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

subversion_1_10: init at 1.10.0 (#41383)

This commit is contained in:
Orivej Desh 2018-06-02 02:50:38 +00:00 committed by GitHub
parent 1fc2853e6b
commit 97f6be5c90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,9 +5,9 @@
, perlBindings ? false , perlBindings ? false
, javahlBindings ? false , javahlBindings ? false
, saslSupport ? false , saslSupport ? false
, stdenv, fetchurl, apr, aprutil, zlib, sqlite , stdenv, fetchurl, apr, aprutil, zlib, sqlite, openssl, lz4, utf8proc
, apacheHttpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null , apacheHttpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null
, sasl ? null, serf ? null, openssl , sasl ? null, serf ? null
}: }:
assert bdbSupport -> aprutil.bdbSupport; assert bdbSupport -> aprutil.bdbSupport;
@ -17,7 +17,7 @@ assert javahlBindings -> jdk != null && perl != null;
let let
common = { version, sha256 }: stdenv.mkDerivation (rec { common = { version, sha256, extraBuildInputs ? [ ] }: stdenv.mkDerivation (rec {
inherit version; inherit version;
name = "subversion-${version}"; name = "subversion-${version}";
@ -30,6 +30,7 @@ let
outputs = [ "out" "dev" "man" ]; outputs = [ "out" "dev" "man" ];
buildInputs = [ zlib apr aprutil sqlite openssl ] buildInputs = [ zlib apr aprutil sqlite openssl ]
++ extraBuildInputs
++ stdenv.lib.optional httpSupport serf ++ stdenv.lib.optional httpSupport serf
++ stdenv.lib.optional pythonBindings python ++ stdenv.lib.optional pythonBindings python
++ stdenv.lib.optional perlBindings perl ++ stdenv.lib.optional perlBindings perl
@ -114,4 +115,10 @@ in {
version = "1.9.7"; version = "1.9.7";
sha256 = "08qn94zaqcclam2spb4h742lvhxw8w5bnrlya0fm0bp17hriicf3"; sha256 = "08qn94zaqcclam2spb4h742lvhxw8w5bnrlya0fm0bp17hriicf3";
}; };
subversion_1_10 = common {
version = "1.10.0";
sha256 = "115mlvmf663w16mc3xyypnaizq401vbypc56hl2ylzc3pcx3zwic";
extraBuildInputs = [ lz4 utf8proc ];
};
} }

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

@ -18014,7 +18014,7 @@ with pkgs;
saslSupport = false; saslSupport = false;
sasl = cyrus_sasl; sasl = cyrus_sasl;
}) })
subversion18 subversion19; subversion18 subversion19 subversion_1_10;
subversion = pkgs.subversion19; subversion = pkgs.subversion19;