mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-30 02:42:59 +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.
31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
diff --git a/etc/Makefile.am b/etc/Makefile.am
|
|
index 5a01282..6a40921 100644
|
|
--- a/etc/Makefile.am
|
|
+++ b/etc/Makefile.am
|
|
@@ -24,17 +24,17 @@ pkgsysconfdir = $(sysconfdir)/@PACKAGE@
|
|
|
|
install-data-local: $(dist_pkgdata_DATA)
|
|
@$(NORMAL_INSTALL)
|
|
- $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)
|
|
- $(INSTALL_DATA) -b $(srcdir)/davfs2.conf $(DESTDIR)$(pkgsysconfdir)/davfs2.conf
|
|
- $(INSTALL_DATA) -b -m 600 $(srcdir)/secrets $(DESTDIR)$(pkgsysconfdir)/secrets
|
|
- $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)/certs
|
|
- $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)/certs/private
|
|
- chmod 700 $(DESTDIR)$(pkgsysconfdir)/certs/private
|
|
+ $(mkinstalldirs) $(out)$(pkgsysconfdir)
|
|
+ $(INSTALL_DATA) -b $(srcdir)/davfs2.conf $(out)$(pkgsysconfdir)/davfs2.conf
|
|
+ $(INSTALL_DATA) -b -m 600 $(srcdir)/secrets $(out)$(pkgsysconfdir)/secrets
|
|
+ $(mkinstalldirs) $(out)$(pkgsysconfdir)/certs
|
|
+ $(mkinstalldirs) $(out)$(pkgsysconfdir)/certs/private
|
|
+ chmod 700 $(out)$(pkgsysconfdir)/certs/private
|
|
|
|
uninstall-local:
|
|
@$(NORMAL_UNINSTALL)
|
|
@list='$(dist_pkgdata_DATA)'; for p in $$list; do \
|
|
f="`echo $$p | sed -e 's|^.*/||'`"; \
|
|
- echo " rm -f $(DESTDIR)$(pkgsysconfdir)/$$f"; \
|
|
- rm -f $(DESTDIR)$(pkgsysconfdir)/$$f; \
|
|
+ echo " rm -f $(out)$(pkgsysconfdir)/$$f"; \
|
|
+ rm -f $(out)$(pkgsysconfdir)/$$f; \
|
|
done
|