diff options
| author | Florian Klink <flokli@flokli.de> | 2018-03-26 16:52:44 +0200 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2018-03-26 17:08:56 +0200 |
| commit | 594130f39c1677d8d7fe9dc3286edc8bd45fa053 (patch) | |
| tree | 5597f2a3f31e1eab81f6a3f57f37ad6163002d79 /pkgs/applications | |
| parent | 56fb68dcef494b7cdb3e09362d67836b8137019c (diff) | |
| download | nixlib-594130f39c1677d8d7fe9dc3286edc8bd45fa053.tar nixlib-594130f39c1677d8d7fe9dc3286edc8bd45fa053.tar.gz nixlib-594130f39c1677d8d7fe9dc3286edc8bd45fa053.tar.bz2 nixlib-594130f39c1677d8d7fe9dc3286edc8bd45fa053.tar.lz nixlib-594130f39c1677d8d7fe9dc3286edc8bd45fa053.tar.xz nixlib-594130f39c1677d8d7fe9dc3286edc8bd45fa053.tar.zst nixlib-594130f39c1677d8d7fe9dc3286edc8bd45fa053.zip | |
svn-all-fast-export: update patch sha256, --prefix is now used
also, rename to svn-all-fast-export, but keep an alias to the old name
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index e5e36e998ace..dc861fd9c198 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -117,11 +117,14 @@ rec { git = gitSVN; }; - svn_all_fast_export = libsForQt5.callPackage ./svn-all-fast-export { }; + svn-all-fast-export = libsForQt5.callPackage ./svn-all-fast-export { }; tig = callPackage ./tig { }; topGit = callPackage ./topgit { }; transcrypt = callPackage ./transcrypt { }; + + # aliases + svn_all_fast_export = svn-all-fast-export; } diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix index fbafc5257d7b..2dfa61952a57 100644 --- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation { patches = [ (fetchpatch { name = "pr40.patch"; - sha256 = "1qndhk5csf7kddk3giailx7r0cdipq46lj73nkcws43n4n93synk"; - url = https://github.com/svn-all-fast-export/svn2git/pull/40.diff; + sha256 = "0mwncklzncsifql9zlxlbj3clsif5p2v1xs8nmxrw44mqvaysjw3"; + url = https://github.com/svn-all-fast-export/svn2git/compare/f00d5a5...flokli:nixos-20180326.patch; }) ]; @@ -31,8 +31,6 @@ stdenv.mkDerivation { "SVN_INCLUDE=${subversion.dev}/include/subversion-1" ]; - installPhase = "make install INSTALL_ROOT=$out"; - meta = with stdenv.lib; { homepage = https://github.com/svn-all-fast-export/svn2git; description = "A fast-import based converter for an svn repo to git repos"; |