2019-02-03 15:30:36 +00:00
|
|
|
{ bdbSupport ? true # build support for Berkeley DB repositories
|
2008-06-19 15:29:25 +00:00
|
|
|
, httpServer ? false # build Apache DAV module
|
2019-02-03 15:30:36 +00:00
|
|
|
, httpSupport ? true # client must support http
|
2008-06-19 15:29:25 +00:00
|
|
|
, pythonBindings ? false
|
|
|
|
, perlBindings ? false
|
|
|
|
, javahlBindings ? false
|
2012-01-14 11:41:06 +00:00
|
|
|
, saslSupport ? false
|
2021-01-11 07:54:33 +00:00
|
|
|
, lib, stdenv, fetchurl, apr, aprutil, zlib, sqlite, openssl, lz4, utf8proc
|
2022-06-09 23:02:28 +00:00
|
|
|
, CoreServices, Security
|
2021-05-21 01:29:29 +00:00
|
|
|
, autoconf, libtool
|
2021-04-26 00:43:55 +00:00
|
|
|
, apacheHttpd ? null, expat, swig ? null, jdk ? null, python3 ? null, py3c ? null, perl ? null
|
2018-06-02 02:50:38 +00:00
|
|
|
, sasl ? null, serf ? null
|
2008-06-19 15:29:25 +00:00
|
|
|
}:
|
|
|
|
|
|
|
|
assert bdbSupport -> aprutil.bdbSupport;
|
2014-11-07 10:55:49 +00:00
|
|
|
assert httpServer -> apacheHttpd != null;
|
2021-04-26 00:43:55 +00:00
|
|
|
assert pythonBindings -> swig != null && python3 != null && py3c != null;
|
2009-10-02 11:49:21 +00:00
|
|
|
assert javahlBindings -> jdk != null && perl != null;
|
2008-06-19 15:29:25 +00:00
|
|
|
|
2015-10-01 20:22:31 +00:00
|
|
|
let
|
2021-05-21 01:29:29 +00:00
|
|
|
# Update libtool for macOS 11 support
|
|
|
|
needsAutogen = stdenv.hostPlatform.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11";
|
2015-10-01 20:22:31 +00:00
|
|
|
|
2021-04-24 19:31:07 +00:00
|
|
|
common = { version, sha256, extraPatches ? [ ] }: stdenv.mkDerivation (rec {
|
2015-12-16 14:17:00 +00:00
|
|
|
inherit version;
|
2022-04-06 14:35:11 +00:00
|
|
|
pname = "subversion${lib.optionalString (!bdbSupport && perlBindings && pythonBindings) "-client"}";
|
2008-06-19 15:29:25 +00:00
|
|
|
|
2015-12-16 14:17:00 +00:00
|
|
|
src = fetchurl {
|
2022-04-06 14:35:11 +00:00
|
|
|
url = "mirror://apache/subversion/subversion-${version}.tar.bz2";
|
2016-03-11 18:39:42 +00:00
|
|
|
inherit sha256;
|
2015-12-16 14:17:00 +00:00
|
|
|
};
|
2008-06-19 15:29:25 +00:00
|
|
|
|
2017-03-20 14:04:18 +00:00
|
|
|
# Can't do separate $lib and $bin, as libs reference bins
|
|
|
|
outputs = [ "out" "dev" "man" ];
|
2015-10-18 11:20:14 +00:00
|
|
|
|
2021-05-21 01:29:29 +00:00
|
|
|
nativeBuildInputs = lib.optionals needsAutogen [ autoconf libtool python3 ];
|
|
|
|
|
2021-04-19 14:54:11 +00:00
|
|
|
buildInputs = [ zlib apr aprutil sqlite openssl lz4 utf8proc ]
|
2021-01-15 13:21:58 +00:00
|
|
|
++ lib.optional httpSupport serf
|
2021-04-26 00:43:55 +00:00
|
|
|
++ lib.optionals pythonBindings [ python3 py3c ]
|
2021-01-15 13:21:58 +00:00
|
|
|
++ lib.optional perlBindings perl
|
2022-06-09 23:02:28 +00:00
|
|
|
++ lib.optional saslSupport sasl
|
2022-10-06 16:38:53 +00:00
|
|
|
++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security ];
|
2015-12-16 14:17:00 +00:00
|
|
|
|
2021-04-24 19:31:07 +00:00
|
|
|
patches = [ ./apr-1.patch ] ++ extraPatches;
|
2016-04-30 15:13:26 +00:00
|
|
|
|
2019-05-09 13:59:18 +00:00
|
|
|
# We are hitting the following issue even with APR 1.6.x
|
|
|
|
# -> https://issues.apache.org/jira/browse/SVN-4813
|
|
|
|
# "-P" CPPFLAG is needed to build Python bindings and subversionClient
|
|
|
|
CPPFLAGS = [ "-P" ];
|
|
|
|
|
2024-09-11 18:40:36 +00:00
|
|
|
env = lib.optionalAttrs stdenv.cc.isClang {
|
|
|
|
NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [
|
|
|
|
"-Wno-error=implicit-function-declaration"
|
|
|
|
"-Wno-error=implicit-int"
|
|
|
|
"-Wno-int-conversion"
|
|
|
|
];
|
|
|
|
};
|
|
|
|
|
2021-05-21 01:29:29 +00:00
|
|
|
preConfigure = lib.optionalString needsAutogen ''
|
|
|
|
./autogen.sh
|
|
|
|
'';
|
|
|
|
|
2018-07-25 21:44:21 +00:00
|
|
|
configureFlags = [
|
2021-01-15 13:21:58 +00:00
|
|
|
(lib.withFeature bdbSupport "berkeley-db")
|
|
|
|
(lib.withFeatureAs httpServer "apxs" "${apacheHttpd.dev}/bin/apxs")
|
|
|
|
(lib.withFeatureAs (pythonBindings || perlBindings) "swig" swig)
|
|
|
|
(lib.withFeatureAs saslSupport "sasl" sasl)
|
|
|
|
(lib.withFeatureAs httpSupport "serf" serf)
|
2018-07-25 21:44:21 +00:00
|
|
|
"--with-zlib=${zlib.dev}"
|
|
|
|
"--with-sqlite=${sqlite.dev}"
|
2023-04-13 07:12:32 +00:00
|
|
|
"--with-apr=${apr.dev}"
|
|
|
|
"--with-apr-util=${aprutil.dev}"
|
2021-01-15 13:21:58 +00:00
|
|
|
] ++ lib.optionals javahlBindings [
|
2018-07-25 21:44:21 +00:00
|
|
|
"--enable-javahl"
|
|
|
|
"--with-jdk=${jdk}"
|
|
|
|
];
|
2015-12-16 14:17:00 +00:00
|
|
|
|
|
|
|
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
|
2015-10-18 11:20:14 +00:00
|
|
|
|
2017-03-20 14:04:18 +00:00
|
|
|
for f in $out/lib/*.la $out/lib/python*/site-packages/*/*.la; do
|
2016-09-22 15:08:06 +00:00
|
|
|
substituteInPlace $f \
|
|
|
|
--replace "${expat.dev}/lib" "${expat.out}/lib" \
|
|
|
|
--replace "${zlib.dev}/lib" "${zlib.out}/lib" \
|
|
|
|
--replace "${sqlite.dev}/lib" "${sqlite.out}/lib" \
|
treewide: use lib.getLib for OpenSSL libraries
At some point, I'd like to make another attempt at
71f1f4884b5 ("openssl: stop static binaries referencing libs"), which
was reverted in 195c7da07df. One problem with my previous attempt is
that I moved OpenSSL's libraries to a lib output, but many dependent
packages were hardcoding the out output as the location of the
libraries. This patch fixes every such case I could find in the tree.
It won't have any effect immediately, but will mean these packages
will automatically use an OpenSSL lib output if it is reintroduced in
future.
This patch should cause very few rebuilds, because it shouldn't make
any change at all to most packages I'm touching. The few rebuilds
that are introduced come from when I've changed a package builder not
to use variable names like openssl.out in scripts / substitution
patterns, which would be confusing since they don't hardcode the
output any more.
I started by making the following global replacements:
${pkgs.openssl.out}/lib -> ${lib.getLib pkgs.openssl}/lib
${openssl.out}/lib -> ${lib.getLib openssl}/lib
Then I removed the ".out" suffix when part of the argument to
lib.makeLibraryPath, since that function uses lib.getLib internally.
Then I fixed up cases where openssl was part of the -L flag to the
compiler/linker, since that unambigously is referring to libraries.
Then I manually investigated and fixed the following packages:
- pycurl
- citrix-workspace
- ppp
- wraith
- unbound
- gambit
- acl2
I'm reasonably confindent in my fixes for all of them.
For acl2, since the openssl library paths are manually provided above
anyway, I don't think openssl is required separately as a build input
at all. Removing it doesn't make a difference to the output size, the
file list, or the closure.
I've tested evaluation with the OfBorg meta checks, to protect against
introducing evaluation failures.
2022-03-25 15:33:21 +00:00
|
|
|
--replace "${openssl.dev}/lib" "${lib.getLib openssl}/lib"
|
2016-09-22 15:08:06 +00:00
|
|
|
done
|
2015-12-16 14:17:00 +00:00
|
|
|
'';
|
|
|
|
|
|
|
|
inherit perlBindings pythonBindings;
|
2008-07-07 11:46:50 +00:00
|
|
|
|
2015-12-16 14:17:00 +00:00
|
|
|
enableParallelBuilding = true;
|
2023-03-02 21:52:26 +00:00
|
|
|
# Missing install dependencies:
|
|
|
|
# libtool: error: error: relink 'libsvn_ra_serf-1.la' with the above command before installing it
|
|
|
|
# make: *** [build-outputs.mk:1316: install-serf-lib] Error 1
|
|
|
|
enableParallelInstalling = false;
|
2008-06-19 15:29:25 +00:00
|
|
|
|
2023-01-21 12:00:00 +00:00
|
|
|
nativeCheckInputs = [ python3 ];
|
2018-04-25 03:20:18 +00:00
|
|
|
doCheck = false; # fails 10 out of ~2300 tests
|
|
|
|
|
2021-01-11 07:54:33 +00:00
|
|
|
meta = with lib; {
|
2015-12-16 14:17:00 +00:00
|
|
|
description = "Version control system intended to be a compelling replacement for CVS in the open source community";
|
2018-08-09 02:48:06 +00:00
|
|
|
license = licenses.asl20;
|
2022-01-03 15:53:12 +00:00
|
|
|
homepage = "https://subversion.apache.org/";
|
2023-11-09 18:56:23 +00:00
|
|
|
mainProgram = "svn";
|
tree-wide: remove eelco as maintainer from things he no longer maintains
While preparing this change, I read the git blame on all of the files I
touched. I saw a working lifetime of building this system which we use
every day and love dearly and keep maintained ourselves. I saw commits
from a 14 year range between 2003 to 2017!! I could not be more thankful
for Eelco's work on building large parts of the foundation of nixpkgs
that all of us rely on now.
However, the end date of that range of the files I looked at the blame
on was 2017. I did not see surviving code from any newer date than that.
Looking at the Git logs, Eelco has been working on other things, and
that's totally fine.
However, it means that our maintenance metadata is out of date on a lot
of packages, and *that*'s the reason I am submitting this change. There
are a lot of packages that don't have anyone with their name on them to
be pinged if they need attention, even if they have had recent activity
(although it is never clear if recent activity was just someone fixing
it because ZHF or because the package actually matters to them).
There are a lot of packages with storied history that maybe don't need
to be in the set anymore at all since they have not been touched in
years; or maybe they are simply finished.
Empty maintainer lists should be a sign that we need to figure out who
maintains it or potentially remove it if it has rotted, and allowing the
maintainer list to be empty if it is already not maintained is part of a
healthy repository ecology.
Either way, I would like to have the maintenance metadata not mislead
anyone into sending Eelco emails about packages he doesn't, in practice,
work on anymore. I have not removed his name from everything; there are
some things that he is the upstream for or has worked on more recently,
for instance, like Nix, which I have left alone.
2024-08-21 08:07:42 +00:00
|
|
|
maintainers = with maintainers; [ lovek323 ];
|
2018-08-09 02:48:06 +00:00
|
|
|
platforms = platforms.linux ++ platforms.darwin;
|
2015-12-16 14:17:00 +00:00
|
|
|
};
|
2010-10-29 14:46:18 +00:00
|
|
|
|
2021-01-15 13:21:58 +00:00
|
|
|
} // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
2015-12-16 14:17:00 +00:00
|
|
|
CXX = "clang++";
|
|
|
|
CC = "clang";
|
|
|
|
CPP = "clang -E";
|
|
|
|
CXXCPP = "clang++ -E";
|
|
|
|
});
|
|
|
|
|
|
|
|
in {
|
2019-05-08 10:19:34 +00:00
|
|
|
subversion = common {
|
2024-10-10 05:19:16 +00:00
|
|
|
version = "1.14.4";
|
|
|
|
sha256 = "sha256-ROrRFucuSA8Q8SPJFLtvn4wEFxHAQe16v/G4Y0oZnjw=";
|
2018-11-08 01:22:03 +00:00
|
|
|
};
|
2015-12-16 14:17:00 +00:00
|
|
|
}
|