diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
| commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
| tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch | |
| parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
| parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
| download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch')
| -rw-r--r-- | nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch b/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch index 3a05d3bbf87b..6e24d707d0ae 100644 --- a/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch +++ b/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch @@ -1,8 +1,8 @@ diff --git a/collectors/Makefile.am b/collectors/Makefile.am -index 24e4c3f09..b3c354943 100644 +index 2aec3dd3e..27385ec28 100644 --- a/collectors/Makefile.am +++ b/collectors/Makefile.am -@@ -30,7 +30,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d +@@ -31,7 +31,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d usergoconfigdir=$(configdir)/go.d # Explicitly install directories to avoid permission issues due to umask @@ -62,7 +62,7 @@ index c8144c137..f8aaa89b6 100644 +no-install-exec-local: $(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir) diff --git a/health/Makefile.am b/health/Makefile.am -index ea1b6e961..071fdd564 100644 +index 20e000860..add0137b3 100644 --- a/health/Makefile.am +++ b/health/Makefile.am @@ -19,7 +19,7 @@ dist_userhealthconfig_DATA = \ @@ -75,10 +75,10 @@ index ea1b6e961..071fdd564 100644 healthconfigdir=$(libconfigdir)/health.d diff --git a/system/Makefile.am b/system/Makefile.am -index 13466639d..e7cc7acea 100644 +index 54e9278c8..e7cc7acea 100644 --- a/system/Makefile.am +++ b/system/Makefile.am -@@ -21,11 +21,9 @@ include $(top_srcdir)/build/subst.inc +@@ -21,12 +21,9 @@ include $(top_srcdir)/build/subst.inc SUFFIXES = .in dist_config_SCRIPTS = \ @@ -87,10 +87,11 @@ index 13466639d..e7cc7acea 100644 dist_config_DATA = \ - .install-type \ +- netdata-updater.conf \ $(NULL) libconfigvnodesdir=$(libconfigdir)/vnodes -@@ -45,7 +43,7 @@ libsysrunitdir=$(libsysdir)/runit +@@ -46,7 +43,7 @@ libsysrunitdir=$(libsysdir)/runit libsyssystemddir=$(libsysdir)/systemd # Explicitly install directories to avoid permission issues due to umask @@ -112,6 +113,3 @@ index be2c545c3..55f373114 100644 $(INSTALL) -d $(DESTDIR)$(usersslconfigdir) dist_noinst_DATA = \ --- -2.40.1 - |