mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 06:01:15 +00:00
Code Issues Wiki Activity
88667 commits 325 branches 124 tags 6.8 GiB
Commit graph

2127 commits

Author SHA1 Message Date
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
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
joachifm ee8d210828 Merge pull request #13528 from bendlas/init-pixie 
pixie: init at 0-1333
 2016-03-05 19:30:49 +00: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
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
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
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
zimbatm 7e8faf022f rubygems: 2.4.8 -> 2.5.2 
Closes #11950
 2016-02-26 18:02:24 +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
Charles Strahan 123a9104e4 Merge pull request #13109 from zimbatm/ruby-fixes 
Ruby fixes
 2016-02-20 20:29:25 -05: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
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
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
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
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
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
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
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 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
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