mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-02 19:14:14 +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.
29 lines
738 B
Diff
29 lines
738 B
Diff
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
index a1a2e4e..fa17f9d 100644
|
|
--- a/src/Makefile.am
|
|
+++ b/src/Makefile.am
|
|
@@ -74,10 +74,6 @@ suidubins += newgidmap newuidmap
|
|
endif
|
|
endif
|
|
|
|
-if WITH_TCB
|
|
-shadowsgidubins = passwd
|
|
-endif
|
|
-
|
|
LDADD = $(INTLLIBS) \
|
|
$(top_builddir)/libmisc/libmisc.la \
|
|
$(top_builddir)/lib/libshadow.la \
|
|
@@ -146,12 +142,6 @@ install-am: all-am
|
|
set -e; for i in $(suidusbins); do \
|
|
chmod $(suidperms) $(DESTDIR)$(usbindir)/$$i; \
|
|
done
|
|
-if WITH_TCB
|
|
- set -e; for i in $(shadowsgidubins); do \
|
|
- chown root:shadow $(DESTDIR)$(ubindir)/$$i; \
|
|
- chmod $(sgidperms) $(DESTDIR)$(ubindir)/$$i; \
|
|
- done
|
|
-endif
|
|
if ENABLE_SUBIDS
|
|
if FCAPS
|
|
setcap cap_setuid+ep $(DESTDIR)$(ubindir)/newuidmap
|