Commit Graph

3221 Commits

Author SHA1 Message Date
Nikolay Amiantov
d1ed30ac0d cargoUnstable: init at 2016-01-10 2016-01-13 13:48:24 +03:00
Vladimír Čunát
cea8ee50c7 phantomjs2: fix evaluation and refactor
The error was due to the fact that with-introduced bindings have lower
priority and we do have `darwin` in scope already.

Fixes #12350. Closes #12351. (A slightly different fix.
I chose this to lower the risk of people re-introducing the mistake.)
2016-01-13 08:34:35 +01:00
Jude Taylor
e6a892bb55 phantomjs2: build on darwin 2016-01-12 21:52:49 -08:00
Tobias Geerinckx-Rice
fcb913b3a7 systemtap: remove dead package
Broken since 2013. Depends on equally broken latex2html.
Our version 1.2 is almost six years old; latest is 2.9.
And it's (still) no dtrace.
2016-01-11 01:41:54 +01:00
Pascal Wittmann
26a6b4b58d yodl: 3.05.01 -> 3.06.00 2016-01-09 20:07:43 +01:00
Pascal Wittmann
1d947ed4bf icmake: 7.23.02 -> 8.00.05 2016-01-09 20:07:43 +01:00
Florent Becker
a14c867d62 js_of_ocaml: Allow caml >= 4.02 to find camlp4 2016-01-08 16:06:00 +01:00
Jude Taylor
08c081309b Revert "gnustep-make: fix installation path"
This reverts commit 4f1559a751.
2016-01-07 21:52:11 -08:00
Gabriel Ebner
b12cabd223 electron: 0.28.2 -> 0.36.2 2016-01-06 19:05:00 +01:00
Peter Simons
1355e928cf Merge pull request #12148 from ragnard/boot-update-and-remove-make-wrapper-usage
boot: Update shell script version and remove makeWrapper usage
2016-01-05 12:22:23 +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
Eric Seidel
222f4b9e2b gnustep-make: dont write to /Library/GNUstep 2016-01-04 14:07:17 -08:00
Ragnar Dahlén
a25bfab690 boot: Update shell script version and remove makeWrapper usage 2016-01-04 17:23:45 +00:00
Tobias Geerinckx-Rice
8f6ae032c0 ccache: cherry-pick a (backported upstream) bug-fix 2016-01-04 15:11:51 +01:00
Pascal Wittmann
340c8acfaf global: 6.5.1 -> 6.5.2 2016-01-03 19:47:17 +01:00
Pascal Wittmann
642065e8d4 checkstyle: 6.13 -> 6.14.1 2016-01-03 19:42:59 +01:00
Tobias Geerinckx-Rice
ddd48258e8 gnustep-make: 2.6.6 -> 2.6.7 2016-01-03 00:24:28 +01:00
Tobias Geerinckx-Rice
4f1559a751 gnustep-make: fix installation path
Get rid of the nested /nix/store/.../nix/store/... directories.
2016-01-03 00:24:28 +01:00
Benjamin Staffin
4a69e5ae85 omake: Fix broken download URL
All the download links on http://omake.metaprl.org/ seem to be dead.
2016-01-02 18:21:48 +01:00
Florent Becker
44931d4293 js_of_ocaml: 2.5 -> 2.6 2016-01-01 19:04:40 +01:00
janus
a472d836f6 FreeBSD: apr-util, cyrus-sasl, berkeley db, glib, gnutls, kerberos, libelf-freebsd, openldap, serf, guile, tet, shishi, gawk, gnugrep 2016-01-01 17:01:13 +00:00
janus
c01dbc4932 FreeBSD patches for GNU m4, stdenv, miniupnpc 2016-01-01 17:01:13 +00:00
Michael Raskin
1dba4b4e6a scons: 2.3.6 -> 2.4.1 2016-01-01 12:30:17 +03:00
Michael Raskin
761340140c luarocks: 2.2.2 -> 2.3.0 2016-01-01 12:30:17 +03:00
Michael Raskin
f50aca5157 cl-launch: 4.1.4 -> 4.1.4.1 2015-12-31 16:52:05 +01:00
Shell Turner
c1ec39d47b icestorm: init at 2015.12.29 2015-12-30 16:52:41 +00: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
Peter Simons
c5f28c305a Merge pull request #11566 from Bevaz/ccache-links
ccache: create symlinks to gcc lib & include in ccache-links directory
2015-12-29 16:29:16 +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
0cfa4fdbd4 strace: 4.10 -> 4.11 2015-12-27 20:25:29 +00:00
Robin Gloster
37ebb4c2ac rustfmt: 2015-12-08 -> 2015-12-23 2015-12-24 13:20:24 +01:00
Robin Gloster
2faea53f8e cargo: 0.6.0 -> 0.7.0 2015-12-24 13:20:24 +01:00
Vladimír Čunát
12a0e09563 Merge #11674: libressl-2.3 patches for various pkgs 2015-12-23 23:16:27 +01:00
Arseniy Seroka
93d3f6f52b Merge pull request #11905 from aborsu/jenkins-update
jenkins ci: 1.638 -> 1.643
2015-12-23 23:10:46 +03:00
Vladimír Čunát
11c702c582 Merge master into staging 2015-12-23 18:57:35 +01:00
Augustin Borsu
170f91a249 jenkins ci: 1.638 -> 1.643 2015-12-23 15:47:11 +01:00
Tim Steinbach
d509f8a30a gradle: 2.9 -> 2.10 2015-12-23 08:44:49 -05:00
Vladimír Čunát
bf9c16d4ac texinfo6: remove meta.branch and refactor meta
It was wrong ("5.2") and seemed unused in nixpkgs.
2015-12-23 09:19:38 +01:00
Arseniy Seroka
87d2532f82 Merge pull request #11879 from aneeshusa/update-vagrant-to-1.8.0
vagrant: 1.7.4 -> 1.8.0
2015-12-22 17:51:35 +03:00
Aneesh Agrawal
53a5a44190 vagrant: 1.7.4 -> 1.8.0 2015-12-22 05:55:48 -05:00
Tim Steinbach
895875bdac maven: 3.3.3 -> 3.3.9, fixes #11867 2015-12-22 02:11:00 +01:00
Tim Steinbach
9121277144 gradle: 2.8 -> 2.9 2015-12-21 11:37:21 -05:00
Tobias Geerinckx-Rice
ca8903c3c2 include-what-you-use: use unversioned llvm attribute
...in the expression itself, while hard-coding the officially supported
version in all-packages.nix for sanity's sake (mine).
2015-12-20 03:22:24 +01:00
Tobias Geerinckx-Rice
986f446674 include-what-you-use: 0.4 -> 0.5
Compatible with llvm+clang 3.7. Changes:
- Added Boost and Qt mappings.
- Better support for using declarations.
- Allow size_t from multiple headers.
- Fixed handling includes with common path prefix.

More: http://include-what-you-use.org/
2015-12-20 03:15:36 +01:00
Herwig Hochleitner
b3b7f9f37f fix lib path for gradle, fixes #11191 2015-12-18 23:12:43 +03:00
Peter Simons
16e9b44afa cabal2nix: update to version 20151217 2015-12-18 11:37:44 +01:00
Pascal Wittmann
21522ede83 Merge pull request #11753 from nlewo/master
Add devpi-client and its dependencies
2015-12-17 16:21:46 +01:00
Vladimír Čunát
5d4f0b556e texinfo: cleanups and doCheck = false for non-interactive
... to simplify bootstrapping. Discussion on #11527.
2015-12-17 14:45:46 +01:00
Jan Malakhovski
daa199a95e texinfo: fix doCheck properly, cleanup (close #11527) 2015-12-17 14:45:46 +01:00
Antoine Eiche
f21a65f719 devpi-client: init at 2.3.2 2015-12-17 09:34:13 +01:00
Mathieu Boespflug
bb30c79f0b vagrant: bring embedded/ libraries in scope of dynamic linker. 2015-12-16 18:14:40 +01:00
Peter Simons
82c673d4c9 Merge pull request #11651 from gleber/add-erlang-modules
Add erlang modules
2015-12-15 17:55:25 +01:00
Gleb Peregud
bb1b5c7194 Update hex.pm registry 2015-12-15 15:06:47 +01:00
Gleb Peregud
474da3bf24 Add sources of specific rebar bootstrap deps via new fetchHex
derivation.
2015-12-15 15:06:44 +01:00
Gleb Peregud
108f3cf67f Add patch which makes rebar compilation hermetic 2015-12-15 14:05:51 +01:00
Gleb Peregud
4ba1a51b7f Move registry to rebar3, since it needs it itself to be bootstrapped.
This makes rebar3 build a bit more hermetic. Next stage is to pull in
rebar3 plugins dependencies for bootstrap to pick up.
2015-12-15 14:05:19 +01:00
Gleb Peregud
033902d269 Refactor fetchHex out of buildHex.
This will allow to reuse this code to fetch rebar3's dependencies to
ensure it's hermetic build.
2015-12-15 14:01:38 +01:00
Gleb Peregud
bcc4ca029a Add rebar3 package 2015-12-15 01:02:52 +01:00
Anton Fedotov
cbe786a530 ccache: create symlinks to gcc lib & include in ccache-links directory
This patch fixes compilation errors when using ccache wrapper:
```
cc1: error: /nix/store/19vvbsjs6l6j0r22albzhysxfvr94imf-ccache-links/lib/gcc/*/*/include-fixed: No such file or directory
```
2015-12-14 12:15:22 +03:00
Lancelot SIX
5aa99f680e pkgs.gdb: 7.10 -> 7.10.1
See https://lists.gnu.org/archive/html/info-gnu/2015-12/msg00003.html
2015-12-12 14:54:25 +01:00
Pascal Wittmann
e0a7c3a54b intel-gpu-tools: 1.12 -> 1.13 2015-12-12 12:05:19 +01:00
Pascal Wittmann
42c7004d33 checkstyle: 6.12.1 -> 6.13 2015-12-12 12:05:19 +01:00
Pavan Rikhi
2de85bd7e5 sassc: v3.2.4 -> v3.3.2 2015-12-10 17:27:46 -05:00
Robin Gloster
34e67f558f rustfmt: 2015-10-28 -> 2015-12-08 2015-12-10 16:23:39 +00:00
Herwig Hochleitner
58ba1d5bd3 leiningen: 2.5.2 -> 2.5.3, fixes #11537 2015-12-08 02:58:33 +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
Matt Whiteley
94baac8d02 chefdk: 0.4.0 -> 0.10.0 2015-12-03 13:28:26 -08:00
Arseniy Seroka
e024f7fec9 Merge pull request #11409 from FlorentBecker/kcov
kcov: fix issue #11399
2015-12-03 16:28:45 +03:00
Florent Becker
fa8586495d kcov: fix issue #11399 2015-12-02 22:20:01 +01:00
William Casarin
bc698428aa multi-ghc-travis: init at git-2015-11-04 2015-11-29 17:39:34 -08:00
Vladimír Čunát
f2ad4a47e8 cmake: remove conditional patch that no longer applies
Close #11290. The patch will no longer apply on *any* platform.
2015-11-29 08:58:39 +01:00
Vincent Laporte
6a622acc87 merlin: 2.3 -> 2.3.1 2015-11-28 10:42:08 +01:00
Nikolay Amiantov
2472e19914 Merge pull request #11278 from abbradar/gdb-guile
gdb: use system zlib, fix guile support
2015-11-27 02:09:13 +03:00
Tobias Geerinckx-Rice
2798b02ad0 Convert some *Flags from strings to lists 2015-11-26 23:45:31 +01:00
Domen Kožar
67e03d0c50 Merge branch 'buildPythonPackage+wheels' 2015-11-26 17:38:35 +01:00
Nikolay Amiantov
d96f7128e1 gdb: use system zlib, fix guile support 2015-11-26 16:43:44 +03:00
Pascal Wittmann
765afaec88 sslmate: make meta.maintainers a list 2015-11-25 23:06:09 +01:00
Joachim Fasting
6ccf87defe bam: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Vladimír Čunát
13eca6f79a Merge #11067: SmartOS updates
I amended some commits slightly.
2015-11-23 14:45:44 +01:00
Danny Wilson
baf7fdcb75 SmartOS: bison: make help2man target specific dependency 2015-11-23 11:42:01 +01:00
Danny Wilson
d510109c54 SmartOS: texinfo: Fix build and make configureFlags target optional. 2015-11-23 11:42:00 +01:00
Danny Wilson
1752268aed SmartOS: Fix pkgconfig 0.29 build 2015-11-23 00:01:55 +01:00
Arseniy Seroka
c89f058b4a Merge pull request #11191 from volhovM/fix/gradle-update
gradle: refactor
2015-11-22 22:40:49 +03:00
Pascal Wittmann
0773d7b576 checkstyle: 6.11.2 -> 6.12.1 2015-11-22 14:07:53 +01:00
Mikhail Volkhov
bc05b570e6 gradle: refactor 2015-11-22 12:46:10 +03:00
Aristid Breitkreuz
77e07fbbd9 add working lsof mirror 2015-11-21 23:48:41 +01:00
Domen Kožar
704c8bab41 buildPythonPackage: fix standalone applications using it 2015-11-21 21:44:12 +01:00
Shea Levy
db995a95ee Merge remote-tracking branch 'origin/master' into staging 2015-11-21 07:46:55 -05:00
Jude Taylor
852988348d Merge branch 'staging' of https://github.com/NixOS/nixpkgs into sandbox-profiles 2015-11-20 19:58:46 -08:00
Pascal Wittmann
815e9f5af2 help2man: 1.47.2 -> 1.47.3 2015-11-20 17:21:23 +01:00
Pascal Wittmann
35f32d0fda Merge pull request #10971 from ericbmerritt/trv-package
trv: init at 0.1.3
2015-11-20 14:26:24 +01:00
William A. Kennington III
22bf2d0bf3 flex: 2.5.39 -> 2.6.0 2015-11-18 17:50:27 -08:00
Pascal Wittmann
dd81844322 Merge pull request #11120 from vizanto/pr-boot
boot: 2.2.0 -> 2.4.2
2015-11-18 13:39:24 +01:00
Danny Wilson
1ebc5bfa21 boot: 2.2.0 -> 2.4.2 2015-11-18 11:48:04 +01:00
Pascal Wittmann
c283a3da68 Replace 'with plaforms; platform' with 'platforms.platform' 2015-11-18 11:34:09 +01:00
Ricardo M. Correia
2b694c237b cargo, cargoSnapshot: add rustc runtime dependency
It turns out that cargo implicitly depends on rustc at runtime: even
`cargo help` will fail if rustc is not in the PATH.

This means that we need to wrap the cargo binary to add rustc to PATH.
However, I have opted into doing something slightly unusual: instead of
tying down a specific cargo to use a specific rustc (i.e., wrap cargo so
that "${rustc}/bin" is prefixed into PATH), instead I'm adding the rustc
used to build cargo as a fallback rust compiler (i.e., wrap cargo so
that "${rustc}/bin" is suffixed into PATH). This means that cargo will
prefer to use a rust compiler that is in the default path, but fallback
into the one used to build cargo only if there wasn't any rust compiler
in the default path.

The reason I'm doing this is that otherwise it could cause unexpected
effects. For example, if you had a build environment with the
rustcMaster and cargo derivations, you would expect cargo to use
rustcMaster to compile your project (since rustcMaster would be the only
compiler available in $PATH), but this wouldn't happen if we tied down
cargo to use the rustc that was used to compile it (because the default
cargo derivation gets compiled with the stable rust compiler).

That said, I have slightly modified makeRustPlatform so that a rust
platform will always use the rust compiler that was used to build cargo,
because this prevents mistakenly depending on two different versions of
the rust compiler (stable and unstable) in the same rust platform,
something which is usually undesirable.

Fixes #11053
2015-11-18 02:41:45 +01:00
Pascal Wittmann
7fd2796e99 Replace 'with plaforms; platform' with 'platforms.platform' 2015-11-17 21:30:43 +01:00
Jaka Hudoklin
be067811ff Merge pull request #11048 from offlinehacker/pkgs/influxdb/update_0.9.4
influxdb: 0.8.3 -> 0.9.4, fix module
2015-11-17 17:18:24 +01:00
lethalman
ca186286d7 Merge pull request #10986 from teh/master
update flow + new go binary (codesearch)
2015-11-16 20:45:10 +01:00