summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-nix.nix
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2017-02-18 12:48:05 -0600
committerThomas Tuegel <ttuegel@mailbox.org>2017-02-18 12:48:05 -0600
commitfd0e0cdc761d1edb0f02b0f5d2d04f557d06711b (patch)
treec95121f6ea5837f095e09c96a6a1c4c0a2ae816f /pkgs/development/haskell-modules/configuration-nix.nix
parent32560d26998fb593d512ac8dce0946486bb299f1 (diff)
downloadnixlib-fd0e0cdc761d1edb0f02b0f5d2d04f557d06711b.tar
nixlib-fd0e0cdc761d1edb0f02b0f5d2d04f557d06711b.tar.gz
nixlib-fd0e0cdc761d1edb0f02b0f5d2d04f557d06711b.tar.bz2
nixlib-fd0e0cdc761d1edb0f02b0f5d2d04f557d06711b.tar.lz
nixlib-fd0e0cdc761d1edb0f02b0f5d2d04f557d06711b.tar.xz
nixlib-fd0e0cdc761d1edb0f02b0f5d2d04f557d06711b.tar.zst
nixlib-fd0e0cdc761d1edb0f02b0f5d2d04f557d06711b.zip
Revert "haskell: add nix-specific fixes for various packages in stackage"
This reverts commit 17c5ca9018619d819c48e25add78f47d7d575611.

This commit causes an evaluation error due to infinite recursion, which can be
tested by running:
```
$ nix-env -f . -qa \* --meta --xml --drv-path --show-trace > /dev/null
```
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-nix.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-nix.nix60
1 files changed, 2 insertions, 58 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index c62d2702b44e..bd74e0e6e04d 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -167,13 +167,6 @@ self: super: builtins.intersectAttrs super {
   http-client-tls = dontCheck super.http-client-tls;
   http-conduit = dontCheck super.http-conduit;
   transient-universe = dontCheck super.transient-universe;
-  typed-process = dontCheck super.typed-process;
-  js-jquery = dontCheck super.js-jquery;
-  hPDB-examples = dontCheck super.hPDB-examples;
-  configuration-tools = dontCheck super.configuration-tools; # https://github.com/alephcloud/hs-configuration-tools/issues/40
-  tcp-streams = dontCheck super.tcp-streams;
-  holy-project = dontCheck super.holy-project;
-  mustache = dontCheck super.mustache;
 
   # Tries to mess with extended POSIX attributes, but can't in our chroot environment.
   xattr = dontCheck super.xattr;
@@ -385,62 +378,13 @@ self: super: builtins.intersectAttrs super {
   idris = overrideCabal super.idris (drv: {
     # https://github.com/idris-lang/Idris-dev/issues/2499
     librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
-
-    # tests and build run executable, so need to set LD_LIBRARY_PATH
-    preBuild = ''
-      export LD_LIBRARY_PATH="$PWD/dist/build:$LD_LIBRARY_PATH"
-    '';
   });
 
   libsystemd-journal = overrideCabal super.libsystemd-journal (old: {
     librarySystemDepends = old.librarySystemDepends or [] ++ [ pkgs.systemd ];
   });
 
-  # does not specify tests in cabal file, instead has custom runTest cabal hook,
-  # so cabal2nix will not detect test dependencies.
-  either-unwrap = overrideCabal super.either-unwrap (drv: {
-    testHaskellDepends = (drv.testHaskellDepends or []) ++ [ self.test-framework self.test-framework-hunit ];
-  });
-
-  hidapi = addExtraLibrary super.hidapi pkgs.libudev;
-
-  hs-GeoIP = super.hs-GeoIP.override { GeoIP = pkgs.geoipWithDatabase; };
-
-  discount = super.discount.override { markdown = pkgs.discount; };
-
-  # tests require working stack installation with all-cabal-hashes cloned in $HOME
-  stackage-curator = dontCheck super.stackage-curator;
-
-  # hardcodes /usr/bin/tr: https://github.com/snapframework/io-streams/pull/59
-  io-streams = enableCabalFlag super.io-streams "NoInteractiveTests";
-
-  # requires autotools to build
-  secp256k1 = addBuildTools super.secp256k1 [ pkgs.autoconf pkgs.automake pkgs.libtool ];
-
-  # tests require git
-  hapistrano = addBuildTool super.hapistrano pkgs.git;
-
-  # requires webkitgtk API version 3 (webkitgtk 2.4 is the latest webkit supporting that version)
-  gi-javascriptcore = super.gi-javascriptcore.override { webkitgtk = pkgs.webkitgtk24x; };
-  gi-webkit = super.gi-webkit.override { webkit = pkgs.webkitgtk24x; };
-
-  # requires valid, writeable $HOME
-  hatex-guide = overrideCabal super.hatex-guide (drv: {
-    preConfigure = ''
-      ${drv.preConfigure or ""}
-      export HOME=$PWD
-    '';
-  });
-
-  # Fails to link against with newer gsl versions because a deprecrated function
-  # was removed
-  hmatrix-gsl = super.hmatrix-gsl.override { gsl = pkgs.gsl_1; };
+  # Needs network in tests.
+  typed-process = dontCheck super.typed-process;
 
-  # tests run executable, relying on PATH
-  # without this, tests fail with "Couldn't launch intero process"
-  intero = overrideCabal super.intero (drv: {
-    preCheck = ''
-      export PATH="$PWD/dist/build/intero:$PATH"
-    '';
-  });
 }