diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index feb7aa2ef940..7628751f973f 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -354,6 +354,10 @@ builtins.intersectAttrs super { (overrideCabal (old: { # Doesn't declare boost dependency pkg-configDepends = (old.pkg-configDepends or [ ]) ++ [ pkgs.boost.dev ]; + + passthru = old.passthru or { } // { + tests.lix = pkgs.lixPackageSets.stable.nix-serve-ng; + }; })) ]; diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index efc0ef628b0a..8877fa03b6ed 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -17,6 +17,8 @@ nixpkgs-review, nix-direnv, nix-fast-build, + haskell, + nix-serve-ng, colmena, storeDir ? "/nix/store", @@ -110,6 +112,15 @@ let inherit (self) nix-eval-jobs; }; + nix-serve-ng = lib.pipe (nix-serve-ng.override { nix = self.lix; }) [ + (haskell.lib.compose.enableCabalFlag "lix") + (haskell.lib.compose.overrideCabal (drv: { + # https://github.com/aristanetworks/nix-serve-ng/issues/46 + # Resetting (previous) broken flag since it may be related to C++ Nix + broken = lib.versionAtLeast self.lix.version "2.93"; + })) + ]; + colmena = colmena.override { nix = self.lix; inherit (self) nix-eval-jobs;