Skip to content
Snippets Groups Projects
Commit 23a079ab authored by Ben Gamari's avatar Ben Gamari :turtle:
Browse files

Merge branch 'test-all' into 'master'

nix: Rip out brokenPackages

See merge request ghc/head.hackage!6
parents 2f65d0a6 7c9e0210
No related branches found
No related tags found
No related merge requests found
......@@ -60,7 +60,7 @@ let
in map import inputs;
# All Haskell packages built with the HEAD compiler.
haskellPackages = nixpkgs.haskellPackages;
haskellPackages = nixpkgs.haskellPackages.extend(sel: sup: {terminfo = null;});
# The packages which we are here to test
testedPackages = with nixpkgs.haskell.lib; with haskellPackages; {
......@@ -81,12 +81,7 @@ let
parts = builtins.match "([a-zA-Z0-9-]+)-.*" patchFile;
pkgName = builtins.elemAt parts 0;
in lib.nameValuePair pkgName haskellPackages."${pkgName}";
brokenPackages = [
# vty isn't applied to its terminfo argument for some reason and I
# can't convinced vty.override to apply it.
"vty"
];
in builtins.removeAttrs (lib.mapAttrs' toPackageAttr (builtins.readDir ../patches)) brokenPackages;
in lib.mapAttrs' toPackageAttr (builtins.readDir ../patches);
inherit (nixpkgs) lib;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment