Frederik Rietdijk
909249dbe2
Merge pull request #17422 from womfoo/fix/leatherman-disable-curl-test
...
leatherman: disable curl test to fix build
2016-08-01 17:00:55 +02:00
Frederik Rietdijk
c74ad2ee23
Merge pull request #17339 from FRidh/rename
...
Python: move interpreters
2016-08-01 15:08:20 +02:00
Kranium Gikos Mendoza
7f3ca5d75b
leatherman: disable curl test to fix build
2016-08-01 19:20:45 +08:00
Thomas Tuegel
ac98cc4d94
Merge pull request #17402 from ttuegel/plasma-closure-size
...
Plasma closure size
2016-07-31 10:29:07 -05:00
obadz
0d259f841b
aws-sdk-cpp: add compile flag -fpermissive due to libcurl upgrade
...
curl upgrade to 7.50.0 (#17152 ) changes the libcurl headers slightly and
therefore requires the followin flag until this package gets updated
2016-07-31 15:03:50 +01:00
Thomas Tuegel
ab58794838
kdeWrapper: assume empty path list by default
2016-07-30 17:25:29 -05:00
Thomas Tuegel
f7d98785d5
breeze-icons: don't propagate qtsvg build input
...
breeze-icons does not have a separate dev output, so this pulls
qtsvg.dev into the closure.
2016-07-30 17:22:04 -05:00
Thomas Tuegel
d1d38f2888
kdeWrapper: include wrappers in path
2016-07-30 17:07:19 -05:00
Thomas Tuegel
22bc6f01cf
kdeEnv: use package version, not ecm version
2016-07-30 17:07:06 -05:00
Thomas Tuegel
aaf612e833
kdeDerivation: don't fail by default on library-only packages
2016-07-30 16:26:05 -05:00
Thomas Tuegel
c122f791c9
Add kdeEnv and kdeWrapper
2016-07-30 16:16:36 -05:00
Thomas Tuegel
e362442562
kde5: avoid propagating dev outputs to reduce closure size
2016-07-30 14:16:46 -05:00
Thomas Tuegel
d5bec1a145
kde5: rename extra-cmake-modules variants
...
Instead of one package `extra-cmake-modules`, there is now `ecm` and
`ecmNoHooks`. The latter is used when one does not want to incur a Qt 5
dependency; it is also available as a top-level package
`extra-cmake-modules`.
2016-07-30 14:06:43 -05:00
Thomas Tuegel
b390eb39ae
kde5: fix extra-cmake-modules hooks
2016-07-30 09:36:52 -05:00
Peter Simons
aa69c4a5df
hackage-packages.nix: update Haskell package set
...
This update was generated by hackage2nix v2.0-18-g8001337 using the following inputs:
- Hackage: 0be8ef7fab
- LTS Haskell: d085132b77
- Stackage Nightly: 84fc6fbee7
2016-07-30 13:34:53 +02:00
Peter Simons
008e8258c0
Merge pull request #17367 from Profpatsch/haskellPackages-cereal-override
...
haskellPackages.cereal: fix for pre-GHC8
2016-07-30 13:32:54 +02:00
Profpatsch
4741e9e051
haskellPackages.Glob: remove superfluous override
...
The override is already in the 7.10.x file, and we’d like to explicitely
override for every version that needs it.
2016-07-30 12:45:23 +02:00
Profpatsch
95528bfdcb
haskellPackages.cereal: fix for pre-GHC 8.0
2016-07-30 12:44:57 +02:00
Vladimír Čunát
46134cbca5
gnutls-3.3: make it build again
...
At least without tests. We only have two packages using it ATM.
2016-07-30 12:30:23 +02:00
Vladimír Čunát
dfa2f8040e
Merge #17354 : tcl/tk: 8.6.4 -> 8.6.6
2016-07-30 08:32:47 +02:00
Thomas Tuegel
40b838b94d
kde5: fix all the Qt version dependencies
2016-07-29 21:13:00 -05:00
Thomas Tuegel
307847e6fa
Merge pull request #17369 from ttuegel/qt-5.7
...
qt57: init at 5.7.0
2016-07-29 18:12:38 -05:00
Thomas Tuegel
839a543d41
qt57: init at 5.7.0
2016-07-29 17:46:13 -05:00
michael bishop
dd3e27f2e7
qt56: purge all refrences to gtk, solves all of the theme problems
2016-07-29 18:50:06 -03:00
Thomas Tuegel
2f32588a8f
phonon: explicitly select Qt 4 vs. Qt 5
2016-07-29 10:29:41 -05:00
Thomas Tuegel
6c79045964
extra-cmake-modules: separate setup hook from package
2016-07-29 10:23:18 -05:00
Frederik Rietdijk
6628c55986
pythonPackages.scipy: 0.17.1 -> 0.18.0
2016-07-29 17:22:20 +02:00
Ricardo M. Correia
24d1d19bd2
menhir: 20160303 -> 20160526 ( #17343 )
2016-07-29 11:30:42 +02:00
Thomas Tuegel
173d668456
Merge branch 'kde-frameworks-qt55'
2016-07-28 19:14:37 -05:00
Thomas Tuegel
4856a2a1ea
build KDE Frameworks with each Qt version
2016-07-28 18:27:13 -05:00
Thomas Tuegel
add332c424
qt55: fix CMake module paths
2016-07-28 18:26:54 -05:00
Rahul Gopinath
0ba631d5bb
tcl/tk: 8.6.4 -> 8.6.6
2016-07-28 16:19:08 -07:00
Vladimír Čunát
3a402e248f
Merge branch 'staging'
...
It includes a security update of libidn.
2016-07-28 20:36:17 +02:00
Frederik Rietdijk
1da6775775
Python: move interpreters
...
Move Python interpreters (CPython, PyPy) to same folder and share
layout.
2016-07-28 17:10:15 +02:00
Franz Pletz
63784b8021
php: 5.5.37 -> 5.5.38, 5.6.23 -> 5.6.24 (security)
...
https://secure.php.net/ChangeLog-5.php#5.5.38
https://secure.php.net/ChangeLog-5.php#5.6.24
2016-07-28 06:22:23 +02:00
Jun Hao
5bf4a9ff73
webkitgtk24x: fix libwebp missing library path, add libobjc as dependency on OSX ( #17198 )
2016-07-28 04:45:54 +02:00
Franz Pletz
996c9837fa
Merge pull request #17322 from RamKromberg/init/motif
...
motif: init at 2.3.6 & nedit: 5.6 -> 5.6a
2016-07-28 03:53:38 +02:00
Franz Pletz
ecb4fb0046
ddd: use motif instead of lesstif
...
See #17322 .
2016-07-28 03:52:14 +02:00
Profpatsch
632411c2b6
openjdk7: replace vulnerable cups version ( #17214 )
...
Fixes #7407 .
Also uses the nixpkgs version of cups, not a static one that is never
maintained.
2016-07-28 03:23:21 +02:00
Michele Guerini Rocco
2ef1c6bbbb
libmatroska: 1.4.4 -> 1.4.5 ( #17310 )
2016-07-28 01:08:54 +02:00
Ram Kromberg
3800bb5017
motif: init at 2.3.6
2016-07-28 01:33:45 +03:00
mimadrid
7bed99a34b
libfilezilla: 0.5.3 -> 0.6.1
2016-07-27 22:48:43 +02:00
Ryan Trinkle
92d21f1115
Merge pull request #17314 from ryantrinkle/ghcjs-cabal-3494
...
ghcjs: work around haskell/cabal#3494
2016-07-27 16:35:39 -04:00
Peter Simons
48829c7828
Merge pull request #17312 from ryantrinkle/ghcjs-separate-stage1-list
...
ghcjs: move list of stage 1 packages into ghcjs derivation
2016-07-27 21:15:12 +02:00
Ryan Trinkle
bf6fdae0f2
ghcjs: work around haskell/cabal#3494
...
See also NixOS/nixpkgs#16144
2016-07-27 14:34:12 -04:00
Ryan Trinkle
5a622db103
ghcjs: move list of stage 1 packages into ghcjs derivation
...
This makes it easier to ensure that the list of stage 1 packages accurately matches the given version of ghcjs, and makes it possible for this list to be overridden
2016-07-27 14:28:31 -04:00
Peter Simons
68de205c5b
hackage-packages.nix: update Haskell package set
...
This update was generated by hackage2nix v2.0-18-g8001337 using the following inputs:
- Hackage: 690eda62e2
- LTS Haskell: d085132b77
- Stackage Nightly: 494d6bf80b
2016-07-27 20:04:41 +02:00
Peter Simons
63ea36c49d
Merge pull request #17309 from ryantrinkle/ghcjs-holdbacks-for-ghc-7.10
...
ghcjs: fix build
2016-07-27 19:56:38 +02:00
Rok Garbas
cd1dadf860
Merge pull request #17242 from rasendubi/mips-linux
...
Fixes for mips-linux
2016-07-27 19:01:11 +02:00
Nathan Moore
251a1ccf55
solarus-quest-editor: init at 1.4.5 ( #17286 )
2016-07-27 18:49:02 +02:00