diff options
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/bolt/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 1 | ||||
-rw-r--r-- | pkgs/os-specific/linux/klibc/shrunk.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/ofp/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/pcm/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/pps-tools/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/service-wrapper/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/shadow/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 26 | ||||
-rw-r--r-- | pkgs/os-specific/linux/tbs/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/undervolt/default.nix | 2 |
11 files changed, 22 insertions, 23 deletions
diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index 054236398769..3a4c2ef7d9f7 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "bolt"; repo = "bolt"; - rev = "${version}"; + rev = version; sha256 = "1qamls0fll0qc27lqavf56hv1yj6v6n4ry90g7bcnwpvccmd82yd"; }; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 42230fe31ecd..7bffc54673bd 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -568,6 +568,7 @@ let }); misc = { + HID_BATTERY_STRENGTH = yes; MODULE_COMPRESS = yes; MODULE_COMPRESS_XZ = yes; KERNEL_XZ = yes; diff --git a/pkgs/os-specific/linux/klibc/shrunk.nix b/pkgs/os-specific/linux/klibc/shrunk.nix index f01f3b6a4ec3..b5b9783c6e7d 100644 --- a/pkgs/os-specific/linux/klibc/shrunk.nix +++ b/pkgs/os-specific/linux/klibc/shrunk.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { # name due to the sed hackery below. Once patchelf 0.4 is in the # tree, we can do this properly. #name = "${klibc.name}-shrunk"; - name = "${klibc.name}"; + name = klibc.name; buildCommand = '' mkdir -p $out/lib cp -prd ${klibc.out}/lib/klibc/bin $out/ diff --git a/pkgs/os-specific/linux/ofp/default.nix b/pkgs/os-specific/linux/ofp/default.nix index 70f46519375b..855754a6bc1b 100644 --- a/pkgs/os-specific/linux/ofp/default.nix +++ b/pkgs/os-specific/linux/ofp/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "OpenFastPath"; repo = "ofp"; - rev = "${version}"; + rev = version; sha256 = "05902593fycgkwzk5g7wzgk0k40nrrgybplkdka3rqnlj6aydhqf"; }; diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix index 9b9e563f8035..c00bd67f95c2 100644 --- a/pkgs/os-specific/linux/pcm/default.nix +++ b/pkgs/os-specific/linux/pcm/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "opcm"; repo = "pcm"; - rev = "${version}"; + rev = version; sha256 = "15kh5ry2w1zj2mbg98hlayw8g53jy79q2ixj2wm48g8vagamv77z"; }; diff --git a/pkgs/os-specific/linux/pps-tools/default.nix b/pkgs/os-specific/linux/pps-tools/default.nix index e4f7d4b3616e..f50bfcec781c 100644 --- a/pkgs/os-specific/linux/pps-tools/default.nix +++ b/pkgs/os-specific/linux/pps-tools/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "redlab-i"; - repo = "${baseName}"; + repo = baseName; rev = "v${version}"; sha256 = "1yh9g0l59dkq4ci0wbb03qin3c3cizfngmn9jy1vwm5zm6axlxhf"; }; diff --git a/pkgs/os-specific/linux/service-wrapper/default.nix b/pkgs/os-specific/linux/service-wrapper/default.nix index f2ed3c4a7834..150262158da4 100644 --- a/pkgs/os-specific/linux/service-wrapper/default.nix +++ b/pkgs/os-specific/linux/service-wrapper/default.nix @@ -4,7 +4,7 @@ let name = "service-wrapper-${version}"; version = "19.04"; # Akin to Ubuntu Release in -runCommand "${name}" { +runCommand name { script = substituteAll { src = ./service-wrapper.sh; isExecutable = true; diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index ccc0df59d108..b4c5c0bac841 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "shadow-maint"; repo = "shadow"; - rev = "${version}"; + rev = version; sha256 = "1llcv77lvpc4h3rgww9ms736kbdisiylcr2z02863f41afxbwl82"; }; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 48f915214188..90b33e183cef 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -18,28 +18,19 @@ let pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { + version = "243"; pname = "systemd"; - # To whoever updates this to 239: check the todo on line 173. - version = "242"; # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! # Also fresh patches should be cherry-picked from that tree to our current one. src = fetchFromGitHub { owner = "NixOS"; repo = "systemd"; - rev = "5fb35fbc783516e2014115c3488134a2afb8494c"; - sha256 = "0pyjvzzh8nnxv4z58n82lz1mjnzv44sylcjgkvw8sp35vx1ryxfh"; + rev = "7019836a26ebdc1ba20c03d06dbb3a613833bd0f"; + sha256 = "0ywaq5jfy177k4q5hwr43v66sz62l1bqhgyxs2vk9m1d5kvrjwk6"; }; - patches = [ - (fetchpatch { - name = "CVE-2019-15718.patch"; - url = https://github.com/systemd/systemd/pull/13457/commits/35e528018f315798d3bffcb592b32a0d8f5162bd.patch; - sha256 = "0m0ypnnllx4r6a2qy1586as15i2qrzxwi1sqdp14rzdwajz1rvnv"; - }) - ]; - outputs = [ "out" "lib" "man" "dev" ]; nativeBuildInputs = @@ -112,6 +103,13 @@ in stdenv.mkDerivation rec { "-Dsulogin-path=${utillinux}/bin/sulogin" "-Dmount-path=${utillinux}/bin/mount" "-Dumount-path=${utillinux}/bin/umount" + "-Dcreate-log-dirs=false" + # Upstream uses cgroupsv2 by default. To support docker and other + # container managers we still need v1. + "-Ddefault-hierarchy=hybrid" + # Upstream defaulted to disable manpages since they optimize for the much + # more frequent development builds + "-Dman=true" ]; preConfigure = '' @@ -233,6 +231,6 @@ in stdenv.mkDerivation rec { license = licenses.lgpl21Plus; platforms = platforms.linux; priority = 10; - maintainers = [ maintainers.eelco ]; + maintainers = with maintainers; [ eelco andir ]; }; } diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix index fc4b38724a7d..bb640e6fa5e1 100644 --- a/pkgs/os-specific/linux/tbs/default.nix +++ b/pkgs/os-specific/linux/tbs/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation { name = "tbs-2018.04.18-${kernel.version}"; srcs = [ media build ]; - sourceRoot = "${build.name}"; + sourceRoot = build.name; preConfigure = '' make dir DIR=../${media.name} diff --git a/pkgs/os-specific/linux/undervolt/default.nix b/pkgs/os-specific/linux/undervolt/default.nix index a97cca4dfa76..eb8f55ac6655 100644 --- a/pkgs/os-specific/linux/undervolt/default.nix +++ b/pkgs/os-specific/linux/undervolt/default.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "georgewhewell"; repo = "undervolt"; - rev = "${version}"; + rev = version; sha256 = "1d934lp8yczrfslmwff6fxzd4arja2vg00s5kwdr949bxpa6w59c"; }; |