Vladimír Čunát
08dd527cc7
Merge branch 'staging'
...
http://hydra.nixos.org/eval/1234895
The mass errors on Hydra seem transient; I verified ghc on i686-linux.
Only darwin jobs are queued ATM. There's a libpng security update
included in this merge, so I don't want to wait too long.
2015-12-29 17:14:35 +01:00
Robin Gloster
59ed410d6d
fix ftp.mozilla.org URLs
...
The old URLs time out.
2015-12-26 02:33:50 +00:00
Vladimír Čunát
12a0e09563
Merge #11674 : libressl-2.3 patches for various pkgs
2015-12-23 23:16:27 +01:00
Robin Gloster
d30904ea89
ruby: fix build with libressl2.3
2015-12-23 22:08:33 +00:00
Vladimír Čunát
11c702c582
Merge master into staging
2015-12-23 18:57:35 +01:00
Vladimír Čunát
fdf3aa9923
buildRubyGem: use a saner default version to fix #11805
...
Previously the gems defaulted to "ruby" as the name and
"${ruby-version}-${gem-name}-${gem-version}" as the version,
which was just insane.
https://github.com/NixOS/nixpkgs/issues/9771#issuecomment-141041414
Noone is reacting so it's high time to take at least some action.
/cc @cstrahan.
2015-12-23 09:02:13 +01:00
Steve Müller
cf99e57c80
php: 7.0.0 -> 7.0.1
2015-12-18 09:41:51 +01:00
Vladimír Čunát
1c268e0b8c
Merge master into staging
2015-12-17 08:53:35 +01:00
Eric Sagnes
b67ac40a82
erlangR18: 18.0 -> 18.2
2015-12-17 09:01:49 +09:00
Steve Müller
de327c7db7
fixes #11618 : make php and phpPackages extension directory consistent
2015-12-11 01:24:05 +01:00
Rok Garbas
7e2a828fd6
python35: 3.5.0 -> 3.5.1
2015-12-08 04:35:17 +01:00
Rok Garbas
124e70a459
python27: 2.7.10 -> 2.7.11
2015-12-08 04:35:17 +01:00
aszlig
6945557dba
ruby: Fix SHA256 hashes of several versions.
...
According to @zimbatm, he got the SHA256 hashes via nix-prefetch-git.
However, fetchFromGitHub doesn't use Git to fetch the sources but uses
fetchzip under the hood, so we get plain source directories in the Nix
store, which in turn are hashed.
Tested by:
nix-build --no-out-link -E 'map (x:
(builtins.getAttr x (import ./. {})).src
) [ "ruby_1_9_3" "ruby_2_0_0" "ruby_2_1_0" "ruby_2_1_1" "ruby_2_1_2"
"ruby_2_1_3" "ruby_2_1_6" "ruby_2_1_7" "ruby_2_2_0" "ruby_2_2_2"
"ruby_2_2_3"
]'
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-12-08 02:56:29 +01:00
zimbatm
f399ab50d8
ruby: update railsexpress patchsets, fixes #11347
2015-12-07 15:37:55 +01:00
zimbatm
7c338ffb77
ruby_2_2: 2.2.2 -> 2.2.3
2015-12-07 15:37:33 +01:00
zimbatm
d9f0568ccb
ruby_2_1: 2.1.6 -> 2.1.7
2015-12-07 15:37:33 +01:00
zimbatm
9ebc399432
ruby_2_0: 2.0.0p645 -> 2.0.0p647
2015-12-07 15:37:33 +01:00
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