diff options
| author | Ellie Hermaszewska <git@monoid.al> | 2021-10-26 18:20:34 +0800 |
|---|---|---|
| committer | Ellie Hermaszewska <git@monoid.al> | 2021-11-07 20:18:45 +0800 |
| commit | 15ae25f36ce057c1750f02e30bcd7b6dc38d523b (patch) | |
| tree | b185f546a252ee953c0902803bb9fd8a692b33c7 /pkgs/test | |
| parent | 518f09f2d0e8829c3ef77c0f535df309f49ed6d9 (diff) | |
| download | nixpkgs-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.tar nixpkgs-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.tar.gz nixpkgs-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.tar.bz2 nixpkgs-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.tar.lz nixpkgs-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.tar.xz nixpkgs-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.tar.zst nixpkgs-15ae25f36ce057c1750f02e30bcd7b6dc38d523b.zip | |
haskell: switch from haskell.lib to haskell.lib.compose
Diffstat (limited to 'pkgs/test')
| -rw-r--r-- | pkgs/test/haskell/documentationTarball/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/test/haskell/setBuildTarget/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/test/haskell/documentationTarball/default.nix b/pkgs/test/haskell/documentationTarball/default.nix index e3214fb49fe..33751028101 100644 --- a/pkgs/test/haskell/documentationTarball/default.nix +++ b/pkgs/test/haskell/documentationTarball/default.nix @@ -2,9 +2,9 @@ let drv = haskellPackages.vector; - docs = pkgs.haskell.lib.documentationTarball drv; + docs = pkgs.haskell.lib.compose.documentationTarball drv; -in pkgs.runCommand "test haskell.lib.documentationTarball" { +in pkgs.runCommand "test haskell.lib.compose.documentationTarball" { meta = { inherit (docs.meta) platforms; }; diff --git a/pkgs/test/haskell/setBuildTarget/default.nix b/pkgs/test/haskell/setBuildTarget/default.nix index 5a8391d0886..f0c78c51044 100644 --- a/pkgs/test/haskell/setBuildTarget/default.nix +++ b/pkgs/test/haskell/setBuildTarget/default.nix @@ -17,7 +17,7 @@ let drv = haskellPackages.callPackage pkgDef {}; test = target: excluded: - let only = pkgs.haskell.lib.setBuildTarget drv target; + let only = pkgs.haskell.lib.compose.setBuildTarget target drv; in '' if [[ ! -f "${only}/bin/${target}" ]]; then echo "${target} was not built" @@ -31,7 +31,7 @@ let ''; in -pkgs.runCommand "test haskell.lib.setBuildTarget" { +pkgs.runCommand "test haskell.lib.compose.setBuildTarget" { meta = { inherit (drv.meta) platforms; }; |