679136e · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

Merge staging-next into staging

commit679136e25258760f9991cdbb8d26440e666daf78 authorFrederik Rietdijk <fridh@fridh.nl> dateThu 25 Jun 2020, 20:35 (6 years ago) parent7a3be96 bef20b3

45 files changed+193−109

compare with master

unifiedsplit

lib/attrsets.nix+1

@@ -469,6 +469,7 @@ rec {

469469 getBin = getOutput "bin";

470470 getLib = getOutput "lib";

471471 getDev = getOutput "dev";

472+ getMan = getOutput "man";

472473

473474 /* Pick the outputs of packages to place in buildInputs */

474475 chooseDevOutputs = drvs: builtins.map getDev drvs;

lib/default.nix+1−1

@@ -77,7 +77,7 @@ let

7777 genAttrs isDerivation toDerivation optionalAttrs

7878 zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil

7979 recursiveUpdate matchAttrs overrideExisting getOutput getBin

80− getLib getDev chooseDevOutputs zipWithNames zip

80+ getLib getDev getMan chooseDevOutputs zipWithNames zip

8181 recurseIntoAttrs dontRecurseIntoAttrs;

8282 inherit (lists) singleton forEach foldr fold foldl foldl' imap0 imap1

8383 concatMap flatten remove findSingle findFirst any all count

nixos/doc/manual/release-notes/rl-2009.xml+9

@@ -110,6 +110,15 @@ systemd.services.mysql.serviceConfig.ReadWritePaths = [ "/var/data" ];

110110</programlisting>

111111 </para>

112112 </listitem>

113+ <listitem>

114+ <para>

115+ Two new option <link linkend="opt-documentation.man.generateCaches">documentation.man.generateCaches</link>

116+ has been added to automatically generate the <literal>man-db</literal> caches, which are needed by utilities

117+ like <command>whatis</command> and <command>apropos</command>. The caches are generated during the build of

118+ the NixOS configuration: since this can be expensive when a large number of packages are installed, the

119+ feature is disabled by default.

120+ </para>

121+ </listitem>

113122 </itemizedlist>

114123 </section>

115124

nixos/modules/misc/documentation.nix+37−1

@@ -102,6 +102,16 @@ in

102102 '';

103103 };

104104

105+ man.generateCaches = mkOption {

106+ type = types.bool;

107+ default = false;

108+ description = ''

109+ Whether to generate the manual page index caches using

110+ <literal>mandb(8)</literal>. This allows searching for a page or

111+ keyword using utilities like <literal>apropos(1)</literal>.

112+ '';

113+ };

114+

105115 info.enable = mkOption {

106116 type = types.bool;

107117 default = true;

@@ -187,7 +197,33 @@ in

187197 environment.systemPackages = [ pkgs.man-db ];

188198 environment.pathsToLink = [ "/share/man" ];

189199 environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable "devman";

190− environment.etc."man.conf".source = "${pkgs.man-db}/etc/man_db.conf";

200+ environment.etc."man_db.conf".text =

201+ let

202+ manualPages = pkgs.buildEnv {

203+ name = "man-paths";

204+ paths = config.environment.systemPackages;

205+ pathsToLink = [ "/share/man" ];

206+ extraOutputsToInstall = ["man"];

207+ ignoreCollisions = true;

208+ };

209+ manualCache = pkgs.runCommandLocal "man-cache" { }

210+ ''

211+ echo "MANDB_MAP ${manualPages}/share/man $out" > man.conf

212+ ${pkgs.man-db}/bin/mandb -C man.conf -psc

213+ '';

214+ in

215+ ''

216+ # Manual pages paths for NixOS

217+ MANPATH_MAP /run/current-system/sw/bin /run/current-system/sw/share/man

218+ MANPATH_MAP /run/wrappers/bin /run/current-system/sw/share/man

219+

220+ ${optionalString cfg.man.generateCaches ''

221+ # Generated manual pages cache for NixOS (immutable)

222+ MANDB_MAP /run/current-system/sw/share/man ${manualCache}

223+ ''}

224+ # Manual pages caches for NixOS

225+ MANDB_MAP /run/current-system/sw/share/man /var/cache/man/nixos

226+ '';

191227 })

192228

193229 (mkIf cfg.info.enable {

pkgs/data/icons/numix-icon-theme/default.nix+2−2

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

33stdenv.mkDerivation rec {

44 pname = "numix-icon-theme";

5− version = "20.03.20";

5+ version = "20.06.07";

77 src = fetchFromGitHub {

88 owner = "numixproject";

99 repo = pname;

1010 rev = version;

11− sha256 = "092f8k38xf9yz898nrangm0ia211d41z8kx0v6njfqfgpiad1s7q";

11+ sha256 = "1yp9parc8ihmai8pswf4qzrqd88qpls87ipq8ylx38yqns7wsn4h";

1212 };

1313

1414 nativeBuildInputs = [ gtk3 ];

pkgs/desktops/gnome-3/core/nautilus/default.nix+2−2

@@ -32,11 +32,11 @@

3232

3333stdenv.mkDerivation rec {

3434 pname = "nautilus";

35− version = "3.36.2";

35+ version = "3.36.3";

3636

3737 src = fetchurl {

3838 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

39− sha256 = "1yknaz8n0l949sr8j3b7kdm0cm5mx2dp4n4k577m492hk6akqrr6";

39+ sha256 = "1y0fsd7j48v4qkc051cg41mz7jycgw4vd4g37lw682p7n5xgrjmn";

4040 };

4141

4242 nativeBuildInputs = [

pkgs/development/libraries/ffmpeg-full/default.nix−2

@@ -242,8 +242,6 @@ stdenv.mkDerivation rec {

242242 pname = "ffmpeg-full";

243243 inherit (ffmpeg) src version;

244244

245− patches = [ ./prefer-libdav1d-over-libaom.patch ];

246−

247245 prePatch = ''

248246 patchShebangs .

249247 '' + stdenv.lib.optionalString stdenv.isDarwin ''

pkgs/development/libraries/ffmpeg-full/prefer-libdav1d-over-libaom.patchdeleted−19

@@ -1,19 +0,0 @@

1−diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c

2−index d2f9a39ce5..2342399a8e 100644

3−--- a/libavcodec/allcodecs.c

4−+++ b/libavcodec/allcodecs.c

5−@@ -679,13 +679,13 @@ extern AVCodec ff_pcm_mulaw_at_encoder;

6− extern AVCodec ff_pcm_mulaw_at_decoder;

7− extern AVCodec ff_qdmc_at_decoder;

8− extern AVCodec ff_qdm2_at_decoder;

9−+extern AVCodec ff_libdav1d_decoder;

10− extern AVCodec ff_libaom_av1_decoder;

11− extern AVCodec ff_libaom_av1_encoder;

12− extern AVCodec ff_libaribb24_decoder;

13− extern AVCodec ff_libcelt_decoder;

14− extern AVCodec ff_libcodec2_encoder;

15− extern AVCodec ff_libcodec2_decoder;

16−-extern AVCodec ff_libdav1d_decoder;

17− extern AVCodec ff_libdavs2_decoder;

18− extern AVCodec ff_libfdk_aac_encoder;

19− extern AVCodec ff_libfdk_aac_decoder;

pkgs/development/libraries/ffmpeg/4.nix+3−3

@@ -5,8 +5,8 @@

55}@args:

77callPackage ./generic.nix (rec {

8− version = "4.2.3";

9− branch = "4.2";

10− sha256 = "0pkrariwjv25k7inwshch7b5820ly3hsp991amyb60rkqc8v4zi1";

8+ version = "4.3";

9+ branch = "4.3";

10+ sha256 = "1qnnhd2b0g5sg72pclxs3i8sxzz0raky69k7w9cmpba9zh973s57";

1111 darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];

1212} // args)

pkgs/development/libraries/json-c/default.nix+10−1

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

1−{ stdenv, fetchurl, autoconf }:

1+{ stdenv, fetchurl, fetchpatch, autoconf }:

33stdenv.mkDerivation rec {

44 name = "json-c-0.13.1";

@@ -7,6 +7,15 @@ stdenv.mkDerivation rec {

77 sha256 = "0ch1v18wk703bpbyzj7h1mkwvsw4rw4qdwvgykscypvqq10678ll";

88 };

10+ patches = [

11+ # https://nvd.nist.gov/vuln/detail/CVE-2020-12762

12+ (fetchpatch {

13+ name = "CVE-2020-12762.patch";

14+ url = "https://github.com/json-c/json-c/commit/865b5a65199973bb63dff8e47a2f57e04fec9736.patch";

15+ sha256 = "1g5afk4khhm1sb70xrva1pyznshcw3ipzp1g5z60dpzxy303pp6h";

16+ })

17+ ];

18+

1019 outputs = [ "out" "dev" ];

1120

1221 nativeBuildInputs = [ autoconf ]; # for autoheader

pkgs/development/libraries/libgcrypt/default.nix+4

@@ -30,6 +30,10 @@ stdenv.mkDerivation rec {

3030 configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ]

3131 ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-asm";

3232

33+ # Necessary to generate correct assembly when compiling for aarch32 on

34+ # aarch64

35+ configurePlatforms = [ "host" "build" ];

36+

3337 # Make sure libraries are correct for .pc and .la files

3438 # Also make sure includes are fixed for callers who don't use libgpgcrypt-config

3539 postFixup = ''

pkgs/development/libraries/libjpeg-turbo/default.nix+6

@@ -18,6 +18,12 @@ stdenv.mkDerivation rec {

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

1919 sha256 = "0nc5vcch5h52gpi07h08zf8br58q8x81q2hv871hrn0dinb53vym";

2020 })

21+

22+ (fetchpatch {

23+ name = "cve-2020-13790.patch";

24+ url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/3de15e0c344d.diff";

25+ sha256 = "0hm5i6qir5w3zxb0xvqdh4jyvbfg7xnd28arhyfsaclfz9wdb0pb";

26+ })

2127 ] ++

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

2329 ./mingw-boolean.patch;

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

@@ -1,11 +1,11 @@

11{ buildPackages, stdenv, fetchurl, gettext, libgpgerror }:

33stdenv.mkDerivation rec {

4− name = "libksba-1.3.5";

4+ name = "libksba-1.4.0";

66 src = fetchurl {

77 url = "mirror://gnupg/libksba/${name}.tar.bz2";

8− sha256 = "0h53q4sns1jz1pkmhcz5wp9qrfn9f5g9i3vjv6dafwzzlvblyi21";

8+ sha256 = "1dj1razn35srkgadx3i30yr0q037cr0dn54m6a54vxgh3zlsirmz";

99 };

1010

1111 outputs = [ "out" "dev" "info" ];

pkgs/development/libraries/libqmi/default.nix+6−4

@@ -1,22 +1,24 @@

1−{ stdenv, fetchurl, pkgconfig, glib, python3, libgudev, libmbim }:

1+{ stdenv, fetchurl, pkg-config, gobject-introspection, glib, python3, libgudev, libmbim }:

33stdenv.mkDerivation rec {

44 pname = "libqmi";

5− version = "1.24.12";

5+ version = "1.25.900";

77 src = fetchurl {

88 url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz";

9− sha256 = "0scb8a2kh0vnzx6kxanfy2s2slnfppvrwg202rxv30m8p2i92frd";

9+ sha256 = "0a96f4ab7qy4szwzqs8ir2mvsnpqzk7zsiv6zahlhpf0jhp1vxf7";

1010 };

1111

1212 outputs = [ "out" "dev" "devdoc" ];

1313

1414 configureFlags = [

1515 "--with-udev-base-dir=${placeholder "out"}/lib/udev"

16+ "--enable-introspection"

1617 ];

1718

1819 nativeBuildInputs = [

19− pkgconfig

20+ pkg-config

21+ gobject-introspection

2022 python3

2123 ];

2224

pkgs/development/libraries/nv-codec-headers/default.nix+2−2

@@ -2,12 +2,12 @@

33stdenv.mkDerivation rec {

44 pname = "nv-codec-headers";

5− version = "9.0.18.1";

5+ version = "9.1.23.1";

77 src = fetchgit {

88 url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git";

99 rev = "n${version}";

10− sha256 = "0354fivb92ix341jds7a7qn3mgwimrnxbganhlhr4vayj25c3hw5";

10+ sha256 = "1xfvb3mhz6wfx9c732888xa82ivaig903lhvvrqqzs31qfznsplh";

1111 };

1212

1313 makeFlags = [ "PREFIX=$(out)" ];

pkgs/development/libraries/science/math/openblas/default.nix+2−2

@@ -99,12 +99,12 @@ let

9999in

100100stdenv.mkDerivation rec {

101101 pname = "openblas";

102− version = "0.3.9";

102+ version = "0.3.10";

103103 src = fetchFromGitHub {

104104 owner = "xianyi";

105105 repo = "OpenBLAS";

106106 rev = "v${version}";

107− sha256 = "0nq51j45shb32n6086xff3x374kx5qhr2cwjzvppx4s2z0ahflal";

107+ sha256 = "174id98ga82bhz2v7sy9yj6pqy0h0088p3mkdikip69p9rh3d17b";

108108 };

109109

110110 inherit blas64;

pkgs/development/python-modules/flake8/default.nix+4−3

@@ -1,6 +1,6 @@

11{ stdenv, buildPythonPackage, fetchPypi, pythonOlder

22, mock, pytest, pytestrunner

3−, configparser, enum34, mccabe, pycodestyle, pyflakes, entrypoints, functools32, typing

3+, configparser, enum34, mccabe, pycodestyle, pyflakes, functools32, typing, importlib-metadata

44}:

66buildPythonPackage rec {

@@ -13,10 +13,11 @@ buildPythonPackage rec {

1313 };

1414

1515 checkInputs = [ pytest mock pytestrunner ];

16− propagatedBuildInputs = [ entrypoints pyflakes pycodestyle mccabe ]

16+ propagatedBuildInputs = [ pyflakes pycodestyle mccabe ]

1717 ++ stdenv.lib.optionals (pythonOlder "3.2") [ configparser functools32 ]

1818 ++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ]

19− ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];

19+ ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]

20+ ++ stdenv.lib.optionals (pythonOlder "3.8") [ importlib-metadata ];

2021

2122 checkPhase = ''

2223 py.test tests

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

@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {

1919 + lib.optionalString useNcurses "-cursesUI"

2020 + lib.optionalString withQt5 "-qt5UI"

2121 + lib.optionalString useQt4 "-qt4UI";

22− version = "3.17.2";

22+ version = "3.17.3";

2323

2424 src = fetchurl {

2525 url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";

2626 # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt

27− sha256 = "199srp8yfai51pcbpmfyc4s8vzrmh2dm91bp582hj2l29x634xzw";

27+ sha256 = "0h4c3nwk7wmzcmmlwyb16zmjqr44l4k591m2y9p9zp3m498hvmhb";

2828 };

2929

3030 patches = [

pkgs/development/tools/parsing/bison/default.nix+2−2

@@ -2,11 +2,11 @@

33stdenv.mkDerivation rec {

44 pname = "bison";

5− version = "3.6.2";

5+ version = "3.6.3";

77 src = fetchurl {

88 url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";

9− sha256 = "16h8panwpljwdq902v9x7inpnks51fn0kqlbyqfjvpilv6md73p2";

9+ sha256 = "0qry9ar16dpg9nzrq7jh3fqh4ah2xvcf6v00fc81z08yjd1ljk2b";

1010 };

1111

1212 nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man;

pkgs/os-specific/linux/alsa-lib/default.nix+2−2

@@ -1,11 +1,11 @@

11{ stdenv, fetchurl, alsa-ucm-conf, alsa-topology-conf }:

33stdenv.mkDerivation rec {

4− name = "alsa-lib-1.2.2";

4+ name = "alsa-lib-1.2.3";

66 src = fetchurl {

77 url = "mirror://alsa/lib/${name}.tar.bz2";

8− sha256 = "1v5kb8jyvrpkvvq7dq8hfbmcj68lml97i4s0prxpfx2mh3c57s6q";

8+ sha256 = "13k7dx1g749z74rz71hs5j8z0pqdjgx7l69pn0vsy7jizhi0kw02";

99 };

1010

1111 patches = [

pkgs/os-specific/linux/alsa-topology-conf/default.nix+2−2

@@ -2,11 +2,11 @@

33stdenv.mkDerivation rec {

44 name = "alsa-topology-conf-${version}";

5− version = "1.2.2";

5+ version = "1.2.3";

77 src = fetchurl {

88 url = "mirror://alsa/lib/${name}.tar.bz2";

9− sha256 = "09cls485ckdjsp4azhv3nw7chyg3r7zrqgald6yp70f7cysxcwml";

9+ sha256 = "1zwxc9zhfcmyffjjbibzpdvf4kx7wv9g2zl6xz7y0d6srfr9jgw3";

1010 };

1111

1212 dontBuild = true;

pkgs/os-specific/linux/alsa-ucm-conf/default.nix+2−2

@@ -2,11 +2,11 @@

33stdenv.mkDerivation rec {

44 name = "alsa-ucm-conf-${version}";

5− version = "1.2.2";

5+ version = "1.2.3";

77 src = fetchurl {

88 url = "mirror://alsa/lib/${name}.tar.bz2";

9− sha256 = "0364fgzdm2qrsqvgqri25gzscbma7yqlv31wz8b1z9c5phlxkgvy";

9+ sha256 = "000db5yla7dljidjbbwbiaxvc1a7wh1zpw694gipaymj9fh4vhhv";

1010 };

1111

1212 dontBuild = true;

pkgs/os-specific/linux/kernel/common-config.nix+1−1

@@ -255,7 +255,7 @@ let

255255 SND_HDA_RECONFIG = yes; # Support reconfiguration of jack functions

256256 # Support configuring jack functions via fw mechanism at boot

257257 SND_HDA_PATCH_LOADER = yes;

258− SND_HDA_CODEC_CA0132_DSP = whenOlder "5.8" yes; # Enable DSP firmware loading on Creative Soundblaster Z/Zx/ZxR/Recon

258+ SND_HDA_CODEC_CA0132_DSP = whenOlder "5.7" yes; # Enable DSP firmware loading on Creative Soundblaster Z/Zx/ZxR/Recon

259259 SND_OSSEMUL = yes;

260260 SND_USB_CAIAQ_INPUT = yes;

261261 # Enable PSS mixer (Beethoven ADSP-16 and other compatible)

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

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

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

1+From 22f46f55c81d84e83a4614856d84e63c8400165c Mon Sep 17 00:00:00 2001

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

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

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

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

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

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

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

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

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

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

@@ -7,18 +7,18 @@ They'll still be remounted read-only.

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

99---

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

11− src/shutdown/umount.c | 2 ++

10+ src/shared/fstab-util.c | 2 ++

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

1212 2 files changed, 4 insertions(+)

1313

14−diff --git a/src/core/mount.c b/src/core/mount.c

15−index 1c4aefd734..a5553226f8 100644

16−--- a/src/core/mount.c

17−+++ b/src/core/mount.c

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

19−

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

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

14+diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c

15+index b19127be09..f9adca1100 100644

16+--- a/src/shared/fstab-util.c

17++++ b/src/shared/fstab-util.c

18+@@ -40,6 +40,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) {

19+ /* Don't bother with the OS data itself */

20+ if (PATH_IN_SET(mount,

21+ "/",

2222+ "/nix",

2323+ "/nix/store",

2424 "/usr",

pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch+4−4

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

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

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

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

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

44Subject: [PATCH 03/18] Fix NixOS containers

@@ -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 734dee1130..a97b1a4bc9 100644

13+index 51d0c2a75b..4d3451ff3b 100644

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

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

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

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

1717 goto finish;

1818 }

1919 } else {

@@ -21,7 +21,7 @@ index 734dee1130..a97b1a4bc9 100644

2121 const char *p, *q;

2222

2323 if (arg_pivot_root_new)

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

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

2525 r = -EINVAL;

2626 goto finish;

2727 }

pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch+1−1

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

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

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

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

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

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

pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch+1−1

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

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

1+From 450c133c1815b473136b2a5540f9213fef5506ee Mon Sep 17 00:00:00 2001

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

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

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

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

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

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

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

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

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

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

@@ -13,7 +13,7 @@ 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 97e1b0004c..d3cc2ba9ec 100644

16+index c306183555..3db39fa435 100644

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

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

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

pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch+1−1

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

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

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

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

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

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

pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch+1−1

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

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

1+From 5a6aad633a7ceffd62b009ce0c4ab6673129f7ff Mon Sep 17 00:00:00 2001

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

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

44Subject: [PATCH 08/18] Fix hwdb paths

pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch+2−2

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

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

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

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

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

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

@@ -79,7 +79,7 @@ index 901fbf0815..b57bdd8fbe 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 a97b1a4bc9..aed60439e3 100644

82+index 4d3451ff3b..1adb91335c 100644

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

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

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

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

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

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

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

22From: Imuli <i@imu.li>

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

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

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

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

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

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

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

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

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

@@ -8,10 +8,10 @@ Subject: [PATCH 11/18] build: don't create statedir and don't touch prefixdir

88 1 file changed, 3 deletions(-)

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

11−index fc216d22da..078db3bb5d 100644

11+index c09115e06a..62eba4186c 100644

1212--- a/meson.build

1313+++ b/meson.build

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

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

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

1616 install_dir : docdir)

1717

pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch+6−6

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

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

1+From 9262f52b0e30cf8c39d9f7684a8c0e8fd4887cd5 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

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

@@ -44,7 +44,7 @@ index 4df6dabf89..02d8d69095 100644

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

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

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

47−index 078db3bb5d..6e1a6483fc 100644

47+index 62eba4186c..b0b2edbb5a 100644

4848--- a/meson.build

4949+++ b/meson.build

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

@@ -57,7 +57,7 @@ index 078db3bb5d..6e1a6483fc 100644

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

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

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

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

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

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

6262 mkdir_p.format(binfmtdir))

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

@@ -66,7 +66,7 @@ index 078db3bb5d..6e1a6483fc 100644

6666 endif

6767

6868 if conf.get('ENABLE_REPART') == 1

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

69+@@ -2612,7 +2615,7 @@ executable('systemd-sleep',

7070 install_dir : rootlibexecdir)

7171

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

@@ -75,7 +75,7 @@ index 078db3bb5d..6e1a6483fc 100644

7575

7676 exe = executable('systemd-sysctl',

7777 'src/sysctl/sysctl.c',

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

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

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

8080 mkdir_p.format(modulesloaddir))

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

@@ -84,7 +84,7 @@ index 078db3bb5d..6e1a6483fc 100644

8484 endif

8585

8686 exe = executable('systemd-nspawn',

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

87+@@ -3167,7 +3170,7 @@ install_subdir('factory/etc',

8888 install_dir : factorydir)

8989

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

pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch+3−3

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

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

1+From 05c2761f6a981c8576fc47a3dd8beb5a2af3ef09 Mon Sep 17 00:00:00 2001

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

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

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

@@ -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 25afdbea04..7afd5e5a37 100644

19+index 4412e7a849..b799eeca95 100644

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

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

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

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

2323 argv[4] = NULL;

2424

2525 RUN_WITH_UMASK(0022)

pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch+1−1

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

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

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

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

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

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

pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch+3−3

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

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

1+From 98580b4aa34f3d2e7401f54d6561c5af27ea3437 Mon Sep 17 00:00:00 2001

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

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

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

@@ -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 15e6c1799e..412bdefe74 100644

13+index 523040b57c..561d91c94c 100644

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

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

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

16+@@ -299,7 +299,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;

pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch+1−1

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

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

1+From 3821e20966ee20f74986041f33c4934ad20385b2 Mon Sep 17 00:00:00 2001

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

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

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

pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch+1−1

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

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

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

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

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

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

pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch+1−1

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

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

1+From 9c1ac48a7d95c09bef5a924bb5db6908596403b4 Mon Sep 17 00:00:00 2001

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

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

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

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

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

3131 bzip2 = null;

3232};

3333in stdenv.mkDerivation {

34− version = "245.5";

34+ version = "245.6";

3535 pname = "systemd";

3636

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

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

3939 src = fetchFromGitHub {

4040 owner = "systemd";

4141 repo = "systemd-stable";

42− rev = "9a506b7e9291d997a920af9ac299e7b834368119";

43− sha256 = "19qd92hjlsljr6x5mbw1l2vdzz5y9hy7y7g0dwgpfifb0lwkxqbr";

42+ rev = "aa0cb635f1f6a4d9b50ed2cca7782f3f751be933";

43+ sha256 = "191f0r1g946bsqxky00z78wygsxi9pld11y2q4374bshnpsff2ll";

4444 };

4545

4646 patches = [

pkgs/tools/misc/file/default.nix+2−2

@@ -2,14 +2,14 @@

33stdenv.mkDerivation rec {

44 pname = "file";

5− version = "5.38";

5+ version = "5.39";

77 src = fetchurl {

88 urls = [

99 "ftp://ftp.astron.com/pub/file/${pname}-${version}.tar.gz"

1010 "https://distfiles.macports.org/file/${pname}-${version}.tar.gz"

1111 ];

12− sha256 = "0d7s376b4xqymnrsjxi3nsv3f5v89pzfspzml2pcajdk5by2yg2r";

12+ sha256 = "1lgs2w2sgamzf27kz5h7pajz7v62554q21fbs11n4mfrfrm2hpgh";

1313 };

1414

1515 nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file;

pkgs/tools/misc/man-db/default.nix+3−5

@@ -15,18 +15,17 @@ stdenv.mkDerivation rec {

1515 buildInputs = [ libpipeline db groff ]; # (Yes, 'groff' is both native and build input)

1616 checkInputs = [ libiconv /* for 'iconv' binary */ ];

1717

18+ patches = [ ./systemwide-man-db-conf.patch ];

19+

1820 postPatch = ''

1921 # Remove all mandatory manpaths. Nixpkgs makes no requirements on

2022 # these directories existing.

2123 sed -i 's/^MANDATORY_MANPATH/# &/' src/man_db.conf.in

2224

23− # Add Nixpkgs and NixOS-related manpaths

24− echo "MANPATH_MAP /run/current-system/sw/bin /run/current-system/sw/share/man" >> src/man_db.conf.in

25− echo "MANPATH_MAP /run/wrappers/bin /run/current-system/sw/share/man" >> src/man_db.conf.in

25+ # Add Nix-related manpaths

2626 echo "MANPATH_MAP /nix/var/nix/profiles/default/bin /nix/var/nix/profiles/default/share/man" >> src/man_db.conf.in

2727

2828 # Add mandb locations for the above

29− echo "MANDB_MAP /run/current-system/sw/share/man /var/cache/man/nixos" >> src/man_db.conf.in

3029 echo "MANDB_MAP /nix/var/nix/profiles/default/share/man /var/cache/man/nixpkgs" >> src/man_db.conf.in

3130 '';

3231

@@ -34,7 +33,6 @@ stdenv.mkDerivation rec {

3433 "--disable-setuid"

3534 "--disable-cache-owner"

3635 "--localstatedir=/var"

37− # Don't try /etc/man_db.conf by default, so we avoid error messages.

3836 "--with-config-file=${placeholder "out"}/etc/man_db.conf"

3937 "--with-systemdtmpfilesdir=${placeholder "out"}/lib/tmpfiles.d"

4038 "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"

pkgs/tools/misc/man-db/systemwide-man-db-conf.patchnew file+39

@@ -0,0 +1,39 @@

1+commit 9089291006a4258c39c75a920ad536b61504251a

2+Author: rnhmjoj <rnhmjoj@inventati.org>

3+Date: Fri May 1 19:32:15 2020 +0200

5+ check for systemwide man_db.conf before the bundled one

7+diff --git a/src/manp.c b/src/manp.c

8+index 5441339..0bbf566 100644

9+--- a/src/manp.c

10++++ b/src/manp.c

11+@@ -841,18 +841,24 @@ void read_config_file (bool optional)

12+ }

13+

14+ if (getenv ("MAN_TEST_DISABLE_SYSTEM_CONFIG") == NULL) {

15+- config_file = fopen (CONFIG_FILE, "r");

16++ const char *config_filepath;

17++ if (access ("/etc/man_db.conf", F_OK) != -1) {

18++ config_filepath = "/etc/man_db.conf";

19++ } else {

20++ config_filepath = CONFIG_FILE;

21++ }

22++ config_file = fopen (config_filepath, "r");

23+ if (config_file == NULL) {

24+ if (optional)

25+ debug ("can't open %s; continuing anyway\n",

26+- CONFIG_FILE);

27++ config_filepath);

28+ else

29+ error (FAIL, 0,

30+ _("can't open the manpath "

31+ "configuration file %s"),

32+- CONFIG_FILE);

33++ config_filepath);

34+ } else {

35+- debug ("From the config file %s:\n", CONFIG_FILE);

36++ debug ("From the config file %s:\n", config_filepath);

37+

38+ add_to_dirlist (config_file, 0);

39+ fclose (config_file);