Commit Graph

7587 Commits

Author SHA1 Message Date
Florian Friesdorf
d76e4420af pil for python27 and python26 2012-12-03 07:12:05 +01:00
Florian Friesdorf
e517d8791f fix nevow url and uncomment again 2012-12-03 06:54:13 +01:00
Florian Friesdorf
1adc9b1b1f python module cleanup, enable a couple of tests, add comments for failing 2012-12-03 06:38:11 +01:00
Florian Friesdorf
e50571e29d setuptoolsSite - only setuptools' site.py 2012-12-03 05:20:04 +01:00
Florian Friesdorf
d4d76a8443 make diff to master look nicer 2012-12-03 04:41:19 +01:00
Florian Friesdorf
3438681d80 Merge branch 'channel-nixos' into python-merge 2012-11-29 21:40:33 +01:00
Florian Friesdorf
471a4b583f Merge branch 'channel-nixos' into python-merge 2012-11-29 15:36:17 +01:00
Eelco Dolstra
72684fb42f Remove support for the obsolete powerpc-darwin and i686-darwin platforms 2012-11-29 14:10:49 +01:00
Eelco Dolstra
4b48d05c58 Remove nixCustomFun
Rationale: on the one hand, there are generic customisation facilities
like overrideDerivation; on the other hand, nixCustomFun cannot
possibly accomodate every customisation scenario, so it's easier to
just modify/copy default.nix.
2012-11-29 13:47:40 +01:00
Eelco Dolstra
5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Eelco Dolstra
f04aa4fb59 Remove findutils 4.2.27
We only used this version on Darwin, but the regular findutils seems
to build fine.
2012-11-29 12:02:07 +01:00
Eelco Dolstra
2eace0dfe6 Make "nix-env -i openjdk" do the right thing 2012-11-29 11:36:51 +01:00
Peter Simons
a4937f9031 Merge pull request #202 from jcumming/games.121128
World of Goo 1.41.
2012-11-29 02:22:58 -08:00
Peter Simons
3cf91145e3 Merge pull request #201 from jcumming/connect.121128.1
Add 'connect' for traversing SOCKS proxies
2012-11-29 02:22:22 -08:00
Lluís Batlle i Rossell
0397d7c51e Removing the 2.6.39 kernel from release-cross; it wasn't in nixpkgs.
I add linux 3.6.
2012-11-29 10:27:34 +01:00
Jack Cummings
6540190179 World of Goo 1.41. 2012-11-28 14:38:46 -08:00
Jack Cummings
9d6f5f79e4 Add 'connect' for traversing SOCKS proxies 2012-11-28 14:29:11 -08:00
Florian Friesdorf
ac89a3de46 Revert "#185 Fix pycurl"
This reverts commit 671bf5b4d706b95db4059abe19ac99178326830e.

We need to support preConfigure.
2012-11-28 16:13:37 +01:00
Lluís Batlle i Rossell
2671e32c20 qcad: removing it. it didn't build since long and librecad replaces it.
I think librecad is a good replacement for the super-outdated qcad community
edition. And afaik, librecad started by taking the qcad code and putting it
more up to date.
2012-11-28 11:45:58 +01:00
Peter Simons
06cb0fa20c Merge pull request #197 from aforemny/despotify
Add despotify
2012-11-28 01:17:33 -08:00
Peter Simons
614c7501bc Merge pull request #193 from badi/gromacs
Add Gromacs
2012-11-28 01:16:17 -08:00
Cillian de Róiste
671bf5b4d7 #185 Fix pycurl
Moving the preConfigure command into the installCommand 'fixes' pycurl.
2012-11-27 23:50:24 +01:00
Baptist BENOIST
876b1c1cac qtcreator: Build QmlDesigner Plugin
Building of this plugin required qt's private headers.
See http://qt.gitorious.org/qt-creator/qt-creator/blobs/master/README for more.
2012-11-27 23:13:18 +01:00
Peter Simons
da4ca16360 haskell-multiset: add version 0.2.2
The new version is currently unused, though, because it compiles only
with GHC 7.6.1 or later.
2012-11-27 15:05:43 +01:00
Peter Simons
6dfa1da45f haskell-bmp: add version 1.2.3.2
The new version is currently unused, though, because it compiles only
with GHC 7.6.1 or later.
2012-11-27 15:05:43 +01:00
Peter Simons
89eb9435ae all-packages.nix: strip trailing whitespace 2012-11-26 16:18:05 +01:00
Peter Simons
a814d0bc90 SANE: switch snapshot version of the backends to git (and general cleanup) 2012-11-26 16:18:05 +01:00
Peter Simons
3d5f6b7d1c Drop obsolete haskell-time versions 1.1.3, 1.2.0.3, 1.2.0.5, and 1.4.0.1. 2012-11-26 15:32:19 +01:00
Peter Simons
8a276cf90d haskell-time: add version 1.4.0.2 2012-11-26 15:32:13 +01:00
Peter Simons
bc6627c6e9 haskell-defaults.nix: add compiler-specific overrides to fix build of cabal-install 2012-11-26 14:17:38 +01:00
Florian Friesdorf
ca429c3b61 znes needs libpng12 2012-11-26 12:58:30 +01:00
Eelco Dolstra
cc4aab2025 firefox: Disable parallel building
http://hydra.nixos.org/build/3348854
2012-11-26 11:50:10 +01:00
Eelco Dolstra
a15fad323b Make Firefox 17 the default 2012-11-26 11:26:39 +01:00
Michael Raskin
7333c01dba Update Compiz 2012-11-25 23:58:04 +04:00
Rok Garbas
fdf3ff7a21 pythonPackages.turses: update to 0.2.9 2012-11-25 19:20:06 +01:00
Rok Garbas
d9e097875c pythonPackages.flake8: Update to 1.6.2 2012-11-25 18:58:25 +01:00
Alexander Foremny
d50712e376 Add despotify 2012-11-25 14:01:13 +01:00
Florian Friesdorf
d1c00eed91 Merge branch 'channel-nixos' into python-merge 2012-11-24 22:48:30 +01:00
Peter Simons
4199b9e80a all-packages.nix: strip trailing whitespace 2012-11-23 23:21:15 +01:00
Peter Simons
3667144395 xsane: build with snapshot version of the sane backends
The last release of that code is ancient. Not sure what these SANE guys
are doing. Anyway, the current Git snapshot works just fine for me.
2012-11-23 23:20:55 +01:00
Mathijs Kwik
ef51f327fe nxml-mode: remove from release as well 2012-11-23 19:59:19 +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
Eelco Dolstra
c9baa28fef Remove Firefox 15 2012-11-23 16:41:41 +01:00
Badi' Abdul-Wahid
7bdcb521b2 Update based on comments to pull request 2012-11-23 15:29:17 +01:00
Badi' Abdul-Wahid
0dab509b3c Merge branch 'master' of git://github.com/NixOS/nixpkgs into origin/gromacs 2012-11-23 15:27:37 +01:00
Rob Vermaas
410b72e807 Add jsontool 5.1.1 (node.js package) 2012-11-23 14:20:48 +01:00
Eelco Dolstra
880ce8da2e nxml-mode: Remove
This package is now part of Emacs itself.
2012-11-23 11:10:30 +01:00