From 6bcfecbfa2aa131a4645b0e18d716f2c2ccac1cb Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Tue, 22 Sep 2020 20:35:39 +0900 Subject: [PATCH] tests.haskell-shellFor: get compiling again --- pkgs/test/haskell-shellFor/default.nix | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/test/haskell-shellFor/default.nix b/pkgs/test/haskell-shellFor/default.nix index 1b3de999d22..05d09d6f39c 100644 --- a/pkgs/test/haskell-shellFor/default.nix +++ b/pkgs/test/haskell-shellFor/default.nix @@ -1,7 +1,7 @@ -{ stdenv, haskellPackages, cabal-install }: +{ lib, stdenv, haskellPackages, cabal-install }: -haskellPackages.shellFor { - packages = p: [ p.database-id-class p.constraints-extras ]; +(haskellPackages.shellFor { + packages = p: [ p.database-id-class p.constraints ]; nativeBuildInputs = [ cabal-install ]; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; unpackPhase = '' @@ -9,16 +9,25 @@ haskellPackages.shellFor { mkdir -p "$sourceRoot" cd "$sourceRoot" tar -xf ${haskellPackages.database-id-class.src} - tar -xf ${haskellPackages.constraints-extras.src} - cp ${builtins.toFile "cabal.project" "packages: database-id-class* constraints-extras*"} cabal.project + tar -xf ${haskellPackages.constraints.src} + cp ${builtins.toFile "cabal.project" "packages: database-id-class* constraints*"} cabal.project ''; buildPhase = '' export HOME=$(mktemp -d) mkdir -p $HOME/.cabal touch $HOME/.cabal/config - cabal v2-build --offline --verbose database-id-class constraints-extras --ghc-options="-O0 -j$NIX_BUILD_CORES" + cabal v2-build --offline --verbose database-id-class constraints --ghc-options="-O0 -j$NIX_BUILD_CORES" ''; installPhase = '' touch $out ''; -} +}).overrideAttrs (oldAttrs: { + meta = + let + oldMeta = oldAttrs.meta or {}; + oldMaintainers = oldMeta.maintainers or []; + additionalMaintainers = with lib.maintainers; [ cdepillabout ]; + allMaintainers = oldMaintainers ++ additionalMaintainers; + in + oldMeta // { maintainers = allMaintainers; }; +})