Commit graph

31081 commits

Author SHA1 Message Date
Kamil Chmielewski 5d5b2d3f8f vagrant: FIX #16837 vagrant plugin install 2016-08-09 17:07:43 +02:00
Aneesh Agrawal 746b591c68 vagrant: use libarchive lib from Nix (#17597)
We currently already replace the embedded bsdtar binaries with the
corresponding ones from Nix. However, we also need to replace the
libarchive shared library to prevent version mismatches between the
embedded library and the Nix binaries.

Also expose version on the derivation and use environment variables
to make overriding the derivation easier.
2016-08-09 12:01:48 +02:00
Daiderd Jordan c31f05e063 Merge pull request #17577 from LnL7/darwin-ffmpeg
ffmpeg: add extra darwin framework for 3.1
2016-08-09 08:13:11 +02:00
Rok Garbas f17ff218ff nodejs: ensure that all scripts in nodejs have proper shebangs (#17594) 2016-08-08 22:14:01 +02:00
Nikolay Amiantov 3fca2ce204 fix invalid antiquotations
See https://github.com/NixOS/nix/issues/1017
2016-08-08 18:08:37 +03:00
Thomas Tuegel ca5b3368ca qttools: fix CMake paths
Fixes #17585.
2016-08-08 08:52:45 -05:00
Eelco Dolstra 2d71df18d3 Merge pull request #17588 from rnhmjoj/nss
nss: 3.23 -> 3.24
2016-08-08 12:11:26 +02:00
Nikolay Amiantov 1e8894f085 unity3d: use chromium-suid-sandbox 2016-08-08 10:49:00 +03:00
Daiderd Jordan b8a3174aa3 haskellPackages.vector-algorithms: added extra build dependencies for ghc 7.10 (#17586) 2016-08-08 00:03:07 +01:00
Daiderd Jordan 0456264754 Merge pull request #17517 from knedlsepp/add-json
nlohmann_json: init at 2.0.2
2016-08-08 00:29:09 +02:00
rnhmjoj f2842da8b2
nss: 3.23 -> 3.24 2016-08-07 23:38:03 +02:00
Daiderd Jordan e2fdd74a41
libsamplerate: fix missing darwin frameworks 2016-08-07 18:20:17 +02:00
Daiderd Jordan b660ed3258
libmikmod: fix missing darwin framework 2016-08-07 17:52:06 +02:00
Daiderd Jordan 00b05d47d3
ffmpeg: add extra darwin framework for 3.1 2016-08-07 12:27:05 +02:00
Rok Garbas 17e8dda597 Merge pull request #17473 from lancelotsix/add_django_1_10
Add django 1.10
2016-08-07 04:08:26 +02:00
Vladimír Čunát dddf84ff61 Merge #17512: gcc49: 4.9.3 -> 4.9.4 2016-08-06 21:10:51 +02:00
Daiderd Jordan d764e55a1c Merge pull request #17564 from LnL7/darwin-haskell-fsnotify
haskellPackages.fsnotify: add darwin build dependency
2016-08-06 17:56:18 +02:00
Daiderd Jordan 7aaf75608f
haskellPackages.fsnotify: add darwin build dependency 2016-08-06 17:29:25 +02:00
Tuomas Tynkkynen 89c867196c SDL2_{gfx,image,net}: Broken on Darwin
Last successful Darwin build was 11 months ago, presumably nobody cares.

http://hydra.nixos.org/build/38317749
http://hydra.nixos.org/build/38318268
http://hydra.nixos.org/build/38322306
2016-08-06 18:27:20 +03:00
Benno Fünfstück 22281009b7 haskell/GLUT: fix "unkown GLUT entry glutInit"
This fixes #17547
2016-08-06 17:21:12 +02:00
Tuomas Tynkkynen ea14f5c86d http-parser: Broken on Darwin
http://hydra.nixos.org/build/38320273
2016-08-06 17:06:45 +03:00
Tuomas Tynkkynen 9c0a090afe colm: Broken on i686
http://hydra.nixos.org/build/38072668
2016-08-06 17:06:45 +03:00
Tuomas Tynkkynen 1db43e0c18 rtags: Broken on i686
http://hydra.nixos.org/build/38304790
2016-08-06 17:06:45 +03:00
Tuomas Tynkkynen 0498573573 drumstick: Broken on i686
http://hydra.nixos.org/build/38323068
2016-08-06 17:06:45 +03:00
Tuomas Tynkkynen fcc3a1b41d bazel: Broken on i686
http://hydra.nixos.org/build/38314298
2016-08-06 17:06:45 +03:00
Tuomas Tynkkynen 3c513ebc13 assimp: Broken on Darwin
http://hydra.nixos.org/build/38315116
2016-08-06 17:06:45 +03:00
Aycan iRiCAN 983ab7be1e haskellPackages.hans: fixed major version bugs (#17555) 2016-08-06 14:29:01 +03:00
Joachim F af8b7d3a28 Merge pull request #17526 from RamKromberg/fix/wavpack
wavpack: 4.75.0 -> 4.80.0
2016-08-06 00:59:08 +02:00
Robin Gloster fae6264d3a Merge pull request #17533 from wizeman/u/upd-containers
ocamlPackages.containers: 0.16 -> 0.18
2016-08-05 19:15:01 +02:00
Ricardo M. Correia e5db1995a6 ocamlPackages.containers: 0.16 -> 0.18 2016-08-05 14:35:17 +02:00
Ram Kromberg 76c2988e33 wavpack: 4.75.0 -> 4.80.0 2016-08-05 13:54:56 +03:00
Lancelot SIX 8420753239
gcc49: 4.9.3 -> 4.9.4
Bugfix release of the 4.9 branch. See
http://lists.gnu.org/archive/html/info-gnu/2016-08/msg00001.html for
announcement
2016-08-05 00:01:15 +02:00
Josef Kemetmueller 54748c1e3f nlohmann_json: init at 2.0.2
A header only C++ library for modern JSON.
2016-08-04 23:34:23 +02:00
koral b3beab9f03 webkitgtk: 2.10.4 -> 2.10.9 2016-08-04 21:18:38 +02:00
obadz fbea275286 haskellPackages.ghc-mod: remove override as 5.6.0.0 is ghc8 compatible
cc @peti
2016-08-04 17:40:17 +01:00
Brad Ediger f0f9172017 elm: Constrain aeson-pretty to <0.8 (#17511)
https://github.com/elm-lang/elm-compiler/pull/1431
2016-08-04 18:08:32 +02:00
Thomas Tuegel 9a29551636 Merge branch 'plasma-5.7' 2016-08-04 10:44:43 -05:00
Thomas Tuegel 5b008e30b4 kdeWrapper: avoid excessive file collisions 2016-08-04 10:40:36 -05:00
Peter Simons 2627b09b82 haskell-applicative-quoters: fix build with GHC 8.x 2016-08-04 17:38:44 +02:00
Peter Simons 8f52a0f926 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0-22-ga83e456 using the following inputs:

  - Hackage: 07ee4666b6
  - LTS Haskell: dfe21a3b8d
  - Stackage Nightly: 7c2bfd83db
2016-08-04 15:20:31 +02:00
Tobias Geerinckx-Rice 06966f4955
icmake: 8.01.00 -> 9.00.00 2016-08-04 00:25:20 +02:00
Shea Levy ca81eef753 Merge branch 'fix-clang-35' of git://github.com/expipiplus1/nixpkgs 2016-08-03 15:36:14 -04:00
Tobias Geerinckx-Rice 37528197a3
libpsl: 0.13.0 -> 0.14.0 2016-08-03 20:02:25 +02:00
Joe Hermaszewski c7281d14f7 clang-3.5: fix build
Make Obj public in llvm's IntrusiveRefCntPtr

This fixes NixOs/nixpkgs#15974

It's not a nice fix, as it's really clang's problem. The proper fix
should modify clang's usage of IntrusiveRefCntPtr.
2016-08-03 19:00:39 +01:00
Joachim F 70bf931498 Merge pull request #17410 from knedlsepp/motif-on-darwin
motif: Add support for darwin
2016-08-03 18:31:43 +02:00
Michael Raskin ef46388c48 neovim-qt: 0pre -> 0.2.1, use libmsgpack 1.4 2016-08-03 17:58:22 +02:00
mimadrid 5c017832e9
strace: 4.12 -> 4.13 2016-08-03 11:09:43 +02:00
Lancelot SIX af154d1ca6
pythonPackags.django: default from 1_9 to 1_10 2016-08-03 09:20:37 +02:00
Alexey Shmalko 61a5c24209 cmocka: cross-compilation support (#17462) 2016-08-03 08:16:01 +02:00
Bart Brouns 0621828bb7 supercollider: 3.6.6 -> 3.7.2 (#17395) 2016-08-03 00:27:03 +02:00