Merge pull request NixOS#270024 from Artturin/fixrebuilds1

Revert "Systemd package rewrite"
chriscoffee · Nov 26, 2023 · 1650071 · 1650071
2 parents ec60dd7 + 40eff71
commit 1650071
Show file tree

Hide file tree

Showing 21 changed files with 138 additions and 177 deletions.
diff --git a/...s-for-uninitialised-encrypted-devic.patch → ...s-for-uninitialised-encrypted-devic.patch b/...s-for-uninitialised-encrypted-devic.patch → ...s-for-uninitialised-encrypted-devic.patch
diff --git a/...n-t-try-to-unmount-nix-or-nix-store.patch → ...n-t-try-to-unmount-nix-or-nix-store.patch b/...n-t-try-to-unmount-nix-or-nix-store.patch → ...n-t-try-to-unmount-nix-or-nix-store.patch
diff --git a/...y/systemd/0003-Fix-NixOS-containers.patch → ...x/systemd/0003-Fix-NixOS-containers.patch b/...y/systemd/0003-Fix-NixOS-containers.patch → ...x/systemd/0003-Fix-NixOS-containers.patch
diff --git a/...ome-NixOS-specific-unit-directories.patch → ...ome-NixOS-specific-unit-directories.patch b/...ome-NixOS-specific-unit-directories.patch → ...ome-NixOS-specific-unit-directories.patch
diff --git a/...-a-useless-message-in-user-sessions.patch → ...-a-useless-message-in-user-sessions.patch b/...-a-useless-message-in-user-sessions.patch → ...-a-useless-message-in-user-sessions.patch
diff --git a/...-timedated-disable-methods-that-cha.patch → ...-timedated-disable-methods-that-cha.patch b/...-timedated-disable-methods-that-cha.patch → ...-timedated-disable-methods-that-cha.patch
diff --git a/...name/sy/systemd/0007-Fix-hwdb-paths.patch → ...c/linux/systemd/0007-Fix-hwdb-paths.patch b/...name/sy/systemd/0007-Fix-hwdb-paths.patch → ...c/linux/systemd/0007-Fix-hwdb-paths.patch
diff --git a/...-usr-share-zoneinfo-to-etc-zoneinfo.patch → ...-usr-share-zoneinfo-to-etc-zoneinfo.patch b/...-usr-share-zoneinfo-to-etc-zoneinfo.patch → ...-usr-share-zoneinfo-to-etc-zoneinfo.patch
diff --git a/...alectl-use-etc-X11-xkb-for-list-x11.patch → ...alectl-use-etc-X11-xkb-for-list-x11.patch b/...alectl-use-etc-X11-xkb-for-list-x11.patch → ...alectl-use-etc-X11-xkb-for-list-x11.patch
diff --git a/...e-statedir-and-don-t-touch-prefixdi.patch → ...e-statedir-and-don-t-touch-prefixdi.patch b/...e-statedir-and-don-t-touch-prefixdi.patch → ...e-statedir-and-don-t-touch-prefixdi.patch
diff --git a/...-add-rootprefix-to-lookup-dir-paths.patch → ...-add-rootprefix-to-lookup-dir-paths.patch b/...-add-rootprefix-to-lookup-dir-paths.patch → ...-add-rootprefix-to-lookup-dir-paths.patch
diff --git a/...execute-scripts-in-etc-systemd-syst.patch → ...execute-scripts-in-etc-systemd-syst.patch b/...execute-scripts-in-etc-systemd-syst.patch → ...execute-scripts-in-etc-systemd-syst.patch
diff --git a/...cute-scripts-in-etc-systemd-system-.patch → ...cute-scripts-in-etc-systemd-system-.patch b/...cute-scripts-in-etc-systemd-system-.patch → ...cute-scripts-in-etc-systemd-system-.patch
diff --git a/...placeholder-for-DEFAULT_PATH_NORMAL.patch → ...placeholder-for-DEFAULT_PATH_NORMAL.patch b/...placeholder-for-DEFAULT_PATH_NORMAL.patch → ...placeholder-for-DEFAULT_PATH_NORMAL.patch
diff --git a/...kg-config-derive-prefix-from-prefix.patch → ...kg-config-derive-prefix-from-prefix.patch b/...kg-config-derive-prefix-from-prefix.patch → ...kg-config-derive-prefix-from-prefix.patch
diff --git a/...environment-when-calling-generators.patch → ...environment-when-calling-generators.patch b/...environment-when-calling-generators.patch → ...environment-when-calling-generators.patch
diff --git a/...17-core-don-t-taint-on-unmerged-usr.patch → ...17-core-don-t-taint-on-unmerged-usr.patch b/...17-core-don-t-taint-on-unmerged-usr.patch → ...17-core-don-t-taint-on-unmerged-usr.patch
diff --git a/...ntext_init-fix-driver-name-checking.patch → ...ntext_init-fix-driver-name-checking.patch b/...ntext_init-fix-driver-name-checking.patch → ...ntext_init-fix-driver-name-checking.patch
diff --git a/...ggest-systemdctl-edit-runtime-on-sy.patch → ...ggest-systemdctl-edit-runtime-on-sy.patch b/...ggest-systemdctl-edit-runtime-on-sy.patch → ...ggest-systemdctl-edit-runtime-on-sy.patch
diff --git a/pkgs/by-name/sy/systemd/package.nix → pkgs/os-specific/linux/systemd/default.nix b/pkgs/by-name/sy/systemd/package.nix → pkgs/os-specific/linux/systemd/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -28734,7 +28734,7 @@ with pkgs;
 
   sysstat = callPackage ../os-specific/linux/sysstat { };
 
-  systemd = callPackage ../by-name/sy/systemd/package.nix {
+  systemd = callPackage ../os-specific/linux/systemd {
     # break some cyclic dependencies
     util-linux = util-linuxMinimal;
     # provide a super minimal gnupg used for systemd-machined