3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

31116 commits

Author SHA1 Message Date
obadz 1cd9c58834 Merge pull request #17461 from rasendubi/powerpc
cross-compilation: fixes for powerpc-linux-uclibc
2016-08-11 00:51:51 +01:00
Vladimír Čunát 947abb08ac Merge branch 'staging' 2016-08-10 22:09:38 +02:00
Graham Christensen 26d25774fa Merge pull request #17637 from swarren83/bump-gocd-server-version
gocd-server: 16.6.0-3590 -> 16.7.0-3819
2016-08-10 14:11:29 -04:00
Shawn Warren c671fc6dd0 gocd-server: 16.6.0-3590 -> 16.7.0-3819
Bump gocd-server version and update sha256 checksum.
2016-08-10 12:45:57 -05:00
Shawn Warren 697b6d2f90 gocd-agent: 16.6.0-3590 -> 16.7.0-3819
Bump gocd-agent version to 16.7.0-3819 and update sha256 checksum.
2016-08-10 12:42:22 -05:00
Daiderd Jordan 5f5b0c4348 haskellPackages.mono-traversable: fix build inputs for ghc7.10.x (#17636) 2016-08-10 17:05:45 +01:00
Shawn Warren 8750b4892e bump gocd-agent version to 16.6.0-3590 (#17311)
Update gocd-agent package version to 16.6.0-3590 including new sha.  Modify heapSize
and maxMemory mkOption to accurately reflect their intended purpose of configuring
initial java heap sizes.
2016-08-10 17:10:13 +02:00
Matthias C. M. Troffaes ad27f0252e wolfssl: 3.9.6 -> 3.9.8 2016-08-10 11:02:55 +01:00
Robin Gloster b08247f1e4 ptlib: 2.10.10 -> 2.10.11, add check for SSLv3 2016-08-10 07:12:08 +02:00
Franz Pletz 347c1ed8a0 libshout: 2.3.1 -> 2.4.1 2016-08-10 07:12:08 +02:00
Franz Pletz 6c7326aedd lolcode: fix build 2016-08-10 07:12:08 +02:00
Franz Pletz 43c663975c lolcode: 0.10.5 -> 0.11.2 2016-08-10 07:12:08 +02:00
Dan Peebles 4c43ac2db5 jsonnet: 0.8.7 -> 0.8.9 2016-08-09 19:39:46 +00:00
Robin Gloster 2005711164 Merge pull request #17613 from despairblue/update/flow
flow: 0.28.0 -> 0.30.0
2016-08-09 17:57:24 +00:00
Kamil Chmielewski 5d5b2d3f8f vagrant: FIX #16837 vagrant plugin install 2016-08-09 17:07:43 +02:00
Danny Arnold 21102b1589 flow: 0.28.0 -> 0.30.0 2016-08-09 16:51:13 +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
Vladimír Čunát 24805b00c0 unixODBCDrivers.mariadb: fix evaluation
... after the parent merge, but the package was broken anyway.
2016-08-07 22:33:19 +02:00
Vladimír Čunát 950feb70b2 treewide: fixup various mysql ocurrences after re-split 2016-08-07 20:46:37 +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
Vladimír Čunát 50f909cf93 mesa: have vdpau drivers in lib/vdpau again
This was done by @abbradar 364f297bb2 but I lost that change by accident
when doing large closure-size merges 39ebb01d.
Fortunately it seems to have caused no problems, likely because
${mesa_drivers}/lib gets into $LD_LIBRARY_PATH.
2016-08-07 12:14:16 +02:00
Vladimír Čunát 03e32315a5 Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1286624
2016-08-07 11:35:28 +02:00
Vladimír Čunát 73e1242172 mesa: vdpau symlinks, broken after 1a52fdc
Fixes #17559.
Using *relative* symlinks doesn't break when moving the files.
2016-08-07 11:33:20 +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
Vladimír Čunát a1b0967fa0 gtk3: maintenance 3.20.6 -> 3.20.8 2016-08-06 18:47: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
Vladimír Čunát 942d57f546 Merge #17159: guile: 2.0.11 -> 2.0.12 2016-08-06 17:37:55 +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