From b9705058c617bd553eb3bbf70687abe3599f812d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Sep 2023 18:09:07 +0000 Subject: juicefs: 1.0.4 -> 1.1.0 --- pkgs/tools/filesystems/juicefs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/juicefs/default.nix b/pkgs/tools/filesystems/juicefs/default.nix index 62565385558..5df6986380b 100644 --- a/pkgs/tools/filesystems/juicefs/default.nix +++ b/pkgs/tools/filesystems/juicefs/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "juicefs"; - version = "1.0.4"; + version = "1.1.0"; src = fetchFromGitHub { owner = "juicedata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Bez9wwAPDyYYECDwW9CB/ACTGUJl6PW3YiipIGY0Zbo="; + sha256 = "sha256-UtERYOjAKOTK+A1qPdD1PajOkf/t5vqWRBvEuxkZmdg="; }; - vendorHash = "sha256-dsKNFIXcSeYUyh1TO1h1Ze3jS97pdhn2eU9hHjTARCo="; + vendorHash = "sha256-BpqxCCuWyUgzPyh7sq3/HyQ29qm/PWD7mQFh1nkkAkA="; ldflags = [ "-s" "-w" ]; -- cgit 1.4.1 From 2dc8e11ccf13f96e22cc7b01b3d7f7887bb6c850 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Sep 2023 05:24:20 +0000 Subject: mount-zip: 1.0.9 -> 1.0.10 --- pkgs/tools/filesystems/mount-zip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/mount-zip/default.nix b/pkgs/tools/filesystems/mount-zip/default.nix index a6577e90073..d0f57894e01 100644 --- a/pkgs/tools/filesystems/mount-zip/default.nix +++ b/pkgs/tools/filesystems/mount-zip/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mount-zip"; - version = "1.0.9"; + version = "1.0.10"; src = fetchFromGitHub { owner = "google"; repo = "mount-zip"; rev = "v${finalAttrs.version}"; - hash = "sha256-dc1Cpyh4ctPPYo4cxH81mqNlomtzjiHHfkh52NPzq80="; + hash = "sha256-hXvA/dqRn5zKVAJ+JjUfIEKsqIhEOTzPEzvJI3cP4NY="; }; nativeBuildInputs = [ boost gcc icu pandoc pkg-config ]; -- cgit 1.4.1 From d38485921a4f8187dd5ec145337db1ac4e3d7d06 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 22 Sep 2023 01:11:11 +0800 Subject: treewide: vendorSha256 -> vendorHash (#256514) --- pkgs/applications/editors/vim/plugins/overrides.nix | 2 +- pkgs/applications/misc/cheat/default.nix | 2 +- pkgs/applications/misc/cointop/default.nix | 2 +- pkgs/applications/misc/dstask/default.nix | 2 +- pkgs/applications/misc/mangal/default.nix | 2 +- pkgs/applications/misc/semver/default.nix | 2 +- pkgs/applications/misc/tty-share/default.nix | 2 +- pkgs/applications/misc/ultralist/default.nix | 2 +- pkgs/applications/networking/alpnpass/default.nix | 2 +- pkgs/applications/networking/brig/default.nix | 2 +- pkgs/applications/networking/browsers/bombadillo/default.nix | 2 +- pkgs/applications/networking/cluster/dnsname-cni/default.nix | 2 +- pkgs/applications/networking/cluster/k3s/1_24/default.nix | 4 ++-- pkgs/applications/networking/cluster/k3s/1_25/default.nix | 4 ++-- pkgs/applications/networking/cluster/k3s/builder.nix | 4 ++-- pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix | 2 +- .../applications/networking/instant-messengers/slack-term/default.nix | 2 +- pkgs/applications/networking/kubo-migrator/all-migrations.nix | 2 +- pkgs/applications/networking/kubo/default.nix | 2 +- pkgs/applications/version-management/git-hound/default.nix | 2 +- pkgs/applications/version-management/gitls/default.nix | 2 +- pkgs/applications/virtualization/ignite/default.nix | 2 +- pkgs/applications/virtualization/umoci/default.nix | 2 +- pkgs/development/libraries/boringssl/default.nix | 2 +- pkgs/development/tools/asmfmt/default.nix | 2 +- pkgs/development/tools/build-managers/goredo/default.nix | 2 +- pkgs/development/tools/butane/default.nix | 2 +- pkgs/development/tools/dapper/default.nix | 2 +- pkgs/development/tools/dockfmt/default.nix | 2 +- pkgs/development/tools/gdlv/default.nix | 2 +- pkgs/development/tools/gllvm/default.nix | 2 +- pkgs/development/tools/gocode-gomod/default.nix | 2 +- pkgs/development/tools/gocyclo/default.nix | 2 +- pkgs/development/tools/godef/default.nix | 2 +- pkgs/development/tools/gogetdoc/default.nix | 2 +- pkgs/development/tools/gojsontoyaml/default.nix | 2 +- pkgs/development/tools/gox/default.nix | 2 +- pkgs/development/tools/hjson-go/default.nix | 2 +- pkgs/development/tools/hostess/default.nix | 2 +- pkgs/development/tools/img/default.nix | 2 +- pkgs/development/tools/jsonnet-bundler/default.nix | 2 +- pkgs/development/tools/kcli/default.nix | 2 +- pkgs/development/tools/misc/devspace/default.nix | 2 +- pkgs/development/tools/misc/go-md2man/default.nix | 2 +- pkgs/development/tools/misc/linuxkit/default.nix | 2 +- pkgs/development/tools/misc/nix-build-uncached/default.nix | 2 +- pkgs/development/tools/misc/scc/default.nix | 2 +- pkgs/development/tools/misc/terraform-lsp/default.nix | 2 +- pkgs/development/tools/packet-sd/default.nix | 2 +- pkgs/development/tools/quicktemplate/default.nix | 2 +- pkgs/development/tools/reftools/default.nix | 2 +- pkgs/development/tools/renderizer/default.nix | 2 +- pkgs/development/tools/statik/default.nix | 2 +- pkgs/development/tools/vultr/default.nix | 2 +- pkgs/development/tools/wp4nix/default.nix | 2 +- pkgs/games/gotypist/default.nix | 2 +- pkgs/os-specific/windows/npiperelay/default.nix | 2 +- pkgs/servers/demoit/default.nix | 2 +- pkgs/servers/documize-community/default.nix | 2 +- pkgs/servers/gobetween/default.nix | 2 +- pkgs/servers/hockeypuck/server.nix | 2 +- pkgs/servers/mail/listmonk/stuffbin.nix | 2 +- pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/collectd-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/jitsi-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/openldap-exporter.nix | 2 +- pkgs/servers/portunus/default.nix | 2 +- pkgs/servers/tracing/honeycomb/honeyvent/default.nix | 2 +- pkgs/servers/trickster/trickster.nix | 2 +- pkgs/tools/admin/pebble/default.nix | 2 +- pkgs/tools/filesystems/stuffbin/default.nix | 2 +- pkgs/tools/misc/frei/default.nix | 2 +- pkgs/tools/misc/lnch/default.nix | 2 +- pkgs/tools/misc/tcat/default.nix | 2 +- pkgs/tools/misc/upterm/default.nix | 2 +- pkgs/tools/misc/vsh/default.nix | 2 +- pkgs/tools/misc/ytcast/default.nix | 2 +- pkgs/tools/networking/bitmask-vpn/default.nix | 2 +- pkgs/tools/networking/dnscrypt-proxy/default.nix | 2 +- pkgs/tools/networking/ghostunnel/default.nix | 2 +- pkgs/tools/networking/gof5/default.nix | 2 +- pkgs/tools/networking/hey/default.nix | 2 +- pkgs/tools/networking/waitron/default.nix | 2 +- pkgs/tools/package-management/apx/default.nix | 2 +- pkgs/tools/package-management/holo-build/default.nix | 2 +- pkgs/tools/security/deepsea/default.nix | 2 +- pkgs/tools/security/der-ascii/default.nix | 2 +- pkgs/tools/security/gitjacker/default.nix | 2 +- pkgs/tools/security/log4j-sniffer/default.nix | 2 +- pkgs/tools/security/log4j-vuln-scanner/default.nix | 2 +- pkgs/tools/security/minica/default.nix | 2 +- pkgs/tools/security/minio-certgen/default.nix | 2 +- pkgs/tools/security/ssb/default.nix | 2 +- pkgs/tools/security/traitor/default.nix | 2 +- pkgs/tools/system/runitor/default.nix | 2 +- pkgs/tools/text/align/default.nix | 2 +- pkgs/tools/text/cidrgrep/default.nix | 2 +- pkgs/tools/text/codesearch/default.nix | 2 +- pkgs/tools/text/vgrep/default.nix | 2 +- 99 files changed, 102 insertions(+), 102 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index b16f9eae5a8..942de58bed1 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1428,7 +1428,7 @@ self: super: { hexokinase = buildGoModule { name = "hexokinase"; src = old.src + "/hexokinase"; - vendorSha256 = null; + vendorHash = null; }; in '' diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index c6e6568eaa0..1b85a1ec65f 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { installShellCompletion scripts/cheat.{bash,fish,zsh} ''; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix index a0ceabf9d10..6e22b443a57 100644 --- a/pkgs/applications/misc/cointop/default.nix +++ b/pkgs/applications/misc/cointop/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-NAw1uoBL/FnNLJ86L9aBCOY65aJn1DDGK0Cd0IO2kr0="; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/misc/dstask/default.nix b/pkgs/applications/misc/dstask/default.nix index fb2a5b729ab..b04399812c6 100644 --- a/pkgs/applications/misc/dstask/default.nix +++ b/pkgs/applications/misc/dstask/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { # # Ref # and - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/pkgs/applications/misc/mangal/default.nix b/pkgs/applications/misc/mangal/default.nix index 26e735039b3..6edc9da4f60 100644 --- a/pkgs/applications/misc/mangal/default.nix +++ b/pkgs/applications/misc/mangal/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/misc/semver/default.nix b/pkgs/applications/misc/semver/default.nix index 5453467b9ef..cdafd320271 100644 --- a/pkgs/applications/misc/semver/default.nix +++ b/pkgs/applications/misc/semver/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0v3j7rw917wnmp4lyjscqzk4qf4azfiz70ynbq3wl4gwp1m783vv"; }; - vendorSha256 = null; + vendorHash = null; nativeBuildInputs = [ git ]; meta = with lib; { diff --git a/pkgs/applications/misc/tty-share/default.nix b/pkgs/applications/misc/tty-share/default.nix index 6bf83be7570..cd741b8338d 100644 --- a/pkgs/applications/misc/tty-share/default.nix +++ b/pkgs/applications/misc/tty-share/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { }; # Upstream has a `./vendor` directory with all deps which we rely upon. - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/applications/misc/ultralist/default.nix b/pkgs/applications/misc/ultralist/default.nix index af2b6be2b2f..4ca7283631c 100644 --- a/pkgs/applications/misc/ultralist/default.nix +++ b/pkgs/applications/misc/ultralist/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-GGBW6rpwv1bVbLTD//cU8jNbq/27Ls0su7DymCJTSmY="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "Simple GTD-style todo list for the command line"; diff --git a/pkgs/applications/networking/alpnpass/default.nix b/pkgs/applications/networking/alpnpass/default.nix index 1d24c802877..81bdc29a54f 100644 --- a/pkgs/applications/networking/alpnpass/default.nix +++ b/pkgs/applications/networking/alpnpass/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { hash = "sha256-hNZqGTV17rFSKLhZzNqH2E4SSb6Jhk7YQ4TN0HnE+9g="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "Inspect the plaintext payload inside of proxied TLS connections"; diff --git a/pkgs/applications/networking/brig/default.nix b/pkgs/applications/networking/brig/default.nix index d049ed4e389..23370866e72 100644 --- a/pkgs/applications/networking/brig/default.nix +++ b/pkgs/applications/networking/brig/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "0gi39jmnzqrgj146yw8lcmgmvzx7ii1dgw4iqig7kx8c0jiqi600"; }; - vendorSha256 = null; + vendorHash = null; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/browsers/bombadillo/default.nix b/pkgs/applications/networking/browsers/bombadillo/default.nix index 983f8ac1ee3..96a968a50fe 100644 --- a/pkgs/applications/networking/browsers/bombadillo/default.nix +++ b/pkgs/applications/networking/browsers/bombadillo/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = null; + vendorHash = null; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/networking/cluster/dnsname-cni/default.nix b/pkgs/applications/networking/cluster/dnsname-cni/default.nix index 3a543f40dd4..3b6edd57529 100644 --- a/pkgs/applications/networking/cluster/dnsname-cni/default.nix +++ b/pkgs/applications/networking/cluster/dnsname-cni/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { wrapProgram $out/bin/dnsname --prefix PATH : ${lib.makeBinPath [ dnsmasq ]} ''; - vendorSha256 = null; + vendorHash = null; subPackages = [ "plugins/meta/dnsname" ]; doCheck = false; # NOTE: requires root privileges diff --git a/pkgs/applications/networking/cluster/k3s/1_24/default.nix b/pkgs/applications/networking/cluster/k3s/1_24/default.nix index 6f7644dd543..9fed570ffce 100644 --- a/pkgs/applications/networking/cluster/k3s/1_24/default.nix +++ b/pkgs/applications/networking/cluster/k3s/1_24/default.nix @@ -117,7 +117,7 @@ let k3sCNIPlugins = buildGoModule rec { pname = "k3s-cni-plugins"; version = k3sCNIVersion; - vendorSha256 = null; + vendorHash = null; subPackages = [ "." ]; @@ -210,7 +210,7 @@ let rev = "v${containerdVersion}"; sha256 = containerdSha256; }; - vendorSha256 = null; + vendorHash = null; buildInputs = [ btrfs-progs ]; subPackages = [ "cmd/containerd" "cmd/containerd-shim-runc-v2" ]; ldflags = versionldflags; diff --git a/pkgs/applications/networking/cluster/k3s/1_25/default.nix b/pkgs/applications/networking/cluster/k3s/1_25/default.nix index 47c3b5886c5..49eb5fcadb1 100644 --- a/pkgs/applications/networking/cluster/k3s/1_25/default.nix +++ b/pkgs/applications/networking/cluster/k3s/1_25/default.nix @@ -116,7 +116,7 @@ let k3sCNIPlugins = buildGoModule rec { pname = "k3s-cni-plugins"; version = k3sCNIVersion; - vendorSha256 = null; + vendorHash = null; subPackages = [ "." ]; @@ -208,7 +208,7 @@ let rev = "v${containerdVersion}"; sha256 = containerdSha256; }; - vendorSha256 = null; + vendorHash = null; buildInputs = [ btrfs-progs ]; subPackages = [ "cmd/containerd" "cmd/containerd-shim-runc-v2" ]; ldflags = versionldflags; diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index 9605ff9f947..c9d3e0a998a 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -129,7 +129,7 @@ let k3sCNIPlugins = buildGoModule rec { pname = "k3s-cni-plugins"; version = k3sCNIVersion; - vendorSha256 = null; + vendorHash = null; subPackages = [ "." ]; @@ -226,7 +226,7 @@ let rev = "v${containerdVersion}"; sha256 = containerdSha256; }; - vendorSha256 = null; + vendorHash = null; buildInputs = [ btrfs-progs ]; subPackages = [ "cmd/containerd-shim-runc-v2" ]; ldflags = versionldflags; diff --git a/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix b/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix index 54f99f91c8a..f17c2b2ad1a 100644 --- a/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-alU1c1ppn4cQi582kcA/PIAJJt73i3uG02cQvSYij1A="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "This plugin evicts the given pod and is useful for testing pod disruption budget rules"; diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/applications/networking/instant-messengers/slack-term/default.nix index 99b8b4563d2..2750336cf1d 100644 --- a/pkgs/applications/networking/instant-messengers/slack-term/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "1fbq7bdhy70hlkklppimgdjamnk0v059pg73xm9ax1f4616ki1m6"; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "Slack client for your terminal"; diff --git a/pkgs/applications/networking/kubo-migrator/all-migrations.nix b/pkgs/applications/networking/kubo-migrator/all-migrations.nix index 39a9f141c7a..8cdeb3efb8e 100644 --- a/pkgs/applications/networking/kubo-migrator/all-migrations.nix +++ b/pkgs/applications/networking/kubo-migrator/all-migrations.nix @@ -14,7 +14,7 @@ let inherit pname version; inherit (kubo-migrator-unwrapped) src; sourceRoot = "${kubo-migrator-unwrapped.src.name}/${pname}"; - vendorSha256 = null; + vendorHash = null; # Fix build on Go 1.17 and later: panic: qtls.ClientHelloInfo doesn't match # See https://github.com/ipfs/fs-repo-migrations/pull/163 postPatch = lib.optionalString (lib.elem pname [ "fs-repo-10-to-11" "fs-repo-11-to-12" ]) '' diff --git a/pkgs/applications/networking/kubo/default.nix b/pkgs/applications/networking/kubo/default.nix index dccd827b129..793f8b8d861 100644 --- a/pkgs/applications/networking/kubo/default.nix +++ b/pkgs/applications/networking/kubo/default.nix @@ -27,7 +27,7 @@ buildGoModule rec { passthru.tests.kubo = nixosTests.kubo; - vendorSha256 = null; + vendorHash = null; outputs = [ "out" "systemd_unit" "systemd_unit_hardened" ]; diff --git a/pkgs/applications/version-management/git-hound/default.nix b/pkgs/applications/version-management/git-hound/default.nix index d2be44bc1a2..7a135b69a2e 100644 --- a/pkgs/applications/version-management/git-hound/default.nix +++ b/pkgs/applications/version-management/git-hound/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-HD5OK8HjnLDbyC/TmVI2HfBRIUCyyHTbA3JvKoeXV5E="; }; - vendorSha256 = null; #vendorSha256 = ""; + vendorHash = null; meta = with lib; { description = "Reconnaissance tool for GitHub code search"; diff --git a/pkgs/applications/version-management/gitls/default.nix b/pkgs/applications/version-management/gitls/default.nix index 4cda10b3805..28fbba659f4 100644 --- a/pkgs/applications/version-management/gitls/default.nix +++ b/pkgs/applications/version-management/gitls/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { hash = "sha256-kLkH/nNidd1QNPKvo7fxZwMhTgd4AVB8Ofw0Wo0z6c0="; }; - vendorSha256 = null; + vendorHash = null; passthru.tests.version = testers.testVersion { package = gitls; diff --git a/pkgs/applications/virtualization/ignite/default.nix b/pkgs/applications/virtualization/ignite/default.nix index 9ab1d36fef5..89387e822d8 100644 --- a/pkgs/applications/virtualization/ignite/default.nix +++ b/pkgs/applications/virtualization/ignite/default.nix @@ -21,7 +21,7 @@ buildGoModule rec{ leaveDotGit = true; }; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/pkgs/applications/virtualization/umoci/default.nix b/pkgs/applications/virtualization/umoci/default.nix index 6af9382d2b7..627817139c8 100644 --- a/pkgs/applications/virtualization/umoci/default.nix +++ b/pkgs/applications/virtualization/umoci/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { sha256 = "0in8kyi4jprvbm3zsl3risbjj8b0ma62yl3rq8rcvcgypx0mn7d4"; }; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index 2c99989bc88..43cb3e95e98 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -20,7 +20,7 @@ buildGoModule { nativeBuildInputs = [ cmake ninja perl ]; - vendorSha256 = null; + vendorHash = null; # hack to get both go and cmake configure phase # (if we use postConfigure then cmake will loop runHook postConfigure) diff --git a/pkgs/development/tools/asmfmt/default.nix b/pkgs/development/tools/asmfmt/default.nix index 61b5d624c8f..a6f15c15c0b 100644 --- a/pkgs/development/tools/asmfmt/default.nix +++ b/pkgs/development/tools/asmfmt/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-YxIVqPGsqxvOY0Qz4Jw5FuO9IbplCICjChosnHrSCgc="; }; - vendorSha256 = null; + vendorHash = null; # This package comes with its own version of goimports, gofmt and goreturns # but these binaries are outdated and are offered by other packages. diff --git a/pkgs/development/tools/build-managers/goredo/default.nix b/pkgs/development/tools/build-managers/goredo/default.nix index d7ddc7ae1f9..9284aae220e 100644 --- a/pkgs/development/tools/build-managers/goredo/default.nix +++ b/pkgs/development/tools/build-managers/goredo/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { inherit (sharness) SHARNESS_TEST_SRCDIR; - vendorSha256 = null; + vendorHash = null; modRoot = "./src"; subPackages = [ "." ]; diff --git a/pkgs/development/tools/butane/default.nix b/pkgs/development/tools/butane/default.nix index 71344ea3ca3..affe321dc91 100644 --- a/pkgs/development/tools/butane/default.nix +++ b/pkgs/development/tools/butane/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { hash = "sha256-HkvDJVSGve6t1gEek8FvfIK20r5TOHRJ71KsGUj95fM="; }; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/pkgs/development/tools/dapper/default.nix b/pkgs/development/tools/dapper/default.nix index d2b36efdaed..c2b6066f61b 100644 --- a/pkgs/development/tools/dapper/default.nix +++ b/pkgs/development/tools/dapper/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "sha256-V+lHnOmIWjI1qmoJ7+pp+cGmJAtSeY+r2I9zykswQzM="; }; - vendorSha256 = null; + vendorHash = null; patchPhase = '' substituteInPlace main.go --replace 0.0.0 ${version} diff --git a/pkgs/development/tools/dockfmt/default.nix b/pkgs/development/tools/dockfmt/default.nix index 18dfed5f2fb..e2a2210fa64 100644 --- a/pkgs/development/tools/dockfmt/default.nix +++ b/pkgs/development/tools/dockfmt/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { hash = "sha256-wEC9kENcE3u+Mb7uLbx/VBUup6PBnCY5cxTYvkJcavg="; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-w" diff --git a/pkgs/development/tools/gdlv/default.nix b/pkgs/development/tools/gdlv/default.nix index 619e8ec192a..7dfa53901c4 100644 --- a/pkgs/development/tools/gdlv/default.nix +++ b/pkgs/development/tools/gdlv/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { sha256 = "sha256-G1/Wbz836yfGZ/1ArICrNbWU6eh4SHXDmo4FKkjUszY="; }; - vendorSha256 = null; + vendorHash = null; subPackages = "."; buildInputs = lib.optionals stdenv.isDarwin [ OpenGL AppKit ]; diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix index c09ec90207b..14b24d91dac 100644 --- a/pkgs/development/tools/gllvm/default.nix +++ b/pkgs/development/tools/gllvm/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-CoreqnMRuPuv+Ci1uyF3HJCJFwK2jwB79okynv6AHTA="; }; - vendorSha256 = null; + vendorHash = null; nativeCheckInputs = with llvmPackages; [ clang diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix index c07d38b6073..9c1752b9ad1 100644 --- a/pkgs/development/tools/gocode-gomod/default.nix +++ b/pkgs/development/tools/gocode-gomod/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { sha256 = "YAOYrPPKgnjCErq8+iW0Le51clGBv0MJy2Nnn7UVo/s="; }; - vendorSha256 = null; + vendorHash = null; postInstall = '' mv $out/bin/gocode $out/bin/gocode-gomod diff --git a/pkgs/development/tools/gocyclo/default.nix b/pkgs/development/tools/gocyclo/default.nix index b8e0bb1c4f5..6dc87ccdc91 100644 --- a/pkgs/development/tools/gocyclo/default.nix +++ b/pkgs/development/tools/gocyclo/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-1IwtGUqshpLDyxH5NNkGUads1TKLs48eslNnFylGUPA="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "Calculate cyclomatic complexities of functions in Go source code"; diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix index 99fe932013e..085e996f350 100644 --- a/pkgs/development/tools/godef/default.nix +++ b/pkgs/development/tools/godef/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/pkgs/development/tools/gogetdoc/default.nix b/pkgs/development/tools/gogetdoc/default.nix index 6f7c189ea9d..adbb01ea7e3 100644 --- a/pkgs/development/tools/gogetdoc/default.nix +++ b/pkgs/development/tools/gogetdoc/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { version = "2019-02-28"; rev = "b37376c5da6aeb900611837098f40f81972e63e4"; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/pkgs/development/tools/gojsontoyaml/default.nix b/pkgs/development/tools/gojsontoyaml/default.nix index 02f5421ca00..88708f5b19f 100644 --- a/pkgs/development/tools/gojsontoyaml/default.nix +++ b/pkgs/development/tools/gojsontoyaml/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-ebxz2uTH7XwD3j6JnsfET6aCGYjvsCjow/sU9pagg50="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "Simply tool to convert json to yaml written in Go"; diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix index 065f5bee224..2cd8bbd8e06 100644 --- a/pkgs/development/tools/gox/default.nix +++ b/pkgs/development/tools/gox/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { sha256 = "0mkh81hd7kn45dz7b6yhzqsg2mvg1g6pwx89jjigxrnqhyg9vrl7"; }; - vendorSha256 = null; + vendorHash = null; # This is required for wrapProgram. allowGoReference = true; diff --git a/pkgs/development/tools/hjson-go/default.nix b/pkgs/development/tools/hjson-go/default.nix index bab12da8eb6..9237871599c 100644 --- a/pkgs/development/tools/hjson-go/default.nix +++ b/pkgs/development/tools/hjson-go/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { hash = "sha256-WR6wLa/Za5MgcH1enHG/74uq/7PdaY/OzvJdgMgDFIk="; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" diff --git a/pkgs/development/tools/hostess/default.nix b/pkgs/development/tools/hostess/default.nix index 0d32f835f87..7bf78c40331 100644 --- a/pkgs/development/tools/hostess/default.nix +++ b/pkgs/development/tools/hostess/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "An idempotent command-line utility for managing your /etc/hosts* file."; diff --git a/pkgs/development/tools/img/default.nix b/pkgs/development/tools/img/default.nix index 17daf49ff23..b14e6e3b261 100644 --- a/pkgs/development/tools/img/default.nix +++ b/pkgs/development/tools/img/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { sha256 = "0r5hihzp2679ki9hr3p0f085rafy2hc8kpkdhnd4m5k4iibqib08"; }; - vendorSha256 = null; + vendorHash = null; postPatch = '' V={newgidmap,newgidmap} \ diff --git a/pkgs/development/tools/jsonnet-bundler/default.nix b/pkgs/development/tools/jsonnet-bundler/default.nix index e627c985050..256d90fd765 100644 --- a/pkgs/development/tools/jsonnet-bundler/default.nix +++ b/pkgs/development/tools/jsonnet-bundler/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-vjb5wEiJw48s7FUarpA94ZauFC7iEgRDAkRTwRIZ8pA="; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/development/tools/kcli/default.nix index 77c773cea1b..fa4e8874513 100644 --- a/pkgs/development/tools/kcli/default.nix +++ b/pkgs/development/tools/kcli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0whijr2r2j5bvfy8jgmpxsa0zvwk5kfjlpnkw4za5k35q7bjffls"; }; - vendorSha256 = null; #vendorSha256 = ""; + vendorHash = null; subPackages = [ "." ]; diff --git a/pkgs/development/tools/misc/devspace/default.nix b/pkgs/development/tools/misc/devspace/default.nix index 7a099a2258c..4f657ff3b6d 100644 --- a/pkgs/development/tools/misc/devspace/default.nix +++ b/pkgs/development/tools/misc/devspace/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-xAK06bpl8BGsVUu6O1C2l+tzeiCQoRUMIUtwntUZVvU="; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" diff --git a/pkgs/development/tools/misc/go-md2man/default.nix b/pkgs/development/tools/misc/go-md2man/default.nix index a1481fe2d38..e86577ba859 100644 --- a/pkgs/development/tools/misc/go-md2man/default.nix +++ b/pkgs/development/tools/misc/go-md2man/default.nix @@ -4,7 +4,7 @@ buildGoModule rec { pname = "go-md2man"; version = "2.0.2"; - vendorSha256 = null; + vendorHash = null; src = fetchFromGitHub { rev = "v${version}"; diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix index 3a7a7836df9..73ea58a17e4 100644 --- a/pkgs/development/tools/misc/linuxkit/default.nix +++ b/pkgs/development/tools/misc/linuxkit/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-8x9oJaYb/mN2TUaVrGOYi5/6TETD78jif0SwCSc0kyo="; }; - vendorSha256 = null; + vendorHash = null; modRoot = "./src/cmd/linuxkit"; diff --git a/pkgs/development/tools/misc/nix-build-uncached/default.nix b/pkgs/development/tools/misc/nix-build-uncached/default.nix index 840bea3eb3e..960b744dc73 100644 --- a/pkgs/development/tools/misc/nix-build-uncached/default.nix +++ b/pkgs/development/tools/misc/nix-build-uncached/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-n9Koi01Te77bpYbRX46UThyD2FhCu9OGHd/6xDQLqjQ="; }; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/pkgs/development/tools/misc/scc/default.nix b/pkgs/development/tools/misc/scc/default.nix index 40b41d8df9e..aef335756f8 100644 --- a/pkgs/development/tools/misc/scc/default.nix +++ b/pkgs/development/tools/misc/scc/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-QViB9lS/znrFb7GoV0RUf1SwS7veTKlmFozWKM1zc+Y="; }; - vendorSha256 = null; + vendorHash = null; # scc has a scripts/ sub-package that's for testing. excludedPackages = [ "scripts" ]; diff --git a/pkgs/development/tools/misc/terraform-lsp/default.nix b/pkgs/development/tools/misc/terraform-lsp/default.nix index 1f35f769623..332913e7113 100644 --- a/pkgs/development/tools/misc/terraform-lsp/default.nix +++ b/pkgs/development/tools/misc/terraform-lsp/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "111350jbq0dp0qhk48j12hrlisd1fwzqpcv357igrbqf6ki7r78q"; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" "-X main.Version=${version}" "-X main.GitCommit=${src.rev}" ]; diff --git a/pkgs/development/tools/packet-sd/default.nix b/pkgs/development/tools/packet-sd/default.nix index fb2cc85ec5d..5f61b584489 100644 --- a/pkgs/development/tools/packet-sd/default.nix +++ b/pkgs/development/tools/packet-sd/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { sha256 = "sha256-2k8AsmyhQNNZCzpVt6JdgvI8IFb5pRi4ic6Yn2NqHMM="; }; - vendorSha256 = null; + vendorHash = null; subPackages = [ "." ]; diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix index 2086464d7b3..a339c8e2896 100644 --- a/pkgs/development/tools/quicktemplate/default.nix +++ b/pkgs/development/tools/quicktemplate/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0xzsvhpllmzmyfg8sj1dpp02826j1plmyrdvqbwryzhf2ci33nqr"; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { homepage = "https://github.com/valyala/quicktemplate"; diff --git a/pkgs/development/tools/reftools/default.nix b/pkgs/development/tools/reftools/default.nix index 44c6605c1ac..151f1accccf 100644 --- a/pkgs/development/tools/reftools/default.nix +++ b/pkgs/development/tools/reftools/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-fHWtUoVK3G0Kn69O6/D0blM6Q/u4LuLinT6sxF18nFo="; }; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/pkgs/development/tools/renderizer/default.nix b/pkgs/development/tools/renderizer/default.nix index d9987137ce6..07001487ab8 100644 --- a/pkgs/development/tools/renderizer/default.nix +++ b/pkgs/development/tools/renderizer/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { "-s" "-w" "-X main.version=${version}" "-X main.commitHash=${src.rev}" "-X main.date=19700101T000000" ]; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "CLI to render Go template text files"; diff --git a/pkgs/development/tools/statik/default.nix b/pkgs/development/tools/statik/default.nix index a5af2ed2d31..e77cf8f3bb0 100644 --- a/pkgs/development/tools/statik/default.nix +++ b/pkgs/development/tools/statik/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "ahsNiac/3I2+PUqc90E73Brb99M68ewh9nWXoupfE3g="; }; - vendorSha256 = null; + vendorHash = null; # Avoid building example subPackages = [ "." "fs" ]; diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix index 8a584ce669c..71a04845578 100644 --- a/pkgs/development/tools/vultr/default.nix +++ b/pkgs/development/tools/vultr/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-kyB6gUbc32NsSDqDy1zVT4HXn0pWxHdBOEBOSaI0Xro="; }; - vendorSha256 = null; + vendorHash = null; # There are not test files doCheck = false; diff --git a/pkgs/development/tools/wp4nix/default.nix b/pkgs/development/tools/wp4nix/default.nix index 61ea2c802d3..08a202784ce 100644 --- a/pkgs/development/tools/wp4nix/default.nix +++ b/pkgs/development/tools/wp4nix/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { sha256 = "sha256-WJteeFUMr684yZEtUP13MqRjJ1UAeo48AzOPdLEE65w="; }; - vendorSha256 = null; + vendorHash = null; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/games/gotypist/default.nix b/pkgs/games/gotypist/default.nix index 7840a56d361..24afb9317c5 100644 --- a/pkgs/games/gotypist/default.nix +++ b/pkgs/games/gotypist/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0khl2f6bl121slw9mlf4qzsdarpk1v3vry11f3dvz7pb1q6zjj11"; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "A touch-typing tutor"; diff --git a/pkgs/os-specific/windows/npiperelay/default.nix b/pkgs/os-specific/windows/npiperelay/default.nix index edc83a27e55..d2347edcbaf 100644 --- a/pkgs/os-specific/windows/npiperelay/default.nix +++ b/pkgs/os-specific/windows/npiperelay/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-cg4aZmpTysc8m1euxIO2XPv8OMnBk1DwhFcuIFHF/1o="; }; - vendorSha256 = null; + vendorHash = null; meta = { description = "Access Windows named pipes from WSL"; diff --git a/pkgs/servers/demoit/default.nix b/pkgs/servers/demoit/default.nix index e2dd5cc928b..1ffd5aba546 100644 --- a/pkgs/servers/demoit/default.nix +++ b/pkgs/servers/demoit/default.nix @@ -13,7 +13,7 @@ buildGoModule { rev = "258780987922e46abde8e848247af0a9435e3099"; sha256 = "sha256-yRfdnqk93GOTBa0zZrm4K3AkUqxGmlrwlKYcD6CtgRg="; }; - vendorSha256 = null; + vendorHash = null; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix index a6631843ad5..572d9a8e2b9 100644 --- a/pkgs/servers/documize-community/default.nix +++ b/pkgs/servers/documize-community/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-Kv4BsFB08rkGRkePFIkjjuhK1TnLPS4m+PUlgKG5cTQ="; }; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/pkgs/servers/gobetween/default.nix b/pkgs/servers/gobetween/default.nix index 290d1db2608..db201e5ba48 100644 --- a/pkgs/servers/gobetween/default.nix +++ b/pkgs/servers/gobetween/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { make -e build${lib.optionalString enableStatic "-static"} ''; - vendorSha256 = null; #vendorSha256 = ""; + vendorHash = null; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/servers/hockeypuck/server.nix b/pkgs/servers/hockeypuck/server.nix index cf48fd5716c..4a59ebe7746 100644 --- a/pkgs/servers/hockeypuck/server.nix +++ b/pkgs/servers/hockeypuck/server.nix @@ -7,7 +7,7 @@ buildGoModule { inherit (sources) pname version src; modRoot = "src/hockeypuck/"; - vendorSha256 = null; + vendorHash = null; doCheck = false; # Uses networking for tests passthru.tests = nixosTests.hockeypuck; diff --git a/pkgs/servers/mail/listmonk/stuffbin.nix b/pkgs/servers/mail/listmonk/stuffbin.nix index 442307fad65..2640ba8b851 100644 --- a/pkgs/servers/mail/listmonk/stuffbin.nix +++ b/pkgs/servers/mail/listmonk/stuffbin.nix @@ -4,7 +4,7 @@ buildGoModule rec { pname = "stuffbin"; version = "1.1.0"; - vendorSha256 = null; + vendorHash = null; src = fetchFromGitHub { owner = "knadh"; diff --git a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix index fd0234e7e16..dd0ea4ec5ec 100644 --- a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-dYkMCCAIlFDFOFUNJd4NvtAeJDTsHeJoH90b5pSGlQE="; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index 3c34ca8b56f..8b842b7ce3d 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0vb6vnd2j87iqxdl86j30dk65vrv4scprv200xb83203aprngqgh"; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix b/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix index 68e99308948..5b90c26eed7 100644 --- a/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix @@ -10,7 +10,7 @@ buildGoModule rec { sha256 = "1cf46wp96d9dwlwlffcgbcr0v3xxxfdv6il0zqkm2i7cfsfw0skf"; }; - vendorSha256 = null; + vendorHash = null; passthru.tests = { inherit (nixosTests.prometheus-exporters) jitsi; }; diff --git a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix b/pkgs/servers/monitoring/prometheus/openldap-exporter.nix index 5f5bd6503e0..3d574d1bb93 100644 --- a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/openldap-exporter.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-1u+89odwV/lz34wtrK91lET2bOqkH6kRA7JCjzsmiEg="; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" diff --git a/pkgs/servers/portunus/default.nix b/pkgs/servers/portunus/default.nix index a59df99c8d1..b2cd17f016d 100644 --- a/pkgs/servers/portunus/default.nix +++ b/pkgs/servers/portunus/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-+sq5Wja0tVkPZ0Z++K2A6my9LfLJ4twxtoEAS6LHqzE="; }; - vendorSha256 = null; + vendorHash = null; postInstall = '' mv $out/bin/{,portunus-}orchestrator diff --git a/pkgs/servers/tracing/honeycomb/honeyvent/default.nix b/pkgs/servers/tracing/honeycomb/honeyvent/default.nix index e1009c35a88..e950980f037 100644 --- a/pkgs/servers/tracing/honeycomb/honeyvent/default.nix +++ b/pkgs/servers/tracing/honeycomb/honeyvent/default.nix @@ -3,7 +3,7 @@ import ./versions.nix ({version, sha256}: buildGoModule { pname = "honeyvent"; inherit version; - vendorSha256 = null; + vendorHash = null; src = fetchFromGitHub { owner = "honeycombio"; diff --git a/pkgs/servers/trickster/trickster.nix b/pkgs/servers/trickster/trickster.nix index a798e0ceff0..db8d6942a61 100644 --- a/pkgs/servers/trickster/trickster.nix +++ b/pkgs/servers/trickster/trickster.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "sha256-BRD8IF3s9RaDorVtXRvbKLVVVXWiEQTQyKBR9jFo1eM="; }; - vendorSha256 = null; + vendorHash = null; subPackages = [ "cmd/trickster" ]; diff --git a/pkgs/tools/admin/pebble/default.nix b/pkgs/tools/admin/pebble/default.nix index a3c8d20b107..76e2e281f68 100644 --- a/pkgs/tools/admin/pebble/default.nix +++ b/pkgs/tools/admin/pebble/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { sha256 = "0sh67bzq3hlagk73w2kp45viq15g2rcxm760jk9fqshamq784m6m"; }; - vendorSha256 = null; + vendorHash = null; passthru.tests = { smoke-test = nixosTests.acme; diff --git a/pkgs/tools/filesystems/stuffbin/default.nix b/pkgs/tools/filesystems/stuffbin/default.nix index 442307fad65..2640ba8b851 100644 --- a/pkgs/tools/filesystems/stuffbin/default.nix +++ b/pkgs/tools/filesystems/stuffbin/default.nix @@ -4,7 +4,7 @@ buildGoModule rec { pname = "stuffbin"; version = "1.1.0"; - vendorSha256 = null; + vendorHash = null; src = fetchFromGitHub { owner = "knadh"; diff --git a/pkgs/tools/misc/frei/default.nix b/pkgs/tools/misc/frei/default.nix index 22e62764643..6e8a2181abb 100644 --- a/pkgs/tools/misc/frei/default.nix +++ b/pkgs/tools/misc/frei/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-9CV6B7fRHXl73uI2JRv3RiaFczLHHBOd7/8UoCAwK6w="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "Modern replacement for free"; diff --git a/pkgs/tools/misc/lnch/default.nix b/pkgs/tools/misc/lnch/default.nix index 211df2186f7..70d52d2ea8b 100644 --- a/pkgs/tools/misc/lnch/default.nix +++ b/pkgs/tools/misc/lnch/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-Iro/FjPFMqulcK90MbludnOXkMEHW0QSCoQRL01/LDE"; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/misc/tcat/default.nix b/pkgs/tools/misc/tcat/default.nix index 3556eb232c1..1f6c45f32dc 100644 --- a/pkgs/tools/misc/tcat/default.nix +++ b/pkgs/tools/misc/tcat/default.nix @@ -9,7 +9,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "1szzfz5xsx9l8gjikfncgp86hydzpvsi0y5zvikd621xkp7g7l21"; }; - vendorSha256 = null; + vendorHash = null; subPackages = "."; meta = with lib; { diff --git a/pkgs/tools/misc/upterm/default.nix b/pkgs/tools/misc/upterm/default.nix index f1a28f1af40..76c39f665a1 100644 --- a/pkgs/tools/misc/upterm/default.nix +++ b/pkgs/tools/misc/upterm/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { hash = "sha256-wjbptcGy3wOZPm/11El7Xqz6NrR8G19V9zfU5pKFGuk="; }; - vendorSha256 = null; + vendorHash = null; subPackages = [ "cmd/upterm" "cmd/uptermd" ]; diff --git a/pkgs/tools/misc/vsh/default.nix b/pkgs/tools/misc/vsh/default.nix index c7f65527e08..cfe014d3f9a 100644 --- a/pkgs/tools/misc/vsh/default.nix +++ b/pkgs/tools/misc/vsh/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { }; # vendor directory is part of repository - vendorSha256 = null; + vendorHash = null; # make sure version gets set at compile time ldflags = [ "-s" "-w" "-X main.vshVersion=v${version}" ]; diff --git a/pkgs/tools/misc/ytcast/default.nix b/pkgs/tools/misc/ytcast/default.nix index a918f56fbed..163329a60da 100644 --- a/pkgs/tools/misc/ytcast/default.nix +++ b/pkgs/tools/misc/ytcast/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0f45ai1s4njhcvbv088yn10i3vdvlm6wlfi0ijq5gak1dg02klma"; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-X main.progVersion=${version}" ]; meta = with lib; { diff --git a/pkgs/tools/networking/bitmask-vpn/default.nix b/pkgs/tools/networking/bitmask-vpn/default.nix index c3e8538acb8..60988da176a 100644 --- a/pkgs/tools/networking/bitmask-vpn/default.nix +++ b/pkgs/tools/networking/bitmask-vpn/default.nix @@ -68,7 +68,7 @@ in buildGoModule rec { inherit src version; pname = "${provider}-vpn"; - vendorSha256 = null; + vendorHash = null; postPatch = '' substituteInPlace pkg/pickle/helpers.go \ diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix index 5227a28c1bd..319e8d9f822 100644 --- a/pkgs/tools/networking/dnscrypt-proxy/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix @@ -4,7 +4,7 @@ buildGoModule rec { pname = "dnscrypt-proxy"; version = "2.1.5"; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/pkgs/tools/networking/ghostunnel/default.nix b/pkgs/tools/networking/ghostunnel/default.nix index 3ca9ec74c26..88afb472b77 100644 --- a/pkgs/tools/networking/ghostunnel/default.nix +++ b/pkgs/tools/networking/ghostunnel/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { hash = "sha256-yG9PfpYqW95X7EfbAhKEDmqBue7SjFULXUO73V4s3t4="; }; - vendorSha256 = null; + vendorHash = null; deleteVendor = true; diff --git a/pkgs/tools/networking/gof5/default.nix b/pkgs/tools/networking/gof5/default.nix index 9b437ee49ee..4c9ab25cc78 100644 --- a/pkgs/tools/networking/gof5/default.nix +++ b/pkgs/tools/networking/gof5/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "10qh7rj8s540ghjdvymly53vny3n0qd0z0ixy24n026jjhgjvnpl"; }; - vendorSha256 = null; + vendorHash = null; # The tests are broken and apparently you need to uncomment some lines in the # code in order for it to work. diff --git a/pkgs/tools/networking/hey/default.nix b/pkgs/tools/networking/hey/default.nix index d59e58981e7..fc086eeeaff 100644 --- a/pkgs/tools/networking/hey/default.nix +++ b/pkgs/tools/networking/hey/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0gsdksrzlwpba14a43ayyy41l1hxpw4ayjpvqyd4ycakddlkvgzb"; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "HTTP load generator, ApacheBench (ab) replacement"; diff --git a/pkgs/tools/networking/waitron/default.nix b/pkgs/tools/networking/waitron/default.nix index c316e98317e..7ad9ed77a7d 100644 --- a/pkgs/tools/networking/waitron/default.nix +++ b/pkgs/tools/networking/waitron/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "sha256-ZkGhEOckIOYGb6Yjr4I4e9cjAHDfksRwHW+zgOMZ/FE="; }; - vendorSha256 = null; #vendorSha256 = ""; + vendorHash = null; subPackages = [ "." ]; diff --git a/pkgs/tools/package-management/apx/default.nix b/pkgs/tools/package-management/apx/default.nix index e1f134a2f5f..9c58e5e0850 100644 --- a/pkgs/tools/package-management/apx/default.nix +++ b/pkgs/tools/package-management/apx/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { hash = "sha256-nBhSl4r7LlgCA5/HCLpOleihE5n/JCJgf43KdCklQbg="; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/package-management/holo-build/default.nix b/pkgs/tools/package-management/holo-build/default.nix index 6fa3887b9e2..fca55807f51 100644 --- a/pkgs/tools/package-management/holo-build/default.nix +++ b/pkgs/tools/package-management/holo-build/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { --replace '/usr/lib/holo/holo-build' '${placeholder "out"}/lib/holo/holo-build' ''; - vendorSha256 = null; + vendorHash = null; nativeBuildInputs = [ installShellFiles perl ]; diff --git a/pkgs/tools/security/deepsea/default.nix b/pkgs/tools/security/deepsea/default.nix index 0befd62e221..2f0a9f175f3 100644 --- a/pkgs/tools/security/deepsea/default.nix +++ b/pkgs/tools/security/deepsea/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "02s03sha8vwp7dsaw3z446pskhb6wmy0hyj0mhpbx58sf147rkig"; }; - vendorSha256 = null; #vendorSha256 = ""; + vendorHash = null; meta = with lib; { description = "Phishing tool for red teams and pentesters"; diff --git a/pkgs/tools/security/der-ascii/default.nix b/pkgs/tools/security/der-ascii/default.nix index 2bfcc9c3709..5fc3b179b3a 100644 --- a/pkgs/tools/security/der-ascii/default.nix +++ b/pkgs/tools/security/der-ascii/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "1my93m1rx08kn2yms6k8w43byr8k61r1nra4b082j8b393wwxkqc"; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/security/gitjacker/default.nix b/pkgs/tools/security/gitjacker/default.nix index 05bdb2b1733..c233032d935 100644 --- a/pkgs/tools/security/gitjacker/default.nix +++ b/pkgs/tools/security/gitjacker/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { sha256 = "sha256-rEn9FpcRfEt2yGepIPEAO9m8JeVb+nMhYMBWhC/barc="; }; - vendorSha256 = null; + vendorHash = null; propagatedBuildInputs = [ git ]; diff --git a/pkgs/tools/security/log4j-sniffer/default.nix b/pkgs/tools/security/log4j-sniffer/default.nix index 72cf2fb851b..dec7ce35866 100644 --- a/pkgs/tools/security/log4j-sniffer/default.nix +++ b/pkgs/tools/security/log4j-sniffer/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "sha256-pO6difzNvQvKQtRLyksXmExtQHlnnwyF3iNEmSBgUmU="; }; - vendorSha256 = null; + vendorHash = null; nativeCheckInputs = [ git diff --git a/pkgs/tools/security/log4j-vuln-scanner/default.nix b/pkgs/tools/security/log4j-vuln-scanner/default.nix index a33848b5d48..57e884d37fe 100644 --- a/pkgs/tools/security/log4j-vuln-scanner/default.nix +++ b/pkgs/tools/security/log4j-vuln-scanner/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-YMD2233EdrrF1SLjwiRcNr53b7Rf5Tu8CZC43QhSY7c="; }; - vendorSha256 = null; + vendorHash = null; postInstall = '' mv $out/bin/scanner $out/bin/$pname diff --git a/pkgs/tools/security/minica/default.nix b/pkgs/tools/security/minica/default.nix index 902961e049f..6dd6d1fd5ce 100644 --- a/pkgs/tools/security/minica/default.nix +++ b/pkgs/tools/security/minica/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-3p6rUFFiWXhX9BBbxqWxRoyRceexvNnqcFCyNi5HoaA="; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/security/minio-certgen/default.nix b/pkgs/tools/security/minio-certgen/default.nix index ddcd55ef3ff..fed6bdca2c5 100644 --- a/pkgs/tools/security/minio-certgen/default.nix +++ b/pkgs/tools/security/minio-certgen/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-qi+SeNLW/jE2dGar4Lf16TKRT3ZTmWB/j8EsnoyrdxI="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "A simple Minio tool to generate self-signed certificates, and provides SAN certificates with DNS and IP entries"; diff --git a/pkgs/tools/security/ssb/default.nix b/pkgs/tools/security/ssb/default.nix index aed2dd79aeb..725f72e6c7c 100644 --- a/pkgs/tools/security/ssb/default.nix +++ b/pkgs/tools/security/ssb/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "0dkd02l30461cwn5hsssnjyb9s8ww179wll3l7z5hy1hv3x6h9g1"; }; - vendorSha256 = null; #vendorSha256 = ""; + vendorHash = null; meta = with lib; { description = "Tool to bruteforce SSH server"; diff --git a/pkgs/tools/security/traitor/default.nix b/pkgs/tools/security/traitor/default.nix index bbe9553819f..26efa6d68a7 100644 --- a/pkgs/tools/security/traitor/default.nix +++ b/pkgs/tools/security/traitor/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-LQfKdjZaTm5z8DUt6He/RJHbOUCUwP3CV3Fyt5rJIfU="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "Automatic Linux privilege escalation"; diff --git a/pkgs/tools/system/runitor/default.nix b/pkgs/tools/system/runitor/default.nix index 651f766cefb..d724d4c4370 100644 --- a/pkgs/tools/system/runitor/default.nix +++ b/pkgs/tools/system/runitor/default.nix @@ -3,7 +3,7 @@ buildGoModule rec { pname = "runitor"; version = "1.2.0"; - vendorSha256 = null; + vendorHash = null; src = fetchFromGitHub { owner = "bdd"; diff --git a/pkgs/tools/text/align/default.nix b/pkgs/tools/text/align/default.nix index 4f67d747da4..e3287b762e3 100644 --- a/pkgs/tools/text/align/default.nix +++ b/pkgs/tools/text/align/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "17gs3417633z71kc6l5zqg4b3rjhpn2v8qs8rnfrk4nbwzz4nrq3"; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { homepage = "https://github.com/Guitarbum722/align"; diff --git a/pkgs/tools/text/cidrgrep/default.nix b/pkgs/tools/text/cidrgrep/default.nix index 2feadbabfd7..0117374dade 100644 --- a/pkgs/tools/text/cidrgrep/default.nix +++ b/pkgs/tools/text/cidrgrep/default.nix @@ -11,7 +11,7 @@ buildGoModule { hash = "sha256-Bp1cST6/8ppvpgNxjUpwL498C9vTJmoWOKLJgmWqfEs="; }; - vendorSha256 = null; + vendorHash = null; postInstall = '' mv $out/bin/cmd $out/bin/cidrgrep diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix index f0a23d8d302..7a948388e09 100644 --- a/pkgs/tools/text/codesearch/default.nix +++ b/pkgs/tools/text/codesearch/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-i03w8PZ31j5EutUZaamZsHz+z4qgX4prePbj5DLA78s="; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/text/vgrep/default.nix b/pkgs/tools/text/vgrep/default.nix index e9fbaf81c2a..f6a14e6024b 100644 --- a/pkgs/tools/text/vgrep/default.nix +++ b/pkgs/tools/text/vgrep/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-8xLyk1iid3xDCAuZwz1oXsEyboLaxvzm1BEyA2snQt4="; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; -- cgit 1.4.1 From f1dceb091995b35175ea671287f285b56d7a297f Mon Sep 17 00:00:00 2001 From: Sergei Shilovsky Date: Thu, 21 Sep 2023 21:41:36 +0300 Subject: curlftpfs: apply SUSE patches Fixes this bug in particular: https://sourceforge.net/p/curlftpfs/bugs/70/ --- pkgs/tools/filesystems/curlftpfs/default.nix | 2 ++ pkgs/tools/filesystems/curlftpfs/suse-bug-580609.patch | 10 ++++++++++ pkgs/tools/filesystems/curlftpfs/suse-bug-955687.patch | 11 +++++++++++ 3 files changed, 23 insertions(+) create mode 100644 pkgs/tools/filesystems/curlftpfs/suse-bug-580609.patch create mode 100644 pkgs/tools/filesystems/curlftpfs/suse-bug-955687.patch (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/curlftpfs/default.nix b/pkgs/tools/filesystems/curlftpfs/default.nix index f1e08f0362d..1263ccb8565 100644 --- a/pkgs/tools/filesystems/curlftpfs/default.nix +++ b/pkgs/tools/filesystems/curlftpfs/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { # it is known to cause problems. Search online for "rpl_malloc" and # "rpl_realloc" to find out more. ./fix-rpl_malloc.patch + ./suse-bug-580609.patch + ./suse-bug-955687.patch ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/filesystems/curlftpfs/suse-bug-580609.patch b/pkgs/tools/filesystems/curlftpfs/suse-bug-580609.patch new file mode 100644 index 00000000000..068fb129a4b --- /dev/null +++ b/pkgs/tools/filesystems/curlftpfs/suse-bug-580609.patch @@ -0,0 +1,10 @@ +--- a/ftpfs.c 2008-04-30 01:05:47.000000000 +0200 ++++ b/ftpfs.c 2010-05-21 13:01:42.569006163 +0200 +@@ -503,7 +503,6 @@ static void *ftpfs_write_thread(void *da + + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_URL, fh->full_path); + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_UPLOAD, 1); +- curl_easy_setopt_or_die(fh->write_conn, CURLOPT_INFILESIZE, -1); + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_READFUNCTION, write_data_bg); + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_READDATA, fh); + curl_easy_setopt_or_die(fh->write_conn, CURLOPT_LOW_SPEED_LIMIT, 1); diff --git a/pkgs/tools/filesystems/curlftpfs/suse-bug-955687.patch b/pkgs/tools/filesystems/curlftpfs/suse-bug-955687.patch new file mode 100644 index 00000000000..b198c586e0c --- /dev/null +++ b/pkgs/tools/filesystems/curlftpfs/suse-bug-955687.patch @@ -0,0 +1,11 @@ +--- a/ftpfs.c ++++ b/ftpfs.c +@@ -614,6 +614,8 @@ static void free_ftpfs_file(struct ftpfs + sem_destroy(&fh->data_need); + sem_destroy(&fh->data_written); + sem_destroy(&fh->ready); ++ if (fh->buf.size) { buf_free(&fh->buf); } ++ if (fh->stream_buf.size) { buf_free(&fh->stream_buf); } + free(fh); + } + -- cgit 1.4.1 From a42f67b8a29578cead5de59c9c9d6bdbc22688fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Sep 2023 10:27:43 +0000 Subject: mergerfs: 2.37.0 -> 2.37.1 --- pkgs/tools/filesystems/mergerfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index b48db16b8fd..e2e6e28e3b6 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mergerfs"; - version = "2.37.0"; + version = "2.37.1"; src = fetchFromGitHub { owner = "trapexit"; repo = pname; rev = version; - sha256 = "sha256-IJcTzEKFMSAryG44Rpwgl0toxFxNyyJyaVC8MO1Dv7M="; + sha256 = "sha256-4WowGrmFDDpmZlAVH73oiKBdgQeqEkbwZCaDSd1rAEc="; }; nativeBuildInputs = [ -- cgit 1.4.1 From 87cb7625b8fe36edcfafb59110752a1ec81a486a Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 23 Sep 2023 20:35:29 +0800 Subject: treewide: remove maintainer (#256811) --- pkgs/applications/blockchains/dcrctl/default.nix | 2 +- pkgs/applications/misc/madonctl/default.nix | 2 +- pkgs/applications/networking/drive/default.nix | 2 +- pkgs/games/harmonist/default.nix | 2 +- pkgs/servers/skydns/default.nix | 2 +- pkgs/tools/filesystems/gcsfuse/default.nix | 2 +- pkgs/tools/filesystems/go-mtpfs/default.nix | 2 +- pkgs/tools/misc/claws/default.nix | 2 +- pkgs/tools/misc/dashing/default.nix | 2 +- pkgs/tools/misc/gosu/default.nix | 2 +- pkgs/tools/misc/wakatime/default.nix | 2 +- pkgs/tools/security/hologram/default.nix | 2 +- pkgs/tools/system/jump/default.nix | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/applications/blockchains/dcrctl/default.nix b/pkgs/applications/blockchains/dcrctl/default.nix index 31e56254ee7..97f9b7767db 100644 --- a/pkgs/applications/blockchains/dcrctl/default.nix +++ b/pkgs/applications/blockchains/dcrctl/default.nix @@ -19,6 +19,6 @@ buildGoModule rec { homepage = "https://decred.org"; description = "A secure Decred wallet daemon written in Go (golang)"; license = with lib.licenses; [ isc ]; - maintainers = with lib.maintainers; [ aaronjheng ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix index df783aa36a9..0e204ea8385 100644 --- a/pkgs/applications/misc/madonctl/default.nix +++ b/pkgs/applications/misc/madonctl/default.nix @@ -32,6 +32,6 @@ buildGoModule rec { description = "CLI for the Mastodon social network API"; homepage = "https://github.com/McKael/madonctl"; license = licenses.mit; - maintainers = with maintainers; [ aaronjheng ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix index b90be9e2a55..4c7b5727fba 100644 --- a/pkgs/applications/networking/drive/default.nix +++ b/pkgs/applications/networking/drive/default.nix @@ -29,6 +29,6 @@ buildGoModule rec { homepage = "https://github.com/odeke-em/drive"; description = "Google Drive client for the commandline"; license = licenses.asl20; - maintainers = with maintainers; [ aaronjheng ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/games/harmonist/default.nix b/pkgs/games/harmonist/default.nix index c08ed624959..cbb556cbc94 100644 --- a/pkgs/games/harmonist/default.nix +++ b/pkgs/games/harmonist/default.nix @@ -25,6 +25,6 @@ buildGoModule rec { ''; homepage = "https://harmonist.tuxfamily.org/"; license = licenses.isc; - maintainers = with maintainers; [ aaronjheng ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index be9e815b9ec..2ae2efbbb75 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -29,6 +29,6 @@ buildGoModule rec { description = "A distributed service for announcement and discovery of services"; homepage = "https://github.com/skynetservices/skydns"; license = lib.licenses.mit; - maintainers = with maintainers; [ aaronjheng ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index e9cb2d8912b..0af1a965fc4 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -42,6 +42,6 @@ buildGoModule rec { homepage = "https://cloud.google.com/storage/docs/gcs-fuse"; changelog = "https://github.com/GoogleCloudPlatform/gcsfuse/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ aaronjheng ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix index 115928e4979..f82e5b7c362 100644 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -28,7 +28,7 @@ buildGoModule rec { description = "A simple FUSE filesystem for mounting Android devices as a MTP device"; homepage = "https://github.com/hanwen/go-mtpfs"; license = licenses.bsd3; - maintainers = with maintainers; [ aaronjheng ]; + maintainers = with maintainers; [ ]; broken = stdenv.isDarwin; }; } diff --git a/pkgs/tools/misc/claws/default.nix b/pkgs/tools/misc/claws/default.nix index 9d360e40c2a..5690ec74d0a 100644 --- a/pkgs/tools/misc/claws/default.nix +++ b/pkgs/tools/misc/claws/default.nix @@ -19,6 +19,6 @@ buildGoModule rec { homepage = "https://github.com/thehowl/claws"; description = "Interactive command line client for testing websocket servers"; license = licenses.mit; - maintainers = with maintainers; [ aaronjheng ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix index 4b960c3fa54..7a1541b7e94 100644 --- a/pkgs/tools/misc/dashing/default.nix +++ b/pkgs/tools/misc/dashing/default.nix @@ -23,6 +23,6 @@ buildGoModule rec { description = "A Dash Generator Script for Any HTML"; homepage = "https://github.com/technosophos/dashing"; license = licenses.mit; - maintainers = with maintainers; [ aaronjheng ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix index df42c6ea949..6f08e027d8f 100644 --- a/pkgs/tools/misc/gosu/default.nix +++ b/pkgs/tools/misc/gosu/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { description = "Tool that avoids TTY and signal-forwarding behavior of sudo and su"; homepage = "https://github.com/tianon/gosu"; license = licenses.asl20; - maintainers = with maintainers; [ aaronjheng ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index bf0e9657296..2ce8df19867 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -47,7 +47,7 @@ buildGoModule rec { homepage = "https://wakatime.com/"; description = "WakaTime command line interface"; license = licenses.bsd3; - maintainers = with maintainers; [ aaronjheng ]; + maintainers = with maintainers; [ ]; mainProgram = "wakatime-cli"; }; } diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index 1a7e45c8024..86bc4293747 100644 --- a/pkgs/tools/security/hologram/default.nix +++ b/pkgs/tools/security/hologram/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/AdRoll/hologram/"; description = "Easy, painless AWS credentials on developer laptops"; - maintainers = with maintainers; [ aaronjheng ]; + maintainers = with maintainers; [ ]; license = licenses.asl20; }; } diff --git a/pkgs/tools/system/jump/default.nix b/pkgs/tools/system/jump/default.nix index c1e625e14c1..3ff64996d01 100644 --- a/pkgs/tools/system/jump/default.nix +++ b/pkgs/tools/system/jump/default.nix @@ -30,6 +30,6 @@ buildGoModule rec { ''; homepage = "https://github.com/gsamokovarov/jump"; license = licenses.mit; - maintainers = with maintainers; [ aaronjheng ]; + maintainers = with maintainers; [ ]; }; } -- cgit 1.4.1 From 943da8b1a78bc1701666d9c6b34e555af4ac04b1 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 23 Sep 2023 13:23:54 +0200 Subject: erofs-utils: 1.6 -> 1.7 Fixes CVE-2023-33552 and CVE-2023-33551. Changelog: https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/ChangeLog?h=v1.7 --- pkgs/tools/filesystems/erofs-utils/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/tools/filesystems') diff --git a/pkgs/tools/filesystems/erofs-utils/default.nix b/pkgs/tools/filesystems/erofs-utils/default.nix index a10addbfa51..163439c903e 100644 --- a/pkgs/tools/filesystems/erofs-utils/default.nix +++ b/pkgs/tools/filesystems/erofs-utils/default.nix @@ -1,20 +1,20 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, util-linux, lz4 +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, util-linux, lz4, zlib , fuseSupport ? stdenv.isLinux }: stdenv.mkDerivation rec { pname = "erofs-utils"; - version = "1.6"; + version = "1.7"; outputs = [ "out" "man" ]; src = fetchurl { url = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${version}.tar.gz"; - sha256 = "sha256-2/Gtrv8buFMrKacsip4ZGTjJOJlGdw3HY9PFnm8yBXE="; + hash = "sha256-tutSm7Qj6y3XecnanCYyhVSItLkeI1U6Mc4j8Rycziw="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ util-linux lz4 ] + buildInputs = [ util-linux lz4 zlib ] ++ lib.optionals fuseSupport [ fuse ]; configureFlags = lib.optionals fuseSupport [ "--enable-fuse" ]; -- cgit 1.4.1