mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-07 04:34:46 +00:00
571c71e6f7
We are migrating packages that meet below requirements:
1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration
The tool is here: https://github.com/Aleksanaa/by-name-migrate.
33 lines
1.0 KiB
Diff
33 lines
1.0 KiB
Diff
diff --git a/samples/Makefile.am b/samples/Makefile.am
|
|
index c253c91..107401d 100644
|
|
--- a/samples/Makefile.am
|
|
+++ b/samples/Makefile.am
|
|
@@ -19,11 +19,6 @@ EXTRA_DIST = knot.sample.conf.in example.com.zone
|
|
|
|
if HAVE_DAEMON
|
|
|
|
-install-data-local: knot.sample.conf
|
|
- if [ \! -f $(DESTDIR)/$(config_dir)/knot.sample.conf ]; then \
|
|
- $(INSTALL) -d $(DESTDIR)/$(config_dir); \
|
|
- $(INSTALL_DATA) knot.sample.conf $(srcdir)/example.com.zone $(DESTDIR)/$(config_dir); \
|
|
- fi
|
|
uninstall-local:
|
|
-rm -rf $(DESTDIR)/$(config_dir)/knot.sample.conf \
|
|
$(DESTDIR)/$(config_dir)/example.com.zone
|
|
diff --git a/src/utils/Makefile.inc b/src/utils/Makefile.inc
|
|
index e6765d9..d859d23 100644
|
|
--- a/src/utils/Makefile.inc
|
|
+++ b/src/utils/Makefile.inc
|
|
@@ -79,11 +79,6 @@ endif HAVE_DNSTAP
|
|
endif HAVE_UTILS
|
|
|
|
if HAVE_DAEMON
|
|
-# Create storage and run-time directories
|
|
-install-data-hook:
|
|
- $(INSTALL) -d $(DESTDIR)/@config_dir@
|
|
- $(INSTALL) -d $(DESTDIR)/@run_dir@
|
|
- $(INSTALL) -d $(DESTDIR)/@storage_dir@
|
|
|
|
sbin_PROGRAMS = knotc knotd
|
|
|