kloenk/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

flake: update nixpkgs input to latest nixos-23.11

Browse source 
This includes the update to libseccomp 2.5.5[1], so we don't need to
override it on our own.

[1] https://nixpk.gs/pr-tracker.html?pr=306070

Change-Id: I1fa9c7fcc23e501d75f774745107c6bb086ced70
This commit is contained in:
Maximilian Bosch 2024-05-08 10:00:56 +02:00
parent 8552519bb8
commit a4c943403f
Signed by: ma27
SSH key fingerprint: SHA256:d7dmwHmpai66L6KIXA+wxzVbkPq0nGLrcHK3ZNroqZY
3 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock
View file

@ -18,11 +18,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1711481231, "lastModified": 1715123187,
"narHash": "sha256-J/fW3Xhm3WsJPNd8ksZmfMnol5aOG2qEMDPbOnNNdTQ=", "narHash": "sha256-0czuu757t53lK6uWeo1a5/jJbCd9t4sOtLDFpts60DM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9d6ddb13cee3cc1192e4430277708c732685f38a", "rev": "0c592f9a288bdf764b6f24c757277c0e49757a46",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
flake.nix
View file

@ -194,10 +194,9 @@
busybox-sandbox-shell = final.busybox-sandbox-shell or final.default-busybox-sandbox-shell; busybox-sandbox-shell = final.busybox-sandbox-shell or final.default-busybox-sandbox-shell;
}; };
# Export the patched version of boehmgc & libseccomp that Lix uses into the overlay # Export the patched version of boehmgc that Lix uses into the overlay
# for consumers of this flake. # for consumers of this flake.
boehmgc-nix = final.nix.boehmgc-nix; boehmgc-nix = final.nix.boehmgc-nix;
libseccomp-nix = final.nix.libseccomp-nix;
# And same thing for our build-release-notes package. # And same thing for our build-release-notes package.
build-release-notes = final.nix.build-release-notes; build-release-notes = final.nix.build-release-notes;
}; };

17
package.nix
View file

@ -19,14 +19,12 @@
curl, curl,
doxygen, doxygen,
editline, editline,
fetchurl,
flex, flex,
git, git,
gtest, gtest,
jq, jq,
libarchive, libarchive,
libcpuid, libcpuid,
libseccomp-nix ? __forDefaults.libseccomp-nix,
libseccomp, libseccomp,
libsodium, libsodium,
lsof, lsof,
@ -77,15 +75,6 @@
lix-doc = pkgs.callPackage ./lix-doc/package.nix { }; lix-doc = pkgs.callPackage ./lix-doc/package.nix { };
build-release-notes = pkgs.callPackage ./maintainers/build-release-notes.nix { }; build-release-notes = pkgs.callPackage ./maintainers/build-release-notes.nix { };
# FIXME remove when we have libsecomp 2.5.5 (currently in staging-23.11)
libseccomp-nix = libseccomp.overrideAttrs (_: rec {
version = "2.5.5";
src = fetchurl {
url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz";
hash = "sha256-JIosik2bmFiqa69ScSw0r+/PnJ6Ut23OAsHJqiX7M3U=";
};
});
}, },
}: }:
let let
@ -258,7 +247,7 @@ stdenv.mkDerivation (finalAttrs: {
lix-doc lix-doc
] ]
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
libseccomp-nix libseccomp
busybox-sandbox-shell busybox-sandbox-shell
] ]
++ lib.optional internalApiDocs rapidcheck ++ lib.optional internalApiDocs rapidcheck
@ -373,10 +362,10 @@ stdenv.mkDerivation (finalAttrs: {
passthru.perl-bindings = pkgs.callPackage ./perl { inherit fileset stdenv; }; passthru.perl-bindings = pkgs.callPackage ./perl { inherit fileset stdenv; };
# Export the patched version of boehmgc & libseccomp. # Export the patched version of boehmgc.
# flake.nix exports that into its overlay. # flake.nix exports that into its overlay.
passthru = { passthru = {
inherit (__forDefaults) boehmgc-nix build-release-notes libseccomp-nix; inherit (__forDefaults) boehmgc-nix build-release-notes;
# The collection of dependency logic for this derivation is complicated enough that # The collection of dependency logic for this derivation is complicated enough that
# it's easier to parameterize the devShell off an already called package.nix. # it's easier to parameterize the devShell off an already called package.nix.