Merge pull request #228541 from ivan/fix-nix-store-ng

nix-serve-ng: use upstream commit that is compatible with Nix 2.13
This commit is contained in:
maralorn 2023-06-21 05:22:08 +02:00 committed by GitHub
commit db261a3a10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -290,11 +290,14 @@ self: super: builtins.intersectAttrs super {
src = assert super.nix-serve-ng.version == "1.0.0"; src = assert super.nix-serve-ng.version == "1.0.0";
# Workaround missing files in sdist # Workaround missing files in sdist
# https://github.com/aristanetworks/nix-serve-ng/issues/10 # 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 { pkgs.fetchFromGitHub {
repo = "nix-serve-ng"; repo = "nix-serve-ng";
owner = "aristanetworks"; owner = "aristanetworks";
rev = "433f70f4daae156b84853f5aaa11987aa5ce7277"; rev = "dabf46d65d8e3be80fa2eacd229eb3e621add4bd";
sha256 = "0mqp67z5mi8rsjahdh395n7ppf0b65k8rd3pvnl281g02rbr69y2"; hash = "sha256-SoJJ3rMtDMfUzBSzuGMY538HDIj/s8bPf8CjIkpqY2w=";
}; };
} (addPkgconfigDepend pkgs.boost.dev super.nix-serve-ng); } (addPkgconfigDepend pkgs.boost.dev super.nix-serve-ng);