Commit Graph

100 Commits

Author SHA1 Message Date
Vladimír Čunát
0b192a0976 Merge branch 'master' into staging
That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
Vladimír Čunát
c4661e9643 Merge: make dev output references explicit
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
Alexander Ried
9e073bd110 subversionClient: fix build with gcc5
fixes #15483
2016-05-20 14:38:14 +02:00
Tuomas Tynkkynen
7fb29bfa73 treewide: Make explicit that 'dev' output of zlib is used 2016-05-19 10:04:38 +02:00
Tuomas Tynkkynen
e80e4ba2bb treewide: Make explicit that 'dev' output of sqlite is used 2016-05-19 10:04:34 +02:00
Tuomas Tynkkynen
16cc4ac83b treewide: Make explicit that 'dev' output of apacheHttpd is used 2016-05-19 10:00:23 +02:00
Pascal Wittmann
8029ee27b6 subversion: 1.9.3 -> 1.9.4 (fixes CVE-2016-2168, CVE-2016-2167) 2016-05-18 21:34:25 +02:00
Pascal Wittmann
032ba2d578 subversion: 1.8.15 -> 1.8.16 (fixes CVE-2016-2168, CVE-2016-2167) 2016-05-18 21:34:25 +02:00
Ricardo Ardissone
025ccbccd7 subversion: fix apr-1 linking 2016-04-30 12:13:26 -03:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Evgeny Egorochkin
5db2d9366b subversion: fix hash 2016-03-21 12:47:54 +02:00
Graham Christensen
bdb1e5c73f svn: convert sha1 to sha256 2016-03-11 15:54:55 -06:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Eelco Dolstra
e7ae72cfb1 subversion: 1.8.14 -> 1.8.15, 1.9.2 -> 1.9.3
CVE-2015-5343, CVE-2015-5259.
2015-12-16 15:21:58 +01:00
Eelco Dolstra
64792ffdaa subversion: Use callPackages 2015-12-16 15:21:58 +01:00
William A. Kennington III
6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
Tuomas Tynkkynen
c471cb866f subversion: Split into multiple outputs 2015-10-28 10:22:59 +01:00
Eelco Dolstra
741bf840da Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
Vladimír Čunát
e9fcbe67b0 kde4.kdesdk-kioslaves: fix by resurrecting svn-1.8
Just bringing back pre-bc54ecd811e state as well.
2015-10-01 22:23:31 +02:00
William A. Kennington III
a7b55bc324 subversion: 1.9.1 -> 1.9.2 2015-09-23 12:30:00 -07:00
William A. Kennington III
bc54ecd811 subversion: 1.8.14 -> 1.9.1 2015-09-17 14:12:38 -07:00
Eelco Dolstra
24f1a7a5cb subversion: Update to 1.8.14
CVE-2015-3184, CVE-2015-3187.
2015-08-24 11:51:28 +02:00
Jude Taylor
9f6f299448 darwin purity: subversion 2015-06-25 16:36:05 -07:00
Eelco Dolstra
c98b8f4c11 subversion: Update to 1.8.13 2015-04-09 15:35:27 +02:00
John Wiegley
eba9d0d8fa subversion: Add several compiler definitions for Darwin 2015-01-03 07:53:06 -05:00
Eelco Dolstra
49282dd1af subversion: Update to 1.8.11 2014-12-18 14:11:10 +01:00
Luca Bruno
83221f3886 Merge branch 'master' into staging
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
Eelco Dolstra
dde6d5708c Add set apacheHttpdPackages containing modules for specific Apache versions
Similar to linuxPackages etc.
2014-11-07 12:08:30 +01:00
Eelco Dolstra
6db6dea4c9 subversion: Remove apparently unnecessary environment variables
At least it seems to build fine (and use clang) without them.
2014-09-24 18:55:09 +02:00
Eelco Dolstra
542a4d0287 subversion: Fix broken configure flags
This caused an impure dependency on libsasl on Darwin.
2014-09-24 18:51:29 +02:00
Joel Taylor
7da056233f wip libc++ 2014-09-09 13:54:25 -07:00
Joel Taylor
3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Moritz Ulrich
cce6dd11b6 subversionClient: update from 1.8.9 to 1.8.10, potentially fixes CVE-2014-3504, CVE-2014-3522, CVE-2014-3528 2014-09-04 16:06:42 +02:00
Eelco Dolstra
2f056c5237 subversion: Fix build on Darwin 2014-08-09 23:54:58 +02:00
Eelco Dolstra
b4c4e2d28d subversion: Update to 1.8.9 2014-08-05 11:46:04 +02:00
Vladimír Čunát
fb1028813c subversion: minor bump to fix CVE-2014-0032 2014-02-22 17:04:34 +01:00
Peter Simons
ff8cffed86 subversion: fix evaluation errors on FreeBSD 2014-01-22 12:44:49 +01:00
William A. Kennington III
184dd198fb subversion: Tweaks and Fixes
Remove ssl and compression options which are no longer valid when using
serf in place of neon. Also, make sure serf is an optional dependency.
2013-12-31 07:59:37 -06:00
Michael Raskin
a3843455c5 Re-add HTTP/HTTPS support back to Subversion by adding serf. Tested. 2013-12-30 23:33:22 +04:00
William A. Kennington III
0270be1eb6 subversion: Update from 1.7.14 -> 1.8.5 2013-12-30 00:08:59 +00:00
Nixpkgs Monitor
ec83369639 subversionClient: update from 1.7.13 to 1.7.14, potentially fixes CVE-2013-4558 2013-12-13 00:10:35 +02:00
Peter Simons
46581c6918 subversion: install bash completion 2013-11-09 19:19:22 +01:00
Eelco Dolstra
01087750ba Don't build some packages on some platforms 2013-11-04 21:11:00 +01:00
Eelco Dolstra
1e8294572f subversion: Update to 1.7.13
CVE-2013-4246
2013-09-25 18:11:00 +02:00
Eelco Dolstra
09fc997107 subversion: Update to 1.7.11
CVE-2013-4131
2013-08-07 17:12:33 +02:00
Jason "Don" O'Conal
bd3c2c76c7 subversion: fix build on darwin
* remove useless -no-cpp-precomp flags
2013-07-04 19:10:41 +10:00
Eelco Dolstra
6dbb6f78bb subversion: Update to 1.7.10
CVE-2013-1968, CVE-2013-2088, CVE-2013-2112.
2013-06-12 15:56:40 +02:00
Eelco Dolstra
b17ba0fbb2 subversion: Update to 1.7.9
CVE-2013-1845, CVE-2013-1846, CVE-2013-1847, CVE-2013-1849,
CVE-2013-1884.
2013-05-01 13:15:05 +02:00
Eelco Dolstra
58e9406f4b subversion: Update to 1.7.8 2013-01-14 14:38:23 +01:00
Eelco Dolstra
2da2e5137f subversion: Update to 1.7.7 2012-11-22 16:56:03 +01:00