public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #61134 from c0bw3b/pkg/subversion

Browse Source 
subversion: drop 1.8 / 1.9.9 -> 1.9.10 / 1.11.1 -> 1.12.0
This commit is contained in:
Eelco Dolstra 2019-05-08 13:48:04 +02:00 committed by GitHub
commit 84a51650b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/applications/version-management/subversion/default.nix
View File

@ -38,10 +38,6 @@ let
patches = [ ./apr-1.patch ]; patches = [ ./apr-1.patch ];
# SVN build seems broken on gcc5:
# https://gcc.gnu.org/gcc-5/porting_to.html
CPPFLAGS = "-P";
configureFlags = [ configureFlags = [
(stdenv.lib.withFeature bdbSupport "berkeley-db") (stdenv.lib.withFeature bdbSupport "berkeley-db")
(stdenv.lib.withFeatureAs httpServer "apxs" "${apacheHttpd.dev}/bin/apxs") (stdenv.lib.withFeatureAs httpServer "apxs" "${apacheHttpd.dev}/bin/apxs")
@ -110,14 +106,9 @@ let
}); });
in { in {
subversion18 = common {
version = "1.8.19";
sha256 = "1gp6426gkdza6ni2whgifjcmjb4nq34ljy07yxkrhlarvfq6ks2n";
};
subversion19 = common { subversion19 = common {
version = "1.9.9"; version = "1.9.10";
sha256 = "1ll13ychbkp367c7zsrrpda5nygkryma5k18qfr8wbaq7dbvxzcd"; sha256 = "1mwwbjs8nqr8qyc0xzy7chnylh4q3saycvly8rzq32swadbcca5f";
}; };
subversion_1_10 = common { subversion_1_10 = common {
@ -126,9 +117,9 @@ in {
extraBuildInputs = [ lz4 utf8proc ]; extraBuildInputs = [ lz4 utf8proc ];
}; };
subversion_1_11 = common { subversion = common {
version = "1.11.1"; version = "1.12.0";
sha256 = "1fv0psjxx5nxb4zmddyrma2bnv1bfff4p8ii6j8fqwjdr982gzcy"; sha256 = "1prfbrd1jnndb5fcsvwnzvdi7c0bpirb6pmfq03w21x0v1rprbkz";
extraBuildInputs = [ lz4 utf8proc ]; extraBuildInputs = [ lz4 utf8proc ];
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -20051,9 +20051,7 @@ in
sublime-merge-dev; sublime-merge-dev;
inherit (callPackages ../applications/version-management/subversion { sasl = cyrus_sasl; }) inherit (callPackages ../applications/version-management/subversion { sasl = cyrus_sasl; })
subversion18 subversion19 subversion_1_10 subversion_1_11; subversion19 subversion_1_10 subversion;
subversion = subversion_1_11;
subversionClient = appendToName "client" (pkgs.subversion.override { subversionClient = appendToName "client" (pkgs.subversion.override {
bdbSupport = false; bdbSupport = false;