diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-21 18:00:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-21 18:00:53 +0000 |
| commit | 25421963c797b02308d2e08d6e7b58c11d1dd40e (patch) | |
| tree | 09a32951a13bdd0aed7041efd6e121298ac7455f /pkgs | |
| parent | 4c610adf95276c9c810b715121bd24ad453dc77a (diff) | |
| parent | e12483116b3b51a185a33a272bf351e357ba9a99 (diff) | |
| download | nixpkgs-25421963c797b02308d2e08d6e7b58c11d1dd40e.tar nixpkgs-25421963c797b02308d2e08d6e7b58c11d1dd40e.tar.gz nixpkgs-25421963c797b02308d2e08d6e7b58c11d1dd40e.tar.bz2 nixpkgs-25421963c797b02308d2e08d6e7b58c11d1dd40e.tar.lz nixpkgs-25421963c797b02308d2e08d6e7b58c11d1dd40e.tar.xz nixpkgs-25421963c797b02308d2e08d6e7b58c11d1dd40e.tar.zst nixpkgs-25421963c797b02308d2e08d6e7b58c11d1dd40e.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs')
202 files changed, 563 insertions, 385 deletions
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/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index ad245ba05d9..f7527096f17 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "152vr796sa1gq62zp3grcr3ywg4b4z233cvwm3s2jhi2nzra26vq"; - x86_64-darwin = "0zk4nf8zyj6vq7yqnidjqgidrj1nq7rri9y2d4aay44kanm3v03f"; - aarch64-linux = "0bprcnd93h13x5d2hzfgpa9yyda3x0zi3w0rfwhi2rbyzlr7vzhf"; - aarch64-darwin = "0rwdknqdhgf3fby1i0gz6hha1vnxfk2dwrpn75g0ra21m11b5b4g"; - armv7l-linux = "0ck2bxhy3k239ici3y2xsc8kwa8bsfn8ywh1p4lh2dkc91liisnq"; + x86_64-linux = "1xzmfvkzqfxblahi2pc54fr7i6rynqm76p4wpbfzxrrh5a3xjwn3"; + x86_64-darwin = "0lp6yqwqwfngl98nba8f77yypb44cfn7kcjhbc93s8kqd57m97zj"; + aarch64-linux = "1hpwjdbfc8l4a7ln50s6h68abcb6djcc5y0h686s9k5v2axm7f3v"; + aarch64-darwin = "0cbms9p8g2gjx9wmm78fzlscw62qasjv30al8v39bda3k694wnh5"; + armv7l-linux = "0hvaray6b36j8s0fvffnkbsw7kf2rn2z4y8q4wlnqx3hfyalcvcn"; }.${system} or throwSystem; sourceRoot = lib.optionalString (!stdenv.isDarwin) "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.82.1.23255"; + version = "1.82.2.23257"; pname = "vscodium"; executableName = "codium"; 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 <https://github.com/NixOS/nixpkgs/pull/87383#issuecomment-633204382> # and <https://github.com/NixOS/nixpkgs/blob/d4226e3a4b5fcf988027147164e86665d382bbfa/pkgs/development/go-modules/generic/default.nix#L18> - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix b/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix index abd18f8eac9..0798aadf2f7 100644 --- a/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix +++ b/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprland-autoname-workspaces"; - version = "1.1.10"; + version = "1.1.11"; src = fetchFromGitHub { owner = "hyprland-community"; repo = "hyprland-autoname-workspaces"; rev = version; - hash = "sha256-I0ELCexJxZgbTLzO4GtvOtaIghzVND8kgOFmlQ0oca8="; + hash = "sha256-x9MXp2MZtrnVI3W+6xo34uUHuRnpVeXS+3vbyti1p24="; }; - cargoHash = "sha256-MmWYsYRxrcEtL+efK1yCzq5b+PsrsrG1flSXn2kGdYs="; + cargoHash = "sha256-mSUtFZvq5+rumefJ6I9C6YzRzu64oJ/bTwaa+rrFlL4="; meta = with lib; { description = "Automatically rename workspaces with icons of started applications"; 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/nwg-panel/default.nix b/pkgs/applications/misc/nwg-panel/default.nix index 35db52a1ae7..a4d333e594c 100644 --- a/pkgs/applications/misc/nwg-panel/default.nix +++ b/pkgs/applications/misc/nwg-panel/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.9.12"; + version = "0.9.13"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; rev = "v${version}"; - hash = "sha256-lCo58v2UGolFagci2xHcieTUvqNc1KKNj3Z92oG5WPI="; + hash = "sha256-dP/FbMrjPextwedQeLJHM6f/a+EuZ+hQSLrH/rF2XOg="; }; # No tests diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix index 2b14079ae60..7ce8b03c08b 100644 --- a/pkgs/applications/misc/perkeep/default.nix +++ b/pkgs/applications/misc/perkeep/default.nix @@ -3,12 +3,12 @@ let gouiJS = fetchurl { url = "https://storage.googleapis.com/perkeep-release/gopherjs/goui.js"; - sha256 = "0xbkdpd900gnmzj8p0x38dn4sv170pdvgzcvzsq70s80p6ykkh6g"; + hash = "sha256-z8A5vbkAaXCw/pv9t9sFJ2xNbEOjg4vkr/YBkNptc3U="; }; publisherJS = fetchurl { url = "https://storage.googleapis.com/perkeep-release/gopherjs/publisher.js"; - sha256 = "09hd7p0xscqnh612jbrjvh3njmlm4292zd5sbqx2lg0aw688q8p2"; + hash = "sha256-4iKMkOEKPCo6Xrq0L5IglVZpB9wyLymCgRYz3cE9DSY="; }; packages = [ @@ -19,7 +19,8 @@ let "perkeep.org/cmd/pk-mount" ]; -in buildGoModule rec { +in +buildGoModule rec { pname = "perkeep"; version = "0.11"; @@ -27,10 +28,10 @@ in buildGoModule rec { owner = "perkeep"; repo = "perkeep"; rev = version; - sha256 = "07j5gplk4kcrbazyg4m4bwggzlz5gk89h90r14jvfcpms7v5nrll"; + hash = "sha256-lGZb9tH1MrclCRkkmNB85dP/Hl+kkue/WplNMul9RR4="; }; - vendorSha256 = "1af9a6r9qfrak0n5xyv9z8n7gn7xw2sdjn4s9bwwidkrdm81iq6b"; + vendorHash = "sha256-y+AYUG15tsj5SppY2bTg/dh3LPpp+14smCo7nLJRyak="; deleteVendor = true; # Vendor is out of sync with go.mod buildPhase = '' diff --git a/pkgs/applications/misc/sampler/default.nix b/pkgs/applications/misc/sampler/default.nix index bea22977097..e5e090e7da4 100644 --- a/pkgs/applications/misc/sampler/default.nix +++ b/pkgs/applications/misc/sampler/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch, darwin, libiconv, alsa-lib, stdenv }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, darwin, alsa-lib, stdenv }: buildGoModule rec { pname = "sampler"; @@ -8,18 +8,18 @@ buildGoModule rec { owner = "sqshq"; repo = pname; rev = "v${version}"; - sha256 = "1lanighxhnn28dfzils7i55zgxbw2abd6y723mq7x9wg1aa2bd0z"; + hash = "sha256-H7QllAqPp35wHeJ405YSfPX3S4lH0/hdQ8Ja2OGLVtE="; }; patches = [ # fix build with go 1.17 (fetchpatch { url = "https://github.com/sqshq/sampler/commit/97a4a0ebe396a780d62f50f112a99b27044e832b.patch"; - sha256 = "1czns7jc85mzdf1mg874jimls8x32l35x3lysxfgfah7cvvwznbk"; + hash = "sha256-c9nP92YHKvdc156OXgYVoyNNa5TkoFeDa78WxOTR9rM="; }) ]; - vendorSha256 = "02cfzqadpsk2vkzsp7ciji9wisjza0yp35pw42q44navhbzcb4ji"; + vendorHash = "sha256-UZLF/oJbWUKwIPyWcT1QX+rIU5SRnav/3GLq2xT+jgk="; doCheck = false; 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/terminal-parrot/default.nix b/pkgs/applications/misc/terminal-parrot/default.nix index b44b4bd0a70..f0b4d20b1a7 100644 --- a/pkgs/applications/misc/terminal-parrot/default.nix +++ b/pkgs/applications/misc/terminal-parrot/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "jmhobbs"; repo = "terminal-parrot"; rev = version; - sha256 = "1b4vr4s1zpkpf5kc1r2kdlp3hf88qp1f7h05g8kd62zf4sfbj722"; + hash = "sha256-Qhy5nCbuC9MmegXA48LFCDk4Lm1T5MBmcXfeHzTJm6w="; }; - vendorSha256 = "1qalnhhq3fmyzj0hkzc5gk9wbypr558mz3ik5msw7fid68k2i48c"; + vendorHash = "sha256-DJEoJjItusN1LTOOX1Ep+frF03yF/QmB/L66gSG0VOE="; doCheck = false; diff --git a/pkgs/applications/misc/timew-sync-server/default.nix b/pkgs/applications/misc/timew-sync-server/default.nix index 8fb6bb3a104..04c9cfad1af 100644 --- a/pkgs/applications/misc/timew-sync-server/default.nix +++ b/pkgs/applications/misc/timew-sync-server/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "timewarrior-synchronize"; repo = pname; rev = "v${version}"; - sha256 = "GaDcnPJBcDJ3AQaHzifDgdl0QT4GSbAOIqp4RrAcO3M="; + hash = "sha256-GaDcnPJBcDJ3AQaHzifDgdl0QT4GSbAOIqp4RrAcO3M="; }; - vendorSha256 = "iROqiRWkHG6N6kivUmgmu6sg14JDdG4f98BdR7CL1gs="; + vendorHash = "sha256-iROqiRWkHG6N6kivUmgmu6sg14JDdG4f98BdR7CL1gs="; meta = with lib; { homepage = "https://github.com/timewarrior-synchronize/timew-sync-server"; 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/cluster/prow/default.nix b/pkgs/applications/networking/cluster/prow/default.nix index b1ea88a11a3..9c8b311cf7c 100644 --- a/pkgs/applications/networking/cluster/prow/default.nix +++ b/pkgs/applications/networking/cluster/prow/default.nix @@ -10,10 +10,10 @@ buildGoModule rec { owner = "kubernetes"; repo = "test-infra"; - sha256 = "0mc3ynmbf3kidibdy8k3v3xjlvmxl8w7zm1z2m0skmhd0y4bpmk4"; + hash = "sha256-ZNa7iAcN1qlBFT/UfziivW4q+9hjIt9WbHEOt6r1g1U="; }; - vendorSha256 = "16fdc5r28andm8my4fxj0f1yygx6j2mvn92i6xdfhbcra0lvr4ql"; + vendorHash = "sha256-FJO8KVCZLehaN1Eku6uQpj/vgwOyO+Irqs0qJHJhzZk="; doCheck = false; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index a00717801ab..83544b7f9a2 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnscontrol"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OxZH8dUl7PEzcan9Jl1rwPpP0+pj4jzLydEQfxxWM+o="; + sha256 = "sha256-+4TQAtqM1ruhv3W1SBHAd1WVJKa7dvGLHlxVqazc+uk="; }; vendorHash = "sha256-3aGdn6Gp+N/a+o9dl4h0oIOnYhtu4oZuBF6X/HKjQOI="; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 8a3e30a99dd..d5b617d6f79 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,12 +1,12 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.30.2"; - hash = "sha256-qz3eO+pTLK0J+XjAccrZIJdyoU1zyYyrnpQKeLRZvc8="; + version = "6.31.0"; + hash = "sha256-JYufuFbIYUR3F+MHGZjmDtwTHPDhWLTkjCDDz+8hDrQ="; }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.31.0-beta.1"; - hash = "sha256-j3DY+FY7kVVGvVuVZw/JxIpwxtgBttSyWcRaa9MCSjE="; + version = "6.32.0-beta.1"; + hash = "sha256-7G4vjnEQnYOIVwXmBt1yZULvDaWXWTDgZCLWCZUq2Gs="; }; } 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/instant-messengers/webcord/default.nix b/pkgs/applications/networking/instant-messengers/webcord/default.nix index f4ae642c79e..6417153c093 100644 --- a/pkgs/applications/networking/instant-messengers/webcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/webcord/default.nix @@ -13,16 +13,16 @@ buildNpmPackage rec { pname = "webcord"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "SpacingBat3"; repo = "WebCord"; rev = "v${version}"; - hash = "sha256-Kiw3pebjH9Pz5oi6Gbjxrjd/kvozapLNqfWLVuTXF/I="; + hash = "sha256-g9UJANYs5IlKAeRc27oNOfdD3uD3nrG5Ecp+AbbsXLE="; }; - npmDepsHash = "sha256-CPGfhV8VXbpX9UB5oQhI+IwFWPgYq2dGnSuyByMNGg4="; + npmDepsHash = "sha256-SSlSLZs97LDtL7OyfCtEGZjDVfsn5KKUgRNyL8J5M5g="; nativeBuildInputs = [ copyDesktopItems 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/networking/mailreaders/hasmail/default.nix b/pkgs/applications/networking/mailreaders/hasmail/default.nix index d750937c3ee..cc2f5c91921 100644 --- a/pkgs/applications/networking/mailreaders/hasmail/default.nix +++ b/pkgs/applications/networking/mailreaders/hasmail/default.nix @@ -15,10 +15,10 @@ buildGoModule rec { owner = "jonhoo"; repo = "hasmail"; rev = "eb52536d26815383bfe5990cd5ace8bb9d036c8d"; - sha256 = "1p6kwa5xk1mb1fkkxz1b5rcyp5kb4zc8nfif1gk6fab6wbdj9ia1"; + hash = "sha256-QcUk2+JmKWfmCy46i9gna5brWS4r/D6nC6uG2Yvi09w="; }; - vendorSha256 = "129hvr8qh5mxj6mzg7793p5jsi4jmsm96f63j7r8wn544yq8sqci"; + vendorHash = "sha256-kWGNsCekWI7ykcM4k6qukkQtyx3pnPerkb0WiFHeMIk="; doCheck = false; diff --git a/pkgs/applications/networking/mullvad/libwg.nix b/pkgs/applications/networking/mullvad/libwg.nix index 0ed9599963e..2f852e3a25b 100644 --- a/pkgs/applications/networking/mullvad/libwg.nix +++ b/pkgs/applications/networking/mullvad/libwg.nix @@ -1,6 +1,5 @@ { lib , buildGoModule -, fetchFromGitHub , mullvad }: buildGoModule { @@ -13,7 +12,7 @@ buildGoModule { sourceRoot = "${mullvad.src.name}/wireguard/libwg"; - vendorSha256 = "QNde5BqkSuqp3VJQOhn7aG6XknRDZQ62PE3WGhEJ5LU="; + vendorHash = "sha256-QNde5BqkSuqp3VJQOhn7aG6XknRDZQ62PE3WGhEJ5LU="; # XXX: hack to make the ar archive go to the correct place # This is necessary because passing `-o ...` to `ldflags` does not work diff --git a/pkgs/applications/networking/twingate/default.nix b/pkgs/applications/networking/twingate/default.nix index 09b3000c875..86349576d44 100644 --- a/pkgs/applications/networking/twingate/default.nix +++ b/pkgs/applications/networking/twingate/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "twingate"; - version = "2023.227.93197"; + version = "2023.250.97595"; src = fetchurl { url = "https://binaries.twingate.com/client/linux/DEB/x86_64/${version}/twingate-amd64.deb"; - hash = "sha256-YV56U+RXpTOJvyufVKtTY1c460//ZJcifq2XroTQLXU="; + hash = "sha256-JTkyJLbcAEcmftPKejMnxwIY+ICkaFar2fahKeXk3fs="; }; buildInputs = [ diff --git a/pkgs/applications/networking/versus/default.nix b/pkgs/applications/networking/versus/default.nix index 1e3dd211326..57b14ed54c7 100644 --- a/pkgs/applications/networking/versus/default.nix +++ b/pkgs/applications/networking/versus/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "INFURA"; repo = pname; rev = "v${version}"; - sha256 = "0j5mj9gwwvgx7r1svlg14dpcqlj8mhwlf7sampkkih6bv92qfzcd"; + hash = "sha256-jX2HRdrLwDjnrUofRzmsSFLMbiPh0a1DPv1tzl+StUg="; }; - vendorSha256 = "1d12jcd8crxcgp5m8ga691wivim4cg8cbz4pzgxp0jhzg9jplpbv"; + vendorHash = "sha256-e116ZXofSnD7+5f8xdBjpMYdeUhGPVTLfaxnhhqTIrQ="; meta = with lib; { description = "Benchmark multiple API endpoints against each other"; diff --git a/pkgs/applications/radio/kappanhang/default.nix b/pkgs/applications/radio/kappanhang/default.nix index 9146bfd781c..41037c50921 100644 --- a/pkgs/applications/radio/kappanhang/default.nix +++ b/pkgs/applications/radio/kappanhang/default.nix @@ -8,14 +8,14 @@ buildGoModule rec { owner = "nonoo"; repo = pname; rev = "v${version}"; - sha256 = "1ycy8avq5s7zspfi0d9klqcwwkpmcaz742cigd7pmcnbbhspcicp"; + hash = "sha256-l0V2NVzLsnpPe5EJcr5i9U7OGaYzNRDd1f/ogrdCnvk="; }; + vendorHash = "sha256-CnZTUP2JBbhG8VUHbVX+vicfQJC9Y8endlwQHdmzMus="; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pulseaudio ]; - vendorSha256 = "1srjngcis42wfskwfqxxj101y9xyzrans1smy53bh1c9zm856xha"; - meta = with lib; { homepage = "https://github.com/nonoo/kappanhang"; description = "Remote control for Icom radio transceivers"; diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 23f059ed9a9..98934dc2ec4 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -102,6 +102,8 @@ stdenv.mkDerivation { hash = "sha256-jn/S0xjxZPnkGYpTRIpL3dKxGe7+Z+EmOGHiE0UkQqg="; }; + separateDebugInfo = true; + depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/applications/version-management/gg/default.nix b/pkgs/applications/version-management/gg/default.nix index b94fea8da85..ea701c6f07b 100644 --- a/pkgs/applications/version-management/gg/default.nix +++ b/pkgs/applications/version-management/gg/default.nix @@ -20,7 +20,7 @@ in buildGoModule { owner = "gg-scm"; repo = "gg"; rev = "v${version}"; - sha256 = "e628aeddb94d2470de860df09ef65499f8c5493fb336bf3df8502842ee02487f"; + hash = "sha256-5iiu3blNJHDehg3wnvZUmfjFST+zNr89+FAoQu4CSH8="; }; postPatch = '' substituteInPlace cmd/gg/editor_unix.go \ @@ -33,7 +33,7 @@ in buildGoModule { "-X" "main.buildCommit=${commit}" ]; - vendorSha256 = "214dc073dad7b323ea449acf24c5b578d573432eeaa1506cf5761a2d7f5ce405"; + vendorHash = "sha256-IU3Ac9rXsyPqRJrPJMW1eNVzQy7qoVBs9XYaLX9c5AU="; nativeBuildInputs = [ pandoc installShellFiles makeWrapper ]; nativeCheckInputs = [ bash coreutils git ]; 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/git-subtrac/default.nix b/pkgs/applications/version-management/git-subtrac/default.nix index 4e9c3b7a5cc..c10a2710249 100644 --- a/pkgs/applications/version-management/git-subtrac/default.nix +++ b/pkgs/applications/version-management/git-subtrac/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "apenwarr"; repo = pname; rev = "v${version}"; - sha256 = "0p1n29k2a2rpznwxlwzkmx38ic6g041k9vx7msvick7cydn417fx"; + hash = "sha256-3Z1AbPPsTBa3rqfvNAMBz7CIRq/zc9q5/TcLJWYSNlw="; }; - vendorSha256 = "0m64grnmhjvfsw7a56474s894sgd24rvcp5kamhzzyc4q556hqny"; + vendorHash = "sha256-3mJoSsGE+f9hVbNctjMR7WmSkCaHmKIO125LWG1+xFQ="; doCheck = false; 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/version-management/gst/default.nix b/pkgs/applications/version-management/gst/default.nix index f0f347d14ca..bf7abf12d7b 100644 --- a/pkgs/applications/version-management/gst/default.nix +++ b/pkgs/applications/version-management/gst/default.nix @@ -13,10 +13,10 @@ buildGoModule rec { owner = "uetchy"; repo = "gst"; rev = "v${version}"; - sha256 = "07cixz5wlzzb4cwcrncg2mz502wlhd3awql5js1glw9f6qfwc5in"; + hash = "sha256-NhbGHTYucfqCloVirkaDlAtQfhWP2cw4I+t/ysvvkR0="; }; - vendorSha256 = "0k5xl55vzpl64gwsgaff92jismpx6y7l2ia0kx7gamd1vklf0qwh"; + vendorHash = "sha256-kGPg6NyhVfVOn0BFQY83/VYdpUjOqaf5I4bev0uhvUw="; doCheck = false; diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index 62c4e8bf9aa..8b928e7085b 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -13,6 +13,7 @@ lib.recurseIntoAttrs inhibit-gnome = callPackage ./inhibit-gnome.nix { }; mpris = callPackage ./mpris.nix { }; mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { }; + mpv-webm = callPackage ./mpv-webm.nix { }; mpvacious = callPackage ./mpvacious.nix { }; quality-menu = callPackage ./quality-menu.nix { }; simple-mpv-webui = callPackage ./simple-mpv-webui.nix { }; diff --git a/pkgs/applications/video/mpv/scripts/mpv-webm.nix b/pkgs/applications/video/mpv/scripts/mpv-webm.nix new file mode 100644 index 00000000000..983003d79d7 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/mpv-webm.nix @@ -0,0 +1,36 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, luaPackages +}: + +stdenvNoCC.mkDerivation { + pname = "mpv-webm"; + version = "unstable-2023-02-23"; + + src = fetchFromGitHub { + owner = "ekisu"; + repo = "mpv-webm"; + rev = "a18375932e39e9b2a40d9c7ab52ea367b41e2558"; + hash = "sha256-aetkQ1gU/6Yys5FJS/N06ED9tCSvL6BAgUGdNmNmpbU="; + }; + + nativeBuildInputs = [ luaPackages.moonscript ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/mpv/scripts + install -m 644 build/webm.lua $out/share/mpv/scripts/ + runHook postInstall + ''; + + passthru.scriptName = "webm.lua"; + + meta = with lib; { + description = "Simple WebM maker for mpv, with no external dependencies"; + homepage = "https://github.com/ekisu/mpv-webm"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ pbsds ]; + }; +} diff --git a/pkgs/applications/video/prism/default.nix b/pkgs/applications/video/prism/default.nix index 8cb6153b811..8fa0c7b0376 100644 --- a/pkgs/applications/video/prism/default.nix +++ b/pkgs/applications/video/prism/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "prism"; @@ -8,10 +8,10 @@ buildGoModule rec { owner = "muesli"; repo = pname; rev = "v${version}"; - sha256 = "0q7q7aj3fm45bnx6hgl9c1ll8na16x6p7qapr0c4a6dhxwd7n511"; + hash = "sha256-IRR7Gu+wGUUYyFfhc003QVlEaWCJPmi6XYVUN6Q6+GA="; }; - vendorSha256 = "1mkd1s9zgzy9agy2rjjk8wfdga7nzv9cmwgiarfi4xrqzj4mbaxq"; + vendorHash = "sha256-uKtVifw4dxJdVvHxytL+9qjXHEdTyiz8U8n/95MObdY="; meta = with lib; { description = "An RTMP stream recaster/splitter"; 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/by-name/st/static-server/package.nix b/pkgs/by-name/st/static-server/package.nix new file mode 100644 index 00000000000..3a5f0748f96 --- /dev/null +++ b/pkgs/by-name/st/static-server/package.nix @@ -0,0 +1,56 @@ +{ lib +, buildGo121Module +, fetchFromGitHub +, curl +, stdenv +, testers +, static-server +, substituteAll +}: + +buildGo121Module rec { + pname = "static-server"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "eliben"; + repo = "static-server"; + rev = "v${version}"; + hash = "sha256-AZcNh/kF6IdAceA7qe+nhRlwU4yGh19av/S1Zt7iKIs="; + }; + + vendorHash = "sha256-1p3dCLLo+MTPxf/Y3zjxTagUi+tq7nZSj4ZB/aakJGY="; + + patches = [ + # patch out debug.ReadBuidlInfo since version information is not available with buildGoModule + (substituteAll { + src = ./version.patch; + inherit version; + }) + ]; + + nativeCheckInputs = [ + curl + ]; + + ldflags = [ "-s" "-w" ]; + + # tests sometimes fail with SIGQUIT on darwin + doCheck = !stdenv.isDarwin; + + passthru.tests = { + version = testers.testVersion { + package = static-server; + }; + }; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = "A simple, zero-configuration HTTP server CLI for serving static files"; + homepage = "https://github.com/eliben/static-server"; + license = licenses.unlicense; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "static-server"; + }; +} diff --git a/pkgs/by-name/st/static-server/version.patch b/pkgs/by-name/st/static-server/version.patch new file mode 100644 index 00000000000..c92d7e482ed --- /dev/null +++ b/pkgs/by-name/st/static-server/version.patch @@ -0,0 +1,23 @@ +--- a/internal/server/server.go ++++ b/internal/server/server.go +@@ -15,7 +15,6 @@ import ( + "net" + "net/http" + "os" +- "runtime/debug" + "strings" + ) + +@@ -50,11 +49,7 @@ func Main() int { + flags.Parse(os.Args[1:]) + + if *versionFlag { +- if buildInfo, ok := debug.ReadBuildInfo(); ok { +- fmt.Printf("%v %v\n", programName, buildInfo.Main.Version) +- } else { +- errorLog.Printf("version info unavailable! run 'go version -m %v'", programName) +- } ++ fmt.Printf("%v %v\n", programName, "@version@") + os.Exit(0) + } + diff --git a/pkgs/by-name/tm/tmuxifier/package.nix b/pkgs/by-name/tm/tmuxifier/package.nix new file mode 100644 index 00000000000..ef0be1687f4 --- /dev/null +++ b/pkgs/by-name/tm/tmuxifier/package.nix @@ -0,0 +1,56 @@ +{ lib, stdenv, fetchFromGitHub, installShellFiles }: + +stdenv.mkDerivation rec { + pname = "tmuxifier"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "jimeh"; + repo = "tmuxifier"; + rev = "v${version}"; + hash = "sha256-7TvJnvtZEo5h45PcSy3tJN09UblswV0mQbTaKjgLyqw="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + sed -i "s@set -e@TMUXIFIER=$out\nTMUXIFIER_LAYOUT_PATH=\"\''${TMUXIFIER_LAYOUT_PATH:-\$HOME/.tmux-layouts}\"\nset -e@" \ + bin/tmuxifier + sed -i "s@\$TMUXIFIER/lib/@\$TMUXIFIER/lib/tmuxifier/@g" \ + bin/tmuxifier libexec/* lib/* + sed -i "s@\$TMUXIFIER/templates/@\$TMUXIFIER/share/tmuxifier/templates/@g; s@\$TMUXIFIER/init.@\$TMUXIFIER/share/tmuxifier/init/init.@g" \ + libexec/* + sed -i "s@\$TMUXIFIER/completion/tmuxifier.bash@\$TMUXIFIER/share/bash-completion/completions/tmuxifier.bash@g; s@\$TMUXIFIER/completion/tmuxifier.zsh@\$TMUXIFIER/share/zsh/site-functions/_tmuxifier@g" \ + init.sh + sed -i "s@\$TMUXIFIER/completion/tmuxifier.tcsh@\$TMUXIFIER/share/tmuxifier/completion/tmuxifier.tcsh@g" \ + init.tcsh + sed -i "s@\$TMUXIFIER/completion/tmuxifier.fish@\$TMUXIFIER/share/fish/vendor_completions.d/tmuxifier.fish@g" \ + init.fish + + install -t $out/bin -Dm555 bin/tmuxifier + install -t $out/share/tmuxifier/init -Dm444 init.fish init.sh init.tcsh + install -t $out/share/tmuxifier/templates -Dm444 templates/* + install -t $out/lib/tmuxifier -Dm444 lib/* + cp -r libexec $out + installShellCompletion --cmd tmuxifier \ + --bash completion/tmuxifier.bash \ + --fish completion/tmuxifier.fish \ + --zsh completion/tmuxifier.zsh + install -t $out/share/tmuxifier/completion -Dm444 completion/tmuxifier.tcsh + + runHook postInstall + ''; + + meta = with lib; { + description = "Powerful session, window & pane management for Tmux"; + homepage = "https://github.com/jimeh/tmuxifier"; + license = licenses.mit; + mainProgram = "tmuxifier"; + maintainers = with maintainers; [ wigust ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index e2746048575..b80f6688a7d 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -16,7 +16,6 @@ , meson , ninja , pkg-config -, python3 , vala , polkit , wrapGAppsHook @@ -38,7 +37,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 vala wrapGAppsHook ]; @@ -65,11 +63,6 @@ stdenv.mkDerivation rec { "-Dcurated=false" ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index fc69dec69a5..921fa48d81c 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-notifications"; - version = "7.0.0"; + version = "7.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-HEkuNJgG0WEOKO6upwQgXg4huA7dNyz73U1nyOjQiTs="; + sha256 = "sha256-vm+wMHyWWtOWM0JyiesfpzC/EmkTNbprXaBgVUDQvDg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/lunarml/default.nix b/pkgs/development/compilers/lunarml/default.nix index d520328443b..104b7ce688b 100644 --- a/pkgs/development/compilers/lunarml/default.nix +++ b/pkgs/development/compilers/lunarml/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation { pname = "lunarml"; - version = "unstable-2023-09-16"; + version = "unstable-2023-09-21"; src = fetchFromGitHub { owner = "minoki"; repo = "LunarML"; - rev = "0fe97ebed71d6aa24c9e80436d45af1b3ef6abd3"; - sha256 = "KSLQva4Lv+hZWrx2cMbLOj82ldodiGn/9j8ksB1FN+s="; + rev = "c6e23ae68149bda550ddb75c0df9f422aa379b3a"; + sha256 = "DY4gOCXfGV1OVdGXd6GGvbHlQdWWxMg5TZzkceeOu9o="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/interpreters/elixir/1.15.nix b/pkgs/development/interpreters/elixir/1.15.nix index a37c413e872..77663266225 100644 --- a/pkgs/development/interpreters/elixir/1.15.nix +++ b/pkgs/development/interpreters/elixir/1.15.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation { - version = "1.15.5"; - sha256 = "sha256-2M1xen5gwmtOu4ug0XkxYke6h+Bw89JkpQGMDhbtNa0="; + version = "1.15.6"; + sha256 = "sha256-eRwyqylldsJOsGAwm61m7jX1yrVDrTPS0qO23lJkcKc="; # https://hexdocs.pm/elixir/1.15.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp minimumOTPVersion = "24"; escriptPath = "lib/elixir/scripts/generate_app.escript"; 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/libraries/libspelling/default.nix b/pkgs/development/libraries/libspelling/default.nix index 32c1af55a37..812dddcc4a1 100644 --- a/pkgs/development/libraries/libspelling/default.nix +++ b/pkgs/development/libraries/libspelling/default.nix @@ -12,11 +12,12 @@ , gtksourceview5 , enchant , icu +, nix-update-script }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libspelling"; - version = "unstable-2023-07-17"; + version = "0.2.0"; outputs = [ "out" "dev" "devdoc" ]; @@ -24,8 +25,8 @@ stdenv.mkDerivation { domain = "gitlab.gnome.org"; owner = "chergert"; repo = "libspelling"; - rev = "65185023db95ec464970aeaeab766fe3ba26ae7d"; - hash = "sha256-R3nPs16y8XGamQvMSF7wb52h0jxt17H2FZPwauLDI/c="; + rev = version; + hash = "sha256-OOSQgdtnEx6/5yKwavCGdY/5L0Mr3XW0Srmd42ZTdUk="; }; nativeBuildInputs = [ @@ -50,10 +51,13 @@ stdenv.mkDerivation { moveToOutput "share/doc" "$devdoc" ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Spellcheck library for GTK 4"; homepage = "https://gitlab.gnome.org/chergert/libspelling"; license = licenses.lgpl21Plus; + changelog = "https://gitlab.gnome.org/chergert/libspelling/-/raw/${version}/NEWS"; maintainers = with maintainers; [ chuangzhu ]; }; } diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix index 5b04c168cf3..1a5bacad59f 100644 --- a/pkgs/development/libraries/packr/default.nix +++ b/pkgs/development/libraries/packr/default.nix @@ -13,12 +13,12 @@ let p2 = buildGoModule rec { owner = "gobuffalo"; repo = "packr"; rev = "v${version}"; - sha256 = "1x78yq2yg0r82h7a67078llni85gk9nbd2ismlbqgppap7fcpyai"; + hash = "sha256-UfnL3Lnq3ocXrTqKtmyar6BoKUUHHKMOFCiD5wX26PQ="; }+"/v2"; subPackages = [ "packr2" ]; - vendorSha256 = "12yq121b0bn8z12091fyqhhz421kgx4z1nskrkvbxlhyc47bwyrp"; + vendorHash = "sha256-N3u+DmEe0r72zFPb8El/MwjyIcTehQRE+MgusIII2Is="; doCheck = false; @@ -45,12 +45,12 @@ p1 = buildGoModule rec { owner = "gobuffalo"; repo = "packr"; rev = "v${version}"; - sha256 = "1x78yq2yg0r82h7a67078llni85gk9nbd2ismlbqgppap7fcpyai"; + hash = "sha256-UfnL3Lnq3ocXrTqKtmyar6BoKUUHHKMOFCiD5wX26PQ="; }; subPackages = [ "packr" ]; - vendorSha256 = "0m3yj8ww4a16j56p8d8w0sdnyx0g2bkd8zg0l4d8vb72mvg5asga"; + vendorHash = "sha256-6mlV3q7irI0aoeB91OYSD3RvmwYcNXRNkSYowjmSflQ="; doCheck = false; diff --git a/pkgs/development/libraries/pkger/default.nix b/pkgs/development/libraries/pkger/default.nix index f2e984c8c81..073c57c013d 100644 --- a/pkgs/development/libraries/pkger/default.nix +++ b/pkgs/development/libraries/pkger/default.nix @@ -12,10 +12,10 @@ buildGoModule rec { owner = "markbates"; repo = "pkger"; rev = "v${version}"; - sha256 = "12zcvsd6bv581wwhahp1wy903495s51lw86b99cfihwmxc5qw6ww"; + hash = "sha256-nBuOC+uVw+hYSssgTkPRJZEBkufhQgU5D6jsZZre7Is="; }; - vendorSha256 = "1b9gpym6kb4hpdbrixphfh1qylmqr265jrmcd4vxb87ahvrsrvgp"; + vendorHash = "sha256-9+2s84bqoNU3aaxmWYzIuFKPA3Tw9phXu5Csaaq/L60="; doCheck = false; diff --git a/pkgs/development/python-modules/aardwolf/default.nix b/pkgs/development/python-modules/aardwolf/default.nix index 3b92fc06a91..add8b364591 100644 --- a/pkgs/development/python-modules/aardwolf/default.nix +++ b/pkgs/development/python-modules/aardwolf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "aardwolf"; - version = "0.2.7"; + version = "0.2.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,14 +33,14 @@ buildPythonPackage rec { owner = "skelsec"; repo = "aardwolf"; rev = "refs/tags/${version}"; - hash = "sha256-xz3461QgZ2tySj2cTlKQ5faYQDSECvbk1U6QCbzM86w="; + hash = "sha256-4kJsW0uwWfcgVruEdDw3QhbzfPDuLjmK+YvcLrgF4SI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${src.name}/aardwolf/utils/rlers"; name = "${pname}-${version}"; - hash = "sha256-JGXTCCyC20EuUX0pP3xSZG3qFB5jRL7+wW2YRC3EiCc="; + hash = "sha256-i7fmdWOseRQGdvdBnlGi+lgWvhC2WFI2FwXU9JywYsc="; }; cargoRoot = "aardwolf/utils/rlers"; diff --git a/pkgs/development/python-modules/amaranth-soc/default.nix b/pkgs/development/python-modules/amaranth-soc/default.nix index e90137ba22b..685d63414ec 100644 --- a/pkgs/development/python-modules/amaranth-soc/default.nix +++ b/pkgs/development/python-modules/amaranth-soc/default.nix @@ -8,15 +8,15 @@ buildPythonPackage rec { pname = "amaranth-soc"; - version = "unstable-2021-12-10"; + version = "unstable-2023-09-15"; # python setup.py --version - realVersion = "0.1.dev49+g${lib.substring 0 7 src.rev}"; + realVersion = "0.1.dev70+g${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth-soc"; - rev = "217d4ea76ad3b3bbf146980d168bc7b3b9d95a18"; - sha256 = "dMip82L7faUn16RDeG3NgMv0nougpwTwDWLX0doD2YA="; + rev = "cce8a79a37498f4d5900be21a295ba77e51e6c9d"; + sha256 = "sha256-hfkJaqICuy3iSTwLM9lbUPvSMDBLW8GdxqswyAOsowo="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix index 713f886d7df..a92e33ebe52 100644 --- a/pkgs/development/python-modules/amaranth/default.nix +++ b/pkgs/development/python-modules/amaranth/default.nix @@ -3,8 +3,8 @@ , pythonOlder , fetchFromGitHub , fetchpatch -, setuptools -, setuptools-scm +, pdm +, python3 , pyvcd , jinja2 , importlib-resources @@ -20,52 +20,27 @@ buildPythonPackage rec { pname = "amaranth"; - version = "0.3"; - # python setup.py --version - realVersion = "0.3"; - disabled = pythonOlder "3.6"; + format = "pyproject"; + # python -m setuptools_scm + version = "0.4.dev197+g${lib.substring 0 7 src.rev}"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "amaranth-lang"; repo = "amaranth"; - rev = "39a83f4d995d16364cc9b99da646ff8db6394166"; - sha256 = "P9AG3t30eGeeCN5+t7mjhRoOWIGZVzWQji9eYXphjA0="; + rev = "11d5bb19eb34463918c07dc5e2e0eac7dbf822b0"; + sha256 = "sha256-Ji5oYfF2hKSunAdAQTniv8Ajj6NE/bvW5cvadrGKa+U="; }; - patches = [ - (fetchpatch { - name = "fix-for-setuptools-64.0.2-preparation.patch"; - url = "https://github.com/amaranth-lang/amaranth/commit/64771a065a280fa683c1e6692383bec4f59f20fa.patch"; - hash = "sha256-Rsh9vVvUQj9nIcrsRirmR6XwFrfZ2VMaYJ4RCQ8sBE0="; - # This commit removes support for Python 3.6, which is unnecessary to fix - # the build when using new setuptools. Include only one file, which has a - # harmless comment change so that the subsequent patch applies cleanly. - includes = ["amaranth/_toolchain/cxx.py"]; - }) - (fetchpatch { - name = "fix-for-setuptools-64.0.2.patch"; - url = "https://github.com/amaranth-lang/amaranth/pull/722/commits/e5a56b07c568e5f4cc2603eefebd14c5cc4e13d8.patch"; - hash = "sha256-C8FyMSKHA7XsEMpO9eYNZx/X5rGaK7p3eXP+jSb6wVg="; - }) - (fetchpatch { - name = "add-python-3.11-support.patch"; - url = "https://github.com/amaranth-lang/amaranth/commit/851546bf2d16db62663d7002bece51f07078d0a5.patch"; - hash = "sha256-eetlFCLqmpCfTKViD16OScJbkql1yhdi5uJGnfnpcCE="; - }) - ]; - - SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"; - nativeBuildInputs = [ git - setuptools - setuptools-scm ]; propagatedBuildInputs = [ jinja2 + pdm pyvcd - setuptools + python3.pkgs.pdm-backend ] ++ lib.optional (pythonOlder "3.9") importlib-resources ++ lib.optional (pythonOlder "3.8") importlib-metadata; @@ -77,17 +52,6 @@ buildPythonPackage rec { yosys ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "Jinja2~=2.11" "Jinja2>=2.11" \ - --replace "pyvcd~=0.2.2" "pyvcd" \ - --replace "amaranth-yosys>=0.10.*" "amaranth-yosys>=0.10" - - # jinja2.contextfunction was removed in jinja2 v3.1 - substituteInPlace amaranth/build/plat.py \ - --replace "@jinja2.contextfunction" "@jinja2.pass_context" - ''; - pythonImportsCheck = [ "amaranth" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix index 5e84af2a53b..8ee08646d1e 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "3.1.3"; + version = "3.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Nd/9mUtEEhCiJSF677lsE5UhMrbWiIl3ktQ7FjtyYlQ="; + hash = "sha256-3dftk/C6g6Hclc/N8LlsYcZfxA1I6bMiXkzRcUg69Oc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/django-types/default.nix b/pkgs/development/python-modules/django-types/default.nix new file mode 100644 index 00000000000..71542f2f9b4 --- /dev/null +++ b/pkgs/development/python-modules/django-types/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, poetry-core +}: + +buildPythonPackage rec { + pname = "django-types"; + version = "0.17.0"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-wcQqt4h2xXxyg0LVqwYHJas3H8jcg7uFuuC+BoRqrXA="; + }; + + nativeBuildInputs = [ poetry-core ]; + + meta = with lib; { + description = "Type stubs for Django"; + homepage = "https://pypi.org/project/django-types"; + license = licenses.mit; + maintainers = with maintainers; [ thubrecht ]; + }; +} diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix index 1df4625a681..a691f3723d5 100644 --- a/pkgs/development/python-modules/fx2/default.nix +++ b/pkgs/development/python-modules/fx2/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "fx2"; - version = "0.11"; + version = "unstable-2023-09-20"; src = fetchFromGitHub { owner = "whitequark"; repo = "libfx2"; - rev = "v${version}"; - hash = "sha256-uJpXsUMFqJY7mjj1rtfc0XWEfNDxO1xXobgBDGFHnp4="; + rev = "73fa811818d56a86b82c12e07327946aeddd2b3e"; + hash = "sha256-AGQPOVTdaUCUeVVNQTBmoNvz5CGxcBOK7+oL+X8AcIw="; }; nativeBuildInputs = [ sdcc ]; diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 6d7d35d6782..1a5d935f4a8 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.15.1"; + version = "3.15.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XihIFu8TUrZgQqJ43LJVB0vCIjf89MpGfmDXS5yUuoM="; + hash = "sha256-GaGxn7Q5blqPWNWIl6pRV9lLzmGm5GGwqcyOuAWI0Ds="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/skodaconnect/default.nix b/pkgs/development/python-modules/skodaconnect/default.nix index 759f568237a..989dfbc8ee8 100644 --- a/pkgs/development/python-modules/skodaconnect/default.nix +++ b/pkgs/development/python-modules/skodaconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "skodaconnect"; - version = "1.3.6"; + version = "1.3.7"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lendy007"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gV/+mt6XxY1UcA1H8zM4pG1ugrDo0m876e3XG1yV32A="; + hash = "sha256-FJnByPP1hUs6ECuZh9aMJksq32xhPcWWolSFBzP7Zd8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 6d2cfc72c43..078d1775e0a 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "8.8.0"; + version = "8.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-fWAVTaie+6lz5cX7hg0s22kHXelIfhh5FNTfxxbUEPw="; + hash = "sha256-apdLWv4UV4MTAx+kyi/MaOibmBYjwMamaI9b6IGKIl0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/upcloud-api/default.nix b/pkgs/development/python-modules/upcloud-api/default.nix index 5c0409be372..17fec99811e 100644 --- a/pkgs/development/python-modules/upcloud-api/default.nix +++ b/pkgs/development/python-modules/upcloud-api/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "upcloud-api"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "UpCloudLtd"; repo = "upcloud-python-api"; rev = "refs/tags/v${version}"; - hash = "sha256-35vPODc/oL+JPMnStFutIRYVTUkYAXKRt/KXBW0Yc+U="; + hash = "sha256-fMsI0aZ8jA08rrNPm8HmfYz/a3HLUExvvXIeDGPh2e8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index ed411bc3a7d..19d40b4f805 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.9.0"; + version = "1.10.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9rXAFMFpKF+oIKXSFLVCLDfdpMF837xRIEe3aH7ditc="; + hash = "sha256-7LFKqC8IHzXKKU5Pw6Qud9jqJFc0lSEJFn636T6CsfQ="; }; propagatedBuildInputs = [ 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/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index 789cc3fcabe..8c9261628bf 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -4,7 +4,7 @@ assert dcompiler != null; stdenv.mkDerivation rec { pname = "dub"; - version = "1.30.0"; + version = "1.33.0"; enableParallelBuilding = true; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "dlang"; repo = "dub"; rev = "v${version}"; - sha256 = "sha256-iVl7bjblvIxvrUX7Phq6h4AIAmZjNVkGYYFA1hhsE7c="; + sha256 = "sha256-4Mha7WF6cg3DIccfpvOnheuvgfziv/7wo8iFsPXO4yY="; }; dubvar = "\\$DUB"; @@ -137,6 +137,7 @@ stdenv.mkDerivation rec { rm -r test/path-subpackage-ref rm -r test/sdl-package-simple rm -r test/dpath-variable # requires execution of dpath-variable.sh + rm -r test/use-c-sources ./test/run-unittest.sh ''; @@ -150,7 +151,7 @@ stdenv.mkDerivation rec { description = "Package and build manager for D applications and libraries"; homepage = "https://code.dlang.org/"; license = licenses.mit; - maintainers = with maintainers; [ ThomasMader ]; + maintainers = with maintainers; [ ThomasMader jtbx ]; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } 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/database/termdbms/default.nix b/pkgs/development/tools/database/termdbms/default.nix index a8c56c51dbc..4cfc905c6c1 100644 --- a/pkgs/development/tools/database/termdbms/default.nix +++ b/pkgs/development/tools/database/termdbms/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "mathaou"; repo = "termdbms"; rev = "d46e72c796e8aee0def71b8e3499b0ebe5ca3385"; - sha256 = "1c3xgidhmvlcdw7v5gcqzv27cb58f1ix8sfd4r14rfz7c8kbv37v"; + hash = "sha256-+4y9JmLnu0xCJs1p1GNwqCx2xP6YvbIPb4zuClt8fbA="; }; - vendorSha256 = "0h9aw68niizd9gs0i890g6ij13af04qgpfy1g5pskyr4ryx0gn26"; + vendorHash = "sha256-RtgHus8k+6lvecG7+zABTo0go3kgoQj0S+3HaJHhKkE="; patches = [ ./viewer.patch ]; 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/gomacro/default.nix b/pkgs/development/tools/gomacro/default.nix index e96fccd0a3b..c172945b906 100644 --- a/pkgs/development/tools/gomacro/default.nix +++ b/pkgs/development/tools/gomacro/default.nix @@ -8,11 +8,12 @@ buildGoModule rec { src = fetchFromGitHub { owner = "cosmos72"; repo = "gomacro"; - sha256 = "0ci486zqrhzvs3njn2ygaxsgjx3fn8bbj2q3sd80xvjiyjvq866g"; inherit rev; + hash = "sha256-zxiEt/RR7g5Q0wMLuRaybnT5dFfPCyvt0PvDjL9BJDI="; }; - vendorSha256 = "1ib4h57drikyy5aq4ms6vc1p29djlpjrh7xd3bgyykr9zmm2w1kx"; + vendorHash = "sha256-fQYuav0pT+/fGq0fmOWlsiVxA9tGV4JV8X7G3E6BZMU="; + subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix index a5413c6a9c0..7b57354e3ea 100644 --- a/pkgs/development/tools/gopkgs/default.nix +++ b/pkgs/development/tools/gopkgs/default.nix @@ -4,16 +4,16 @@ buildGoModule rec { pname = "gopkgs"; version = "2.1.2"; - subPackages = [ "cmd/gopkgs" ]; - src = fetchFromGitHub { rev = "v${version}"; owner = "uudashr"; repo = "gopkgs"; - sha256 = "1jak1bg6k5iasscw68ra875k59k3iqhka2ykabsd427k1j3mypln"; + hash = "sha256-ll5fhwzzCNL0UtMLNSGOY6Yyy0EqI8OZ1iqWad4KU8k="; }; - vendorSha256 = "1pwsc488ldw039by8nqpni801zry7dnf0rx4hhd73xpv2w7s8n2r"; + vendorHash = "sha256-WVikDxf79nEahKRn4Gw7Pv8AULQXW+RXGoA3ihBhmt8="; + + subPackages = [ "cmd/gopkgs" ]; doCheck = false; 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/kubeprompt/default.nix b/pkgs/development/tools/kubeprompt/default.nix index 3624a45f934..28f628389d2 100644 --- a/pkgs/development/tools/kubeprompt/default.nix +++ b/pkgs/development/tools/kubeprompt/default.nix @@ -8,17 +8,17 @@ buildGoModule rec { owner = "jlesquembre"; repo = pname; rev = version; - sha256 = "0ib61af6fwsl35gmid9jj0fp8zxgzrw4qk32r03hxzkh9g7r3kla"; + hash = "sha256-is6Rz0tw/g4HyGJMTHj+r390HZAytVhfGVRzZ5wKZkU="; }; + vendorHash = "sha256-UUMulGnqfIshN2WIejZgwrWWlywj5TpnAQ4A5/d0NCE="; + ldflags = [ "-w" "-s" "-X github.com/jlesquembre/kubeprompt/pkg/version.Version=${version}" ]; - vendorSha256 = "089lfkvyf00f05kkmr935jbrddf2c0v7m2356whqnz7ad6a2whsi"; - doCheck = false; meta = with lib; { diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/development/tools/literate-programming/Literate/default.nix index 1a71b9bc857..1aabc4c86b3 100644 --- a/pkgs/development/tools/literate-programming/Literate/default.nix +++ b/pkgs/development/tools/literate-programming/Literate/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation { buildInputs = [ ldc dub ]; + HOME = "home"; + installPhase = "install -D bin/lit $out/bin/lit"; meta = with lib; { 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/prototool/default.nix b/pkgs/development/tools/prototool/default.nix index d0f141f5240..3e7c9b0b87d 100644 --- a/pkgs/development/tools/prototool/default.nix +++ b/pkgs/development/tools/prototool/default.nix @@ -8,12 +8,12 @@ buildGoModule rec { owner = "uber"; repo = pname; rev = "v${version}"; - sha256 = "02ih9pqnziwl2k4z6c59w1p4bxmb3xki5y33pdfkxqn2467s792g"; + hash = "sha256-T6SjjyHC4j5du2P4Emcfq/ZFbuCpMPPJFJTHb/FNMAo="; }; - nativeBuildInputs = [ makeWrapper ]; + vendorHash = "sha256-W924cy6bd3V/ep3JmzUCV7iuYNukEetr90SKmLMH0j8="; - vendorSha256 = "0gyj0yrri2j4yxmyn4d4vdhaxf2p08srpjcxg9zpaxwv5rrvipav"; + nativeBuildInputs = [ makeWrapper ]; doCheck = false; 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/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 2a002feb2aa..61baa99cda7 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2023-09-11"; - cargoSha256 = "sha256-bdF88QG++8ieFLG9H6D6nR6d9GHna36HMskp6TnTA4c="; + version = "2023-09-18"; + cargoSha256 = "sha256-quX7e8Dw58pUpro3XKuY9TtrlK/gDiyvFN/Z8rxQw7Y="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-6GjjGVCn0lNlGQifjM8AqRRMzVxf/KNyQqmAl8a9HME="; + sha256 = "sha256-+d/GW4MyksvJmNoQLJMpKxApuZTVwaT+yuxxR/Cc/BE="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; 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/textql/default.nix b/pkgs/development/tools/textql/default.nix index 3a1a6bcd05d..74953d0e3fa 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "dinedal"; repo = "textql"; rev = "fca00ecc76c8d9891b195ad2c1359d39f0213604"; - sha256 = "1v1nq7q2jr7d7kimlbykmh9d73cw750ybcz7v7l091qxjsii3irm"; + hash = "sha256-NccRo5YdhwTo2eez5UE5nI3TEqzTL1rjPO1kKfDBNuw="; }; patches = [ @@ -19,7 +19,7 @@ buildGoModule rec { }) ]; - vendorSha256 = "1h77wfs3plgcsysb13jk526gnbcw2j0xbbrvc68mz6nk1mj6scgw"; + vendorHash = "sha256-/DFtZA3Tml+RYTuv1YEUnC37jChTjrC01+zRO7Tj58A="; postInstall = '' install -Dm644 -t $out/share/man/man1 ${src}/man/textql.1 diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index 5b0c4f55f31..1f3f0765db2 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "unityhub"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/unityhub-amd64-${version}.deb"; - sha256 = "sha256-R/Ehf379Vbh/fN6iJO6BKsUuGMe2ogJdlWosElR+7f8="; + sha256 = "sha256-MiehcBs+Egfen7MzkzzWxLuTrWrHkqIj1y47sPI3Y74="; }; nativeBuildInputs = [ 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/linux/bpftune/default.nix b/pkgs/os-specific/linux/bpftune/default.nix index b9daff531a5..c2fd9d3f6a5 100644 --- a/pkgs/os-specific/linux/bpftune/default.nix +++ b/pkgs/os-specific/linux/bpftune/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "bpftune"; - version = "unstable-2023-08-22"; + version = "unstable-2023-09-11"; src = fetchFromGitHub { owner = "oracle"; repo = "bpftune"; - rev = "ae3047976d6ba8c3ec7c21ec8c85b92d11c64169"; - hash = "sha256-yXfS3zrUxRlmWsXyDpPhvYDqgYFQTAZ2dlmiQp6/zVQ="; + rev = "22926812a555eac910eac0699100bac0f8776f1b"; + hash = "sha256-BflJc5lYWYFIo9LzKfb34F4V1qOI8ywVjnzOLz605DI="; }; postPatch = '' @@ -32,6 +32,8 @@ stdenv.mkDerivation rec { substituteInPlace include/bpftune/libbpftune.h \ --replace /usr/lib64/bpftune/ "$out/lib/bpftune/" \ --replace /usr/local/lib64/bpftune/ "$out/lib/bpftune/" + substituteInPlace src/libbpftune.c \ + --replace /lib/modules /run/booted-system/kernel-modules/lib/modules substituteInPlace src/Makefile sample_tuner/Makefile \ --replace 'BPF_INCLUDE := /usr/include' 'BPF_INCLUDE := ${lib.getDev libbpf}/include' \ diff --git a/pkgs/os-specific/linux/fan2go/default.nix b/pkgs/os-specific/linux/fan2go/default.nix index 48da98cf591..c7176183018 100644 --- a/pkgs/os-specific/linux/fan2go/default.nix +++ b/pkgs/os-specific/linux/fan2go/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "markusressel"; repo = pname; rev = version; - sha256 = "w2Qwu3ZmBkoA86xa7V6pnIBAbfG9mtkAHePkQjefRW8="; + hash = "sha256-w2Qwu3ZmBkoA86xa7V6pnIBAbfG9mtkAHePkQjefRW8="; }; - vendorSha256 = "6OEdl7ie0dTjXrG//Fvcg4ZyTW/mhrUievDljY2zi/4="; + vendorHash = "sha256-6OEdl7ie0dTjXrG//Fvcg4ZyTW/mhrUievDljY2zi/4="; postConfigure = '' substituteInPlace vendor/github.com/md14454/gosensors/gosensors.go \ diff --git a/pkgs/os-specific/linux/ifmetric/default.nix b/pkgs/os-specific/linux/ifmetric/default.nix index f5d55db5e41..d4672b9be21 100644 --- a/pkgs/os-specific/linux/ifmetric/default.nix +++ b/pkgs/os-specific/linux/ifmetric/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ maintainers.anna328p ]; platforms = platforms.linux; + mainProgram = "ifmetric"; }; } diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index ff54d8cfec0..0d73b00d120 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -5,8 +5,8 @@ let # ./update-zen.py zen zenVariant = { version = "6.5.4"; #zen - suffix = "zen1"; #zen - sha256 = "1s0a2706xk60k9w6dr3zx2ma8bsny1dkvv0fmsk3kd8ghyg3xswh"; #zen + suffix = "zen2"; #zen + sha256 = "0p67v2rhkf0q61cvf310nkg08dpwgmkabid71qp01ig3sdp6rcsy"; #zen isLqx = false; }; # ./update-zen.py lqx diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix index 051ad131be9..3c82cdec29f 100644 --- a/pkgs/os-specific/linux/microcode/amd.nix +++ b/pkgs/os-specific/linux/microcode/amd.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sourceRoot = "."; - buildInputs = [ libarchive ]; + nativeBuildInputs = [ libarchive ]; buildPhase = '' mkdir -p kernel/x86/microcode 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/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index 4d0c07b0bf1..147115b550e 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -24,10 +24,10 @@ buildGoModule rec { owner = "trezor"; repo = "blockbook"; rev = "v${version}"; - sha256 = "1jb195chy3kbspmv9vyg7llw6kgykkmvz3znd97mxf24f4q622jv"; + hash = "sha256-WwphMHFEuF5PavaPv+uc/k3DKT3P77Tr1WsOD1lJYck="; }; - vendorSha256 = "1w9c0qzah2f9rbjdxqajwrfkia25cwbn30gidviaid3b7ddpd7r8"; + vendorHash = "sha256-KJ92WztrtKjibvGBYRdnRag4XeZS4d7kyskJqD4GLPE="; nativeBuildInputs = [ pkg-config ]; 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/duckling-proxy/default.nix b/pkgs/servers/duckling-proxy/default.nix index 445e78234fb..b314a6b59bd 100644 --- a/pkgs/servers/duckling-proxy/default.nix +++ b/pkgs/servers/duckling-proxy/default.nix @@ -8,9 +8,10 @@ buildGoModule { owner = "LukeEmmet"; repo = "duckling-proxy"; rev = "e2bfd73a60d7afa43f13a9d420d514131fee8fd1"; - sha256 = "134hnfa4f5sb1z1j5684wmqzascsrlagx8z36i1470yggb00j4hr"; + hash = "sha256-GRIJwHrPg0NCNOOj/hTNmmn1ceUEmSLDD0sXR5SzkIw="; }; - vendorSha256 = "0wxk1a5gn9a7q2kgq11a783rl5cziipzhndgp71i365y3p1ssqyf"; + + vendorHash = "sha256-zmOtwx2+mBHDua9Z+G+MnxWaBzoqBPymwEcl+4oKs3M="; meta = with lib; { description = "Gemini proxy to access the Small Web"; 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/hasura/cli.nix b/pkgs/servers/hasura/cli.nix index 48bcfe39eab..b8ec1a92fe3 100644 --- a/pkgs/servers/hasura/cli.nix +++ b/pkgs/servers/hasura/cli.nix @@ -9,7 +9,7 @@ buildGoModule rec { subPackages = [ "cmd/hasura" ]; - vendorSha256 = "0rjh4rs92jj56il3hg8msjz0w0iv25lydnh9v1kxmvdzy1x75b2b"; + vendorHash = "sha256-S6xyevC/7dpn2Ana5mkROwIOvtQVPThoNEVKkXQmUGY="; doCheck = false; 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/http/cgiserver/default.nix b/pkgs/servers/http/cgiserver/default.nix index a9662a2916e..59092d51ad3 100644 --- a/pkgs/servers/http/cgiserver/default.nix +++ b/pkgs/servers/http/cgiserver/default.nix @@ -7,10 +7,10 @@ buildGoModule rec { src = fetchzip { url = "https://src.anomalous.eu/cgiserver/snapshot/cgiserver-${version}.tar.zst"; nativeBuildInputs = [ zstd ]; - sha256 = "14bp92sw0w6n5dzs4f7g4fcklh25nc9k0xjx4ia0gi7kn5jwx2mq"; + hash = "sha256-uIrOZbHzxAdUJF12MBOzRUA6mSPvOKJ/K9ZwwLVId5E="; }; - vendorSha256 = "00jslxzf6p8zs1wxdx3qdb919i80xv4w9ihljd40nnydasshqa4v"; + vendorHash = "sha256-mygMtVbNWwtIkxTGxMnuAMUU0mp49NZ50B9d436nWgI="; meta = with lib; { homepage = "https://src.anomalous.eu/cgiserver/about/"; diff --git a/pkgs/servers/irc/irccat/default.nix b/pkgs/servers/irc/irccat/default.nix index fdcb39af0b8..fb4b1c6c6ba 100644 --- a/pkgs/servers/irc/irccat/default.nix +++ b/pkgs/servers/irc/irccat/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "irccloud"; repo = "irccat"; rev = "v${version}"; - sha256 = "sha256-fr5x1usviJPbc4t5SpIVgV9Q6071XG8eYtyeyraddts="; + hash = "sha256-fr5x1usviJPbc4t5SpIVgV9Q6071XG8eYtyeyraddts="; }; - vendorSha256 = "030hnkwh45yqppm96yy15j82skf7wmax5xkm7j5khr1l9lrz4591"; + vendorHash = "sha256-IRXyM000ZDiLPHX20lXlx00tkCzBe5PqvdgXAvm0EAw="; meta = with lib; { homepage = "https://github.com/irccloud/irccat"; 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/mediamtx/default.nix b/pkgs/servers/mediamtx/default.nix index 850cf9e67c8..ced6aecc2b5 100644 --- a/pkgs/servers/mediamtx/default.nix +++ b/pkgs/servers/mediamtx/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mediamtx"; - version = "1.0.0"; + version = "1.0.3"; src = fetchFromGitHub { owner = "bluenviron"; repo = pname; rev = "v${version}"; - hash = "sha256-SKNCQu5uRAxKpQbceha50K4ShV7mE0VI1PGFVAlWq4Q="; + hash = "sha256-7DuQkTGBB4yL4ZxufQ6v1qm8icuCyzihgX/a94NE5lo="; }; - vendorHash = "sha256-mPnAlFHCJKXOdmKP3Ff7cQJMStKtu4Sa7iYuot5/IKE="; + vendorHash = "sha256-UBbkCOfvMHxCJa2gaxEZtFIjWNC+r+PJXHewSvkC4Uc="; # Tests need docker doCheck = false; 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/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index a171051223b..f6af24264fe 100644 --- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix @@ -7,11 +7,11 @@ buildGoModule rec { src = fetchFromGitHub { owner = "google"; repo = "dnsmasq_exporter"; - sha256 = "1i7imid981l0a9k8lqyr9igm3qkk92kid4xzadkwry4857k6mgpj"; rev = "v${version}"; + hash = "sha256-8r5q5imI+MxnU7+TFqdIc+JRX0zZY4pmUoAGlFqs8cQ="; }; - vendorSha256 = "1dqpa180pbdi2gcmp991d4cry560mx5rm5l9x065s9n9gnd38hvl"; + vendorHash = "sha256-dEM0mn3JJl0M6ImWmkuvwBSfGWkhpVvZE7GtC1BQF7c="; doCheck = false; diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix index 0a852b35ecb..99d306f9710 100644 --- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix @@ -8,12 +8,12 @@ buildGoModule rec { rev = "fd36539bd7db191b3734e17934b5f1e78e4e9829"; owner = "mxschmitt"; repo = "fritzbox_exporter"; - sha256 = "0w9gdcnfc61q6mzm95i7kphsf1rngn8rb6kz1b6knrh5d8w61p1n"; + hash = "sha256-NtxgOGoFZjvNCn+alZF9Ngen4Z0nllR/NTgY5ixrL3E="; }; - subPackages = [ "cmd/exporter" ]; + vendorHash = "sha256-VhQAEVxRJjIzFP67LUKhfGxdUbTQB7UCK8/JKwpoy0w="; - vendorSha256 = "0k6bd052pjfg5c1ba1yhni8msv3wl512vfzy2hrk49jibh8h052n"; + subPackages = [ "cmd/exporter" ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) fritzbox; }; 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/mail-exporter.nix b/pkgs/servers/monitoring/prometheus/mail-exporter.nix index 2d995ba5293..ae13becd0ae 100644 --- a/pkgs/servers/monitoring/prometheus/mail-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mail-exporter.nix @@ -8,10 +8,10 @@ buildGoModule { owner = "cherti"; repo = "mailexporter"; rev = "f5a552c736ac40ccdc0110d2e9a71619c1cd6862"; - sha256 = "0y7sg9qrd7q6g5gi65sjvw6byfmk2ph0a281wjc9cr4pd25xkciz"; + hash = "sha256-P7LZi2iXZJaY5AEJBeAVszq/DN9SFxNfeQaflnF6+ng="; }; - vendorSha256 = "1hwahk8v3qnmyn6bwk9l2zpr0k7p2w7zjzxmjwgjyx429g9rzqs0"; + vendorHash = "sha256-QOOf00uCdC8fl7V/+Q8X90yQ7xc0Tb6M9dXisdGEisM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix index 6f9e78799a0..431b029db9f 100644 --- a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix @@ -7,11 +7,11 @@ buildGoModule rec { src = fetchFromGitHub { owner = "nshttpd"; repo = "mikrotik-exporter"; - sha256 = "1vqn1f159g0l76021gifbxpjf7zjhrj807qqqn51h5413lbi6r66"; rev = "4bfa7adfef500ff621a677adfab1f7010af920d1"; + hash = "sha256-xmQTFx2BFBiKxRgfgGSG8h8nb18uviCAORS8VIILFu8="; }; - vendorSha256 = "0b244z3hly5726vwkr7vhdzzm2fi38cv1qh7nvfp3vpsxnii04md"; + vendorHash = "sha256-rRIQo+367nHdtgfisBka0Yn6f4P75Mm3Ead4CscnRCw="; doCheck = false; 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/monitoring/prometheus/openvpn-exporter.nix b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix index 735fc852998..6b03f90e58f 100644 --- a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "kumina"; repo = "openvpn_exporter"; rev = "v${version}"; - sha256 = "14m4n5918zimdnyf0yg2948jb1hp1bdf27k07j07x3yrx357i05l"; + hash = "sha256-tIB4yujZj36APGAe4doKF4YlEUnieeC8bTV+FFKxpJI="; }; - vendorSha256 = "1jgw0nnibydhcd83kp6jqkf41mhwldp8wdhqk0yjw18v9m0p7g5s"; + vendorHash = "sha256-urxzQU0bBS49mBg2jm6jHNZA3MTS3DlQY7D5Fa0F/Mk="; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix index 52589af2da7..d1418a9a248 100644 --- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "postgres_exporter"; - version = "0.13.2"; + version = "0.14.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "postgres_exporter"; rev = "v${version}"; - sha256 = "sha256-K0B6EsRCWznYf4xS+9T4HafOSUPHCNsu2ZSIVXneGyk="; + sha256 = "sha256-Y66VxzKaadTNE/84aQxgTKsr/KpXwq2W/1BOvsvyNbM="; }; - vendorHash = "sha256-0MQS42/4iImtq3yBGVCe0BwV0HiJCo7LVEAbsKltE4g="; + vendorHash = "sha256-+ly4zZFCnrWycdi/RP8L0yG5/lsGzu4VwKDlea2prio="; ldflags = let diff --git a/pkgs/servers/monitoring/prometheus/script-exporter.nix b/pkgs/servers/monitoring/prometheus/script-exporter.nix index d0806b6c5fa..5af5a5488d8 100644 --- a/pkgs/servers/monitoring/prometheus/script-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/script-exporter.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "adhocteam"; repo = pname; rev = "v${version}"; - sha256 = "t/xgRalcHxEcT1peU1ePJUItD02rQdfz1uWpXDBo6C0="; + hash = "sha256-t/xgRalcHxEcT1peU1ePJUItD02rQdfz1uWpXDBo6C0="; }; - vendorSha256 = "Hs1SNpC+t1OCcoF3FBgpVGkhR97ulq6zYhi8BQlgfVc="; + vendorHash = "sha256-Hs1SNpC+t1OCcoF3FBgpVGkhR97ulq6zYhi8BQlgfVc="; passthru.tests = { inherit (nixosTests.prometheus-exporters) script; }; diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index a6fb147e758..aa86f064240 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "jonnenauha"; repo = "prometheus_varnish_exporter"; rev = version; - sha256 = "15w2ijz621caink2imlp1666j0ih5pmlj62cbzggyb34ncl37ifn"; + hash = "sha256-1sUzKLNkLP/eX0wYSestMAJpjAmX1iimjYoFYb6Mgpc="; }; - vendorSha256 = "00i9znb1pk5jpmyhxfg9zbw935fk3c1r0qrgf868xlcf9p8x2rrz"; + vendorHash = "sha256-P2fR0U2O0Y4Mci9jkAMb05WR+PrpuQ59vbLMG5b9KQI="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/uptime-kuma/default.nix b/pkgs/servers/monitoring/uptime-kuma/default.nix index 42b39e50eab..2bebed16c73 100644 --- a/pkgs/servers/monitoring/uptime-kuma/default.nix +++ b/pkgs/servers/monitoring/uptime-kuma/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "uptime-kuma"; - version = "1.23.0"; + version = "1.23.2"; src = fetchFromGitHub { owner = "louislam"; repo = "uptime-kuma"; rev = version; - hash = "sha256-868hyugz/YJaCs4dJJ4OKHi5jx/e4ScjMBxGaNGUhe0="; + hash = "sha256-AJAnWMJDIPbZyVcz6lGMSIq/EuwL2xgj9+4jySNzUb8="; }; - npmDepsHash = "sha256-vULtoWNqvT4RW1Q1l0+9p65cZ0TZEUnhCw0/bANsjOo="; + npmDepsHash = "sha256-ABVCpJH0cS8zPNdPLlNVgAKYd1zSinS3rLJHj4hiMEY="; patches = [ # Fixes the permissions of the database being not set correctly diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix index dd948b8b1c4..87066485417 100644 --- a/pkgs/servers/nsq/default.nix +++ b/pkgs/servers/nsq/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "nsqio"; repo = "nsq"; rev = "v${version}"; - sha256 = "0ajqjwfn06zsmz21z9mkl4cblarypaf20228pqcd1293zl6y3ry8"; + hash = "sha256-yOfhDf0jidAYvkgIIJy6Piu6GKGzph/Er/obYB2XWCo="; }; - vendorSha256 = "11sx96zshaciqrm8rqmhz1sf6nd4lczqwiha031xyyifvmpp2hsa"; + vendorHash = "sha256-SkNxb90uet/DAApGjj+jpFnjdPiw4oxqxpEpqL9JXYc="; excludedPackages = [ "bench" ]; 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/readarr/default.nix b/pkgs/servers/readarr/default.nix index 609d0cacddf..82d86bea10e 100644 --- a/pkgs/servers/readarr/default.nix +++ b/pkgs/servers/readarr/default.nix @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-0q+MHdNRzq7gmv5jiArU1q+1UBWNZx0JRgiIy2pnIAc="; - arm64-linux_hash = "sha256-NtbzzbWfEE1thyGOuJhTYXPxhTpw9lqXcvvlfmvCMqM="; - x64-osx_hash = "sha256-oz2Sbvr8fky0mpBUXRKYki3UL0ewA/a2hEtPISBV8Ko="; + x64-linux_hash = "sha256-CkbgY/ZP9Eh+Ivxk/BEZFuurBpoxM5tpdn0ul2oFIgU="; + arm64-linux_hash = "sha256-EXiWRfrsazHhZwMS08Ol0vA9N+Gho5x/03xbqOm5OQ0="; + x64-osx_hash = "sha256-/LaoVBlvl0c3SfPoaV089UNcy7eIUIzLl/whyN3n8vc="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.3.3.2171"; + version = "0.3.5.2217"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; 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/servers/xmpp/prosody-filer/default.nix b/pkgs/servers/xmpp/prosody-filer/default.nix index a6de3a10474..7665a7f7450 100644 --- a/pkgs/servers/xmpp/prosody-filer/default.nix +++ b/pkgs/servers/xmpp/prosody-filer/default.nix @@ -1,18 +1,18 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "prosody-filer"; version = "unstable-2021-05-24"; - vendorSha256 = "05spkks77x88kc31c1zdg1cbf9ijymjs7qzmhg4c6lql5p2h5fbd"; - src = fetchFromGitHub { owner = "ThomasLeister"; repo = "prosody-filer"; rev = "c65edd199b47dc505366c85b3702230fda797cd6"; - sha256 = "0h6vp5flgy4wwmzhs6pf6qkk2j4ah8w919dwhfsq4wdpqs78kc0y"; + hash = "sha256-HrCJjsa3cYK1g7ylkDiCikgxJzbuGg1/5Zz4R12520A="; }; + vendorHash = "sha256-bbkCxS0UU8PIg/Xjo2X1Mia3WHjtBxYGmwj1c/ScVxc="; + doCheck = false; meta = with lib; { @@ -21,5 +21,5 @@ buildGoModule rec { license = licenses.mit; platforms = platforms.linux; description = "A simple file server for handling XMPP http_upload requests"; - }; + }; } diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index 0ecbb9bfdb6..8df75ac15b9 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "getantibody"; repo = "antibody"; rev = "v${version}"; - sha256 = "0icag53svzdm7yvzp855fp0f7q0g0jkfmjaa1sj6mmb01c1xgzi1"; + hash = "sha256-If7XAwtg1WqkDkrJ6qYED+DjwHWloPu3P7X9rUd5ikU="; }; - vendorSha256 = "0z8fma3v2dph8nv3q4lmv43s6p5sc338xb7kcmnpwcc0iw7b4vyj"; + vendorHash = "sha256-0m+yDo+AMX5tZfOsjsZgulyjB9mVEjy2RfA2sYeqDn0="; doCheck = false; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 5e123ff6685..cc5550395fe 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -18,11 +18,11 @@ buildGoModule rec { pname = "lxd-unwrapped"; - version = "5.17"; + version = "5.18"; src = fetchurl { url = "https://github.com/canonical/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz"; - hash = "sha256-21pw8Q8UYjuxdaKzNXoTanxxyTNRXXbuerIZPIQK4yg="; + hash = "sha256-4F4q+jnypE4I2/5D65UT3NRpdJertSRni8JvHkpTFVI="; }; vendorHash = null; 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/bluetooth/bluewalker/default.nix b/pkgs/tools/bluetooth/bluewalker/default.nix index ed2a5796444..6cc25523d74 100644 --- a/pkgs/tools/bluetooth/bluewalker/default.nix +++ b/pkgs/tools/bluetooth/bluewalker/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "jtaimisto"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wAzBlCczsLfHboGYIsyN7dGwz52CMw+L3XQ0njfLVR0="; + hash = "sha256-wAzBlCczsLfHboGYIsyN7dGwz52CMw+L3XQ0njfLVR0="; }; - vendorSha256 = "189qs6vmx63vwsjmc4qgf1y8xjsi7x6l1f5c3kd8j8jnagl26z4h"; + vendorHash = "sha256-kHwj6FNWIonaHKy4QE0/UcuOfHAPE1al5nuYXrfROKE="; ldflags = [ "-w" 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/cod/default.nix b/pkgs/tools/misc/cod/default.nix index e80abc03a79..c681930032f 100644 --- a/pkgs/tools/misc/cod/default.nix +++ b/pkgs/tools/misc/cod/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "dim-an"; repo = pname; rev = "v${version}"; - sha256 = "0wi680sxpv0kp1ggy21qp4c4ms79hw4z9w9kvp278p8z3y8wwglr"; + hash = "sha256-mT7OkR8fXXTE3TPx9AmH6ehKGLk4CP9euBPs2zVAJnI="; }; - vendorSha256 = "0ann1fbh8rqys3rwbz5h9mfnvkpqiw5rgkd4c30y99706h2dzv4i"; + vendorHash = "sha256-kezfBDTgpOTBYKTNlwuP+M5tXU2w/MXz0B5nBJcL1io="; ldflags = [ "-s" "-w" "-X main.GitSha=${src.rev}" ]; diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix index dd4dd26efa2..122bc20279b 100644 --- a/pkgs/tools/misc/docui/default.nix +++ b/pkgs/tools/misc/docui/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "skanehira"; repo = "docui"; rev = version; - sha256 = "0jya0wdp8scjmsr44krdbbb8q4gplf44gsng1nyn12a6ldqzayxl"; + hash = "sha256-tHv1caNGiWC9Dc/qR4ij9xGM1lotT0KyrpJpdBsHyks="; }; - vendorSha256 = "1ggdczvv03lj0g6cq26vrk1rba6pk0805n85w9hkbjx9c4r3j577"; + vendorHash = "sha256-5xQ5MmGpyzVh4gXZAhCY16iVw8zbCMzMA5IOsPdn7b0="; meta = with lib; { description = "TUI Client for Docker"; 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/glasgow/default.nix b/pkgs/tools/misc/glasgow/default.nix index a2c8019e190..693660667ea 100644 --- a/pkgs/tools/misc/glasgow/default.nix +++ b/pkgs/tools/misc/glasgow/default.nix @@ -9,17 +9,15 @@ python3.pkgs.buildPythonApplication rec { pname = "glasgow"; - version = "unstable-2023-04-15"; + version = "unstable-2023-09-20"; # python -m setuptools_scm - realVersion = "0.1.dev2+g${lib.substring 0 7 src.rev}"; - - patches = [ ./0001-Relax-Amaranth-git-dependency.patch ]; + realVersion = "0.1.dev1798+g${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "GlasgowEmbedded"; repo = "glasgow"; - rev = "406e06fae5c85f6f773c9839747513874bc3ec77"; - sha256 = "sha256-s4fWpKJj6n2+CIAsD2bjr5K8RhJz1H1sFnjiartNGf0="; + rev = "e9a9801d5be3dcba0ee188dd8a6e9115e337795d"; + sha256 = "sha256-ztB3I/jrDSm1gKB1e5igivUVloq+YYhkshDlWg75NMA="; }; nativeBuildInputs = [ @@ -30,6 +28,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ aiohttp amaranth + appdirs bitarray crc fx2 @@ -52,7 +51,14 @@ python3.pkgs.buildPythonApplication rec { # installCheck tries to build_ext again doInstallCheck = false; + postInstall = '' + mkdir -p $out/etc/udev/rules.d + cp $src/config/99-glasgow.rules $out/etc/udev/rules.d + ''; + checkPhase = '' + # tests attempt to cache bitstreams + export XDG_CACHE_HOME=$TMPDIR ${python3.interpreter} -W ignore::DeprecationWarning test.py ''; 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/paperlike-go/default.nix b/pkgs/tools/misc/paperlike-go/default.nix index 0278fb1f791..63390f427d4 100644 --- a/pkgs/tools/misc/paperlike-go/default.nix +++ b/pkgs/tools/misc/paperlike-go/default.nix @@ -11,12 +11,12 @@ buildGoModule { owner = "leoluk"; repo = "paperlike-go"; rev = "bd658d88ea9a3b21e1b301b96253abab7cf56d79"; - sha256 = "1h0n2n5w5pn3r08qf6hbmiib5m71br27y66ki9ajnaa890377qaj"; + hash = "sha256-UuFzBkhIKStVitMYf0Re4dSyYqwLGocRyMPewosVFsA="; }; - subPackages = [ "cmd/paperlike-cli" ]; + vendorHash = "sha256-OfTeJd3VS/WoUpyPY7XfQZWLrvS+vqPPgeL2Hd0HtgI="; - vendorSha256 = "00mn0zfivxp2h77s7gmyyjp8p5a1vysn73wwaalgajymvljxxx1r"; + subPackages = [ "cmd/paperlike-cli" ]; meta = { description = "paperlike-go is a Linux Go library and CLI utility to control a Dasung Paperlike display via I2C DDC."; diff --git a/pkgs/tools/misc/pg_flame/default.nix b/pkgs/tools/misc/pg_flame/default.nix index ca58e2a6570..f35706bfc67 100644 --- a/pkgs/tools/misc/pg_flame/default.nix +++ b/pkgs/tools/misc/pg_flame/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "mgartner"; repo = pname; rev = "v${version}"; - sha256 = "1a03vxqnga83mhjp7pkl0klhkyfaby7ncbwm45xbl8c7s6zwhnw2"; + hash = "sha256-glvIv9GHIbp6IZUvZo9fyvkJ6QR03nMlrAOpZ3HfA6g="; }; - vendorSha256 = "1rkx20winh66y2m7i7q13jpr83044i2d1pfd5p5l5kkpsix5mra5"; + vendorHash = "sha256-ReVaetR3zkLLLc3d0EQkBAyUrxwBn3iq8MZAGzkQfeY="; meta = with lib; { description = "Flamegraph generator for Postgres EXPLAIN ANALYZE output"; 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/changetower/default.nix b/pkgs/tools/networking/changetower/default.nix index 62a277dd0cf..f5d63bb4336 100644 --- a/pkgs/tools/networking/changetower/default.nix +++ b/pkgs/tools/networking/changetower/default.nix @@ -11,10 +11,10 @@ buildGoModule rec { owner = "Dc4ts"; repo = "ChangeTower"; rev = "v${version}"; - sha256 = "058ccn6d5f7w268hfqh85bz1xj6ysgfrmyj0b4asjiskq7728v9z"; + hash = "sha256-P20kzsFTR6kVWUD6mt3T3sge/ioIYgeREfy40oxlDBU="; }; - vendorSha256 = "0hagskhwrdsl6s6hn27jriysbxhaz0pqq1h43j7v0ggnwd2s03bq"; + vendorHash = "sha256-eA2gReP2PbCPHAQGjC/4CvalfczyCAuNNlS3zOHUT0E="; meta = with lib; { description = "Tools to watch for webppage changes"; 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/mole/default.nix b/pkgs/tools/networking/mole/default.nix index 53bf7b3ada7..39d109118d9 100644 --- a/pkgs/tools/networking/mole/default.nix +++ b/pkgs/tools/networking/mole/default.nix @@ -12,10 +12,10 @@ buildGoModule rec { owner = "davrodpin"; repo = pname; rev = "v${version}"; - sha256 = "11q48wfsr35xf2gmvh4biq4hlpba3fh6lrm3p9wni0rl1nxy40i7"; + hash = "sha256-JwLiuw00g2h5uqNmaqAbal0KCY6LwF2fcL2MrB1HBIc="; }; - vendorSha256 = "1qm328ldkaifj1vsrz025vsa2wqzii9rky00b6wh8jf31f4ljbzv"; + vendorHash = "sha256-+y9JiQvDSQS5WQD4mVOMH3Oh9C4C/Kx3kC6q2SgSo+I="; ldflags = [ "-s" diff --git a/pkgs/tools/networking/pixiecore/default.nix b/pkgs/tools/networking/pixiecore/default.nix index 371d39193f3..f1249cfb828 100644 --- a/pkgs/tools/networking/pixiecore/default.nix +++ b/pkgs/tools/networking/pixiecore/default.nix @@ -9,10 +9,10 @@ buildGoModule rec { owner = "danderson"; repo = "netboot"; inherit rev; - sha256 = "14dslmx3gk08h9gqfjw5y27x7d2c6r8ir7mjd7l9ybysagpzr02a"; + hash = "sha256-SoD871PaL5/oabKeHFE2TLTTj/CFS4dfggjMN3qlupE="; }; - vendorSha256 = "08n3m6fkwh8jmmzky3ygij4gxlcqidqk5ywi8ki8bkyzzs2lqaw7"; + vendorHash = "sha256-hytMhf7fz4XiRJH7MnGLmNH+iIzPDz9/rRJBPp2pwyI="; doCheck = false; diff --git a/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix b/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix index 24aaebe9d02..12117252abf 100644 --- a/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix +++ b/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix @@ -12,10 +12,10 @@ buildGoModule rec { owner = "shadowsocks"; repo = "v2ray-plugin"; rev = "v${version}"; - sha256 = "0aq445gnqk9dxs1hkw7rvk86wg0iyiy0h740lvyh6d9zsqhf61wb"; + hash = "sha256-iwfjINY/NQP9poAcCHz0ETxu0Nz58AmD7i1NbF8hBCs="; }; - vendorSha256 = "0vzd9v33p4a32f5ic9ir4g5ckis06wpdf07a649h9qalimxnvzfz"; + vendorHash = "sha256-3/1te41U4QQTMeoA1y43QMfJyiM5JhaLE0ORO8ZO7W8="; meta = with lib; { description = "Yet another SIP003 plugin for shadowsocks, based on v2ray"; diff --git a/pkgs/tools/networking/ssh-key-confirmer/default.nix b/pkgs/tools/networking/ssh-key-confirmer/default.nix index c7a90aee523..ed8b9cac734 100644 --- a/pkgs/tools/networking/ssh-key-confirmer/default.nix +++ b/pkgs/tools/networking/ssh-key-confirmer/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "benjojo"; repo = "ssh-key-confirmer"; rev = "v${version}"; - sha256 = "18whj9ds3rpjj5b71lbadi37ps99v13nnmkn3vq28x6cqfdy6w09"; + hash = "sha256-CXDjm8PMdCTwHnZWa0fYKel7Rmxq0XBWkfLmoVuSkKM="; }; - vendorSha256 = "0v9yw6v8fj6dqgbkks4pnmvxx9b7jqdy7bn7ywddk396sbsxjiqa"; + vendorHash = "sha256-CkfZ9dImjdka98eu4xuWZ6Xed7WX6DnXw81Ih7bhPm0="; ldflags = [ "-s" "-w" ]; 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/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix index ec2e63fe397..dfb41df3370 100644 --- a/pkgs/tools/package-management/morph/default.nix +++ b/pkgs/tools/package-management/morph/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "dbcdk"; repo = "morph"; rev = "v${version}"; - sha256 = "sha256-0CHmjqPxBgALGZYjfJFLoLBnoI0U7oZ8WyCtu1bkzZg="; + hash = "sha256-0CHmjqPxBgALGZYjfJFLoLBnoI0U7oZ8WyCtu1bkzZg="; }; - vendorSha256 = "08zzp0h4c4i5hk4whz06a3da7qjms6lr36596vxz0d8q0n7rspr9"; + vendorHash = "sha256-KV+djwUYNfD7NqmYkanRVeKj2lAGfMjJhCUSRiC4/yM="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/agebox/default.nix b/pkgs/tools/security/agebox/default.nix index 9e0c7c48e59..ea50c8779b3 100644 --- a/pkgs/tools/security/agebox/default.nix +++ b/pkgs/tools/security/agebox/default.nix @@ -8,12 +8,14 @@ buildGoModule rec { owner = "slok"; repo = pname; rev = "v${version}"; - sha256 = "1gi6lj3dpckhsx6hdpdnr8rclqgfkbdmkzx966nlxyi52bjfzbsv"; + hash = "sha256-W6/v5BIl+k6tMan/Wdua7mHKMsq23QZN13Cy24akJr4="; }; - vendorSha256 = "1jwzx6hp04y8hfpwfvf9zmhqjj3ghvr3gmgnllpcff1lai78vdrw"; + + vendorHash = "sha256-PLeNTlQ0OMcupfbVN/KGb0iJYf3Jbcevg8gTcKHpn8s="; ldflags = [ - "-s" "-w" + "-s" + "-w" "-X main.Version=${version}" ]; diff --git a/pkgs/tools/security/cloudbrute/default.nix b/pkgs/tools/security/cloudbrute/default.nix index 84a59ec495f..677c1402150 100644 --- a/pkgs/tools/security/cloudbrute/default.nix +++ b/pkgs/tools/security/cloudbrute/default.nix @@ -11,10 +11,10 @@ buildGoModule rec { owner = "0xsha"; repo = "CloudBrute"; rev = "v${version}"; - sha256 = "05b9klddk8wvi78j47jyg9pix6qpxyr01l1m7k1j7598siazfv9g"; + hash = "sha256-L233VdQolSPDPDXQALLvF5seb3peHiLRiZuj2RqdaRU="; }; - vendorSha256 = "0f3n0wrmg9d2qyn8hlnhf9lsfqd9443myzr04p48v68m8n83j6a9"; + vendorHash = "sha256-SRk5kEUVmY3IJSB/XwchqWGnaXLQUoisx6KlVzMHdjg="; meta = with lib; { description = "Cloud enumeration tool"; 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/dorkscout/default.nix b/pkgs/tools/security/dorkscout/default.nix index 27cc5a0d4e1..e5b5057c608 100644 --- a/pkgs/tools/security/dorkscout/default.nix +++ b/pkgs/tools/security/dorkscout/default.nix @@ -11,10 +11,10 @@ buildGoModule rec { owner = "R4yGM"; repo = pname; rev = version; - sha256 = "0h2m458jxdm3xg0h2vb8yq1jc28jqwinv1pdqypdsbvsz48s0hxz"; + hash = "sha256-v0OgEfl6L92ux+2GbSPHEgkmA/ZobQHB66O2LlEhVUA="; }; - vendorSha256 = "05vn9hd5r8cy45b3ixjch17v38p08k8di8gclq0i9rkz9bvy1nph"; + vendorHash = "sha256-8Nrg90p/5hQBpuyh2NBE4KKxT4BM9jhWIZ6hXBpMdhc="; meta = with lib; { description = "Tool to automate the work with Google dorks"; 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/grype/default.nix b/pkgs/tools/security/grype/default.nix index dbb8fcdd4ba..1dd9ed7f8a6 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "grype"; - version = "0.68.1"; + version = "0.69.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ASjnExBnOdeEWc94ShM+RUmp1YK499M/5CN6WQjCXMo="; + hash = "sha256-70xtemOFrQ4aaEy2iq9Nqp7n8kgwPYAwssPOS+5Qlfg="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -28,7 +28,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-nLZAbniX1FT1PE32cmYzqZar1e2ZiLBpnYuZg1BcKMo="; + vendorHash = "sha256-//zS7i9pxtU1cgWTACWoJ38GVLqVM36LGeggjosL07A="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/security/kiterunner/default.nix b/pkgs/tools/security/kiterunner/default.nix index a455c17d717..5f73ba05590 100644 --- a/pkgs/tools/security/kiterunner/default.nix +++ b/pkgs/tools/security/kiterunner/default.nix @@ -11,10 +11,10 @@ buildGoModule rec { owner = "assetnote"; repo = pname; rev = "v${version}"; - sha256 = "084jywgqjj2hpaprdcb9a7i8hihphnfil0sx3wrlvjpa8sk0z1mw"; + hash = "sha256-vIYPpkbqyk0zH10DGp2FF0aI4lFpsZavulBIiR/3kiA="; }; - vendorSha256 = "1nczzzsnh38qi949ki5268y39ggkwncanc1pv7727qpwllzl62vy"; + vendorHash = "sha256-fgtDP6X84iPO2Tcwq5jl8700PDKixJlIihgNaPX/n9k="; ldflags = [ "-s" "-w" "-X github.com/assetnote/kiterunner/cmd/kiterunner/cmd.Version=${version}" 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/ots/default.nix b/pkgs/tools/security/ots/default.nix index 47d53e741cc..bba9e8e6fb8 100644 --- a/pkgs/tools/security/ots/default.nix +++ b/pkgs/tools/security/ots/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "sniptt-official"; repo = pname; rev = "v${version}"; - sha256 = "Oxs2ytf0rY9QYzVaLUkqyX15oWjas3ukSkq9D1TYbDE="; + hash = "sha256-Oxs2ytf0rY9QYzVaLUkqyX15oWjas3ukSkq9D1TYbDE="; }; - vendorSha256 = "qYk8T0sYIO0wJ0R0j+0VetCy11w8usIRRdBm/Z6grJE="; + vendorHash = "sha256-qYk8T0sYIO0wJ0R0j+0VetCy11w8usIRRdBm/Z6grJE="; ldflags = [ "-X main.version=${version}" "-X main.buildSource=nix" ]; diff --git a/pkgs/tools/security/shellz/default.nix b/pkgs/tools/security/shellz/default.nix index b34986b2f7f..f1b226c3213 100644 --- a/pkgs/tools/security/shellz/default.nix +++ b/pkgs/tools/security/shellz/default.nix @@ -11,10 +11,10 @@ buildGoModule rec { owner = "evilsocket"; repo = pname; rev = "v${version}"; - sha256 = "1mhl1y0jkycyl1hgwxavxkm1f6kdx1sz3bvpmkr46sdijji06imi"; + hash = "sha256-sUYDopSxaUPyrHev8XXobRoX6uxbdf5goJ75KYEPFNY="; }; - vendorSha256 = "14rd9xd7s5sfmxgv5p9ka8x12xcimv5hrq7hzy0d1c3ddf50rr7n"; + vendorHash = "sha256-9uQMimttsNCA//DgDMuukXUROlIz3bJfr04XfVpPLZM="; ldflags = [ "-s" 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/system/uroboros/default.nix b/pkgs/tools/system/uroboros/default.nix index 7f25c70c297..f7d5ec0ac13 100644 --- a/pkgs/tools/system/uroboros/default.nix +++ b/pkgs/tools/system/uroboros/default.nix @@ -12,10 +12,10 @@ buildGoModule rec { owner = "evilsocket"; repo = pname; inherit rev; - sha256 = "1a1bc2za2ppb7j7ibhykgxwivwmx7yq0593255jd55gl60r0l7i4"; + hash = "sha256-JB4KMjD0ldJkKWKkArA/vfIdeX/TwxWPPOteob5gK6g="; }; - vendorSha256 = "1ml3x00zzkwj1f76a4wk2y8z4bxjhadf2p1li96qjpnc8fgfd50l"; + vendorHash = "sha256-FJTmnkPMXolNijRc4ZqCsi/ykReTE2WOC5LP/wHog9Y="; meta = with lib; { description = "Tool for monitoring and profiling single processes"; 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/chroma/default.nix b/pkgs/tools/text/chroma/default.nix index 6ef96b287b4..af5241de7a0 100644 --- a/pkgs/tools/text/chroma/default.nix +++ b/pkgs/tools/text/chroma/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { inherit (srcInfo) sha256; }; - vendorSha256 = "1qawayihklidfzln3jr899wh4zp9w7yq3i18klaylqndrg47k286"; + vendorHash = "sha256-Bol5yMvNYuoVnSjEgf3h6X4CeUooy2Hpdy3SCaNXXOE="; modRoot = "./cmd/chroma"; 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/dcs/default.nix b/pkgs/tools/text/dcs/default.nix index 5edc7896afa..0f438e4ff57 100644 --- a/pkgs/tools/text/dcs/default.nix +++ b/pkgs/tools/text/dcs/default.nix @@ -13,10 +13,10 @@ buildGoModule { owner = "Debian"; repo = "dcs"; rev = "da46accc4d55e9bfde1a6852ac5a9e730fcbbb2c"; - sha256 = "N+6BXlKn1YTlh0ZdPNWa0nuJNcQtlUIc9TocM8cbzQk="; + hash = "sha256-N+6BXlKn1YTlh0ZdPNWa0nuJNcQtlUIc9TocM8cbzQk="; }; - vendorSha256 = "l2mziuisx0HzuP88rS5M+Wha6lu8P036wJYZlmzjWfs="; + vendorHash = "sha256-l2mziuisx0HzuP88rS5M+Wha6lu8P036wJYZlmzjWfs="; # Depends on dcs binaries doCheck = false; 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}" ]; diff --git a/pkgs/tools/typesetting/soupault/default.nix b/pkgs/tools/typesetting/soupault/default.nix index f3fa8b67ba7..e2b69cc7b86 100644 --- a/pkgs/tools/typesetting/soupault/default.nix +++ b/pkgs/tools/typesetting/soupault/default.nix @@ -9,35 +9,34 @@ let pname = "soupault"; - version = "4.6.0"; + version = "4.7.0"; in ocamlPackages.buildDunePackage { inherit pname version; minimalOCamlVersion = "4.13"; - duneVersion = "3"; - src = fetchFromGitea { domain = "codeberg.org"; owner = "PataphysicalSociety"; repo = pname; rev = version; - sha256 = "MblwVacfK9CfoO0TEND+bqdi7iQayBOJKKOhzE7oiVk="; + sha256 = "nwXyOwDUbkMnyHPrvCvmToyONdbg5kJm2mt5rWrB6HA="; }; patches = lib.lists.optional (lib.strings.versionAtLeast "2.0.0" ocamlPackages.camomile.version) (fetchpatch { name = "camomile-1_x"; - url = "https://files.baturin.org/software/soupault/soupault-4.6.0-camomile-1.x.patch"; - sha256 = "J5RGyLDDVRzf6MLLI+73lqClxoovcPD2ZFawk+f6cE4="; + url = "https://files.baturin.org/software/soupault/soupault-4.7.0-camomile-1.x.patch"; + sha256 = "V7+OUjXqWtXwjUa35MlY9iyAlqOkst9Th7DgfDXkXZg="; }); buildInputs = with ocamlPackages; [ base64 camomile containers + csv digestif ezjsonm fileutils @@ -66,5 +65,6 @@ ocamlPackages.buildDunePackage { changelog = "https://codeberg.org/PataphysicalSociety/soupault/src/branch/main/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ toastal ]; + mainProgram = "soupault"; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8910d95ccf5..ffefaf6b783 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3080,6 +3080,8 @@ self: super: with self; { django-two-factor-auth = callPackage ../development/python-modules/django-two-factor-auth { }; + django-types = callPackage ../development/python-modules/django-types { }; + django-versatileimagefield = callPackage ../development/python-modules/django-versatileimagefield { }; django-vite = callPackage ../development/python-modules/django-vite { }; |