diff options
author | Florian Klink <flokli@flokli.de> | 2020-04-30 01:03:18 +0200 |
---|---|---|
committer | Florian Klink <flokli@flokli.de> | 2020-04-30 01:47:35 +0200 |
commit | a3082bc6b796f539cbe02bffbb058966acb629b6 (patch) | |
tree | 9995d1f4931f6811a025e06d0b073779d55c9304 /pkgs/os-specific/linux/systemd/default.nix | |
parent | 8882516056f19f4a12fabd70084f4f246db9f30c (diff) | |
download | nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.gz nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.bz2 nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.lz nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.xz nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.tar.zst nixpkgs-a3082bc6b796f539cbe02bffbb058966acb629b6.zip |
systemd: regenerate patches
It seems nix is much more permissive in applying patches than git am. These patches were regenerated by running `git am path/to/nixpkgs/pkgs/os-specific/linux/systemd/*.patch`, and manually running `patch -p1 < path/to/nixpkgs/pkgs/os-specific/linux/systemd/*N.patch` where necessary.
Diffstat (limited to 'pkgs/os-specific/linux/systemd/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 5728431b059..479b747ec41 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -45,23 +45,23 @@ in stdenv.mkDerivation { patches = [ ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch - ./0003-Don-t-try-to-unmount-nix-or-nix-store.patch - ./0004-Fix-NixOS-containers.patch - ./0006-Look-for-fsck-in-the-right-place.patch - ./0007-Add-some-NixOS-specific-unit-directories.patch - ./0009-Get-rid-of-a-useless-message-in-user-sessions.patch - ./0010-hostnamed-localed-timedated-disable-methods-that-cha.patch - ./0011-Fix-hwdb-paths.patch - ./0012-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch - ./0013-localectl-use-etc-X11-xkb-for-list-x11.patch - ./0016-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch - ./0018-Install-default-configuration-into-out-share-factory.patch - ./0019-inherit-systemd-environment-when-calling-generators.patch - ./0021-add-rootprefix-to-lookup-dir-paths.patch - ./0022-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch - ./0023-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch - ./0024-kmod-static-nodes.service-Update-ConditionFileNotEmpty.patch - ./0025-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch + ./0002-Don-t-try-to-unmount-nix-or-nix-store.patch + ./0003-Fix-NixOS-containers.patch + ./0004-Look-for-fsck-in-the-right-place.patch + ./0005-Add-some-NixOS-specific-unit-directories.patch + ./0006-Get-rid-of-a-useless-message-in-user-sessions.patch + ./0007-hostnamed-localed-timedated-disable-methods-that-cha.patch + ./0008-Fix-hwdb-paths.patch + ./0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch + ./0010-localectl-use-etc-X11-xkb-for-list-x11.patch + ./0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch + ./0012-Install-default-configuration-into-out-share-factory.patch + ./0013-inherit-systemd-environment-when-calling-generators.patch + ./0014-add-rootprefix-to-lookup-dir-paths.patch + ./0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch + ./0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch + ./0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch + ./0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch ]; postPatch = '' |