Commit graph

27084 commits

Author SHA1 Message Date
William A. Kennington III 357e471d56 rocksdb: 4.0 -> 4.1 2015-11-17 21:12:49 -08: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
Luca Bruno db4e688df2 git2: fix libssh support 2015-11-17 17:55:20 +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
Michel Kuhlmann cab1f3de5e R: regenerate CRAN packages 2015-11-17 14:34:27 +01:00
Vladimír Čunát 31aa281919 libpng12: security update 1.2.53 -> 1.2.54
Part of fix for #11030.
Also refactor meta.
2015-11-17 12:57:33 +01:00
Peter Simons 2d87d483d0 configuration-hackage2nix.yaml: update list of broken packages 2015-11-17 11:09:59 +01:00
Peter Simons 4fb7b4170a hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20150922-42-g3ca1747 using the following inputs:

  - Nixpkgs: ad0723f0c7
  - Hackage: c7478af457
  - LTS Haskell: 8ec1fc3419
  - Stackage Nightly: e6bcfb640c
2015-11-17 11:09:09 +01:00
Domen Kožar f809e8e0ab webkitgtk: 2.10.0 -> 2.10.4 (fix build) 2015-11-17 08:19:01 +01:00
Domen Kožar 0ff2240da3 Merge pull request #11078 from svend/nim-darwin
nim: Add darwin platform
2015-11-17 01:06:02 +01:00
Svend Sorensen d4994d85e4 nim: Add darwin platform 2015-11-16 14:50:40 -08:00
lethalman ca186286d7 Merge pull request #10986 from teh/master
update flow + new go binary (codesearch)
2015-11-16 20:45:10 +01:00
Sander van der Burg a06dd213b6 nodejs-5_0: add package 2015-11-16 17:58:11 +00:00
Stefan Junker 63edfb1871 go14: 1.4.2 -> 1.4.3 (close #10702) 2015-11-16 16:39:08 +01:00
Arseniy Seroka aca3377672 Merge pull request #11028 from ryantrinkle/hmatrix-darwin
Add Accelerate framework dependency to hmatrix on darwin
2015-11-16 18:19:25 +03:00
Jaka Hudoklin 9c1943fb6f influxdb: 0.8.3 -> 0.9.4, fix module 2015-11-16 14:22:08 +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
Domen Kožar 5ca01c71d1 Merge pull request #10814 from NarrativeScience/no_large_file_test
numpy: patch to remove large file test
2015-11-16 12:55:13 +01:00
Domen Kožar 4755afc385 Merge commit 'b666ac3e9ff3f08b120d068770768be580e67f76' (staging)
Merge rest of the fixes from staging
2015-11-16 11:23:06 +01:00
Peter Simons 731965eb24 Merge pull request #10967 from sjourdois/cracklib
cracklib: 2.9.4 -> 2.9.6
2015-11-16 11:09:04 +01:00
Peter Simons 2025ed52a0 Merge pull request #10987 from mcmtroffaes/feature/libssh2-mingw
libssh2: fix shared library build under mingw
2015-11-16 11:05:45 +01:00
Ryan Trinkle 90d5d315af hmatrix: fix missing Accelerate framework dependency on darwin 2015-11-15 14:57:58 -05:00
Florent Becker 7ff5826e08 kcov : init at 29 2015-11-15 18:07:48 +01:00
Domen Kožar b666ac3e9f Revert "python: skip build at install phase"
This reverts commit d34f5b6570.

PIL and NumPy don't like this change and I'd rather spend time on
bringing wheels to Nix than fixing old infrastructure.
2015-11-15 13:50:04 +01:00
Domen Kožar 5a16c0e6e4 buildPythonPackage: clean up shellHook 2015-11-15 13:50:04 +01:00
Tobias Geerinckx-Rice b0e253a05c libpsl: list 2015-11-12 -> 2015-11-13 2015-11-15 03:56:59 +01:00
Arseniy Seroka 20024205d3 Merge pull request #11014 from Havvy/node10
nodejs: 0.10.38 -> 0.10.40
2015-11-15 01:23:20 +03:00
William A. Kennington III b762a2035c taglib: 1.9.1 -> 1.10 2015-11-14 13:28:48 -08:00
William A. Kennington III 453f7c7218 Merge branch 'master.upstream' into staging.upstream 2015-11-14 12:39:32 -08: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 050bebb8c4 cmake: 3.3.2 -> 3.4.0 2015-11-13 15:55:44 -08:00
William A. Kennington III cdf65ba19e gtk3: 3.18.3 -> 3.18.4 2015-11-13 15:55:33 -08:00
William A. Kennington III 8f45d18a71 Merge branch 'master.upstream' into staging.upstream 2015-11-13 15:54:10 -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
Ryan Scheel (Havvy) 087202abf9 nodejs: 0.10.38 -> 0.10.40 2015-11-13 23:06:03 +00:00
Arseniy Seroka f7bd63dc77 Merge pull request #10977 from sjourdois/ffmpeg
darwin: ffmpeg-full and deps: darwin fixes
2015-11-13 17:43:54 +03:00
Tobias Geerinckx-Rice 519d18b063 libpsl: list 2015-10-11 -> 2015-11-12 2015-11-13 15:07:34 +01:00
John Ericson 53e43204f9 ghcjs: update comment on generating built-in pkg list
Should we do `import (runCommand ...)` to automate this?
2015-11-12 16:47:41 -08:00
vbgl c14eca68a4 Merge pull request #10965 from sjourdois/cgal
cgal: 4.6.1 -> 4.7
2015-11-13 00:07:04 +01:00
Peter Simons aee2e72122 Haskell math-functions is broken on Hydra again. :-( 2015-11-12 22:31:03 +01:00
Peter Simons 4856880cab hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20150922-36-ge0ee7ef using the following inputs:

  - Nixpkgs: 7c001f31b0
  - Hackage: 46f2de463b
  - LTS Haskell: 1ae555e197
  - Stackage Nightly: 4113b2e369
2015-11-12 22:30:54 +01:00
Matthias C. M. Troffaes d583c16568 libssh2: fix shared library build under mingw 2015-11-12 15:12:09 +00:00
Bjørn Forsman 30313d5c6e jenkins: 1.637 -> 1.638 (important security fixes)
I fat fingered the previous update, *this* is the real important
security updates:

https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2015-11-11
2015-11-12 13:40:09 +01:00
Bjørn Forsman 7a1c4ab324 jenkins: 1.636 -> 1.637 (security fixes)
https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2015-11-11
2015-11-12 13:34:44 +01:00
vbgl b3d2a2874a Merge pull request #10964 from vbgl/master
menhir: refactor to generic; init at 20151110 for OCaml >= 4.02
2015-11-12 01:15:26 +01:00
William A. Kennington III 6de80cb21b libevdev: 1.4.4 -> 1.4.5 2015-11-11 15:47:22 -08:00
William A. Kennington III 0ba740d26b mesa: 11.0.4 -> 11.0.5 2015-11-11 15:45:15 -08:00
Stéphane Jourdois a2bf64a381 darwin: ffmpeg-full: add some missing darwin deps 2015-11-11 23:00:11 +01:00
Stéphane Jourdois b096a863a9 darwin: wavpack: add missing darwin deps 2015-11-11 23:00:10 +01:00