Commit graph

8677 commits

Author SHA1 Message Date
Florian Friesdorf 92a833604c Merge branch 'py/offline-distutils' into python-merge
Conflicts:
	pkgs/development/python-modules/generic/builder.sh
	pkgs/development/python-modules/generic/default.nix
2012-11-24 22:49:19 +01:00
Florian Friesdorf d1c00eed91 Merge branch 'channel-nixos' into python-merge 2012-11-24 22:48:30 +01:00
Florian Friesdorf 74d963c69a offlineDistutils in PYTHONPATH in configurePhase instead of builder.sh
Conflicts:
	pkgs/development/python-modules/generic/default.nix
2012-11-24 22:34:09 +01:00
Florian Friesdorf bdccb5417b fix python module builder 2012-11-23 18:33:33 +01:00
Florian Friesdorf ccb5d0fc19 fix python module builder 2012-11-23 18:33:25 +01:00
Florian Friesdorf 1171166518 Merge branch 'py/offline-distutils' into python-merge 2012-11-23 17:39:23 +01:00
Florian Friesdorf 337d16368a fix builder in python-module 2012-11-23 17:38:31 +01:00
Florian Friesdorf ddbd5c2eba Merge branch 'py/offline-distutils' into python-merge
Conflicts:
	pkgs/development/python-modules/generic/default.nix
2012-11-23 17:28:51 +01:00
Florian Friesdorf ad8a4c73fa use offline-disutils in buildPythonPackage 2012-11-23 17:27:55 +01:00
Florian Friesdorf 224251d104 python-offline-distutils 2012-11-23 17:27:12 +01:00
Eelco Dolstra d4e3064669 firefox: Add 17.0 2012-11-23 16:41:41 +01:00
Florian Friesdorf dce76a387d Merge branch 'py/pth-create' into python-merge
Conflicts:
	pkgs/development/python-modules/generic/default.nix
2012-11-23 15:57:09 +01:00
Florian Friesdorf fa1c8fef2f move pth rename and site.py removal to buildPhase
This leaves the installCommand to be only easy_install and makes it
easy again to overwrite this.
2012-11-23 15:54:55 +01:00
Lluís Batlle i Rossell 2880190491 valgrind: updating to bugfix release 3.8.1 2012-11-23 15:04:51 +01:00
Peter Simons ec56583a11 haskell-lens: the haddock documentation has been fixed 2012-11-22 17:30:21 +01:00
Peter Simons e6c384e5d3 haskell-yesod-form: update to version 1.2.0.1 2012-11-22 17:29:38 +01:00
Peter Simons d7bb7ba8b9 haskell-rank1dynamic: update to version 0.1.0.2 2012-11-22 17:29:38 +01:00
Peter Simons 4b9cddcd2f haskell-network-transport: update to version 0.3.0.1 2012-11-22 17:29:38 +01:00
Peter Simons 37b04ff3a5 haskell-lens: update to version 3.4 2012-11-22 17:29:38 +01:00
Peter Simons 99cf7cba4b haskell-http-conduit: update to version 1.8.4.1 2012-11-22 17:29:38 +01:00
Peter Simons 8a37e8c82c haskell-email-validate: update to version 0.3.2 2012-11-22 17:29:38 +01:00
Peter Simons d571a32318 haskell-distributed-static: update to version 0.2.1.1 2012-11-22 17:29:38 +01:00
Peter Simons 7f4631412a haskell-distributed-process: update to version 0.4.1 2012-11-22 17:29:37 +01:00
Peter Simons 763739107e haskell-distributed-process-simplelocalnet: update to version 0.2.0.8 2012-11-22 17:29:37 +01:00
Peter Simons fe2fdc9e99 haskell-binary: update to version 0.6.3.0 2012-11-22 17:29:37 +01:00
Peter Simons 5000619377 haskell-SHA: update to version 1.6.1 2012-11-22 17:29:37 +01:00
Michael Raskin e72e74dad8 Update Julia to correspond to their changes 2012-11-22 17:30:33 +04:00
Florian Friesdorf 24fd592d64 Merge branch 'py/always-unzip' into python-merge
Conflicts:
	pkgs/development/python-modules/generic/default.nix
2012-11-22 13:39:05 +01:00
Florian Friesdorf 1b013ac1ea Merge branch 'py/pdb' into python-merge 2012-11-22 13:38:08 +01:00
Florian Friesdorf bd443d69c9 Merge branch 'py/pth-recursive' into python-merge 2012-11-22 13:37:51 +01:00
Florian Friesdorf 9a6b4e5621 Merge branch 'py/pth-create' into python-merge 2012-11-22 13:37:46 +01:00
Michael Raskin 1c32897905 Merge pull request #187 from orbitz/ocaml-findlib-add-topfind
Ocaml findlib add topfind
2012-11-21 21:34:09 -08:00
Michael Raskin 1b15008952 Merge pull request #153 from jcumming/icecast
- icecast-2.3.3, libshout-2.3.1
2012-11-21 21:30:28 -08:00
Rob Vermaas ad928fee30 Update Oracle JDK to 1.6.0u38b04 2012-11-21 21:31:56 +01:00
Peter Simons baa71f8d37 haskell-testpack: patch to support recent versions of QuickCheck 2012-11-21 17:40:27 +01:00
Peter Simons 5407af5c14 haskell-DAV: add version 0.2 2012-11-21 12:30:54 +01:00
Peter Simons 4ea0f76ffc haskell-xml-hamlet: add version 0.4.0.3 2012-11-21 12:30:53 +01:00
Peter Simons afc41f2278 haskell-lens: add version 3.3 2012-11-21 12:30:53 +01:00
Peter Simons 53d69fd13d haskell-comonads-fd: add version 3.0 2012-11-21 12:30:53 +01:00
Peter Simons 26f32d8df6 Merge pull request #191 from qknight/gobby_update
updates to libinfinity 0.5.3 and gobby 0.4.94
2012-11-21 03:07:38 -08:00
Peter Simons 32931c2837 haskell-monad-peel: update to version 0.1.1 2012-11-21 12:04:48 +01:00
Peter Simons c9fabedfac haskell-http-date: update to version 0.0.3 2012-11-21 12:04:48 +01:00
Peter Simons 775dd5b7d5 haskell-graphviz: update to version 2999.14.1.0 2012-11-21 12:04:48 +01:00
Mathijs Kwik b155a188e3 neoload: link used jre to a location which is hard-coded into some binaries 2012-11-21 09:49:35 +01:00
Joachim Schiele 1ed9e35be6 fixed compile errors for libinfinity and gobby 2012-11-20 21:21:47 +00:00
Peter Simons b62393bbb0 Merge pull request #158 from bbenoist/qvtk
vtk: latest version + useQt4 option
2012-11-20 12:44:15 -08:00
Peter Simons 2f55f31f49 Merge pull request #155 from bbenoist/newpkgs
New pkgs: qtcreator fox xfe gmrun geany
2012-11-20 12:43:06 -08:00
Peter Simons aa7d0c4cc5 Merge pull request #178 from mpashton/abcde-new
Updated version of abcde to 2.5.4
2012-11-20 12:41:40 -08:00
Peter Simons 43c84c6ec8 haskell-zlib-bindings: update to version 0.1.1.2 2012-11-20 14:47:51 +01:00
Peter Simons 306cb4d9b5 haskell-cabal2nix: update to version 1.42 2012-11-20 14:42:19 +01:00