Commit Graph

22848 Commits

Author SHA1 Message Date
Florian Friesdorf
3438681d80 Merge branch 'channel-nixos' into python-merge 2012-11-29 21:40:33 +01:00
Eelco Dolstra
2122adcdd1 systemd: Update to 196
Main change is that systemd now has its own PCI/USB IDs database, so
it no longer depends on pciutils/usbutils.
2012-11-29 18:50:07 +01:00
Eelco Dolstra
bce3c6db7e openjdk: Fix typo in the version 2012-11-29 16:32:37 +01:00
Eelco Dolstra
38e847ff19 libssh: Update to 0.5.3
Fixes CVE-2012-4559, CVE-2012-4560, CVE-2012-4561 and CVE-2012-4562.
2012-11-29 16:21:01 +01:00
Florian Friesdorf
471a4b583f Merge branch 'channel-nixos' into python-merge 2012-11-29 15:36:17 +01:00
Florian Friesdorf
a4ded47776 include offlineDistutils in preConfigure instead of configurePhase 2012-11-29 15:29:41 +01:00
Eelco Dolstra
59e979177d Remove duplicate tcp-wrappers package 2012-11-29 15:26:13 +01:00
Eelco Dolstra
ea1d49d0a1 Remove unused attribute qt4_for_skype 2012-11-29 15:26:13 +01:00
Eelco Dolstra
79725bb5bc Mark some packages as low priority and disambiguate some others 2012-11-29 15:26:13 +01:00
Eelco Dolstra
ab1b0e6359 Minor cleanup 2012-11-29 15:26:13 +01:00
Rok Garbas
5771bcde8b updating some python packages: alot httplib2, tweepy, urwid 2012-11-29 14:16:32 +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
Ludovic Courtès
1ac274784b gcc 4.7: don't pass `--with-native-system-header-dir' when cross-compiling 2012-11-29 10:58:41 +01:00
Ludovic Courtès
cd30b83fd8 gcc 4.7: when cross-building for GNU, patch gnu.h', not i386/gnu.h' 2012-11-29 10:58:41 +01: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
Ludovic Courtès
2aea62bd07 gcc 4.7: when cross-building for GNU, patch gnu-user.h', not gnu.h' 2012-11-29 10:07:21 +01:00
Ludovic Courtès
310567b91f zile: update to 2.4.9 2012-11-29 10:07:21 +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
781d9aa84c chromium 24.0.1312.25 and 23.0.1271.91 2012-11-28 17:01:52 +01:00
Florian Friesdorf
ac89a3de46 Revert "#185 Fix pycurl"
This reverts commit 671bf5b4d7.

We need to support preConfigure.
2012-11-28 16:13:37 +01:00
Michael Raskin
19b638f5c7 Update Julia / account for it now using patchelf 2012-11-28 16:19:26 +04: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
Lluís Batlle i Rossell
66e980ba31 librecad: updating to 1.0.2, and making it install
The expression was unfinished, not installing anything.
2012-11-28 11:40:18 +01:00
Lluís Batlle i Rossell
5a6e4e5d3f muparser: updating from 1.x to 2.x 2012-11-28 11:40:18 +01:00
Peter Simons
7838d3568b Merge pull request #198 from jcumming/zfs.121126.1
Need pthread_cancel for zdb to work properly. Add -lgcc_s.
2012-11-28 01:18:08 -08: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
Peter Simons
46d1acdcf1 Merge pull request #199 from bbenoist/fix
Fixes and updates on qt-4.8, qtcreator, opera, dia and geany
2012-11-28 01:14:37 -08:00
Baptist BENOIST
82bdf7c8d9 opera|dia|geany: remove the obsolete share/icons/hicolor/icon-theme.cache file
This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
It have no reasons to exist in a redistribuable package
2012-11-28 00:21:34 +01: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
Cillian de Róiste
a5d5502100 #185 fix salut_a_toi 2012-11-27 23:41:42 +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
Baptist BENOIST
a40d115a62 qt-4.8: Add a developerBuild option
This option configures qmake with the -developer-build option.
For example, this tells Qt installer to also install Qt's private headers.
See http://doc.qt.digia.com/qt/configure-options.html for more.
2012-11-27 23:13:18 +01:00
Baptist BENOIST
1a59276a64 qtcreator: update to 2.6.0 2012-11-27 23:13:18 +01:00
Cillian de Róiste
dd9d1b7cf9 #185 Fix calibre by adding setuptools as an input (thanks @chaoflow) 2012-11-27 20:27:04 +01:00
Peter Simons
d00afb644f haskell-gloss: update to version 1.7.7.1 2012-11-27 15:05:44 +01:00
Peter Simons
103b632742 haskell-conduit: update to version 0.5.4.2 2012-11-27 15:05:44 +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
Rickard Nilsson
e6bd4b6865 darktable: Upgrade to 1.1 2012-11-27 14:32:22 +01:00
Peter Simons
8effc542b4 git-annex: update to 3.20121126 2012-11-27 13:46:27 +01:00
Peter Simons
62f8d24e56 git: update to 1.8.0.1 2012-11-27 13:46:12 +01:00
Jack Cummings
4775e71049 Need pthread_cancel for zdb to work properly. Add -lgcc_s. 2012-11-26 21:32:24 -08:00