1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 01:20:40 +00:00
Commit graph

87676 commits

Author SHA1 Message Date
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
Joachim F a5302f3c79 Merge pull request #17313 from vrthra/kakoune
kakoune: init at 2016-07-26
2016-07-30 19:31:11 +02:00
Gabriel Ebner 1e43d54695 Merge pull request #17378 from gebner/xorg-glamor
xorg: switch to current glamor driver
2016-07-30 17:10:51 +02:00
Gabriel Ebner 07fc65289a nixos/x11: remove unneccessary special cases 2016-07-30 17:03:16 +02:00
Thomas Tuegel 6ff942aea4 Merge pull request #17380 from ttuegel/ecm-hooks
kde5: fix extra-cmake-modules hooks
2016-07-30 09:56:35 -05:00
Thomas Tuegel b390eb39ae kde5: fix extra-cmake-modules hooks 2016-07-30 09:36:52 -05:00
Ram Kromberg 78d82f33ac alliance: 5.0 -> 5.1.1 (#17353) 2016-07-30 15:35:51 +01:00
Joachim F 29739ece1f Merge pull request #17376 from mimadrid/update/meld-3.16.2
meld: 3.16.1 -> 3.16.2
2016-07-30 14:00:29 +02:00
Gabriel Ebner 5c9309c231 xorg.xorgserver: enable glamor support 2016-07-30 13:37:51 +02: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
Joachim F 5915716f13 Merge pull request #17373 from peterhoeg/st_0143
syncthing: 0.14.2 -> 0.14.3
2016-07-30 12:26:30 +02:00
Joachim F 9b4bd61b20 Merge pull request #17377 from magnetophon/faust
faust: remove double quotes around NIX_CFLAGS_COMPILE and NIX_LDFLAGS
2016-07-30 12:14:58 +02:00
Bart Brouns dc6ec6a4c8 faust: remove double quotes around NIX_CFLAGS_COMPILE and NIX_LDFLAGS
fixes https://travis-ci.org/NixOS/nixpkgs/jobs/147556297#L2705
2016-07-30 11:21:02 +02:00
mimadrid 83251cdd60
meld: 3.16.1 -> 3.16.2 2016-07-30 11:06:22 +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
Peter Hoeg 10deae8a57 syncthing: 0.14.2 -> 0.14.3 2016-07-30 11:32:43 +08:00
Thomas Tuegel 40b838b94d kde5: fix all the Qt version dependencies 2016-07-29 21:13:00 -05:00
Thomas Tuegel 0925700688 okular: avoid accidental Qt 5 dependency 2016-07-29 20:00:07 -05:00
Dmitry Kalinkin 4449ecb617 root: 6.04.16 -> 6.04.18 (#17265)
root: compile against external gsl

Revert "Revert "root: enable parallel building""

This reverts commit ee1a10ee6b.

ROOT has no problems with parallel build. The problems that caused the
original commit were not related to parallel building.
2016-07-30 01:41:37 +01:00
Tristan Helmich ad470d59fd emby: 3.0.6000 -> 3.0.6020 (#17368) 2016-07-30 01:39:09 +01:00
Kranium Gikos Mendoza c9e5ddde0a monero: 0.8.8.4 -> 0.9.4 (#17371) 2016-07-30 01:37:49 +01:00
Jinjing Wang c8f535b452 shadowsocks-libev: 2.4.7 -> 2.4.8 (#17366) 2016-07-30 01:20:56 +01:00
Miguel Madrid aa2629cedf unrar: 5.4.2 -> 5.4.4 (#17361) 2016-07-30 01:19:45 +01: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
Thomas Tuegel 02e9e67fd4 Merge pull request #17370 from cleverca22/master
qt56: purge all refrences to gtk, solves all of the theme problems
2016-07-29 17:08:39 -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 06536879e7 kde5.plasma: 5.7.1 -> 5.7.2 2016-07-29 13:52:17 -05:00
Thomas Tuegel 9ac568fc92 breeze-qt4: avoid accidental Qt 5 dependency 2016-07-29 13:52:17 -05:00
Frederik Rietdijk 4ab5728ec9 pythonPackages.datashape: 0.5.1 -> 0.5.2 2016-07-29 20:02:44 +02:00
Frederik Rietdijk 06f6c1426b pythonPackages.pystache: disable tests on Python 3 2016-07-29 19:48:11 +02:00
Frederik Rietdijk 3673454e53 pythonPackages.bokeh: 0.10.0 -> 0.12.1 2016-07-29 19:48:11 +02:00
Frederik Rietdijk 5e663301d4 pythonPackages.tornado: 4.2.1 -> 4.4.1 2016-07-29 19:48:11 +02:00
Frederik Rietdijk 7cdd900cb7 pythonPackages.certifi: 2015.11.20.1 -> 2016.2.28 2016-07-29 19:48:11 +02:00
Frederik Rietdijk 250d78ca23 pythonPackages.awscli: use colorama_3_3 2016-07-29 19:48:11 +02:00
Frederik Rietdijk bf06024b9f pythonPackages.colorama: 0.3.3 -> 0.3.7 2016-07-29 19:48:11 +02:00
Frederik Rietdijk 778712e0a7 pythonPackages.colorama_3_3: init at 0.3.3 2016-07-29 19:48:11 +02:00
Frederik Rietdijk 0868a918a3 pythonPackages.backports_abc: init at 0.4 2016-07-29 19:48:11 +02:00
Frederik Rietdijk 67b8bd0b20 pythonPackages.numba: 0.26.0 -> 0.27.0 2016-07-29 19:48:11 +02:00
Frederik Rietdijk 3979648fb1 pythonPackages.llvmlite: 0.11.0 -> 0.12.1 2016-07-29 19:48:11 +02:00
Frederik Rietdijk 60503897af pythonPackages.cython: 0.24 -> 0.24.1 2016-07-29 19:02:18 +02:00
Thomas Tuegel b26fbfd85f kdelibs: fix typo 2016-07-29 11:41:31 -05:00
Thomas Tuegel 1d575e4ba8 kdelibs: avoid accidental Qt 5 dependency 2016-07-29 11:29:23 -05:00
Thomas Tuegel 2f32588a8f phonon: explicitly select Qt 4 vs. Qt 5 2016-07-29 10:29:41 -05:00
Thomas Tuegel 3dea00d90e nixos/kde: phonon moved to qt5 2016-07-29 10:29:15 -05:00
Thomas Tuegel 2056f56f77 fcitx: drop patches, use extra-cmake-modules directly
Fixes #17252. (Really, this time.)

Now that extra-cmake-modules does not depend on Qt 5, it is possible to
depend on it directly.
2016-07-29 10:23:27 -05:00