Tuomas Tynkkynen
e08599567a
frame: Fix 'lib.optional' use
...
Produces a list-of-lists in buildInputs
2016-08-30 23:00:13 +03:00
Tuomas Tynkkynen
d2ef0577c5
grail: Fix 'lib.optional' use
...
Produces a list-of-lists as buildInputs.
2016-08-30 23:00:13 +03:00
Frederik Rietdijk
0478682f09
libsndfile: 1.0.26 -> 1.0.27
2016-08-30 18:53:31 +02:00
Tuomas Tynkkynen
7259f80577
libre: Use 'dev' output of libc
2016-08-30 16:30:24 +03:00
Tuomas Tynkkynen
73f1ade407
glibc_multi: Reference dev outputs of glibc
2016-08-30 15:18:51 +03:00
Tuomas Tynkkynen
d3dc3d4130
Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging
...
https://github.com/NixOS/nixpkgs/pull/14766
2016-08-30 12:43:37 +03:00
Tuomas Tynkkynen
d75596995e
swt: Fix LFLAGS
...
Passing '-I${foo}/lib' to GCC doesn't seem sane.
2016-08-30 03:47:50 +03:00
Tuomas Tynkkynen
aef35c52f0
treewide: Fix output references to libX11
2016-08-30 03:40:23 +03:00
Vladimír Čunát
4f73633f26
treewide: stop using fontbhttf
2016-08-29 22:28:50 +02:00
Ram Kromberg
3bfb354145
libsoup's vala: 0.23 -> 0.26
...
Close #17904 .
2016-08-29 18:45:55 +02:00
Tuomas Tynkkynen
69e51ebf55
kde-frameworks: Use chooseDevOutputs
2016-08-29 14:49:54 +03:00
Tuomas Tynkkynen
2f50cfe25f
qt5: Shuffle outputs
...
Unnoticed by the scripts.
2016-08-29 14:49:53 +03:00
Tuomas Tynkkynen
040fadf345
glibc_multi: Fix unnoticed output shuffle
2016-08-29 14:49:53 +03:00
Tuomas Tynkkynen
7c1607ae65
webkitgtk: Few last missing 'dev' references
2016-08-29 14:49:53 +03:00
Tuomas Tynkkynen
fd4b3dcccb
gmp{4,5}: Split into multiple outputs
...
Keep all versions consistent so that e.g. 'gmp.dev' is always available,
regardless of version.
2016-08-29 14:49:52 +03:00
Tuomas Tynkkynen
e065baafba
glibc: Make one exception for output order
...
Usages like '${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2' are much more
common than the bin output.
2016-08-29 14:49:52 +03:00
Tuomas Tynkkynen
a17216af4c
treewide: Shuffle outputs
...
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
obadz
b74793bd1c
Merge branch 'master' into staging
...
Conflicts:
pkgs/tools/system/facter/default.nix
2016-08-29 12:44:17 +01:00
Robin Gloster
f3c994ca11
rhino: disable format/fortify hardening
2016-08-29 09:08:03 +00:00
Frederik Rietdijk
5da0b34591
liborc: init at 0.4.16
2016-08-29 10:35:21 +02:00
Robin Gloster
beff32f61e
ucommon: disable flaky networking test
2016-08-29 01:31:47 +00:00
Robin Gloster
4076f4d376
Merge pull request #18074 from womfoo/bump/facter-and-deps
...
facter: 3.1.8 -> 3.4.1 and add/update related dependencies
2016-08-29 01:22:28 +00:00
Kranium Gikos Mendoza
4eb021baff
leatherman: 0.7.5 -> 0.9.0
2016-08-29 08:56:06 +08:00
Kranium Gikos Mendoza
1bac115b05
cpp-hocon: init at 0.1.2
2016-08-29 08:55:40 +08:00
Robin Gloster
e17bc25943
Merge remote-tracking branch 'upstream/master' into staging
2016-08-29 00:24:47 +00:00
Tuomas Tynkkynen
d1c7eb8098
glibc: Uncomment 'meta.platforms'
2016-08-28 18:04:09 +03:00
obadz
92d929c884
Merge branch 'master' into staging
2016-08-28 14:48:02 +01:00
Thomas Tuegel
43bf5d2c30
Merge pull request #18052 from loskutov/master
...
Qt5: Enable Wayland support
2016-08-28 07:38:23 -05:00
Thomas Tuegel
b8a83d901f
qt5: use absolute paths to plugins in CMake
...
This reverts commit 17f9b21c09
.
This is a partial unrevert. Qt 5.6 and Qt 5.7 remain building and
working. Qt 5.5 stays building but broken.
2016-08-28 07:33:42 -05:00
obadz
57ddc155fc
Merge branch 'master' into staging
...
Conflicts:
pkgs/games/scummvm/default.nix
2016-08-28 12:20:59 +01:00
Moritz Ulrich
17f9b21c09
Revert "qt5: use absolute paths to plugins in CMake"
...
This reverts commit 7a9e04943d
.
The commit in question breaks the patches to qtbase, causing the build to fail. An issue to track this feature will follow.
2016-08-28 12:29:20 +02:00
Gabriel Ebner
497b3cabcc
libqalculate, qalculate-gtk: 0.9.8 -> 0.9.9
2016-08-28 10:40:33 +02:00
Ignat Loskutov
cc83045026
Qt5: Enable Wayland support
2016-08-28 00:57:43 -04:00
obadz
ed01e0ca4f
openssl: fix merge conflict between b6dabe3
and 6e7ca92
2016-08-28 03:53:13 +01:00
obadz
3de6e5be50
Merge branch 'master' into staging
...
Conflicts:
pkgs/applications/misc/navit/default.nix
pkgs/applications/networking/mailreaders/alpine/default.nix
pkgs/applications/networking/mailreaders/realpine/default.nix
pkgs/development/compilers/ghc/head.nix
pkgs/development/libraries/openssl/default.nix
pkgs/games/liquidwar/default.nix
pkgs/games/spring/springlobby.nix
pkgs/os-specific/linux/kernel/perf.nix
pkgs/servers/sip/freeswitch/default.nix
pkgs/tools/archivers/cromfs/default.nix
pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Nikolay Amiantov
9fa012dee5
SDL_ttf: don't link itself to /include
2016-08-28 01:04:18 +03:00
Thomas Tuegel
7a9e04943d
qt5: use absolute paths to plugins in CMake
...
CMake needs absolute paths to plugin shared objects in case one package
provides a plugin for a different package.
2016-08-27 12:24:54 -05:00
Rok Garbas
1102352a79
Merge pull request #17906 from garbas/neovim-0.1.5-update
...
neovim: 0.1.4 -> 0.1.5 (and related dependencies)
2016-08-27 17:44:34 +02:00
Vladimír Čunát
069120110d
Merge #18013 : gnumeric: 1.12.26 -> 1.12.32
...
It seems fine on Linux, except for gtk3 theming problems but that looks
the same as before the update.
2016-08-27 17:18:05 +02:00
Michael Raskin
f3a86cf599
loadcaffe: init at 0.0pre2016.08.01
2016-08-27 15:41:58 +02:00
Michael Raskin
2e0c1c3758
torch: find libjpeg and libpng, use compatible openblas
2016-08-27 15:41:58 +02:00
Robin Gloster
e646d2c07c
gnome3.gtk: fix build on darwin
...
The .la file does not exist on darwin.
2016-08-27 08:00:20 +00:00
Thomas Tuegel
3a98be5e19
poppler: 0.46.0 -> 0.47.0
2016-08-26 12:43:22 -05:00
Franz Pletz
1585e0f09b
sqlite: 3.13.0 -> 3.14.1
2016-08-26 17:08:04 +02:00
Vincent Laporte
3a710c068f
gnumeric: 1.12.26 -> 1.12.32
...
goffice: 0.10.26 -> 0.10.32
2016-08-26 13:36:58 +02:00
Zero King
f7823dde4f
ffmpeg: 3.1.1 -> 3.1.2
2016-08-26 09:05:43 +00:00
Robin Gloster
b6dabe3df0
openssl_1_1_0: init at 1.1.0
2016-08-26 07:39:18 +00:00
Graham Christensen
355cc31229
Merge pull request #17962 from vbgl/inkscape-darwin
...
inkscape: fix on darwin (fixes #15768 )
2016-08-25 18:14:42 -04:00
Vladimír Čunát
801692c3dd
Merge #17928 : openssl: fix CVE-2016-2177
2016-08-25 22:22:00 +02:00
Bjørn Forsman
fbf9162cbb
treewide: cups_filters -> cups-filters
2016-08-25 17:48:35 +02:00