From af2eaf1ef908f76146674d71de41e95297b186bd Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 29 Sep 2013 22:37:33 +0200 Subject: [PATCH] llvm-general: remove version 3.3.5 --- .../libraries/haskell/llvm-general/3.3.5.nix | 21 ------------------- .../llvm-general/{3.3.8.2.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 6 +----- 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/llvm-general/3.3.5.nix rename pkgs/development/libraries/haskell/llvm-general/{3.3.8.2.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/llvm-general/3.3.5.nix b/pkgs/development/libraries/haskell/llvm-general/3.3.5.nix deleted file mode 100644 index 16d9859aae22..000000000000 --- a/pkgs/development/libraries/haskell/llvm-general/3.3.5.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ cabal, HUnit, llvmConfig, mtl, parsec, QuickCheck, setenv -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text -, transformers -}: - -cabal.mkDerivation (self: { - pname = "llvm-general"; - version = "3.3.5.0"; - sha256 = "15zrav7339jn6p75g1d7h3qkr1wyal1jzfs8xy73kckw2fzn4nlf"; - buildDepends = [ mtl parsec setenv text transformers ]; - testDepends = [ - HUnit mtl QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 - ]; - buildTools = [ llvmConfig ]; - meta = { - description = "General purpose LLVM bindings"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix b/pkgs/development/libraries/haskell/llvm-general/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix rename to pkgs/development/libraries/haskell/llvm-general/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c42e5b18508c..f3d7f43e85bc 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1406,13 +1406,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x ListZipper = callPackage ../development/libraries/haskell/ListZipper {}; - llvmGeneral_3_3_5 = callPackage ../development/libraries/haskell/llvm-general/3.3.5.nix { + llvmGeneral = callPackage ../development/libraries/haskell/llvm-general { llvmConfig = pkgs.llvm; }; - llvmGeneral_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general/3.3.8.2.nix { - llvmConfig = pkgs.llvm; - }; - llvmGeneral = self.llvmGeneral_3_3_8_2; llvmGeneralPure = callPackage ../development/libraries/haskell/llvm-general-pure {};