diff --git a/pkgs/development/libraries/haskell/language-c-quote/0.4.4.nix b/pkgs/development/libraries/haskell/language-c-quote/0.4.4.nix deleted file mode 100644 index fc8c15edf57..00000000000 --- a/pkgs/development/libraries/haskell/language-c-quote/0.4.4.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ cabal, alex, exceptionMtl, exceptionTransformers, filepath, happy -, haskellSrcMeta, HUnit, mainlandPretty, mtl, srcloc, syb, symbol -, testFramework, testFrameworkHunit -}: - -cabal.mkDerivation (self: { - pname = "language-c-quote"; - version = "0.4.4"; - sha256 = "1g233ja3qy64xcimy9irfb3n8zys00vg1d0s4g3hr48ilc95dl8l"; - buildDepends = [ - exceptionMtl exceptionTransformers filepath haskellSrcMeta - mainlandPretty mtl srcloc syb symbol - ]; - testDepends = [ - HUnit srcloc symbol testFramework testFrameworkHunit - ]; - buildTools = [ alex happy ]; - jailbreak = true; - meta = { - homepage = "http://www.eecs.harvard.edu/~mainland/"; - description = "C/CUDA/OpenCL quasiquoting library"; - 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-quote/0.7.1.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/language-c-quote/0.7.1.nix rename to pkgs/development/libraries/haskell/language-c-quote/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index dba94cdc975..e9730377a5c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -457,9 +457,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); accelerate = callPackage ../development/libraries/haskell/accelerate {}; - accelerateCuda = callPackage ../development/libraries/haskell/accelerate-cuda { - languageCQuote = self.languageCQuote_0_4_4; - }; + accelerateCuda = callPackage ../development/libraries/haskell/accelerate-cuda {}; accelerateExamples = callPackage ../development/libraries/haskell/accelerate-examples {}; @@ -1215,9 +1213,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); languageC_0_3_2_1 = callPackage ../development/libraries/haskell/language-c/0.3.2.1.nix {}; languageC = self.languageC_0_4_2; - languageCQuote_0_4_4 = callPackage ../development/libraries/haskell/language-c-quote/0.4.4.nix {}; - languageCQuote_0_7_1 = callPackage ../development/libraries/haskell/language-c-quote/0.7.1.nix {}; - languageCQuote = self.languageCQuote_0_7_1; + languageCQuote = callPackage ../development/libraries/haskell/language-c-quote {}; languageJavascript = callPackage ../development/libraries/haskell/language-javascript {};