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
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
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
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
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
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: 5bb0a1b20f
- LTS Haskell: a5a99cf176
- Stackage Nightly: 3664752ea8
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
Sander van der Burg
c3ffae4777
nodejs: implement a darwin-specific fix that properly refers to tr1/type_traits
2016-07-14 12:57:17 +00:00
Vladimír Čunát
1b5ac05845
Merge branch 'staging'
...
Includes security fixes in gd and libarchive.
2016-07-14 15:51:28 +02:00
Gabriel Ebner
40d5284cc2
rustfmt: add meta.platforms
2016-07-14 12:10:09 +02:00
Gabriel Ebner
457a428813
rustracer: add meta.platforms
2016-07-14 12:10:09 +02:00
Mathias Schreck
8e4248a95d
galen: 2.2.4 -> 2.3.0
2016-07-14 10:52:13 +02:00
Gabriel Ebner
6c7d179509
tokei: add meta.platforms
2016-07-14 10:21:46 +02:00
Gabriel Ebner
aab727fd77
tokei: init at 3.0.0
2016-07-14 10:19:20 +02:00
Andrew Kelley
37fc141da3
glfw: 3.1.2 -> 3.2
2016-07-13 17:47:20 -07:00
Moritz Ulrich
c1bcfd7405
Merge pull request #16920 from the-kenny/rust-1.10.0
...
rust: 1.9.0 -> 1.10.0
2016-07-13 23:56:55 +02:00
Vladimír Čunát
19a4935c55
gnutls: fix up yet again
...
Noticed on: https://github.com/NixOS/nixpkgs/commit/7d94f57309a4#commitcomment-18221038
Hopefully OK finally, evaluation tested on x86_64-{linux,darwin}.
Apparently I'm trying to contribute in situations I'd better be relaxing
already.
2016-07-13 22:39:30 +02:00
Moritz Ulrich
8c45378cde
rustc: 1.9.0 -> 1.10.0, cargo: 0.10.0 -> 0.11.0
2016-07-13 20:08:05 +02:00
Alexey Lebedeff
54a15fb2e4
erlang: 18.3 -> 18.3.4 ( #16244 )
...
Minor OTP releases (and their manpages) are not available for dowload at
http://erlang.org/download
But e.g.:
- 18.3.1 contains an important fix for mnesia
- 18.3.1-18.3.4 has a lot of SSL/TLS fixes
So we have to fetch from GitHub and build everything ourselves.
Also replace explicit path patching with upstream patches:
- https://github.com/erlang/otp/pull/1023
- https://github.com/erlang/otp/pull/1103 - with this patch it's now
possible to build erlang in sandboxed mode
2016-07-13 19:41:55 +02:00
Vladimír Čunát
f56a319e3e
ncurses: revert to 5.9 on Darwin (only)
...
I don't want to investigate why it won't compile.
http://hydra.nixos.org/build/37537876/nixlog/1/raw
2016-07-12 22:00:11 +02:00
Vladimír Čunát
40785f0dac
Merge branch 'master' into staging
...
Hydra nixpkgs: ?compare=1282763
2016-07-12 22:00:10 +02:00