From 4eef2a3d43e42855a495f76cfaafebe1d90d0b9a Mon Sep 17 00:00:00 2001 From: John Garcia Date: Tue, 23 Jul 2024 22:39:36 +0100 Subject: [PATCH 1/3] apx: move to pkgs/by-name --- .../apx/default.nix => by-name/ap/apx/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/package-management/apx/default.nix => by-name/ap/apx/package.nix} (100%) diff --git a/pkgs/tools/package-management/apx/default.nix b/pkgs/by-name/ap/apx/package.nix similarity index 100% rename from pkgs/tools/package-management/apx/default.nix rename to pkgs/by-name/ap/apx/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 413d54d74751..b7bbda849dc0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38636,8 +38636,6 @@ with pkgs; eiciel = callPackage ../tools/filesystems/eiciel { }; - apx = callPackage ../tools/package-management/apx { }; - dpkg = callPackage ../tools/package-management/dpkg { }; dumb = callPackage ../misc/dumb { }; From 301779587affb96a7e9be8bb34c0d12d7261a84b Mon Sep 17 00:00:00 2001 From: John Garcia Date: Tue, 23 Jul 2024 22:43:29 +0100 Subject: [PATCH 2/3] apx: 2.4.2 -> 2.4.3 --- pkgs/by-name/ap/apx/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ap/apx/package.nix b/pkgs/by-name/ap/apx/package.nix index 1e161b805e94..54b3965d03e6 100644 --- a/pkgs/by-name/ap/apx/package.nix +++ b/pkgs/by-name/ap/apx/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "apx"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "Vanilla-OS"; repo = "apx"; rev = "v${version}"; - hash = "sha256-X6nphUzJc/R3Egw09eRQbza1QebpLGsMIfV7BpLOXTc="; + hash = "sha256-zzdg8cIu4+l8f//Rn11NByh6jfVpidZ+5PT+DubzYPU="; }; - vendorHash = "sha256-hGi+M5RRUL2oyxFGVeR0sum93/CA+FGYy0m4vDmlXTc="; + vendorHash = "sha256-YHnPLjZWUYoARHF4V1Pm1LYdCJGubPCve0wQ5FpeXUg="; # podman needed for apx to not error when building shell completions nativeBuildInputs = [ installShellFiles podman ]; From 1c276021b506f71ea711f34ac3a26f9841d6787e Mon Sep 17 00:00:00 2001 From: John Garcia Date: Tue, 23 Jul 2024 22:44:15 +0100 Subject: [PATCH 3/3] apx: add version to build flags --- pkgs/by-name/ap/apx/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ap/apx/package.nix b/pkgs/by-name/ap/apx/package.nix index 54b3965d03e6..569559147a53 100644 --- a/pkgs/by-name/ap/apx/package.nix +++ b/pkgs/by-name/ap/apx/package.nix @@ -23,7 +23,7 @@ buildGoModule rec { # podman needed for apx to not error when building shell completions nativeBuildInputs = [ installShellFiles podman ]; - ldflags = [ "-s" "-w" ]; + ldflags = [ "-s" "-w" "-X 'main.Version=v${version}'" ]; postPatch = '' substituteInPlace config/apx.json \