diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-12-31 09:47:26 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-12-31 09:53:02 +0100 |
commit | f9f6f41bff2213e199bded515e9b66d1e5c4d7dd (patch) | |
tree | 29c5a75228e31f305f42c5b761709a186e406776 /pkgs/applications/version-management/subversion/default.nix | |
parent | bbcf127c7c9029cba43493d7d25a9d1c65d59152 (diff) | |
parent | 468f698f609e123bb0ffae67181d07ac99eb2204 (diff) | |
download | nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.gz nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.bz2 nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.lz nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.xz nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.tar.zst nixlib-f9f6f41bff2213e199bded515e9b66d1e5c4d7dd.zip |
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.
Diffstat (limited to 'pkgs/applications/version-management/subversion/default.nix')
-rw-r--r-- | pkgs/applications/version-management/subversion/default.nix | 147 |
1 files changed, 75 insertions, 72 deletions
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 30af36b4880f..f18184162fe7 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -8,7 +8,6 @@ , stdenv, fetchurl, apr, aprutil, zlib, sqlite , apacheHttpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null , sasl ? null, serf ? null -, branch ? "1.9" }: assert bdbSupport -> aprutil.bdbSupport; @@ -17,90 +16,94 @@ assert pythonBindings -> swig != null && python != null; assert javahlBindings -> jdk != null && perl != null; let - config = { - "1.9".ver_min = "2"; - "1.9".sha1 = "fb9db3b7ddf48ae37aa8785872301b59bfcc7017"; - "1.8".ver_min = "14"; - "1.8".sha1 = "0698efc58373e7657f6dd3ce13cab7b002ffb497"; - }; -in -assert builtins.hasAttr branch config; - -stdenv.mkDerivation (rec { - - version = "${branch}." + config.${branch}.ver_min; + common = { version, sha1 }: stdenv.mkDerivation (rec { + inherit version; + name = "subversion-${version}"; - name = "subversion-${version}"; - - src = fetchurl { - url = "mirror://apache/subversion/${name}.tar.bz2"; - inherit (config.${branch}) sha1; - }; + src = fetchurl { + url = "mirror://apache/subversion/${name}.tar.bz2"; + inherit sha1; + }; # Can't do separate $lib and $bin, as libs reference bins outputs = [ "dev" "out" "man" ]; - buildInputs = [ zlib apr aprutil sqlite ] - ++ stdenv.lib.optional httpSupport serf - ++ stdenv.lib.optional pythonBindings python - ++ stdenv.lib.optional perlBindings perl - ++ stdenv.lib.optional saslSupport sasl; - - configureFlags = '' - ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"} - ${if httpServer then "--with-apxs=${apacheHttpd}/bin/apxs" else "--without-apxs"} - ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"} - ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""} - --disable-keychain - ${if saslSupport then "--with-sasl=${sasl}" else "--without-sasl"} - ${if httpSupport then "--with-serf=${serf}" else "--without-serf"} - --with-zlib=${zlib} - --with-sqlite=${sqlite} - ''; - - preBuild = '' - makeFlagsArray=(APACHE_LIBEXECDIR=$out/modules) - ''; - - postInstall = '' - if test -n "$pythonBindings"; then - make swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn - make install-swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn - fi - - if test -n "$perlBindings"; then - make swig-pl-lib - make install-swig-pl-lib - cd subversion/bindings/swig/perl/native - perl Makefile.PL PREFIX=$out - make install - cd - - fi - - mkdir -p $out/share/bash-completion/completions - cp tools/client-side/bash_completion $out/share/bash-completion/completions/subversion + buildInputs = [ zlib apr aprutil sqlite ] + ++ stdenv.lib.optional httpSupport serf + ++ stdenv.lib.optional pythonBindings python + ++ stdenv.lib.optional perlBindings perl + ++ stdenv.lib.optional saslSupport sasl; + + configureFlags = '' + ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"} + ${if httpServer then "--with-apxs=${apacheHttpd}/bin/apxs" else "--without-apxs"} + ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"} + ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""} + --disable-keychain + ${if saslSupport then "--with-sasl=${sasl}" else "--without-sasl"} + ${if httpSupport then "--with-serf=${serf}" else "--without-serf"} + --with-zlib=${zlib} + --with-sqlite=${sqlite} + ''; + + preBuild = '' + makeFlagsArray=(APACHE_LIBEXECDIR=$out/modules) + ''; + + postInstall = '' + if test -n "$pythonBindings"; then + make swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn + make install-swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn + fi + + if test -n "$perlBindings"; then + make swig-pl-lib + make install-swig-pl-lib + cd subversion/bindings/swig/perl/native + perl Makefile.PL PREFIX=$out + make install + cd - + fi + + mkdir -p $out/share/bash-completion/completions + cp tools/client-side/bash_completion $out/share/bash-completion/completions/subversion for f in $out/lib/*.la; do substituteInPlace $f --replace "${expat.dev}/lib" "${expat.out}/lib" substituteInPlace $f --replace "${zlib.dev}/lib" "${zlib.out}/lib" substituteInPlace $f --replace "${sqlite.dev}/lib" "${sqlite.out}/lib" done - ''; + ''; + + inherit perlBindings pythonBindings; - inherit perlBindings pythonBindings; + enableParallelBuilding = true; - enableParallelBuilding = true; + meta = { + description = "A version control system intended to be a compelling replacement for CVS in the open source community"; + homepage = http://subversion.apache.org/; + maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ]; + hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + }; - meta = { - description = "A version control system intended to be a compelling replacement for CVS in the open source community"; - homepage = http://subversion.apache.org/; - maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ]; - hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + } // stdenv.lib.optionalAttrs stdenv.isDarwin { + CXX = "clang++"; + CC = "clang"; + CPP = "clang -E"; + CXXCPP = "clang++ -E"; + }); + +in { + + subversion18 = common { + version = "1.8.15"; + sha1 = "680acf88f0db978fbbeac89ed63776d805b918ef"; }; -} // stdenv.lib.optionalAttrs stdenv.isDarwin { - CXX = "clang++"; - CC = "clang"; - CPP = "clang -E"; - CXXCPP = "clang++ -E"; -}) + + subversion19 = common { + version = "1.9.3"; + sha1 = "27e8df191c92095f48314a415194ec37c682cbcf"; + }; + +} |