summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2019-08-13 20:00:59 +0200
committerPeter Simons <simons@cryp.to>2019-08-13 20:01:38 +0200
commit705b5cd05d1be32b83cfc097732214ce6cc35790 (patch)
tree147dbe505ad195e3ecb1be45f58cb92ec2e4fdce
parent72c55dda974d65b99e777ed227fad713414f98bd (diff)
downloadnixpkgs-705b5cd05d1be32b83cfc097732214ce6cc35790.tar
nixpkgs-705b5cd05d1be32b83cfc097732214ce6cc35790.tar.gz
nixpkgs-705b5cd05d1be32b83cfc097732214ce6cc35790.tar.bz2
nixpkgs-705b5cd05d1be32b83cfc097732214ce6cc35790.tar.lz
nixpkgs-705b5cd05d1be32b83cfc097732214ce6cc35790.tar.xz
nixpkgs-705b5cd05d1be32b83cfc097732214ce6cc35790.tar.zst
nixpkgs-705b5cd05d1be32b83cfc097732214ce6cc35790.zip
darcs: fix build
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix.yaml2
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix4
3 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9f58d819bb0..779788785d0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1279,4 +1279,7 @@ self: super: {
   # https://github.com/sol/hpack/issues/366
   hpack = dontCheck super.hpack;
 
+  # QuickCheck >=2.3 && <2.13, hspec >=2.1 && <2.7
+  graphviz = dontCheck super.graphviz;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index a8f462571f0..d6344717dfa 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -4100,7 +4100,6 @@ broken-packages:
   - Dao
   - dao
   - dapi
-  - darcs
   - darcs-benchmark
   - darcs-beta
   - darcs-buildpackage
@@ -5248,7 +5247,6 @@ broken-packages:
   - graphql
   - graphql-api
   - graphtype
-  - graphviz
   - graql
   - grasp
   - gray-code
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index e1c70c608dd..62e2ff6c53b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -61840,8 +61840,6 @@ self: {
        '';
        description = "a distributed, interactive, smart revision control system";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) curl;};
 
   "darcs-benchmark" = callPackage
@@ -99289,8 +99287,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq text ];
        description = "Bindings to Graphviz for graph visualisation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) graphviz;};
 
   "graql" = callPackage