Commit Graph

26515 Commits

Author SHA1 Message Date
Sander van der Burg
64e8c45576 Merge branch 'master' of github.com:NixOS/nixpkgs 2013-05-16 12:18:46 +02:00
Sander van der Burg
259b1f931f Added assert: Node.JS assert module and its dependencies 2013-05-16 12:18:23 +02:00
Domen Kožar
378d975b88 Merge pull request #505 from MarcWeber/submit/linux-3.8-dvb-support
without these two settings my USB dvb-t stick doesn't work
2013-05-16 03:16:23 -07:00
Sander van der Burg
098fb6d70d added mocha: simple, flexible, fun test framework for JavaScript and its dependencies 2013-05-16 11:49:21 +02:00
Domen Kozar
3745b458ab pg8000: fix url 2013-05-16 11:04:36 +02:00
Gergely Risko
51c69ea60e oracle jdk/jre: use requireFile instead of fetchurl (merge #537)
The user has to accept the EULA nowadays on the oracle website.
2013-05-16 10:58:08 +02:00
Gergely Risko
07b26ce493 fetchUrl: add curlOpts parameter (merge #535) 2013-05-16 10:45:16 +02:00
Domen Kozar
951f5be7d9 pg8000: upgrade to 1.09 to support postgresql 9.1/9.2 2013-05-16 10:05:39 +02:00
Domen Kozar
7bbe5823e8 let hydra mirror unfree firmware 2013-05-15 15:22:50 +02:00
Domen Kožar
d63523c769 Merge pull request #527 from qknight/firmware-linux-0.36-to-0.38
updated firmware-linux from 0.36-to-0.38
2013-05-15 06:17:45 -07:00
Domen Kožar
83747f519a Merge pull request #519 from offlinehacker/powerline2
Add powerline beta, libgit2 and pygit2
2013-05-15 06:17:23 -07:00
Eelco Dolstra
501833cf55 linux: Re-enable the memory resource controller
We accidentally lost this in Linux >= 3.5 because the kernel options
were renamed.  (Probably an argument for not using "?" in the kernel
config...)
2013-05-15 14:53:15 +02:00
Eelco Dolstra
d5c8f4cb60 cacert: Update to 20121229 2013-05-15 13:15:53 +02:00
Eelco Dolstra
e3c641b39a mercurial: Update to 2.6.1
Also, set a default for web.cacerts so that the system certificates on
NixOS are used.
2013-05-15 13:15:53 +02:00
Rob Vermaas
000fddd10e Fix hash for linux 3.2.45 2013-05-15 08:37:33 +00:00
Shea Levy
dd42dd480b runInLinuxImage: Fix derivation overriding.
This only ever worked because runInLinuxVM happened to call
overrideDerivation, which itself erroneously passed arbitrarily-added
attributes to the new call to derivation.

Hopefully this time Eelco won't have to revert my change ;)

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-15 01:15:16 -04:00
Shea Levy
03b6fe7422 Revert "Revert "overrideDerivation: Re-attatch passthru and meta to all outputs""
This reverts commit 18df66f466.

I will fix the breakage in upcoming commits.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-15 00:39:17 -04:00
Shea Levy
05a02c639e Revert "Revert "Revert "Revert "overrideDerivation: Simplify""""
This reverts commit abf2d36773.

I will fix the breakage in upcoming commits.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-15 00:38:03 -04:00
David Guibert
880a386c57 update linux 3.2.45 2013-05-14 21:33:14 +02:00
Lluís Batlle i Rossell
44e99f41be Fixing 'my-env', when without cleanup. 2013-05-14 18:59:50 +02:00
Lluís Batlle i Rossell
48f97bdae0 Some kde wrapper improvements. 2013-05-14 18:51:24 +02:00
David Guibert
c887f9e932 update gnuplot to 4.6.0 2013-05-14 15:42:14 +02:00
Eelco Dolstra
ea919f29a9 hipchat: Fix desktop item 2013-05-14 14:30:15 +02:00
Eelco Dolstra
07d4f26be1 nvidia-x11: Update to 319.17 2013-05-14 13:47:30 +02:00
Eelco Dolstra
b9013993db git: Update to 1.8.2.3 2013-05-14 11:53:28 +02:00
Eelco Dolstra
2ce0e5ef4b mysql: Update to 5.1.69 2013-05-14 11:47:23 +02:00
Eelco Dolstra
602be839a4 mysql: Update to 5.5.31
CVE-2013-1502, CVE-2013-1511, CVE-2013-1532, CVE-2013-1544,
CVE-2013-2375, CVE-2013-2376, CVE-2013-2389, CVE-2013-2391,
CVE-2013-2392, maybe others.
2013-05-14 11:47:22 +02:00
Rickard Nilsson
30b3522c14 scala: Remove scalacheck.jar from scala's classpath 2013-05-14 11:28:24 +02:00
Sander van der Burg
bfd5124bde jayschema: JSON schema validator NodeJS package 2013-05-14 11:27:44 +02:00
Andres Loeh
645eb7c3c1 haskell-irc: no longer depends on parsec-2. 2013-05-14 11:06:12 +02:00
Lluís Batlle i Rossell
d4039f99fd go: 1.1 released 2013-05-14 10:58:48 +02:00
Eelco Dolstra
fdd06dc094 nix: Update to 1.5.2 2013-05-14 00:01:38 +02:00
Eelco Dolstra
9f9620f566 Doh 2013-05-13 22:04:33 +02:00
Evgeny Egorochkin
f2098a37cd Merge pull request #531 from errge/master
download git-annex from github, not kitenet.net
2013-05-13 10:18:34 -07:00
Domen Kozar
6c56602e55 dunst: upgrade, set maintainers, set default config file 2013-05-13 18:48:42 +02:00
Gergely Risko
972b1a7d50 Download git-annex from github instead of git.kitenet.net
git.kitenet.net doesn't allow snapshot downloads anymore, the url
just returns 403 Forbidden.
2013-05-13 18:19:41 +02:00
Eelco Dolstra
278b255388 Restore unintentionally deleted line 2013-05-13 18:15:02 +02:00
Eelco Dolstra
9df603b300 Use Linux 3.9 for VM builds
This seems to fix CIFS hangs like: http://hydra.nixos.org/build/4916655
2013-05-13 18:12:12 +02:00
Eelco Dolstra
6fb4c62f25 Fix some old Fedora builds
http://hydra.nixos.org/build/4949447
2013-05-13 17:47:20 +02:00
Lluís Batlle i Rossell
a6781e121f libreoffice: update from 3.6.2.2 to 3.6.6.2 2013-05-13 16:07:01 +02:00
Peter Simons
25b7c65b34 haskell-hlint: update to version 1.8.45 2013-05-13 13:43:44 +02:00
Peter Simons
057ec53542 haskell-haskdogs: update to version 0.3.2 2013-05-13 13:43:44 +02:00
Peter Simons
4e359215c5 haskell-uuid: update to version 1.2.13 2013-05-13 13:43:44 +02:00
Peter Simons
6b33985fc7 haskell-unix-time: update to version 0.1.8 2013-05-13 13:43:44 +02:00
Peter Simons
05369891a9 haskell-shake: update to version 0.10.3 2013-05-13 13:43:44 +02:00
Peter Simons
bc50c0f467 haskell-largeword: update to version 1.0.5 2013-05-13 13:43:44 +02:00
Peter Simons
4d545eddcd haskell-ghc-mod: update to version 1.12.5 2013-05-13 13:43:44 +02:00
Peter Simons
9e609d2369 haskell-accelerate: update to version 0.13.0.1 2013-05-13 13:43:44 +02:00
Peter Simons
82759ee4c0 haskell-accelerate-io: update to version 0.13.0.1 2013-05-13 13:43:43 +02:00
Peter Simons
825fc23a63 haskell-accelerate-cuda: update to version 0.13.0.1 2013-05-13 13:43:43 +02:00