From f8dc3abbb053f3732afc016109a47febad94ff71 Mon Sep 17 00:00:00 2001 From: Yorick Date: Mon, 14 May 2018 02:03:42 +0200 Subject: linux: add CONFIG_KEY_DH_OPERATIONS --- pkgs/os-specific/linux/kernel/common-config.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 4af5889fd1cd..ebb569689b29 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -636,6 +636,11 @@ with stdenv.lib; X86_X2APIC y IRQ_REMAP y ''} + + # needed for iwd WPS support (wpa_supplicant replacement) + ${optionalString (versionAtLeast version "4.7") '' + CONFIG_KEY_DH_OPERATIONS y + ''} # Disable the firmware helper fallback, udev doesn't implement it any more FW_LOADER_USER_HELPER_FALLBACK? n -- cgit 1.4.1 From 9cd3c7a12ee6d131c9ea545c2c75b412b7506673 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 15 May 2018 08:21:25 -0400 Subject: linux-testing: 4.17-rc4 -> 4.17-rc5 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 922256703307..691c0d7a0a97 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.17-rc4"; - modDirVersion = "4.17.0-rc4"; + version = "4.17-rc5"; + modDirVersion = "4.17.0-rc5"; extraMeta.branch = "4.17"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1y34hpzgxblwqslhsfsmzmpv9f3s936r93wgn4kmhkcwsm0in292"; + sha256 = "1khx3s8nb604h23hasamshcvcwll0j4vi5v6v274ls01ja9mg1xk"; }; # Should the testing kernels ever be built on Hydra? -- cgit 1.4.1 From c7e8ddc066ea4d06b979c066fa983f3d1c00d232 Mon Sep 17 00:00:00 2001 From: Yorick Date: Tue, 15 May 2018 14:33:29 +0200 Subject: linux: config: remove prefix on KEY_DH_OPERATIONS --- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index ebb569689b29..ec2b2f387950 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -639,7 +639,7 @@ with stdenv.lib; # needed for iwd WPS support (wpa_supplicant replacement) ${optionalString (versionAtLeast version "4.7") '' - CONFIG_KEY_DH_OPERATIONS y + KEY_DH_OPERATIONS y ''} # Disable the firmware helper fallback, udev doesn't implement it any more -- cgit 1.4.1 From 1e0975f4c05959cf11b5a905f335c269dcaae630 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 11 May 2018 17:42:37 +0900 Subject: iproute2: module to create rt_table file & co When doing source routing/multihoming, it's practical to give names to routing tables. The absence of the rt_table file in /etc make this impossible. This patch recreates these files on rebuild so that they can be modified by the user see NixOS#38638. iproute2 is modified to look into config.networking.iproute2.confDir instead of /etc/iproute2. --- nixos/modules/config/iproute2.nix | 23 +++++++++++++++++++++++ nixos/modules/module-list.nix | 1 + pkgs/os-specific/linux/iproute/default.nix | 5 +++-- 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 nixos/modules/config/iproute2.nix (limited to 'pkgs/os-specific') diff --git a/nixos/modules/config/iproute2.nix b/nixos/modules/config/iproute2.nix new file mode 100644 index 000000000000..881ad671a627 --- /dev/null +++ b/nixos/modules/config/iproute2.nix @@ -0,0 +1,23 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.networking.iproute2; + confDir = "/run/iproute2"; +in +{ + options.networking.iproute2.enable = mkEnableOption "copy IP route configuration files"; + + config = mkMerge [ + ({ nixpkgs.config.iproute2.confDir = confDir; }) + + (mkIf cfg.enable { + system.activationScripts.iproute2 = '' + cp -R ${pkgs.iproute}/etc/iproute2 ${confDir} + chmod -R 664 ${confDir} + chmod +x ${confDir} + ''; + }) + ]; +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6c4326046ef8..5d390f606670 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -9,6 +9,7 @@ ./config/fonts/ghostscript.nix ./config/gnu.nix ./config/i18n.nix + ./config/iproute2.nix ./config/krb5/default.nix ./config/ldap.nix ./config/networking.nix diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 7d412d7e15d0..8ccb0c203803 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, lib, flex, bash, bison, db, iptables, pkgconfig }: +{ fetchurl, stdenv, config, lib, flex, bash, bison, db, iptables, pkgconfig }: stdenv.mkDerivation rec { name = "iproute2-${version}"; @@ -26,8 +26,9 @@ stdenv.mkDerivation rec { "HDRDIR=$(TMPDIR)/include/iproute2" # Don't install headers ]; + # enable iproute2 module if you want this folder to be created buildFlags = [ - "CONFDIR=/etc/iproute2" + "CONFDIR=${config.iproute2.confDir or "/run/iproute2"}" ]; installFlags = [ -- cgit 1.4.1