From f3c94988cd60d8bba9b442bbee22f269263c4802 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Mon, 19 Aug 2024 14:57:27 +0200 Subject: [PATCH] labctl: 0.0.22 -> 0.0.22-unstable-2024-05-10 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- .../la/labctl/package.nix} | 25 ++++++------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 8 insertions(+), 19 deletions(-) rename pkgs/{tools/networking/labctl/default.nix => by-name/la/labctl/package.nix} (63%) diff --git a/pkgs/tools/networking/labctl/default.nix b/pkgs/by-name/la/labctl/package.nix similarity index 63% rename from pkgs/tools/networking/labctl/default.nix rename to pkgs/by-name/la/labctl/package.nix index 89c84e4f1832..231d0984b207 100644 --- a/pkgs/tools/networking/labctl/default.nix +++ b/pkgs/by-name/la/labctl/package.nix @@ -1,30 +1,21 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, fetchpatch -, installShellFiles +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, }: buildGoModule rec { pname = "labctl"; - version = "0.0.22"; + version = "0.0.22-unstable-2024-05-10"; src = fetchFromGitHub { owner = "labctl"; repo = "labctl"; - rev = "v${version}"; - hash = "sha256-84t7qhLafNyPLgHmFQUsizEn6Us44dDTercGEm9lup4="; + rev = "1a8b11402def10819d36b9f7f44e82612ef22674"; + hash = "sha256-px5jrfllo6teJaNrqIQVyqMwArCw625xSVM7V/xW/IA="; }; - patches = [ - # Fix build failure with Go 1.21 by updating go4.org/unsafe/assume-no-moving-gc - # See https://github.com/labctl/labctl/pull/4 - (fetchpatch { - url = "https://github.com/labctl/labctl/commit/615d05e94b991362beddce71c7ee34eae7fc93ff.patch"; - hash = "sha256-4JrXSsg8rfuH6i8XyLd/qO6AibkRMDBIpfT8r1yS75c="; - }) - ]; - nativeBuildInputs = [ installShellFiles ]; vendorHash = "sha256-Ycr/IZckIFysS9Goes58hhgh96UMRHjYWfWlQU23mXk="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aba3cf0100fc..6b86c8cc8234 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2459,8 +2459,6 @@ with pkgs; lab = callPackage ../applications/version-management/lab { }; - labctl = callPackage ../tools/networking/labctl { }; - legit = callPackage ../applications/version-management/legit { }; legit-web = callPackage ../applications/version-management/legit-web { };