From 829deee3f3dd92364cb60298db3012ac0a7beb42 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:58:22 +0100 Subject: [PATCH 1/7] tartan: unstable-2021-12-23 -> 0.3.0-unstable-2021-12-23 --- pkgs/development/tools/analysis/tartan/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/tartan/default.nix b/pkgs/development/tools/analysis/tartan/default.nix index 1106d017cba1..f56a6260e7f1 100644 --- a/pkgs/development/tools/analysis/tartan/default.nix +++ b/pkgs/development/tools/analysis/tartan/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "tartan"; - version = "unstable-2021-12-23"; + version = "0.3.0-unstable-2021-12-23"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; From f6fc9675cdddd6cf26064830fbfd1f9deb5d9ace Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:59:45 +0100 Subject: [PATCH 2/7] goperf: unstable-2023-11-08 -> 0-unstable-2023-11-08 And fix an issue with the updateScript which prevented it from working: error: attribute 'go-modules' in selection path 'goperf.go-modules.drvAttrs.outputHash' not found Did you mean goModules? --- pkgs/development/tools/goperf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/goperf/default.nix b/pkgs/development/tools/goperf/default.nix index ed1a6c1a23b7..ffb644aaea40 100644 --- a/pkgs/development/tools/goperf/default.nix +++ b/pkgs/development/tools/goperf/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "goperf"; - version = "unstable-2023-11-08"; + version = "0-unstable-2023-11-08"; src = fetchgit { url = "https://go.googlesource.com/perf"; @@ -22,8 +22,8 @@ buildGoModule rec { export UPDATE_NIX_ATTR_PATH=goperf ${lib.escapeShellArgs (unstableGitUpdater { inherit (src) url; })} set -x - oldhash="$(nix-instantiate . --eval --strict -A "goperf.go-modules.drvAttrs.outputHash" | cut -d'"' -f2)" - newhash="$(nix-build -A goperf.go-modules --no-out-link 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)" + oldhash="$(nix-instantiate . --eval --strict -A "goperf.goModules.drvAttrs.outputHash" | cut -d'"' -f2)" + newhash="$(nix-build -A goperf.goModules --no-out-link 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)" fname="$(nix-instantiate --eval -E 'with import ./. {}; (builtins.unsafeGetAttrPos "version" goperf).file' | cut -d'"' -f2)" ${lib.getExe sd} --string-mode "$oldhash" "$newhash" "$fname" ''; From 502911d57fb9311270c2adbdc25601caf62434fb Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 18:00:38 +0100 Subject: [PATCH 3/7] c2ffi: Fix passthru.updateScript settings --- pkgs/development/tools/misc/c2ffi/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/misc/c2ffi/default.nix b/pkgs/development/tools/misc/c2ffi/default.nix index a66ae2aa35ea..28364b8beeed 100644 --- a/pkgs/development/tools/misc/c2ffi/default.nix +++ b/pkgs/development/tools/misc/c2ffi/default.nix @@ -24,6 +24,9 @@ llvmPackages.stdenv.mkDerivation { passthru.updateScript = unstableGitUpdater { url = "https://github.com/rpav/c2ffi.git"; branch = c2ffiBranch; + # Tags only exist for older LLVM versions, so they would result in nonsense names + # like: c2ffi-llvm-16.0.0-11.0.0.0-unstable-YYYY-MM-DD + hardcodeZeroVersion = true; }; nativeBuildInputs = [ From 8b563cd9f923cdf009b3864a358d912103703320 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 18:01:17 +0100 Subject: [PATCH 4/7] luaPackages.luarocks-nix: unstable-2023-10-19 -> 0-unstable-2023-10-19 --- pkgs/development/tools/misc/luarocks/luarocks-nix.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 20acab5a8584..4f33618c79c0 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -2,7 +2,7 @@ luarocks.overrideAttrs (old: { pname = "luarocks-nix"; - version = "unstable-2023-10-19"; + version = "0-unstable-2023-10-19"; src = fetchFromGitHub { owner = "nix-community"; @@ -14,7 +14,10 @@ luarocks.overrideAttrs (old: { patches = [ ]; passthru = { - updateScript = unstableGitUpdater { }; + updateScript = unstableGitUpdater { + # tags incompletely inherited from regular luarocks + hardcodeZeroVersion = true; + }; }; meta = old.meta // { From bf311d950e4c5d65fae66717c7c3d4f085ff6415 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Tue, 30 Apr 2024 20:45:51 +0200 Subject: [PATCH 5/7] luaPackages.luarocks-nix: Fix meta.position Which in turn, fixes running the updateScript: + update-source-version luaPackages.luarocks-nix 0-unstable-2024-04-29 --rev=a473a8f479711682f5b97a72362736d96efd463b update-source-version: error: Couldn't locate old source hash 'sha256-dqFFYehBgK0RqH0/1GtZXq7XLGCcc3Kfadq8ICYNCWk=' (or it appeared more than once) in '/pkgs/development/tools/misc/luarocks/default.nix'! --- pkgs/development/tools/misc/luarocks/luarocks-nix.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 4f33618c79c0..08f25fbd367e 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -20,7 +20,9 @@ luarocks.overrideAttrs (old: { }; }; - meta = old.meta // { + # old.meta // { /* ... */ } doesn't update meta.position, which breaks the updateScript + meta = { + inherit (old.meta) description license maintainers platforms; mainProgram = "luarocks"; }; }) From 33f42fc0d2d6ba46e7b3796a77aa7601ee980862 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 18:02:12 +0100 Subject: [PATCH 6/7] patchelfUnstable: unstable-2024-01-15 -> 0.18.0-unstable-2024-01-15 --- pkgs/development/tools/misc/patchelf/unstable.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index c2d9b2c0bede..212f0b8cebc4 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "patchelf"; - version = "unstable-2024-01-15"; + version = "0.18.0-unstable-2024-01-15"; src = fetchFromGitHub { owner = "NixOS"; From 211af0d467511bea9ea96bfb1fd2165d3323e2aa Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 18:02:32 +0100 Subject: [PATCH 7/7] vala-lint: unstable-2023-12-05 -> 0-unstable-2023-12-05 --- pkgs/development/tools/vala-lint/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/vala-lint/default.nix b/pkgs/development/tools/vala-lint/default.nix index b3f4987146b8..f08d43897a22 100644 --- a/pkgs/development/tools/vala-lint/default.nix +++ b/pkgs/development/tools/vala-lint/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "vala-lint"; - version = "unstable-2023-12-05"; + version = "0-unstable-2023-12-05"; src = fetchFromGitHub { owner = "vala-lang";