Dan Peebles
81352b2cb5
Merge branch 'master' into staging
2017-04-06 21:26:24 -04:00
Dan Peebles
6b1957d17a
qt5: fix to work on LLVM 4
...
Including apple_sdk.sdk is generally a recipe for a bad time on LLVM 3.8
and above, since you end up with bad headers in the wrong place that hurt
the new libc++ in 3.8 and above. In this case, qt only wanted the super-
generic SDK for CUPS headers, which we can just depend on directly now.
2017-04-06 21:00:28 -04:00
Hamish Mackenzie
bde6e3da6f
Fix geoclue build on Darwin
2017-04-07 00:45:54 +02:00
Michael Raskin
365e8a7b6a
quicklispPackages: update to fresh QuickLisp
...
lispPackages: reduce environment-bombing
2017-04-06 18:47:36 +02:00
Peter Hoeg
0af3de05ae
Merge pull request #24665 from peterhoeg/f/pmc
...
pmccabe: darwin is supported too
Fixes #24636 .
2017-04-06 17:11:38 +08:00
Peter Hoeg
ca0493ff63
pmccabe: darwin is supported too
2017-04-06 16:53:01 +08:00
Shea Levy
5e984362f6
haskell generic builder: Use ghcjs's hsc2hs.
...
This is required when using ghcjs to compile Setup.hs, which we do since #23614 .
See comments on c35350a212
2017-04-06 03:16:00 -04:00
Vladimír Čunát
10dc47e5e1
Merge #24558 : qt58: Fix path to qhelpgenerator
...
Fixes #24659 .
2017-04-06 00:47:58 +02:00
Vladimír Čunát
c6bc4cfdbc
Merge branch 'master' into staging
2017-04-06 00:16:59 +02:00
Daiderd Jordan
d42dccf029
pkgconfig: 0.29.1 -> 0.29.2
2017-04-06 00:08:04 +02:00
Markus Hauck
471626e6fb
scalafmt: 0.6.6 -> 0.6.7
...
Updates scalafmt to 0.6.7
2017-04-05 20:40:14 +02:00
Jörg Thalheim
052cd88921
Merge pull request #24625 from Mic92/networkmanager
...
networkmanager: 1.4.4 -> 1.6.4
2017-04-05 12:49:58 +02:00
Benno Fünfstück
26084166c3
Merge pull request #24646 from luke-clifton/accelerate-llvm
...
llvm-hs: Point llvm-hs to llvm_4
2017-04-05 11:42:00 +02:00
Luke Clifton
5ffece7de1
llvm-hs: Point llvm-hs to llvm_4
2017-04-05 16:51:45 +08:00
Peter Simons
bbbe24f469
Merge pull request #24530 from mulderr/master
...
oracle-instantclient: add optional odbc support
2017-04-05 10:24:49 +02:00
Peter Simons
4ad28de5a3
Merge pull request #24510 from woehr/master
...
ghcjs (head): Fix infinite recursion ...
2017-04-05 10:23:37 +02:00
Shea Levy
f038db24a6
nix-plugins: 2.0.6 -> 2.0.7.
...
Fixes warning on nix 1.12
2017-04-04 22:50:00 -04:00
Shea Levy
fe319f8ebd
nix-plugins: 2.0.3 -> 2.0.6.
...
Fixes incompatibility between build-time and link-time nix version
2017-04-04 22:35:35 -04:00
Shea Levy
3f023c8989
nix-plugins: 2.0.2 -> 2.0.3
...
Fixes darwin build
2017-04-04 15:11:42 -04:00
Jörg Thalheim
b04fb3ffcd
Merge pull request #24586 from maurer/bap
...
Add BAP to nixpkgs
2017-04-04 19:48:49 +02:00
Matthew Maurer
e010c25ba4
libbap: init at master-2017-02-08
2017-04-04 13:17:56 -04:00
Matthew Maurer
d022b4419c
bap-python: init at 1.1.0
2017-04-04 13:11:06 -04:00
Matthew Maurer
7171d16fd4
bap: init at 1.2.0
2017-04-04 13:11:01 -04:00
Shea Levy
9904019841
nix-plugins: Bump, unbreak
2017-04-04 11:29:40 -04:00
Jörg Thalheim
43c0530ca6
libproxy: fix compilation
...
also use webkit backend (webkitgtk is also a more common gnome/gtk)
Changelog: https://cgit.freedesktop.org/NetworkManager/NetworkManager/tree/NEWS?h=1.6.2
2017-04-04 17:00:40 +02:00
zimbatm
7fe25124bc
Merge pull request #24604 from NeQuissimus/ruby_updates
...
Ruby updates
2017-04-04 15:38:22 +01:00
Peter Simons
fa365c2b9d
haskell-language-nix: fix build with GHC 7.6.3
2017-04-04 16:29:12 +02:00
Peter Simons
046c5c57d0
haskell-binary: update 0.8.x branch to latest version
2017-04-04 16:29:12 +02:00
Peter Simons
b232d2f4e4
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.1.1 from Hackage revision
f68bd69837
.
2017-04-04 16:29:06 +02:00
Peter Simons
4f62f342f6
hackage2nix: disable Hydra builds for accelerate-* packages with unfree license
2017-04-04 16:29:04 +02:00
Peter Simons
e0160f70da
LTS Haskell 8.8
2017-04-04 16:29:04 +02:00
Dan Peebles
3a9c217804
rtags: fix for clang/libc++ 4
...
This also fixes a missing header in the SDK that rtags needs to work
properly. The underlying cause is that C++ headers got shuffled around a
lot in libc++ 3.8 (I believe) and became more standards-compliant, which
led to a lot of C-compatible passthrough header files being added to it
like math.h, which defines some C++-compatible versions of standard
functions like signbit, while #include_next'ing the system math.h. In
this case, including the SDK was stuffing another math.h in front of the
libc++ shim, which led to all sorts of mysterious failures.
2017-04-04 08:07:52 -04:00
Domen Kožar
f3dbaa7b57
Merge pull request #24595 from lukego/pharo-no-pic
...
pharo-vm: Disable "pic" hardening
2017-04-04 12:01:27 +02:00
Domen Kožar
94d1145ece
Merge pull request #24597 from lukego/pharo-launcher-test
...
pharo-launcher: Add test case & myself as maintainer
2017-04-04 08:08:48 +02:00
Tim Steinbach
3535a6bf3c
ruby: 2.0.0-p647 -> 2.0.0-p648
2017-04-03 15:40:26 -04:00
lprndn
f259fa6e91
Merge branch 'master' into lprndn_Nixpkgs
2017-04-03 21:37:11 +02:00
Tim Steinbach
ec2c469230
ruby: 2.2.5 -> 2.2.7
2017-04-03 15:33:26 -04:00
Tim Steinbach
482566939e
ruby: 2.3.3 -> 2.3.4
2017-04-03 15:28:38 -04:00
Tim Steinbach
bc45ee50c4
ruby: 2.4.0 -> 2.4.1
2017-04-03 15:23:18 -04:00
Nikolay Amiantov
ef4b73a038
libappindicator: propagate dependencies
2017-04-03 17:39:41 +03:00
Luke Gorrie
4736c19c65
pharo-launcher: Add test case & myself as maintainer
2017-04-03 14:26:33 +00:00
Luke Gorrie
c77a54d79f
pharo-vm: Disable "pic" hardening
...
Compiling the Pharo VM with "pic" hardening causes segmentation faults
on startup of pharo-launcher.
Resolves NixOS/nixpkgs#24541 .
2017-04-03 13:58:02 +00:00
Shea Levy
1feca4cae3
haskellPackages: Export haskellSrc2nix and hackage2nix
...
Allows using a different haskell package set to generate the nix
expressions (during eval time) than the one used to actually build the
package (at build time).
2017-04-03 08:13:07 -04:00
Vladimír Čunát
969849acf8
mesa: maintenance 17.0.2 -> 17.0.3
2017-04-03 11:24:50 +02:00
David McFarland
2c006ca805
Revert "openssl: add custom build of 1.0.2 for steam"
...
No longer necessary. See https://github.com/NixOS/nixpkgs/pull/23034#issuecomment-291005754
This reverts commit a50784b34e
.
2017-04-03 09:04:44 +02:00
Eelco Dolstra
747ad4befd
mlt: Remove some -dev paths from the closure
...
This reduces the closure size of mlt-qt5 from 683 to 278 MiB.
2017-04-02 21:51:46 +02:00
Eelco Dolstra
6d4e6102a7
libgsf: Use separate dev output
2017-04-02 21:51:46 +02:00
Ambroz Bizjak
195efedd2c
qt58: Fix path to qhelpgenerator in cmake file.
...
It is located in the dev output, fix it as for qcollectiongenerator.
This fixes a build error in KDevelop.
2017-04-02 11:21:34 +02:00
Orivej Desh
8f9b219107
kwallet: support GPG-encrypted wallets
2017-04-01 23:42:30 +00:00
Michael Weiss
40d171855f
gpgme: 1.8.0 -> 1.9.0
...
For the license change see:
- https://directory.fsf.org/wiki/GPGME#tab=Details
- AUTHORS [0]
See #24491 for the other changes.
[0]: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=blob;f=AUTHORS;h=bbf1576ad27dc51956c371282862b468c633ea49;hb=HEAD
2017-04-02 01:26:22 +02:00