JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
69,564 Commits 2 Branches 0 Tags 13 GiB
198dda950b
Commit Graph

60150 Commits

Author SHA1 Message Date
Peter Simons
1cdcc79c7e haskell-rsa: test suite has been fixed upstream 2015-09-19 08:20:52 +02:00
Peter Simons
6d4e88f970 haskell-modules: remove obsolete overrides 2015-09-19 08:20:52 +02:00
Peter Simons
90954445a1 haskell-mwc-random: disable test suite to break infinite recursion 2015-09-19 08:20:52 +02:00
Peter Simons
f7f1984589 haskell: remove conduit override from configuration-ghc-7.8.x.nix for the sake of stackage LTS 2015-09-19 08:20:52 +02:00
Peter Simons
0838eabbea haskell-nanospec: disable tests to break infinite recursion 2015-09-19 08:20:52 +02:00
Peter Simons
4bf92d39c0 haskell-options: disable test suite to break infinite recursion 2015-09-19 08:20:51 +02:00
Peter Simons
4e5c781ac6 haskell-hspec-expectations: disable test suite to break infinite recursion 2015-09-19 08:20:51 +02:00
Peter Simons
8abc91d7a3 haskell-text: break recursion in older package sets 2015-09-19 08:20:51 +02:00
Peter Simons
f2d17b586c haskell-semigroupoids: don't compile the test suite of old versions 2015-09-19 08:20:51 +02:00
Peter Simons
aa88e53408 haskell-hpc-coveralls: the build fails with dynamic linking enabled 2015-09-19 08:20:51 +02:00
Peter Simons
b3b735bd20 haskell-hspec-discover: disable Haddock documentation 
* pkgs/development/haskell-modules/configuration-common.nix (self):
 2015-09-19 08:20:51 +02:00
Peter Simons
e9c20be62d haskell-HTF: disable test suite for older versions, too 2015-09-19 08:20:51 +02:00
Peter Simons
28e9327282 haskell-hslua needs no more overrides. 2015-09-19 08:20:51 +02:00
Peter Simons
1b86d24d41 haskell-libconfig builds without overrides. 2015-09-19 08:20:51 +02:00
Peter Simons
9e4b5dce24 haskell-hmatrix builds without overrides now. 2015-09-19 08:20:50 +02:00
Peter Simons
a1ff4eb2ad haskell-hspec: add overrides for older versions to break infinitie recursions 2015-09-19 08:20:50 +02:00
Peter Simons
786ebf4e12 haskell-freenect: override is required only for old versions 2015-09-19 08:20:50 +02:00
Peter Simons
2aaa587b71 hackage-packages.nix: switch our default package set to Stackage Nightly 
This update was generated by hackage2nix v20150903-82-g351b6f8 using the following inputs:

  - Hackage: af161fdf17
  - LTS Haskell: da73308b63
  - Stackage Nightly: 1994a4f865
 2015-09-19 08:20:40 +02:00
taku0
2f0b7a29a2 source-han-sans: 1.001 -> 1.004 2015-09-19 09:57:06 +09:00
William A. Kennington III
6e09223627 Merge branch 'master.upstream' into staging.upstream 2015-09-18 17:16:27 -07:00
Erik Rybakken
64c1a9a2e2 perseus: init at 4-beta 2015-09-19 00:56:24 +02:00
Arseniy Seroka
6c2993284a Merge pull request #9929 from oxij/fdupes-jody 
fdupes: switch to fdupes-jody patch set
 2015-09-19 01:37:19 +03:00
Jaka Hudoklin
5baac1e962 kibana: 3.1.1 -> 4.2.0 2015-09-19 00:33:35 +02:00
Jan Malakhovski
6640a241d2 fdupes: switch to fdupes-jody patch set 
This adds a lot of useful features implemented in a reasonable way (unlike
debian patches).
 2015-09-18 22:31:23 +00:00
William A. Kennington III
4a672c87cd zfs: Add a patch to fix discard data corruption 2015-09-18 14:55:36 -07:00
William A. Kennington III
bbfd7f2d48 bareos: 14.2.4 -> 15.2.1 2015-09-18 14:52:52 -07:00
William A. Kennington III
26c3d3f060 ceph: Fix .la files 2015-09-18 14:52:52 -07:00
William A. Kennington III
a394827e13 libedit: Fix .la and .pc files 2015-09-18 14:52:52 -07:00
William A. Kennington III
ec18091961 nss: Add platforms 2015-09-18 14:52:52 -07:00
William A. Kennington III
ac1bf75056 nspr: Add platforms 2015-09-18 14:52:52 -07:00
William A. Kennington III
5293bc1302 xfsprogs: 3.2.2 -> 4.2.0 2015-09-18 14:52:52 -07:00
William A. Kennington III
a1db11198e icedtea_web: 1.6 -> 1.6.1 2015-09-18 14:52:51 -07:00
William A. Kennington III
f1c67b858d yubikey-personalization-gui: 3.1.20 -> 3.1.21 2015-09-18 14:52:51 -07:00
William A. Kennington III
332826cce4 spice-protocol: 0.12.7 -> 0.12.9 2015-09-18 14:52:51 -07:00
William A. Kennington III
52b5acb2e4 lightdm: 1.14.2 -> 1.16.2 2015-09-18 14:52:51 -07:00
William A. Kennington III
5e254f57c7 spice-gtk: 0.27 -> 0.29 2015-09-18 14:52:51 -07:00
William A. Kennington III
b17dfc68d4 rsyslog: 8.10.0 -> 8.12.0 2015-09-18 14:52:51 -07:00
William A. Kennington III
85639b94c4 keepalived: 1.2.18 -> 1.2.19 2015-09-18 14:52:51 -07:00
William A. Kennington III
58a45a4459 samba: 4.2.3 -> 4.3.0 2015-09-18 14:52:51 -07:00
William A. Kennington III
db031b5dff yubico-piv-tool: 0.1.6 -> 1.0.2 2015-09-18 14:52:51 -07:00
William A. Kennington III
37bba4ec2c mongodb: 3.0.5 -> 3.0.6 2015-09-18 14:52:51 -07:00
William A. Kennington III
ee867799b0 cgmanager: 0.37 -> 0.39 2015-09-18 14:52:51 -07:00
William A. Kennington III
88285257f1 zeromq: 4.1.2 -> 4.1.3 2015-09-18 14:52:51 -07:00
William A. Kennington III
27cfafa6d6 libykmneomgr: 0.1.6 -> 0.1.7 2015-09-18 14:52:51 -07:00
William A. Kennington III
056f68ae62 libxml++: 2.38.0 -> 2.38.1 2015-09-18 14:52:50 -07:00
William A. Kennington III
765e62ae25 libu2f-host: 0.0.4 -> 1.0.0 2015-09-18 14:52:50 -07:00
William A. Kennington III
c56ed27a55 librelp: 1.2.7 -> 1.2.8 2015-09-18 14:52:50 -07:00
William A. Kennington III
c7b658f0a1 czmq: 3.0.0-rc1 -> 3.0.2 2015-09-18 14:52:50 -07:00
William A. Kennington III
fdba5c2fd8 libksi: Add package 2015-09-18 14:52:50 -07:00
William A. Kennington III
24dabdfb98 iproute: 4.1.1 -> 4.2.0 2015-09-18 14:52:50 -07:00
William A. Kennington III
0ecdb40d86 snappy: 1.1.2 -> 1.1.3 2015-09-18 14:52:50 -07:00
William A. Kennington III
4b0921c604 resolv_wrapper: Add package 2015-09-18 14:52:50 -07:00
William A. Kennington III
19f3fe6b2a socket_wrapper: 1.1.3 -> 1.1.4 2015-09-18 14:52:50 -07:00
William A. Kennington III
b95072e2a7 libraw1394: 2.1.0 -> 2.1.1 2015-09-18 14:52:50 -07:00
William A. Kennington III
a7827df5a6 liblognorm: 1.1.1 -> 1.1.2 2015-09-18 14:52:50 -07:00
William A. Kennington III
05853e1d2a libibumad: 1.3.9 -> 1.3.10.2 2015-09-18 14:52:49 -07:00
William A. Kennington III
58a6fdf5ef libibmad: 1.3.11 -> 1.3.12 2015-09-18 14:52:49 -07:00
William A. Kennington III
65f6e4d558 check: 0.9.14 -> 0.10.0 2015-09-18 14:52:49 -07:00
Spencer Janssen
9dee532ce7 flexget: depend on beautifulsoup 4.1.3 
The beautifulsoup expression was recently updated to version 4.4,
flexget depends on version < 4.4.
 2015-09-18 16:40:30 -05:00
Arseniy Seroka
7e2ae36f4e Merge pull request #9922 from rycee/package/perl-packages 
Add some Perl packages
 2015-09-19 00:24:01 +03:00
Arseniy Seroka
501e1ee94c Merge pull request #9932 from rycee/bump/perl-Perl-Critic 
perl-Perl-Critic: 1.125 -> 1.126
 2015-09-19 00:15:18 +03:00
Robert Helgesson
a36fab7473 perl-Perl-Critic: 1.125 -> 1.126 2015-09-18 22:28:27 +02:00
Vladimír Čunát
0fdb93864e Merge new texlive infrastructure, /CC #287 2015-09-18 20:52:34 +02:00
Bryan Gardiner
c8ea6c07c6 jitsi: fix the system tray icon 
Java's desktop integration on Linux relies on dlopen'ing some libraries (gtk2 or
gnome).  This commit makes Java able to find gtk2, fixing the problem of Jitsi's
system tray icon not appearing.

Part of bug #4014.
 2015-09-18 20:11:29 +02:00
Edward Tjörnhammar
697ef465cd jitsi: kill the elves of solaris 2015-09-18 20:11:29 +02:00
Jude Taylor
8b54192b85 Revert "git-credential-osxkeychain" 
This reverts commit 58fa09a40a.
 2015-09-18 10:20:26 -07:00
Thomas Tuegel
2948e85526 julia: re-enable tests 2015-09-18 11:31:05 -05:00
Thomas Tuegel
5428096873 julia: does not currently build on i686-linux 2015-09-18 11:30:02 -05:00
Thomas Tuegel
1c40404cb2 Revert "julia: fix i686 build" 
This reverts commit 02fc4551f5.
 2015-09-18 11:29:26 -05:00
Robert Helgesson
ddc2ee933e perl-CHI: init at 0.60 2015-09-18 17:35:00 +02:00
Robert Helgesson
f912306a0b perl-Test-Class: init at 0.50 2015-09-18 17:35:00 +02:00
Robert Helgesson
501de562d5 perl-MooX-Types-MooseLike-Numeric: init at 1.02 2015-09-18 17:35:00 +02:00
Robert Helgesson
59ed815e09 perl-Log-Any: use stdenv.lib.licenses 
Also add myself as maintainer (there was previously none) and use `name`
variable in URL.
 2015-09-18 17:33:51 +02:00
Robert Helgesson
92e7ca9a45 perl-Hash-MoreUtils: init at 0.05 2015-09-18 17:27:49 +02:00
Robert Helgesson
a14de22b03 perl-Digest-JHash: init at 0.09 2015-09-18 17:27:17 +02:00
Robert Helgesson
9e147549be perl-File-Util: init at 4.132140 2015-09-18 17:26:07 +02:00
Robert Helgesson
372429b446 perl-File-LibMagic: init at 1.13 2015-09-18 17:25:53 +02:00
Robert Helgesson
00163a09d3 perl-DateTime-Format-MySQL: init at 0.05 2015-09-18 17:25:47 +02:00
Robert Helgesson
ad57899629 perl-Log-Handler: init at 0.87 2015-09-18 17:24:50 +02:00
lethalman
b7319c79a6 Merge pull request #9842 from chetant/libwebsockets-1.4 
Add Libwebsockets package
 2015-09-18 16:36:30 +02:00
lethalman
ef9a50b0a6 Merge pull request #9788 from desiderius/pillow-2.9.0 
pythonPackages.pillow: 2.3.0 -> 2.9.0
 2015-09-18 15:17:32 +02:00
lethalman
e716f7d5e8 Merge pull request #9822 from taku0/sox-14.4.2 
sox: 14.4.1 -> 14.4.2
 2015-09-18 15:14:34 +02:00
Luca Bruno
c65d8ef38d Revert "spice-protocol: 0.12.7 -> 0.12.8" 
This reverts commit 3fa5a3d544.

Breaks qemu build.
 2015-09-18 14:53:51 +02:00
宋文武
16e01531de farstream: use pythonPackages.gst-python 2015-09-18 20:38:19 +08:00
宋文武
d79463365a pitivi: 0.93 -> 0.94 (close #9894) 2015-09-18 20:38:19 +08:00
宋文武
38812685ed gst-python -> pythonPackages.gst-python 2015-09-18 20:38:18 +08:00
lethalman
60d1c0cfd1 Merge pull request #9915 from khumba/claws-mime-fix 
claws-mail: fix attachment MIME detection, enable parallel build
 2015-09-18 14:15:04 +02:00
Bryan Gardiner
268b4d5cfe
claws-mail: fix attachment MIME type detection 
Adds support for shared-mime-info to Claws, to fix attachments in
outgoing messages always having MIME type application/octet-stream
because Claws doesn't know where to look, instead complaining:

/nix/store/...-claws-mail-3.11.1/etc/mime.types: fopen: No such file or directory

Moreover, Claws relies on incoming MIME types for knowing when e.g. to
display an attached image, so sending application/octet-stream
unnecessarily is bad.

Tested against release-15.09.
 2015-09-18 04:52:44 -07:00
Bryan Gardiner
5e3eb6741f
claws-mail: enable parallel building 2015-09-18 04:32:35 -07:00
Martin Sturm
9e0519e554 vlc: use libsamplerate 
Change the sample rate converter used from default "ugly_resampler" to
libsamplerate (aka secret rabbit code).
 2015-09-18 10:17:21 +02:00
Tobias Geerinckx-Rice
4eadb3f154 minissdpd: init at 1.4 2015-09-18 09:36:11 +02:00
Tobias Geerinckx-Rice
6e28b032a5 gnu-efi: 3.0.2 -> 3.0.3 2015-09-18 07:12:13 +02:00
Tobias Geerinckx-Rice
27678026d7 cpio: unbundle patch (fetch from my GitHub acct.) 2015-09-18 06:09:04 +02:00
Tobias Geerinckx-Rice
3278007dae cpio: 2.11 -> 2.12 
Enable tests (which may fail on Darwin, another reason to stage this).
 2015-09-18 06:06:39 +02:00
Tobias Geerinckx-Rice
1e593edbf1 autofs: 5.0.8 -> 5.1.1 2015-09-18 05:02:02 +02:00
Tobias Geerinckx-Rice
7cfa918aac lemon: init at 1.0 2015-09-18 03:46:06 +02:00
Tobias Geerinckx-Rice
7eba250f55 hplip & plugin: 3.15.6 -> 3.15.9 2015-09-18 02:04:05 +02:00
Tobias Geerinckx-Rice
71481159a5 miniupnpc: 1.9.20150703 -> 1.9.20150917 2015-09-18 02:04:05 +02:00
Jude Taylor
58fa09a40a git-credential-osxkeychain 2015-09-17 16:11:18 -07:00
Jude Taylor
d78936131a preparation for being able to build xquartz 2015-09-17 16:11:18 -07:00
William A. Kennington III
fda452c56c chromium: Updates 
- dev: 47.0.2503.0 -> 47.0.2508.0
  - beta: 46.0.2490.22 -> 46.0.2490.33
  - stable: 45.0.2454.85 -> 45.0.2454.93
 2015-09-17 15:51:32 -07:00
William A. Kennington III
5611ad899f libs3: Only builds on linux 2015-09-17 15:41:23 -07:00
William A. Kennington III
1bc98b2e36 boost: Reduce the number of supported versions 2015-09-17 15:40:32 -07:00
William A. Kennington III
f8e7cee32e folly: 0.57.0 -> 2015-09-17 2015-09-17 15:39:21 -07:00
William A. Kennington III
fb30776a77 pcre: Fix patch method 2015-09-17 15:20:49 -07:00
William A. Kennington III
da908b458b boost: Remove unused 1.58 2015-09-17 14:49:13 -07:00
William A. Kennington III
bea831a968 Revert "libabw: fix build by using older boost" 
This reverts commit 471e5697e4.

This should have already been fixed by
35b3a53829.
 2015-09-17 14:44:35 -07:00
William A. Kennington III
9d921766c5 libressl: 2.2.2 -> 2.2.3 2015-09-17 14:33:43 -07:00
William A. Kennington III
453b986d2f pcre: Updates to fix a number of vulnerabilities 
- CVE-2015-3210
  - CVE-2015-5073
  - http://seclists.org/oss-sec/2015/q3/295
 2015-09-17 14:31:05 -07:00
William A. Kennington III
6634bdc93c openldap: Fix CVE-2015-6908 2015-09-17 14:22:51 -07:00
William A. Kennington III
bc54ecd811 subversion: 1.8.14 -> 1.9.1 2015-09-17 14:12:38 -07:00
William A. Kennington III
3fa5a3d544 spice-protocol: 0.12.7 -> 0.12.8 2015-09-17 14:12:38 -07:00
William A. Kennington III
2d5dd06fbb audit: 2.4.2 -> 2.4.4 2015-09-17 14:12:38 -07:00
William A. Kennington III
dec8e299f5 nftables: 0.4 -> 0.5 2015-09-17 14:12:38 -07:00
William A. Kennington III
42de4877ee libnftnl: 1.0.3 -> 1.0.5 2015-09-17 14:12:38 -07:00
William A. Kennington III
6b47c27e67 dhcp: 4.3.2 -> 4.3.3 2015-09-17 14:12:38 -07:00
William A. Kennington III
ecd90e61cc bind: 9.10.2-P4 -> 9.10.3 2015-09-17 14:12:38 -07:00
Pascal Wittmann
52b99249a8 perl-Crypt-OpenSSL-Random: 0.06 -> 0.10 2015-09-17 22:51:56 +02:00
Pascal Wittmann
c24601f79d perl-Crypt-Rijndael: 1.12 -> 1.13 2015-09-17 22:51:56 +02:00
Vladimír Čunát
fba3a4e227 Merge #9665: wxPython: update & refactor 2015-09-17 22:10:35 +02:00
Vladimír Čunát
80b26e4079 jitsi: fix tarball on darwin 2015-09-17 22:04:39 +02:00
Vladimír Čunát
f2d03ee0d0 Merge #8897: AppArmor updates 2015-09-17 21:21:44 +02:00
Ian-Woo Kim
38d83144aa libhangul, nabi: input method library and tool for korean 
Close #9689. @vcunat removed empty buildInputs and refactored meta.
 2015-09-17 21:19:47 +02:00
Johannes Bornhold
ee799e05bf dmd: Disable unsupported linker flags if stdenv.isClang 
Close #9692.
Was able to build dmd on darwin, but it could not be used due to those flags.
 2015-09-17 21:19:47 +02:00
Eduard Bachmakov
d006578d40 dfilemanager: update to latest git revision (close #9762) 2015-09-17 21:19:47 +02:00
desiderius
7ca623adf1 pythonPackages.elasticsearchdsl: 0.0.4 -> 0.0.8 
Close #9767.
 2015-09-17 21:19:47 +02:00
Bryan Gardiner
37cd8fc16f jitsi: fix when installed via systemPackages 
Close #9754.
Otherwise, the wrong directory is changed into, and trying to start Jitsi gives:

$ jitsi
Error: Could not find or load main class net.java.sip.communicator.launcher.SIPCommunicator
 2015-09-17 21:19:47 +02:00
Michel Kuhlmann
dc5b2741c9 geos: 3.4.2 -> 3.5.0 (close #9770) 2015-09-17 21:19:46 +02:00
Pascal Wittmann
c393d0ccc3 Merge pull request #9902 from ebzzry/tthsum-1.3.2 
tthsum: init at 1.3.2
 2015-09-17 21:01:51 +02:00
Rommel M. Martinez
16ea769c0e tthsum: init at 1.3.2 2015-09-18 03:01:01 +08:00
Vincent Laporte
34c59894a6 ocaml-mode: fix build for OCaml >= 4.02 2015-09-17 20:58:35 +02:00
Vincent Laporte
fb09fca7b7 ocsigen-server: fix the bytecode server 
Dynamically loaded OCaml libraries are now properly found
 2015-09-17 20:58:35 +02:00
Vincent Laporte
47a7742c62 proj: 4.9.1 -> 4.9.2 2015-09-17 20:58:35 +02:00
Pascal Wittmann
87d2510297 perl-Crypt-SSLeay: 0.57 -> 0.72 2015-09-17 20:26:36 +02:00
Vladimír Čunát
e922b6b0a2 oracle{jdk,jre}: add meta.platforms to fix #9786 
It won't be built by Hydra anyway due to being unfree.
 2015-09-17 20:17:12 +02:00
Vladimír Čunát
a418096d6a Merge branch 'master' into staging 2015-09-17 20:07:20 +02:00
Lancelot SIX
bed1eb3260 autogen: 5.18.5 -> 5.18.6 (close #9885) 
See http://lists.gnu.org/archive/html/info-gnu/2015-09/msg00006.html for
announcement
 2015-09-17 19:55:34 +02:00
Vladimír Čunát
471e5697e4 libabw: fix build by using older boost 2015-09-17 19:54:23 +02:00
Vladimír Čunát
ba2b706da9 proofgeneral: use the new texlive 
Supplied the needed fonts so it builds.
 2015-09-17 19:23:39 +02:00
Vladimír Čunát
c1bcf671dd gcl: don't depend on TeX 
It doesn't seem to need it or use it at all.
 2015-09-17 19:23:17 +02:00
Vladimír Čunát
237d027b86 texmacs: use new texlive, scheme-small by default 
The pdf output looks good.
 2015-09-17 19:06:53 +02:00
Vladimír Čunát
b799be7642 latex2html: mark as broken 
I don't see directly how to make it work.
 2015-09-17 19:06:42 +02:00
Vladimír Čunát
40c0356dd3 lazylist, polytable: remove as they are in texlive now 2015-09-17 19:06:14 +02:00
Vladimír Čunát
8c86f1bc84 R: use the new texlive 
The docs look fine. There's still an error though:
    Running 'texi2dvi' on 'grid.tex' failed.
 2015-09-17 19:01:03 +02:00
Vladimír Čunát
22fd6e1e4c texlive: add a new highly granular version, #287 2015-09-17 19:01:03 +02:00
Vladimír Čunát
fe5c8d78a0 poppler: add _min variant that doesn't bring X stuff 2015-09-17 17:54:32 +02:00
Vladimír Čunát
fa33b083eb buildEnv: add new parameters: extraPrefix and buildInputs 2015-09-17 17:43:18 +02:00
Arseniy Seroka
e8c1717ff4 Merge pull request #9895 from Mathnerd314/rabbitvcs 
rabbitvcs: init at 0.16
 2015-09-17 18:05:58 +03:00
Arseniy Seroka
3a6774ab34 Merge pull request #9898 from robbinch/pkg-zimlib 
zimlib: init at 20150710.
 2015-09-17 18:05:14 +03:00
Luca Bruno
67d2344120 gnome-shell: use src.nix 2015-09-17 17:02:55 +02:00
Eelco Dolstra
276e38a1bb patchShebangs: Ignore outputs that don't exist yet 2015-09-17 16:54:07 +02:00
aszlig
389e654e03
systemd: Backport fix for detecting VirtualBox. 
This is a backport of systemd/systemd@e32886e.

As noted by @ts468 in #9876, systemd-detect-virt will report KVM if
we're running inside VirtualBox 5.x. Instead of just disabling the
check, this essentially fixes systemd to be able to detect VirtualBox
again.

Tested this against nixos/tests/simple.nix (just to make sure systemd is
still working) and nixos/tests/virtualbox.nix (all tests succeed).

Thanks a lot to @ts468 for catching this and also to @domenkozar for
testing various things concerning that bug.

Fixes #9876.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-09-17 16:02:43 +02:00
Eelco Dolstra
f81982e779 gdb: Update to 7.10 2015-09-17 15:56:42 +02:00
Eelco Dolstra
e636e0a532 gdb: Look for debug info in /run/current-system/sw/lib/debug 
The previous default was $out/lib/debug, which wasn't very useful.

This ensures that you can do

  environment.systemPackages = [ pkgs.hello.debug ];

to install debug info.
 2015-09-17 15:56:37 +02:00
Eelco Dolstra
ec5b66eb4a Enable separate debug info 
You can now pass

  separateDebugInfo = true;

to mkDerivation. This causes debug info to be separated from ELF
binaries and stored in the "debug" output. The advantage is that it
enables installing lean binaries, while still having the ability to
make sense of core dumps, etc.
 2015-09-17 15:56:33 +02:00
Pascal Wittmann
edee7f1720 Transformed meta.maintainers attributes to lists 2015-09-17 15:33:36 +02:00
Pascal Wittmann
cd73f0ad69 perl-CPAN-Meta-Check: 0.009 -> 0.012 2015-09-17 15:33:36 +02:00
Pascal Wittmann
b8ecf516e3 perlPackages: fix some builds 
by adding ModuleMetadata to buildInputs
 2015-09-17 15:33:36 +02:00
Pascal Wittmann
1983d9403d perl-Module-Metadata: 1.00019 -> 1.00027 2015-09-17 15:33:36 +02:00
Pascal Wittmann
bfc52b2654 perl-CPAN-Meta: 2.142690 -> 2.150005 2015-09-17 15:33:36 +02:00
Pascal Wittmann
19e1197efa perl-B-Hooks-EndOfScope: 0.13 -> 0.15 2015-09-17 15:33:35 +02:00
Pascal Wittmann
482ae6d350 perl-Autobox: 2.82 -> 2.83 2015-09-17 15:33:35 +02:00
Pascal Wittmann
11aa159977 Merge pull request #9900 from LnL7/xhyve-0.2.0 
xhyve: xhyve-0.1.0 -> xhyve-0.2.0
 2015-09-17 15:14:01 +02:00
Rob Vermaas
7994c99d6f Update libcloud to 0.18.0. Needed for newer nixops. 2015-09-17 12:32:45 +00:00
Daiderd Jordan
c0c1374b8a xhyve: xhyve-0.1.0 -> xhyve-0.2.0 2015-09-17 13:27:12 +02:00
Vladimír Čunát
ab295420c5 qemu: qemu-2.4.0-x86-only -> qemu-x86-only-2.4.0 2015-09-17 12:47:45 +02:00
Bjørn Forsman
b0336c9854 lftp: 4.6.3a -> 4.6.4 
Upstream says:

  2015-08-20: lftp-4.6.4 released. Some bugs fixed, minor features added.
 2015-09-17 12:17:19 +02:00
Domen Kožar
ca6fae24b9 sqlalchemy, IMAPClient: disable on py35 2015-09-17 11:19:18 +02:00
Domen Kožar
539b39c34b python35Packages.pyparted: 3.10 -> 3.10.7 2015-09-17 11:17:03 +02:00
Jascha Geerds
d8b6defaae hipchat: 2.2.1373 -> 2.2.1388 2015-09-17 11:06:24 +02:00
Vladimír Čunát
485ea9a621 xf86_video_nouveau: deprecate this alias 2015-09-17 09:11:18 +02:00
William A. Kennington III
fc2b0e9d10 argyllcms: gcc5 compat 2015-09-16 21:58:53 -07:00
Robbin C
024b0414ab zimlib: init at 20150710. 
This adds zimlib, a library for reading and writing ZIM files. ZIM is a
file format for storing Web content offline.
 2015-09-17 12:26:11 +08:00
William A. Kennington III
318ac091b2 ldns: Compat with perl 5.22 2015-09-16 21:20:49 -07:00
Thomas Tuegel
3faf5b53a5 dropbox: 3.8.5 -> 3.8.9 2015-09-16 17:55:12 -05:00
Mathnerd314
c3ed1b17ba rabbitvcs: init at 0.16 2015-09-16 16:36:27 -06:00
Arseniy Seroka
6c6653a437 vimPlugins: 2015-09-17 update 2015-09-17 00:42:27 +03:00
William A. Kennington III
35b3a53829 libabw: Boost 1.59 Compat 2015-09-16 13:45:54 -07:00
William A. Kennington III
84505bd36a grsecurity: Update patches 2015-09-16 13:35:41 -07:00
Benjamin Staffin
cc1af6640c swig3: re-enable darwin builds 2015-09-16 16:28:13 -04:00
William A. Kennington III
5a0759971f heimdal: 2015-06-17 -> 2015-09-13 2015-09-16 13:14:23 -07:00
William A. Kennington III
62a04a8bf1 libtasn1: 4.5 -> 4.7 2015-09-16 13:05:16 -07:00
William A. Kennington III
871baf2278 kernel: 4.1.6 -> 4.1.7 2015-09-16 12:55:36 -07:00
William A. Kennington III
5975687f98 kernel: 3.14.51 -> 3.14.52 2015-09-16 12:55:36 -07:00
William A. Kennington III
72d22e3f4d kernel: 3.10.87 -> 3.10.88 2015-09-16 12:55:36 -07:00
Arseniy Seroka
69ea3f4a9a Merge pull request #9867 from AndersonTorres/intercal 
Intercal: a quick fix to find gcc
 2015-09-16 22:53:05 +03:00
Arseniy Seroka
ea8e824cdd Merge pull request #9852 from taku0/wavpack_darwin 
wavpack: disabled asm for Darwin
 2015-09-16 22:52:27 +03:00
Arseniy Seroka
0345a316ae Merge pull request #9853 from odi/emacs-packages 
[emacs-packages]: engine-mode init at 1.0.0
 2015-09-16 22:51:45 +03:00
Arseniy Seroka
0488226367 Merge pull request #9882 from rehno-lindeque/vimPlugins-vim-jade 
vimPlugins: add vim-jade
 2015-09-16 22:51:21 +03:00
Bjørn Forsman
c9a6b811d6 duply: 1.9.1 -> 1.9.2 2015-09-16 19:47:45 +02:00
Andreas Wagner
937741c9f3 teensy-loader-cli: consistent naming, version bump 2015-09-16 19:14:01 +02:00
Edward Tjörnhammar
f02eed27f9 gitRepo: 1.21 -> 1.22 2015-09-16 19:13:27 +02:00
Bjørn Forsman
b95bec7917 wireshark: 1.12.5 -> 1.12.7 
Build and run tested.
 2015-09-16 19:00:34 +02:00
Thomas Tuegel
ac74bb296c Merge branch 'julia' 2015-09-16 11:21:56 -05:00
Thomas Tuegel
3dcff36085 julia: build dependencies with same openblas 2015-09-16 11:19:03 -05:00
Thomas Tuegel
aa4efac850 arpack: update homepage 2015-09-16 11:08:39 -05:00
lethalman
8e6acbe201 Merge pull request #9888 from krgn/renoise 
add Renoise to nixpkgs
 2015-09-16 17:57:02 +02:00
karsten gebbert
6625fde1c7 add renoise to nixpkgs 2015-09-16 17:46:16 +02:00
Edward Tjörnhammar
c6cadd11db Merge pull request #9785 from khumba/jitsi-rpath-fix 
jitsi: patch RPATHs for missing libraries
 2015-09-16 16:10:04 +02:00
Bjørn Forsman
0af5fccf2a pidgin-sipe: 1.18.1 -> 1.20.0 
Build and run tested (on release-15.09 branch).
 2015-09-16 15:47:16 +02:00
Bryan Gardiner
476f2e3e2d
jitsi: add myself as maintainer 2015-09-16 06:42:26 -07:00
Bryan Gardiner
e422c2398c
jitsi: make a path patch for java slightly safer 2015-09-16 06:42:26 -07:00
Bryan Gardiner
8ef6197be5
jitsi: patch RPATHs of bundled .so files 
Possibly helps with bug #3482.
 2015-09-16 06:42:25 -07:00
Bryan Gardiner
4140c7fe16
openjdk8: add the architecture passthru from openjdk7 2015-09-16 06:42:22 -07:00
taku0
a904293857 wavpack: disabled asm for Clang 2015-09-16 21:10:19 +09:00
Edward Tjörnhammar
54ced3be71 Merge pull request #9856 from rycee/bump/svtplay-dl 
svtplay-dl: 0.10.2015.08.24 -> 0.20.2015.09.13
 2015-09-16 13:51:21 +02:00
Tobias Geerinckx-Rice
0f0b20ac0c eid-mw: 4.1.5 -> 4.1.6 2015-09-16 13:08:17 +02:00
Tobias Geerinckx-Rice
33d2f27d95 stress-ng: 0.04.18 -> 0.04.19 2015-09-16 13:08:17 +02:00
lethalman
d938e6bad5 Merge pull request #9881 from rycee/bump/some-perl-packages 
Bump versions of some Perl packages
 2015-09-16 11:23:34 +02:00
aszlig
cb5e5a5b9d
Revert "makeInitrd, makeModulesClosure: reduce repetition" 
This reverts commit b5ee55f81f.

The reason is that the args attribute in this case doesn't contain the
optional attributes which are specified, see here for example:

$ nix-instantiate --eval -E '(args@{ bar ? 111, ... }: args) {}'
{ }
$

This essentially breaks all VM tests, because stage-1 is passing all
arguments but pkgs/build-support/vm/default.nix does not.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-09-16 10:33:10 +02:00
Bjørn Forsman
b8e776bbe4 diffstat: 1.59 -> 1.60 
2015/07/07 (diffstat 1.60)
	+ add configure option --with-man2html

	+ update configure macros

	+ update config.guess, config.sub
 2015-09-16 07:55:13 +02:00
Bjørn Forsman
a8b75d8777 ascii: 3.14 -> 3.15 2015-09-16 07:51:05 +02:00
Bjørn Forsman
0b9d83737c lighttpd: 1.4.35 -> 1.4.37 2015-09-16 07:46:34 +02:00
Tobias Geerinckx-Rice
b708f3b117 netsniff-ng: 0.5.9-{96-g4669e7a -> 98-gb3a9f17} 2015-09-16 05:48:58 +02:00
Tobias Geerinckx-Rice
d884dd7a55 libpsl: list 2015-09-07 -> 2015-09-15 2015-09-16 05:01:19 +02:00
Tobias Geerinckx-Rice
0635ec3b5c libpsl: 0.8.0 -> 0.9.0 2015-09-16 05:01:18 +02:00
Tobias Geerinckx-Rice
85ed1cc5ed miniupnpc: 1.9.{20150430 -> 20150730} 
The miniupnpc(3) man page is (now?) installed by default,
no need to do so manually.

Let's try enabling the test "suite"; it is dirt-cheap.
 2015-09-16 05:01:18 +02:00
Rehno Lindeque
b1d894e081 vimPlugins: add vim-jade 2015-09-16 00:38:20 +00:00
Austin Seipp
bab211893b nixpkgs: rethinkdb 2.0.4 -> 2.1.3 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-09-15 18:42:12 -05:00
Robert Helgesson
34ce5ce652 perl-Pod-Weaver: 4.004 -> 4.012 2015-09-16 01:22:41 +02:00
Robert Helgesson
c2705ef98d perl-Config-INI: 0.020 -> 0.025 2015-09-16 01:09:10 +02:00
Robert Helgesson
f75df15636 perl-Mixin-Linewise: 0.004 -> 0.108 2015-09-16 01:09:10 +02:00
Robert Helgesson
a2b7097059 perl-Throwable: 0.200010 -> 0.200013 2015-09-16 01:09:09 +02:00
Robert Helgesson
7324065115 perl-Readonly: 1.03 -> 2.00 2015-09-16 01:09:09 +02:00
Robert Helgesson
4dd7a7622a perl-CPAN-Changes: 0.27 -> 0.400002 2015-09-16 01:09:09 +02:00
Robert Helgesson
400d9e536b perl-Getopt-Long-Descriptive: 0.093 -> 0.099 2015-09-16 01:09:09 +02:00
Robert Helgesson
4d8733d7b4 perl-mousex-getopt: 0.35 -> 0.36 2015-09-16 01:09:04 +02:00
Robert Helgesson
f10fe3f596 perl-MooseX-Getopt: 0.65 -> 0.68 2015-09-16 00:47:38 +02:00
aszlig
89b6831ffd
virtualbox: Fix load of dbus library at runtime. 
VirtualBox had support for DBUS even in version 4.x, but it appears that
nothing in our VM test triggered it to load, thus I didn't notice the
runtime error:

rtldrNativeLoad: dlopen('libdbus-1.so.3', RTLD_NOW | RTLD_LOCAL) failed:
                 libdbus-1.so.3: cannot open shared object file: No such
                 file or directory

The upstream commits I think are responsible for this to come to surface
are _probably_ (did I ever mention that I love SVN? *cough*) one of
these:

https://www.virtualbox.org/changeset/55664/vbox
https://www.virtualbox.org/changeset/55602/vbox

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-09-16 00:19:52 +02:00
Pascal Wittmann
c748c0fb41 global: 6.5 -> 6.5.1 2015-09-15 23:47:18 +02:00
Robert Helgesson
d243a5d0c9 eclipse-plugin-bytecode-outline: init at 2.4.3 2015-09-15 22:13:14 +02:00
Vladimír Čunát
83df5ae07b ccl: fix fetchsvn hash (fixes #9746) 
No idea what's changed.
 2015-09-15 21:47:52 +02:00
Tobias Geerinckx-Rice
0f19e693aa perlPackages.MathBigRat: 0.2606 -> 0.260801 2015-09-15 21:34:10 +02:00
Peter Simons
91b07846a6 haskell-bytestring-builder: trigger re-build to recover from broken package on Hydra 2015-09-15 21:31:49 +02:00
William A. Kennington III
773b4deb7c Merge commit 'a6f6c0e' into master.upstream 
This is a partial merge of staging where we have up to date binaries for
all packages.
 2015-09-15 12:16:49 -07:00
William A. Kennington III
8dc7073546 Merge branch 'master.upstream' into staging.upstream 2015-09-15 12:04:41 -07:00
Frederik Rietdijk
316a09377d numba: init at 0.21.0, fixes #9516 2015-09-15 20:25:16 +02:00
Frederik Rietdijk
1f58b332a0 llvmlite: init at 0.7.0 
[ci skip]
 2015-09-15 20:25:03 +02:00
Guillaume Maudoux
63b0a6c527 python-INGInious: 0.3.dev1 -> 0.3a2.dev0 
Fixes hydra build failure(s).
Fixes #9873.
 2015-09-15 19:43:33 +02:00
Guillaume Maudoux
47cd462823 pythin-sphinx_rtd_update: 0.1.7 -> 0.1.8 2015-09-15 19:10:09 +02:00
Peter Simons
7802f5c793 haskell.lib: add doDistribute function as a dual to dontDistribute 2015-09-15 16:23:46 +02:00
Peter Simons
974f2122b1 jailbreak-cabal: clean up overrides 
These changes ensure that jailbreak-cabal works correctly without further
configuration even with older compilers. The exception to that rule being,
naturally, versions of GHC that can't compile Cabal 1.20.x; these *do* need
another override.
 2015-09-15 16:23:46 +02:00
Peter Simons
73d79ed945 ghc: re-add version 7.8.3, which is required for LTS support 2015-09-15 16:23:46 +02:00
Peter Simons
6a0e150aa9 configuration-ghc-7.10.x.nix: remove obsolete overrides 2015-09-15 16:23:46 +02:00
Domen Kožar
81b05b4a48 bump a bunch of python libs to fix py35 support 2015-09-15 16:16:11 +02:00
Peter Simons
8836c58dc0 Remove all references to haskell-ng and haskellngPackages from Nixpkgs. 2015-09-15 16:11:58 +02:00
Domen Kožar
21a3ebd013 Merge pull request #9873 from FRidh/multiprocessing 
python-packages multiprocessing: remove package
 2015-09-15 15:45:07 +02:00
Arseniy Seroka
32c4603a55 Merge pull request #9859 from ebzzry/rtorrent-0.9.6 
rtorrent: 0.9.4 -> 0.9.6
 2015-09-15 15:40:15 +03:00
Rommel M. Martinez
5fc73c6de1 rtorrent: 0.9.4 -> 0.9.6 2015-09-15 20:03:03 +08:00
Frederik Rietdijk
3633a3b6f1 python-packages multiprocessing: remove package 
multiprocessing is a backport for Python 2.4 and 2.5. Both versions are
not supported on Nix. This removes the multiprocessing package.
 2015-09-15 13:26:05 +02:00
Frederik Rietdijk
ca769a679a python-packages inginious: does not need multiprocessing package 
Inginious does not actually need the multiprocessing.
 2015-09-15 13:23:48 +02:00
Vladimír Čunát
eb09b1fd85 hackage-packages: revert the xlib renaming changes 
The file is generated anyway.

@peti: is there an easy way to make the generator use different
attribute names? (But this case isn't important at all.)
 2015-09-15 13:07:41 +02:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg 
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
 2015-09-15 12:54:34 +02:00
Vladimír Čunát
21e3ff658a x11: replace its usage by xlibsWrapper directly 
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
 2015-09-15 12:08:24 +02:00
Vladimír Čunát
47ad941fbf x11,xlibs: deprecate these aliases 2015-09-15 12:03:30 +02:00
Vladimír Čunát
0c74f18e4c xlibs.xlibs: remove 
It was really ugly that `xlibs.xlibs` meant something else than `xlibs`,
especially when using `with xlibs`, such as in wine.
Also, now `xlibs` is the same as `xorg`.
 2015-09-15 11:59:33 +02:00
Pascal Wittmann
1e24c18d18 mujs: 2015-01-22 -> 2015-09-15 2015-09-15 11:02:23 +02:00
Pascal Wittmann
db0819f955 Fix some meta.license attributes 2015-09-15 11:02:09 +02:00
Vladimír Čunát
6521957bf4 lesstif: correct the version 
... to correspond to what is really downloaded and built.
Also, the 2006 comment was no longer correct, as the version is from 2009.
 2015-09-15 10:03:23 +02:00
Vladimír Čunát
b5ee55f81f makeInitrd, makeModulesClosure: reduce repetition 
After #9869.
 2015-09-15 10:03:23 +02:00
Frederik Rietdijk
f97b4c4fb8 python-packages numpy: disabled for Py35 
numpy 1.9.2 does not support python 3.5. The newer version, 1.9.3 or 1.10 for sure will.
http://numpy-discussion.10968.n7.nabble.com/OK-to-upload-patched-1-9-2-for-Python-3-5-td41032.html
 2015-09-15 09:18:19 +02:00
Frederik Rietdijk
36bf2f60d1 python-packages: Python 3.5 2015-09-15 09:17:42 +02:00
vbgl
39af9df25b Merge pull request #9866 from ericsagnes/byobu 
byobu: fixup script paths (closes #9865)
 2015-09-15 08:58:59 +02:00
Tobias Geerinckx-Rice
193319ce03 "Parallel Tools" -> Parallels Tools 2015-09-15 08:51:02 +02:00
Tobias Geerinckx-Rice
7c8dd80c30 perlPackages.SysVirt: 1.2.9 -> 1.2.19 2015-09-15 08:51:01 +02:00
Domen Kožar
de8f176875 fix nixos eval 2015-09-15 08:45:19 +02:00
Eric Sagnes
ad3193e59a byobu: fixup script paths 2015-09-15 15:42:20 +09:00
Domen Kožar
0f35fa16c8 python33Packages: too old to build them on hydra 2015-09-15 07:50:27 +02:00
Domen Kožar
cabb050528 add python35 and python35Packages 2015-09-15 07:46:46 +02:00
Domen Kožar
eb29d8e44b Merge pull request #9869 from Mathnerd314/import-fix 
all-packages: Use callPackage where possible
 2015-09-15 06:53:50 +02:00
Mathnerd314
eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
Domen Kožar
f3519eb040 Merge pull request #9864 from ebzzry/unetbootin-613 
unetbootin: 608 -> 613
 2015-09-15 06:15:36 +02:00
Domen Kožar
b487fb65e3 Merge pull request #9860 from ktosiek/openafs-linux-4.2 
openafs: patches for linux 4.2
 2015-09-15 06:14:03 +02:00
Domen Kožar
60ad36ba67 libreoffice: 5.0.0.5 -> 5.0.1.2, refactor 
I've extracted some of libraries and made expression simpler.

(cherry picked from commit 66e6f99d40350a4b2a235913a1fa77d88b1a44a6)
Signed-off-by: Domen Kožar <domen@dev.si>
 2015-09-15 05:41:37 +02:00
Domen Kožar
0b4ec468c5 disable chronos /cc @offlinehacker 
(cherry picked from commit 83cc494542b9c53921616caa06984bd72f4e3dea)
Signed-off-by: Domen Kožar <domen@dev.si>
 2015-09-15 05:41:20 +02:00
AndersonTorres
6a8cf7854d Intercal: a quick fix to find gcc 
Intercal needs gcc to build any executable, and in Nix/NixOS it needs to
be explicitly set in PATH environment variable. So, now ick is
conveniently wrapped.
 2015-09-14 23:40:46 -03:00
aszlig
7fb1c7efcf
python/notmuch: Fix runtime dep on libnotmuch. 
The Python library wants to use ctypes.CDLL() on libnotmuch, so we need
to patch in the correct store path of the shared object file.

Thanks to mog from the #nixos IRC for stumbling over this.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2015-09-15 04:25:41 +02:00
Tobias Geerinckx-Rice
98782144ed libtiff: 4.0.5 -> 4.0.6 2015-09-15 03:32:41 +02:00
Jude Taylor
9be2c355be remove 3 more outdated impure-deps 2015-09-14 17:54:15 -07:00
Tobias Geerinckx-Rice
c545bc80f6 hack (font): init at 2.013 2015-09-15 00:47:58 +02:00
Tobias Geerinckx-Rice
133a31f71f mcelog: 125 -> 126 
Adds --is-cpu-supported command line option.
 2015-09-15 00:17:18 +02:00
Eric Seidel
1d5a96c3c6 Merge pull request #9309 from acowley/nix-darwin 
nix: use libsodium on darwin
 2015-09-14 15:12:33 -07:00
Tobias Geerinckx-Rice
cb363c1033 dstat: add python-wifi dependency for --wifi 
This is limited to kernels with the (legacy) Wireless Extensions,
and supported wireless cards. Also add myself as a maintainer.

CC maintainer @jgeerds
 2015-09-14 23:53:21 +02:00
Tobias Geerinckx-Rice
8314510a02 pythonPackages.python-wifi: init at 0.6.0 2015-09-14 23:53:21 +02:00
Tobias Geerinckx-Rice
6dc2a827c0 geolite-legacy: update 2015-09-08 -> 2015-09-14 2015-09-14 23:53:20 +02:00
Samuel Rivas
40d26f6730 erlang-mode: refactor maintainers (close #9855) 2015-09-14 23:47:20 +02:00
Benjamin Saunders
8613179f78 llvm: 3.6 -> 3.7 (close #9815) 
Package changes from 3.6:
- CMake exports patch no longer necessary
- Cosmetic purity patch fix
- Build libc++ with private libc++abi headers visible from sources
- Work around bugs in lldb's configure scripts
 2015-09-14 23:47:20 +02:00
Rommel M. Martinez
1b262abd98 unetbootin: 608 -> 613 2015-09-15 05:11:34 +08:00
Peter Simons
e1bbc6f35c cabal2nix: fix version number 20180903 to 20150903 
Thanks to @drvink for pointing this out.
 2015-09-14 13:46:16 -07:00
Tomasz Kontusz
135fc6a769 lttng-modules: 2.6.2-1-g7a88f8b -> 2.6.3 
This also drops the assertion about kernel.version - we don't have
anything older than 3.4 in nixpkgs anyway.
 2015-09-14 21:45:37 +02:00
vbgl
bc6c6f1444 Merge pull request #9857 from ebzzry/deluge-1.3.12 
deluge: 1.3.11 -> 1.3.12
 2015-09-14 21:29:33 +02:00
Tomasz Kontusz
afff88e599 openafs: patches for linux 4.2 2015-09-14 21:28:20 +02:00
Rommel M. Martinez
95e8e6fc00 deluge: 1.3.11 -> 1.3.12 2015-09-15 02:21:11 +08:00
Eelco Dolstra
4e1b21d133 Make the jdk/jre attributes work on Darwin 2015-09-14 20:18:44 +02:00
Oliver Dunkl
410749d795 [emacs-packages]: engine-mode init at 1.0.0 2015-09-14 20:12:06 +02:00
Robert Helgesson
d749f111ab svtplay-dl: 0.10.2015.08.24 -> 0.20.2015.09.13 2015-09-14 20:08:56 +02:00
Vincent Laporte
55004d509a ocaml-dolog: 1.0 -> 1.1 2015-09-14 20:07:21 +02:00
Eelco Dolstra
ef490c6b14 Make the "openjdk7" attribute work on Darwin 2015-09-14 19:21:28 +02:00
Eelco Dolstra
acd97de64d Fix Darwin eval 2015-09-14 19:21:15 +02:00
Eelco Dolstra
77f3fe79b2 Disambiguate openjdk/openjre 
This makes "nix-env -i openjre" work again.

Also get rid of some unnecessary aliases.
 2015-09-14 19:07:18 +02:00