diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-07-26 00:13:28 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-26 00:13:28 +0000 |
commit | cde91a5dd2c5ca36e9fccb16a2e19c2aefa3f302 (patch) | |
tree | bccb1827ae6d5654f5affd686fc4177f13d56727 /pkgs/test/haskell | |
parent | e31a4d909d1fae09ba0f5be643f08f4f4e685678 (diff) | |
parent | a9b47d85504bdd199e90846622c76aa0bfeabfac (diff) |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/test/haskell')
-rw-r--r-- | pkgs/test/haskell/default.nix | 1 | ||||
-rw-r--r-- | pkgs/test/haskell/writers/default.nix | 26 |
2 files changed, 0 insertions, 27 deletions
diff --git a/pkgs/test/haskell/default.nix b/pkgs/test/haskell/default.nix index 9eabd9644bed..8f1f21d65b51 100644 --- a/pkgs/test/haskell/default.nix +++ b/pkgs/test/haskell/default.nix @@ -5,7 +5,6 @@ lib.recurseIntoAttrs { cabalSdist = callPackage ./cabalSdist { }; documentationTarball = callPackage ./documentationTarball { }; setBuildTarget = callPackage ./setBuildTarget { }; - writers = callPackage ./writers { }; incremental = callPackage ./incremental { }; upstreamStackHpackVersion = callPackage ./upstreamStackHpackVersion { }; } diff --git a/pkgs/test/haskell/writers/default.nix b/pkgs/test/haskell/writers/default.nix deleted file mode 100644 index f05fda4bc736..000000000000 --- a/pkgs/test/haskell/writers/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -# Wrap only the haskell-related tests from tests.writers -# in their own derivation for Hydra CI in the haskell-updates -# jobset. Can presumably removed as soon as tests.writers is -# always green on darwin as well: -# https://github.com/NixOS/nixpkgs/issues/126182 -{ runCommand, tests }: - -let - inherit (tests.writers) - writeTest - bin - simple - path - ; -in - -runCommand "test-haskell-writers" { - meta = { - inherit (tests.writers.meta) platforms; - }; -} '' - ${writeTest "success" "test-haskell-bin-writer" "${bin.haskell}/bin/${bin.haskell.name}"} - ${writeTest "success" "test-haskell-simple-writer" simple.haskell} - ${writeTest "success" "test-haskell-path-writer" path.haskell} - touch $out -'' |