Commit Graph
37780 Commits
Author SHA1 Message Date
Thomas Tuegel 6dc6ae0ebe qt55.qtlocation: don't try to wrap missing module 2016-07-17 06:58:15 -05:00
Vladimír Čunát bf6759839a Merge #17023: bring back ncurses5 to fix GHC bootstrapping 2016-07-17 13:41:19 +02:00
Joachim Fasting ce103cae38 cppcheck: 1.73 -> 1.74 2016-07-17 11:52:13 +02:00
Vladimír Čunát 15cd7af522 Merge #16968: fltk: darwin compatibility 2016-07-17 10:43:50 +02:00
Vladimír Čunát 33476f3303 Merge #17014: qt3: fix build with multiple outputs 2016-07-17 10:36:26 +02:00
Kovacsics Robert (NixOS) f4c34a8345 tclx: init at 8.4.1 2016-07-16 21:49:58 +01:00
Tuomas Tynkkynen 8ee0e105c9 ghc: Make various binary GHCs use ncurses5
Fixes #17008: GHC bootstrapping broken by ncurses update.
2016-07-16 23:47:28 +03:00
Tuomas Tynkkynen b0cc1cd729 ncurses: Add explicit 'ncurses5' and 'ncurses6' attrs
Also reinstate the gcc5 patch to make it build on Linux.
2016-07-16 23:47:28 +03:00
Thomas Tuegel 343415e02e qt55.qtbase: fix setup hook and QMake hook 2016-07-16 15:02:19 -05:00
Frederik Rietdijk 097d75d502 Merge pull request #17005 from rzetterberg/libui
libui: init at 3.1a
2016-07-16 18:23:22 +02:00
Kranium Gikos Mendoza 5d8005b1ef qt3: fix build after multiple-outputs change
also updated source tarball path
2016-07-16 23:39:03 +08:00
Thomas Tuegel 78e7f44488 qt5.makeQtWrapper: do not inherit Qt search paths 2016-07-16 10:14:50 -05:00
Thomas Tuegel 766ea7c4ca qt55.qtbase: update setup hook 2016-07-16 10:14:45 -05:00
Thomas Tuegel d19dc420d2 qt56.qtbase: don't use propagatedUserEnvPkgs
Fixes #15498.
2016-07-16 10:14:44 -05:00
Peter Simons 3bfe30a042 haskell: update our Hackage database to the latest version 2016-07-16 13:34:06 +02:00
Joachim F ed50ef318b Merge pull request #15848 from matthewbauer/packagekit
Add in PackageKit
2016-07-16 13:29:08 +02:00
Frederik Rietdijk fe17c7a002 Merge pull request #16643 from devhell/mediainfo
{lib}mediainfo{-gui}: 0.7.86 -> 0.7.87
2016-07-16 12:55:54 +02:00
Frederik Rietdijk e60d5a72e3 Merge pull request #17000 from womfoo/fix/guile-sdl
guile-sdl: fix after multiple-outputs change
2016-07-16 12:48:07 +02:00
Nikolay Amiantov d936272b79 Merge branch 'master' into staging 2016-07-16 13:36:27 +03:00
Lancelot SIX b360982b50 libgpg-error: 1.23 -> 1.24 2016-07-16 11:53:50 +02:00
Lancelot SIX 02949b4880 libassuan: 2.4.2 -> 2.4.3 2016-07-16 11:53:50 +02:00
Lancelot SIX d75c43e15c libgcrypt: 1.7.1 -> 1.7.2
See http://lists.gnu.org/archive/html/info-gnu/2016-07/msg00006.html
for release announcement
2016-07-16 11:53:50 +02:00
Richard Zetterberg 6c0cfd3be3 libui: init at 3.1a 2016-07-16 11:06:21 +02:00
Gabriel Ebner f63ead3e5d Merge pull request #16977 from markus1189/scalafmt
scalafmt: 0.2.5 -> 0.2.11
2016-07-16 07:57:19 +02:00
Kranium Gikos Mendoza 1c7cb20fb1 guile-sdl: fix after multiple-outputs change 2016-07-16 12:06:51 +08:00
Alexey Shmalko 3172c2a455 path64: remove
The project seem to be inactive since 2010 (http://www.path64.org/). The
repository is also unavailable now.

Found at https://github.com/NixOS/nixpkgs/issues/15558.
2016-07-16 03:16:44 +03:00
Thomas Tuegel bc685f8a7c Merge pull request #16993 from acowley/octave-darwin
octave: add arpack, libwebp, and darwin compat
2016-07-15 18:18:22 -05:00
Rok Garbas 4ea1b3824a elm-format: disable tests (one failing), reported upstream 2016-07-16 00:39:55 +02:00
Rok Garbas 0362eaf3ec elm-format: 0.3.1 -> 0.4.0 2016-07-16 00:36:28 +02:00
Rok Garbas bed7aba2f0 elm: 0.17 -> 0.17.1 2016-07-16 00:11:41 +02:00
Anthony Cowley 73ec6bea2c octave: add arpack, libwebp, and darwin compat
This follows on from PR #16965 for qrupdate and PR #16968 for fltk.

WIth these, the added explicit dependencies on arpack (to support
the octave `eigs` function) and `libwebp`, and not pulling X11 things,
octave works properly on darwin.
2016-07-15 17:17:35 -04:00
obadz cfc0a5415b Revert "fontconfig: fix etc priority"
This reverts commit 1e53d4a777.

Closes #16983

cc @vcunat @ericsagnes @dezgeg
2016-07-15 20:44:21 +02:00
Peter Simons 1b0e82d6ff Merge pull request #16974 from khumba/hoppy+qtah-maintainer
hoppy, qtah: add myself as maintainer
2016-07-15 20:27:22 +02:00
Bjørn Forsman 8c2d888401 jenkins: move $out/{lib => webapps}/jenkins.war
As pointed out by @danbst, the tomcat NixOS module expects packages
listed in services.tomcat.webapps to either be direct .war file paths or
have .war files inside a "webapps" directory.

Commit 4075c10a59
("jenkins: move .war file from $out to $out/lib/jenkins.war") broke
jenkins + tomcat. Fix it by moving jenkins.war to $out/webapps/.
2016-07-15 17:18:44 +02:00
Robin Gloster 6539901c7f Merge remote-tracking branch 'upstream/hardened-stdenv' into hardened-stdenv 2016-07-15 15:02:16 +00:00
Robin Gloster 5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Peter Simons 9fc0347c93 Merge pull request #16262 from basvandijk/fix-inline-c-cpp-darwin
inline-c-cpp: fix build on darwin
2016-07-15 16:21:46 +02:00
Bjørn Forsman 4075c10a59 jenkins: move .war file from $out to $out/lib/jenkins.war
Fixes #14137, also known as:

  $ nix-shell -p jenkins
  bash: source: /nix/store/ln1yw6c2v8bb2cjqfr1z5aqcssw054wa-jenkins-2.3:
  cannot execute binary file
  [nix-shell exited with error]

The problem is that jenkins.war is not installed inside the directory
$out, but rather _as the file_ $out. Fix it by moving the file to
$out/lib/jenkins.war.

While at it, move buildCommand so that the "meta" section is at the end
of the expression (standard style), and quote shell variables.
2016-07-15 15:12:52 +02:00
Christian Richter a4c965ef1b webkitgtk24x: 2.4.9 -> 2.4.11 2016-07-15 14:15:13 +02:00
Alexei Robyn c30d4e07c5 libvirt: revert to full systemd dependency
Fixes issue with virt-manager failing to list 'USB Host Devices' and
'PCI Host Devices' with the error "Connection does not support host
device enumeration".
2016-07-15 12:47:26 +02:00
Markus Hauck 3d4a32835e scalafmt: 0.2.5 -> 0.2.11 2016-07-15 10:44:04 +02:00
John Ericson bed2a14afa makeRustPlatform: Remove self argument 2016-07-15 10:13:21 +02:00
Bryan Gardiner 5e685121e4 hoppy, qtah: add myself as maintainer 2016-07-14 23:07:53 -07:00
Anthony Cowley fbf41c6c7f fltk: darwin compatibility 2016-07-14 16:14:09 -04:00
Peter Simons 6af0f57f91 haskell-binary: update to latest version 2016-07-14 22:13:48 +02:00
Peter Simons d477991c48 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v2.0-4-gb156b94 using the following inputs:

  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/5bb0a1b20f0c9cc20c5e0c9c33deac5e855bb316
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/a5a99cf17698741e56c8efdf50989692c2e363e0
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/3664752ea8eaaca08dcc932bfcfaf3a3e20eddc4
2016-07-14 22:13:09 +02:00
Arseniy Seroka c1a600e8df Merge pull request #16936 from andrewrk/glfw
glfw: 3.1.2 -> 3.2
2016-07-14 22:20:41 +04:00
Arseniy Seroka 5a9a71fb2c Merge pull request #16957 from holidaycheck/galen-2.3.0
galen: 2.2.4 -> 2.3.0
2016-07-14 22:19:58 +04:00
Arseniy Seroka aa138041f7 Merge pull request #16960 from womfoo/bump/urweb-20160621
urweb: 20151220 -> 20160621
2016-07-14 22:19:12 +04:00
Kranium Gikos Mendoza 2c169f83e7 urweb: 20151220 -> 20160621 2016-07-14 23:14:15 +08:00