about summary refs log tree commit diff
path: root/pkgs/applications/version-management/subversion/default.nix
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2018-06-02 02:50:38 +0000
committerGitHub <noreply@github.com>2018-06-02 02:50:38 +0000
commit97f6be5c90de1d04391d855f2be588f827b2e7ae (patch)
tree85fe9d536e4c751b2f5289fcfd9d9012471dfd4e /pkgs/applications/version-management/subversion/default.nix
parent1fc2853e6b9f6be55c2492f808707f3f6edf8a1f (diff)
downloadnixlib-97f6be5c90de1d04391d855f2be588f827b2e7ae.tar
nixlib-97f6be5c90de1d04391d855f2be588f827b2e7ae.tar.gz
nixlib-97f6be5c90de1d04391d855f2be588f827b2e7ae.tar.bz2
nixlib-97f6be5c90de1d04391d855f2be588f827b2e7ae.tar.lz
nixlib-97f6be5c90de1d04391d855f2be588f827b2e7ae.tar.xz
nixlib-97f6be5c90de1d04391d855f2be588f827b2e7ae.tar.zst
nixlib-97f6be5c90de1d04391d855f2be588f827b2e7ae.zip
subversion_1_10: init at 1.10.0 (#41383)
Diffstat (limited to 'pkgs/applications/version-management/subversion/default.nix')
-rw-r--r--pkgs/applications/version-management/subversion/default.nix13
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 6b8ef7b88e8e..8cbfe1ec1617 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -5,9 +5,9 @@
 , perlBindings ? false
 , javahlBindings ? 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
-, sasl ? null, serf ? null, openssl
+, sasl ? null, serf ? null
 }:
 
 assert bdbSupport -> aprutil.bdbSupport;
@@ -17,7 +17,7 @@ assert javahlBindings -> jdk != null && perl != null;
 
 let
 
-  common = { version, sha256 }: stdenv.mkDerivation (rec {
+  common = { version, sha256, extraBuildInputs ? [ ] }: stdenv.mkDerivation (rec {
     inherit version;
     name = "subversion-${version}";
 
@@ -30,6 +30,7 @@ let
     outputs = [ "out" "dev" "man" ];
 
     buildInputs = [ zlib apr aprutil sqlite openssl ]
+      ++ extraBuildInputs
       ++ stdenv.lib.optional httpSupport serf
       ++ stdenv.lib.optional pythonBindings python
       ++ stdenv.lib.optional perlBindings perl
@@ -114,4 +115,10 @@ in {
     version = "1.9.7";
     sha256 = "08qn94zaqcclam2spb4h742lvhxw8w5bnrlya0fm0bp17hriicf3";
   };
+
+  subversion_1_10 = common {
+    version = "1.10.0";
+    sha256 = "115mlvmf663w16mc3xyypnaizq401vbypc56hl2ylzc3pcx3zwic";
+    extraBuildInputs = [ lz4 utf8proc ];
+  };
 }