fcc68a4 · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

Merge branch 'staging-next'

The nss update is needed for security update of firefox. For linux platforms only about 1k aarch64 rebuilds are missing; the diff on Hydra looks OK. Darwin needs 20k more rebuilds, but I don't think we want to wait for that.

commitfcc68a43aab781f05c8fb8cbe06102ce5fd2b473 authorVladimír Čunát <v@cunat.cz> dateThu 7 May 2020, 19:54 (7 years ago) parent05a7b69 2ba59c0

29 files changed+213−180

compare with master

unifiedsplit

pkgs/applications/networking/ftp/filezilla/default.nix+17−6

@@ -1,10 +1,8 @@

11{ stdenv

22, fetchurl

3−

43, dbus

54, gettext

65, gnutls

7−, gtk2

86, libfilezilla

97, libidn

108, nettle

@@ -16,33 +14,46 @@

1614, xdg_utils

1715}:

1816

17+let

18+ # we can drop this when wxgtk is built with gtk3 by default

19+ # see: https://github.com/NixOS/nixpkgs/pull/73145

20+ wxgtk' = wxGTK30.override { compat26 = false; withGtk2 = false; };

21+

22+in

1923stdenv.mkDerivation rec {

2024 pname = "filezilla";

21− version = "3.46.3";

25+ version = "3.48.0";

2226

2327 src = fetchurl {

2428 url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2";

25− sha256 = "15bkg9qs07h4pzkxba1gymp8f264dk0zrzd9brx48fcwm7qbzigi";

29+ sha256 = "0msxl8ihbycd56hmn1q8sl1gzmsxc7j8ar9k4zsryd0ayyz7wv05";

2630 };

2731

32+ # https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769

33+ postPatch = ''

34+ sed -i src/interface/Mainfrm.h \

35+ -e '/^#define/a #include <list>'

36+ '';

37+

2838 configureFlags = [

2939 "--disable-manualupdatecheck"

3040 "--disable-autoupdatecheck"

3141 ];

3242

3343 nativeBuildInputs = [ pkgconfig ];

44+

3445 buildInputs = [

3546 dbus

3647 gettext

3748 gnutls

38− gtk2

3949 libfilezilla

4050 libidn

4151 nettle

4252 pugixml

4353 sqlite

4454 tinyxml

45− wxGTK30

55+ wxgtk'

56+ wxgtk'.gtk

4657 xdg_utils

4758 ];

4859

pkgs/development/compilers/go/1.14.nix+2−2

@@ -30,11 +30,11 @@ in

3030

3131stdenv.mkDerivation rec {

3232 pname = "go";

33− version = "1.14.1";

33+ version = "1.14.2";

3434

3535 src = fetchurl {

3636 url = "https://dl.google.com/go/go${version}.src.tar.gz";

37− sha256 = "0xkna02clggcdgl5xxwani62krnf64x6p3hk9k5v9ldh2lhmglia";

37+ sha256 = "0z3zxsnhmsxplnwfw1l9gr6jgglwp50sr3p5njknv9i6jzk89plq";

3838 };

3939

4040 # perl is used for testing go vet

pkgs/development/libraries/gstreamer/bad/default.nix+2−4

@@ -104,12 +104,10 @@ in stdenv.mkDerivation rec {

104104 sha256 = "0l1f6kqcl04q7w12a2b4qibcvjz6gqhs0csdv2wbvfd6zndpjm6p";

105105 })

106106 ./fix_pkgconfig_includedir.patch

107+ # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1235

108+ ./opencv-4.3.patch

107109 ];

108110

109− # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/950

110− # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1235

111− postPatch = "sed '/^ opencv_dep =/s/< 4\.2\.0/< 4.4.0/' -i ext/opencv/meson.build";

112−

113111 nativeBuildInputs = [

114112 meson

115113 ninja

pkgs/development/libraries/gstreamer/bad/opencv-4.3.patchnew file+13

@@ -0,0 +1,13 @@

1+diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build

2+index f38b55d..05b142e 100644

3+--- a/ext/opencv/meson.build

4++++ b/ext/opencv/meson.build

5+@@ -65,7 +65,7 @@ if opencv_found

6+ endif

7+ endforeach

8+ else

9+- opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.2.0'], required : false)

10++ opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.4.0'], required : false)

11+ opencv_found = opencv_dep.found()

12+ if opencv_found

13+ foreach h : libopencv4_headers

pkgs/development/libraries/libfilezilla/default.nix+5−2

@@ -9,16 +9,19 @@

1010stdenv.mkDerivation rec {

1111 pname = "libfilezilla";

12− version = "0.19.3";

12+ version = "0.21.0";

1313

1414 src = fetchurl {

1515 url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2";

16− sha256 = "0fml6whdbfcwc8nfjhvrnidkscv6q2x988zf3alfjl2mdpw4jgd4";

16+ sha256 = "1wjvxi3spkp58lay590bs5s2i8fn94lqkc7qvq4q7ns4l9k9z3av";

1717 };

1818

1919 nativeBuildInputs = [ pkgconfig ];

20+

2021 buildInputs = [ gettext gnutls nettle ];

2122

23+ enableParallelBuilding = true;

24+

2225 meta = with stdenv.lib; {

2326 homepage = "https://lib.filezilla-project.org/";

2427 description = "A modern C++ library, offering some basic functionality to build high-performing, platform-independent programs";

pkgs/development/libraries/libjpeg-turbo/default.nix+9−1

@@ -1,4 +1,4 @@

1−{ stdenv, fetchurl, cmake, nasm, enableStatic ? false }:

1+{ stdenv, fetchurl, fetchpatch, cmake, nasm, enableStatic ? false }:

33stdenv.mkDerivation rec {

@@ -11,6 +11,14 @@ stdenv.mkDerivation rec {

1111 };

1212

1313 patches =

14+ [

15+ # Fixes race in tests that causes "jpegtran-shared-icc" to fail

16+ # https://github.com/libjpeg-turbo/libjpeg-turbo/pull/425

17+ (fetchpatch {

18+ url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/a2291b252de1413a13db61b21863ae7aea0946f3.patch";

19+ sha256 = "0nc5vcch5h52gpi07h08zf8br58q8x81q2hv871hrn0dinb53vym";

20+ })

21+ ] ++

1422 stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt")

1523 ./mingw-boolean.patch;

1624

pkgs/development/libraries/libndctl/default.nix+2−2

@@ -5,13 +5,13 @@

66stdenv.mkDerivation rec {

77 pname = "libndctl";

8− version = "67";

8+ version = "68";

1010 src = fetchFromGitHub {

1111 owner = "pmem";

1212 repo = "ndctl";

1313 rev = "v${version}";

14− sha256 = "076jgw1g2aafqgnq705in0wnabysqk46dq5yxdv1qzgjmyhka39n";

14+ sha256 = "0xmim7z4qp6x2ggndnbwd940c73pa1qlf3hxyn3qh5pyr69nh9y8";

1515 };

1616

1717 outputs = [ "out" "lib" "man" "dev" ];

pkgs/development/libraries/nss/default.nix+8−4

@@ -5,7 +5,7 @@ let

55 url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz";

66 sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";

77 };

8− version = "3.51";

8+ version = "3.52";

99 underscoreVersion = builtins.replaceStrings ["."] ["_"] version;

1010

1111in stdenv.mkDerivation rec {

@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {

1414

1515 src = fetchurl {

1616 url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";

17− sha256 = "1725d0idf5zzqafdqfdn9vprc7ys2ywhv23sqn328di968xqnd3m";

17+ sha256 = "0q8m9jf6zgkbhx71myjb7y0gcl5ib3gj6qkl9yvdqpd6vl6fn2ha";

1818 };

1919

2020 depsBuildBuild = [ buildPackages.stdenv.cc ];

@@ -27,8 +27,12 @@ in stdenv.mkDerivation rec {

2727 propagatedBuildInputs = [ nspr ];

2828

2929 prePatch = ''

30− # strip the trailing whitespace from the patch line…

31− xz -d < ${nssPEM} | sed -e '/^-DIRS = builtins $/ s/ $//' | patch -p1

30+ # strip the trailing whitespace from the patch line and the renamed CKO_NETSCAPE_ enum to CKO_NSS_

31+ xz -d < ${nssPEM} | sed \

32+ -e '/^-DIRS = builtins $/ s/ $//' \

33+ -e 's/CKO_NETSCAPE_/CKO_NSS_/g' \

34+ -e 's/CKT_NETSCAPE_/CKT_NSS_/g' \

35+ | patch -p1

3236 '';

3337

3438 patches =

pkgs/development/libraries/openh264/default.nix+2−2

@@ -2,13 +2,13 @@

33stdenv.mkDerivation rec {

44 pname = "openh264";

5− version = "2.0.0";

5+ version = "2.1.0";

77 src = fetchFromGitHub {

88 owner = "cisco";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "0sa4n4xshmiiv6h767jjq9qxapxxjwwwm3bpcignkxv5xn5sls5r";

11+ sha256 = "1wba260n1932vafd5ni2jqv9kzc7lj6a1asm1cqk8jv690m6zvpi";

1212 };

1313

1414 nativeBuildInputs = [ nasm ];

pkgs/development/tools/build-managers/meson/default.nix+2−2

@@ -8,11 +8,11 @@

99python3Packages.buildPythonApplication rec {

1010 pname = "meson";

11− version = "0.54.0";

11+ version = "0.54.1";

1212

1313 src = python3Packages.fetchPypi {

1414 inherit pname version;

15− sha256 = "3eVybXeBEqy9Sme7NjOrLuddM9HoeaYoOntKRMM2PCc=";

15+ sha256 = "L3b7RXJ2K+E+5HkpJhAJG0UJr1eIvM6zkf4iK80Cltw=";

1616 };

1717

1818 postFixup = ''

pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch+3−3

@@ -1,7 +1,7 @@

1−From a6c9317a905ef478b8e0d3dad263990feb5d11cb Mon Sep 17 00:00:00 2001

1+From b873e4c0de3e24f2ec9370e5a217247217e90587 Mon Sep 17 00:00:00 2001

22From: Eelco Dolstra <eelco.dolstra@logicblox.com>

33Date: Tue, 8 Jan 2013 15:46:30 +0100

4−Subject: [PATCH 01/27] Start device units for uninitialised encrypted devices

4+Subject: [PATCH 01/18] Start device units for uninitialised encrypted devices

66This is necessary because the NixOS service that initialises the

77filesystem depends on the appearance of the device unit. Also, this

@@ -28,5 +28,5 @@ index c34b606216..3ab8c1c3fe 100644

2828 SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}!="crypto_LUKS", SYMLINK+="gpt-auto-root"

2929 SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}=="crypto_LUKS", SYMLINK+="gpt-auto-root-luks"

3030--

31−2.24.1

31+2.26.2

3232

pkgs/os-specific/linux/systemd/0003-Don-t-try-to-unmount-nix-or-nix-store.patch → pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patchrenamed+9−9

@@ -1,21 +1,21 @@

1−From fd9c882581877eef8ba1b34a9502a1ff546b3833 Mon Sep 17 00:00:00 2001

1+From bdd3ff777dd8253ff5732118dd6de0fa9a9b95fe Mon Sep 17 00:00:00 2001

22From: Eelco Dolstra <eelco.dolstra@logicblox.com>

33Date: Fri, 12 Apr 2013 13:16:57 +0200

4−Subject: [PATCH 03/27] Don't try to unmount /nix or /nix/store

4+Subject: [PATCH 02/18] Don't try to unmount /nix or /nix/store

66They'll still be remounted read-only.

88https://github.com/NixOS/nixos/issues/126

99---

10− src/core/mount.c | 4 +++-

10+ src/core/mount.c | 2 ++

1111 src/shutdown/umount.c | 2 ++

12− 2 files changed, 5 insertions(+), 1 deletion(-)

12+ 2 files changed, 4 insertions(+)

1313

1414diff --git a/src/core/mount.c b/src/core/mount.c

15−index a0dfa6a1a7..4ca6adcdc6 100644

15+index 1c4aefd734..a5553226f8 100644

1616--- a/src/core/mount.c

1717+++ b/src/core/mount.c

18−@@ -414,6 +414,8 @@ static bool mount_is_extrinsic(Mount *m) {

18+@@ -412,6 +412,8 @@ static bool mount_is_extrinsic(Mount *m) {

1919

2020 if (PATH_IN_SET(m->where, /* Don't bother with the OS data itself */

2121 "/", /* (strictly speaking redundant: should already be covered by the perpetual flag check above) */

@@ -25,10 +25,10 @@ index a0dfa6a1a7..4ca6adcdc6 100644

2525 "/etc"))

2626 return true;

2727diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c

28−index 2d07d3d6c1..8b112f464e 100644

28+index 8a5e80eeaa..fab35ed6f3 100644

2929--- a/src/shutdown/umount.c

3030+++ b/src/shutdown/umount.c

31−@@ -373,6 +373,8 @@ static int delete_dm(dev_t devnum) {

31+@@ -414,6 +414,8 @@ static int delete_dm(dev_t devnum) {

3232

3333 static bool nonunmountable_path(const char *path) {

3434 return path_equal(path, "/")

@@ -38,5 +38,5 @@ index 2d07d3d6c1..8b112f464e 100644

3838 || path_equal(path, "/usr")

3939 #endif

4040--

41−2.25.1

41+2.26.2

4242

pkgs/os-specific/linux/systemd/0004-Fix-NixOS-containers.patch → pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patchrenamed+6−6

@@ -1,7 +1,7 @@

1−From 58c4a7b4e9d9c34b92deded6aea814738821059d Mon Sep 17 00:00:00 2001

1+From c28b3b2e254433e93549ee6fe8c93b43ce455776 Mon Sep 17 00:00:00 2001

22From: Eelco Dolstra <eelco.dolstra@logicblox.com>

33Date: Wed, 16 Apr 2014 10:59:28 +0200

4−Subject: [PATCH 04/27] Fix NixOS containers

4+Subject: [PATCH 03/18] Fix NixOS containers

66In NixOS containers, the init script is bind-mounted into the

77container, so checking early whether it exists will fail.

@@ -10,10 +10,10 @@ container, so checking early whether it exists will fail.

1010 1 file changed, 2 insertions(+)

1111

1212diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c

13−index 5d9290b1cf..26615901c3 100644

13+index 734dee1130..a97b1a4bc9 100644

1414--- a/src/nspawn/nspawn.c

1515+++ b/src/nspawn/nspawn.c

16−@@ -4924,6 +4924,7 @@ static int run(int argc, char *argv[]) {

16+@@ -5018,6 +5018,7 @@ static int run(int argc, char *argv[]) {

1717 goto finish;

1818 }

1919 } else {

@@ -21,7 +21,7 @@ index 5d9290b1cf..26615901c3 100644

2121 const char *p, *q;

2222

2323 if (arg_pivot_root_new)

24−@@ -4938,6 +4939,7 @@ static int run(int argc, char *argv[]) {

24+@@ -5032,6 +5033,7 @@ static int run(int argc, char *argv[]) {

2525 r = -EINVAL;

2626 goto finish;

2727 }

@@ -30,5 +30,5 @@ index 5d9290b1cf..26615901c3 100644

3030

3131 } else {

3232--

33−2.24.1

33+2.26.2

3434

pkgs/os-specific/linux/systemd/0006-Look-for-fsck-in-the-right-place.patch → pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patchrenamed+5−5

@@ -1,17 +1,17 @@

1−From c841ffab8fb6174b51382b9d4334f78c74018730 Mon Sep 17 00:00:00 2001

1+From baf52609ad18785aa1d2cd043185ae9438d59411 Mon Sep 17 00:00:00 2001

22From: Eelco Dolstra <eelco.dolstra@logicblox.com>

33Date: Thu, 1 May 2014 14:10:10 +0200

4−Subject: [PATCH 06/27] Look for fsck in the right place

4+Subject: [PATCH 04/18] Look for fsck in the right place

66---

77 src/fsck/fsck.c | 2 +-

88 1 file changed, 1 insertion(+), 1 deletion(-)

1010diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c

11−index 55e6544d31..3626aadda7 100644

11+index 80f7107b9d..74e48a385f 100644

1212--- a/src/fsck/fsck.c

1313+++ b/src/fsck/fsck.c

14−@@ -371,7 +371,7 @@ static int run(int argc, char *argv[]) {

14+@@ -370,7 +370,7 @@ static int run(int argc, char *argv[]) {

1515 } else

1616 dash_c[0] = 0;

1717

@@ -21,5 +21,5 @@ index 55e6544d31..3626aadda7 100644

2121 cmdline[i++] = "-T";

2222

2323--

24−2.24.1

24+2.26.2

2525

pkgs/os-specific/linux/systemd/0007-Add-some-NixOS-specific-unit-directories.patch → pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patchrenamed+11−11

@@ -1,12 +1,12 @@

1−From 8c0be07ccbad35d0c1106015057996aa55b9a1f9 Mon Sep 17 00:00:00 2001

1+From 45f80155b7c2edb1e73c233283f1ab1582e1cfbe Mon Sep 17 00:00:00 2001

22From: Eelco Dolstra <eelco.dolstra@logicblox.com>

33Date: Fri, 19 Dec 2014 14:46:17 +0100

4−Subject: [PATCH 07/27] Add some NixOS-specific unit directories

4+Subject: [PATCH 05/18] Add some NixOS-specific unit directories

6−Look in /nix/var/nix/profiles/default/lib/systemd for units provided

7−by packages in the default (system-wide) profile, and in

8−/etc/systemd-mutable/system for persistent, mutable units (not

9−recommended).

6+Look in `/nix/var/nix/profiles/default/lib/systemd` for units provided

7+by packages installed into the default profile via

8+`nix-env -iA nixos.$package`, and into `/etc/systemd-mutable/system` for

9+persistent, mutable units (used for Dysnomia).

1010

1111Also, remove /usr and /lib as these don't exist on NixOS.

1212---

@@ -15,7 +15,7 @@ Also, remove /usr and /lib as these don't exist on NixOS.

1515 2 files changed, 7 insertions(+), 15 deletions(-)

1616

1717diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in

18−index 5d1ddd7620..21b977d6fc 100644

18+index 8331832c7a..bedb97115d 100644

1919--- a/src/core/systemd.pc.in

2020+++ b/src/core/systemd.pc.in

2121@@ -17,8 +17,8 @@ systemduserunitdir=${prefix}/lib/systemd/user

@@ -28,12 +28,12 @@ index 5d1ddd7620..21b977d6fc 100644

2828+systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/etc/systemd-mutable/user:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/user:${systemduserunitdir}

2929 systemdsystemgeneratordir=${rootprefix}/lib/systemd/system-generators

3030 systemdusergeneratordir=${prefix}/lib/systemd/user-generators

31− systemdsleepdir=${rootprefix}/lib/systemd/system-sleep

31+ systemdsystemgeneratorpath=/run/systemd/system-generators:/etc/systemd/system-generators:/usr/local/lib/systemd/system-generators:${systemdsystemgeneratordir}

3232diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c

33−index 6bf0ff0316..2b6324ad8c 100644

33+index 48e0eec09a..a9d38f16d0 100644

3434--- a/src/shared/path-lookup.c

3535+++ b/src/shared/path-lookup.c

36−@@ -99,17 +99,14 @@ int xdg_user_data_dir(char **ret, const char *suffix) {

36+@@ -98,17 +98,14 @@ int xdg_user_data_dir(char **ret, const char *suffix) {

3737 }

3838

3939 static const char* const user_data_unit_paths[] = {

@@ -103,5 +103,5 @@ index 6bf0ff0316..2b6324ad8c 100644

103103

104104 default:

105105--

106−2.24.1

106+2.26.2

107107

pkgs/os-specific/linux/systemd/0009-Get-rid-of-a-useless-message-in-user-sessions.patch → pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patchrenamed+5−5

@@ -1,7 +1,7 @@

1−From 99c86daa5244d45a19f75f6ce92bd4255edef420 Mon Sep 17 00:00:00 2001

1+From d52058070c0c12bb05f82460f0b4b55678b724e9 Mon Sep 17 00:00:00 2001

22From: Eelco Dolstra <eelco.dolstra@logicblox.com>

33Date: Mon, 11 May 2015 15:39:38 +0200

4−Subject: [PATCH 09/27] Get rid of a useless message in user sessions

4+Subject: [PATCH 06/18] Get rid of a useless message in user sessions

66Namely lots of variants of

@@ -13,10 +13,10 @@ in containers.

1313 1 file changed, 2 insertions(+), 1 deletion(-)

1414

1515diff --git a/src/core/unit.c b/src/core/unit.c

16−index a1dc76aa6a..07670af8e2 100644

16+index 97e1b0004c..d3cc2ba9ec 100644

1717--- a/src/core/unit.c

1818+++ b/src/core/unit.c

19−@@ -2045,7 +2045,8 @@ static void unit_check_binds_to(Unit *u) {

19+@@ -2043,7 +2043,8 @@ static void unit_check_binds_to(Unit *u) {

2020 }

2121

2222 assert(other);

@@ -27,5 +27,5 @@ index a1dc76aa6a..07670af8e2 100644

2727 /* A unit we need to run is gone. Sniff. Let's stop this. */

2828 r = manager_add_job(u->manager, JOB_STOP, u, JOB_FAIL, NULL, &error, NULL);

2929--

30−2.24.1

30+2.26.2

3131

pkgs/os-specific/linux/systemd/0010-hostnamed-localed-timedated-disable-methods-that-cha.patch → pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patchrenamed+15−15

@@ -1,7 +1,7 @@

1−From cec1430f72edfedb951fe34e87765ef422ea9843 Mon Sep 17 00:00:00 2001

1+From 409fc808794942ad1736c2cc74853d9792e4ad02 Mon Sep 17 00:00:00 2001

22From: Gabriel Ebner <gebner@gebner.org>

33Date: Sun, 6 Dec 2015 14:26:36 +0100

4−Subject: [PATCH 10/27] hostnamed, localed, timedated: disable methods that

4+Subject: [PATCH 07/18] hostnamed, localed, timedated: disable methods that

55 change system settings.

77---

@@ -11,10 +11,10 @@ Subject: [PATCH 10/27] hostnamed, localed, timedated: disable methods that

1111 3 files changed, 28 insertions(+)

1212

1313diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c

14−index 9e4f4fb59e..141b8acc08 100644

14+index 21f6471495..8c5af7619f 100644

1515--- a/src/hostname/hostnamed.c

1616+++ b/src/hostname/hostnamed.c

17−@@ -423,6 +423,9 @@ static int method_set_hostname(sd_bus_message *m, void *userdata, sd_bus_error *

17+@@ -422,6 +422,9 @@ static int method_set_hostname(sd_bus_message *m, void *userdata, sd_bus_error *

1818 if (r < 0)

1919 return r;

2020

@@ -24,7 +24,7 @@ index 9e4f4fb59e..141b8acc08 100644

2424 if (isempty(name))

2525 name = c->data[PROP_STATIC_HOSTNAME];

2626

27−@@ -479,6 +482,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_

27+@@ -478,6 +481,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_

2828 if (r < 0)

2929 return r;

3030

@@ -34,7 +34,7 @@ index 9e4f4fb59e..141b8acc08 100644

3434 name = empty_to_null(name);

3535

3636 if (streq_ptr(name, c->data[PROP_STATIC_HOSTNAME]))

37−@@ -536,6 +542,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess

37+@@ -535,6 +541,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess

3838 if (r < 0)

3939 return r;

4040

@@ -45,10 +45,10 @@ index 9e4f4fb59e..141b8acc08 100644

4545

4646 if (streq_ptr(name, c->data[prop]))

4747diff --git a/src/locale/localed.c b/src/locale/localed.c

48−index 8d0eec96a5..0b1c1d664e 100644

48+index 09f16d25f4..c1cb87cef1 100644

4949--- a/src/locale/localed.c

5050+++ b/src/locale/localed.c

51−@@ -276,6 +276,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er

51+@@ -275,6 +275,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er

5252 if (r < 0)

5353 return r;

5454

@@ -58,7 +58,7 @@ index 8d0eec96a5..0b1c1d664e 100644

5858 /* If single locale without variable name is provided, then we assume it is LANG=. */

5959 if (strv_length(l) == 1 && !strchr(*l, '=')) {

6060 if (!locale_is_valid(*l))

61−@@ -411,6 +414,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro

61+@@ -410,6 +413,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro

6262 if (r < 0)

6363 return r;

6464

@@ -68,7 +68,7 @@ index 8d0eec96a5..0b1c1d664e 100644

6868 keymap = empty_to_null(keymap);

6969 keymap_toggle = empty_to_null(keymap_toggle);

7070

71−@@ -587,6 +593,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err

71+@@ -586,6 +592,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err

7272 if (r < 0)

7373 return r;

7474

@@ -79,10 +79,10 @@ index 8d0eec96a5..0b1c1d664e 100644

7979 model = empty_to_null(model);

8080 variant = empty_to_null(variant);

8181diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c

82−index 6c94b23de4..fa20d22cde 100644

82+index 5e2fb50d83..63865f557c 100644

8383--- a/src/timedate/timedated.c

8484+++ b/src/timedate/timedated.c

85−@@ -653,6 +653,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *

85+@@ -652,6 +652,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *

8686 if (r < 0)

8787 return r;

8888

@@ -93,7 +93,7 @@ index 6c94b23de4..fa20d22cde 100644

9393 if (!timezone_is_valid(z, LOG_DEBUG))

9494 return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid or not installed time zone '%s'", z);

9595

96−@@ -732,6 +736,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error

96+@@ -731,6 +735,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error

9797 if (r < 0)

9898 return r;

9999

@@ -103,7 +103,7 @@ index 6c94b23de4..fa20d22cde 100644

103103 if (lrtc == c->local_rtc)

104104 return sd_bus_reply_method_return(m, NULL);

105105

106−@@ -924,6 +931,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error

106+@@ -923,6 +930,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error

107107 if (r < 0)

108108 return r;

109109

@@ -114,5 +114,5 @@ index 6c94b23de4..fa20d22cde 100644

114114 if (r < 0)

115115 return r;

116116--

117−2.24.1

117+2.26.2

118118

pkgs/os-specific/linux/systemd/0011-Fix-hwdb-paths.patch → pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patchrenamed+5−5

@@ -1,7 +1,7 @@

1−From 0f434c6baee63eff913f36aee839df3718a75d4a Mon Sep 17 00:00:00 2001

1+From b56fc7b6ae8014eb2f71924c89498f395a1a81bd Mon Sep 17 00:00:00 2001

22From: Nikolay Amiantov <ab@fmap.me>

33Date: Thu, 7 Jul 2016 02:47:13 +0300

4−Subject: [PATCH 11/27] Fix hwdb paths

4+Subject: [PATCH 08/18] Fix hwdb paths

66Patch by vcunat.

77---

@@ -9,10 +9,10 @@ Patch by vcunat.

99 1 file changed, 1 insertion(+), 6 deletions(-)

1010

1111diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c

12−index 58124abd21..d80e408b8c 100644

12+index b3febdbb31..eba00a5bc7 100644

1313--- a/src/libsystemd/sd-hwdb/sd-hwdb.c

1414+++ b/src/libsystemd/sd-hwdb/sd-hwdb.c

15−@@ -298,13 +298,8 @@ static int trie_search_f(sd_hwdb *hwdb, const char *search) {

15+@@ -297,13 +297,8 @@ static int trie_search_f(sd_hwdb *hwdb, const char *search) {

1616 }

1717

1818 static const char hwdb_bin_paths[] =

@@ -28,5 +28,5 @@ index 58124abd21..d80e408b8c 100644

2828 _public_ int sd_hwdb_new(sd_hwdb **ret) {

2929 _cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb = NULL;

3030--

31−2.24.1

31+2.26.2

3232

pkgs/os-specific/linux/systemd/0012-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch → pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patchrenamed+8−8

@@ -1,7 +1,7 @@

1−From 78479b75c9f9342646223b3db6b4b0744817dc24 Mon Sep 17 00:00:00 2001

1+From 4d304a321796db4de827aa39a149bea23d039214 Mon Sep 17 00:00:00 2001

22From: Nikolay Amiantov <ab@fmap.me>

33Date: Tue, 11 Oct 2016 13:12:08 +0300

4−Subject: [PATCH] Change /usr/share/zoneinfo to /etc/zoneinfo

4+Subject: [PATCH 09/18] Change /usr/share/zoneinfo to /etc/zoneinfo

66NixOS uses this path.

77---

@@ -66,10 +66,10 @@ index 105584e2e7..5238f69931 100644

6666 return -EINVAL;

6767

6868diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c

69−index 528e6452cf..c712ca9072 100644

69+index 901fbf0815..b57bdd8fbe 100644

7070--- a/src/firstboot/firstboot.c

7171+++ b/src/firstboot/firstboot.c

72−@@ -443,7 +443,7 @@ static int process_timezone(void) {

72+@@ -431,7 +431,7 @@ static int process_timezone(void) {

7373 if (isempty(arg_timezone))

7474 return 0;

7575

@@ -79,10 +79,10 @@ index 528e6452cf..c712ca9072 100644

7979 (void) mkdir_parents(etc_localtime, 0755);

8080 if (symlink(e, etc_localtime) < 0)

8181diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c

82−index 873a76596f..a024b10f32 100644

82+index a97b1a4bc9..aed60439e3 100644

8383--- a/src/nspawn/nspawn.c

8484+++ b/src/nspawn/nspawn.c

85−@@ -1642,8 +1642,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u

85+@@ -1657,8 +1657,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u

8686 static const char *timezone_from_path(const char *path) {

8787 return PATH_STARTSWITH_SET(

8888 path,

@@ -94,7 +94,7 @@ index 873a76596f..a024b10f32 100644

9494

9595 static bool etc_writable(void) {

9696diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c

97−index 5e2fb50d83..02eb2ca11d 100644

97+index 63865f557c..8021a8b753 100644

9898--- a/src/timedate/timedated.c

9999+++ b/src/timedate/timedated.c

100100@@ -264,7 +264,7 @@ static int context_read_data(Context *c) {

@@ -128,5 +128,5 @@ index 5e2fb50d83..02eb2ca11d 100644

128128 return -ENOMEM;

129129

130130--

131−2.25.1

131+2.26.2

132132

pkgs/os-specific/linux/systemd/0013-localectl-use-etc-X11-xkb-for-list-x11.patch → pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patchrenamed+5−5

@@ -1,7 +1,7 @@

1−From 5365ffbfba2de03628e8bbb6cc0bc022272436a1 Mon Sep 17 00:00:00 2001

1+From cb3f1ec1793cbf74c4b5663e038bd49ff4576192 Mon Sep 17 00:00:00 2001

22From: Imuli <i@imu.li>

33Date: Wed, 19 Oct 2016 08:46:47 -0400

4−Subject: [PATCH 13/27] localectl: use /etc/X11/xkb for list-x11-*

4+Subject: [PATCH 10/18] localectl: use /etc/X11/xkb for list-x11-*

66NixOS has an option to link the xkb data files to /etc/X11, but not to

77/usr/share/X11.

@@ -10,10 +10,10 @@ NixOS has an option to link the xkb data files to /etc/X11, but not to

1010 1 file changed, 1 insertion(+), 1 deletion(-)

1111

1212diff --git a/src/locale/localectl.c b/src/locale/localectl.c

13−index 9fb5152110..9554c2cf76 100644

13+index 6f2d37d222..7aa2310d48 100644

1414--- a/src/locale/localectl.c

1515+++ b/src/locale/localectl.c

16−@@ -287,7 +287,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) {

16+@@ -286,7 +286,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) {

1717 } state = NONE, look_for;

1818 int r;

1919

@@ -23,5 +23,5 @@ index 9fb5152110..9554c2cf76 100644

2323 return log_error_errno(errno, "Failed to open keyboard mapping list. %m");

2424

2525--

26−2.24.1

26+2.26.2

2727

pkgs/os-specific/linux/systemd/0016-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch → pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patchrenamed+5−5

@@ -1,17 +1,17 @@

1−From 1408762890aba25e58598d1e4dfa17ed2b75de26 Mon Sep 17 00:00:00 2001

1+From 0ffb786d0e12a61899af448b1e4dd32a53ea5a8e Mon Sep 17 00:00:00 2001

22From: Franz Pletz <fpletz@fnordicwalking.de>

33Date: Sun, 11 Feb 2018 04:37:44 +0100

4−Subject: [PATCH 16/27] build: don't create statedir and don't touch prefixdir

4+Subject: [PATCH 11/18] build: don't create statedir and don't touch prefixdir

66---

77 meson.build | 3 ---

88 1 file changed, 3 deletions(-)

1010diff --git a/meson.build b/meson.build

11−index 8ccc947e37..263cc7189a 100644

11+index fc216d22da..078db3bb5d 100644

1212--- a/meson.build

1313+++ b/meson.build

14−@@ -2944,9 +2944,6 @@ install_data('LICENSE.GPL2',

14+@@ -3176,9 +3176,6 @@ install_data('LICENSE.GPL2',

1515 'src/libsystemd/sd-bus/GVARIANT-SERIALIZATION',

1616 install_dir : docdir)

1717

@@ -22,5 +22,5 @@ index 8ccc947e37..263cc7189a 100644

2222

2323 meson_check_help = find_program('tools/meson-check-help.sh')

2424--

25−2.24.1

25+2.26.2

2626

pkgs/os-specific/linux/systemd/0018-Install-default-configuration-into-out-share-factory.patch → pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patchrenamed+28−32

@@ -1,7 +1,7 @@

1−From a087cb535b2d3c7a5d989b5aabc0a257369e9f9d Mon Sep 17 00:00:00 2001

1+From 3dbcdab1ba22c4eeca6d61718c09bcb9b5551764 Mon Sep 17 00:00:00 2001

22From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>

33Date: Mon, 26 Feb 2018 14:25:57 +0000

4−Subject: [PATCH 18/27] Install default configuration into $out/share/factory

4+Subject: [PATCH 12/18] Install default configuration into $out/share/factory

66By default systemd should read all its configuration from /etc. Therefor

77we rely on -Dsysconfdir=/etc in meson as default value. Unfortunately

@@ -11,7 +11,7 @@ this commit introduces two new configuration variables `factoryconfdir`

1111and `factorypkgconfdir` to install systemd's own configuration into nix

1212store again, while having executables looking up files in /etc.

1313---

14− hwdb.d/meson.build | 2 +-

14+ hwdb.d/meson.build | 2 +-

1515 meson.build | 11 +++++++----

1616 network/meson.build | 2 +-

1717 src/core/meson.build | 10 +++++-----

@@ -27,14 +27,14 @@ store again, while having executables looking up files in /etc.

2727 src/udev/meson.build | 4 ++--

2828 sysctl.d/meson.build | 2 +-

2929 tmpfiles.d/meson.build | 2 +-

30− units/meson.build | 3 ++-

31− 17 files changed, 30 insertions(+), 26 deletions(-)

30+ units/meson.build | 2 +-

31+ 17 files changed, 29 insertions(+), 26 deletions(-)

3232

3333diff --git a/hwdb.d/meson.build b/hwdb.d/meson.build

34−index badf39f555..8fd9c7639f 100644

34+index 4df6dabf89..02d8d69095 100644

3535--- a/hwdb.d/meson.build

3636+++ b/hwdb.d/meson.build

37−@@ -26,7 +26,7 @@ if conf.get('ENABLE_HWDB') == 1

37+@@ -27,7 +27,7 @@ if conf.get('ENABLE_HWDB') == 1

3838 install_dir : udevhwdbdir)

3939

4040 meson.add_install_script('sh', '-c',

@@ -43,15 +43,11 @@ index badf39f555..8fd9c7639f 100644

4343

4444 meson.add_install_script('sh', '-c',

4545 'test -n "$DESTDIR" || @0@/systemd-hwdb update'

46− .format(rootbindir))

47− endif

48−

49− ############################################################

5046diff --git a/meson.build b/meson.build

51−index 263cc7189a..7a67078208 100644

47+index 078db3bb5d..6e1a6483fc 100644

5248--- a/meson.build

5349+++ b/meson.build

54−@@ -151,6 +151,9 @@ udevhwdbdir = join_paths(udevlibexecdir, 'hwdb.d')

50+@@ -154,6 +154,9 @@ udevhwdbdir = join_paths(udevlibexecdir, 'hwdb.d')

5551 catalogdir = join_paths(prefixdir, 'lib/systemd/catalog')

5652 kernelinstalldir = join_paths(prefixdir, 'lib/kernel/install.d')

5753 factorydir = join_paths(datadir, 'factory')

@@ -61,7 +57,7 @@ index 263cc7189a..7a67078208 100644

6157 bootlibdir = join_paths(prefixdir, 'lib/systemd/boot/efi')

6258 testsdir = join_paths(prefixdir, 'lib/systemd/tests')

6359 systemdstatedir = join_paths(localstatedir, 'lib/systemd')

64−@@ -2287,7 +2290,7 @@ if conf.get('ENABLE_BINFMT') == 1

60+@@ -2503,7 +2506,7 @@ if conf.get('ENABLE_BINFMT') == 1

6561 meson.add_install_script('sh', '-c',

6662 mkdir_p.format(binfmtdir))

6763 meson.add_install_script('sh', '-c',

@@ -69,8 +65,8 @@ index 263cc7189a..7a67078208 100644

6965+ mkdir_p.format(join_paths(factoryconfdir, 'binfmt.d')))

7066 endif

7167

72− if conf.get('ENABLE_VCONSOLE') == 1

73−@@ -2373,7 +2376,7 @@ executable('systemd-sleep',

68+ if conf.get('ENABLE_REPART') == 1

69+@@ -2604,7 +2607,7 @@ executable('systemd-sleep',

7470 install_dir : rootlibexecdir)

7571

7672 install_data('src/sleep/sleep.conf',

@@ -79,7 +75,7 @@ index 263cc7189a..7a67078208 100644

7975

8076 exe = executable('systemd-sysctl',

8177 'src/sysctl/sysctl.c',

82−@@ -2685,7 +2688,7 @@ if conf.get('HAVE_KMOD') == 1

78+@@ -2916,7 +2919,7 @@ if conf.get('HAVE_KMOD') == 1

8379 meson.add_install_script('sh', '-c',

8480 mkdir_p.format(modulesloaddir))

8581 meson.add_install_script('sh', '-c',

@@ -88,7 +84,7 @@ index 263cc7189a..7a67078208 100644

8884 endif

8985

9086 exe = executable('systemd-nspawn',

91−@@ -2927,7 +2930,7 @@ install_subdir('factory/etc',

87+@@ -3159,7 +3162,7 @@ install_subdir('factory/etc',

9288 install_dir : factorydir)

9389

9490 install_data('xorg/50-systemd-user.sh',

@@ -98,10 +94,10 @@ index 263cc7189a..7a67078208 100644

9894 install_dir : modprobedir)

9995 install_data('LICENSE.GPL2',

10096diff --git a/network/meson.build b/network/meson.build

101−index 59d4be1a17..72da2c16a2 100644

97+index 544dcf4387..1828c50863 100644

10298--- a/network/meson.build

10399+++ b/network/meson.build

104−@@ -7,7 +7,7 @@ if conf.get('ENABLE_NETWORKD') == 1

100+@@ -10,7 +10,7 @@ if conf.get('ENABLE_NETWORKD') == 1

105101 install_dir : networkdir)

106102

107103 meson.add_install_script('sh', '-c',

@@ -111,7 +107,7 @@ index 59d4be1a17..72da2c16a2 100644

111107

112108 install_data('99-default.link',

113109diff --git a/src/core/meson.build b/src/core/meson.build

114−index df3aa5c6c1..305f67a80a 100644

110+index 3586838f59..02ddf1a123 100644

115111--- a/src/core/meson.build

116112+++ b/src/core/meson.build

117113@@ -179,8 +179,8 @@ libcore = static_library(

@@ -125,7 +121,7 @@ index df3aa5c6c1..305f67a80a 100644

125121 ['systemd.pc', pkgconfigdatadir],

126122 ['triggers.systemd', '']]

127123

128−@@ -210,6 +210,6 @@ meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir))

124+@@ -212,6 +212,6 @@ meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir))

129125 meson.add_install_script('sh', '-c', mkdir_p.format(systemgeneratordir))

130126 meson.add_install_script('sh', '-c', mkdir_p.format(usergeneratordir))

131127

@@ -207,10 +203,10 @@ index 0a7d3d5440..ff90149c1c 100644

207203 install_data('org.freedesktop.login1.conf',

208204 install_dir : dbuspolicydir)

209205diff --git a/src/network/meson.build b/src/network/meson.build

210−index 6bed37a170..35f15bcaf1 100644

206+index c1c02cfda1..1bfa79a03b 100644

211207--- a/src/network/meson.build

212208+++ b/src/network/meson.build

213−@@ -168,7 +168,7 @@ if conf.get('ENABLE_NETWORKD') == 1

209+@@ -201,7 +201,7 @@ if conf.get('ENABLE_NETWORKD') == 1

214210 endif

215211

216212 install_data('networkd.conf',

@@ -231,10 +227,10 @@ index adbac24b54..e9dc88dfa2 100644

231227+ install_dir : factorypkgconfdir)

232228 endif

233229diff --git a/src/resolve/meson.build b/src/resolve/meson.build

234−index 92b67b6333..ac5b9a0b0a 100644

230+index c4d8d4e5d9..f550c289a5 100644

235231--- a/src/resolve/meson.build

236232+++ b/src/resolve/meson.build

237−@@ -168,7 +168,7 @@ if conf.get('ENABLE_RESOLVE') == 1

233+@@ -170,7 +170,7 @@ if conf.get('ENABLE_RESOLVE') == 1

238234 output : 'resolved.conf',

239235 configuration : substs)

240236 install_data(resolved_conf,

@@ -257,10 +253,10 @@ index e5c118c8db..19235df9ca 100644

257253 install_dir : dbuspolicydir)

258254 install_data('org.freedesktop.timesync1.service',

259255diff --git a/src/udev/meson.build b/src/udev/meson.build

260−index 511fe428b9..32333efea6 100644

256+index 173b10be50..82638cf5a9 100644

261257--- a/src/udev/meson.build

262258+++ b/src/udev/meson.build

263−@@ -186,7 +186,7 @@ foreach prog : [['ata_id/ata_id.c'],

259+@@ -187,7 +187,7 @@ foreach prog : [['ata_id/ata_id.c'],

264260 endforeach

265261

266262 install_data('udev.conf',

@@ -269,7 +265,7 @@ index 511fe428b9..32333efea6 100644

269265

270266 configure_file(

271267 input : 'udev.pc.in',

272−@@ -195,7 +195,7 @@ configure_file(

268+@@ -196,7 +196,7 @@ configure_file(

273269 install_dir : pkgconfigdatadir == 'no' ? '' : pkgconfigdatadir)

274270

275271 meson.add_install_script('sh', '-c',

@@ -300,10 +296,10 @@ index e77f46d06b..04d2ef621d 100644

300296+ mkdir_p.format(join_paths(factoryconfdir, 'tmpfiles.d')))

301297 endif

302298diff --git a/units/meson.build b/units/meson.build

303−index 476991edba..3d9dc6e1c8 100644

299+index ea91f0cc9e..8622054ca5 100644

304300--- a/units/meson.build

305301+++ b/units/meson.build

306−@@ -308,7 +308,7 @@ install_data('user-.slice.d/10-defaults.conf',

302+@@ -323,7 +323,7 @@ install_data('user-.slice.d/10-defaults.conf',

307303

308304 meson.add_install_script(meson_make_symlink,

309305 join_paths(pkgsysconfdir, 'user'),

@@ -313,5 +309,5 @@ index 476991edba..3d9dc6e1c8 100644

313309 join_paths(dbussystemservicedir, 'org.freedesktop.systemd1.service'),

314310 join_paths(dbussessionservicedir, 'org.freedesktop.systemd1.service'))

315311--

316−2.24.1

312+2.26.2

317313

pkgs/os-specific/linux/systemd/0019-inherit-systemd-environment-when-calling-generators.patch → pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patchrenamed+5−5

@@ -1,7 +1,7 @@

1−From 3eb1716dd80c245a2883da04156af79fb9097519 Mon Sep 17 00:00:00 2001

1+From 0b0510aa72cf8026f34f300efa3f150f45971404 Mon Sep 17 00:00:00 2001

22From: Andreas Rammhold <andreas@rammhold.de>

33Date: Fri, 2 Nov 2018 21:15:42 +0100

4−Subject: [PATCH 19/27] inherit systemd environment when calling generators.

4+Subject: [PATCH 13/18] inherit systemd environment when calling generators.

66Systemd generators need access to the environment configured in

77stage-2-init.sh since it schedules fsck and mkfs executions based on

@@ -16,10 +16,10 @@ executables that are being called from managers.

1616 1 file changed, 8 insertions(+), 3 deletions(-)

1717

1818diff --git a/src/core/manager.c b/src/core/manager.c

19−index d9114bb0c5..22c3b6ff76 100644

19+index 25afdbea04..7afd5e5a37 100644

2020--- a/src/core/manager.c

2121+++ b/src/core/manager.c

22−@@ -3868,9 +3868,14 @@ static int manager_run_generators(Manager *m) {

22+@@ -3896,9 +3896,14 @@ static int manager_run_generators(Manager *m) {

2323 argv[4] = NULL;

2424

2525 RUN_WITH_UMASK(0022)

@@ -38,5 +38,5 @@ index d9114bb0c5..22c3b6ff76 100644

3838

3939 finish:

4040--

41−2.24.1

41+2.26.2

4242

pkgs/os-specific/linux/systemd/0021-add-rootprefix-to-lookup-dir-paths.patch → pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patchrenamed+4−4

@@ -1,7 +1,7 @@

1−From 8d1618a97ad08078815f409f03b45aff3ae6bd0a Mon Sep 17 00:00:00 2001

1+From 4bd20cf0450455e2f9831b09ba91811ba3d58961 Mon Sep 17 00:00:00 2001

22From: Andreas Rammhold <andreas@rammhold.de>

33Date: Thu, 9 May 2019 11:15:22 +0200

4−Subject: [PATCH 21/27] add rootprefix to lookup dir paths

4+Subject: [PATCH 14/18] add rootprefix to lookup dir paths

66systemd does not longer use the UDEVLIBEXEC directory as root for

77discovery default udev rules. By adding `$out/lib` to the lookup paths

@@ -12,7 +12,7 @@ files that I might have missed.

1212 1 file changed, 4 insertions(+), 2 deletions(-)

1313

1414diff --git a/src/basic/def.h b/src/basic/def.h

15−index 2af0b763f0..17959b07e8 100644

15+index 970654a1ad..bb261040f8 100644

1616--- a/src/basic/def.h

1717+++ b/src/basic/def.h

1818@@ -39,13 +39,15 @@

@@ -34,5 +34,5 @@ index 2af0b763f0..17959b07e8 100644

3434 #define CONF_PATHS(n) \

3535 CONF_PATHS_USR(n) \

3636--

37−2.24.1

37+2.26.2

3838

pkgs/os-specific/linux/systemd/0022-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch → pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patchrenamed+5−5

@@ -1,7 +1,7 @@

1−From 859c16c52cdd61ec99d256bf5b35637d59e5dac9 Mon Sep 17 00:00:00 2001

1+From f23a1e00de028048a2a21d322493039cce7ee214 Mon Sep 17 00:00:00 2001

22From: Nikolay Amiantov <ab@fmap.me>

33Date: Thu, 25 Jul 2019 20:45:55 +0300

4−Subject: [PATCH 22/27] systemd-shutdown: execute scripts in

4+Subject: [PATCH 15/18] systemd-shutdown: execute scripts in

55 /etc/systemd/system-shutdown

77This is needed for NixOS to use such scripts as systemd directory is immutable.

@@ -10,10 +10,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable.

1010 1 file changed, 1 insertion(+), 1 deletion(-)

1111

1212diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c

13−index 0eb17989d0..93e619c58a 100644

13+index 15e6c1799e..412bdefe74 100644

1414--- a/src/shutdown/shutdown.c

1515+++ b/src/shutdown/shutdown.c

16−@@ -299,7 +299,7 @@ int main(int argc, char *argv[]) {

16+@@ -298,7 +298,7 @@ int main(int argc, char *argv[]) {

1717 _cleanup_free_ char *cgroup = NULL;

1818 char *arguments[3], *watchdog_device;

1919 int cmd, r, umount_log_level = LOG_INFO;

@@ -23,5 +23,5 @@ index 0eb17989d0..93e619c58a 100644

2323 /* The log target defaults to console, but the original systemd process will pass its log target in through a

2424 * command line argument, which will override this default. Also, ensure we'll never log to the journal or

2525--

26−2.24.1

26+2.26.2

2727

pkgs/os-specific/linux/systemd/0023-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch → pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patchrenamed+5−5

@@ -1,7 +1,7 @@

1−From 9be689d5243d0c78bec7b285774c58749da08c9c Mon Sep 17 00:00:00 2001

1+From 758b8211e6e76524d62a2e0ffcf37dcf55e3be87 Mon Sep 17 00:00:00 2001

22From: Nikolay Amiantov <ab@fmap.me>

33Date: Thu, 25 Jul 2019 20:46:58 +0300

4−Subject: [PATCH 23/27] systemd-sleep: execute scripts in

4+Subject: [PATCH 16/18] systemd-sleep: execute scripts in

55 /etc/systemd/system-sleep

77This is needed for NixOS to use such scripts as systemd directory is immutable.

@@ -10,10 +10,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable.

1010 1 file changed, 1 insertion(+)

1111

1212diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c

13−index b9fe96635d..f1c3ca06a3 100644

13+index fbfddc0262..d2530b9421 100644

1414--- a/src/sleep/sleep.c

1515+++ b/src/sleep/sleep.c

16−@@ -191,6 +191,7 @@ static int execute(char **modes, char **states) {

16+@@ -178,6 +178,7 @@ static int execute(char **modes, char **states) {

1717 };

1818 static const char* const dirs[] = {

1919 SYSTEM_SLEEP_PATH,

@@ -22,5 +22,5 @@ index b9fe96635d..f1c3ca06a3 100644

2222 };

2323

2424--

25−2.24.1

25+2.26.2

2626

pkgs/os-specific/linux/systemd/0024-kmod-static-nodes.service-Update-ConditionFileNotEmpty.patch → pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patchrenamed+3−3

@@ -1,7 +1,7 @@

1−From 7db89c2236158461c99fe5c5da7ddb7feab825cf Mon Sep 17 00:00:00 2001

1+From ce9fe2249c91fdfb224eaffce63e3dbdb4a5c25d Mon Sep 17 00:00:00 2001

22From: Florian Klink <flokli@flokli.de>

33Date: Sat, 7 Mar 2020 22:40:27 +0100

4−Subject: [PATCH] kmod-static-nodes.service: Update ConditionFileNotEmpty

4+Subject: [PATCH 17/18] kmod-static-nodes.service: Update ConditionFileNotEmpty

66On NixOS, kernel modules of the currently booted systems are located at

77/run/booted-system/kernel-modules/lib/modules/%v/, not /lib/modules/%v/.

@@ -23,5 +23,5 @@ index 0971edf9ec..87105a87b9 100644

2323 [Service]

2424 Type=oneshot

2525--

26−2.25.1

26+2.26.2

2727

pkgs/os-specific/linux/systemd/0025-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch → pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patchrenamed+4−4

@@ -1,7 +1,7 @@

1−From 0939ac4be7ced099670979f26adf8a579173ce4b Mon Sep 17 00:00:00 2001

1+From 55b69fc1b5441e3aff8f1ab684ba8eed3718a32d Mon Sep 17 00:00:00 2001

22From: Florian Klink <flokli@flokli.de>

33Date: Sun, 8 Mar 2020 01:05:54 +0100

4−Subject: [PATCH] path-util.h: add placeholder for DEFAULT_PATH_NORMAL

4+Subject: [PATCH 18/18] path-util.h: add placeholder for DEFAULT_PATH_NORMAL

66This will be the $PATH used to lookup ExecStart= etc. options, which

77systemd itself uses extensively.

@@ -10,7 +10,7 @@ systemd itself uses extensively.

1010 1 file changed, 3 insertions(+), 3 deletions(-)

1111

1212diff --git a/src/basic/path-util.h b/src/basic/path-util.h

13−index 111d85d445..cfd92aeb73 100644

13+index 30031fca8e..d97145539a 100644

1414--- a/src/basic/path-util.h

1515+++ b/src/basic/path-util.h

1616@@ -24,11 +24,11 @@

@@ -29,5 +29,5 @@ index 111d85d445..cfd92aeb73 100644

2929 #if HAVE_SPLIT_USR

3030 # define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR

3131--

32−2.25.1

32+2.26.2

3333

pkgs/os-specific/linux/systemd/default.nix+20−20

@@ -31,7 +31,7 @@ let gnupg-minimal = gnupg.override {

3131 bzip2 = null;

3232};

3333in stdenv.mkDerivation {

34− version = "245.3";

34+ version = "245.5";

3535 pname = "systemd";

3636

3737 # When updating, use https://github.com/systemd/systemd-stable tree, not the development one!

@@ -39,29 +39,29 @@ in stdenv.mkDerivation {

3939 src = fetchFromGitHub {

4040 owner = "systemd";

4141 repo = "systemd-stable";

42− rev = "0f5047b7d393cfba37f91e25cae559a0bc910582";

43− sha256 = "0wyh14gbvvpgdmk1mjgpxr9i4pv1i9n7pnwpa0gvjh6hq948fyn2";

42+ rev = "9a506b7e9291d997a920af9ac299e7b834368119";

43+ sha256 = "19qd92hjlsljr6x5mbw1l2vdzz5y9hy7y7g0dwgpfifb0lwkxqbr";

4444 };

4545

4646 patches = [

4747 ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch

48− ./0003-Don-t-try-to-unmount-nix-or-nix-store.patch

49− ./0004-Fix-NixOS-containers.patch

50− ./0006-Look-for-fsck-in-the-right-place.patch

51− ./0007-Add-some-NixOS-specific-unit-directories.patch

52− ./0009-Get-rid-of-a-useless-message-in-user-sessions.patch

53− ./0010-hostnamed-localed-timedated-disable-methods-that-cha.patch

54− ./0011-Fix-hwdb-paths.patch

55− ./0012-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch

56− ./0013-localectl-use-etc-X11-xkb-for-list-x11.patch

57− ./0016-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch

58− ./0018-Install-default-configuration-into-out-share-factory.patch

59− ./0019-inherit-systemd-environment-when-calling-generators.patch

60− ./0021-add-rootprefix-to-lookup-dir-paths.patch

61− ./0022-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch

62− ./0023-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch

63− ./0024-kmod-static-nodes.service-Update-ConditionFileNotEmpty.patch

64− ./0025-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch

48+ ./0002-Don-t-try-to-unmount-nix-or-nix-store.patch

49+ ./0003-Fix-NixOS-containers.patch

50+ ./0004-Look-for-fsck-in-the-right-place.patch

51+ ./0005-Add-some-NixOS-specific-unit-directories.patch

52+ ./0006-Get-rid-of-a-useless-message-in-user-sessions.patch

53+ ./0007-hostnamed-localed-timedated-disable-methods-that-cha.patch

54+ ./0008-Fix-hwdb-paths.patch

55+ ./0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch

56+ ./0010-localectl-use-etc-X11-xkb-for-list-x11.patch

57+ ./0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch

58+ ./0012-Install-default-configuration-into-out-share-factory.patch

59+ ./0013-inherit-systemd-environment-when-calling-generators.patch

60+ ./0014-add-rootprefix-to-lookup-dir-paths.patch

61+ ./0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch

62+ ./0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch

63+ ./0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch

64+ ./0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch

6565 ];

6666

6767 postPatch = ''