diff options
| -rw-r--r-- | flake.lock | 6 | ||||
| -rw-r--r-- | flake.nix | 3 | ||||
| -rw-r--r-- | package.nix | 17 |
3 files changed, 7 insertions, 19 deletions
diff --git a/flake.lock b/flake.lock index 269efc21a..8e59b2942 100644 --- a/flake.lock +++ b/flake.lock @@ -18,11 +18,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711481231, - "narHash": "sha256-J/fW3Xhm3WsJPNd8ksZmfMnol5aOG2qEMDPbOnNNdTQ=", + "lastModified": 1715123187, + "narHash": "sha256-0czuu757t53lK6uWeo1a5/jJbCd9t4sOtLDFpts60DM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9d6ddb13cee3cc1192e4430277708c732685f38a", + "rev": "0c592f9a288bdf764b6f24c757277c0e49757a46", "type": "github" }, "original": { @@ -194,10 +194,9 @@ 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. boehmgc-nix = final.nix.boehmgc-nix; - libseccomp-nix = final.nix.libseccomp-nix; # And same thing for our build-release-notes package. build-release-notes = final.nix.build-release-notes; }; diff --git a/package.nix b/package.nix index 7c92cdfcb..0186b7472 100644 --- a/package.nix +++ b/package.nix @@ -19,14 +19,12 @@ curl, doxygen, editline, - fetchurl, flex, git, gtest, jq, libarchive, libcpuid, - libseccomp-nix ? __forDefaults.libseccomp-nix, libseccomp, libsodium, lsof, @@ -77,15 +75,6 @@ lix-doc = pkgs.callPackage ./lix-doc/package.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 @@ -258,7 +247,7 @@ stdenv.mkDerivation (finalAttrs: { lix-doc ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - libseccomp-nix + libseccomp busybox-sandbox-shell ] ++ lib.optional internalApiDocs rapidcheck @@ -373,10 +362,10 @@ stdenv.mkDerivation (finalAttrs: { 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. 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 # it's easier to parameterize the devShell off an already called package.nix. |