From be4efc801057e5d54c94374098a7862fe3d7a3b4 Mon Sep 17 00:00:00 2001 From: ryneeverett Date: Sun, 12 Jan 2020 21:41:31 +0000 Subject: gitstatus: patch fewer characters This is a followup to https://github.com/NixOS/nixpkgs/pull/76744. The patch is still too aggressive because it captures additional local variables declared in the same line. It should stop when it hits whitespace. See https://github.com/romkatv/gitstatus/pull/92. --- .../applications/version-management/git-and-tools/gitstatus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications/version-management/git-and-tools') diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index 94753275b61..429ab092f40 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; patchPhase = '' - sed -i "s|local daemon=.*|local daemon=$out/bin/gitstatusd|" gitstatus.plugin.zsh + sed -i "s|local daemon=\S*|local daemon=$out/bin/gitstatusd|" gitstatus.plugin.zsh ''; installPhase = '' install -Dm755 gitstatusd $out/bin/gitstatusd -- cgit 1.4.1 From f5e446b30fea10895bbd3ff90e27737d1754b899 Mon Sep 17 00:00:00 2001 From: ryneeverett Date: Sun, 12 Jan 2020 22:21:25 +0000 Subject: gitstatus: patch in variable rather than regexing Patching in the GITSTATUS_DAEMON variable seems like a more stable solution than doing inline replacements. --- .../applications/version-management/git-and-tools/gitstatus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications/version-management/git-and-tools') diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index 429ab092f40..9b77690868b 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; patchPhase = '' - sed -i "s|local daemon=\S*|local daemon=$out/bin/gitstatusd|" gitstatus.plugin.zsh + sed -i "1i GITSTATUS_DAEMON=$out/bin/gitstatusd" gitstatus.plugin.zsh ''; installPhase = '' install -Dm755 gitstatusd $out/bin/gitstatusd -- cgit 1.4.1 From b467436ebb50fb2ed0a40988bdc35a7e63740abb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Jan 2020 12:57:58 +0000 Subject: gitAndTools.git-subrepo: 0.4.0 -> 0.4.1 --- .../version-management/git-and-tools/git-subrepo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/version-management/git-and-tools') diff --git a/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix b/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix index 969ea7cc2fa..54543bb4841 100644 --- a/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "git-subrepo"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "ingydotnet"; repo = "git-subrepo"; rev = version; - sha256 = "05m2dm9gq2nggwnxxdyq2kjj584sn2lxk66pr1qhjxnk81awj9l7"; + sha256 = "0n10qnc8kyms6cv65k1n5xa9nnwpwbjn9h2cq47llxplawzqgrvp"; }; nativeBuildInputs = [ -- cgit 1.4.1 From 3d6c99a1530e3deca2ec3787fc5746a864e8f2d5 Mon Sep 17 00:00:00 2001 From: Łukasz Jan Niemier Date: Thu, 16 Jan 2020 22:36:29 +0100 Subject: gitFull: support git send-email on Darwin --- pkgs/applications/version-management/git-and-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications/version-management/git-and-tools') diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index d57ffd75d7f..2e99ca666dc 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -46,7 +46,7 @@ let gitFull = gitBase.override { svnSupport = true; guiSupport = true; - sendEmailSupport = !stdenv.isDarwin; + sendEmailSupport = true; withLibsecret = !stdenv.isDarwin; }; -- cgit 1.4.1 From 1e4c3f8dc82292df1337e5283c67d7d9edf44558 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Mon, 20 Jan 2020 15:52:26 +0200 Subject: thicket: init at 0.1.3 --- .../version-management/git-and-tools/default.nix | 2 ++ .../git-and-tools/thicket/default.nix | 26 ++++++++++++++++++++++ .../git-and-tools/thicket/shards.nix | 8 +++++++ 3 files changed, 36 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/thicket/default.nix create mode 100644 pkgs/applications/version-management/git-and-tools/thicket/shards.nix (limited to 'pkgs/applications/version-management/git-and-tools') diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index d57ffd75d7f..9d638c70f92 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -174,6 +174,8 @@ let svn-all-fast-export = libsForQt5.callPackage ./svn-all-fast-export { }; + thicket = callPackage ./thicket { }; + tig = callPackage ./tig { }; topGit = callPackage ./topgit { }; diff --git a/pkgs/applications/version-management/git-and-tools/thicket/default.nix b/pkgs/applications/version-management/git-and-tools/thicket/default.nix new file mode 100644 index 00000000000..42819043d58 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/thicket/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchFromGitHub +, crystal +}: + +crystal.buildCrystalPackage rec { + pname = "thicket"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "taylorthurlow"; + repo = pname; + rev = "v${version}"; + sha256 = "0hkmmssiwipx373d0zw9a2yn72gqzqzcvwkqbs522m5adz6qmkzw"; + }; + + shardsFile = ./shards.nix; + crystalBinaries.thicket.src = "src/thicket.cr"; + + meta = with lib; { + description = "A better one-line git log"; + homepage = "https://github.com/taylorthurlow/thicket"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + }; +} \ No newline at end of file diff --git a/pkgs/applications/version-management/git-and-tools/thicket/shards.nix b/pkgs/applications/version-management/git-and-tools/thicket/shards.nix new file mode 100644 index 00000000000..c8839651a26 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/thicket/shards.nix @@ -0,0 +1,8 @@ +{ + ameba = { + owner = "veelenga"; + repo = "ameba"; + rev = "v0.10.0"; + sha256 = "1yjxzwdhigsyjn0qp362jkj85qvg4dsyzal00pgr1srnh2xry912"; + }; +} -- cgit 1.4.1 From 35363c3efa24e44a625219c65c43853c4e25e86b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 21 Jan 2020 11:05:48 -0600 Subject: gitAndTools.hub: 2.13.0 -> 2.14.1 https://github.com/github/hub/releases/tag/v2.14.1 https://github.com/github/hub/releases/tag/v2.14.0 --- pkgs/applications/version-management/git-and-tools/hub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/version-management/git-and-tools') diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index ee21a2158ac..1b67b933cb1 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "hub"; - version = "2.13.0"; + version = "2.14.1"; goPackagePath = "github.com/github/hub"; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "github"; repo = pname; rev = "v${version}"; - sha256 = "18b0r16fk5wahvysqvg6vzjr7smyc2sdxp9sf55viby3kkwjfbkh"; + sha256 = "0b179sp8z2blzh4a0c2pjbbiya68x2i4cnmcci58r8k0mwrx6mw1"; }; nativeBuildInputs = [ groff utillinux ]; -- cgit 1.4.1