From 486132e97c0e8a718e6522f21a248865f9932a9c Mon Sep 17 00:00:00 2001 From: Colin Arnott Date: Fri, 6 Jan 2023 00:03:35 +0000 Subject: [PATCH] netmaker-full: init at 0.17.1 We got complaints that netclient is not really netmaker. So like other monorepo packages, we have split out netmaker to contain just the server binary, and netmaker-full contains everything in the repo. Updates #207802 --- pkgs/applications/networking/netmaker/default.nix | 15 ++++++++++----- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index ce074c49cb6..4268191b42f 100644 --- a/pkgs/applications/networking/netmaker/default.nix +++ b/pkgs/applications/networking/netmaker/default.nix @@ -1,4 +1,12 @@ -{ buildGoModule, fetchFromGitHub, installShellFiles, lib, libglvnd, pkg-config, xorg }: +{ buildGoModule +, fetchFromGitHub +, installShellFiles +, lib +, libglvnd +, pkg-config +, subPackages ? ["." "netclient"] +, xorg +}: buildGoModule rec { pname = "netmaker"; @@ -13,10 +21,7 @@ buildGoModule rec { vendorHash = "sha256-4LaGwwDu3pKd6I6r/F3isCi9CuFqPGvc5SdVTV34qOI="; - subPackages = [ - "." - "netclient" - ]; + inherit subPackages; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44e4475033d..ca1ac95d5ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31027,7 +31027,8 @@ with pkgs; nerd-font-patcher = callPackage ../applications/misc/nerd-font-patcher { }; - netmaker = callPackage ../applications/networking/netmaker {}; + netmaker = callPackage ../applications/networking/netmaker {subPackages = ["."];}; + netmaker-full = callPackage ../applications/networking/netmaker {}; newsflash = callPackage ../applications/networking/feedreaders/newsflash { webkitgtk = webkitgtk_5_0;