From 1b9af797ec106b0b812c842d3734a4f6ed821dc9 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 30 Aug 2024 14:33:08 -0700 Subject: [PATCH 1/2] breakpointHook: move to by-name, mark broken instead of asserting --- .../br/breakpointHook}/breakpoint-hook.sh | 0 pkgs/by-name/br/breakpointHook/package.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 5 ----- 3 files changed, 6 insertions(+), 5 deletions(-) rename pkgs/{build-support/setup-hooks => by-name/br/breakpointHook}/breakpoint-hook.sh (100%) create mode 100644 pkgs/by-name/br/breakpointHook/package.nix diff --git a/pkgs/build-support/setup-hooks/breakpoint-hook.sh b/pkgs/by-name/br/breakpointHook/breakpoint-hook.sh similarity index 100% rename from pkgs/build-support/setup-hooks/breakpoint-hook.sh rename to pkgs/by-name/br/breakpointHook/breakpoint-hook.sh diff --git a/pkgs/by-name/br/breakpointHook/package.nix b/pkgs/by-name/br/breakpointHook/package.nix new file mode 100644 index 000000000000..c6c705788914 --- /dev/null +++ b/pkgs/by-name/br/breakpointHook/package.nix @@ -0,0 +1,6 @@ +{ stdenv, makeSetupHook }: + +makeSetupHook { + name = "breakpoint-hook"; + meta.broken = !stdenv.buildPlatform.isLinux; +} ./breakpoint-hook.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c972e7862a8..0f960281982f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4261,11 +4261,6 @@ with pkgs; brutespray = callPackage ../tools/security/brutespray { }; - breakpointHook = assert stdenv.buildPlatform.isLinux; - makeSetupHook { - name = "breakpoint-hook"; - } ../build-support/setup-hooks/breakpoint-hook.sh; - btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; btrfs-snap = callPackage ../tools/filesystems/btrfs-snap { }; From 558fc2db774e371da51ea04043b948e53244a15b Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 30 Aug 2024 14:33:50 -0700 Subject: [PATCH 2/2] nuv: remove breakpointHook from nativeBuildInputs --- pkgs/by-name/nu/nuv/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/nu/nuv/package.nix b/pkgs/by-name/nu/nuv/package.nix index 386828568104..f4ae78469d9f 100644 --- a/pkgs/by-name/nu/nuv/package.nix +++ b/pkgs/by-name/nu/nuv/package.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , buildGoModule , makeWrapper -, breakpointHook , jq , curl , kubectl @@ -32,7 +31,7 @@ buildGoModule { subPackages = [ "." ]; vendorHash = "sha256-JkQbQ2NEaumXbAfsv0fNiQf/EwMs3SDLHvu7c/bU7fU="; - nativeBuildInputs = [ makeWrapper jq curl breakpointHook ]; + nativeBuildInputs = [ makeWrapper jq curl ]; ldflags = [ "-s"