diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2024-05-04 20:33:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@lix> | 2024-05-04 20:33:59 +0000 |
| commit | 8dfb30a2355be667fcb947ea995669c801534fbf (patch) | |
| tree | 42a1a54c5e58ab03e57d9b78933a349db59579b6 | |
| parent | fa8009257a1344285e5d5de25c59fef3b5b6e5d4 (diff) | |
| parent | 3580a4b7bfb6a450298f24606541f833dfde5481 (diff) | |
Merge "package: remove assert for libseccomp version" into main
| -rw-r--r-- | package.nix | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/package.nix b/package.nix index ae26d49fe..455e21135 100644 --- a/package.nix +++ b/package.nix @@ -85,17 +85,14 @@ lix-doc = pkgs.callPackage ./lix-doc/package.nix { }; - # remove when we drop 23.11 support (which includes a version too old to know about fchmodat2) - # see src/libstore/linux/fchmodat2-compat.hh - libseccomp-nix = - assert lib.versionOlder (lib.getVersion libseccomp) "2.5.5"; - 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="; - }; - }); + # 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 |