1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Commit graph

23913 commits

Author SHA1 Message Date
Vladimír Čunát 30f31c9afc Merge 'master' into staging
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
Sander van der Burg 2cb3dc6812 Merge pull request #7515 from abbradar/platformtools-bin
androidEnv.platformTools: add /bin
2015-04-26 20:19:24 +00:00
Michael Raskin 39d8b61a25 Apparently https:// is now required for iterate darcs 2015-04-26 20:58:05 +03:00
Peter Simons d0d5bbdc53 libcanberra: pass libcap to fix the build 2015-04-26 17:27:13 +02:00
Michael Raskin 9e44118e5d libao now needs libcap 2015-04-26 18:09:08 +03:00
Michael Raskin c9c2aa5ced Pass libcap as SDL input to fix the build 2015-04-26 18:06:15 +03:00
Peter Simons 08f0e0208a hackage-packages.nix: update to bf1b180f9d with hackage2nix revision c84f676708fec9d3a848f466468db04c7e641069 2015-04-26 16:53:47 +02:00
Peter Simons 066d6146fc haskell-shake: disable test suite on Darwin
The tests fail because of https://github.com/ndmitchell/shake/issues/206.
2015-04-26 13:09:13 +02:00
Peter Simons effd525c55 hackage-packages.nix: update to ea1e77a413 with hackage2nix revision c84f676708fec9d3a848f466468db04c7e641069 2015-04-26 13:06:35 +02:00
Peter Simons 2c5f7fdd58 haskell-configuration-ghc-7.10.x: fix test suite failure in haddock-library 2015-04-26 11:47:44 +02:00
Peter Simons 0340d4d0ea haskell-configuration-ghc-7.10.x: fix evaluation error 2015-04-26 11:47:44 +02:00
Peter Simons c59420a856 hackage-packages.nix: update to abae36d131 with hackage2nix revision c84f676708fec9d3a848f466468db04c7e641069 2015-04-26 11:47:44 +02:00
William A. Kennington III 7fa5873cd8 libsndfile: Fix typo 2015-04-25 21:27:54 -07:00
William A. Kennington III 2754efb8a2 lirc: Fix install 2015-04-25 21:27:54 -07:00
William A. Kennington III f11859b464 eigen: Add platform 2015-04-25 21:27:54 -07:00
William A. Kennington III 64fa593e1e celt: Correct typo 2015-04-25 21:27:54 -07:00
William A. Kennington III 726f1a6edd libopus: Slight refactor 2015-04-25 21:27:54 -07:00
William A. Kennington III 6a931f4127 dbus_cplusplus: Remove dependency on gtkmm 2015-04-25 21:27:54 -07:00
William A. Kennington III bca07bdaa6 libxml++: 2.37.2 -> 2.38.0 2015-04-25 21:27:53 -07:00
William A. Kennington III 14d52d7e0d Fix some platforms 2015-04-25 21:27:53 -07:00
William A. Kennington III 1439ed2134 sbc: 1.1 -> 1.3 2015-04-25 21:27:53 -07:00
William A. Kennington III 2bc99bb996 webrtc-audio-processing: Add derivation 2015-04-25 21:27:53 -07:00
William A. Kennington III dbcbb2dbe1 libasyncns: Add derivation 2015-04-25 21:27:53 -07:00
William A. Kennington III 232b71c6e8 Fix some platforms 2015-04-25 21:27:53 -07:00
William A. Kennington III 54f812558a lirc: Refactor 2015-04-25 21:27:53 -07:00
William A. Kennington III f9afdf62b9 speex: 1.2rc1 -> 1.2rc2 2015-04-25 21:27:53 -07:00
William A. Kennington III 6e2b9cf61a speexdsp: Add derivation 2015-04-25 21:27:53 -07:00
William A. Kennington III 5dd8538812 mesa: 10.5.3 -> 10.5.4 2015-04-25 18:41:18 -07:00
William A. Kennington III df000d93e9 nettle: 3.1 -> 3.1.1 2015-04-25 18:38:31 -07:00
Vincent Laporte 7cf05bfe71 boost: use ${python.interpreter} rather than ${python}/bin/python 2015-04-25 22:35:25 +02:00
Bjørn Forsman 173da15f75 jquery: bump 1.11.1 -> 1.11.2 2015-04-25 20:27:07 +02:00
Peter Simons 991a23b5db haskell-edit-distance: update patch SHA 2015-04-25 18:02:02 +02:00
Peter Simons 848bf3b75d haskell-wreq-sb: disable failing test suite 2015-04-25 17:57:32 +02:00
Peter Simons 24f50d3e22 hackage-packages.nix: update to cc08310397 with hackage2nix revision c84f676708fec9d3a848f466468db04c7e641069 2015-04-25 17:57:32 +02:00
Peter Simons cb3342f1dc Merge pull request #7543 from mdorman/master
Add patch for present not yet on hackage.
2015-04-25 17:48:53 +02:00
Peter Simons 2ca6148bc7 hackage-packages.nix: re-generate from Hackage state 5af579af59 2015-04-25 17:09:04 +02:00
Jaka Hudoklin 5e2b429e82 Merge pull request #7556 from offlinehacker/pkgs/node-packages/fix_platforms
nodePackages: fix platform detection
2015-04-25 16:21:51 +02:00
Jaka Hudoklin 744b06cc28 nodePackages: fix platform detection 2015-04-25 15:18:54 +02:00
vbgl 3591040468 Merge pull request #6535 from michelk/qgis_2.8.0
[WIP] qgis: update to 2.8.0
2015-04-25 14:35:40 +02:00
Michael Alan Dorman 54fb857a49 Add patch for present not yet on hackage. 2015-04-25 06:45:35 -04:00
Luca Bruno db3b86560f GNOME 3.16.1, closes #7357 2015-04-25 12:02:33 +02:00
Luca Bruno d4a0cd2a94 Add gettextWithExpat function 2015-04-25 11:48:23 +02:00
Luca Bruno cbfd3056b5 Merge branch 'lafix' into staging
Fix .la and .pc files of trousers and gnutls
2015-04-25 11:43:16 +02:00
Luca Bruno 6b6183125e gnutls, trousers: fix .la and .pc files, remove propagated build inputs
cc @vcunat @wkennington
2015-04-25 11:43:08 +02:00
Pascal Wittmann 8e86ec5bf0 Merge pull request #7529 from joachifm/trivial-builderDefs
Some trivial builderDefs->mkDerivation translations
2015-04-25 11:32:12 +02:00
Vladimír Čunát 2c0db9ffbe webkitgtk-2.4: security update, fix and parallel build
NEWS claims security fixes:
CVE-2014-1344, CVE-2014-1384, CVE-2014-1385, CVE-2014-1386,
CVE-2014-1387, CVE-2014-1388, CVE-2014-1389, CVE-2014-1390.
Otherwise NEWS seems safe, basically only containing bugfixes.

Parallel building should work now, thanks to make update :-)
tested with 8 threads, once webkitgtk24x and webkitgtk2.
2015-04-25 09:42:52 +02:00
Vladimír Čunát 2275f6626c webkitgtk-2.4: patch to fix build, rename file
Extracted from #7357 to avoid merge problems.
2015-04-25 08:30:32 +02:00
Charles Strahan 1cdbde93d5 haskell-Extra: patch for GHC 7.10.x 2015-04-24 22:10:11 -04:00
Thomas Tuegel 66d44ef6d4 Merge branch 'openblas' 2015-04-24 19:34:39 -05:00
Thomas Tuegel 8ed9f847b1 openblas: update to 0.2.14 2015-04-24 18:21:20 -05:00