From 9cc4b19ee67ccf6a7137d2570fc788f8cad8382b Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Mon, 15 Jan 2024 18:25:53 +0900 Subject: tests.haskell.shellFor: change from using linear to cereal The current version of linear (1.22) has incorrect constraints in its cabal file (which has been corrected in a revision), so it is causing this test to fail. This commit just switches to another arbitrary package (cereal) for the tests. --- pkgs/test/haskell/shellFor/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/test/haskell') diff --git a/pkgs/test/haskell/shellFor/default.nix b/pkgs/test/haskell/shellFor/default.nix index 83daf079cc0f2..82cd9e38e7315 100644 --- a/pkgs/test/haskell/shellFor/default.nix +++ b/pkgs/test/haskell/shellFor/default.nix @@ -1,7 +1,7 @@ { lib, writeText, haskellPackages, cabal-install }: (haskellPackages.shellFor { - packages = p: [ p.constraints p.linear ]; + packages = p: [ p.constraints p.cereal ]; # WARNING: When updating this, make sure that the libraries passed to # `extraDependencies` are not actually transitive dependencies of libraries in # `packages` above. We explicitly want to test that it is possible to specify @@ -14,8 +14,8 @@ mkdir -p "$sourceRoot" cd "$sourceRoot" tar -xf ${haskellPackages.constraints.src} - tar -xf ${haskellPackages.linear.src} - cp ${writeText "cabal.project" "packages: constraints* linear*"} cabal.project + tar -xf ${haskellPackages.cereal.src} + cp ${writeText "cabal.project" "packages: constraints* cereal*"} cabal.project ''; buildPhase = '' export HOME=$(mktemp -d) @@ -37,7 +37,7 @@ fi # Check packages arg - cabal v2-build --offline --verbose constraints linear --ghc-options="-O0 -j$NIX_BUILD_CORES" + cabal v2-build --offline --verbose constraints cereal --ghc-options="-O0 -j$NIX_BUILD_CORES" ''; installPhase = '' touch $out -- cgit 1.4.1