Merge master into staging-next

2 files changed, 28 insertions, 2 deletions

diff --git a/pkgs/applications/version-management/git-and-tools/gex/default.nix b/pkgs/applications/version-management/git-and-tools/gex/default.nix
new file mode 100644
index 0000000000000..dbcc63419b750
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/gex/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, stdenv
+, rustPlatform
+, fetchFromGitHub
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "gex";
+  version = "0.3.3";
+
+  src = fetchFromGitHub {
+    owner = "Piturnah";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-oUcQKpZqqb8wZDpdFfpxLpwdfQlokJE5bsoPwxh+JMM=";
+  };
+
+  cargoHash = "sha256-ZFrIlNysjlXI8n78N2Hkff6gAplipxSQXUWG8HJq8fs=";
+
+  meta = with lib; {
+    description = "Git Explorer: cross-platform git workflow improvement tool inspired by Magit";
+    homepage = "https://github.com/Piturnah/gex";
+    license = with licenses; [ asl20 /* or */ mit ];
+    maintainers = with maintainers; [ Br1ght0ne ];
+  };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix
index 6663a52b82881..15b164284bfb6 100644
--- a/pkgs/applications/version-management/git-and-tools/gh/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "gh";
-  version = "2.18.0";
+  version = "2.18.1";
 
   src = fetchFromGitHub {
     owner = "cli";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-MnjUJFylU2YoM3SsxRIjakFKiYkfyVNiCpMc0euu0fc=";
+    sha256 = "sha256-igtbMrm4cgaBWxjvv8UjqvPNFSi1UxNgplWYArqRRi0=";
   };
 
   vendorSha256 = "sha256-XWquL/+47t467kOYpDgMmT7t3hbdCiPQnatRW+VtaYc=";