cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge staging-next into staging

Browse source
This commit is contained in:
Frederik Rietdijk 2020-06-25 20:35:19 +02:00
commit 679136e252
45 changed files with 193 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/attrsets.nix
View file

@ -469,6 +469,7 @@ rec {
getBin = getOutput "bin";
getLib = getOutput "lib";
getDev = getOutput "dev";
getMan = getOutput "man";
/* Pick the outputs of packages to place in buildInputs */
chooseDevOutputs = drvs: builtins.map getDev drvs;

2
lib/default.nix
View file

@ -77,7 +77,7 @@ let
genAttrs isDerivation toDerivation optionalAttrs
zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil
recursiveUpdate matchAttrs overrideExisting getOutput getBin
getLib getDev chooseDevOutputs zipWithNames zip
getLib getDev getMan chooseDevOutputs zipWithNames zip
recurseIntoAttrs dontRecurseIntoAttrs;
inherit (lists) singleton forEach foldr fold foldl foldl' imap0 imap1
concatMap flatten remove findSingle findFirst any all count

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

@ -110,6 +110,15 @@ systemd.services.mysql.serviceConfig.ReadWritePaths = [ "/var/data" ];
</programlisting>
</para>
</listitem>
<listitem>
<para>
Two new option <link linkend="opt-documentation.man.generateCaches">documentation.man.generateCaches</link>
has been added to automatically generate the <literal>man-db</literal> caches, which are needed by utilities
like <command>whatis</command> and <command>apropos</command>. The caches are generated during the build of
the NixOS configuration: since this can be expensive when a large number of packages are installed, the
feature is disabled by default.
</para>
</listitem>
</itemizedlist>
</section>

38
nixos/modules/misc/documentation.nix
View file

@ -102,6 +102,16 @@ in
'';
};
man.generateCaches = mkOption {
type = types.bool;
default = false;
description = ''
Whether to generate the manual page index caches using
<literal>mandb(8)</literal>. This allows searching for a page or
keyword using utilities like <literal>apropos(1)</literal>.
'';
};
info.enable = mkOption {
type = types.bool;
default = true;
@ -187,7 +197,33 @@ in
environment.systemPackages = [ pkgs.man-db ];
environment.pathsToLink = [ "/share/man" ];
environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable "devman";
environment.etc."man.conf".source = "${pkgs.man-db}/etc/man_db.conf";
environment.etc."man_db.conf".text =
let
manualPages = pkgs.buildEnv {
name = "man-paths";
paths = config.environment.systemPackages;
pathsToLink = [ "/share/man" ];
extraOutputsToInstall = ["man"];
ignoreCollisions = true;
};
manualCache = pkgs.runCommandLocal "man-cache" { }
''
echo "MANDB_MAP ${manualPages}/share/man $out" > man.conf
${pkgs.man-db}/bin/mandb -C man.conf -psc
'';
in
''
# Manual pages paths for NixOS
MANPATH_MAP /run/current-system/sw/bin /run/current-system/sw/share/man
MANPATH_MAP /run/wrappers/bin /run/current-system/sw/share/man
${optionalString cfg.man.generateCaches ''
# Generated manual pages cache for NixOS (immutable)
MANDB_MAP /run/current-system/sw/share/man ${manualCache}
''}
# Manual pages caches for NixOS
MANDB_MAP /run/current-system/sw/share/man /var/cache/man/nixos
'';
})
(mkIf cfg.info.enable {

4
pkgs/data/icons/numix-icon-theme/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "numix-icon-theme";
version = "20.03.20";
version = "20.06.07";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
sha256 = "092f8k38xf9yz898nrangm0ia211d41z8kx0v6njfqfgpiad1s7q";
sha256 = "1yp9parc8ihmai8pswf4qzrqd88qpls87ipq8ylx38yqns7wsn4h";
};
nativeBuildInputs = [ gtk3 ];

4
pkgs/desktops/gnome-3/core/nautilus/default.nix
View file

@ -32,11 +32,11 @@
stdenv.mkDerivation rec {
pname = "nautilus";
version = "3.36.2";
version = "3.36.3";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1yknaz8n0l949sr8j3b7kdm0cm5mx2dp4n4k577m492hk6akqrr6";
sha256 = "1y0fsd7j48v4qkc051cg41mz7jycgw4vd4g37lw682p7n5xgrjmn";
};
nativeBuildInputs = [

2
pkgs/development/libraries/ffmpeg-full/default.nix
View file

@ -242,8 +242,6 @@ stdenv.mkDerivation rec {
pname = "ffmpeg-full";
inherit (ffmpeg) src version;
patches = [ ./prefer-libdav1d-over-libaom.patch ];
prePatch = ''
patchShebangs .
'' + stdenv.lib.optionalString stdenv.isDarwin ''

19
pkgs/development/libraries/ffmpeg-full/prefer-libdav1d-over-libaom.patch
View file

@ -1,19 +0,0 @@
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index d2f9a39ce5..2342399a8e 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -679,13 +679,13 @@ extern AVCodec ff_pcm_mulaw_at_encoder;
extern AVCodec ff_pcm_mulaw_at_decoder;
extern AVCodec ff_qdmc_at_decoder;
extern AVCodec ff_qdm2_at_decoder;
+extern AVCodec ff_libdav1d_decoder;
extern AVCodec ff_libaom_av1_decoder;
extern AVCodec ff_libaom_av1_encoder;
extern AVCodec ff_libaribb24_decoder;
extern AVCodec ff_libcelt_decoder;
extern AVCodec ff_libcodec2_encoder;
extern AVCodec ff_libcodec2_decoder;
-extern AVCodec ff_libdav1d_decoder;
extern AVCodec ff_libdavs2_decoder;
extern AVCodec ff_libfdk_aac_encoder;
extern AVCodec ff_libfdk_aac_decoder;

6
pkgs/development/libraries/ffmpeg/4.nix
View file

@ -5,8 +5,8 @@
}@args:
callPackage ./generic.nix (rec {
version = "4.2.3";
branch = "4.2";
sha256 = "0pkrariwjv25k7inwshch7b5820ly3hsp991amyb60rkqc8v4zi1";
version = "4.3";
branch = "4.3";
sha256 = "1qnnhd2b0g5sg72pclxs3i8sxzz0raky69k7w9cmpba9zh973s57";
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
} // args)

11
pkgs/development/libraries/json-c/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoconf }:
{ stdenv, fetchurl, fetchpatch, autoconf }:
stdenv.mkDerivation rec {
name = "json-c-0.13.1";
@ -7,6 +7,15 @@ stdenv.mkDerivation rec {
sha256 = "0ch1v18wk703bpbyzj7h1mkwvsw4rw4qdwvgykscypvqq10678ll";
};
patches = [
# https://nvd.nist.gov/vuln/detail/CVE-2020-12762
(fetchpatch {
name = "CVE-2020-12762.patch";
url = "https://github.com/json-c/json-c/commit/865b5a65199973bb63dff8e47a2f57e04fec9736.patch";
sha256 = "1g5afk4khhm1sb70xrva1pyznshcw3ipzp1g5z60dpzxy303pp6h";
})
];
outputs = [ "out" "dev" ];
nativeBuildInputs = [ autoconf ]; # for autoheader

4
pkgs/development/libraries/libgcrypt/default.nix
View file

@ -30,6 +30,10 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ]
++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-asm";
# Necessary to generate correct assembly when compiling for aarch32 on
# aarch64
configurePlatforms = [ "host" "build" ];
# Make sure libraries are correct for .pc and .la files
# Also make sure includes are fixed for callers who don't use libgpgcrypt-config
postFixup = ''

6
pkgs/development/libraries/libjpeg-turbo/default.nix
View file

@ -18,6 +18,12 @@ stdenv.mkDerivation rec {
url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/a2291b252de1413a13db61b21863ae7aea0946f3.patch";
sha256 = "0nc5vcch5h52gpi07h08zf8br58q8x81q2hv871hrn0dinb53vym";
})
(fetchpatch {
name = "cve-2020-13790.patch";
url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/3de15e0c344d.diff";
sha256 = "0hm5i6qir5w3zxb0xvqdh4jyvbfg7xnd28arhyfsaclfz9wdb0pb";
})
] ++
stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt")
./mingw-boolean.patch;

4
pkgs/development/libraries/libksba/default.nix
View file

@ -1,11 +1,11 @@
{ buildPackages, stdenv, fetchurl, gettext, libgpgerror }:
stdenv.mkDerivation rec {
name = "libksba-1.3.5";
name = "libksba-1.4.0";
src = fetchurl {
url = "mirror://gnupg/libksba/${name}.tar.bz2";
sha256 = "0h53q4sns1jz1pkmhcz5wp9qrfn9f5g9i3vjv6dafwzzlvblyi21";
sha256 = "1dj1razn35srkgadx3i30yr0q037cr0dn54m6a54vxgh3zlsirmz";
};
outputs = [ "out" "dev" "info" ];

10
pkgs/development/libraries/libqmi/default.nix
View file

@ -1,22 +1,24 @@
{ stdenv, fetchurl, pkgconfig, glib, python3, libgudev, libmbim }:
{ stdenv, fetchurl, pkg-config, gobject-introspection, glib, python3, libgudev, libmbim }:
stdenv.mkDerivation rec {
pname = "libqmi";
version = "1.24.12";
version = "1.25.900";
src = fetchurl {
url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz";
sha256 = "0scb8a2kh0vnzx6kxanfy2s2slnfppvrwg202rxv30m8p2i92frd";
sha256 = "0a96f4ab7qy4szwzqs8ir2mvsnpqzk7zsiv6zahlhpf0jhp1vxf7";
};
outputs = [ "out" "dev" "devdoc" ];
configureFlags = [
"--with-udev-base-dir=${placeholder "out"}/lib/udev"
"--enable-introspection"
];
nativeBuildInputs = [
pkgconfig
pkg-config
gobject-introspection
python3
];

4
pkgs/development/libraries/nv-codec-headers/default.nix
View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "nv-codec-headers";
version = "9.0.18.1";
version = "9.1.23.1";
src = fetchgit {
url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git";
rev = "n${version}";
sha256 = "0354fivb92ix341jds7a7qn3mgwimrnxbganhlhr4vayj25c3hw5";
sha256 = "1xfvb3mhz6wfx9c732888xa82ivaig903lhvvrqqzs31qfznsplh";
};
makeFlags = [ "PREFIX=$(out)" ];

4
pkgs/development/libraries/science/math/openblas/default.nix
View file

@ -99,12 +99,12 @@ let
in
stdenv.mkDerivation rec {
pname = "openblas";
version = "0.3.9";
version = "0.3.10";
src = fetchFromGitHub {
owner = "xianyi";
repo = "OpenBLAS";
rev = "v${version}";
sha256 = "0nq51j45shb32n6086xff3x374kx5qhr2cwjzvppx4s2z0ahflal";
sha256 = "174id98ga82bhz2v7sy9yj6pqy0h0088p3mkdikip69p9rh3d17b";
};
inherit blas64;

7
pkgs/development/python-modules/flake8/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
, mock, pytest, pytestrunner
, configparser, enum34, mccabe, pycodestyle, pyflakes, entrypoints, functools32, typing
, configparser, enum34, mccabe, pycodestyle, pyflakes, functools32, typing, importlib-metadata
}:
buildPythonPackage rec {
@ -13,10 +13,11 @@ buildPythonPackage rec {
};
checkInputs = [ pytest mock pytestrunner ];
propagatedBuildInputs = [ entrypoints pyflakes pycodestyle mccabe ]
propagatedBuildInputs = [ pyflakes pycodestyle mccabe ]
++ stdenv.lib.optionals (pythonOlder "3.2") [ configparser functools32 ]
++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ]
++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];
++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]
++ stdenv.lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
checkPhase = ''
py.test tests

4
pkgs/development/tools/build-managers/cmake/default.nix
View file

@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
+ lib.optionalString useNcurses "-cursesUI"
+ lib.optionalString withQt5 "-qt5UI"
+ lib.optionalString useQt4 "-qt4UI";
version = "3.17.2";
version = "3.17.3";
src = fetchurl {
url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
# compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
sha256 = "199srp8yfai51pcbpmfyc4s8vzrmh2dm91bp582hj2l29x634xzw";
sha256 = "0h4c3nwk7wmzcmmlwyb16zmjqr44l4k591m2y9p9zp3m498hvmhb";
};
patches = [

4
pkgs/development/tools/parsing/bison/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bison";
version = "3.6.2";
version = "3.6.3";
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
sha256 = "16h8panwpljwdq902v9x7inpnks51fn0kqlbyqfjvpilv6md73p2";
sha256 = "0qry9ar16dpg9nzrq7jh3fqh4ah2xvcf6v00fc81z08yjd1ljk2b";
};
nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man;

4
pkgs/os-specific/linux/alsa-lib/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, alsa-ucm-conf, alsa-topology-conf }:
stdenv.mkDerivation rec {
name = "alsa-lib-1.2.2";
name = "alsa-lib-1.2.3";
src = fetchurl {
url = "mirror://alsa/lib/${name}.tar.bz2";
sha256 = "1v5kb8jyvrpkvvq7dq8hfbmcj68lml97i4s0prxpfx2mh3c57s6q";
sha256 = "13k7dx1g749z74rz71hs5j8z0pqdjgx7l69pn0vsy7jizhi0kw02";
};
patches = [

4
pkgs/os-specific/linux/alsa-topology-conf/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "alsa-topology-conf-${version}";
version = "1.2.2";
version = "1.2.3";
src = fetchurl {
url = "mirror://alsa/lib/${name}.tar.bz2";
sha256 = "09cls485ckdjsp4azhv3nw7chyg3r7zrqgald6yp70f7cysxcwml";
sha256 = "1zwxc9zhfcmyffjjbibzpdvf4kx7wv9g2zl6xz7y0d6srfr9jgw3";
};
dontBuild = true;

4
pkgs/os-specific/linux/alsa-ucm-conf/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "alsa-ucm-conf-${version}";
version = "1.2.2";
version = "1.2.3";
src = fetchurl {
url = "mirror://alsa/lib/${name}.tar.bz2";
sha256 = "0364fgzdm2qrsqvgqri25gzscbma7yqlv31wz8b1z9c5phlxkgvy";
sha256 = "000db5yla7dljidjbbwbiaxvc1a7wh1zpw694gipaymj9fh4vhhv";
};
dontBuild = true;

2
pkgs/os-specific/linux/kernel/common-config.nix
View file

@ -255,7 +255,7 @@ let
SND_HDA_RECONFIG = yes; # Support reconfiguration of jack functions
# Support configuring jack functions via fw mechanism at boot
SND_HDA_PATCH_LOADER = yes;
SND_HDA_CODEC_CA0132_DSP = whenOlder "5.8" yes; # Enable DSP firmware loading on Creative Soundblaster Z/Zx/ZxR/Recon
SND_HDA_CODEC_CA0132_DSP = whenOlder "5.7" yes; # Enable DSP firmware loading on Creative Soundblaster Z/Zx/ZxR/Recon
SND_OSSEMUL = yes;
SND_USB_CAIAQ_INPUT = yes;
# Enable PSS mixer (Beethoven ADSP-16 and other compatible)

2
pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
View file

@ -1,4 +1,4 @@
From b873e4c0de3e24f2ec9370e5a217247217e90587 Mon Sep 17 00:00:00 2001
From 22f46f55c81d84e83a4614856d84e63c8400165c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Jan 2013 15:46:30 +0100
Subject: [PATCH 01/18] Start device units for uninitialised encrypted devices

22
pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
View file

@ -1,4 +1,4 @@
From bdd3ff777dd8253ff5732118dd6de0fa9a9b95fe Mon Sep 17 00:00:00 2001
From e5b2b1e90d055068936336f6f01639bcde251b96 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Apr 2013 13:16:57 +0200
Subject: [PATCH 02/18] Don't try to unmount /nix or /nix/store
@ -7,18 +7,18 @@ They'll still be remounted read-only.
https://github.com/NixOS/nixos/issues/126
---
src/core/mount.c | 2 ++
src/shutdown/umount.c | 2 ++
src/shared/fstab-util.c | 2 ++
src/shutdown/umount.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/src/core/mount.c b/src/core/mount.c
index 1c4aefd734..a5553226f8 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -412,6 +412,8 @@ static bool mount_is_extrinsic(Mount *m) {
if (PATH_IN_SET(m->where, /* Don't bother with the OS data itself */
"/", /* (strictly speaking redundant: should already be covered by the perpetual flag check above) */
diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
index b19127be09..f9adca1100 100644
--- a/src/shared/fstab-util.c
+++ b/src/shared/fstab-util.c
@@ -40,6 +40,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) {
/* Don't bother with the OS data itself */
if (PATH_IN_SET(mount,
"/",
+ "/nix",
+ "/nix/store",
"/usr",

8
pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
View file

@ -1,4 +1,4 @@
From c28b3b2e254433e93549ee6fe8c93b43ce455776 Mon Sep 17 00:00:00 2001
From ca7f6286c518d7ef3877458bbdf8e01f5518ab0e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Apr 2014 10:59:28 +0200
Subject: [PATCH 03/18] Fix NixOS containers
@ -10,10 +10,10 @@ container, so checking early whether it exists will fail.
1 file changed, 2 insertions(+)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 734dee1130..a97b1a4bc9 100644
index 51d0c2a75b..4d3451ff3b 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -5018,6 +5018,7 @@ static int run(int argc, char *argv[]) {
@@ -5017,6 +5017,7 @@ static int run(int argc, char *argv[]) {
goto finish;
}
} else {
@ -21,7 +21,7 @@ index 734dee1130..a97b1a4bc9 100644
const char *p, *q;
if (arg_pivot_root_new)
@@ -5032,6 +5033,7 @@ static int run(int argc, char *argv[]) {
@@ -5031,6 +5032,7 @@ static int run(int argc, char *argv[]) {
r = -EINVAL;
goto finish;
}

2
pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch
View file

@ -1,4 +1,4 @@
From baf52609ad18785aa1d2cd043185ae9438d59411 Mon Sep 17 00:00:00 2001
From c87cc5b1cf9c37f195e6b362352279e14289554e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 May 2014 14:10:10 +0200
Subject: [PATCH 04/18] Look for fsck in the right place

2
pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch
View file

@ -1,4 +1,4 @@
From 45f80155b7c2edb1e73c233283f1ab1582e1cfbe Mon Sep 17 00:00:00 2001
From 450c133c1815b473136b2a5540f9213fef5506ee Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 19 Dec 2014 14:46:17 +0100
Subject: [PATCH 05/18] Add some NixOS-specific unit directories

4
pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch
View file

@ -1,4 +1,4 @@
From d52058070c0c12bb05f82460f0b4b55678b724e9 Mon Sep 17 00:00:00 2001
From f88a9bb1e6080b539ed0116caa9781e7f6755f54 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 May 2015 15:39:38 +0200
Subject: [PATCH 06/18] Get rid of a useless message in user sessions
@ -13,7 +13,7 @@ in containers.
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/core/unit.c b/src/core/unit.c
index 97e1b0004c..d3cc2ba9ec 100644
index c306183555..3db39fa435 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -2043,7 +2043,8 @@ static void unit_check_binds_to(Unit *u) {

2
pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch
View file

@ -1,4 +1,4 @@
From 409fc808794942ad1736c2cc74853d9792e4ad02 Mon Sep 17 00:00:00 2001
From e2b25ce3606d05ff8a387185c41ab32fb2a36161 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 6 Dec 2015 14:26:36 +0100
Subject: [PATCH 07/18] hostnamed, localed, timedated: disable methods that

2
pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch
View file

@ -1,4 +1,4 @@
From b56fc7b6ae8014eb2f71924c89498f395a1a81bd Mon Sep 17 00:00:00 2001
From 5a6aad633a7ceffd62b009ce0c4ab6673129f7ff Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 7 Jul 2016 02:47:13 +0300
Subject: [PATCH 08/18] Fix hwdb paths

4
pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
View file

@ -1,4 +1,4 @@
From 4d304a321796db4de827aa39a149bea23d039214 Mon Sep 17 00:00:00 2001
From b509dbd302a7933ae0002f44b99aac6a1fd5775b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 11 Oct 2016 13:12:08 +0300
Subject: [PATCH 09/18] Change /usr/share/zoneinfo to /etc/zoneinfo
@ -79,7 +79,7 @@ index 901fbf0815..b57bdd8fbe 100644
(void) mkdir_parents(etc_localtime, 0755);
if (symlink(e, etc_localtime) < 0)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index a97b1a4bc9..aed60439e3 100644
index 4d3451ff3b..1adb91335c 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1657,8 +1657,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u

2
pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch
View file

@ -1,4 +1,4 @@
From cb3f1ec1793cbf74c4b5663e038bd49ff4576192 Mon Sep 17 00:00:00 2001
From b5665ef8b9266c662c3a137df1ef1721cdff346e Mon Sep 17 00:00:00 2001
From: Imuli <i@imu.li>
Date: Wed, 19 Oct 2016 08:46:47 -0400
Subject: [PATCH 10/18] localectl: use /etc/X11/xkb for list-x11-*

6
pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch
View file

@ -1,4 +1,4 @@
From 0ffb786d0e12a61899af448b1e4dd32a53ea5a8e Mon Sep 17 00:00:00 2001
From be6b5c37779302384079b22b7fd767daad878fa9 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 11 Feb 2018 04:37:44 +0100
Subject: [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
1 file changed, 3 deletions(-)
diff --git a/meson.build b/meson.build
index fc216d22da..078db3bb5d 100644
index c09115e06a..62eba4186c 100644
--- a/meson.build
+++ b/meson.build
@@ -3176,9 +3176,6 @@ install_data('LICENSE.GPL2',
@@ -3184,9 +3184,6 @@ install_data('LICENSE.GPL2',
'src/libsystemd/sd-bus/GVARIANT-SERIALIZATION',
install_dir : docdir)

12
pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch
View file

@ -1,4 +1,4 @@
From 3dbcdab1ba22c4eeca6d61718c09bcb9b5551764 Mon Sep 17 00:00:00 2001
From 9262f52b0e30cf8c39d9f7684a8c0e8fd4887cd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 26 Feb 2018 14:25:57 +0000
Subject: [PATCH 12/18] Install default configuration into $out/share/factory
@ -44,7 +44,7 @@ index 4df6dabf89..02d8d69095 100644
meson.add_install_script('sh', '-c',
'test -n "$DESTDIR" || @0@/systemd-hwdb update'
diff --git a/meson.build b/meson.build
index 078db3bb5d..6e1a6483fc 100644
index 62eba4186c..b0b2edbb5a 100644
--- a/meson.build
+++ b/meson.build
@@ -154,6 +154,9 @@ udevhwdbdir = join_paths(udevlibexecdir, 'hwdb.d')
@ -57,7 +57,7 @@ index 078db3bb5d..6e1a6483fc 100644
bootlibdir = join_paths(prefixdir, 'lib/systemd/boot/efi')
testsdir = join_paths(prefixdir, 'lib/systemd/tests')
systemdstatedir = join_paths(localstatedir, 'lib/systemd')
@@ -2503,7 +2506,7 @@ if conf.get('ENABLE_BINFMT') == 1
@@ -2511,7 +2514,7 @@ if conf.get('ENABLE_BINFMT') == 1
meson.add_install_script('sh', '-c',
mkdir_p.format(binfmtdir))
meson.add_install_script('sh', '-c',
@ -66,7 +66,7 @@ index 078db3bb5d..6e1a6483fc 100644
endif
if conf.get('ENABLE_REPART') == 1
@@ -2604,7 +2607,7 @@ executable('systemd-sleep',
@@ -2612,7 +2615,7 @@ executable('systemd-sleep',
install_dir : rootlibexecdir)
install_data('src/sleep/sleep.conf',
@ -75,7 +75,7 @@ index 078db3bb5d..6e1a6483fc 100644
exe = executable('systemd-sysctl',
'src/sysctl/sysctl.c',
@@ -2916,7 +2919,7 @@ if conf.get('HAVE_KMOD') == 1
@@ -2924,7 +2927,7 @@ if conf.get('HAVE_KMOD') == 1
meson.add_install_script('sh', '-c',
mkdir_p.format(modulesloaddir))
meson.add_install_script('sh', '-c',
@ -84,7 +84,7 @@ index 078db3bb5d..6e1a6483fc 100644
endif
exe = executable('systemd-nspawn',
@@ -3159,7 +3162,7 @@ install_subdir('factory/etc',
@@ -3167,7 +3170,7 @@ install_subdir('factory/etc',
install_dir : factorydir)
install_data('xorg/50-systemd-user.sh',

6
pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch
View file

@ -1,4 +1,4 @@
From 0b0510aa72cf8026f34f300efa3f150f45971404 Mon Sep 17 00:00:00 2001
From 05c2761f6a981c8576fc47a3dd8beb5a2af3ef09 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Fri, 2 Nov 2018 21:15:42 +0100
Subject: [PATCH 13/18] inherit systemd environment when calling generators.
@ -16,10 +16,10 @@ executables that are being called from managers.
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/core/manager.c b/src/core/manager.c
index 25afdbea04..7afd5e5a37 100644
index 4412e7a849..b799eeca95 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -3896,9 +3896,14 @@ static int manager_run_generators(Manager *m) {
@@ -3901,9 +3901,14 @@ static int manager_run_generators(Manager *m) {
argv[4] = NULL;
RUN_WITH_UMASK(0022)

2
pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch
View file

@ -1,4 +1,4 @@
From 4bd20cf0450455e2f9831b09ba91811ba3d58961 Mon Sep 17 00:00:00 2001
From c70029539d0aec5df0c1e4203359335a3841a1e5 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Thu, 9 May 2019 11:15:22 +0200
Subject: [PATCH 14/18] add rootprefix to lookup dir paths

6
pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
View file

@ -1,4 +1,4 @@
From f23a1e00de028048a2a21d322493039cce7ee214 Mon Sep 17 00:00:00 2001
From 98580b4aa34f3d2e7401f54d6561c5af27ea3437 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 25 Jul 2019 20:45:55 +0300
Subject: [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.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
index 15e6c1799e..412bdefe74 100644
index 523040b57c..561d91c94c 100644
--- a/src/shutdown/shutdown.c
+++ b/src/shutdown/shutdown.c
@@ -298,7 +298,7 @@ int main(int argc, char *argv[]) {
@@ -299,7 +299,7 @@ int main(int argc, char *argv[]) {
_cleanup_free_ char *cgroup = NULL;
char *arguments[3], *watchdog_device;
int cmd, r, umount_log_level = LOG_INFO;

2
pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
View file

@ -1,4 +1,4 @@
From 758b8211e6e76524d62a2e0ffcf37dcf55e3be87 Mon Sep 17 00:00:00 2001
From 3821e20966ee20f74986041f33c4934ad20385b2 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 25 Jul 2019 20:46:58 +0300
Subject: [PATCH 16/18] systemd-sleep: execute scripts in

2
pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch
View file

@ -1,4 +1,4 @@
From ce9fe2249c91fdfb224eaffce63e3dbdb4a5c25d Mon Sep 17 00:00:00 2001
From b07defe819e0f66d08563690b3a5abea5da08620 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 7 Mar 2020 22:40:27 +0100
Subject: [PATCH 17/18] kmod-static-nodes.service: Update ConditionFileNotEmpty

2
pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
View file

@ -1,4 +1,4 @@
From 55b69fc1b5441e3aff8f1ab684ba8eed3718a32d Mon Sep 17 00:00:00 2001
From 9c1ac48a7d95c09bef5a924bb5db6908596403b4 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 8 Mar 2020 01:05:54 +0100
Subject: [PATCH 18/18] path-util.h: add placeholder for DEFAULT_PATH_NORMAL

6
pkgs/os-specific/linux/systemd/default.nix
View file

@ -31,7 +31,7 @@ let gnupg-minimal = gnupg.override {
bzip2 = null;
};
in stdenv.mkDerivation {
version = "245.5";
version = "245.6";
pname = "systemd";
# When updating, use https://github.com/systemd/systemd-stable tree, not the development one!
@ -39,8 +39,8 @@ in stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "systemd";
repo = "systemd-stable";
rev = "9a506b7e9291d997a920af9ac299e7b834368119";
sha256 = "19qd92hjlsljr6x5mbw1l2vdzz5y9hy7y7g0dwgpfifb0lwkxqbr";
rev = "aa0cb635f1f6a4d9b50ed2cca7782f3f751be933";
sha256 = "191f0r1g946bsqxky00z78wygsxi9pld11y2q4374bshnpsff2ll";
};
patches = [

4
pkgs/tools/misc/file/default.nix
View file

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "file";
version = "5.38";
version = "5.39";
src = fetchurl {
urls = [
"ftp://ftp.astron.com/pub/file/${pname}-${version}.tar.gz"
"https://distfiles.macports.org/file/${pname}-${version}.tar.gz"
];
sha256 = "0d7s376b4xqymnrsjxi3nsv3f5v89pzfspzml2pcajdk5by2yg2r";
sha256 = "1lgs2w2sgamzf27kz5h7pajz7v62554q21fbs11n4mfrfrm2hpgh";
};
nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file;

8
pkgs/tools/misc/man-db/default.nix
View file

@ -15,18 +15,17 @@ stdenv.mkDerivation rec {
buildInputs = [ libpipeline db groff ]; # (Yes, 'groff' is both native and build input)
checkInputs = [ libiconv /* for 'iconv' binary */ ];
patches = [ ./systemwide-man-db-conf.patch ];
postPatch = ''
# Remove all mandatory manpaths. Nixpkgs makes no requirements on
# these directories existing.
sed -i 's/^MANDATORY_MANPATH/# &/' src/man_db.conf.in
# Add Nixpkgs and NixOS-related manpaths
echo "MANPATH_MAP /run/current-system/sw/bin /run/current-system/sw/share/man" >> src/man_db.conf.in
echo "MANPATH_MAP /run/wrappers/bin /run/current-system/sw/share/man" >> src/man_db.conf.in
# Add Nix-related manpaths
echo "MANPATH_MAP /nix/var/nix/profiles/default/bin /nix/var/nix/profiles/default/share/man" >> src/man_db.conf.in
# Add mandb locations for the above
echo "MANDB_MAP /run/current-system/sw/share/man /var/cache/man/nixos" >> src/man_db.conf.in
echo "MANDB_MAP /nix/var/nix/profiles/default/share/man /var/cache/man/nixpkgs" >> src/man_db.conf.in
'';
@ -34,7 +33,6 @@ stdenv.mkDerivation rec {
"--disable-setuid"
"--disable-cache-owner"
"--localstatedir=/var"
# Don't try /etc/man_db.conf by default, so we avoid error messages.
"--with-config-file=${placeholder "out"}/etc/man_db.conf"
"--with-systemdtmpfilesdir=${placeholder "out"}/lib/tmpfiles.d"
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"

39
pkgs/tools/misc/man-db/systemwide-man-db-conf.patch Normal file
View file

@ -0,0 +1,39 @@
commit 9089291006a4258c39c75a920ad536b61504251a
Author: rnhmjoj <rnhmjoj@inventati.org>
Date: Fri May 1 19:32:15 2020 +0200
check for systemwide man_db.conf before the bundled one
diff --git a/src/manp.c b/src/manp.c
index 5441339..0bbf566 100644
--- a/src/manp.c
+++ b/src/manp.c
@@ -841,18 +841,24 @@ void read_config_file (bool optional)
}
if (getenv ("MAN_TEST_DISABLE_SYSTEM_CONFIG") == NULL) {
- config_file = fopen (CONFIG_FILE, "r");
+ const char *config_filepath;
+ if (access ("/etc/man_db.conf", F_OK) != -1) {
+ config_filepath = "/etc/man_db.conf";
+ } else {
+ config_filepath = CONFIG_FILE;
+ }
+ config_file = fopen (config_filepath, "r");
if (config_file == NULL) {
if (optional)
debug ("can't open %s; continuing anyway\n",
- CONFIG_FILE);
+ config_filepath);
else
error (FAIL, 0,
_("can't open the manpath "
"configuration file %s"),
- CONFIG_FILE);
+ config_filepath);
} else {
- debug ("From the config file %s:\n", CONFIG_FILE);
+ debug ("From the config file %s:\n", config_filepath);
add_to_dirlist (config_file, 0);
fclose (config_file);