From 206a32a8b9129c81d89b557dcf591e94fa550ba8 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 5 May 2025 18:19:17 +0200 Subject: [PATCH] hercules-ci-*.nix: 2.24 -> 2.28 This is a "megarepo" update where dependents rely on the exact version of their dependency internally, hence the single commit. (The bindings had an interface change) The commonality of these updates is support for the new Nix version, hence the title, but this also fixes a linking issue involving the nixVersion symbol. dlopen(/nix/store/448nl79c6bci4pqxhq22g2gb3d8qwljw-nix-2.24.14/lib/libnixmain.dylib, 0x0005): symbol not found in flat namespace '__ZN3nix10nixVersionE' --- pkgs/development/haskell-modules/configuration-nix.nix | 2 +- .../replacements-by-name/hercules-ci-agent.nix | 4 ++-- .../replacements-by-name/hercules-ci-cnix-expr.nix | 4 ++-- .../replacements-by-name/hercules-ci-cnix-store.nix | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index ab3a42259dc0..72cb136791f3 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1317,7 +1317,7 @@ builtins.intersectAttrs super { overrideCabal (old: { passthru = old.passthru or { } // { - nixPackage = pkgs.nixVersions.nix_2_24; + nixPackage = pkgs.nixVersions.nix_2_28; }; }) ( diff --git a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-agent.nix b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-agent.nix index cd605465d060..17bd33cc1358 100644 --- a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-agent.nix +++ b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-agent.nix @@ -80,8 +80,8 @@ }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.10.5"; - sha256 = "ab1c2370dbfdca7d7b67cb1985648edabf40d99f01b88a98d6961a2706c0e591"; + version = "0.10.6"; + sha256 = "5551c8eda390b48da6801f8f8580dc770e6e2fa2adf467ea7afd174748816fd6"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ diff --git a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-expr.nix b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-expr.nix index 902521b22a60..5a652312b469 100644 --- a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-expr.nix +++ b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-expr.nix @@ -30,8 +30,8 @@ }: mkDerivation { pname = "hercules-ci-cnix-expr"; - version = "0.3.6.5"; - sha256 = "0adbd451815bb6ea7388c0477fe6e114e0ba019819027709855e7834aedcb6df"; + version = "0.4.0.0"; + sha256 = "ba6dadda0a14e456780df018a610209ef288ed6562ad5843cb8d19d38fc026ed"; setupHaskellDepends = [ base Cabal diff --git a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-store.nix b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-store.nix index 3ded910b3eda..fc535cd23911 100644 --- a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-store.nix +++ b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-store.nix @@ -24,8 +24,8 @@ }: mkDerivation { pname = "hercules-ci-cnix-store"; - version = "0.3.6.1"; - sha256 = "35e3d21f9bbc1c83187af22a2532d227fc42a5cf3cf683a86be7bb7180f10d5e"; + version = "0.3.7.0"; + sha256 = "6feba2a6e1a267bc69b67962ed6eaa3510b1ae31c411fdb4e6670763d175d3b1"; setupHaskellDepends = [ base Cabal