Commit graph

1746 commits

Author SHA1 Message Date
Eelco Dolstra 403271a476 perl: 5.20.2 -> 5.20.3 2015-12-02 18:12:32 +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
Vladimír Čunát 13eca6f79a Merge #11067: SmartOS updates
I amended some commits slightly.
2015-11-23 14:45:44 +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