summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2015-09-10 15:11:17 +0200
committerPeter Simons <simons@cryp.to>2015-09-11 10:28:30 +0200
commitf6fd6defa5c91abdd2ec3fb344c1d3bd7690a1c7 (patch)
tree7f689f886a1c2e023800969463845eabaac7280c /pkgs/development
parenteb5657e5a2f76e4341e1a81b27de2b1455313b1a (diff)
downloadnixpkgs-f6fd6defa5c91abdd2ec3fb344c1d3bd7690a1c7.tar
nixpkgs-f6fd6defa5c91abdd2ec3fb344c1d3bd7690a1c7.tar.gz
nixpkgs-f6fd6defa5c91abdd2ec3fb344c1d3bd7690a1c7.tar.bz2
nixpkgs-f6fd6defa5c91abdd2ec3fb344c1d3bd7690a1c7.tar.lz
nixpkgs-f6fd6defa5c91abdd2ec3fb344c1d3bd7690a1c7.tar.xz
nixpkgs-f6fd6defa5c91abdd2ec3fb344c1d3bd7690a1c7.tar.zst
nixpkgs-f6fd6defa5c91abdd2ec3fb344c1d3bd7690a1c7.zip
haskell-nix-paths: pull the library in from Hackage now that it's been published
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix1
-rw-r--r--pkgs/development/tools/haskell/cabal2nix/nix-paths.nix19
2 files changed, 0 insertions, 20 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index dca155e6988..1c56a00e96c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -755,7 +755,6 @@ self: super: {
   zlib = dontCheck super.zlib;
 
   # Override the obsolete version from Hackage with our more up-to-date copy.
-  nix-paths = self.callPackage ../tools/haskell/cabal2nix/nix-paths.nix {};
   cabal2nix = self.callPackage ../tools/haskell/cabal2nix/cabal2nix.nix {};
   hackage2nix = self.callPackage ../tools/haskell/cabal2nix/hackage2nix.nix {};
   language-nix = self.callPackage ../tools/haskell/cabal2nix/language-nix.nix {};
diff --git a/pkgs/development/tools/haskell/cabal2nix/nix-paths.nix b/pkgs/development/tools/haskell/cabal2nix/nix-paths.nix
deleted file mode 100644
index f6d27857ee3..00000000000
--- a/pkgs/development/tools/haskell/cabal2nix/nix-paths.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ mkDerivation, base, fetchFromGitHub, nix, stdenv }:
-
-mkDerivation rec {
-  pname = "nix-paths";
-  version = "1";
-  src = fetchFromGitHub {
-    owner = "nixos";
-    repo = "cabal2nix";
-    rev = "c475c17fa5f8dfc16c694fb0264486f94cbf2c5e";
-    sha256 = "0skqdka1ibgwf33b23ibz93g5h6mbv31p1rbqz66j8qgxsvcgrkg";
-  };
-  postUnpack = "sourceRoot+=/${pname}";
-  libraryHaskellDepends = [ base ];
-  libraryToolDepends = [ nix ];
-  homepage = "https://github.com/nixos/cabal2nix#readme";
-  description = "Knowledge of Nix's installation directories";
-  license = stdenv.lib.licenses.bsd3;
-  maintainers = with stdenv.lib.maintainers; [ simons ];
-}