Merge https://github.com/NixOS/nixpkgs

3 files changed, 61 insertions, 5 deletions

diff --git a/nixpkgs/pkgs/by-name/in/incus-unwrapped/package.nix b/nixpkgs/pkgs/by-name/in/incus-unwrapped/package.nix
index 4c256481bfc3..3beeff04f4fd 100644
--- a/nixpkgs/pkgs/by-name/in/incus-unwrapped/package.nix
+++ b/nixpkgs/pkgs/by-name/in/incus-unwrapped/package.nix
@@ -16,16 +16,16 @@
 
 buildGoModule rec {
   pname = "incus-unwrapped";
-  version = "0.2";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "lxc";
     repo = "incus";
-    rev = "refs/tags/incus-${version}";
-    hash = "sha256-WhprzGzTeB8sEMMTYN5j1Zrwg0GiGLlXTqCkcPq0XVo=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-oPBrIN4XUc9GnBszEWAAnEcNahV4hfB48XSKvkpq5Kk=";
   };
 
-  vendorHash = "sha256-4fxQHtvRULTyKJTGdo42qwWQUSIWqbqOO1Wf8daBP/s=";
+  vendorHash = "sha256-TwrHWjBd6Hn7CQMxFhHobopeefCvYeDz8fAPYmTKV9M=";
 
   postPatch = ''
     substituteInPlace internal/usbid/load.go \
@@ -36,6 +36,7 @@ buildGoModule rec {
     "cmd/incus-agent"
     "cmd/incus-migrate"
     "cmd/lxd-to-incus"
+    "test/mini-oidc"
   ];
 
   nativeBuildInputs = [
@@ -84,7 +85,7 @@ buildGoModule rec {
 
     updateScript = nix-update-script {
        extraArgs = [
-        "-vr" "incus-\(.*\)"
+        "-vr" "v\(.*\)"
        ];
      };
   };
diff --git a/nixpkgs/pkgs/by-name/in/inshellisense/package.nix b/nixpkgs/pkgs/by-name/in/inshellisense/package.nix
new file mode 100644
index 000000000000..2361c0e69ad2
--- /dev/null
+++ b/nixpkgs/pkgs/by-name/in/inshellisense/package.nix
@@ -0,0 +1,23 @@
+{ lib, buildNpmPackage, fetchFromGitHub }:
+
+buildNpmPackage rec {
+  pname = "inshellisense";
+  version = "0.0.1-rc.4";
+
+  src = fetchFromGitHub {
+    owner = "microsoft";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    hash = "sha256-PYSonVyclGSH3ArbqJuKrBNGbJaQEp6XemwnHboVwPk=";
+  };
+
+  npmDepsHash = "sha256-sjr4Hy1/zWPAlVGsMkyQIQcBT86KLaN2/UAaAd7Mn6Q=";
+
+  meta = with lib; {
+    description = "IDE style command line auto complete";
+    homepage = "https://github.com/microsoft/inshellisense";
+    license = licenses.mit;
+    maintainers = [ maintainers.malo ];
+  };
+}
+
diff --git a/nixpkgs/pkgs/by-name/in/invidtui/package.nix b/nixpkgs/pkgs/by-name/in/invidtui/package.nix
new file mode 100644
index 000000000000..bf92bfbedc64
--- /dev/null
+++ b/nixpkgs/pkgs/by-name/in/invidtui/package.nix
@@ -0,0 +1,32 @@
+{ lib, buildGoModule, fetchFromGitHub, yt-dlp, ffmpeg, mpv }:
+
+buildGoModule rec {
+  pname = "invidtui";
+  version = "0.3.6";
+
+  src = fetchFromGitHub {
+    owner = "darkhz";
+    repo = "invidtui";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-zUr0zrIJPpqhHvL7PFFN7cgcgBXV+WHO/eRes7+HzxM=";
+  };
+
+  vendorHash = "sha256-cKvY3/3N3SESBVol7Af3M3mJaPwxLzd/rKN8P+qh7sY=";
+
+  doCheck = true;
+
+  postPatch = ''
+        substituteInPlace cmd/flags.go \
+          --replace "\"ffmpeg\"" "\"${lib.getBin ffmpeg}/bin/ffmpeg\"" \
+          --replace "\"mpv\"" "\"${lib.getBin mpv}/bin/mpv\"" \
+          --replace "\"yt-dlp\"" "\"${lib.getBin yt-dlp}/bin/yt-dlp\""
+  '';
+
+  meta = with lib; {
+    homepage = "https://darkhz.github.io/invidtui/";
+    description = "An invidious TUI client";
+    license = licenses.mit;
+    maintainers = with maintainers; [ rettetdemdativ ];
+    mainProgram = "invidtui";
+  };
+}