public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
90,858 Commits 1 Branch 0 Tags
Commit Graph

20090 Commits

Author SHA1 Message Date
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 17f9b21c09aeed162ac8da5be6edab3a311d5556.

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 7a9e04943dc82294037ec03e6eadf23d2933f821.

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
Thomas Tuegel
f4bb247bd6
fetch-kde-qt.sh: modularize script allowing multiple versions 2016-08-25 10:07:03 -05:00
Vincent Laporte
b4b244de2a cairomm: fix on darwin 2016-08-25 15:39:52 +02:00
Robin Gloster
bb2824c68e
webkitgtk: 2.12.3 -> 2.12.4 
Security fixes: CVE-2016-4622, CVE-2016-4624, CVE-2016-4591,
CVE-2016-4590.
 2016-08-25 00:11:33 +00:00
Franz Pletz
9de5d8ff0f libseccomp: 2.3.0 -> 2.3.1 2016-08-25 01:55:42 +02:00
Nikolay Amiantov
0859b1e119 folly: fix license 
Fixes #17977.
 2016-08-25 02:30:28 +03:00
Robin Gloster
f0b53ac245 ctpp2: use default gcc 2016-08-24 22:41:41 +00:00
Jaka Hudoklin
052a913bcd Merge pull request #17951 from juliendehos/cppcms 
cppcms: init at 1.0.5
 2016-08-24 23:35:54 +02:00
Jaka Hudoklin
d919184fad Merge pull request #17953 from juliendehos/cppdb 
cppdb: init at 0.3.1
 2016-08-24 23:35:24 +02:00
Robin Gloster
210b94da49 belle-sip: 1.4.1 -> 1.4.2 and fix with new glibc 2016-08-24 18:31:30 +00:00
Shea Levy
8b9b9fad31 Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"" 
Revert a revert of a merge that shouldn't have been in master but was intentionally in staging.

Next time I'll do this right after the revert instead of so far down the line...

This reverts commit 9adad8612b082bcbae30c81678a04b79a44079a4.
 2016-08-24 07:35:30 -04:00
obadz
78b7529ee3 Merge branch 'master' into staging 2016-08-24 11:57:44 +01:00