Vladimír Čunát
|
e4832c7541
|
Merge branch 'staging'
Includes a security update of libxml2.
|
2016-05-27 15:58:40 +02:00 |
|
Franz Pletz
|
93c010ddad
|
php: 5.5.35 -> 5.5.36, 7.0.6 -> 7.0.7 (security)
See:
* https://secure.php.net/ChangeLog-5.php#5.5.36
* https://secure.php.net/ChangeLog-7.php#7.0.7
|
2016-05-26 18:44:31 +02:00 |
|
Vladimír Čunát
|
0b192a0976
|
Merge branch 'master' into staging
That's to get mesa rebuild from master, as it's nontrivial.
|
2016-05-23 09:02:10 +02:00 |
|
Vladimír Čunát
|
c4661e9643
|
Merge: make dev output references explicit
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
|
2016-05-22 12:09:23 +02:00 |
|
Vladimír Čunát
|
5dfe6fd034
|
perl: fix evaluation on cygwin
... and maybe on other platforms that have `stdenv.cc.cc == null`.
No hash changes where it did evaluate previously. Discussion:
https://github.com/NixOS/nixpkgs/commit/b291f1682f#commitcomment-17558440
|
2016-05-20 21:37:27 +02:00 |
|
Tuomas Tynkkynen
|
7fb29bfa73
|
treewide: Make explicit that 'dev' output of zlib is used
|
2016-05-19 10:04:38 +02:00 |
|
Tuomas Tynkkynen
|
e80e4ba2bb
|
treewide: Make explicit that 'dev' output of sqlite is used
|
2016-05-19 10:04:34 +02:00 |
|
Tuomas Tynkkynen
|
8d473f107c
|
treewide: Make explicit that 'dev' output of readline is used
|
2016-05-19 10:03:35 +02:00 |
|
Tuomas Tynkkynen
|
2a73de6e6c
|
treewide: Make explicit that 'dev' output of openssl is used
|
2016-05-19 10:02:23 +02:00 |
|
Tuomas Tynkkynen
|
3672f3edcb
|
treewide: Make explicit that 'dev' output of libxslt is used
|
2016-05-19 10:00:48 +02:00 |
|
Tuomas Tynkkynen
|
309b2644ac
|
treewide: Make explicit that 'dev' output of libpng is used
|
2016-05-19 10:00:44 +02:00 |
|
Tuomas Tynkkynen
|
be00816cab
|
treewide: Make explicit that 'dev' output of libjpeg is used
|
2016-05-19 10:00:42 +02:00 |
|
Tuomas Tynkkynen
|
5ecce6b94a
|
treewide: Make explicit that 'dev' output of libffi is used
|
2016-05-19 10:00:41 +02:00 |
|
Tuomas Tynkkynen
|
47c45e2041
|
treewide: Make explicit that 'dev' output of gmp is used
|
2016-05-19 10:00:36 +02:00 |
|
Tuomas Tynkkynen
|
288912c2c4
|
treewide: Make explicit that 'dev' output of freetype is used
|
2016-05-19 10:00:34 +02:00 |
|
Tuomas Tynkkynen
|
e28e010b36
|
treewide: Make explicit that 'dev' output of curl is used
|
2016-05-19 10:00:29 +02:00 |
|
Tuomas Tynkkynen
|
c22f86a853
|
treewide: Make explicit that 'dev' output of bzip2 is used
|
2016-05-19 10:00:28 +02:00 |
|
Alexander Ried
|
3e39cfe860
|
dust: add meta field
|
2016-05-18 17:31:12 +02:00 |
|
Alexander Ried
|
b5ae9ad3fb
|
dust: use fetchFromGitHub (sha was broken)
|
2016-05-18 17:31:07 +02:00 |
|
Domen Kožar
|
b49bf121b8
|
rename iElectric to domenkozar to match GitHub
|
2016-05-17 13:00:47 +01:00 |
|
Peter Simons
|
8e462995ba
|
Bring my stdenv.lib.maintainers user name in line with my github nick.
|
2016-05-16 22:49:55 +02:00 |
|
Frederik Rietdijk
|
022f5fdf83
|
Merge pull request #15477 from FRidh/pythonbuildinputs
Python: be explicit about buildInputs
|
2016-05-16 12:11:39 +02:00 |
|
Frederik Rietdijk
|
91834cfe3e
|
Python 3.5: be explicit about buildInputs
|
2016-05-16 12:10:33 +02:00 |
|
Frederik Rietdijk
|
56e96b8b10
|
Python 3.4: be explicit about buildInputs
|
2016-05-16 12:10:32 +02:00 |
|
Frederik Rietdijk
|
58ec2d47ea
|
Python 3.3: be explicit about buildInputs
|
2016-05-16 12:10:32 +02:00 |
|
Vladimír Čunát
|
e5d40c6fa3
|
Merge branch 'staging'
Hydra is only half-finished, but we'd better get secure glibc fast.
|
2016-05-16 10:15:28 +02:00 |
|
Rok Garbas
|
913e869f8d
|
remove python32 due to pip 8.1.2 not supporting python 3.2 anymore
|
2016-05-15 15:09:23 +02:00 |
|
Frederik Rietdijk
|
6c51676476
|
Merge pull request #15366 from bendlas/update-pypy
pypy: 4.0.1 -> 5.1.1
|
2016-05-15 13:12:11 +02:00 |
|
Vladimír Čunát
|
b1ac3404e0
|
Merge branch 'master' into staging
|
2016-05-14 21:37:55 +02:00 |
|
Franz Pletz
|
4d750ae2c7
|
php: 7.0.5 -> 7.0.6
|
2016-05-13 17:27:59 +02:00 |
|
Franz Pletz
|
468d35fc8e
|
perl: 5.22.1 -> 5.22.2
|
2016-05-13 17:04:50 +02:00 |
|
Vladimír Čunát
|
3e387c3e00
|
Merge branch 'staging'
Darwin isn't in a perfect state, in particular its bootstrap tools won't
build which will block nixpkgs channel. But on the whole it seems
acceptable.
|
2016-05-13 10:14:53 +02:00 |
|
Pascal Wittmann
|
be482b2314
|
groovy: 2.4.5 -> 2.4.6
|
2016-05-12 20:57:46 +02:00 |
|
Vladimír Čunát
|
6c2fbfbd77
|
Merge branch 'master' into staging
|
2016-05-12 04:53:38 +02:00 |
|
Herwig Hochleitner
|
668f9159ab
|
pypy: deactivate test_zipfile64 again
|
2016-05-11 18:33:36 +02:00 |
|
Herwig Hochleitner
|
2a4af7ef72
|
pixie: 1333 -> 1352
|
2016-05-10 19:56:55 +02:00 |
|
Herwig Hochleitner
|
e87cbf9fa3
|
pypy: revise test expression
|
2016-05-10 19:51:06 +02:00 |
|
Herwig Hochleitner
|
14e73a6e6f
|
pypy: 4.0.1 -> 5.1.1
|
2016-05-10 19:49:53 +02:00 |
|
Eelco Dolstra
|
cb37ab146b
|
Add mirror://mozilla scheme
|
2016-05-09 19:37:22 +02:00 |
|
Vladimír Čunát
|
65a9fa8cdc
|
Merge branch 'master' into staging
|
2016-05-08 21:24:48 +02:00 |
|
Nikolay Amiantov
|
2d57767974
|
openspades-git: drop yet another hack, fix accidential python merge
|
2016-05-07 12:03:24 +03:00 |
|
Nikolay Amiantov
|
c7193c1506
|
openspades: less hacks
|
2016-05-07 11:59:53 +03:00 |
|
zimbatm
|
e8803166ef
|
elixir: 1.2.4 -> 1.2.5
|
2016-05-06 11:23:10 +02:00 |
|
Karn Kallio
|
deb1c67411
|
racket: 6.4 -> 6.5
|
2016-05-05 20:25:25 +02:00 |
|
Joachim Fasting
|
23fd70b719
|
Merge pull request #15018 from ericsagnes/pkg-fix/php
php: add default php.ini
|
2016-05-05 19:16:04 +02:00 |
|
Vladimír Čunát
|
1dc36904d8
|
Merge #14920: windows improvements, mainly mingw
|
2016-05-05 08:30:19 +02:00 |
|
zimbatm
|
007ea84222
|
Merge pull request #15181 from bradediger/ruby-2.3.1
ruby: update 2.3 series to 2.3.1
|
2016-05-04 10:31:08 +01:00 |
|
Tuomas Tynkkynen
|
aadaa91379
|
Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
pkgs/applications/networking/browsers/vivaldi/default.nix
pkgs/misc/emulators/wine/base.nix
|
2016-05-03 23:12:48 +03:00 |
|
Franz Pletz
|
c0f4361902
|
php: Fix openssl module build
|
2016-05-03 16:04:40 +02:00 |
|
Brad Ediger
|
6e353bb17f
|
ruby: update 2.3 series to 2.3.1
|
2016-05-02 15:49:05 -05:00 |
|