diff options
author | éclairevoyant <848000+eclairevoyant@users.noreply.github.com> | 2024-05-07 00:01:50 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-07 00:01:50 +0000 |
commit | a85613a1bc12856241bd55f223897293ada3e7b7 (patch) | |
tree | ac444016a5e037726335b058bca6f78e42051293 | |
parent | ad7efee13e0d216bf29992311536fce1d3eefbef (diff) | |
parent | 52a5da6a01b33a13ff7d1d28f42deaa8bb610216 (diff) |
Merge pull request #309659 from OPNA2608/fix/stableVersion/pkgs-libraries
pkgs/development/libraries: Fix some unstableGitUpdater users
-rw-r--r-- | pkgs/development/libraries/cegui/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/libraries/crossguid/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/gl3w/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/gtk-frdp/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/hax11/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libcxxrt/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libsegfault/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libvgm/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libz/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/minilibx/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/rapidcheck/default.nix | 2 |
11 files changed, 27 insertions, 14 deletions
diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/development/libraries/cegui/default.nix index 1e884b3d8a81d..0a1fd07e25081 100644 --- a/pkgs/development/libraries/cegui/default.nix +++ b/pkgs/development/libraries/cegui/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, writeShellScript , cmake , ogre , freetype @@ -13,7 +14,7 @@ stdenv.mkDerivation { pname = "cegui"; - version = "unstable-2023-03-18"; + version = "0-unstable-2023-03-18"; src = fetchFromGitHub { owner = "paroj"; @@ -47,6 +48,12 @@ stdenv.mkDerivation { passthru.updateScript = unstableGitUpdater { branch = "v0"; + # The above branch is separate from the branch with the latest tags, so the updater doesn't pick them up + # This is what would be used to handle upstream's format, if it was able to see the tags + # tagConverter = writeShellScript "cegui-tag-converter.sh" '' + # sed -e 's/^v//g' -e 's/-/./g' + # ''; + hardcodeZeroVersion = true; }; meta = with lib; { diff --git a/pkgs/development/libraries/crossguid/default.nix b/pkgs/development/libraries/crossguid/default.nix index e8d85ec23dd5c..2b98aca1d66d6 100644 --- a/pkgs/development/libraries/crossguid/default.nix +++ b/pkgs/development/libraries/crossguid/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "crossguid"; - version = "unstable-2019-05-29"; + version = "0.2.2-unstable-2019-05-29"; src = fetchFromGitHub { owner = "graeme-hill"; @@ -24,7 +24,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = lib.optional stdenv.isLinux libuuid; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; meta = with lib; { description = "Lightweight cross platform C++ GUID/UUID library"; diff --git a/pkgs/development/libraries/gl3w/default.nix b/pkgs/development/libraries/gl3w/default.nix index fdfb203ba12b4..c0934e7d18f9b 100644 --- a/pkgs/development/libraries/gl3w/default.nix +++ b/pkgs/development/libraries/gl3w/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "gl3w"; - version = "unstable-2023-10-10"; + version = "0-unstable-2023-10-10"; src = fetchFromGitHub { owner = "skaslev"; diff --git a/pkgs/development/libraries/gtk-frdp/default.nix b/pkgs/development/libraries/gtk-frdp/default.nix index 3819c2043a1da..b3edf0ba48537 100644 --- a/pkgs/development/libraries/gtk-frdp/default.nix +++ b/pkgs/development/libraries/gtk-frdp/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "gtk-frdp"; - version = "unstable-2024-03-01"; + version = "3.37.1-unstable-2024-03-01"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -41,7 +41,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = unstableGitUpdater { }; + updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; }; env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/hax11/default.nix b/pkgs/development/libraries/hax11/default.nix index 42851f0cf3004..fba0a560e9931 100644 --- a/pkgs/development/libraries/hax11/default.nix +++ b/pkgs/development/libraries/hax11/default.nix @@ -9,7 +9,7 @@ multiStdenv.mkDerivation (finalAttrs: { pname = "hax11"; - version = "unstable-2023-09-25"; + version = "0-unstable-2023-09-25"; src = fetchFromGitHub { owner = "CyberShadow"; diff --git a/pkgs/development/libraries/libcxxrt/default.nix b/pkgs/development/libraries/libcxxrt/default.nix index cd9e7778a80be..6cdcbe63f78c2 100644 --- a/pkgs/development/libraries/libcxxrt/default.nix +++ b/pkgs/development/libraries/libcxxrt/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "libcxxrt"; - version = "unstable-2024-04-15"; + version = "4.0.10-unstable-2024-04-15"; src = fetchFromGitHub { owner = "libcxxrt"; diff --git a/pkgs/development/libraries/libsegfault/default.nix b/pkgs/development/libraries/libsegfault/default.nix index 721570f330b3c..58896c3e2bc27 100644 --- a/pkgs/development/libraries/libsegfault/default.nix +++ b/pkgs/development/libraries/libsegfault/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "libsegfault"; - version = "unstable-2022-11-13"; + version = "0-unstable-2022-11-13"; src = fetchFromGitHub { owner = "jonathanpoelen"; diff --git a/pkgs/development/libraries/libvgm/default.nix b/pkgs/development/libraries/libvgm/default.nix index 0f45c39e0aeb1..0b07548d073a6 100644 --- a/pkgs/development/libraries/libvgm/default.nix +++ b/pkgs/development/libraries/libvgm/default.nix @@ -42,7 +42,7 @@ let in stdenv.mkDerivation { pname = "libvgm"; - version = "unstable-2024-04-24"; + version = "0-unstable-2024-04-24"; src = fetchFromGitHub { owner = "ValleyBell"; diff --git a/pkgs/development/libraries/libz/default.nix b/pkgs/development/libraries/libz/default.nix index 6b3e1dacdc00e..b9ee7f96b4217 100644 --- a/pkgs/development/libraries/libz/default.nix +++ b/pkgs/development/libraries/libz/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libz"; - version = "unstable-2018-03-31"; + version = "1.2.8.2015.12.26-unstable-2018-03-31"; src = fetchFromGitLab { owner = "sortix"; @@ -18,7 +18,9 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; outputDoc = "dev"; # single tiny man3 page - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "libz-"; + }; meta = { homepage = "https://sortix.org/libz/"; diff --git a/pkgs/development/libraries/minilibx/default.nix b/pkgs/development/libraries/minilibx/default.nix index 0551993e438a2..41a422e3a2a26 100644 --- a/pkgs/development/libraries/minilibx/default.nix +++ b/pkgs/development/libraries/minilibx/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { pname = "minilibx"; - version = "unstable-2021-10-30"; + version = "0-unstable-2021-10-30"; src = fetchFromGitHub { owner = "42Paris"; diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/development/libraries/rapidcheck/default.nix index 68f2e5e096a8b..880f1706b2995 100644 --- a/pkgs/development/libraries/rapidcheck/default.nix +++ b/pkgs/development/libraries/rapidcheck/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "rapidcheck"; - version = "unstable-2023-12-14"; + version = "0-unstable-2023-12-14"; src = fetchFromGitHub { owner = "emil-e"; |