From 6b682a9e379c4e083ff20291f710a702b89d95ee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 10 Sep 2015 17:20:55 +0200 Subject: [PATCH] haskell-language-nix: pull this library in from Hackage --- .../haskell-modules/configuration-common.nix | 1 - .../tools/haskell/cabal2nix/language-nix.nix | 25 ------------------- 2 files changed, 26 deletions(-) delete mode 100644 pkgs/development/tools/haskell/cabal2nix/language-nix.nix diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1c56a00e96c..ea94ae8b35a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -757,7 +757,6 @@ self: super: { # Override the obsolete version from Hackage with our more up-to-date copy. 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 {}; distribution-nixpkgs = self.callPackage ../tools/haskell/cabal2nix/distribution-nixpkgs.nix {}; # https://github.com/urs-of-the-backwoods/HGamer3D/issues/7 diff --git a/pkgs/development/tools/haskell/cabal2nix/language-nix.nix b/pkgs/development/tools/haskell/cabal2nix/language-nix.nix deleted file mode 100644 index b1034cb0a6c..00000000000 --- a/pkgs/development/tools/haskell/cabal2nix/language-nix.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ mkDerivation, base, deepseq, doctest, fetchFromGitHub, lens -, pretty, QuickCheck, regex-posix, stdenv -}: - -mkDerivation rec { - pname = "language-nix"; - version = "20150903"; - src = fetchFromGitHub { - owner = "nixos"; - repo = "cabal2nix"; - rev = "v${version}"; - sha256 = "1cniaymgwz96bjchan49jv627wjbymc3vs48w1p19qj2k9rly6q7"; - }; - postUnpack = "sourceRoot+=/${pname}"; - libraryHaskellDepends = [ - base deepseq doctest lens pretty QuickCheck regex-posix - ]; - testHaskellDepends = [ - base deepseq doctest lens pretty QuickCheck regex-posix - ]; - homepage = "https://github.com/nixos/cabal2nix#readme"; - description = "Data types and useful functions to represent and manipulate the Nix language"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ simons ]; -}