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
William A. Kennington III
8a44a36ca4
Merge branch 'master.upstream' into staging.upstream
2015-10-15 10:22:28 -07:00
Vladimír Čunát
3077bdfd71
Merge #10229 : update and fix sbcl and cmucl
...
And related changes.
2015-10-09 18:49:01 +02:00
Eelco Dolstra
bcc7673a44
php: Update to 5.5.30, 5.6.14
2015-10-07 11:32:15 +02:00
Pascal Wittmann
100904a39c
musj: 2015-09-15 -> 2015-09-29
2015-10-06 16:29:05 +02:00
Eelco Dolstra
741bf840da
Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
...
This reverts commit f61176c539
, reversing
changes made to a27ca029ee
.
Conflicts:
pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
Jude Taylor
0a32eab91e
fix LLVM packages to work in darwin stdenv
2015-10-05 08:46:56 -07:00
Tomas Hlavaty
37eda842f6
picolisp: exec in shell
...
there is no need to keep the shell around
2015-10-04 21:08:51 +02:00
Tomas Hlavaty
3a4db8d7e5
gtk-server: added
2015-10-04 21:08:50 +02:00
Jude Taylor
83a5cfb260
add darwin.libobjc to some ruby gems that need it
2015-10-01 13:30:30 -07:00
Jude Taylor
10054a676a
update bundler-head SHA256
2015-10-01 08:58:28 -07:00
Jude Taylor
5379504451
Merge pull request #9834 from NixOS/rubies
...
Merge Ruby versions into one file
2015-10-01 08:58:28 -07:00
Vladimír Čunát
673f3de193
lisps: some refactoring
2015-10-01 11:20:24 +02:00
Tomas Hlavaty
411d83d5fe
picolisp: compile on arm and i686
2015-09-30 23:36:40 +02:00
Tomas Hlavaty
5ecdc8f3c6
picolisp: 3.1.10 -> 3.1.11
2015-09-30 23:36:40 +02:00
Domen Kožar
41007653db
Merge pull request #10122 from Havvy/elixir
...
elixir: 1.0.5 -> 1.1.0
2015-09-29 21:48:25 +02:00
Ryan Scheel (Havvy)
f824566fb3
elixir: 1.0.5 -> 1.1.1
...
Had to change the `mix` shebang to do coreutils/bin/env elixir, not
coreutils/bin/env elixir/bin/elixir.
2015-09-29 13:10:39 +02:00
Luca Bruno
b7f49e89af
xulrunner: disable gconf
2015-09-29 10:29:48 +02:00
Vladimír Čunát
76ef7a93e3
Merge: xlibs and x11 attribute cleanup
...
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
William A. Kennington III
0a7176c5a1
Revert "bundlerEnv: Use released versions of bundler"
...
This reverts commit 7bc8b1561e
.
This breaks some ruby gems and needs to be reworked again.
2015-09-20 22:05:29 -07:00
William A. Kennington III
7bc8b1561e
bundlerEnv: Use released versions of bundler
...
We were using HEAD for unreleased features. These features are now in
release builds so we should go back to using those. This also means we
won't have to deal with hash mismatches for all ruby packages.
2015-09-20 18:56:56 -07:00
William A. Kennington III
773b4deb7c
Merge commit 'a6f6c0e' into master.upstream
...
This is a partial merge of staging where we have up to date binaries for
all packages.
2015-09-15 12:16:49 -07:00
Vladimír Čunát
88c9f8b574
xlibs: replace occurrences by xorg
...
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Vladimír Čunát
21e3ff658a
x11: replace its usage by xlibsWrapper directly
...
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Pascal Wittmann
1e24c18d18
mujs: 2015-01-22 -> 2015-09-15
2015-09-15 11:02:23 +02:00
Domen Kožar
cabb050528
add python35 and python35Packages
2015-09-15 07:46:46 +02:00
Mathnerd314
eb7404d97a
all-packages: Use callPackage where possible
2015-09-14 22:27:19 -06:00
Pascal Wittmann
f2e03fb4dc
bundler: 1.10.5 -> 1.10.6
2015-09-13 21:25:58 +02:00
Arseniy Seroka
488c5ac433
Merge pull request #9502 from anderspapitto/0ad
...
add spidermonkey 31.5, and upgrade 0ad to version 18 Alpha
2015-09-09 03:11:43 +03:00
Anders Papitto
4bcde3f244
spidermonkey: add 31.5
2015-09-08 17:00:34 -07:00
Pascal Wittmann
855716a66b
ceptre: 2015-08-15 -> 2015-08-30
2015-09-08 18:11:50 +02:00
Eelco Dolstra
0ea1169dae
php: Latest versions
2015-09-08 15:32:33 +02:00
Vladimír Čunát
8f33b8cc93
mass rewrite of find parameters to cross-platform style
...
Fixes #9044 , close #9667 . Thanks to @taku0 for suggesting this solution.
Now we have no modes starting with `/` or `+`.
Rewrite the `-perm` parameters of find:
- completely safe: rewrite `/0100` and `+100` to `-0100`,
- slightly semantics-changing: rewrite `+111` to `-0100`.
I cross-verified the `find` manual pages for Linux, Darwin, FreeBSD.
2015-09-06 10:26:30 +02:00
Ryan Artecona
4183604207
elixir: fix mix on darwin
...
Darwin disallows shebang scripts from using other scripts as their
command--the command must be a binary. This commit changes the `mix`
shebang script from calling `elixir` directly (another shebang script),
instead using `env` as an intermediary.
Fixes #9050
2015-09-05 23:49:51 -04:00
Pascal Wittmann
46d9fbc446
ceptre: init at 2015-08-15
...
A linear logic programming language for modeling generative interactive systems
2015-09-05 11:20:29 +02:00
William A. Kennington III
c6f689f951
Merge branch 'master.upstream' into staging.upstream
2015-09-04 12:05:11 -07:00
Nikolay Amiantov
c31a677482
Revert "bundler-HEAD: fix checksum"
...
This reverts commit 9cea5bcf2c
.
See 9cea5bcf2c (commitcomment-13058505)
2015-09-04 01:14:50 +03:00
William A. Kennington III
86ebd3ee25
Merge branch 'master.upstream' into staging.upstream
2015-09-03 11:15:58 -07:00
Nikolay Amiantov
9cea5bcf2c
bundler-HEAD: fix checksum
...
Related to #8567
2015-09-03 12:22:12 +03:00
Domen Kožar
89cec0c096
racket: don't build docs as it causes failures sometimes
...
(cherry picked from commit 1a392bd62e
)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-02 21:16:20 +02:00
William A. Kennington III
7735c6cb0e
Merge branch 'master.upstream' into staging.upstream
2015-08-31 10:28:18 -07:00
Thomas Tuegel
5d57d8244a
Merge pull request #9427 from henrytill/racket-6.2.1
...
racket: 6.2 -> 6.2.1
2015-08-30 13:56:54 -05:00
William A. Kennington III
5ca1c32a9d
Merge branch 'master.upstream' into staging.upstream
2015-08-28 17:55:20 -07:00
Edward Tjörnhammar
28a18999fa
ruby: use fetchFromSavannah to enable better availability for proxied users.
2015-08-28 07:45:49 +02:00
Thomas Tuegel
ce79122119
pypy: wrap original, not symlink
2015-08-26 09:35:48 -05:00
Jude Taylor
4e8279b43b
darwin purity: ruby-2.1.6
2015-08-25 17:14:02 -07:00
Henry Till
94abba931d
racket: 6.2 -> 6.2.1
2015-08-24 14:54:05 -04:00
Jude Taylor
65dd349574
update mysteriously varying git hashes
2015-08-21 12:00:35 -07:00
William A. Kennington III
2ac70270e8
Merge branch 'master.upstream' into staging.upstream
2015-08-18 11:36:32 -07:00
Nikolay Amiantov
344e522166
python: add .env for convenient nix-shell's
2015-08-17 21:22:50 +03:00
William A. Kennington III
a106080623
Merge branch 'master.upstream' into staging.upstream
2015-08-14 13:22:00 -07:00