1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 06:01:15 +00:00
Commit graph

19943 commits

Author SHA1 Message Date
Franz Pletz 1585e0f09b
sqlite: 3.13.0 -> 3.14.1 2016-08-26 17:08:04 +02:00
Vladimír Čunát 801692c3dd Merge #17928: openssl: fix CVE-2016-2177 2016-08-25 22:22:00 +02:00
Franz Pletz 9de5d8ff0f libseccomp: 2.3.0 -> 2.3.1 2016-08-25 01:55:42 +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 9adad8612b.
2016-08-24 07:35:30 -04:00
obadz 78b7529ee3 Merge branch 'master' into staging 2016-08-24 11:57:44 +01:00
Daniel Peebles 3f337a2b23 Merge pull request #17685 from matthewbauer/darwin-misc2
Darwin misc. fixes
2016-08-24 11:52:27 +02:00
Franz Pletz 6303b6eb1c czmq: fix bad merge
9db5362270 vs. 9e211203da
2016-08-23 20:02:38 +02:00
obadz 8da8aa7ddb Merge branch 'hardened-stdenv' into staging 2016-08-23 18:50:10 +01:00
obadz 0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Robin Gloster 9e211203da czmq: fix build
Uses -Werror, failing with additionally enabled warnings from hardening.
2016-08-23 15:51:26 +00:00
Tuomas Tynkkynen cfd18c85a4 geant: Clean up a bit 2016-08-23 04:32:21 +03:00
Tuomas Tynkkynen a18ee4acb7 treewide: Make explicit that 'dev' output of boost is used
Also fix one incorrect output in geant.
2016-08-23 04:32:21 +03:00
Tuomas Tynkkynen 1c761150f7 treewide: Make explicit that 'dev' output of libmysql is used 2016-08-23 03:52:06 +03:00
Tuomas Tynkkynen 526aee8340 treewide: Make explicit that 'dev' output of gst_all_1.gstreamer is used 2016-08-23 03:52:06 +03:00
Alexey Shmalko 6e7ca9272e
openssl: fix CVE-2016-2177 2016-08-23 03:41:03 +03:00
Joachim F 404fd54674 Merge pull request #17921 from ambrop72/kdevelop-build-fix
kdevplatform: Fix build.
2016-08-23 01:57:33 +02:00
Tuomas Tynkkynen 282277dbc8 treewide: Use more makeBinPath 2016-08-23 01:18:10 +03:00
Tuomas Tynkkynen d3705faa56 treewide: Use makeLibraryPath in LD_LIBRARY_PATHs 2016-08-23 00:14:00 +03:00
Ambroz Bizjak a581f4ca56 kdevplatform: Fix build.
Build log: https://hydra.nixos.org/build/38445107/nixlog/1
Upstream report and patch: https://phabricator.kde.org/D1160
2016-08-22 20:37:18 +02:00
Eelco Dolstra 9db5362270 czmq: Fix build on Glibc 2.24
http://hydra.nixos.org/build/38982107
2016-08-22 17:14:23 +02:00
Nikolay Amiantov 231fca0b7d SDL2_gfx: 5 -> nightly 2016-08-22 06:30:01 +03:00
Nikolay Amiantov 7bf7f19765 SDL2: cleanup and add patch to discover extensions 2016-08-22 06:30:01 +03:00
Nikolay Amiantov b47327ebd5 SDL: cleanup and add patch to discover extensions 2016-08-22 06:30:00 +03:00
obadz 24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
obadz ba50fd7170 Merge branch 'master' into staging 2016-08-22 01:18:11 +01:00
Ram Kromberg 1457159889 zeitgeist: vala -> vala_0_23 2016-08-21 20:14:27 +03:00
Ram Kromberg 18bca23878 telepathy: vala -> vala_0_23 2016-08-21 20:13:36 +03:00
Ram Kromberg fe86c24730 libunity: vala -> vala_0_23 2016-08-21 20:12:32 +03:00
Ram Kromberg a206e13fe1 libsoup: vala -> vala_0_23 2016-08-21 20:11:51 +03:00
Ram Kromberg 4ce4a798ea libosinfo: vala -> vala_0_23 2016-08-21 20:10:54 +03:00
Ram Kromberg 83b302e134 libindicate: vala -> vala_0_23 2016-08-21 20:10:06 +03:00
Ram Kromberg a94a987248 libfm: vala -> vala_0_23 2016-08-21 20:09:21 +03:00
Ram Kromberg df9922e4b5 libdbusmenu: vala -> vala_0_23 2016-08-21 20:08:42 +03:00
Ram Kromberg ef4f13a068 libappindicator: vala -> vala_0_23 2016-08-21 20:07:58 +03:00
Ram Kromberg 7e226b02c5 gusb: vala -> vala_0_23 2016-08-21 20:07:11 +03:00
Ram Kromberg efaa6d116c granite: vala -> vala_0_23 2016-08-21 20:06:29 +03:00
Shea Levy 1b15f1df5f Merge branch 'fftw' of git://github.com/acowley/nixpkgs 2016-08-21 11:23:36 -04:00
obadz 68936edfb3 Merge branch 'master' into staging 2016-08-21 12:03:41 +01:00
Vladimír Čunát d890e82794 Re-Merge #17867: libsecret: use currently latest vala 2016-08-21 10:45:47 +02:00
Rickard Nilsson 7a3260c590 libvirt and pythonPackages.libvirt: 2.0.0 -> 2.1.0 2016-08-21 09:51:24 +02:00
Anthony Cowley 2e1fa4a9f5 fftw: fix on darwin
doc generation involves running Fortran wrapper generation shell scripts
that hard code references to gcc which fails on darwin.
2016-08-21 00:59:31 -04:00
Ram Kromberg dd0546bd9d libsecret: add vala dependency 2016-08-21 03:52:01 +03:00
Thomas Tuegel c2b47f3f07 Merge branch 'qt-5-reduce-relocations' 2016-08-20 17:40:15 -05:00
Thomas Tuegel dedc6716e4 qt5: build without -reduce-relocations
Fixes #17862.
2016-08-20 17:36:32 -05:00
Michael Raskin 3581a00d69 torch: init at 0.0-pre20160820 2016-08-20 23:41:34 +02:00
obadz b092538811 Revert "glibc: add patch to fix segfault in forkpty"
This reverts commit 1747d28e5a.

Was fixed upstream in glibc 2.24
2016-08-20 22:39:05 +01:00
Vladimír Čunát a9114cda74 Merge #17867: libsecret: add vala dependency 2016-08-20 18:01:56 +02:00
Vladimír Čunát cdb44a4ada Merge branch 'master' into staging 2016-08-20 18:01:36 +02:00
Ram Kromberg 71a7ca4931 libsecret: add vala dependency 2016-08-20 17:12:01 +03:00