Author: andres
Date: Sun May 20 17:38:03 2012
New Revision: 34186
URL: https://nixos.org/websvn/nix/?rev=34186&sc=1
Log:
Adding NVIDIA CUDA toolkit and haskell-accelerate-cuda plus deps.
Added:
nixpkgs/trunk/pkgs/development/compilers/cudatoolkit/
nixpkgs/trunk/pkgs/development/compilers/cudatoolkit/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/accelerate/
nixpkgs/trunk/pkgs/development/libraries/haskell/accelerate-cuda/
nixpkgs/trunk/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/accelerate-examples/
nixpkgs/trunk/pkgs/development/libraries/haskell/accelerate-examples/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/accelerate-io/
nixpkgs/trunk/pkgs/development/libraries/haskell/accelerate-io/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/accelerate/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/cuda/
nixpkgs/trunk/pkgs/development/libraries/haskell/cuda/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/exception-mtl/
nixpkgs/trunk/pkgs/development/libraries/haskell/exception-mtl/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/exception-transformers/
nixpkgs/trunk/pkgs/development/libraries/haskell/exception-transformers/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/language-c-quote/
nixpkgs/trunk/pkgs/development/libraries/haskell/language-c-quote/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix
- copied, changed from r34185,
nixpkgs/trunk/pkgs/development/libraries/haskell/language-c/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/language-c/0.4.2.nix
- copied, changed from r34185,
nixpkgs/trunk/pkgs/development/libraries/haskell/language-c/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/mainland-pretty/
nixpkgs/trunk/pkgs/development/libraries/haskell/mainland-pretty/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/pgm/
nixpkgs/trunk/pkgs/development/libraries/haskell/pgm/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/srcloc/
nixpkgs/trunk/pkgs/development/libraries/haskell/srcloc/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/symbol/
nixpkgs/trunk/pkgs/development/libraries/haskell/symbol/default.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/language-c/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added: nixpkgs/trunk/pkgs/development/compilers/cudatoolkit/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/compilers/cudatoolkit/default.nix Sun May
20 17:38:03 2012 (r34186)
@@ -0,0 +1,52 @@
+{ stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib
+, xlibs, fontconfig, freetype, unixODBC, alsaLib
+} :
+
+stdenv.mkDerivation rec {
+ name = "cudatoolkit-4.2.9";
+
+ dontPatchELF = true;
+ dontStrip = true;
+
+ src =
+ if stdenv.system == "x86_64-linux" then
+ fetchurl {
+ url =
http://developer.download.nvidia.com/compute/cuda/4_2/rel/toolkit/cudatoolkit_4.2.9_linux_64_suse11.2.run;
+ sha256 = "1inngzwq520bhpdfrh5bm4cxfyf3hxj94jialjxgviri5bj9hz60";
+ }
+ else throw "cudatoolkit does not support platform ${stdenv.system}";
+
+ buildInputs = [ perl ];
+
+ runtimeDependencies = [
+ ncurses expat python zlib
+ xlibs.libX11 xlibs.libXext xlibs.libXrender xlibs.libXt xlibs.libXtst
xlibs.libXi xlibs.libXext
+ fontconfig freetype unixODBC alsaLib
+ ];
+
+ rpath = "${stdenv.lib.makeLibraryPath
runtimeDependencies}:${stdenv.gcc.gcc}/lib64";
+
+ unpackPhase = ''
+ sh $src --keep --noexec
+ cd pkg
+ '';
+
+ buildPhase = ''
+ find . -type f -executable -exec patchelf \
+ --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+ '{}' \; || true
+ find . -type f -exec patchelf \
+ --set-rpath $rpath:$out/lib:$out/lib64:$(cat
$NIX_GCC/nix-support/orig-gcc)/lib \
+ --force-rpath \
+ '{}' \; || true
+ '';
+
+ installPhase = ''
+ mkdir $out
+ perl ./install-linux.pl --prefix="$out"
+ '';
+
+ meta = {
+ license = [ "nonfree" ];
+ };
+}
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/accelerate-cuda/default.nix
Sun May 20 17:38:03 2012 (r34186)
@@ -0,0 +1,23 @@
+{ cabal, accelerate, binary, blazeBuilder, cryptohash, cuda
+, fclabels, filepath, hashable, hashtables, languageCQuote
+, mainlandPretty, mtl, srcloc, symbol, transformers
+, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+ pname = "accelerate-cuda";
+ version = "0.12.0.0";
+ sha256 = "1h8rx8jcv3x7hg8fr23fzy59lcv72rb914vyczs40bgfr4cgdaaa";
+ buildDepends = [
+ accelerate binary blazeBuilder cryptohash cuda fclabels filepath
+ hashable hashtables languageCQuote mainlandPretty mtl srcloc symbol
+ transformers unorderedContainers
+ ];
+ meta = {
+ homepage = "http://www.cse.unsw.edu.au/~chak/project/accelerate/";;
+ description = "Accelerate backend for NVIDIA GPUs";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/accelerate-examples/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/accelerate-examples/default.nix
Sun May 20 17:38:03 2012 (r34186)
@@ -0,0 +1,27 @@
+{ cabal, accelerate, accelerateCuda, accelerateIo
+, attoparsec, bmp, bytestringLexing, cmdargs, criterion, cuda
+, deepseq, fclabels, filepath, gloss, hashtables, mtl, mwcRandom
+, pgm, QuickCheck, random, testFramework, testFrameworkQuickcheck2
+, vector, vectorAlgorithms
+}:
+
+cabal.mkDerivation (self: {
+ pname = "accelerate-examples";
+ version = "0.12.0.0";
+ sha256 = "08mkfr46vl8vgcsxvmbs499frvybfq0chbcj1chpb8rwy8w9fa9h";
+ isLibrary = false;
+ isExecutable = true;
+ buildDepends = [
+ accelerate accelerateCuda accelerateIo attoparsec
+ bmp bytestringLexing cmdargs criterion cuda deepseq fclabels
+ filepath gloss hashtables mtl mwcRandom pgm QuickCheck random
+ testFramework testFrameworkQuickcheck2 vector vectorAlgorithms
+ ];
+ meta = {
+ homepage = "http://www.cse.unsw.edu.au/~chak/project/accelerate/";;
+ description = "Examples using the Accelerate library";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/accelerate-io/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/accelerate-io/default.nix
Sun May 20 17:38:03 2012 (r34186)
@@ -0,0 +1,15 @@
+{ cabal, accelerate, repa, vector }:
+
+cabal.mkDerivation (self: {
+ pname = "accelerate-io";
+ version = "0.12.0.0";
+ sha256 = "0jc6vcxmji11kj041cds6j90by3mvaybswgmsiflxdlf4zlagd6h";
+ buildDepends = [ accelerate repa vector ];
+ meta = {
+ homepage = "http://www.cse.unsw.edu.au/~chak/project/accelerate/";;
+ description = "Read and write Accelerate arrays in various formats";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/accelerate/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/accelerate/default.nix
Sun May 20 17:38:03 2012 (r34186)
@@ -0,0 +1,14 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+ pname = "accelerate";
+ version = "0.12.0.0";
+ sha256 = "1hb1zqsh8598brnjhdds8knp9dfsdlshrx5c7lj4pgl37gqyb5q5";
+ meta = {
+ homepage = "https://github.com/AccelerateHS/accelerate/";;
+ description = "An embedded language for accelerated array processing";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/cuda/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/cuda/default.nix Sun May
20 17:38:03 2012 (r34186)
@@ -0,0 +1,43 @@
+{ cabal, c2hs, cudatoolkit, extensibleExceptions, nvidia_x11 }:
+
+cabal.mkDerivation (self: {
+ pname = "cuda";
+ version = "0.4.1.0";
+ sha256 = "1drr95d4v3khidxr6na5vyq28bv5rqk2n676q0bydc4rqwhb1z6w";
+ buildDepends = [ extensibleExceptions ];
+ buildTools = [ c2hs ];
+ extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.gcc ];
+ # 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 $propagatedBuildNativeInputs; 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.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/exception-mtl/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/exception-mtl/default.nix
Sun May 20 17:38:03 2012 (r34186)
@@ -0,0 +1,15 @@
+{ cabal, exceptionTransformers, mtl, transformers }:
+
+cabal.mkDerivation (self: {
+ pname = "exception-mtl";
+ version = "0.3.0.2";
+ sha256 = "1mhk1z7hz50h8ssr4s7dzdxzn02rr0njxijdddfjjw71fln3nl5h";
+ buildDepends = [ exceptionTransformers mtl transformers ];
+ meta = {
+ homepage = "http://www.eecs.harvard.edu/~mainland/";;
+ description = "Exception monad transformer instances for mtl2 classes";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/exception-transformers/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/exception-transformers/default.nix
Sun May 20 17:38:03 2012 (r34186)
@@ -0,0 +1,15 @@
+{ cabal, stm, transformers }:
+
+cabal.mkDerivation (self: {
+ pname = "exception-transformers";
+ version = "0.3.0.2";
+ sha256 = "1ah3dimnc980vkr2lycpl4nsb615gxqws6mv9j90mz6g165h9khf";
+ buildDepends = [ stm transformers ];
+ meta = {
+ homepage = "http://www.eecs.harvard.edu/~mainland/";;
+ description = "Type classes and monads for unchecked extensible
exceptions";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/language-c-quote/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/language-c-quote/default.nix
Sun May 20 17:38:03 2012 (r34186)
@@ -0,0 +1,21 @@
+{ cabal, alex, exceptionMtl, exceptionTransformers, filepath, happy
+, haskellSrcMeta, mainlandPretty, mtl, srcloc, syb, symbol
+}:
+
+cabal.mkDerivation (self: {
+ pname = "language-c-quote";
+ version = "0.3.1.0";
+ sha256 = "0y3zfc43izvalm1lrbk286nmg4s3vgpj5v2j6j2saz3c7l2ly8z6";
+ buildDepends = [
+ exceptionMtl exceptionTransformers filepath haskellSrcMeta
+ mainlandPretty mtl srcloc syb symbol
+ ];
+ buildTools = [ alex happy ];
+ 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 ];
+ };
+})
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix (from
r34185, nixpkgs/trunk/pkgs/development/libraries/haskell/language-c/default.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/language-c/default.nix
Sun May 20 03:23:31 2012 (r34185, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix
Sun May 20 17:38:03 2012 (r34186)
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "language-c";
- version = "0.4.2";
- sha256 = "07pf4v4n7kvr5inkhs24b7g55pmkk4k5ihi6s5dbc200l01wz133";
+ version = "0.3.2.1";
+ sha256 = "1qk86p88p2jk1cbgl8p5g19ip3nh6z22ddj5jac58r5ny076iimx";
buildDepends = [ filepath syb ];
buildTools = [ alex happy ];
meta = {
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/language-c/0.4.2.nix (from
r34185, nixpkgs/trunk/pkgs/development/libraries/haskell/language-c/default.nix)
==============================================================================
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/mainland-pretty/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/mainland-pretty/default.nix
Sun May 20 17:38:03 2012 (r34186)
@@ -0,0 +1,15 @@
+{ cabal, srcloc, symbol }:
+
+cabal.mkDerivation (self: {
+ pname = "mainland-pretty";
+ version = "0.1.2.0";
+ sha256 = "0qhv8qfzcm5n1scgmxsv1c2qqnhvp8r0hmax22vzaq7jmlzwhj4p";
+ buildDepends = [ srcloc symbol ];
+ meta = {
+ homepage = "http://www.eecs.harvard.edu/~mainland/";;
+ description = "Pretty printing designed for printing source code";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/pgm/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/pgm/default.nix Sun May
20 17:38:03 2012 (r34186)
@@ -0,0 +1,15 @@
+{ cabal, parsec }:
+
+cabal.mkDerivation (self: {
+ pname = "pgm";
+ version = "0.1.3";
+ sha256 = "1byq8bacqgdpahf57ccwwa45wf9ij0kkgp89rg9flsv1g10364d4";
+ buildDepends = [ parsec ];
+ meta = {
+ homepage = "https://github.com/sergeyastanin/haskell-pgm";;
+ description = "Pure Haskell implementation of PGM image format";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/srcloc/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/srcloc/default.nix Sun May
20 17:38:03 2012 (r34186)
@@ -0,0 +1,15 @@
+{ cabal, syb, symbol }:
+
+cabal.mkDerivation (self: {
+ pname = "srcloc";
+ version = "0.1.1.1";
+ sha256 = "131g83sa0kjwy4bz6hcaxplywqd0899sw5r5x0nr0bffkhk91k60";
+ buildDepends = [ syb symbol ];
+ meta = {
+ homepage = "http://www.eecs.harvard.edu/~mainland/";;
+ description = "Data types for managing source code locations";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/symbol/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/symbol/default.nix Sun May
20 17:38:03 2012 (r34186)
@@ -0,0 +1,15 @@
+{ cabal, syb }:
+
+cabal.mkDerivation (self: {
+ pname = "symbol";
+ version = "0.1.1.1";
+ sha256 = "1vda97jh9jrvb4l9v9m3xzv8z96jdwf5fji643i6ff3n3h9ysn77";
+ buildDepends = [ syb ];
+ meta = {
+ homepage = "http://www.eecs.harvard.edu/~mainland/";;
+ description = "A 'Symbol' type for fast symbol comparison";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.ghc.meta.platforms;
+ maintainers = [ self.stdenv.lib.maintainers.andres ];
+ };
+})
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun May 20 03:23:31
2012 (r34185)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun May 20 17:38:03
2012 (r34186)
@@ -544,6 +544,10 @@
cron = callPackage ../tools/system/cron { # see also fcron
};
+ cudatoolkit = callPackage ../development/compilers/cudatoolkit {
+ python = python26;
+ };
+
curl = makeOverridable (import ../tools/networking/curl) rec {
fetchurl = fetchurlBoot;
inherit stdenv zlib openssl libssh2;
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun May 20 03:23:31
2012 (r34185)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun May 20 17:38:03
2012 (r34186)
@@ -356,6 +356,14 @@
haskellSrcExts = self.haskellSrcExts_1_11_1;
};
+ accelerate = callPackage ../development/libraries/haskell/accelerate {};
+
+ accelerateCuda = callPackage
../development/libraries/haskell/accelerate-cuda {};
+
+ accelerateExamples = callPackage
../development/libraries/haskell/accelerate-examples {};
+
+ accelerateIo = callPackage ../development/libraries/haskell/accelerate-io {};
+
ACVector = callPackage ../development/libraries/haskell/AC-Vector {};
abstractDeque = callPackage ../development/libraries/haskell/abstract-deque
{};
@@ -447,7 +455,9 @@
bytestringTrie = callPackage
../development/libraries/haskell/bytestring-trie {};
- c2hs = callPackage ../development/libraries/haskell/c2hs {};
+ c2hs = callPackage ../development/libraries/haskell/c2hs {
+ languageC = self.languageC_0_3_2_1;
+ };
Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix
{ cabal = self.cabal.override { Cabal = null; }; };
Cabal = null; # core package in GHC
@@ -522,6 +532,10 @@
cryptoPubkeyTypes = callPackage
../development/libraries/haskell/crypto-pubkey-types {};
+ cuda = callPackage ../development/libraries/haskell/cuda {
+ inherit (pkgs.linuxPackages) nvidia_x11;
+ };
+
csv = callPackage ../development/libraries/haskell/csv {};
cssText = callPackage ../development/libraries/haskell/css-text {};
@@ -592,6 +606,10 @@
erf = callPackage ../development/libraries/haskell/erf {};
+ exceptionMtl = callPackage ../development/libraries/haskell/exception-mtl {};
+
+ exceptionTransformers = callPackage
../development/libraries/haskell/exception-transformers {};
+
explicitException = callPackage
../development/libraries/haskell/explicit-exception {};
executablePath = callPackage
../development/libraries/haskell/executable-path {};
@@ -678,8 +696,8 @@
GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {};
gloss = callPackage ../development/libraries/haskell/gloss {
- GLUT = self.GLUT22;
- OpenGL = self.OpenGL24;
+ GLUT = self.GLUT23;
+ OpenGL = self.OpenGL25;
};
GLURaw = callPackage ../development/libraries/haskell/GLURaw {};
@@ -693,6 +711,7 @@
OpenGL = self.OpenGL_2_5_0_0;
};
GLUT22 = self.GLUT_2_2_2_1;
+ GLUT23 = self.GLUT_2_3_0_0;
GLUT = self.GLUT_2_3_0_0;
gtk = callPackage ../development/libraries/haskell/gtk {
@@ -900,7 +919,11 @@
jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {};
- languageC = callPackage ../development/libraries/haskell/language-c {};
+ 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;
+
+ languageCQuote = callPackage
../development/libraries/haskell/language-c-quote/default.nix {};
languageJavascript = callPackage
../development/libraries/haskell/language-javascript {};
@@ -924,6 +947,8 @@
mathFunctions = callPackage ../development/libraries/haskell/math-functions
{};
+ mainlandPretty = callPackage
../development/libraries/haskell/mainland-pretty {};
+
maude = callPackage ../development/libraries/haskell/maude {
parsec = self.parsec3;
};
@@ -1023,6 +1048,7 @@
OpenGL_2_4_0_2 = callPackage
../development/libraries/haskell/OpenGL/2.4.0.2.nix {};
OpenGL_2_5_0_0 = callPackage
../development/libraries/haskell/OpenGL/2.5.0.0.nix {};
OpenGL24 = self.OpenGL_2_4_0_2;
+ OpenGL25 = self.OpenGL_2_5_0_0;
OpenGL = self.OpenGL_2_5_0_0;
OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {};
@@ -1071,6 +1097,8 @@
persistentTemplate = callPackage
../development/libraries/haskell/persistent-template {};
+ pgm = callPackage ../development/libraries/haskell/pgm {};
+
polyparse_1_7 = callPackage
../development/libraries/haskell/polyparse/1.7.nix {};
polyparse_1_8 = callPackage
../development/libraries/haskell/polyparse/1.8.nix {};
polyparse = self.polyparse_1_8;
@@ -1202,6 +1230,8 @@
socks = callPackage ../development/libraries/haskell/socks {};
+ srcloc = callPackage ../development/libraries/haskell/srcloc {};
+
stateref = callPackage ../development/libraries/haskell/stateref {};
StateVar = callPackage ../development/libraries/haskell/StateVar {};
@@ -1277,6 +1307,8 @@
libc = pkgs.stdenv.gcc.libc;
};
+ symbol = callPackage ../development/libraries/haskell/symbol {};
+
systemFilepath = callPackage
../development/libraries/haskell/system-filepath {};
systemFileio = callPackage ../development/libraries/haskell/system-fileio {};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
