pyrox.dev / nixpkgs
lol
fork atom

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

pkgs/development/tools: Fix some unstableGitUpdater users

authored by éclairevoyant and committed by GitHub 508a8e68 7e17df3d

+17 -9
unified split
+1 -1
pkgs/development/tools/analysis/tartan/default.nix
··· 12 12 13 13 stdenv.mkDerivation rec { 14 14 pname = "tartan"; 15 - version = "unstable-2021-12-23"; 15 + version = "0.3.0-unstable-2021-12-23"; 16 16 17 17 src = fetchFromGitLab { 18 18 domain = "gitlab.freedesktop.org";
+3 -3
pkgs/development/tools/goperf/default.nix
··· 8 8 9 9 buildGoModule rec { 10 10 pname = "goperf"; 11 - version = "unstable-2023-11-08"; 11 + version = "0-unstable-2023-11-08"; 12 12 13 13 src = fetchgit { 14 14 url = "https://go.googlesource.com/perf"; ··· 22 22 export UPDATE_NIX_ATTR_PATH=goperf 23 23 ${lib.escapeShellArgs (unstableGitUpdater { inherit (src) url; })} 24 24 set -x 25 - oldhash="$(nix-instantiate . --eval --strict -A "goperf.go-modules.drvAttrs.outputHash" | cut -d'"' -f2)" 26 - newhash="$(nix-build -A goperf.go-modules --no-out-link 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)" 25 + oldhash="$(nix-instantiate . --eval --strict -A "goperf.goModules.drvAttrs.outputHash" | cut -d'"' -f2)" 26 + newhash="$(nix-build -A goperf.goModules --no-out-link 2>&1 | tail -n3 | grep 'got:' | cut -d: -f2- | xargs echo || true)" 27 27 fname="$(nix-instantiate --eval -E 'with import ./. {}; (builtins.unsafeGetAttrPos "version" goperf).file' | cut -d'"' -f2)" 28 28 ${lib.getExe sd} --string-mode "$oldhash" "$newhash" "$fname" 29 29 '';
+3
pkgs/development/tools/misc/c2ffi/default.nix
··· 24 24 passthru.updateScript = unstableGitUpdater { 25 25 url = "https://github.com/rpav/c2ffi.git"; 26 26 branch = c2ffiBranch; 27 + # Tags only exist for older LLVM versions, so they would result in nonsense names 28 + # like: c2ffi-llvm-16.0.0-11.0.0.0-unstable-YYYY-MM-DD 29 + hardcodeZeroVersion = true; 27 30 }; 28 31 29 32 nativeBuildInputs = [
+8 -3
pkgs/development/tools/misc/luarocks/luarocks-nix.nix
··· 2 2 3 3 luarocks.overrideAttrs (old: { 4 4 pname = "luarocks-nix"; 5 - version = "unstable-2023-10-19"; 5 + version = "0-unstable-2023-10-19"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "nix-community"; ··· 14 14 patches = [ ]; 15 15 16 16 passthru = { 17 - updateScript = unstableGitUpdater { }; 17 + updateScript = unstableGitUpdater { 18 + # tags incompletely inherited from regular luarocks 19 + hardcodeZeroVersion = true; 20 + }; 18 21 }; 19 22 20 - meta = old.meta // { 23 + # old.meta // { /* ... */ } doesn't update meta.position, which breaks the updateScript 24 + meta = { 25 + inherit (old.meta) description license maintainers platforms; 21 26 mainProgram = "luarocks"; 22 27 }; 23 28 })
+1 -1
pkgs/development/tools/misc/patchelf/unstable.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "patchelf"; 5 - version = "unstable-2024-01-15"; 5 + version = "0.18.0-unstable-2024-01-15"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "NixOS";
+1 -1
pkgs/development/tools/vala-lint/default.nix
··· 15 15 16 16 stdenv.mkDerivation rec { 17 17 pname = "vala-lint"; 18 - version = "unstable-2023-12-05"; 18 + version = "0-unstable-2023-12-05"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = "vala-lang";