From 9547cdaadc4bb9b5340454032988cc1dc5300a14 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Aug 2013 21:47:01 +0200 Subject: [PATCH] haskell-language-c: drop obsolete version 0.3.2.1 --- .../libraries/haskell/language-c/0.3.2.1.nix | 16 ---------------- .../language-c/{0.4.2.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 8 ++------ 3 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/language-c/0.3.2.1.nix rename pkgs/development/libraries/haskell/language-c/{0.4.2.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix b/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix deleted file mode 100644 index 154bc68c3c5c..000000000000 --- a/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ cabal, alex, filepath, happy, syb }: - -cabal.mkDerivation (self: { - pname = "language-c"; - version = "0.3.2.1"; - sha256 = "1qk86p88p2jk1cbgl8p5g19ip3nh6z22ddj5jac58r5ny076iimx"; - buildDepends = [ filepath syb ]; - buildTools = [ alex happy ]; - meta = { - homepage = "http://www.sivity.net/projects/language.c/"; - description = "Analysis and generation of C code"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/language-c/0.4.2.nix b/pkgs/development/libraries/haskell/language-c/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/language-c/0.4.2.nix rename to pkgs/development/libraries/haskell/language-c/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index be9d8f415fc0..79045f14831f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -647,9 +647,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); bytestringProgress = callPackage ../development/libraries/haskell/bytestring-progress {}; - c2hs = callPackage ../development/libraries/haskell/c2hs { - languageC = self.languageC_0_3_2_1; - }; + c2hs = callPackage ../development/libraries/haskell/c2hs {}; Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix { cabal = self.cabal.override { Cabal = null; }; }; Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix { cabal = self.cabal.override { Cabal = null; }; }; @@ -1314,9 +1312,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); knob = callPackage ../development/libraries/haskell/knob {}; - languageC_0_4_2 = callPackage ../development/libraries/haskell/language-c/0.4.2.nix {}; - languageC_0_3_2_1 = callPackage ../development/libraries/haskell/language-c/0.3.2.1.nix {}; - languageC = self.languageC_0_4_2; + languageC = callPackage ../development/libraries/haskell/language-c {}; languageCQuote = callPackage ../development/libraries/haskell/language-c-quote {};