1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-19 12:28:51 +00:00
Commit graph

2016 commits

Author SHA1 Message Date
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
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
Joachim Fasting 594bdfc74d Merge pull request #15125 from Beauhurst/php_updates
PHP security updates
2016-05-01 19:02:19 +02:00
Nikolay Amiantov 37563c2d96 spidermonkey: add meta 2016-05-01 12:37:48 +03:00
Robert Scott 11a716491b php: 5.5.34 -> 5.4.35 2016-04-30 22:32:34 +00:00
Robert Scott e9c16b7902 php: 5.6.20 -> 5.6.21 2016-04-30 20:48:12 +00:00
Eric Sagnes a8bc5b67f8 php: add default php.ini 2016-04-29 15:26:20 +09:00
Tuomas Tynkkynen b465dc202f boost: Kill unnecessary 'lib' output
This was split in somewhere pre-2014 without the current infra which
automates parts of this, in particular the output propagation.
2016-04-28 00:41:28 +03:00
Tuomas Tynkkynen 4ff8f377af Merge remote-tracking branch 'upstream/master' into staging 2016-04-28 00:13:53 +03:00
Vladimír Čunát 387915e99c python3*: port the fix from parent commit
I really love such copied expressions...
but this case was easy compared to usual consequences
of file-copying in long-running branches.
2016-04-26 10:52:18 +02:00
Vladimír Čunát 626e5bd4dd python3: fix build after 5ff40dded, refactor
The path list was passed in a format not suitable for gcc command-line.
Also, let's utilize that we had `with stdenv.lib;`.
/cc @abbradar.
2016-04-26 10:43:48 +02:00
Nikolay Amiantov 5ff40ddedf add get* helper functions and mass-replace manual outputs search with them 2016-04-25 13:24:39 +03:00
Eric Merritt 2d6d9682bb elixir: set ERL_LIBS for elixir apps
Previously Elixir didn't correct set the ERL_LIBS environment
variable for the OTP Applications that it supplies. This
change fixes that
2016-04-23 19:03:29 -07:00
Eric Merritt e214f29168 elixir: modify elixir to allow debug information
This modifies the elixir derivation to allow 'debugInfo' to be set. This
will build the elixir library with debug information and allow dializer
to be used it derivative projects
2016-04-23 19:03:29 -07:00
Lluís Batlle i Rossell e741a302d4 Make rigsofrods build the latest code.
I add angelscript 2.22 too, as it makes RoR happy.
2016-04-18 12:30:47 +02:00
Michael Raskin 7c0f4882f3 angelscript: 2.30.2 -> 2.31.0 2016-04-13 14:47:04 +02:00
Vladimír Čunát 39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
Robert Scott d61b739f07 php: 5.6.19 -> 5.6.20 2016-04-10 18:41:57 +00:00