JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
97,939 Commits 2 Branches 0 Tags 13 GiB
4073aaa7e1
Commit Graph

2373 Commits

Author SHA1 Message Date
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
Robin Gloster
c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00: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
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00: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
Robin Gloster
3e68106afd Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-07 21:52:26 +00: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
Robin Gloster
f791c1074d lua.i686-linux: disable stackprotector hardening 2016-04-05 16:44:30 +00:00
Tomas Hlavaty
106d0f6b51 clisp: control build options and fix non x86* architectures 2016-04-04 22:22:30 +02:00
Robin Gloster
bbbaccfa68 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-04 15:24:52 +00: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
Robin Gloster
df72d621f1 Revert "php: enable PIE hardening" 
This reverts commit fb57bfbd4f.
 2016-04-03 13:31:15 +00:00
zimbatm
3dfe4297ae racket: 6.3 -> 6.4 2016-04-03 14:10:35 +01:00
Robin Gloster
f3f9145d23 spidermonkey.i686-linux: turn off stackprotector hardening 2016-04-03 11:49:13 +00:00
Robin Gloster
696d85a62d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-03 11:01:57 +00: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
Franz Pletz
2e08d8234e Merge remote-tracking branch 'origin/master' 2016-03-31 10:06:30 +02:00
Franz Pletz
a56d90efda php: Disable bindnow hardening flag 
Fixes dynamic linking against i.e. mysql.
 2016-03-31 09:56:45 +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
Robin Gloster
f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +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
Lluís Batlle i Rossell
1f8ffdde5b octave: update to 4.0.1 
bugfix release, they say.
 2016-03-24 12:04:07 +01:00
Lluís Batlle i Rossell
74ccfd690d octave: parallel building and check. 
I think those were not updated since 3.8.2. They worked for me. Let's see.
 2016-03-24 12:04:07 +01:00
Joachim Fasting
1972c5aa17 clisp: fix i686 build 
Requires -falign-functions=4

See https://hydra.nixos.org/build/33256640/nixlog/1/raw
 2016-03-23 13:54:58 +01:00
Shea Levy
49e53e6701 nix-exec: bump for new nix 2016-03-22 18:20:16 -04:00
Domen Kožar
ba78130c21 remove elrangR15 and riak 1.3.0 as they're outdated 
(cherry picked from commit 4452a68425e4eaf9db95e0fc5ac8474a2b19bc71)
Signed-off-by: Domen Kožar <domen@dev.si>
 2016-03-22 21:40:07 +00:00
Tobias Geerinckx-Rice
c0a35241f0 mcelog: 133 -> 134 
trigger: Avoid warning from earlier merge
 2016-03-22 00:59:15 +01:00
Sergey Mironov
c899444c69 luajit: symlinked as 'lua' 2016-03-22 00:17:31 +03:00
zimbatm
5a64bc44ea move all ruby modules to development/ruby-modules 2016-03-19 22:06:26 +00:00
zimbatm
3547ffa89f ruby: remove unused patches 2016-03-19 22:04:12 +00:00
zimbatm
06e4186f4e Merge pull request #14061 from zimbatm/bundler-env-fix 
bundlerEnv: fix wrapping of programs
 2016-03-19 22:03:12 +00:00
zimbatm
53c9edef34 bundlerEnv: fix wrapping of programs 
Setting the GEM_PATH after ruby is started is not reliable enough. In
some cases rubygems would have already loaded and ignore these settings.

Fixes #14048
 2016-03-19 20:25:34 +00:00
Charles Strahan
2802785675 Merge pull request #13975 from aespinosa/proper-script-gempaths 
buildRubyGem: use Gem.use_paths to load gems
 2016-03-19 16:15:50 -04:00
Robert Scott
9f54f755a9 php: 5.5.32 -> 5.5.33 (security update) 2016-03-19 11:18:12 +00:00
Robert Scott
e4817b7d99 php: 5.6.18 -> 5.6.19 (security update) 2016-03-19 11:15:48 +00:00
Sergey Mironov
da66fd2b11 luajit: bump to 2.1.0-beta1 2016-03-19 12:37:01 +03:00
zimbatm
9c4b45fafe Merge pull request #13601 from zimbatm/ruby-dev 
ruby.dev
 2016-03-18 19:05:45 +00:00
Michael Fellinger
bb59ba117d bundix: 2.0.6 -> 2.0.8 2016-03-17 18:12:38 +01:00
Allan Espinosa
52b61dce47 buildRubyGem: use Gem.use_paths to load gems 
After ruby initializes, rubygems no longer reads the GEM_PATH. Before,
we have the following scenario:

    Gem.path # => ["a"]
    ENV['GEM_PATH'] = ["b"]
    Gem.path # => ["a"] # Still returns the same

Gem.use_paths is the documented way to create isolated environments as
documented in [1].

[1] http://www.rubydoc.info/github/rubygems/rubygems/Gem.use_paths
 2016-03-16 17:28:02 -05:00
Vladimír Čunát
c643ccaa8c Merge #13950: move ncurses utilities to $out 2016-03-16 08:39:37 +01:00
Robin Gloster
3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00
zimbatm
d9cf99225b rubygems: 2.4.8 -> 2.6.2 2016-03-14 23:46:01 +00:00
zimbatm
19820e9a96 ruby: add a new .dev output to ruby derivations 
The idea is to bundle ruby, bundler and bundix together. I was
having issues where bundler was installed with ruby 2.3.0 and I wanted to use
ruby 2.0.0.

With this change all the developer has to do is install `ruby_2_0_0.dev`
either in his environment or in a nix-shell.
 2016-03-14 22:25:48 +00:00
zimbatm
4637cfa51f bundler: 1.10.6 -> 1.11.2 2016-03-14 22:25:19 +00:00
zimbatm
86f1579266 ruby: install rubygems directly into the derivation 
Having a separate rubygems package can lead to split-brain scenarios.

Since rubygems is designed to replace himself on a ruby installation,
let's do that.
 2016-03-14 22:23:25 +00:00
zimbatm
9504992e1d Merge pull request #13897 from nbp/fix-ocaml-pkgs-platform 
Ensure that we can evaluate the platform attribute of ocaml packages.
 2016-03-14 19:25:40 +00:00
Nicolas B. Pierron
72c6f8a140 Ensure that we can evaluate the platform attribute of ocaml packages. 2016-03-13 19:08:26 +00:00
宋文武
93feb5d115 drop my maintainership (close #13881) 2016-03-13 18:39:01 +01:00
Michael Fellinger
075b3b449d bundix: 2.0.5 -> 2.0.6 
Fixes issue caused by changed nix-prefetch-git output.
 2016-03-13 13:59:38 +01:00
Joachim Fasting
098c04683a scsh: move build deps to nativeBuildInputs 
Also remove redundant inputs already implied by autoreconfHook.
 2016-03-12 19:06:40 +01:00
Eelco Dolstra
dd53c65dcc Merge remote-tracking branch 'origin/gcc-5' into staging 
Still some breakage but no blockers:

http://hydra.nixos.org/eval/1242130?filter=x86_64-linux&compare=1237852&full=#tabs-now-fail
 2016-03-11 16:02:38 +01:00
Thomas Tuegel
cd5e923f55 luajit: fix evaluation on Darwin 2016-03-11 08:57:39 -06:00
Vladimír Čunát
c801cd1a04 php: fixup build when configured with httpd via nixos 2016-03-11 11:54:53 +01:00
Mayeu - Cast
7db78e0412 elixir: 1.2.2 -> 1.2.3 2016-03-09 17:11:10 +01:00
Thomas Tuegel
3ef7671cea ncurses: combine $lib and $out outputs 
The $lib output refers to the terminfo database in $out, which is about
10x larger than the ncurses shared library. Splitting these outputs
saves a small amount of space for any derivations that use the terminfo
database but not the ncurses library, but we do not have evidence that
any such exist.
 2016-03-08 11:35:24 -06:00
Vladimír Čunát
b291f1682f perl merge fixup 2016-03-08 09:59:12 +01:00
Vladimír Čunát
09af15654f Merge master into closure-size 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
 2016-03-08 09:58:19 +01:00
Franz Pletz
e9fc4e7db6 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-07 22:08:27 +01:00
Henry Till
cf71bc9255 racket: fix build error 
https://github.com/racket/racket/issues/1222

closes #13733
 2016-03-07 10:49:19 -05:00
Eelco Dolstra
669d59711f Merge remote-tracking branch 'origin/perl-5.22' into staging 
Small number of regressions: http://hydra.nixos.org/eval/1239239?compare=1237919#tabs-now-fail
 2016-03-07 11:58:17 +01:00
Joachim Fasting
fe37f28939 pixie: fix description 2016-03-06 14:04:37 +01:00
Franz Pletz
fb57bfbd4f php: enable PIE hardening 2016-03-06 00:15:18 +01:00
joachifm
ee8d210828 Merge pull request #13528 from bendlas/init-pixie 
pixie: init at 0-1333
 2016-03-05 19:30:49 +00:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists 
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
 2016-03-05 18:55:26 +01:00
zimbatm
7c4c151a94 ruby: only keep the latest tiny per major.minor 
Tiny versions are just for bug-fixes and should be upgraded. I think that the
list has grown a bit too much organically and should be trimmed.
 2016-03-04 14:24:37 +00:00
Robin Gloster
fed49425c5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-03 16:11:55 +00:00
Eelco Dolstra
62c562a522 gcc: Remove 4.3 and 4.4 
GCC 4.3 was used by only one package ("self"), which I've marked as
broken.
 2016-03-02 18:01:17 +01:00
Robin Gloster
5936d6dbbb Revert "rubygems: 2.4.8 -> 2.5.2" 
This reverts commit 7e8faf022f.

This breaks the rake call in gitlab see
https://github.com/NixOS/nixpkgs/pull/13468#issuecomment-191286066
 2016-03-02 15:25:35 +00:00
Robin Gloster
33f7d0b3f6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-01 22:46:39 +00:00
Robin Gloster
d47857c3d9 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-01 21:09:17 +00:00
Pascal Wittmann
d2e15a02d7 mujs: 2015-09-29 -> 2016-02-22 2016-03-01 22:08:26 +01:00
Pascal Wittmann
69237f371c Merge pull request #13586 from zimbatm/bats-fixup 
bats: fixes installation
 2016-03-01 15:19:03 +01:00
Lancelot SIX
75591b49be Merge pull request #13468 from zimbatm/rubygems-2.5.2 
rubygems: 2.4.8 -> 2.5.2
 2016-03-01 09:31:36 +01:00
zimbatm
a3119bd35d bats: fixes installation 
The build was failing with:

  /...-stdenv/setup: ./install.sh: /usr/bin/env: bad interpreter: No such file
  or directory

See https://hydra.nixos.org/build/32353411/log
 2016-03-01 00:19:27 +00:00
Herwig Hochleitner
de5fa8339f dust: init at 0-91 2016-02-29 21:14:52 +01:00
Robin Gloster
85515f0be8 clisp_2_44_1: disable format hardening 2016-02-29 09:44:42 +00:00
Robin Gloster
4d6db3c64c perl520: fix bootstrap compilation by disabling fortify hardening 2016-02-28 19:45:02 +00:00
Robin Gloster
3b4765c9e5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-28 16:32:57 +00:00
Michael Raskin
c0f20c5912 Merge pull request #13518 from leenaars/love2 
love: fix broken 0.8.2 + added version 0.72
 2016-02-28 09:35:54 +00:00
Herwig Hochleitner
1c380842d1 pixie: init at 0-1333 
This is the pixie language, a clojure-like lisp, utilizing the pypy vm
toolkit for JIT, GC and C bindings.
 2016-02-28 03:15:07 +01:00
Michiel Leenaars
62c3ad1dde love: fix broken 0.8 + added version 0.72 2016-02-27 22:37:36 +01:00
Eelco Dolstra
a85ba820a4 perl: Make 5.22 the default 2016-02-27 22:36:54 +01:00
Eelco Dolstra
be4ebe0046 perl: 5.22.0 -> 5.22.1 2016-02-27 22:22:26 +01:00
Eelco Dolstra
7627bf6f3f perl: Unify 5.20 and 5.22 expressions 2016-02-27 22:22:26 +01:00
zimbatm
17348dc094 Remove all dots at end of descriptions 
Specially crafted for @JagaJaga

    find pkgs -name "*.nix" -exec \
      sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
 2016-02-27 17:30:29 +00:00
Robin Gloster
3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
zimbatm
7e8faf022f rubygems: 2.4.8 -> 2.5.2 
Closes #11950
 2016-02-26 18:02:24 +00:00
Robin Gloster
7412bffd9e self: use default compiler 2016-02-26 15:42:23 +00:00
Robin Gloster
2700dac7de lush: disable pic hardening 2016-02-24 22:17:45 +00:00
Robin Gloster
18adc96e0f supercollider: disable fortify hardening 2016-02-24 21:29:55 +00:00
zimbatm
cdbaee7d4b Merge pull request #12866 from nathan7/rubygem-drvname-fix 
buildRubyGem: ensure gem versions don't get misparsed
 2016-02-23 23:13:12 +00:00
zimbatm
49217b724f Merge pull request #12786 from phunehehe/unused-bundler-head 
remove unused file bundler-head.nix
 2016-02-23 22:39:55 +00:00
Robin Gloster
402d57ee8e bootstrap env: disable stackprotector hardening until gcc >=4.9 2016-02-22 18:32:53 +00:00
Robin Gloster
bb2639aafc Merge branch 'curl-7.15-fixup' of https://github.com/zimbatm/nixpkgs into hardened-stdenv 2016-02-22 01:14:22 +00:00
Charles Strahan
123a9104e4 Merge pull request #13109 from zimbatm/ruby-fixes 
Ruby fixes
 2016-02-20 20:29:25 -05:00
Robin Gloster
bc21db3692 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-19 21:16:14 +00:00
zimbatm
a92c609ec6 gemconfig: add eventmachine and msgpack 2016-02-18 23:44:50 +00:00
zimbatm
24e0fc99f9 buildRubyGem: remove unecessary duplication 2016-02-18 23:44:49 +00:00
Vladimír Čunát
e9520e81b3 Merge branch 'master' into staging 2016-02-17 10:06:31 +01:00
Arseniy Seroka
7c477195aa Merge pull request #12991 from leenaars/love 
love -> 0.10 added
 2016-02-15 22:12:57 +03:00
Franz Pletz
41698c9efa Merge branch 'master' into hardened-stdenv 2016-02-15 20:05:29 +01:00
Michiel Leenaars
f4a32be729 love: 0.8 -> 0.10.1 2016-02-15 17:10:26 +01:00
zimbatm
9acbb9021b bundix: cleaner substitution 
Use the builtin substituteInPlace instead of sed
 2016-02-14 17:57:18 +00:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Tuomas Tynkkynen
34922a3951 python2: Fix on non-Linux 
The location of this 'regen' script (whatever is does) depends on the
platform. AFAICT it always exists due to this:

$(srcdir)/Lib/$(PLATDIR):
        mkdir $(srcdir)/Lib/$(PLATDIR)
        cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen
 2016-02-13 16:03:55 -05:00
Tuomas Tynkkynen
78e62da7f1 python2: Fix on Darwin 
Presumably $out/lib/python*/plat-linux2/ is a Linux-only thing.
 2016-02-13 15:52:23 -05:00
Arseniy Seroka
af8a9e2203 Merge pull request #12944 from zimbatm/jruby-9.0.5.0 
jruby: 1.7.21 -> 9.0.5.0
 2016-02-12 20:56:29 +03:00
Michael Fellinger
b9c13dcbc7 bundix: 2.0.4 -> 2.0.5 
Fixes issue with the -d flag creating duplicated `dependencies` properties.
 2016-02-12 09:56:02 +01:00
Robin Gloster
40b7aa3d69 erlangR14: turn off format hardening 2016-02-12 01:04:15 +00:00
zimbatm
447851b9d2 jruby: 1.7.21 -> 9.0.5.0 2016-02-11 23:31:41 +00:00
Eelco Dolstra
fc84ee22df php: Remove version 5.4 which is EOL 2016-02-11 11:27:34 +01:00
Eelco Dolstra
42634fe6cc php: 5.5.31 -> 5.5.32 2016-02-11 11:24:54 +01:00
Eelco Dolstra
b061225c54 php: 5.6.17 -> 5.6.18 2016-02-11 11:24:48 +01:00
Michael Fellinger
db6f59619d bundix: 1.0.4 -> 2.0.4 2016-02-10 23:27:33 +00:00
Arseniy Seroka
3b1d18ff48 Merge pull request #12919 from zimbatm/new-bundix2 
bundix: 1.0.4 -> 2.0.4
 2016-02-10 16:04:31 +03:00
Michael Fellinger
112476ec96 bundix: 1.0.4 -> 2.0.4 2016-02-10 12:02:10 +00:00
Robin Gloster
94a74cb14d spidermonkey: turn off format hardening 2016-02-08 00:18:44 +00:00
Nathan Zadoks
c998447a13 buildRubyGem: pass the gem version through into the derivation name 2016-02-07 16:53:31 +01:00
Nathan Zadoks
b4da3bb88b buildRubyGem: ensure gem versions don't get misparsed 
Without this, every nix-env --upgrade replaces ruby with an
arbitrary gem, which makes Ruby unusuable from user environments.
 2016-02-07 16:53:27 +01:00
Robin Gloster
9492e06315 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-07 14:44:27 +00:00
Daiderd Jordan
4b4d5c96c8 bats: init at 4.0.4 2016-02-07 14:53:54 +01:00
Vladimír Čunát
a115bff08c Merge branch 'master' into staging 2016-02-07 13:52:42 +01:00
Robin Gloster
9229e9c656 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-07 11:17:57 +00:00
Arseniy Seroka
a9618d217f Merge pull request #12782 from tvon/elixir-1.2.2 
elixir: 1.2.0 -> 1.2.2
 2016-02-04 00:40:35 +03:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size 
Let's get rid of those merge conflicts.
 2016-02-03 16:57:19 +01:00
Tom von Schwerdtner
fd9fb59790 elixir: 1.2.0 -> 1.2.2 2016-02-03 10:28:56 -05:00
lukasepple
2c4f6af55d rakudo-star: 2015.03 -> 2015.11 2016-02-03 15:55:58 +01:00
Hoang Xuan Phu
cb7b811c43 remove unused file bundler-head.nix (bundler_HEAD is now just an alias for bundler) 2016-02-03 11:26:40 +07:00
Robin Gloster
2b430c9aa6 acl2: use mkDerivation 2016-01-30 20:31:02 +00:00
Robin Gloster
e96ea9712c ruby: add patch for RAND_egd 2016-01-30 16:36:57 +00:00
Vladimír Čunát
de0af30716 Merge branch 'master' into staging 2016-01-29 10:19:48 +01:00
Michael Fellinger
c24c153743 Add Ruby 2.3.0 package 2016-01-27 09:28:59 +01:00
Tobias Geerinckx-Rice
9fb8020e4e Add version attribute where maintainers |= nckx 
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
 2016-01-25 17:35:21 +01:00
Vladimír Čunát
2af19df364 Merge branch 'master' into staging 2016-01-25 10:02:25 +01:00
Jude Taylor
c473bea69a Merge pull request #12603 from zimbatm/ruby-fixes 
Ruby fixes
 2016-01-24 22:48:14 -08:00
zimbatm
e9eda43928 buildRubyGem: fix missing libobjc in darwin 
This was preventing any ruby gem with a c extension to build.

mkmf would fail with a misleading error:

    /nix/store/dmkcai8fnv21qxiasx628nim3mq4r4wg-ruby-2.2.3-p0/lib/ruby/2.2.0/mkmf.rb:456:in `try_do': The compiler failed to generate an executable file. (RuntimeError)
    You have to install development tools first.
 2016-01-24 23:15:40 +00:00
zimbatm
9a55295c49 buildRubyGem: fix NoMethodError 
generate_stub doesn't exist and the output is not used in the code so I just
removed the line.

This was preventing the binstubs from generating properly.
 2016-01-24 23:14:00 +00:00
Eric Seidel
dd6d4ca8cc racket: change meta.platorms to unix 2016-01-24 11:33:34 -08:00
Nikolay Amiantov
9b980baa9d bundlerEnv.wrapper: rename to wrappedRuby 2016-01-24 15:59:31 +03:00
Nikolay Amiantov
dc162f648c Merge pull request #12284 from abbradar/bundlerenv-wrapper 
bundlerEnv: add wrapper
 2016-01-23 12:02:09 +03:00
Eric Seidel
2e62f785d4 racket: fix on darwin 2016-01-22 17:38:11 -08:00
Rok Garbas
dd9bad4aa4 rubygems: 2.4.1 -> 2.4.8, fixes #8492 2016-01-20 03:36:36 +01:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Vladimír Čunát
620c147cce Merge branch 'master' into staging 2016-01-18 09:48:49 +01:00
Henry Till
00f394e2a9 racket: 6.2.1 -> 6.3 2016-01-16 15:57:23 -05:00
Henry Till
6fc61a173e racket: add parameter to enable building docs 2016-01-16 15:57:02 -05:00
Vladimír Čunát
2d0893088f Merge branch 'master' into staging 2016-01-15 13:43:57 +01:00
Vladimír Čunát
98218971c2 Merge #12299: make firefox-like browsers wrapped by default 2016-01-15 08:53:58 +01:00
Vladimír Čunát
a8f1d40c1f all-packages: browserWrapper -> browser 
- I chose to keep `browser-unwrapped` attributes so that it's much
  easier to override parameters for the browser (through `packageOverrides`).
- Aliases `browserWrapper` are retained for now, as usual.
 2016-01-15 08:36:08 +01:00
Vladimír Čunát
f8472457a4 pypy: fix build with multiple outputs 2016-01-12 23:57:48 +01:00
Andrey Pavlov
9c2da8a296 elixir: 1.1.1 -> 1.2.0 2016-01-12 18:14:43 +03:00
Domen Kožar
5c2c881c57 pypy: parallel build improvements, remove some patching 
incorporates http://paste.pound-python.org/show/oFyMaSSzvb07lenWYmAK/
from NixCon sprints
 2016-01-11 20:42:00 +01:00
Corbin Simpson
da698fd9da pypy: add some required build inputs and disable some unsafe tests 
I had to disable another networking-centric test suite; it was trying to make
unapproved phone calls.
 2016-01-11 20:42:00 +01:00
Nikolay Amiantov
75358ad0e7 bundlerEnv: add wrapper 2016-01-10 07:26:37 +03:00
Arseniy Seroka
3443462ab1 Merge pull request #12233 from deeky666/php-7.0.2 
php: 7.0.1 -> 7.0.2
 2016-01-08 20:22:00 +03:00
Eelco Dolstra
aa73be3609 Merge pull request #12232 from deeky666/php-5.5.31 
php: 5.5.30 -> 5.5.31
 2016-01-08 12:36:09 +01:00
Steve Müller
4341df2f70 php: 7.0.1 -> 7.0.2 2016-01-08 10:51:35 +01:00
Steve Müller
5250326474 php: 5.5.30 -> 5.5.31 2016-01-08 10:49:04 +01:00
Steve Müller
7c54bca127 php: 5.6.16 -> 5.6.17 2016-01-08 10:42:32 +01:00
Dan Peebles
732495017b perl-5.20: break dependency on the compiler that built it 
This is a major closure size reduction on Darwin, and probably a less
significant one on Linux. On darwin, retaining the compiler means adding
clang and its dependency llvm to the perl closure, which gives us ~400MB
of extra stuff. Considering that Nix itself depends on this version of
perl, that makes cutting a new Nix release rather unpleasaont Darwin.

After this patch, I was able to get the `nixUnstable` closure down to
21MB after feeding it into a .tar.xz (123MB before compression). There's
still room for improvement but this should carry us over until we split
outputs.
 2016-01-07 23:01:02 -05:00
Domen Kožar
78096e9b89 python: 3.4.3 -> 3.4.4 2016-01-07 11:19:40 +01:00
Vladimír Čunát
b1acaffe67 Merge branch 'master' into staging 2016-01-05 10:28:58 +01:00
Vladimír Čunát
7c879d342d Merge #10816: improve FreeBSD support 2016-01-05 09:50:10 +01:00
Pascal Wittmann
fa51f98133 ceptre: 2015-11-20 -> 2016-01-01 2016-01-03 20:06:12 +01:00
Michael Raskin
1406e8e693 angelscript: 2.30.1 -> 2.30.2 2016-01-01 12:30:17 +03:00
Vladimír Čunát
ab65fe023d perl: synchronize changes done to 5.20 and 5.22 
Some multiple-output changes were previously only in 5.22,
but since master is still using 5.20, let's stick with that version
on closure-size as well.
741bf840da (commitcomment-14784970)
 2015-12-31 10:18:13 +01:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size 
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
 2015-12-31 09:53:02 +01:00
Michael Raskin
d27dd12571 Merge pull request #12043 from rycee/migrate/stdenv 
Migrate some more packages from builderDefsPackage to stdenv
 2015-12-30 21:26:00 +01:00
Robert Helgesson
9f5b058041 regina: use stdenv 
This replaces use of `builderDefsPackage`.
 2015-12-30 21:15:15 +01:00
Dan Peebles
878544e4f6 perl-5.2{0,2}: remove unnecessary patch for darwin 
The patch no longer applies on 5.20 and is breaking everything. I tried
building both 5.20 and 5.22 and both seemed to work fine without the
patch.
 2015-12-29 21:01:19 -05:00
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
Charles Strahan
b6c06e216b ruby: new bundler infrastructure 
This improves our Bundler integration (i.e. `bundlerEnv`).

Before describing the implementation differences, I'd like to point a
breaking change: buildRubyGem now expects `gemName` and `version` as
arguments, rather than a `name` attribute in the form of
"<gem-name>-<version>".

Now for the differences in implementation.

The previous implementation installed all gems at once in a single
derivation. This was made possible by using a set of monkey-patches to
prevent Bundler from downloading gems impurely, and to help Bundler
find and activate all required gems prior to installation. This had
several downsides:

* The patches were really hard to understand, and required subtle
  interaction with the rest of the build environment.
* A single install failure would cause the entire derivation to fail.

The new implementation takes a different approach: we install gems into
separate derivations, and then present Bundler with a symlink forest
thereof. This has a couple benefits over the existing approach:

* Fewer patches are required, with less interplay with the rest of the
  build environment.
* Changes to one gem no longer cause a rebuild of the entire dependency
  graph.
* Builds take 20% less time (using gitlab as a reference).

It's unfortunate that we still have to muck with Bundler's internals,
though it's unavoidable with the way that Bundler is currently designed.
There are a number improvements that could be made in Bundler that would
simplify our packaging story:

* Bundler requires all installed gems reside within the same prefix
  (GEM_HOME), unlike RubyGems which allows for multiple prefixes to
  be specified through GEM_PATH. It would be ideal if Bundler allowed
  for packages to be installed and sourced from multiple prefixes.
* Bundler installs git sources very differently from how RubyGems
  installs gem packages, and, unlike RubyGems, it doesn't provide a
  public interface (CLI or programmatic) to guide the installation of a
  single gem. We are presented with the options of either
  reimplementing a considerable portion Bundler, or patch and use parts
  of its internals; I choose the latter. Ideally, there would be a way
  to install gems from git sources in a manner similar to how we drive
  `gem` to install gem packages.
* When a bundled program is executed (via `bundle exec` or a
  binstub that does `require 'bundler/setup'`), the setup process reads
  the Gemfile.lock, activates the dependencies, re-serializes the lock
  file it read earlier, and then attempts to overwrite the Gemfile.lock
  if the contents aren't bit-identical. I think the reasoning is that
  by merely running an application with a newer version of Bundler, you'll
  automatically keep the Gemfile.lock up-to-date with any changes in the
  format. Unfortunately, that doesn't play well with any form of
  packaging, because bundler will immediately cause the application to
  abort when it attempts to write to the read-only Gemfile.lock in the
  store. We work around this by normalizing the Gemfile.lock with the
  version of Bundler that we'll use at runtime before we copy it into
  the store. This feels fragile, but it's the best we can do without
  changes upstream, or resorting to more delicate hacks.

With all of the challenges in using Bundler, one might wonder why we
can't just cut Bundler out of the picture and use RubyGems. After all,
Nix provides most of the isolation that Bundler is used for anyway.

The problem, however, is that almost every Rails application calls
`Bundler::require` at startup (by way of the default project templates).
Because bundler will then, by default, `require` each gem listed in the
Gemfile, Rails applications are almost always written such that none of
the source files explicitly require their dependencies. That leaves us
with two options: support and use Bundler, or maintain massive patches
for every Rails application that we package.

Closes #8612
 2015-12-29 09:30:21 -05: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
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01: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
Luca Bruno
e289717414 rename moveToOutput and propagatedBuildInputs 2015-12-02 10:05:36 +01: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
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +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
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +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
Vladimír Čunát
333d69a5f0 Merge staging into closure-size 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
 2015-11-20 14:32:58 +01: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
Tuomas Tynkkynen
0fe3e37946 php: Apply brute force to locate openldap 
Needed after the split to multiple outputs :(. But that's what you get
for not providing pkg-config files...
 2015-10-28 10:23:01 +01:00
Vladimír Čunát
dd915f82e7 expat: split dev output 2015-10-28 10:09:34 +01:00
Vladimír Čunát
b5636e9e71 perl: get rid of various references 
Discussed a little at #10244.
I didn't bother to port this to older perl versions,
and maybe it would be of no use anyway.
 2015-10-28 10:09:32 +01: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
90d5e87862 sqlite: split dev and bin outputs 2015-10-14 14:27:07 +02:00
Vladimír Čunát
f014217a55 spidermonkey-{17,24}: split the dev and lib outputs 2015-10-13 20:19:02 +02:00
Vladimír Čunát
9da12a6713 SDL: split the dev output and fix referrers 2015-10-13 20:18:56 +02:00
Vladimír Čunát
99e4371526 curl: split into multiple outputs 
Also use pkgconfig to be safer and fix (some) referrers.
 2015-10-13 20:18:48 +02:00
Vladimír Čunát
91407a8bdf ncurses: split into multiple outputs 
Some programs (e.g. tput) might better be moved somewhere else than
$dev/bin, but that can be improved later if need be.
 2015-10-13 20:18:44 +02:00
Vladimír Čunát
ba9b80c7e0 nspr,nss: split into multiple outputs 
Hopefully most references are OK.
 2015-10-13 20:18:44 +02: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
Vladimír Čunát
38313d5d87 libxml2,libxslt: split into multiple outputs 
Fixed all references, hopefully.
libxml2Python is slightly hacky now, but it seems to work.
 2015-10-05 13:44:16 +02: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
Tuomas Tynkkynen
77580d42ad php: Enable SSL via buildInputs 
The old way doesn't seem to work with multiple outputs.
TODO: this seems to be a recurring pattern with openssl, maybe the
splitting isn't done correctly?
 2015-10-03 16:42:46 +02:00
Vladimír Čunát
2f7568e092 guile: fixup with multiple-output libtool 2015-10-03 16:34:00 +02:00
Vladimír Čunát
f361938b21 Merge staging into closure-size 
This makes gcc5 the default builder, etc.
 2015-10-03 15:23:13 +02:00
Tuomas Tynkkynen
837c104512 perl: Port multiple-output changes from 5.16 to 5.20 and 5.22 2015-10-03 14:34:13 +02:00
Tuomas Tynkkynen
0054c8aa5a python3: Use correct build inputs for multi-output deps 
Without this, python will silently build without native extensions (e.g
openssl); this causes wget to fail its tests for instance.

vcunat added python-3.5.
 2015-10-03 14:08:51 +02:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size 
Many non-conflict problems weren't (fully) resolved in this commit yet.
 2015-10-03 13:33:37 +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 1a392bd62e4d8ff92ec92ebe48912b8295714e2e)
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
Shea Levy
c541c23692 nix-exec: Bugfix bump 2015-08-14 15:56:01 -04:00
Shea Levy
529596fd31 Bump nix-exec for new nix 2015-08-14 09:49:41 -04:00
William A. Kennington III
952def0e3c Merge branch 'master.upstream' into staging.upstream 2015-08-13 11:55:02 -07:00
Eelco Dolstra
64b3974d13 php: Use callPackages 2015-08-11 13:24:23 +02:00
Eelco Dolstra
e7504ebf71 php: Update to 5.4.44, 5.5.28, 5.6.12 2015-08-11 13:24:23 +02:00
Geoff Reedy
5a5e86f5cd erlang: add setupHook to set ERL_LIBS 2015-08-09 09:42:24 -06:00
William A. Kennington III
4624985561 Merge branch 'master.upstream' into staging.upstream 2015-08-07 13:40:39 -07:00
Pascal Wittmann
006a2f553e picoc: disable broken tests on i686 2015-08-06 12:52:34 +02:00
William A. Kennington III
09b4a7cc1b Merge branch 'master.upstream' into staging.upstream 2015-07-31 17:26:20 -07:00
Tobias Geerinckx-Rice
6c6201a99b Remove unnecessary rec{s from "my" packages 2015-07-31 02:02:07 +02:00
Eelco Dolstra
55932c1bec Don't statically depend on cacert for certificates 
This reverts commit cd52c04456 and
others.

Managing certificates (including revoking certificates and adding
custom certificates) becomes extremely painful if every package in the
system potentially depends on a different copy of cacert. Also, it
makes updating cacert rather expensive.
 2015-07-31 01:34:58 +02:00
William A. Kennington III
7ebe164ae0 Merge branch 'master.upstream' into staging.upstream 2015-07-30 15:03:10 -07:00
Luca Bruno
863d426a3b supercollider: build with gcc48 (ZHF) 2015-07-30 13:09:58 +02:00
Vladimír Čunát
862900e42e mass-replace deprecated usage of find -perm (Fixes #9044) 
sed 's|-perm +0|-perm /0|g'
It's a mass-rebuild due to usage in stdenv's default setup hooks.
 2015-07-30 10:30:17 +02:00
William A. Kennington III
aaef42ab8c Merge branch 'master.upstream' into staging.upstream 2015-07-29 10:23:08 -07:00
Jude Taylor
78e6b78bc6 fix source hashes for cabal2nix and bundler 2015-07-28 12:24:14 -07:00
Eelco Dolstra
cca7cdb631 php: Update to 5.4.43, 5.5.27, 5.6.11 
CVE-2015-3152
 2015-07-28 13:10:53 +02:00
Eelco Dolstra
e1f78bf677 More docs/manpages in separate outputs 2015-07-27 00:27:54 +02:00
Samuel Rivas
b454ff7cbb Add sitePackages to pypy's passthru 2015-07-21 14:16:29 +02:00
Arseniy Seroka
387ad0356a Merge pull request #8916 from joachifm/scsh 
scsh: 0.6.7 -> 0.7 pre-release
 2015-07-21 14:27:27 +03:00
Joachim Fasting
8050aa1c80 scsh: 0.6.7 -> 0.7 pre-release 
The scsh HEAD is buildable, whereas 0.6.7 segfaults during image creation.
 2015-07-21 11:34:13 +02:00
Austin Seipp
22d5d78027 Merge pull request #8871 from mayflower/php7-beta1 
php70: init at 7.0beta1
 2015-07-19 16:57:42 -05:00
Vincent Laporte
4efbe96205 pypy: fix two libraries (ZHF) 2015-07-17 19:00:16 +02:00
Robin Gloster
5e7850f088 php70: init at 7.0beta1 
The first beta of php7 has been released. This enables developers to
test their code for breakage in preparation for the stable release and
allows us to make sure we don't have any bugs in the packaging prior to
the stable release.
 2015-07-17 16:42:03 +00:00
Vincent Laporte
1c5c4e91d7 pypy: fix build (ZHF) 2015-07-15 19:40:56 +02:00
William A. Kennington III
333f145d76 Merge branch 'master.upstream' into staging.upstream 2015-07-13 15:11:31 -07:00
James Cook
98fb18af3e python-2.6: mark broken because being insecure for years 2015-07-12 10:12:33 +02:00
Jude Taylor
7393c6c69d modernize rubies 2015-07-10 10:28:27 -07:00
Pascal Wittmann
03bd9a363a pure: fixed build with gcc 4.9 (ZHF) 
Reported upstream https://bitbucket.org/purelang/pure-lang/issues/37
 2015-07-09 13:52:26 +02:00
Susan Potter
1b1374c7f0 jruby: update 1.7.20.1 -> 1.7.21 2015-07-08 21:38:00 -05:00
William A. Kennington III
dae5b35463 ruby: Fixup libv8 versions 2015-07-08 15:10:50 -07:00
William A. Kennington III
f92c174cce ruby: Correct version string 2015-07-08 14:24:42 -07:00
William A. Kennington III
7cda24c01e Merge branch 'master.upstream' into staging.upstream 2015-07-08 14:11:16 -07:00
Charles Strahan
357324df26 ruby: add 2.2.2, bump patch levels 
* Adds Ruby 2.2.2
* 1.9.3-p547 -> 1.9.3-p551
* 2.0.0-p481 -> 2.0.0-p645
 2015-07-07 17:45:33 -04:00
Charles Strahan
4ea88cc526 ruby: fix version 2.2.0 2015-07-07 17:43:49 -04:00
William A. Kennington III
81396388e5 spidermonkey: Apply 17 patch to 24 2015-07-07 09:51:06 -07:00
William A. Kennington III
f36a9a798e spidermonkey: Use more system dependencies and fix for perl 5.22 2015-07-07 00:01:16 -07:00
William A. Kennington III
ae28ff8b91 Merge branch 'master.upstream' into staging.upstream 2015-07-06 17:15:11 -07:00
William A. Kennington III
8f17099d6a bundler: 1.9.2 -> 1.10.5 2015-07-06 16:42:16 -07:00
William A. Kennington III
0f21f3e00b bundler-head: Correct hash 2015-07-06 16:42:16 -07:00
William A. Kennington III
d5cd6eebcd ruby: Add 2.1.6 2015-07-06 16:42:16 -07:00
William A. Kennington III
84ef883ac2 rvm-patchsets: Update 2015-07-06 16:42:16 -07:00
William A. Kennington III
d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
Michael Raskin
5f95a8cc10 Angelscript: update 2.30.0 -> 2.30.1 2015-07-05 00:32:53 +03:00
William A. Kennington III
7eae48871f Merge branch 'master.upstream' into staging.upstream 2015-07-01 13:38:17 -07:00
Shea Levy
145768bf9b Unmaintain a bunch of packages 2015-07-01 08:11:05 -04:00
Luca Bruno
22fce48371 php: fix broken build inputs (ZHF) 2015-07-01 12:31:01 +02:00
William A. Kennington III
612f0bdd67 Merge branch 'master.upstream' into staging.upstream 2015-06-30 23:58:07 -07:00
Andrey Pavlov
15fd734a58 elixir: 1.0.4 -> 1.0.5 2015-06-29 17:30:59 +03:00
William A. Kennington III
12102562f7 Merge branch 'master.upstream' into staging.upstream 2015-06-27 00:18:18 -07:00
William A. Kennington III
7297255019 Convert all jack references to libjack2 2015-06-27 00:17:52 -07:00
William A. Kennington III
ef253212f4 Merge branch 'master.upstream' into staging.upstream 2015-06-26 17:25:49 -07:00
Jude Taylor
e130e9d3a3 fix bundler hash 2015-06-26 09:54:49 -07:00
Andrey Pavlov
5506632473 erlang: add Erlang R18, closes #8515 2015-06-26 16:15:14 +02:00
Jude Taylor
80c62d1325 darwin purity: ruby-1.9.3 2015-06-25 16:36:04 -07:00
Thomas Tuegel
a8c52d0958 Merge branch 'master' into staging 2015-06-25 09:15:05 -05:00
Arseniy Seroka
22b89f2fcd Merge pull request #8463 from mbbx6spp/jruby-1_7_20_1 
jruby: 1.7.12 -> 1.7.20.1 (update package for CVE patch)
 2015-06-23 20:04:31 +03:00
Susan Potter
2968707101 jruby: 1.7.12 -> 1.7.20.1 
Security release which only updates Rubygems to version 2.4.8. Rubygems 2.4.8
addresses CVE-2015-1855 to resolve some problems with wildcard matching of
hostnames.

See following entry for more information:
http://jruby.org/2015/06/10/jruby-1-7-20-1.html
 2015-06-23 11:58:29 -05:00
Henry Till
e6e04d3a45 racket: 6.1.1 -> 6.2 2015-06-22 19:28:43 -04:00
Jude Taylor
e3927f6b92 remove unbuildables from impure darwin stdenv 2015-06-19 22:08:11 -07:00
Jude Taylor
f048ff3969 darwin purity: python-2.7 2015-06-19 12:56:39 -07:00