From e12d996eb30307f9cbbc3ab3207dc9e400e5c36b Mon Sep 17 00:00:00 2001 From: nat Date: Tue, 24 Oct 2023 17:15:14 +0200 Subject: [PATCH 1/3] steamguard-cli: migrate to by-name --- .../default.nix => by-name/st/steamguard-cli/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/security/steamguard-cli/default.nix => by-name/st/steamguard-cli/package.nix} (100%) diff --git a/pkgs/tools/security/steamguard-cli/default.nix b/pkgs/by-name/st/steamguard-cli/package.nix similarity index 100% rename from pkgs/tools/security/steamguard-cli/default.nix rename to pkgs/by-name/st/steamguard-cli/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a23e5416f95..b8fc2e54facc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38419,8 +38419,6 @@ with pkgs; steamback = python311.pkgs.callPackage ../tools/games/steamback { }; - steamguard-cli = callPackage ../tools/security/steamguard-cli { }; - protontricks = python3Packages.callPackage ../tools/package-management/protontricks { inherit winetricks steam-run yad; }; From c7d9444e92e8050177ae1c109d75ad27bed62b56 Mon Sep 17 00:00:00 2001 From: nat Date: Tue, 24 Oct 2023 17:57:46 +0200 Subject: [PATCH 2/3] steamguard-cli: setup shell completions --- pkgs/by-name/st/steamguard-cli/package.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix index 643a5ad07ef9..29733dfdcd2f 100644 --- a/pkgs/by-name/st/steamguard-cli/package.nix +++ b/pkgs/by-name/st/steamguard-cli/package.nix @@ -1,4 +1,5 @@ -{ lib +{ installShellFiles +, lib , rustPlatform , fetchFromGitHub }: @@ -16,6 +17,14 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-qQA7UdtFqGPyCRHdV+FfbQFiPaOeW4rT4dYC3BeHDw0="; + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + installShellCompletion --cmd steamguard \ + --bash <($out/bin/steamguard completion --shell bash) \ + --fish <($out/bin/steamguard completion --shell fish) \ + --zsh <($out/bin/steamguard completion --shell zsh) \ + ''; + meta = with lib; { changelog = "https://github.com/dyc3/steamguard-cli/releases/tag/v${version}"; description = "A linux utility for generating 2FA codes for Steam and managing Steam trade confirmations."; From 0ede6c69721531256479f89eca50225fbf65372a Mon Sep 17 00:00:00 2001 From: nat Date: Wed, 25 Oct 2023 19:12:12 +0200 Subject: [PATCH 3/3] steamguard-cli: 0.12.2 -> 0.12.3 --- pkgs/by-name/st/steamguard-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix index 29733dfdcd2f..d93cfa4b281c 100644 --- a/pkgs/by-name/st/steamguard-cli/package.nix +++ b/pkgs/by-name/st/steamguard-cli/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "steamguard-cli"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "dyc3"; repo = pname; rev = "v${version}"; - hash = "sha256-p3v7XiOXWH6F1oIiARr0K3sYOXCcNS97+THIG7k72wk="; + hash = "sha256-qfyo63u6gBkGNxVBmFsz9YXs6duRU/VnFly40C13vI8="; }; - cargoHash = "sha256-qQA7UdtFqGPyCRHdV+FfbQFiPaOeW4rT4dYC3BeHDw0="; + cargoHash = "sha256-B8/WCSHC905wDxYGLYVMT0QxgMiGR0/VMVzOlyTKPss="; nativeBuildInputs = [ installShellFiles ]; postInstall = ''