diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/3.3.8.2.nix b/pkgs/development/libraries/haskell/llvm-general-pure/3.3.8.2.nix deleted file mode 100644 index 37b6d6b60c59..000000000000 --- a/pkgs/development/libraries/haskell/llvm-general-pure/3.3.8.2.nix +++ /dev/null @@ -1,23 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, HUnit, mtl, parsec, QuickCheck, setenv, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2, transformers -}: - -cabal.mkDerivation (self: { - pname = "llvm-general-pure"; - version = "3.3.8.2"; - sha256 = "171mp9rydw6r2khcmvkcfjk934ckfahwyx1b4a15gmj8sr1s9hzp"; - buildDepends = [ mtl parsec setenv transformers ]; - testDepends = [ - HUnit mtl QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 - ]; - doCheck = false; - meta = { - description = "Pure Haskell LLVM functionality (no FFI)"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.4.0.nix b/pkgs/development/libraries/haskell/llvm-general-pure/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/llvm-general-pure/3.4.4.0.nix rename to pkgs/development/libraries/haskell/llvm-general-pure/default.nix diff --git a/pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix b/pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix deleted file mode 100644 index 4669358ccbf5..000000000000 --- a/pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix +++ /dev/null @@ -1,27 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, HUnit, llvmConfig, llvmGeneralPure, mtl, parsec -, QuickCheck, setenv, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2, transformers, utf8String -}: - -cabal.mkDerivation (self: { - pname = "llvm-general"; - version = "3.3.8.2"; - sha256 = "11qnvpnx4i8mjdgn5y58rl70wf8pzmd555hrdaki1f4q0035cmm5"; - buildDepends = [ - llvmGeneralPure mtl parsec setenv transformers utf8String - ]; - testDepends = [ - HUnit llvmGeneralPure mtl QuickCheck testFramework - testFrameworkHunit testFrameworkQuickcheck2 - ]; - buildTools = [ llvmConfig ]; - doCheck = false; - meta = { - description = "General purpose LLVM bindings"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/llvm-general/3.4.4.0.nix b/pkgs/development/libraries/haskell/llvm-general/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/llvm-general/3.4.4.0.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 f4ec20de3221..0e477d3c1690 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1584,19 +1584,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in ListZipper = callPackage ../development/libraries/haskell/ListZipper {}; - # Needed for idris for now - llvmGeneral_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general/3.3.8.2.nix { - llvmConfig = pkgs.llvm_33; - llvmGeneralPure = self.llvmGeneralPure_3_3_8_2; - }; - llvmGeneral_3_4_4_0 = callPackage ../development/libraries/haskell/llvm-general/3.4.4.0.nix { - llvmConfig = pkgs.llvm; - }; - llvmGeneral = self.llvmGeneral_3_4_4_0; + llvmGeneral = callPackage ../development/libraries/haskell/llvm-general { llvmConfig = pkgs.llvm; }; - llvmGeneralPure_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.8.2.nix {}; - llvmGeneralPure_3_4_4_0 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.4.0.nix {}; - llvmGeneralPure = self.llvmGeneralPure_3_4_4_0; + llvmGeneralPure = callPackage ../development/libraries/haskell/llvm-general-pure {}; lrucache = callPackage ../development/libraries/haskell/lrucache {};