diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-06-22 00:13:26 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-22 00:13:26 +0000 |
commit | 0312d8f75067f10db6842a4c5d3a402caca49cd0 (patch) | |
tree | 3ba38179692d89189d1f30a5a19e845fb2991aa4 /pkgs/development/haskell-modules | |
parent | 35e763373dfb50171d2c74c1b009364274c3e5f4 (diff) | |
parent | 3fb3ce0b6b84d3b4e7b49e142da9c5764b563058 (diff) | |
download | nixpkgs-0312d8f75067f10db6842a4c5d3a402caca49cd0.tar nixpkgs-0312d8f75067f10db6842a4c5d3a402caca49cd0.tar.gz nixpkgs-0312d8f75067f10db6842a4c5d3a402caca49cd0.tar.bz2 nixpkgs-0312d8f75067f10db6842a4c5d3a402caca49cd0.tar.lz nixpkgs-0312d8f75067f10db6842a4c5d3a402caca49cd0.tar.xz nixpkgs-0312d8f75067f10db6842a4c5d3a402caca49cd0.tar.zst nixpkgs-0312d8f75067f10db6842a4c5d3a402caca49cd0.zip |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 7 |
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 7a2c2d56809..b14716718e8 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -348,11 +348,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); |