summary refs log tree commit diff
path: root/pkgs/development/haskell-modules
diff options
context:
space:
mode:
authormaralorn <mail@maralorn.de>2023-06-21 05:22:08 +0200
committerGitHub <noreply@github.com>2023-06-21 05:22:08 +0200
commitdb261a3a10a2e2e104175ea30f0d8ffc52736276 (patch)
tree1022c6fdfc07a645a6b13202c6ef579e4ea5476b /pkgs/development/haskell-modules
parentfc1f73daedb6c9e21b6c5b1660ffd5cefc157ad9 (diff)
parent7b63a3b996aa6f44592a96284a1ca8683a70ad9a (diff)
downloadnixpkgs-db261a3a10a2e2e104175ea30f0d8ffc52736276.tar
nixpkgs-db261a3a10a2e2e104175ea30f0d8ffc52736276.tar.gz
nixpkgs-db261a3a10a2e2e104175ea30f0d8ffc52736276.tar.bz2
nixpkgs-db261a3a10a2e2e104175ea30f0d8ffc52736276.tar.lz
nixpkgs-db261a3a10a2e2e104175ea30f0d8ffc52736276.tar.xz
nixpkgs-db261a3a10a2e2e104175ea30f0d8ffc52736276.tar.zst
nixpkgs-db261a3a10a2e2e104175ea30f0d8ffc52736276.zip
Merge pull request #228541 from ivan/fix-nix-store-ng
nix-serve-ng: use upstream commit that is compatible with Nix 2.13
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r--pkgs/development/haskell-modules/configuration-nix.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index d02beb6bad6..6f2df9d5d49 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -290,11 +290,14 @@ self: super: builtins.intersectAttrs super {
     src = assert super.nix-serve-ng.version == "1.0.0";
       # Workaround missing files in sdist
       # https://github.com/aristanetworks/nix-serve-ng/issues/10
+      #
+      # Workaround for libstore incompatibility with Nix 2.13
+      # https://github.com/aristanetworks/nix-serve-ng/issues/22
       pkgs.fetchFromGitHub {
         repo = "nix-serve-ng";
         owner = "aristanetworks";
-        rev = "433f70f4daae156b84853f5aaa11987aa5ce7277";
-        sha256 = "0mqp67z5mi8rsjahdh395n7ppf0b65k8rd3pvnl281g02rbr69y2";
+        rev = "dabf46d65d8e3be80fa2eacd229eb3e621add4bd";
+        hash = "sha256-SoJJ3rMtDMfUzBSzuGMY538HDIj/s8bPf8CjIkpqY2w=";
       };
   } (addPkgconfigDepend pkgs.boost.dev super.nix-serve-ng);