diff options
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/localtime/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/system/netdata/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch | 16 |
3 files changed, 24 insertions, 4 deletions
diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix index 943651fa249..b1f05cb1851 100644 --- a/pkgs/tools/system/localtime/default.nix +++ b/pkgs/tools/system/localtime/default.nix @@ -7,16 +7,16 @@ buildGoModule { pname = "localtime"; - version = "unstable-2021-11-23"; + version = "unstable-2022-02-20"; src = fetchFromGitHub { owner = "Stebalien"; repo = "localtime"; - rev = "3e5d6cd64444b2164e87cea03448bfb8eefd6ccd"; - sha256 = "sha256-6uxxPq6abtRqM/R2Fw46ynP9PEkHggTSUymLYlQXQRU="; + rev = "c1e10aa4141ed2bb01986b48e0e942e618993c06"; + hash = "sha256-bPQ1c2KUTkxx2g7IvLmrKgJKfRHTLlTXLR/QQ0O4CrI="; }; - vendorSha256 = "sha256-sf3sL6aO5jSytT2NtBkA3lhg77RIzbYkSC4fkH+cwwk="; + vendorSha256 = "sha256-12JnEU41sp9qRP07p502EYogveE+aNdfmLwlDRbIdxU="; postPatch = '' demoPath="${geoclue2-with-demo-agent}/libexec/geoclue-2.0/demos/agent" diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index b194b2f2a4b..dd50e48f073 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -49,6 +49,10 @@ in stdenv.mkDerivation rec { # Therefore we put it into `/run/netdata`, which is owned # by netdata only. ./ipc-socket-in-run.patch + + # Avoid build-only inputs in closure leaked by configure command: + # https://github.com/NixOS/nixpkgs/issues/175693#issuecomment-1143344162 + ./skip-CONFIGURE_COMMAND.patch ]; NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; diff --git a/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch b/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch new file mode 100644 index 00000000000..fa7a0e7ad9c --- /dev/null +++ b/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch @@ -0,0 +1,16 @@ +Shrink closure size by avoiding paths embedded from configure call. + +https://github.com/NixOS/nixpkgs/issues/175693 +--- a/daemon/buildinfo.c ++++ b/daemon/buildinfo.c +@@ -248,7 +248,9 @@ void print_build_info(void) { + char *prebuilt_distro = NULL; + get_install_type(&install_type, &prebuilt_arch, &prebuilt_distro); + +- printf("Configure options: %s\n", CONFIGURE_COMMAND); ++ // To minimize closure size do not persist configure options ++ // with build-time inputs. ++ printf("Configure options: REMOVED\n"); + + if (install_type == NULL) { + printf("Install type: unknown\n"); |