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
2a4af7ef72
pixie: 1333 -> 1352
2016-05-10 19:56:55 +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
Robert Scott
1773c53fcf
php55: 5.5.33 -> 5.5.34
2016-04-10 14:45:35 +00:00
Vladimír Čunát
30f14243c3
Merge branch 'master' into closure-size
...
Comparison to master evaluations on Hydra:
- 1255515 for nixos
- 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Vladimír Čunát
d1df28f8e5
Merge 'staging' into closure-size
...
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Tomas Hlavaty
106d0f6b51
clisp: control build options and fix non x86* architectures
2016-04-04 22:22:30 +02:00
joachifm
b83efcc906
Merge pull request #14419 from micxjo/update-rakudo
...
rakudo-star: 2015.11 -> 2016.01
2016-04-03 19:05:03 +00:00
Micxjo Funkcio
8949de8cfd
rakudo-star: 2015.11 -> 2016.01
...
Support for the JVM backend has been temporarily switched off as
it's not fully functional yet and upstream recommends against
using it.
2016-04-03 11:46:45 -07:00
zimbatm
3dfe4297ae
racket: 6.3 -> 6.4
2016-04-03 14:10:35 +01:00
Eric Bailey
e549aad2f2
elixir: 1.2.3 -> 1.2.4
2016-04-02 15:46:58 -05:00
Eric Bailey
456ce67462
Patch erlang-R17
...
Fix R17 build on OS X, modeling changes after R18,
i.e. inherit Carbon, Cocoa.
2016-04-01 19:06:20 -05:00
Arseniy Seroka
b3792fa38b
Merge pull request #14355 from kragniz/jython-2.7.0
...
jython: 2.7-rc3 -> 2.7.0
2016-04-01 15:15:48 +03:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Louis Taylor
4cd54c5ce9
jython: 2.7-rc3 -> 2.7.0
2016-04-01 01:51:00 +01:00
Franz Pletz
fc1e886f1b
php: 7.0.2 -> 7.0.5 (security)
...
https://secure.php.net/ChangeLog-7.php#7.0.5
2016-03-31 16:07:43 +02:00
Domen Kožar
a1cfdb9c88
remove erlangR14: outdated and doesn't build
2016-03-30 18:54:58 +01:00
joachifm
532beaa2a3
Merge pull request #13913 from grwlf/torch
...
torch: add expression for Torch7 the machine-learning framework
2016-03-30 14:29:32 +00:00
Domen Kožar
b07e7bfc7b
Merge remote-tracking branch 'origin/staging'
2016-03-27 13:19:04 +01:00
Joachim Fasting
3fe86ac582
io: fix gcc5 build
...
c11 inline semantics breaks the build
See https://github.com/stevedekorte/io/issues/316
and https://hydra.nixos.org/build/33606216/nixlog/1/raw
2016-03-26 16:54:19 +01:00
Joachim Fasting
04bcb88332
hugs: fix build & meta fixups
...
Fix build by applying a patch from Arch Linux.
See https://hydra.nixos.org/build/33247205/log/raw
Meta fixups
- The license is actually 3-clause BSD license.
- Use HTTPS homepage
- Adopt the package
- Convert src.sha256 to base32
2016-03-25 00:39:49 +01:00