From 3580a4b7bfb6a450298f24606541f833dfde5481 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 4 May 2024 10:33:26 +0200 Subject: [PATCH] package: remove assert for libseccomp version This has the following downsides: * you cannot build Lix against nixos-unstable. * this will immediately break as soon as libseccomp will hit nixos-23.11 (given that people will probably use the package.nix via our overlay or override nixpkgs via `follows`). Hence, removing the assert again and add a better FIXME comment. Change-Id: I284e10cf08e1873fef70ed869a1638aa89792422 --- package.nix | 19 ++++++++----------- 1 file 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