Merge remote-tracking branch 'nixpkgs/nixos-unstable' HEAD master

2 files changed, 40 insertions, 3 deletions

diff --git a/nixpkgs/pkgs/by-name/nh/nh/package.nix b/nixpkgs/pkgs/by-name/nh/nh/package.nix
index e20797546f1a..14c22003e64c 100644
--- a/nixpkgs/pkgs/by-name/nh/nh/package.nix
+++ b/nixpkgs/pkgs/by-name/nh/nh/package.nix
@@ -10,7 +10,7 @@
 , nix-output-monitor
 }:
 let
-  version = "3.5.15";
+  version = "3.5.17";
   runtimeDeps = [ nvd nix-output-monitor ];
 in
 rustPlatform.buildRustPackage {
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage {
     owner = "viperML";
     repo = "nh";
     rev = "refs/tags/v${version}";
-    hash = "sha256-1mE4ZXGAMZl2Mufr47y+2UMDHBelqsvChaCsQDK3m70=";
+    hash = "sha256-o4K6QHBjXrmcYkX9MIw9gZ+DHM3OaEVswswHRX9h8Is=";
   };
 
   strictDeps = true;
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage {
       --prefix PATH : ${lib.makeBinPath runtimeDeps}
   '';
 
-  cargoHash = "sha256-5BazSJGsafSl0eE7GOWw2SrVgC3k1tlrLiIFIpC51/o=";
+  cargoHash = "sha256-6Y5vpXEuHZXe9HKk6KomujlibzwtZJbtn6YgOqbmInk=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/nixpkgs/pkgs/by-name/nh/nhost-cli/package.nix b/nixpkgs/pkgs/by-name/nh/nhost-cli/package.nix
new file mode 100644
index 000000000000..d3a88416983d
--- /dev/null
+++ b/nixpkgs/pkgs/by-name/nh/nhost-cli/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "nhost-cli";
+  version = "1.18.3";
+
+  src = fetchFromGitHub {
+    owner = "nhost";
+    repo = "cli";
+    rev = "v${version}";
+    hash = "sha256-TYi0Cth4GWEIT9QRUC4z3Uwnh4EmywY+XCOM5oJP+4g=";
+  };
+
+  vendorHash = null;
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X=main.Version=v${version}"
+  ];
+
+  postInstall = ''
+    mv $out/bin/cli $out/bin/nhost
+  '';
+
+  meta = {
+    description = "A tool for setting up a local development environment for Nhost";
+    homepage = "https://github.com/nhost/cli";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ moraxyc ];
+    mainProgram = "nhost";
+  };
+}