From daec67fbf58e2981c528c99bf27f4e58a8f4f39b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 11 May 2013 15:30:46 +0200 Subject: [PATCH] haskell-cuda: drop obsolete version 0.4.1.1 --- .../libraries/haskell/cuda/0.4.1.1.nix | 40 ------------------- .../haskell/cuda/{0.5.0.2.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 6 +-- 3 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/cuda/0.4.1.1.nix rename pkgs/development/libraries/haskell/cuda/{0.5.0.2.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/cuda/0.4.1.1.nix b/pkgs/development/libraries/haskell/cuda/0.4.1.1.nix deleted file mode 100644 index f03e1907ec0..00000000000 --- a/pkgs/development/libraries/haskell/cuda/0.4.1.1.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ cabal, c2hs, cudatoolkit, extensibleExceptions, nvidia_x11 }: - -cabal.mkDerivation (self: { - pname = "cuda"; - version = "0.4.1.1"; - sha256 = "05hhlnfyr30r1frsc15px38ijd1qvs125yjxvsi6q1kmmkq1w6y9"; - buildDepends = [ extensibleExceptions ]; - buildTools = [ c2hs ]; - extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.gcc ]; - doCheck = false; - # Perhaps this should be the default in cabal.nix ... - # - # The cudatoolkit provides both 64 and 32-bit versions of the - # library. GHC's linker fails if the wrong version is found first. - # We solve this by eliminating lib64 from the path on 32-bit - # platforms and putting lib64 first on 64-bit platforms. - libPaths = if self.stdenv.is64bit then "lib64 lib" else "lib"; - configurePhase = '' - for i in Setup.hs Setup.lhs; do - test -f $i && ghc --make $i - done - for p in $extraBuildInputs $propagatedNativeBuildInputs; do - if [ -d "$p/include" ]; then - extraLibDirs="$extraLibDirs --extra-include-dir=$p/include" - fi - for d in $libPaths; do - if [ -d "$p/$d" ]; then - extraLibDirs="$extraLibDirs --extra-lib-dir=$p/$d" - fi - done - done - ./Setup configure --verbose --prefix="$out" $libraryProfiling $extraLibDirs $configureFlags - ''; - meta = { - description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.stdenv.lib.platforms.none; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/cuda/0.5.0.2.nix b/pkgs/development/libraries/haskell/cuda/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/cuda/0.5.0.2.nix rename to pkgs/development/libraries/haskell/cuda/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e9730377a5c..5c7b31c31c6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -697,13 +697,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cryptoRandomApi = callPackage ../development/libraries/haskell/crypto-random-api {}; - cuda_0_4_1_1 = callPackage ../development/libraries/haskell/cuda/0.4.1.1.nix { + cuda = callPackage ../development/libraries/haskell/cuda { inherit (pkgs.linuxPackages) nvidia_x11; }; - cuda_0_5_0_2 = callPackage ../development/libraries/haskell/cuda/0.5.0.2.nix { - inherit (pkgs.linuxPackages) nvidia_x11; - }; - cuda = self.cuda_0_4_1_1; csv = callPackage ../development/libraries/haskell/csv {};