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

subversion: fixup some referrers after splitting

Browse Source
This commit is contained in:
Vladimír Čunát 2015-10-26 11:30:48 +01:00
parent c471cb866f
commit c5579c9184
8 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/misc/svnserve.nix
View File

@ -40,7 +40,7 @@ in
preStart = "mkdir -p ${cfg.svnBaseDir}";
exec = "${pkgs.subversion}/bin/svnserve -r ${cfg.svnBaseDir} -d --foreground --pid-file=/var/run/svnserve.pid";
exec = "${pkgs.subversion.out}/bin/svnserve -r ${cfg.svnBaseDir} -d --foreground --pid-file=/var/run/svnserve.pid";
};
};
}

2
nixos/modules/services/web-servers/apache-httpd/phabricator.nix
View File

@ -39,7 +39,7 @@ in {
"${pkgs.diffutils}"
] ++
(if config.mercurial then ["${pkgs.mercurial}"] else []) ++
(if config.subversion then ["${pkgs.subversion}"] else []) ++
(if config.subversion then ["${pkgs.subversion.out}"] else []) ++
(if config.git then ["${pkgs.git}"] else []);
startupScript = pkgs.writeScript "activatePhabricator" ''

2
pkgs/applications/misc/ikiwiki/default.nix
View File

@ -66,7 +66,7 @@ stdenv.mkDerivation {
${lib.optionalString bazaarSupport ''--prefix PATH : ${bazaar}/bin \''}
${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin \''}
${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin \''}
${lib.optionalString subversionSupport ''--prefix PATH : ${subversion}/bin \''}
${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin \''}
${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin \''}
${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils}
done

2
pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildPhase = ''
sed -i 's|/bin/cat|cat|' ./src/repository.cpp
qmake
make CXXFLAGS='-I${apr}/include/apr-1 -I${subversion}/include/subversion-1 -DVER="\"${src.rev}\""'
make CXXFLAGS='-I${apr}/include/apr-1 -I${subversion.dev}/include/subversion-1 -DVER="\"${src.rev}\""'
'';
installPhase = ''

2
pkgs/applications/version-management/rabbitvcs/default.nix
View File

@ -17,7 +17,7 @@ python2Packages.buildPythonPackage rec {
sed -ie 's|if sys\.argv\[1\] == "install":|if False:|' ./setup.py
sed -ie "s|PREFIX = sys.prefix|PREFIX = \"$out\"|" ./setup.py
sed -ie 's|/usr/bin/meld|${meld}/bin/meld|' ./rabbitvcs/util/configspec/configspec.ini
sed -ie 's|/usr/bin/svnadmin|${subversion}/bin/svnadmin|' ./rabbitvcs/ui/create.py
sed -ie 's|/usr/bin/svnadmin|${subversion.out}/bin/svnadmin|' ./rabbitvcs/ui/create.py
sed -ie "s|/usr/share/doc|$out/share/doc|" ./rabbitvcs/ui/about.py
sed -ie "s|gnome-open|xdg-open|" ./rabbitvcs/util/helper.py
'';

4
pkgs/applications/version-management/rapidsvn/default.nix
View File

@ -10,8 +10,8 @@ stdenv.mkDerivation {
buildInputs = [ wxGTK subversion apr aprutil python ];
configureFlags = [ "--with-svn-include=${subversion}/include"
"--with-svn-lib=${subversion}/lib" ];
configureFlags = [ "--with-svn-include=${subversion.dev}/include"
"--with-svn-lib=${subversion.out}/lib" ];
meta = {
description = "Multi-platform GUI front-end for the Subversion revision system";

4
pkgs/tools/filesystems/svnfs/default.nix
View File

@ -12,10 +12,10 @@ stdenv.mkDerivation {
# why is this required?
preConfigure=''
export LD_LIBRARY_PATH=${subversion}/lib
export LD_LIBRARY_PATH=${subversion.out}/lib
'';
NIX_CFLAGS_COMPILE="-I ${subversion}/include/subversion-1";
NIX_CFLAGS_COMPILE="-I ${subversion.dev}/include/subversion-1";
NIX_LDFLAGS="-lsvn_client-1";
meta = {

8
pkgs/top-level/python-packages.nix
View File

@ -12351,9 +12351,11 @@ let
cd Source
python setup.py backport
python setup.py configure \
--apr-inc-dir=${pkgs.apr}/include/apr-1 \
--apu-inc-dir=${pkgs.aprutil}/include/apr-1 \
--apr-lib-dir=${pkgs.apr}/lib \
--apr-inc-dir=${pkgs.apr.dev}/include \
--apu-inc-dir=${pkgs.aprutil.dev}/include \
--apr-lib-dir=${pkgs.apr.out}/lib \
--svn-lib-dir=${pkgs.subversion.out}/lib \
--svn-bin-dir=${pkgs.subversion.out}/bin \
--svn-root-dir=${pkgs.subversion}
'' + (if !stdenv.isDarwin then "" else ''
sed -i -e 's|libpython2.7.dylib|lib/libpython2.7.dylib|' Makefile