Vladimír Čunát
a81e8c2e97
Merge branch 'master' into staging
...
This is to get the openssl security update immediately,
as it surely causes a nontrivial rebuild.
2015-12-05 11:42:48 +01:00
Vladimír Čunát
263fd55d4b
Merge recent staging built on Hydra
...
http://hydra.nixos.org/eval/1231884
Only Darwin jobs seem to be queued now,
but we can't afford to wait for that single build slave.
2015-12-05 11:11:51 +01:00
Vladimír Čunát
476c96b5c6
Merge master into staging
...
Taken the version from recent channel bump, as it's well-tested.
Close #11460 .
2015-12-05 10:26:06 +01:00
Arseniy Seroka
0c05f14d53
Merge pull request #10535 from roblabla/feature-updateGitlab8.0.5
...
gitlab: 7.4.2 -> 8.0.5
2015-12-04 16:30:09 +03:00
Eelco Dolstra
2157dadebf
perl-5.16: Remove
2015-12-04 12:19:45 +01:00
roblabla
b7a4231aa2
gitlab: 7.4.2 -> 8.0.5
2015-12-04 01:14:24 +01:00
Eelco Dolstra
403271a476
perl: 5.20.2 -> 5.20.3
2015-12-02 18:12:32 +01:00
Robin Gloster
f22b401cdc
php70: 7.0.0RC6 -> 7.0.0
2015-12-02 12:54:04 +00:00
Herwig Hochleitner
a92a40e8a1
pypy: 4.0.0 -> 4.0.1
2015-12-01 11:45:13 +01:00
Domen Kožar
dc977f78a8
Merge pull request #11147 from FRidh/wrapper
...
python: apply wrapper to all packages in python.buildEnv extraLibs
2015-11-30 11:08:19 +01:00
Frederik Rietdijk
12e8f3c6aa
python: apply wrapper to all packages in python.buildEnv extraLibs
...
Currently, when constructing a buildEnv and adding packages via
extraLibs, then binaries in extraLibs cannot access the other Python
modules. An example is having ipython/jupyter in extraLibs; in that case
ipython cannot import any other modules.
2015-11-30 10:52:57 +01:00
Robin Gloster
ef4f3e6ff4
php56: 5.6.15 -> 5.6.16
2015-11-28 16:54:20 +00:00
Domen Kožar
67e03d0c50
Merge branch 'buildPythonPackage+wheels'
2015-11-26 17:38:35 +01:00
Tomas Hlavaty
9d4a60f9cd
picolisp: 3.1.11 -> 15.11
2015-11-26 08:24:02 +01:00
Tomas Hlavaty
594ef50121
picolisp: add myself as a maintainer
2015-11-26 08:24:02 +01:00
Tomas Hlavaty
b091b9e30b
gtk-server: add myself as a maintainer
2015-11-26 08:24:02 +01:00
Shea Levy
8ea29441cf
Merge remote-tracking branch 'origin/single-underscore' into staging
...
Use zero underscores for sandboxProfile
2015-11-25 13:01:34 -05:00
zimbatm
ad2a4ab24c
ruby: remove insecure 1.8.7, fixes #11194
...
1.8.x is unsupported and is probably insecure.
This also simplifies things a little bit
2015-11-25 12:10:03 +01:00
Vladimír Čunát
13eca6f79a
Merge #11067 : SmartOS updates
...
I amended some commits slightly.
2015-11-23 14:45:44 +01:00
Pascal Wittmann
ac40e749c8
ceptre: 2015-08-30 -> 2015-11-20
2015-11-22 14:24:24 +01:00
Herwig Hochleitner
481a9ada06
pypy: 2.6.0 -> 4.0.0
2015-11-21 21:44:12 +01:00
Domen Kožar
fc2874d02e
pypy: use the official sitePackages install path
2015-11-21 21:44:12 +01:00
Jude Taylor
69e7f3bb74
switch to zero underscores for sandbox profiles; remove generateFrameworkProfile
2015-11-21 12:10:33 -08:00
Jude Taylor
a63346e33c
use single underscore for sandboxProfile
2015-11-21 11:17:30 -08:00
Shea Levy
db995a95ee
Merge remote-tracking branch 'origin/master' into staging
2015-11-21 07:46:55 -05:00
Shea Levy
df9f0d7060
nix-exec: 4.1.2 -> 4.1.3 bugfix release
2015-11-20 09:16:35 -05:00
Jude Taylor
4a64687737
remove debugging from perl 5.16
2015-11-19 11:31:06 -08:00
Jude Taylor
df80090d09
use per-derivation sandbox profiles
2015-11-19 11:31:06 -08:00
Jude Taylor
914e9baefe
start on sandbox stuff
2015-11-19 11:31:06 -08:00
Pascal Wittmann
7fd2796e99
Replace 'with plaforms; platform' with 'platforms.platform'
2015-11-17 21:30:43 +01:00
Danny Wilson
b19116f688
Fix Perl build on SmartOS
2015-11-16 17:20:14 +01:00
Domen Kožar
0b4776b6b7
Merge pull request #9182 from greedy/erlang-setup-hook
...
erlang: add setupHook to set ERL_LIBS
2015-11-16 13:09:26 +01:00
William A. Kennington III
6602f49495
Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
...
This reverts commit 741bf840da
.
This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
William A. Kennington III
9579c9ec7f
Merge commit 'cb21b77' into master.upstream
...
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Karn Kallio
60b4d47f90
xulrunner: fix path to configure script
2015-11-08 22:12:06 +01:00
William A. Kennington III
1e7aa4f17d
Merge branch 'master.upstream' into staging.upstream
2015-11-05 18:30:11 -08:00
Pascal Wittmann
17fbc42cde
groovy: 2.4.3 -> 2.4.5 and wrap correctly
2015-11-05 20:37:08 +01:00
William A. Kennington III
4251612faa
Merge branch 'master.upstream' into staging.upstream
2015-11-04 01:00:48 -08:00
Jude Taylor
58b862b750
darwin purity: pythonPackages.pandas
2015-11-03 14:00:51 -08:00
Robin Gloster
fdf8e4f2c8
php70: 7.0.0beta1 -> 7.0.0RC6
2015-11-01 12:13:16 +00:00
Robin Gloster
0ceec8420c
php: 5.6.14 -> 5.6.15
2015-11-01 12:12:13 +00:00
William A. Kennington III
dd2de66d61
Merge branch 'master.upstream' into staging.upstream
2015-10-30 17:16:07 -07:00
Jude Taylor
56f053120b
erlang: remove nested lists
2015-10-28 17:36:27 -07:00
Jude Taylor
e6bc23a801
Merge pull request #10603 from datakurre/datakurre-rabbitmq
...
darwin: erlangR18 + rabbitmq_server: add needed inputs
2015-10-28 17:23:11 -07:00
Moritz Ulrich
5baf95cc71
clojure: 1.6.0 -> 1.7.0
2015-10-27 08:11:37 +01:00
Asko Soukka
a5ac419236
darwin: erlangR18: add needed inputs for Darwin
2015-10-26 22:02:56 +02:00
Vladimír Čunát
4917a4f8b3
Merge master into staging
2015-10-23 01:57:14 +02:00
Asko Soukka
caafa68a7e
darwin: python35: add needed inputs
2015-10-22 07:56:40 +03:00
Jude Taylor
a7f478a368
darwin: add needed inputs to python-3.4
2015-10-20 15:54:33 -07:00
Allan Espinosa
c20e79abb9
ruby: adjust the libPath
2015-10-17 22:28:22 +09:00