diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-06-30 01:41:59 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-06-30 01:41:59 +0200 |
| commit | f7781f52933ff4a83d1396f6255dfa91e727dc7c (patch) | |
| tree | e76320ab79bb58dccf9c517c31aac209202217b5 /pkgs/applications/version-management/git-and-tools | |
| parent | 3892a3e5a913af86f22888cf13552c229629d126 (diff) | |
| parent | 2059bf9e39bef62e9386291e1041371bdd8036ab (diff) | |
| download | nixlib-f7781f52933ff4a83d1396f6255dfa91e727dc7c.tar nixlib-f7781f52933ff4a83d1396f6255dfa91e727dc7c.tar.gz nixlib-f7781f52933ff4a83d1396f6255dfa91e727dc7c.tar.bz2 nixlib-f7781f52933ff4a83d1396f6255dfa91e727dc7c.tar.lz nixlib-f7781f52933ff4a83d1396f6255dfa91e727dc7c.tar.xz nixlib-f7781f52933ff4a83d1396f6255dfa91e727dc7c.tar.zst nixlib-f7781f52933ff4a83d1396f6255dfa91e727dc7c.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
3 files changed, 48 insertions, 1 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index d890001489ff..a6efb8d339e9 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "1.1"; src = fetchurl { - url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz"; + url = "https://git.zx2c4.com/cgit/snapshot/${name}.tar.xz"; sha256 = "142qcgs8dwnzhymn0a7xx47p9fc2z5wrb86ah4a9iz0mpqlsz288"; }; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 9a4ef524dde9..24da6a71c580 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -95,6 +95,8 @@ rec { git-stree = callPackage ./git-stree { }; + git-sync = callPackage ./git-sync { }; + git2cl = callPackage ./git2cl { }; gitFastExport = callPackage ./fast-export { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix new file mode 100644 index 000000000000..7ba7d8ec2434 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, coreutils, gnugrep, gnused, makeWrapper, git +}: + +stdenv.mkDerivation rec { + name = "git-sync-${version}"; + version = "20151024"; + + src = fetchFromGitHub { + owner = "simonthum"; + repo = "git-sync"; + rev = "eb9adaf2b5fd65aac1e83d6544b9076aae6af5b7"; + sha256 = "01if8y93wa0mwbkzkzx2v1vqh47zlz4k1dysl6yh5rmppd1psknz"; + }; + + buildInputs = [ makeWrapper ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin + cp -a git-sync $out/bin/git-sync + ''; + + wrapperPath = with stdenv.lib; makeBinPath [ + coreutils + git + gnugrep + gnused + ]; + + fixupPhase = '' + patchShebangs $out/bin + + wrapProgram $out/bin/git-sync \ + --prefix PATH : "${wrapperPath}" + ''; + + meta = { + description = "A script to automatically synchronize a git repository"; + homepage = https://github.com/simonthum/git-sync; + maintainers = with stdenv.lib.maintainers; [ imalison ]; + license = stdenv.lib.licenses.cc0; + platforms = with stdenv.lib.platforms; unix; + }; +} |