From 33d2a40d6751477472a2eeb0531ef7ddbf1cc695 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 24 Nov 2023 16:39:57 -0300 Subject: [PATCH] systemd: migrate to by-name --- ...1-Start-device-units-for-uninitialised-encrypted-devic.patch | 0 .../systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch | 0 .../sy}/systemd/0003-Fix-NixOS-containers.patch | 0 .../systemd/0004-Add-some-NixOS-specific-unit-directories.patch | 0 .../0005-Get-rid-of-a-useless-message-in-user-sessions.patch | 0 ...6-hostnamed-localed-timedated-disable-methods-that-cha.patch | 0 .../linux => by-name/sy}/systemd/0007-Fix-hwdb-paths.patch | 0 .../0008-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch | 0 .../systemd/0009-localectl-use-etc-X11-xkb-for-list-x11.patch | 0 ...0-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch | 0 .../sy}/systemd/0011-add-rootprefix-to-lookup-dir-paths.patch | 0 ...2-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch | 0 ...3-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch | 0 ...14-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch | 0 .../sy}/systemd/0015-pkg-config-derive-prefix-from-prefix.patch | 0 ...16-inherit-systemd-environment-when-calling-generators.patch | 0 .../sy}/systemd/0017-core-don-t-taint-on-unmerged-usr.patch | 0 .../0018-tpm2_context_init-fix-driver-name-checking.patch | 0 ...9-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch | 0 .../systemd/default.nix => by-name/sy/systemd/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 21 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{os-specific/linux => by-name/sy}/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch (100%) rename pkgs/{os-specific/linux => by-name/sy}/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch (100%) rename pkgs/{os-specific/linux => by-name/sy}/systemd/0003-Fix-NixOS-containers.patch (100%) rename pkgs/{os-specific/linux => by-name/sy}/systemd/0004-Add-some-NixOS-specific-unit-directories.patch (100%) rename pkgs/{os-specific/linux => by-name/sy}/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch (100%) rename pkgs/{os-specific/linux => by-name/sy}/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch (100%) rename pkgs/{os-specific/linux => by-name/sy}/systemd/0007-Fix-hwdb-paths.patch (100%) rename pkgs/{os-specific/linux => by-name/sy}/systemd/0008-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch (100%) rename pkgs/{os-specific/linux => by-name/sy}/systemd/0009-localectl-use-etc-X11-xkb-for-list-x11.patch (100%) rename pkgs/{os-specific/linux => by-name/sy}/systemd/0010-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch (100%) rename pkgs/{os-specific/linux => by-name/sy}/systemd/0011-add-rootprefix-to-lookup-dir-paths.patch (100%) rename pkgs/{os-specific/linux => by-name/sy}/systemd/0012-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch (100%) rename pkgs/{os-specific/linux => by-name/sy}/systemd/0013-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch (100%) rename pkgs/{os-specific/linux => by-name/sy}/systemd/0014-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch (100%) rename pkgs/{os-specific/linux => by-name/sy}/systemd/0015-pkg-config-derive-prefix-from-prefix.patch (100%) rename pkgs/{os-specific/linux => by-name/sy}/systemd/0016-inherit-systemd-environment-when-calling-generators.patch (100%) rename pkgs/{os-specific/linux => by-name/sy}/systemd/0017-core-don-t-taint-on-unmerged-usr.patch (100%) rename pkgs/{os-specific/linux => by-name/sy}/systemd/0018-tpm2_context_init-fix-driver-name-checking.patch (100%) rename pkgs/{os-specific/linux => by-name/sy}/systemd/0019-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch (100%) rename pkgs/{os-specific/linux/systemd/default.nix => by-name/sy/systemd/package.nix} (100%) diff --git a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/by-name/sy/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch rename to pkgs/by-name/sy/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch diff --git a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/by-name/sy/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch rename to pkgs/by-name/sy/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch diff --git a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/pkgs/by-name/sy/systemd/0003-Fix-NixOS-containers.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch rename to pkgs/by-name/sy/systemd/0003-Fix-NixOS-containers.patch diff --git a/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch b/pkgs/by-name/sy/systemd/0004-Add-some-NixOS-specific-unit-directories.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch rename to pkgs/by-name/sy/systemd/0004-Add-some-NixOS-specific-unit-directories.patch diff --git a/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch b/pkgs/by-name/sy/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch rename to pkgs/by-name/sy/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch diff --git a/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch b/pkgs/by-name/sy/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch rename to pkgs/by-name/sy/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch diff --git a/pkgs/os-specific/linux/systemd/0007-Fix-hwdb-paths.patch b/pkgs/by-name/sy/systemd/0007-Fix-hwdb-paths.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0007-Fix-hwdb-paths.patch rename to pkgs/by-name/sy/systemd/0007-Fix-hwdb-paths.patch diff --git a/pkgs/os-specific/linux/systemd/0008-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/by-name/sy/systemd/0008-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0008-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch rename to pkgs/by-name/sy/systemd/0008-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch diff --git a/pkgs/os-specific/linux/systemd/0009-localectl-use-etc-X11-xkb-for-list-x11.patch b/pkgs/by-name/sy/systemd/0009-localectl-use-etc-X11-xkb-for-list-x11.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0009-localectl-use-etc-X11-xkb-for-list-x11.patch rename to pkgs/by-name/sy/systemd/0009-localectl-use-etc-X11-xkb-for-list-x11.patch diff --git a/pkgs/os-specific/linux/systemd/0010-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch b/pkgs/by-name/sy/systemd/0010-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0010-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch rename to pkgs/by-name/sy/systemd/0010-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch diff --git a/pkgs/os-specific/linux/systemd/0011-add-rootprefix-to-lookup-dir-paths.patch b/pkgs/by-name/sy/systemd/0011-add-rootprefix-to-lookup-dir-paths.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0011-add-rootprefix-to-lookup-dir-paths.patch rename to pkgs/by-name/sy/systemd/0011-add-rootprefix-to-lookup-dir-paths.patch diff --git a/pkgs/os-specific/linux/systemd/0012-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/pkgs/by-name/sy/systemd/0012-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0012-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch rename to pkgs/by-name/sy/systemd/0012-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch diff --git a/pkgs/os-specific/linux/systemd/0013-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/pkgs/by-name/sy/systemd/0013-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0013-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch rename to pkgs/by-name/sy/systemd/0013-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch diff --git a/pkgs/os-specific/linux/systemd/0014-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/pkgs/by-name/sy/systemd/0014-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0014-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch rename to pkgs/by-name/sy/systemd/0014-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch diff --git a/pkgs/os-specific/linux/systemd/0015-pkg-config-derive-prefix-from-prefix.patch b/pkgs/by-name/sy/systemd/0015-pkg-config-derive-prefix-from-prefix.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0015-pkg-config-derive-prefix-from-prefix.patch rename to pkgs/by-name/sy/systemd/0015-pkg-config-derive-prefix-from-prefix.patch diff --git a/pkgs/os-specific/linux/systemd/0016-inherit-systemd-environment-when-calling-generators.patch b/pkgs/by-name/sy/systemd/0016-inherit-systemd-environment-when-calling-generators.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0016-inherit-systemd-environment-when-calling-generators.patch rename to pkgs/by-name/sy/systemd/0016-inherit-systemd-environment-when-calling-generators.patch diff --git a/pkgs/os-specific/linux/systemd/0017-core-don-t-taint-on-unmerged-usr.patch b/pkgs/by-name/sy/systemd/0017-core-don-t-taint-on-unmerged-usr.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0017-core-don-t-taint-on-unmerged-usr.patch rename to pkgs/by-name/sy/systemd/0017-core-don-t-taint-on-unmerged-usr.patch diff --git a/pkgs/os-specific/linux/systemd/0018-tpm2_context_init-fix-driver-name-checking.patch b/pkgs/by-name/sy/systemd/0018-tpm2_context_init-fix-driver-name-checking.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0018-tpm2_context_init-fix-driver-name-checking.patch rename to pkgs/by-name/sy/systemd/0018-tpm2_context_init-fix-driver-name-checking.patch diff --git a/pkgs/os-specific/linux/systemd/0019-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch b/pkgs/by-name/sy/systemd/0019-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch similarity index 100% rename from pkgs/os-specific/linux/systemd/0019-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch rename to pkgs/by-name/sy/systemd/0019-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/by-name/sy/systemd/package.nix similarity index 100% rename from pkgs/os-specific/linux/systemd/default.nix rename to pkgs/by-name/sy/systemd/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dfae037c050a..c0f2df341068 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28740,7 +28740,7 @@ with pkgs; sysstat = callPackage ../os-specific/linux/sysstat { }; - systemd = callPackage ../os-specific/linux/systemd { + systemd = callPackage ../by-name/sy/systemd/package.nix { # break some cyclic dependencies util-linux = util-linuxMinimal; # provide a super minimal gnupg used for systemd-machined