Merge pull request #308314 from OPNA2608/fix/stableVersion/pkgs-devtools

pkgs/development/tools: Fix some unstableGitUpdater users
This commit is contained in:
éclairevoyant 2024-05-05 05:13:23 +00:00 committed by GitHub
commit 508a8e68bd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 17 additions and 9 deletions

View File

@ -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";

View File

@ -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"
'';

View File

@ -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 = [

View File

@ -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,10 +14,15 @@ luarocks.overrideAttrs (old: {
patches = [ ];
passthru = {
updateScript = unstableGitUpdater { };
updateScript = unstableGitUpdater {
# tags incompletely inherited from regular luarocks
hardcodeZeroVersion = true;
};
};
meta = old.meta // {
# old.meta // { /* ... */ } doesn't update meta.position, which breaks the updateScript
meta = {
inherit (old.meta) description license maintainers platforms;
mainProgram = "luarocks";
};
})

View File

@ -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";

View File

@ -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";