From e72e5acac8a851e0a73f5ce31e7bb483543af079 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:52:12 +0100 Subject: [PATCH 01/11] cegui: unstable-2023-03-18 -> 0-unstable-2023-03-18 Not really correct, but the updater can't see the correct upstream tags on the used branch. --- pkgs/development/libraries/cegui/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/development/libraries/cegui/default.nix index 1e884b3d8a81..0a1fd07e2508 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; { From 53ff5df1b9ea27c9d778f8e3856be6fad217572e Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:53:13 +0100 Subject: [PATCH 02/11] crossguid: unstable-2019-05-29 -> 0.2.2-unstable-2019-05-29 --- pkgs/development/libraries/crossguid/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/crossguid/default.nix b/pkgs/development/libraries/crossguid/default.nix index e8d85ec23dd5..2b98aca1d66d 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"; From 935882c621d7a4a0b695defe489e31da5f25b82e Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:53:36 +0100 Subject: [PATCH 03/11] gl3w: unstable-2023-10-10 -> 0-unstable-2023-10-10 --- pkgs/development/libraries/gl3w/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gl3w/default.nix b/pkgs/development/libraries/gl3w/default.nix index fdfb203ba12b..c0934e7d18f9 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"; From e85faede0a211303100d7d35f113b6a38b9fc088 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:54:08 +0100 Subject: [PATCH 04/11] gtk-frdp: unstable-2024-03-01 -> 3.37.1-unstable-2024-03-01 --- pkgs/development/libraries/gtk-frdp/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk-frdp/default.nix b/pkgs/development/libraries/gtk-frdp/default.nix index 3819c2043a1d..b3edf0ba4853 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 [ From 0c67a69f7a06a9fb91e9d6c8e2bcadb3f9c59655 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:54:31 +0100 Subject: [PATCH 05/11] hax11: unstable-2023-09-25 -> 0-unstable-2023-09-25 --- pkgs/development/libraries/hax11/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/hax11/default.nix b/pkgs/development/libraries/hax11/default.nix index 42851f0cf300..fba0a560e993 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"; From 72aa0eeac48addaa566daed47fc160ca7a8ad58c Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:55:58 +0100 Subject: [PATCH 06/11] libsegfault: unstable-2022-11-13 -> 0-unstable-2022-11-13 --- pkgs/development/libraries/libsegfault/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libsegfault/default.nix b/pkgs/development/libraries/libsegfault/default.nix index 721570f330b3..58896c3e2bc2 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"; From bfb6ea04cfd87d33afd0c1b4ca41d5120f0592a3 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:56:38 +0100 Subject: [PATCH 07/11] libvgm: unstable-2024-04-24 -> 0-unstable-2024-04-24 --- pkgs/development/libraries/libvgm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libvgm/default.nix b/pkgs/development/libraries/libvgm/default.nix index 0f45c39e0aeb..0b07548d073a 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"; From 97d0c1d1587860115a831dbce63c27a63e5e7911 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:57:21 +0100 Subject: [PATCH 08/11] libz: unstable-2018-03-31 -> 1.2.8.2015.12.26-unstable-2018-03-31 --- pkgs/development/libraries/libz/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libz/default.nix b/pkgs/development/libraries/libz/default.nix index 6b3e1dacdc00..b9ee7f96b421 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/"; From eb394b2974d6435ca13353b6457c42ae7af9f6a7 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:57:43 +0100 Subject: [PATCH 09/11] minilibx: unstable-2021-10-30 -> 0-unstable-2021-10-30 --- pkgs/development/libraries/minilibx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/minilibx/default.nix b/pkgs/development/libraries/minilibx/default.nix index 0551993e438a..41a422e3a2a2 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"; From 046edaea92757ec5b846b3a5022038b96e983c48 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:55:41 +0100 Subject: [PATCH 10/11] libcxxrt: unstable-2024-04-15 -> 4.0.10-unstable-2024-04-15 --- pkgs/development/libraries/libcxxrt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libcxxrt/default.nix b/pkgs/development/libraries/libcxxrt/default.nix index cd9e7778a80b..6cdcbe63f78c 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"; From 52a5da6a01b33a13ff7d1d28f42deaa8bb610216 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 7 Feb 2024 17:58:03 +0100 Subject: [PATCH 11/11] rapidcheck: unstable-2023-12-14 -> 0-unstable-2023-12-14 --- pkgs/development/libraries/rapidcheck/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/development/libraries/rapidcheck/default.nix index 68f2e5e096a8..880f1706b299 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";