From 34beeac70b01e23e8c021f26c52202072d3c561b Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Mon, 24 Jul 2017 16:39:53 +0100 Subject: [PATCH 01/36] fix haskellPackages.cuda and some tools dependent on cudatoolkit --- .../haskell-modules/configuration-nix.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 7b9dbcdaa79..a0af66ea182 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -64,8 +64,19 @@ self: super: builtins.intersectAttrs super { "--extra-include-dirs=${pkgs.cudatoolkit}/include" ]; preConfigure = '' - unset CC # unconfuse the haskell-cuda configure script - sed -i -e 's|/usr/local/cuda|${pkgs.cudatoolkit}|g' configure + export CUDA_PATH=${pkgs.cudatoolkit} + ''; + }); + + nvvm = overrideCabal super.nvvm (drv: { + preConfigure = '' + export CUDA_PATH=${pkgs.cudatoolkit} + ''; + }); + + cufft = overrideCabal super.cufft (drv: { + preConfigure = '' + export CUDA_PATH=${pkgs.cudatoolkit} ''; }); From a912a6a291eaa5f6a2ad9143c9e276779c357a41 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 16 Jul 2017 18:20:27 +0200 Subject: [PATCH 02/36] nginx: make enabling SSL port-specific --- .../services/web-servers/nginx/default.nix | 64 ++++++++++++++++--- .../web-servers/nginx/vhost-options.nix | 53 ++++++++++----- 2 files changed, 91 insertions(+), 26 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index f83413b4534..05843655b08 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -122,16 +122,32 @@ let ''; vhosts = concatStringsSep "\n" (mapAttrsToList (vhostName: vhost: - let - ssl = vhost.enableSSL || vhost.forceSSL; - defaultPort = if ssl then 443 else 80; + let + ssl = with vhost; addSSL || onlySSL || enableSSL; - listenString = { addr, port, ... }: - "listen ${addr}:${toString (if port != null then port else defaultPort)} " + defaultListen = with vhost; + if listen != [] then listen + else if onlySSL || enableSSL then + singleton { addr = "0.0.0.0"; port = 443; ssl = true; } + ++ optional enableIPv6 { addr = "[::]"; port = 443; ssl = true; } + else singleton { addr = "0.0.0.0"; port = 80; ssl = false; } + ++ optional enableIPv6 { addr = "[::]"; port = 80; ssl = false; } + ++ optional addSSL { addr = "0.0.0.0"; port = 443; ssl = true; } + ++ optional (enableIPv6 && addSSL) { addr = "[::]"; port = 443; ssl = true; }; + + hostListen = + if !vhost.forceSSL + then defaultListen + else filter (x: x.ssl) defaultListen; + + listenString = { addr, port, ssl, ... }: + "listen ${addr}:${toString port} " + optionalString ssl "ssl http2 " - + optionalString vhost.default "default_server" + + optionalString vhost.default "default_server " + ";"; + redirectListen = filter (x: !x.ssl) defaultListen; + redirectListenString = { addr, ... }: "listen ${addr}:80 ${optionalString vhost.default "default_server"};"; @@ -152,7 +168,7 @@ let in '' ${optionalString vhost.forceSSL '' server { - ${concatMapStringsSep "\n" redirectListenString vhost.listen} + ${concatMapStringsSep "\n" redirectListenString redirectListen} server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases}; ${optionalString vhost.enableACME acmeLocation} @@ -163,7 +179,7 @@ let ''} server { - ${concatMapStringsSep "\n" listenString vhost.listen} + ${concatMapStringsSep "\n" listenString hostListen} server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases}; ${optionalString vhost.enableACME acmeLocation} ${optionalString (vhost.root != null) "root ${vhost.root};"} @@ -392,6 +408,7 @@ in example = literalExample '' { "hydra.example.com" = { + addSSL = true; forceSSL = true; enableACME = true; locations."/" = { @@ -408,11 +425,40 @@ in config = mkIf cfg.enable { # TODO: test user supplied config file pases syntax test - assertions = let hostOrAliasIsNull = l: l.root == null || l.alias == null; in [ + warnings = + let + deprecatedSSL = name: config: optional config.enableSSL + '' + config.services.nginx.virtualHosts..enableSSL is deprecated, + use config.services.nginx.virtualHosts..onlySSL instead. + ''; + + in flatten (mapAttrsToList deprecatedSSL virtualHosts); + + assertions = + let + hostOrAliasIsNull = l: l.root == null || l.alias == null; + in [ { assertion = all (host: all hostOrAliasIsNull (attrValues host.locations)) (attrValues virtualHosts); message = "Only one of nginx root or alias can be specified on a location."; } + + { + assertion = all (conf: with conf; !(addSSL && (onlySSL || enableSSL))) (attrValues virtualHosts); + message = '' + Options services.nginx.service.virtualHosts..addSSL and + services.nginx.virtualHosts..onlySSL are mutually esclusive + ''; + } + + { + assertion = all (conf: with conf; forceSSL -> addSSL) (attrValues virtualHosts); + message = '' + Option services.nginx.virtualHosts..forceSSL requires + services.nginx.virtualHosts..addSSL set to true. + ''; + } ]; systemd.services.nginx = { diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index 60260512bc2..362f8ee9052 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -27,25 +27,21 @@ with lib; }; listen = mkOption { - type = with types; listOf (submodule { - options = { - addr = mkOption { type = str; description = "IP address."; }; - port = mkOption { type = nullOr int; description = "Port number."; }; - }; - }); - default = - [ { addr = "0.0.0.0"; port = null; } ] - ++ optional config.networking.enableIPv6 - { addr = "[::]"; port = null; }; + type = with types; listOf (submodule { options = { + addr = mkOption { type = str; description = "IP address."; }; + port = mkOption { type = int; description = "Port number."; default = 80; }; + ssl = mkOption { type = bool; description = "Enable SSL."; default = false; }; + }; }); + default = []; example = [ - { addr = "195.154.1.1"; port = 443; } - { addr = "192.168.1.2"; port = 443; } + { addr = "195.154.1.1"; port = 443; ssl = true;} + { addr = "192.154.1.1"; port = 80; } ]; description = '' Listen addresses and ports for this virtual host. IPv6 addresses must be enclosed in square brackets. - Setting the port to null defaults - to 80 for http and 443 for https (i.e. when enableSSL is set). + Note: this option overrides addSSL + and onlySSL. ''; }; @@ -70,16 +66,39 @@ with lib; ''; }; - enableSSL = mkOption { + addSSL = mkOption { type = types.bool; default = false; - description = "Whether to enable SSL (https) support."; + description = '' + Whether to enable HTTPS in addition to plain HTTP. This will set defaults for + listen to listen on all interfaces on the respective default + ports (80, 443). + ''; + }; + + onlySSL = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable HTTPS and reject plain HTTP connections. This will set + defaults for listen to listen on all interfaces on port 443. + ''; + }; + + enableSSL = mkOption { + type = types.bool; + visible = false; + default = false; }; forceSSL = mkOption { type = types.bool; default = false; - description = "Whether to always redirect to https."; + description = '' + Whether to add a separate nginx server block that permanently redirects (301) + all plain HTTP traffic to HTTPS. This option needs addSSL + to be set to true. + ''; }; sslCertificate = mkOption { From eaf9faef60ad4e927e5c9dc18550eb59fb2904ea Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 3 Aug 2017 21:22:30 +0200 Subject: [PATCH 03/36] erlang: remove explicit gcc dependency --- pkgs/development/interpreters/erlang/generic-builder.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 1fdfe4ca61d..897f84f94ad 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -1,5 +1,5 @@ { pkgs, stdenv, fetchurl, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused -, libxml2, libxslt, ncurses, openssl, perl, gcc, autoreconfHook +, libxml2, libxslt, ncurses, openssl, perl, autoreconfHook , openjdk ? null # javacSupport , unixODBC ? null # odbcSupport , mesa ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport @@ -47,9 +47,9 @@ in stdenv.mkDerivation ({ inherit src version; - buildInputs = - [ perl gnum4 ncurses openssl autoreconfHook libxslt libxml2 makeWrapper gcc - ] + nativeBuildInputs = [ autoreconfHook makeWrapper perl ]; + + buildInputs = [ gnum4 ncurses openssl autoreconfHook libxslt libxml2 ] ++ optionals wxSupport wxPackages2 ++ optionals odbcSupport odbcPackages ++ optionals javacSupport javacPackages From 5fc9a604b441e5fae80f0fb1891b6c984fb3693e Mon Sep 17 00:00:00 2001 From: gnidorah Date: Fri, 4 Aug 2017 10:57:19 +0300 Subject: [PATCH 04/36] k3b: remove unused wrapper file --- pkgs/applications/misc/k3b/wrapper.nix | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 pkgs/applications/misc/k3b/wrapper.nix diff --git a/pkgs/applications/misc/k3b/wrapper.nix b/pkgs/applications/misc/k3b/wrapper.nix deleted file mode 100644 index 486d3fb7ddf..00000000000 --- a/pkgs/applications/misc/k3b/wrapper.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ lib, symlinkJoin, k3b-original, cdrtools, makeWrapper }: - -let - binPath = lib.makeBinPath [ cdrtools ]; -in symlinkJoin { - name = "k3b-${k3b-original.version}"; - - paths = [ k3b-original ]; - buildInputs = [ makeWrapper ]; - - postBuild = '' - wrapProgram $out/bin/k3b \ - --prefix PATH ':' ${binPath} - ''; -} From ce78756ad8c6b0822555f936e521ed7b21e2c169 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Fri, 4 Aug 2017 11:52:01 +0300 Subject: [PATCH 05/36] gwenview, spectacle: propagate libkipi --- pkgs/applications/kde/gwenview.nix | 2 +- pkgs/applications/kde/spectacle.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix index 233566c1bda..60adb104bdd 100644 --- a/pkgs/applications/kde/gwenview.nix +++ b/pkgs/applications/kde/gwenview.nix @@ -17,5 +17,5 @@ mkDerivation { baloo exiv2 kactivities kdelibs4support kio libkdcraw lcms2 libkipi phonon qtimageformats qtsvg qtx11extras ]; - propagatedUserEnvPkgs = [ kipi-plugins ]; + propagatedUserEnvPkgs = [ kipi-plugins libkipi ]; } diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix index db1bf2aee65..1be07fe6fe8 100644 --- a/pkgs/applications/kde/spectacle.nix +++ b/pkgs/applications/kde/spectacle.nix @@ -16,5 +16,5 @@ mkDerivation { kconfig kcoreaddons kdbusaddons kdeclarative kio knotifications kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras ]; - propagatedUserEnvPkgs = [ kipi-plugins ]; + propagatedUserEnvPkgs = [ kipi-plugins libkipi ]; } From 07796ccb578e44b8545133bb7dc2a73537d94c59 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 5 Aug 2017 15:20:13 +0200 Subject: [PATCH 06/36] libgcrypt: fix clang build Fixes #27906 Because #pragma GCC optimize ("O0") doesn't work for clang and NIX_CFLAGS_COMPILE bypasses the fixup done by the makefiles everything gets compiled with -O2. The build still uses optimisation for everything else. --- pkgs/development/libraries/libgcrypt/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index ed742bee874..5bcb8c5fe98 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }: +{ stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }: assert enableCapabilities -> stdenv.isLinux; @@ -14,9 +14,13 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "info" ]; outputBin = "dev"; - buildInputs = - [ libgpgerror ] - ++ lib.optional enableCapabilities libcap; + # The CPU Jitter random number generator must not be compiled with + # optimizations and the optimize -O0 pragma only works for gcc. + # The build enables -O2 by default for everything else. + hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify"; + + buildInputs = [ libgpgerror ] + ++ stdenv.lib.optional enableCapabilities libcap; # Make sure libraries are correct for .pc and .la files # Also make sure includes are fixed for callers who don't use libgpgcrypt-config From 771c80d216bbb4e70563cd22d9b26250fdbbd06c Mon Sep 17 00:00:00 2001 From: gnidorah Date: Fri, 4 Aug 2017 11:58:44 +0300 Subject: [PATCH 07/36] gwenview, k3b, konsole: propagate kinit --- pkgs/applications/kde/gwenview.nix | 4 ++-- pkgs/applications/kde/k3b.nix | 3 ++- pkgs/applications/kde/konsole.nix | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix index 60adb104bdd..3d03d1dea3e 100644 --- a/pkgs/applications/kde/gwenview.nix +++ b/pkgs/applications/kde/gwenview.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, exiv2, lcms2, baloo, kactivities, kdelibs4support, kio, kipi-plugins, libkdcraw, libkipi, - phonon, qtimageformats, qtsvg, qtx11extras + phonon, qtimageformats, qtsvg, qtx11extras, kinit }: mkDerivation { @@ -17,5 +17,5 @@ mkDerivation { baloo exiv2 kactivities kdelibs4support kio libkdcraw lcms2 libkipi phonon qtimageformats qtsvg qtx11extras ]; - propagatedUserEnvPkgs = [ kipi-plugins libkipi ]; + propagatedUserEnvPkgs = [ kipi-plugins libkipi (lib.getBin kinit) ]; } diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix index 79806dc93fb..cfe7327ac72 100644 --- a/pkgs/applications/kde/k3b.nix +++ b/pkgs/applications/kde/k3b.nix @@ -5,7 +5,7 @@ , flac, lame, libmad, libmpcdec, libvorbis , libsamplerate, libsndfile, taglib , cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager -, ffmpeg, libmusicbrainz2, normalize, sox, transcode, shared_mime_info +, ffmpeg, libmusicbrainz2, normalize, sox, transcode, shared_mime_info, kinit }: mkDerivation { @@ -30,6 +30,7 @@ mkDerivation { # others ffmpeg libmusicbrainz2 shared_mime_info ]; + propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; postFixup = let k3bPath = lib.makeBinPath [ cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix index bd026c6f039..d2d60adda2c 100644 --- a/pkgs/applications/kde/konsole.nix +++ b/pkgs/applications/kde/konsole.nix @@ -20,4 +20,5 @@ mkDerivation { kguiaddons kiconthemes kinit kio knotifications knotifyconfig kparts kpty kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript ]; + propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; } From 0e28d3af1dfdbf510dfd0f91905085f6dfdcfd2a Mon Sep 17 00:00:00 2001 From: gnidorah Date: Fri, 4 Aug 2017 11:39:47 +0300 Subject: [PATCH 08/36] nixos: add pathes for KDE applications --- nixos/modules/config/system-path.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index cf3cc2f2262..5d339eaea48 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -118,6 +118,9 @@ in "/share/themes" "/share/vim-plugins" "/share/vulkan" + "/share/kservices5" + "/share/kservicetypes5" + "/share/kxmlgui5" ]; system.path = pkgs.buildEnv { From c8e96826ae2d897a79127e4c9c0679098fec6d82 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 6 Aug 2017 14:49:22 +0200 Subject: [PATCH 09/36] influxdb module: collectd.port is now called bind-address with the influxdb release we have packaged (and newer releases) collectd.port has been streamlined to bind-address which takes a string instead of a number. ref: https://github.com/influxdata/influxdb/blob/master/services/collectd/README.md --- nixos/modules/services/databases/influxdb.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix index dd88624f406..25daf972b58 100644 --- a/nixos/modules/services/databases/influxdb.nix +++ b/nixos/modules/services/databases/influxdb.nix @@ -70,7 +70,7 @@ let enabled = false; typesdb = "${pkgs.collectd}/share/collectd/types.db"; database = "collectd_db"; - port = 25826; + bind-address = ":25826"; }]; opentsdb = [{ From e3629d05cbf1f3bbf5e3b73a6e7bfa53a37b42a0 Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 6 Aug 2017 10:29:29 -0300 Subject: [PATCH 10/36] mate-icon-theme: 1.18.1 -> 1.18.2 --- pkgs/desktops/mate/mate-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index 3a2de515ba9..239a01c759a 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mate-icon-theme-${version}"; version = "${major-ver}.${minor-ver}"; major-ver = "1.18"; - minor-ver = "1"; + minor-ver = "2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1217nza3ilmy6x3b9i1b75lpq7lpvhs18s0c2n3j6zhxdqy61nlm"; + sha256 = "0si3li3kza7s45zhasjvqn5f85zpkn0x8i4kq1dlnqvjjqzkg4ch"; }; nativeBuildInputs = [ pkgconfig intltool iconnamingutils ]; From 1048cefa7afa4a66b5d1e446494c93519c637d65 Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 6 Aug 2017 10:31:59 -0300 Subject: [PATCH 11/36] mate-icon-theme-faenza: 1.18.0 -> 1.18.1 --- pkgs/desktops/mate/mate-icon-theme-faenza/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index ddc6d81499d..05edfc1dd6d 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mate-icon-theme-faenza-${version}"; version = "${major-ver}.${minor-ver}"; major-ver = "1.18"; - minor-ver = "0"; + minor-ver = "1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1crfv6s3ljbc7a7m229bvs3qbjzlp8cgvyhqmdaa9npd5lxmk88v"; + sha256 = "0vc3wg9l5yrxm0xmligz4lw2g3nqj1dz8fwv90xvym8pbjds2849"; }; nativeBuildInputs = [ autoreconfHook ]; From 2f1ae93e43dab9c21a25e226a7a7f8a2555bf49a Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 6 Aug 2017 10:32:48 -0300 Subject: [PATCH 12/36] mate-themes: 3.20.19 -> 3.20.22, 3.22.10 -> 3.22.13 --- pkgs/desktops/mate/mate-themes/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 793c68e688a..45be1d8710d 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -6,15 +6,15 @@ stdenv.mkDerivation rec { version = "${major-ver}.${minor-ver}"; major-ver = gnome3.version; minor-ver = { - "3.20" = "19"; - "3.22" = "10"; + "3.20" = "22"; + "3.22" = "13"; }."${major-ver}"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/themes/${major-ver}/${name}.tar.xz"; sha256 = { - "3.20" = "11b8g374dkjhbs7x7khpriabvkip4dmfkma5myzfv6m54qlj3b8g"; - "3.22" = "03ficjfxa4qpx4vcshhk2zxryivckxpw7wcjgbn8xqnjk3lgzjcb"; + "3.20" = "1yjj5w7zvyjyg0k21nwk438jjsnj0qklsf0z5pmmp1jff1vxyck4"; + "3.22" = "1p7w63an8qs15hkj79nppy7471glv0rm1b0himn3c4w69q8qdc9i"; }."${major-ver}"; }; From eb70dfb1305c807d3b0019dd0a34e183964885f0 Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 6 Aug 2017 10:35:11 -0300 Subject: [PATCH 13/36] caja: 1.18.0 -> 1.18.3 --- pkgs/desktops/mate/caja/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index d068f432ee9..07c7d0662a9 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "caja-${version}"; version = "${major-ver}.${minor-ver}"; major-ver = "1.18"; - minor-ver = "0"; + minor-ver = "3"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1fc7dxj9hw8fffrcnwxbj8pq7gl08il68rkpk92rv3qm7siv1606"; + sha256 = "0mljqcx7k8p27854zm7qzzn8ca6hs7hva9p43hp4p507z52caqmm"; }; nativeBuildInputs = [ From 8ba81342dc8c43b7c1fb63478048ccb77d0258ef Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 6 Aug 2017 10:36:42 -0300 Subject: [PATCH 14/36] mate-terminal: 1.18.0 -> 1.18.1 --- pkgs/desktops/mate/mate-terminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index 532e50c4549..9d620b28301 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mate-terminal-${version}"; version = "${major-ver}.${minor-ver}"; major-ver = "1.18"; - minor-ver = "0"; + minor-ver = "1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "07z8g8zkc8k6d7xqdlg18cjnwg7zzv5hbgwma5y9mh8zx9xsqz92"; + sha256 = "1zihm609d2d9cw53ry385whshjl1dnkifpk41g1ddm9f58hv4da1"; }; buildInputs = [ From dc21f1ad65a8c0bcaed70771de33c26f5586ad0e Mon Sep 17 00:00:00 2001 From: gnidorah Date: Mon, 7 Aug 2017 10:12:21 +0300 Subject: [PATCH 15/36] linux: BFQ Group Scheduling support --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index df18c60130d..c15839f7dfe 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -558,6 +558,7 @@ with stdenv.lib; ''} ${optionalString (versionAtLeast version "4.12") '' + BFQ_GROUP_IOSCHED y IOSCHED_BFQ m MQ_IOSCHED_KYBER y ''} From cc7777f5f81c33b8f9c2eea37a6f86ffb415ef3e Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Mon, 7 Aug 2017 10:37:11 +0200 Subject: [PATCH 16/36] ponyc: 0.16.1 -> 0.17.0 https://github.com/ponylang/ponyc/issues/2135 --- pkgs/development/compilers/ponyc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index c3d9d988207..ab7881a2151 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { name = "ponyc-${version}"; - version = "0.16.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "175yivc5vjwfdcqcpkdqmdfy72pn4k62n4j3qagfbwya7frq2car"; + sha256 = "06g811x7vc275ypn3laqcsq7lmp2w8al6ipkpknhpq9c6lf7dvcp"; }; buildInputs = [ llvm makeWrapper which ]; From 71203503f9c3b69ae75b1c612d9e4665f9b37b5e Mon Sep 17 00:00:00 2001 From: moesasji Date: Mon, 7 Aug 2017 09:36:05 +0100 Subject: [PATCH 17/36] xfce4-session: fix lock screen not working with light-locker --- pkgs/desktops/xfce/core/xfce4-light-locker.patch | 16 ++++++++++++++++ pkgs/desktops/xfce/core/xfce4-session.nix | 5 +++++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/desktops/xfce/core/xfce4-light-locker.patch diff --git a/pkgs/desktops/xfce/core/xfce4-light-locker.patch b/pkgs/desktops/xfce/core/xfce4-light-locker.patch new file mode 100644 index 00000000000..4e1dcc1efa7 --- /dev/null +++ b/pkgs/desktops/xfce/core/xfce4-light-locker.patch @@ -0,0 +1,16 @@ +--- ./scripts/xflock4.orig 2017-08-06 23:05:53.807688995 +0100 ++++ ./scripts/xflock4 2017-08-06 23:09:06.171789989 +0100 +@@ -24,10 +24,11 @@ + PATH=/bin:/usr/bin + export PATH + +-# Lock by xscreensaver or gnome-screensaver, if a respective daemon is running ++# Lock by xscreensaver, gnome-screensaver or light-locker, if a respective daemon is running + for lock_cmd in \ + "xscreensaver-command -lock" \ +- "gnome-screensaver-command --lock" ++ "gnome-screensaver-command --lock" \ ++ "light-locker-command -l" + do + $lock_cmd >/dev/null 2>&1 && exit + done diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix index a0568b0dd39..edc810d3897 100644 --- a/pkgs/desktops/xfce/core/xfce4-session.nix +++ b/pkgs/desktops/xfce/core/xfce4-session.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { sha256 = "97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd"; }; + patches = [ + # Fix "lock screen" not working for light-locker + ./xfce4-light-locker.patch + ]; + buildInputs = [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus_glib xfconf xfce4panel libglade xorg.iceauth xorg.libSM From 22ba421a0801f5e11ca53c5e57c113f2dd07223e Mon Sep 17 00:00:00 2001 From: romildo Date: Mon, 7 Aug 2017 06:37:11 -0300 Subject: [PATCH 18/36] adapta-gtk-theme: 3.90.0.125 -> 3.91.1.47 --- pkgs/misc/themes/adapta/default.nix | 46 ++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index e62707afb7c..acce5ccac21 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -1,31 +1,49 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk_pixbuf, librsvg, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk_pixbuf, librsvg, gtk-engine-murrine, gnome3 }: stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.90.0.125"; - - meta = with stdenv.lib; { - description = "An adaptive GTK+ theme based on Material Design"; - homepage = https://github.com/tista500/Adapta; - license = with licenses; [ gpl2 cc-by-sa-30 ]; - platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; - }; + version = "3.91.1.47"; src = fetchFromGitHub { owner = "tista500"; repo = "Adapta"; rev = version; - sha256 = "0abww5rcbn478w2kdhjlf68bfj8yf8i02nlmrjpp7j1v14r32xr0"; + sha256 = "1w41xwhb93p999g0835cmlax55a5fyz9j4m5nn6nss2d6g6nrxap"; }; preferLocalBuild = true; - nativeBuildInputs = [ autoreconfHook pkgconfig parallel sassc inkscape libxml2 glib.dev ]; + nativeBuildInputs = [ + autoreconfHook + pkgconfig + parallel + sassc + inkscape + libxml2 + glib.dev + gnome3.gnome_shell + ]; - buildInputs = [ gdk_pixbuf librsvg gtk-engine-murrine ]; + buildInputs = [ + gdk_pixbuf + librsvg + gtk-engine-murrine + ]; postPatch = "patchShebangs ."; - configureFlags = "--disable-unity"; + configureFlags = [ + "--disable-gtk_legacy" + "--disable-gtk_next" + "--disable-unity" + "--disable-parallel" # parallel build is not finishing + ]; + + meta = with stdenv.lib; { + description = "An adaptive Gtk+ theme based on Material Design"; + homepage = https://github.com/tista500/Adapta; + license = with licenses; [ gpl2 cc-by-sa-30 ]; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; } From a0a4bea2a6a5ccf4c367e7f71df824c44b2d547b Mon Sep 17 00:00:00 2001 From: Alexander Gall Date: Mon, 7 Aug 2017 12:27:55 +0200 Subject: [PATCH 19/36] nixos/cloud-image: add module The module creates an image for an openstack-based cloud using the cloud-init package. --- nixos/modules/virtualisation/cloud-image.nix | 44 ++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 nixos/modules/virtualisation/cloud-image.nix diff --git a/nixos/modules/virtualisation/cloud-image.nix b/nixos/modules/virtualisation/cloud-image.nix new file mode 100644 index 00000000000..0f0141abfb1 --- /dev/null +++ b/nixos/modules/virtualisation/cloud-image.nix @@ -0,0 +1,44 @@ +# Usage: +# $ NIX_PATH=`pwd`:nixos-config=`pwd`/nixpkgs/nixos/modules/virtualisation/cloud-image.nix nix-build '' -A config.system.build.cloudImage + +{ config, lib, pkgs, ... }: + +with lib; + +{ + system.build.cloudImage = import ../../lib/make-disk-image.nix { + inherit pkgs lib config; + partitioned = true; + diskSize = 1 * 1024; + configFile = pkgs.writeText "configuration.nix" + '' + { config, lib, pkgs, ... }: + + with lib; + + { + imports = [ ]; + } + ''; + }; + + imports = [ ../profiles/qemu-guest.nix ]; + + fileSystems."/".device = "/dev/disk/by-label/nixos"; + + boot = { + kernelParams = [ "console=ttyS0" ]; + loader.grub.device = "/dev/vda"; + loader.timeout = 0; + }; + + networking.hostName = mkDefault ""; + + services.openssh = { + enable = true; + permitRootLogin = "without-password"; + passwordAuthentication = mkDefault false; + }; + + services.cloud-init.enable = true; +} From f37972588db25ef22f5071fab64ab1a3e3a86c0a Mon Sep 17 00:00:00 2001 From: nonsequitur Date: Mon, 7 Aug 2017 15:42:16 +0200 Subject: [PATCH 20/36] ruby docs: fix text and example (#28006) 1. 'wrapper' has been renamed to 'wrappedRuby', so use this instead. 2. mkDerivation isn't called with a 'src' attribute, so skip the 'unpackPhase' to avoid an error. 3. Simplify the build command. 'mkdir' and 'patchShebangs' don't need to be called explicitly. --- doc/languages-frameworks/ruby.xml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml index 4b48f7ffa1b..89b7a8986c3 100644 --- a/doc/languages-frameworks/ruby.xml +++ b/doc/languages-frameworks/ruby.xml @@ -82,7 +82,7 @@ versions available from various packages. Resulting derivations for both builders also have two helpful -attributes, env and wrapper. +attributes, env and wrappedRuby. The first one allows one to quickly drop into nix-shell with the specified environment present. E.g. nix-shell -A sensu.env would give you an @@ -110,15 +110,11 @@ the needed dependencies. For example, to make a derivation in stdenv.mkDerivation { name = "my-script"; - - buildInputs = [ env.wrapper ]; - + buildInputs = [ env.wrappedRuby ]; + phases = [ "installPhase" "fixupPhase" ]; script = ./my-script.rb; - buildCommand = '' - mkdir -p $out/bin install -D -m755 $script $out/bin/my-script - patchShebangs $out/bin/my-script ''; }]]> From b416579af4f20e4d7431faf12d37239002f0faf4 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Tue, 8 Aug 2017 00:32:36 +1000 Subject: [PATCH 21/36] leatherman: 0.11.2 -> 1.0.0 --- pkgs/development/libraries/leatherman/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index d45a616606d..a9c7a9b70bb 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "leatherman-${version}"; - version = "0.11.2"; + version = "1.0.0"; src = fetchFromGitHub { - sha256 = "1rnk204mvzc44i69b8gfb1fjj5r4qby7ymal782rdplnlbm065r8"; + sha256 = "15kg6vdr1iav5x3pzwvrdsi54lbl8zh2xwqlp03gaq4n3kg5wj3y"; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ffca1ff4fb1..d75cf86744b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2942,9 +2942,7 @@ with pkgs; leafpad = callPackage ../applications/editors/leafpad { }; - leatherman = callPackage ../development/libraries/leatherman { - boost = boost160; - }; + leatherman = callPackage ../development/libraries/leatherman { }; leela = callPackage ../tools/graphics/leela { }; From b99f162e40d9dfb3b8620da51d152add3ca3c644 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Tue, 8 Aug 2017 00:33:43 +1000 Subject: [PATCH 22/36] facter: 3.6.6 -> 3.7.1 --- pkgs/tools/system/facter/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 55bf93608e8..56ac33ba23c 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "facter-${version}"; - version = "3.6.6"; + version = "3.7.1"; src = fetchFromGitHub { - sha256 = "07jphvwfmvrq28f8k15k16kz090zvb11nn6bd895fz5axag01ins"; + sha256 = "0v5g7qlqqixgvc2hf9440a8sfh8jvgzynwk5ipcb505hi00ddq7a"; rev = version; repo = "facter"; owner = "puppetlabs"; @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { CXXFLAGS = "-fpermissive"; NIX_CFLAGS_COMPILE = "-Wno-error"; + NIX_LDFLAGS = "-lblkid"; cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d75cf86744b..284d9901a4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1001,9 +1001,7 @@ with pkgs; facedetect = callPackage ../tools/graphics/facedetect { }; - facter = callPackage ../tools/system/facter { - boost = boost160; - }; + facter = callPackage ../tools/system/facter { }; fasd = callPackage ../tools/misc/fasd { }; From a852d39ddafd461d6ae049ec41024c8ebdc029aa Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Tue, 8 Aug 2017 01:02:38 +1000 Subject: [PATCH 23/36] zabbix-cli: 1.6.1 -> 1.7.0 --- pkgs/tools/misc/zabbix-cli/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/zabbix-cli/default.nix b/pkgs/tools/misc/zabbix-cli/default.nix index 77c06ea1911..f56f680c9eb 100644 --- a/pkgs/tools/misc/zabbix-cli/default.nix +++ b/pkgs/tools/misc/zabbix-cli/default.nix @@ -4,15 +4,20 @@ let in pythonPackages.buildPythonApplication rec { name = "zabbix-cli-${version}"; - version = "1.6.1"; + version = "1.7.0"; - propagatedBuildInputs = with pythonPackages; [ argparse requests ]; + propagatedBuildInputs = with pythonPackages; [ ipaddr requests ]; + + # argparse is part of the standardlib + prePatch = '' + substituteInPlace setup.py --replace "'argparse'," "" + ''; src = fetchFromGitHub { owner = "usit-gd"; repo = "zabbix-cli"; rev = version; - sha256 = "17ip3s8ifgj264zwxrr857wk02xmzmlsjrr613mdhkgdwizqbcs3"; + sha256 = "0z33mv8xk0h72rn0iz1qrrkyz63w6cln8d5hqqddcvkxwnq0z6kx"; }; meta = with lib; { From 795c00335989c3721895dd170eb26cf2d3d70e56 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 7 Aug 2017 17:21:08 +0200 Subject: [PATCH 24/36] isabelle: use polyml 5.6 Isabelle 2016 does not work with newer PolyML versions. --- pkgs/development/compilers/polyml/5.6.nix | 33 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/compilers/polyml/5.6.nix diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix new file mode 100644 index 00000000000..8b5d14e7f5f --- /dev/null +++ b/pkgs/development/compilers/polyml/5.6.nix @@ -0,0 +1,33 @@ +{stdenv, fetchurl, autoreconfHook}: + +let + version = "5.6"; +in + +stdenv.mkDerivation { + name = "polyml-${version}"; + + prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace configure.ac --replace stdc++ c++ + ''; + + buildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook; + + src = fetchurl { + url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz"; + sha256 = "05d6l2a5m9jf32a8kahwg2p2ph4x9rjf1nsl83331q3gwn5bkmr0"; + }; + + meta = { + description = "Standard ML compiler and interpreter"; + longDescription = '' + Poly/ML is a full implementation of Standard ML. + ''; + homepage = http://www.polyml.org/; + license = stdenv.lib.licenses.lgpl21; + platforms = with stdenv.lib.platforms; linux; + maintainers = [ #Add your name here! + stdenv.lib.maintainers.z77z + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ffca1ff4fb1..e6b6bfe112f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6314,6 +6314,7 @@ with pkgs; pltScheme = racket; # just to be sure polyml = callPackage ../development/compilers/polyml { }; + polyml56 = callPackage ../development/compilers/polyml/5.6.nix { }; pure = callPackage ../development/interpreters/pure { llvm = llvm_35; @@ -18198,6 +18199,7 @@ with pkgs; tini = callPackage ../applications/virtualization/tini {}; isabelle = callPackage ../applications/science/logic/isabelle { + polyml = polyml56; java = if stdenv.isLinux then jre else jdk; }; From bcc285848527cb12be9b14b125552afa84389e7b Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Tue, 8 Aug 2017 01:21:56 +1000 Subject: [PATCH 25/36] pick: 1.6.1 -> 1.7.0 --- pkgs/tools/misc/pick/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/pick/default.nix b/pkgs/tools/misc/pick/default.nix index 075949f47e1..5fda26bacad 100644 --- a/pkgs/tools/misc/pick/default.nix +++ b/pkgs/tools/misc/pick/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pick-${version}"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { - owner = "thoughtbot"; + owner = "calleerlandsson"; repo = "pick"; rev = "v${version}"; - sha256 = "0iw3yqwg8j0pg56xx52xwn7n95vxlqbqh71zrc934v4mq971qlhd"; + sha256 = "1x7ql530rj4yj50dzp8526mz92g4hhqxnig1qgiq3h3k815p31qb"; }; buildInputs = [ ncurses ]; From 4825e4818b092571ce91a48272bb0f718b161ce7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 7 Aug 2017 11:32:26 -0400 Subject: [PATCH 26/36] linux: 4.9.40 -> 4.9.41 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 4ad4a5dfef7..fb7440a04ae 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.40"; + version = "4.9.41"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "16rdcvqkgb8hfzkkzbkhznnab22z43prm56jbrxnqr9acprnfmq2"; + sha256 = "11y6q0mmi3z6pg4h0prv67pr1a78rvrzw75ygg6720dz0jzvnnmd"; }; kernelPatches = args.kernelPatches; From ea2a10e143b83538c68864338752396dbc36424c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 7 Aug 2017 11:35:42 -0400 Subject: [PATCH 27/36] linux: 4.4.79 -> 4.4.80 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index d421633553a..16699dcdf43 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.79"; + version = "4.4.80"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1a5wprjimsnx49sdg05ndmnx84m24fl48s64jvdpz58i3sss7g8d"; + sha256 = "1hs07k49sbpi8yw2mdwn1967i82x4wn6kg0lbjvv5l1pv3alky1l"; }; kernelPatches = args.kernelPatches; From 06af1df85731837b16002c4ec8dc185059a2aa85 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 7 Aug 2017 11:40:01 -0400 Subject: [PATCH 28/36] linux: 4.13-rc3 -> 4.13-rc4 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 5106aacbe61..281cc7186b6 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.13-rc3"; - modDirVersion = "4.13.0-rc3"; + version = "4.13-rc4"; + modDirVersion = "4.13.0-rc4"; extraMeta.branch = "4.13"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "07cxqf57hgs3wnbvkqixiwhjrwdf433pjwmh0hv1id0bk8wdrjjl"; + sha256 = "00yiihmgifvl4bas861p87166nb1mf59b6nm5jsfk2zr27pszlyx"; }; features.iwlwifi = true; From 4edcfa3eb72203d6170fffcac7e9fe8d577e9831 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 7 Aug 2017 11:44:35 -0400 Subject: [PATCH 29/36] gradle: 4.0.2 -> 4.1 --- pkgs/development/tools/build-managers/gradle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 49fd080df45..45a4d8a8358 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-4.0.2"; + name = "gradle-4.1"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "08ns3p1w258cbfk6yg3yy2mmy7wwma5riq04yjjgc4dx889l5b3r"; + sha256 = "0hzdz5cy5dmyqz73qy80q74aiy87jl5vnxcy3imahgaszffglpfm"; }; }; From 2f9724e804188bfbdf184631795fb130930cb0ec Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Mon, 7 Aug 2017 12:53:48 -0700 Subject: [PATCH 30/36] ffmpeg, ffmpeg-full: 3.3.2 -> 3.3.3 --- pkgs/development/libraries/ffmpeg-full/default.nix | 4 ++-- pkgs/development/libraries/ffmpeg/3.3.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 4a02c034cf3..c0c9cfa2749 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -231,11 +231,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "11974vcfsy8w0i6f4lfwqmg80xkfybqw7vw6zzrcn5i6ncddx60r"; + sha256 = "07is8msrhxr1dk6vgwa192k2pl2a0in1h9w8f9cknlvbvhn01afj"; }; patchPhase = ''patchShebangs . diff --git a/pkgs/development/libraries/ffmpeg/3.3.nix b/pkgs/development/libraries/ffmpeg/3.3.nix index 34213755313..bf414e0865d 100644 --- a/pkgs/development/libraries/ffmpeg/3.3.nix +++ b/pkgs/development/libraries/ffmpeg/3.3.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "3.3.2"; - sha256 = "0slf12dxk6wq1ns09kqqqrzwylxcy0isvc3niyxig45gq3ah0s91"; + branch = "3.3.3"; + sha256 = "0wx421d7vp4nz8kgp0kg16sswikj8ff1pd18x9mmcbpmqy7sqs8h"; darwinFrameworks = [ Cocoa CoreMedia ]; }) From f46f98ad31e60d512732fb56c3230ab916a9f64b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 7 Aug 2017 17:34:10 -0400 Subject: [PATCH 31/36] Revert 0cf0d7186a5259ae59b852c109f31ab09af56cec Order common kernel config by functionality See #27949 --- .../linux/kernel/common-config.nix | 1135 +++++++++-------- 1 file changed, 600 insertions(+), 535 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index c15839f7dfe..deb1d81775b 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -3,14 +3,11 @@ WARNING/NOTE: whenever you want to add an option here you need to either - * make sure it works for all the versions in nixpkgs, + * mark it as an optional one with `?` suffix, + * or make sure it works for all the versions in nixpkgs, * or check for which kernel versions it will work (using kernel changelog, google or whatever) and mark it with `versionOlder` or - `versionAtLeast` - - This file has a fairly obvious structure, follow it! - Do not duplicate predicates, sort options alphabetically, comment if - the option's functionality is non-obvious. + `versionAtLeast`. Then do test your change by building all the kernels (or at least their configs) in Nixpkgs or else you will guarantee lots and lots @@ -24,636 +21,704 @@ with stdenv.lib; '' -# Globally applicable + # Compress kernel modules for a sizable disk space savings. + ${optionalString (versionAtLeast version "3.18") '' + MODULE_COMPRESS y + MODULE_COMPRESS_XZ y + ''} - 8139TOO_8129 y - 8139TOO_PIO n # PIO is slower - 9P_FS_POSIX_ACL y - 9P_FSCACHE y - ACCESSIBILITY y # Accessibility support - AIC79XX_DEBUG_ENABLE n - AIC7XXX_DEBUG_ENABLE n - AIC94XX_DEBUG n - ASYNC_RAID6_TEST n - ATH9K_AHB y # Ditto, AHB bus - ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus - ATOMIC64_SELFTEST n - AUXDISPLAY y # Auxiliary Display support - B43_PHY_HT y - BACKTRACE_SELF_TEST n - BACKTRACE_SELF_TEST n - BCMA_HOST_PCI y - BINFMT_MISC y - BINFMT_SCRIPT y # Our initrd init uses shebang scripts, so can't be modular. - BLK_CGROUP y # required by CFQ - BLK_DEV_INITRD y # Enable initrd support - BLK_DEV_INTEGRITY y - BLK_DEV_RAM y # Enable initrd support - BLK_DEV_THROTTLING y - BONDING m - BRCMFMAC_USB y - BRIDGE_VLAN_FILTERING y - BSD_PROCESS_ACCT_V3 y - BT_HCIUART_BCSP y - BT_HCIUART_H4 y # UART (H4) protocol support - BT_HCIUART_LL y - BT_RFCOMM_TTY y # RFCOMM TTY support - BTRFS_FS_POSIX_ACL y - CC_OPTIMIZE_FOR_SIZE n # Optimize with -O2 - CFG80211_WEXT y # Without it, ipw2200 drivers don't build - CFQ_GROUP_IOSCHED y - CGROUP_DEVICE y - CGROUPS y # used by systemd - CIFS_ACL y - CIFS_DFS_UPCALL y - CIFS_FSCACHE y - CIFS_POSIX y - CIFS_STATS y - CIFS_UPCALL y - CIFS_WEAK_PW_HASH y - CIFS_XATTR y - CLEANCACHE y - CLS_U32_MARK y - CLS_U32_PERF y - CONNECTOR y # PROC_EVENTS requires that the netlink connector is not built as a module - CPU_FREQ_DEFAULT_GOV_PERFORMANCE y - CRASH_DUMP n - CRC32_SELFTEST n - CRYPTO_TEST n - DEBUG_DEVRES n + KERNEL_XZ y + + # Debugging. DEBUG_KERNEL y + DYNAMIC_DEBUG y + BACKTRACE_SELF_TEST n + DEBUG_DEVRES n DEBUG_STACK_USAGE n DEBUG_STACKOVERFLOW n - DEFAULT_SECURITY_APPARMOR y - DETECT_HUNG_TASK y - DEVTMPFS y - DONGLE y # Serial dongle support - DRM_GMA3600 y - DRM_GMA600 y - DRM_LOAD_EDID_FIRMWARE y - DVB_DYNAMIC_MINORS y # we use udev - EFI_STUB y # EFI bootloader in the bzImage itself - EXT2_FS_POSIX_ACL y - EXT2_FS_SECURITY y - EXT2_FS_XATTR y - EXT3_FS_POSIX_ACL y - EXT3_FS_SECURITY y - EXT4_FS_POSIX_ACL y - EXT4_FS_SECURITY y - F2FS_FS m - FANOTIFY y - FB y - FB_3DFX_ACCEL y - FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support - FB_ATY_GX y # Mach64 GX support - FB_EFI y - FB_NVIDIA_I2C y # Enable DDC Support - FB_RIVA_I2C y - FB_SAVAGE_ACCEL y - FB_SAVAGE_I2C y - FB_SIS_300 y - FB_SIS_315 y - FB_VESA y - FHANDLE y # used by systemd - FRAMEBUFFER_CONSOLE y - FRAMEBUFFER_CONSOLE_ROTATION y - FRONTSWAP y - FUSION y # Fusion MPT device support - HIPPI y - HOSTAP_FIRMWARE_NVRAM y - HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver - HWMON y - HYPERVISOR_GUEST y - IDE n # deprecated IDE supportIRDA_ULTRA y # Ultra (connectionless) protocol - IKCONFIG y # Make /proc/config.gz available - IKCONFIG_PROC y # Make /proc/config.gz available - INTEL_IDLE y - INTERVAL_TREE_TEST n - IOSCHED_CFQ y # Include the CFQ I/O scheduler in the kernel, rather than as a module, so that the initrd gets a good I/O scheduler - IOSCHED_DEADLINE y - IP_DCCP_CCID3 n # experimental - IP_MROUTE_MULTIPLE_TABLES y - IP_MULTICAST y - IP_NF_TARGET_REDIRECT m - IP_PNP n - IP_ROUTE_VERBOSE y - IP_VS_PROTO_AH y - IP_VS_PROTO_ESP y - IP_VS_PROTO_TCP y - IP_VS_PROTO_UDP y - IPV6_MROUTE y - IPV6_MROUTE_MULTIPLE_TABLES y - IPV6_MULTIPLE_TABLES y - IPV6_OPTIMISTIC_DAD y - IPV6_PIMSM_V2 y - IPV6_ROUTE_INFO y - IPV6_ROUTER_PREF y - IPV6_SUBTREES y - IPW2100_MONITOR y # support promiscuous mode - IPW2200_MONITOR y # support promiscuous mode - JFS_POSIX_ACL y - JFS_SECURITY y - JOYSTICK_IFORCE_232 y # I-Force Serial joysticks and wheels - JOYSTICK_IFORCE_USB y # I-Force USB joysticks and wheels - JOYSTICK_XPAD_FF y # X-Box gamepad rumble support - JOYSTICK_XPAD_LEDS y # LED Support for Xbox360 controller 'BigX' LED - KERNEL_XZ y - KEXEC_JUMP y - KPROBES y - KSM y - KVM_ASYNC_PF y - KVM_GUEST y - KVM_MMIO y - L2TP_ETH m - L2TP_IP m - L2TP_V3 y - LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support - LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback - LOGO n # not needed - MEDIA_ATTACH y - MEDIA_CAMERA_SUPPORT y - MEDIA_DIGITAL_TV_SUPPORT y - MEDIA_RC_SUPPORT y - MEDIA_USB_SUPPORT y - MEGARAID_NEWGEN y - MEMCG y - MEMCG_SWAP y - MEMTEST y # Enable the kernel's built-in memory tester - MICROCODE y - MICROCODE_AMD y - MICROCODE_INTEL y - MMC_BLOCK_MINORS 32 # 8 is default. Modern gpt tables on eMMC may go far beyond 8. - MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension - MTD_COMPLEX_MAPPINGS y # needed for many devices - MTD_TESTS n - MTRR_SANITIZER y - NAMESPACES y # Required by 'unshare' used by 'nixos-install' - NET y - NET_FC y # Fibre Channel driver support - NETFILTER y - NETFILTER_ADVANCED y - NFS_FSCACHE y - NFS_SWAP y - NFS_V3_ACL y - NFSD_V2_ACL y - NFSD_V3 y - NFSD_V3_ACL y - NFSD_V4 y - NLS y - NLS_CODEPAGE_437 m # VFAT default for the codepage= mount option - NLS_DEFAULT utf8 - NLS_ISO8859_1 m # VFAT default for the iocharset= mount option - NLS_UTF8 m - NOTIFIER_ERROR_INJECTION n - NUMA y - OCFS2_DEBUG_MASKLOG n - PARAVIRT_SPINLOCKS y - PARAVIRT y - PM_ADVANCED_DEBUG y - PM_TRACE_RTC n # Disable some expensive () features - PM_WAKELOCKS y - POSIX_MQUEUE y - PPP_FILTER y - PPP_MULTILINK y # PPP multilink support - PROC_EVENTS y - RBTREE_TEST n - RC_DEVICES y # Enable IR devices - RCU_TORTURE_TEST n - REGULATOR y # Voltage and Current Regulator Support - REISERFS_FS_POSIX_ACL y - REISERFS_FS_SECURITY y - REISERFS_FS_XATTR y - RT_GROUP_SCHED n - RT2800USB_RT55XX y - SCHED_AUTOGROUP y SCHEDSTATS n - SCSI_LOGGING y # SCSI logging facility - SCSI_LOWLEVEL y # enable lots of SCSI devices - SCSI_LOWLEVEL_PCMCIA y - SCSI_SAS_ATA y # added to enable detection of hard drive - SECCOMP y # used by systemd >= 231 - SECCOMP_FILTER y # ditto - SECURITY_APPARMOR y - SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default - SERIAL_8250 y # 8250/16550 and compatible serial support - SLIP_COMPRESSED y # CSLIP compressed headers - SLIP_SMART y - SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode - SND_DYNAMIC_MINORS y - SND_HDA_INPUT_BEEP y # Support digital beep via input layer - SND_HDA_PATCH_LOADER y # Support configuring jack functions via fw mechanism at boot - SND_HDA_RECONFIG y # Support reconfiguration of jack functions - SND_USB_CAIAQ_INPUT y - SPI y # needed for many devices - SPI_MASTER y - SQUASHFS_LZO y - SQUASHFS_XATTR y - SQUASHFS_XZ y - SQUASHFS_ZLIB y - STAGING y - STANDALONE n # Support drivers that need external firmware. - STRICT_DEVMEM y # Filter access to /dev/mem - TEST_KSTRTOX n - TEST_LIST_SORT n - TEST_STRING_HELPERS n - THERMAL_HWMON y # Hardware monitoring support - TMPFS y - TMPFS_POSIX_ACL y - TRANSPARENT_HUGEPAGE_ALWAYS n - TRANSPARENT_HUGEPAGE_MADVISE y - TRANSPARENT_HUGEPAGE y - UBIFS_FS_ADVANCED_COMPR y - UDF_FS m - UNIX y - USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators - USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling - USB_SERIAL_GENERIC y # USB Generic Serial Driver - USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices - USB_SERIAL_KEYSPAN_USA18X y - USB_SERIAL_KEYSPAN_USA19 y - USB_SERIAL_KEYSPAN_USA19QI y - USB_SERIAL_KEYSPAN_USA19QW y - USB_SERIAL_KEYSPAN_USA19W y - USB_SERIAL_KEYSPAN_USA28 y - USB_SERIAL_KEYSPAN_USA28X y - USB_SERIAL_KEYSPAN_USA28XA y - USB_SERIAL_KEYSPAN_USA28XB y - USB_SERIAL_KEYSPAN_USA49W y - USB_SERIAL_KEYSPAN_USA49WLC y - VGA_SWITCHEROO y # Hybrid graphics support - VIRT_DRIVERS y - WAN y - X86_CHECK_BIOS_CORRUPTION y - X86_MCE y - XFS_POSIX_ACL y - XFS_QUOTA y - XFS_RT y # XFS Realtime subvolume support - XZ_DEC_TEST n - ZRAM m + DETECT_HUNG_TASK y -# Architecture dependent - - ${optionalString (stdenv.isx86_64 || stdenv.isi686) '' - XEN y - XEN_DOM0 y - ${optionalString ((versionAtLeast version "3.18") && (features.xen_dom0 or false)) '' - HVC_XEN_FRONTEND y - HVC_XEN y - PCI_XEN y - SWIOTLB_XEN y - XEN_BACKEND y - XEN_BALLOON_MEMORY_HOTPLUG y - XEN_BALLOON y - XEN_EFI y - XEN_HAVE_PVMMU y - XEN_MCE_LOG y - XEN_PVH y - XEN_PVHVM y - XEN_SAVE_RESTORE y - XEN_SCRUB_PAGES y - XEN_SELFBALLOONING y - XEN_STUB y - XEN_SYS_HYPERVISOR y - XEN_TMEM y - ''} + ${optionalString (versionOlder version "4.4") '' + CPU_NOTIFIER_ERROR_INJECT? n ''} - ${optionalString (!stdenv.is64bit) '' - HIGHMEM64G y # We need 64 GB (PAE) support for Xen guest support. - ''} - - ${optionalString (stdenv.is64bit) '' - IRQ_REMAP y - VFIO_PCI_VGA y - X86_X2APIC y - ''} - - ${optionalString (stdenv.system == "i686-linux") '' - FB_GEODE y - ''} - - ${optionalString (stdenv.system == "x86_64-linux") '' - BPF_JIT y + ${optionalString (versionOlder version "4.11") '' + TIMER_STATS y + DEBUG_NX_TEST n ''} + # Bump the maximum number of CPUs to support systems like EC2 x1.* + # instances and Xeon Phi. ${optionalString (stdenv.system == "x86_64-linux" || stdenv.system == "aarch64-linux") '' NR_CPUS 384 ''} -# Kernel version dependent + # Unix domain sockets. + UNIX y - ${optionalString (versionAtLeast version "3.3" && versionOlder version "3.13") '' - AUDIT_LOGINUID_IMMUTABLE y + # Power management. + ${optionalString (versionOlder version "3.19") '' + PM_RUNTIME y ''} - - ${optionalString (versionOlder version "3.10") '' - ARM_KPROBES_TEST n - CPU_NOTIFIER_ERROR_INJECT n - EFI_TEST n - RCU_PERF_TEST n - TEST_ASYNC_DRIVER_PROBE n - TEST_BITMAP n - TEST_HASH n - TEST_UUID n - USB_SUSPEND y + PM_ADVANCED_DEBUG y + ${optionalString (versionAtLeast version "3.11") '' + X86_INTEL_LPSS y ''} - ${optionalString (versionAtLeast version "3.10") '' X86_INTEL_PSTATE y ''} + INTEL_IDLE y + CPU_FREQ_DEFAULT_GOV_PERFORMANCE y + ${optionalString (versionOlder version "3.10") '' + USB_SUSPEND y + ''} + PM_WAKELOCKS y + # Support drivers that need external firmware. + STANDALONE n + + # Make /proc/config.gz available. + IKCONFIG y + IKCONFIG_PROC y + + # Optimize with -O2, not -Os. + CC_OPTIMIZE_FOR_SIZE n + + # Enable the kernel's built-in memory tester. + MEMTEST y + + # Include the CFQ I/O scheduler in the kernel, rather than as a + # module, so that the initrd gets a good I/O scheduler. + IOSCHED_CFQ y + BLK_CGROUP y # required by CFQ + IOSCHED_DEADLINE y + ${optionalString (versionAtLeast version "4.11") '' + MQ_IOSCHED_DEADLINE y + ''} + ${optionalString (versionAtLeast version "4.12") '' + BFQ_GROUP_IOSCHED y + MQ_IOSCHED_KYBER y + IOSCHED_BFQ m + ''} + + # Enable NUMA. + NUMA? y + + # Disable some expensive (?) features. + PM_TRACE_RTC n + + # Enable initrd support. + BLK_DEV_RAM y + BLK_DEV_INITRD y + + # Enable various subsystems. + ACCESSIBILITY y # Accessibility support + AUXDISPLAY y # Auxiliary Display support + DONGLE y # Serial dongle support + HIPPI y + MTD_COMPLEX_MAPPINGS y # needed for many devices + SCSI_LOWLEVEL y # enable lots of SCSI devices + SCSI_LOWLEVEL_PCMCIA y + SCSI_SAS_ATA y # added to enable detection of hard drive + SPI y # needed for many devices + SPI_MASTER y + WAN y + + # Networking options. + NET y + IP_PNP n + ${optionalString (versionOlder version "3.13") '' + IPV6_PRIVACY y + ''} + NETFILTER y + NETFILTER_ADVANCED y + IP_ROUTE_VERBOSE y + IP_MROUTE_MULTIPLE_TABLES y + IP_VS_PROTO_TCP y + IP_VS_PROTO_UDP y + IP_VS_PROTO_ESP y + IP_VS_PROTO_AH y + IP_DCCP_CCID3 n # experimental + IP_MULTICAST y + IPV6_ROUTER_PREF y + IPV6_ROUTE_INFO y + IPV6_OPTIMISTIC_DAD y + IPV6_MULTIPLE_TABLES y + IPV6_SUBTREES y + IPV6_MROUTE y + IPV6_MROUTE_MULTIPLE_TABLES y + IPV6_PIMSM_V2 y + ${optionalString (versionAtLeast version "4.7") '' + IPV6_FOU_TUNNEL m + ''} + CLS_U32_PERF y + CLS_U32_MARK y + ${optionalString (stdenv.system == "x86_64-linux") '' + BPF_JIT y + ''} + ${optionalString (versionAtLeast version "4.4") '' + NET_CLS_BPF m + NET_ACT_BPF m + ''} + L2TP_V3 y + L2TP_IP m + L2TP_ETH m + BRIDGE_VLAN_FILTERING y + BONDING m + NET_L3_MASTER_DEV? y + NET_FOU_IP_TUNNELS? y + IP_NF_TARGET_REDIRECT m + + # Wireless networking. + CFG80211_WEXT? y # Without it, ipw2200 drivers don't build + IPW2100_MONITOR? y # support promiscuous mode + IPW2200_MONITOR? y # support promiscuous mode + HOSTAP_FIRMWARE? y # Support downloading firmware images with Host AP driver + HOSTAP_FIRMWARE_NVRAM? y + ATH9K_PCI? y # Detect Atheros AR9xxx cards on PCI(e) bus + ATH9K_AHB? y # Ditto, AHB bus + B43_PHY_HT? y + BCMA_HOST_PCI? y + + # Enable various FB devices. + FB y + FB_EFI y + FB_NVIDIA_I2C y # Enable DDC Support + FB_RIVA_I2C y + FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support + FB_ATY_GX y # Mach64 GX support + FB_SAVAGE_I2C y + FB_SAVAGE_ACCEL y + FB_SIS_300 y + FB_SIS_315 y + FB_3DFX_ACCEL y + FB_VESA y + FRAMEBUFFER_CONSOLE y + FRAMEBUFFER_CONSOLE_ROTATION y + ${optionalString (stdenv.system == "i686-linux") '' + FB_GEODE y + ''} + + # Video configuration. + # Enable KMS for devices whose X.org driver supports it. + ${optionalString (versionOlder version "4.3" && !(features.chromiumos or false)) '' + DRM_I915_KMS y + ''} + # Allow specifying custom EDID on the kernel command line + DRM_LOAD_EDID_FIRMWARE y + VGA_SWITCHEROO y # Hybrid graphics support + DRM_GMA600 y + DRM_GMA3600 y + ${optionalString (versionAtLeast version "4.5" && (versionOlder version "4.9")) '' + DRM_AMD_POWERPLAY y # necessary for amdgpu polaris support + ''} + ${optionalString (versionAtLeast version "4.9") '' + DRM_AMDGPU_SI y # (experimental) amdgpu support for verde and newer chipsets + DRM_AMDGPU_CIK y # (stable) amdgpu support for bonaire and newer chipsets + ''} + + # Sound. + SND_DYNAMIC_MINORS y + SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode + SND_HDA_INPUT_BEEP y # Support digital beep via input layer + SND_HDA_RECONFIG y # Support reconfiguration of jack functions + SND_HDA_PATCH_LOADER y # Support configuring jack functions via fw mechanism at boot + SND_USB_CAIAQ_INPUT y + ${optionalString (versionOlder version "4.12") '' + PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) + ''} + + # USB serial devices. + USB_SERIAL_GENERIC y # USB Generic Serial Driver + USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices + USB_SERIAL_KEYSPAN_USA28 y + USB_SERIAL_KEYSPAN_USA28X y + USB_SERIAL_KEYSPAN_USA28XA y + USB_SERIAL_KEYSPAN_USA28XB y + USB_SERIAL_KEYSPAN_USA19 y + USB_SERIAL_KEYSPAN_USA18X y + USB_SERIAL_KEYSPAN_USA19W y + USB_SERIAL_KEYSPAN_USA19QW y + USB_SERIAL_KEYSPAN_USA19QI y + USB_SERIAL_KEYSPAN_USA49W y + USB_SERIAL_KEYSPAN_USA49WLC y + + # Filesystem options - in particular, enable extended attributes and + # ACLs for all filesystems that support them. + FANOTIFY y + TMPFS y + TMPFS_POSIX_ACL y + ${optionalString (versionAtLeast version "4.9") '' + FS_ENCRYPTION? m + ''} + EXT2_FS_XATTR y + EXT2_FS_POSIX_ACL y + EXT2_FS_SECURITY y + ${optionalString (versionOlder version "4.0") '' + EXT2_FS_XIP y # Ext2 execute in place support + ''} + EXT3_FS_POSIX_ACL y + EXT3_FS_SECURITY y + EXT4_FS_POSIX_ACL y + EXT4_ENCRYPTION? ${if versionOlder version "4.8" then "m" else "y"} + EXT4_FS_SECURITY y + REISERFS_FS_XATTR? y + REISERFS_FS_POSIX_ACL? y + REISERFS_FS_SECURITY? y + JFS_POSIX_ACL? y + JFS_SECURITY? y + XFS_QUOTA? y + XFS_POSIX_ACL? y + XFS_RT? y # XFS Realtime subvolume support + OCFS2_DEBUG_MASKLOG? n + BTRFS_FS_POSIX_ACL y + UBIFS_FS_ADVANCED_COMPR? y + F2FS_FS m + F2FS_FS_SECURITY? y + F2FS_FS_ENCRYPTION? y + UDF_FS m + ${optionalString (versionAtLeast version "4.0" && versionOlder version "4.6") '' + NFSD_PNFS y + ''} + NFSD_V2_ACL y + NFSD_V3 y + NFSD_V3_ACL y + NFSD_V4 y + ${optionalString (versionAtLeast version "3.11") '' + NFSD_V4_SECURITY_LABEL y + ''} + NFS_FSCACHE y + NFS_SWAP y + NFS_V3_ACL y ${optionalString (versionAtLeast version "3.11") '' NFS_V4_1 y # NFSv4.1 client support NFS_V4_2 y NFS_V4_SECURITY_LABEL y - NFSD_V4_SECURITY_LABEL y - PINCTRL_BAYTRAIL y # GPIO on Intel Bay Trail, for some Chromebook internal eMMC disks - X86_INTEL_LPSS y - - ${optionalString (versionOlder version "4.4") '' - MICROCODE_AMD_EARLY y - MICROCODE_EARLY y - MICROCODE_INTEL_EARLY y - ''} ''} - + CIFS_XATTR y + CIFS_POSIX y + CIFS_FSCACHE y + CIFS_STATS y + CIFS_WEAK_PW_HASH y + CIFS_UPCALL y + CIFS_ACL y + CIFS_DFS_UPCALL y + ${optionalString (versionOlder version "4.13") '' + CIFS_SMB2 y + ''} ${optionalString (versionAtLeast version "3.12") '' CEPH_FSCACHE y - HOTPLUG_PCI_ACPI y # PCI hotplug using ACPI - HOTPLUG_PCI_PCIE y # PCI-Expresscard hotplug support - USER_NS y # Support for user namespaces ''} - - ${optionalString (versionOlder version "3.13") '' - IPV6_PRIVACY y - ''} - - ${optionalString (versionAtLeast version "3.13") '' - KVM_VFIO y - SQUASHFS_DECOMP_MULTI_PERCPU y - SQUASHFS_FILE_DIRECT y - ''} - - ${optionalString (versionOlder version "3.14") '' - CC_STACKPROTECTOR y # Detect buffer overflows on the stack - ''} - ${optionalString (versionAtLeast version "3.14") '' - CC_STACKPROTECTOR_REGULAR y # Detect buffer overflows on the stack CEPH_FS_POSIX_ACL y ''} - - ${optionalString (versionOlder version "3.15") '' - USB_DEBUG n + ${optionalString (versionAtLeast version "3.13") '' + SQUASHFS_FILE_DIRECT y + SQUASHFS_DECOMP_MULTI_PERCPU y ''} - - ${optionalString (versionAtLeast version "3.15") '' - UEVENT_HELPER n - - ${optionalString (versionOlder version "4.8") '' - MLX4_EN_VXLAN y - ''} - ''} - - ${optionalString (versionOlder version "3.18") '' - ZSMALLOC y - ''} - - ${optionalString (versionAtLeast version "3.18") '' - MODULE_COMPRESS y # Compress kernel modules for a sizable disk space savings - MODULE_COMPRESS_XZ y - ZSMALLOC m - ''} - - ${optionalString (versionOlder version "3.19") '' - PM_RUNTIME y # Power management - ''} - + SQUASHFS_XATTR y + SQUASHFS_ZLIB y + SQUASHFS_LZO y + SQUASHFS_XZ y ${optionalString (versionAtLeast version "3.19") '' SQUASHFS_LZ4 y ''} - ${optionalString (versionOlder version "4.0") '' - EXT2_FS_XIP y # Ext2 execute in place support + # Native Language Support modules, needed by some filesystems + NLS y + NLS_DEFAULT utf8 + NLS_UTF8 m + NLS_CODEPAGE_437 m # VFAT default for the codepage= mount option + NLS_ISO8859_1 m # VFAT default for the iocharset= mount option + + # Runtime security tests + ${optionalString (versionOlder version "4.11") '' + DEBUG_SET_MODULE_RONX? y # Detect writes to read-only module pages ''} - ${optionalString (versionAtLeast version "4.0") '' - KVM_GENERIC_DIRTYLOG_READ_PROTECT y - - ${optionalString (versionOlder version "4.6") '' - NFSD_PNFS y - ''} - - ${optionalString (versionOlder version "4.12") '' - KVM_COMPAT y - ''} + # Security related features. + RANDOMIZE_BASE? y + STRICT_DEVMEM y # Filter access to /dev/mem + SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default + SECURITY_YAMA? y # Prevent processes from ptracing non-children processes + DEVKMEM n # Disable /dev/kmem + ${if versionOlder version "3.14" then '' + CC_STACKPROTECTOR? y # Detect buffer overflows on the stack + '' else '' + CC_STACKPROTECTOR_REGULAR? y + ''} + ${optionalString (versionAtLeast version "3.12") '' + USER_NS y # Support for user namespaces ''} - ${optionalString (versionOlder version "4.3" && !(features.chromiumos or false)) '' - DRM_I915_KMS y + # AppArmor support + SECURITY_APPARMOR y + DEFAULT_SECURITY_APPARMOR y + + # Microcode loading support + MICROCODE y + MICROCODE_INTEL y + MICROCODE_AMD y + ${optionalString (versionAtLeast version "3.11" && versionOlder version "4.4") '' + MICROCODE_EARLY y + MICROCODE_INTEL_EARLY y + MICROCODE_AMD_EARLY y ''} + # Misc. options. + 8139TOO_8129 y + 8139TOO_PIO n # PIO is slower + AIC79XX_DEBUG_ENABLE n + AIC7XXX_DEBUG_ENABLE n + AIC94XX_DEBUG n + ${optionalString (versionAtLeast version "3.3" && versionOlder version "3.13") '' + AUDIT_LOGINUID_IMMUTABLE y + ''} + ${optionalString (versionOlder version "4.4") '' + B43_PCMCIA? y + ''} + BLK_DEV_INITRD y + BLK_DEV_INTEGRITY y + BSD_PROCESS_ACCT_V3 y + BT_HCIUART_BCSP? y + BT_HCIUART_H4? y # UART (H4) protocol support + BT_HCIUART_LL? y + BT_RFCOMM_TTY? y # RFCOMM TTY support + CLEANCACHE? y + CRASH_DUMP? n + DVB_DYNAMIC_MINORS? y # we use udev + EFI_STUB y # EFI bootloader in the bzImage itself + CGROUPS y # used by systemd + FHANDLE y # used by systemd + SECCOMP y # used by systemd >= 231 + SECCOMP_FILTER y # ditto + POSIX_MQUEUE y + FRONTSWAP y + FUSION y # Fusion MPT device support + IDE n # deprecated IDE support + ${optionalString (versionAtLeast version "4.3") '' + IDLE_PAGE_TRACKING y + ''} + IRDA_ULTRA y # Ultra (connectionless) protocol + JOYSTICK_IFORCE_232? y # I-Force Serial joysticks and wheels + JOYSTICK_IFORCE_USB? y # I-Force USB joysticks and wheels + JOYSTICK_XPAD_FF? y # X-Box gamepad rumble support + JOYSTICK_XPAD_LEDS? y # LED Support for Xbox360 controller 'BigX' LED + KEXEC_FILE? y + KEXEC_JUMP? y + LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support + LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback + LOGO n # not needed + MEDIA_ATTACH y + MEGARAID_NEWGEN y + ${optionalString (versionAtLeast version "3.15" && versionOlder version "4.8") '' + MLX4_EN_VXLAN y + ''} + ${optionalString (versionOlder version "4.9") '' + MODVERSIONS y + ''} + MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension + MTRR_SANITIZER y + NET_FC y # Fibre Channel driver support + ${optionalString (versionAtLeast version "3.11") '' + PINCTRL_BAYTRAIL y # GPIO on Intel Bay Trail, for some Chromebook internal eMMC disks + ''} + MMC_BLOCK_MINORS 32 # 8 is default. Modern gpt tables on eMMC may go far beyond 8. + PPP_MULTILINK y # PPP multilink support + PPP_FILTER y + REGULATOR y # Voltage and Current Regulator Support + RC_DEVICES? y # Enable IR devices + RT2800USB_RT55XX y + SCHED_AUTOGROUP y + SCSI_LOGGING y # SCSI logging facility + SERIAL_8250 y # 8250/16550 and compatible serial support + SLIP_COMPRESSED y # CSLIP compressed headers + SLIP_SMART y + HWMON y + THERMAL_HWMON y # Hardware monitoring support + ${optionalString (versionAtLeast version "3.15") '' + UEVENT_HELPER n + ''} + ${optionalString (versionOlder version "3.15") '' + USB_DEBUG? n + ''} + USB_EHCI_ROOT_HUB_TT y # Root Hub Transaction Translators + USB_EHCI_TT_NEWSCHED y # Improved transaction translator scheduling + ${optionalString (versionAtLeast version "4.3") '' + USERFAULTFD y + ''} + X86_CHECK_BIOS_CORRUPTION y + X86_MCE y + + ${optionalString (versionAtLeast version "3.12") '' + HOTPLUG_PCI_ACPI y # PCI hotplug using ACPI + HOTPLUG_PCI_PCIE y # PCI-Expresscard hotplug support + ''} + + + # Linux containers. + NAMESPACES? y # Required by 'unshare' used by 'nixos-install' + RT_GROUP_SCHED n + CGROUP_DEVICE? y + MEMCG y + MEMCG_SWAP y + ${optionalString (versionOlder version "4.7") "DEVPTS_MULTIPLE_INSTANCES y"} + BLK_DEV_THROTTLING y + CFQ_GROUP_IOSCHED y ${optionalString (versionAtLeast version "4.3") '' CGROUP_PIDS y - IDLE_PAGE_TRACKING y - - ${optionalString (!features.grsecurity or false) '' - USERFAULTFD y - ''} ''} - ${optionalString (versionOlder version "4.4") '' - B43_PCMCIA y + # Enable staging drivers. These are somewhat experimental, but + # they generally don't hurt. + STAGING y + + # PROC_EVENTS requires that the netlink connector is not built + # as a module. This is required by libcgroup's cgrulesengd. + CONNECTOR y + PROC_EVENTS y + + # Tracing. + FTRACE y + KPROBES y + FUNCTION_TRACER y + FTRACE_SYSCALLS y + SCHED_TRACER y + STACK_TRACER y + + ${if versionOlder version "4.11" then '' + UPROBE_EVENT? y + '' else '' + UPROBE_EVENTS? y ''} ${optionalString (versionAtLeast version "4.4") '' BPF_SYSCALL y - BRCMFMAC_PCIE y - F2FS_FS_ENCRYPTION y - F2FS_FS_SECURITY y - FW_LOADER_USER_HELPER_FALLBACK n - GLOB_SELFTEST n - KEXEC_FILE y - LNET_SELFTEST n - LOCK_TORTURE_TEST n - NET_ACT_BPF m - NET_CLS_BPF m - NET_FOU_IP_TUNNELS y - NET_L3_MASTER_DEV y - PERCPU_TEST n - TEST_BPF n - TEST_FIRMWARE n - TEST_HEXDUMP n - TEST_PRINTF n - TEST_RHASHTABLE n - TEST_STATIC_KEYS n - TEST_UDELAY n - TEST_USER_COPY n - ZBUD y - ZSWAP y - - ${optionalString (versionOlder version "4.13") '' - TEST_LKM n - ''} - - ${optionalString (!features.grsecurity or false) '' - BPF_EVENTS y - RANDOMIZE_BASE y - ''} + BPF_EVENTS y ''} + FUNCTION_PROFILER y + RING_BUFFER_BENCHMARK n - ${optionalString (versionAtLeast version "4.5" && (versionOlder version "4.9")) '' - DRM_AMD_POWERPLAY y # necessary for amdgpu polaris support - ''} + # Devtmpfs support. + DEVTMPFS y - ${optionalString (versionOlder version "4.7") '' - DEVPTS_MULTIPLE_INSTANCES y # Linux containers - ''} - - ${optionalString (versionAtLeast version "4.7") '' - IPV6_FOU_TUNNEL m - ''} + # Easier debugging of NFS issues. + SUNRPC_DEBUG y + # Virtualisation. + PARAVIRT? y + HYPERVISOR_GUEST y + PARAVIRT_SPINLOCKS? y ${optionalString (versionOlder version "4.8") '' KVM_APIC_ARCHITECTURE y - - ${optionalString (versionAtLeast version "4.4") '' - EXT4_ENCRYPTION m - ''} ''} - - ${optionalString (versionAtLeast version "4.8") '' - EXT4_ENCRYPTION y + KVM_ASYNC_PF y + ${optionalString ((versionAtLeast version "4.0") && (versionOlder version "4.12")) '' + KVM_COMPAT? y ''} - - ${optionalString (versionAtLeast version "4.9") '' - DRM_AMDGPU_CIK y # (stable) amdgpu support for bonaire and newer chipsets - DRM_AMDGPU_SI y # (experimental) amdgpu support for verde and newer chipsets - FS_ENCRYPTION m - MODVERSIONS y - ''} - - ${optionalString (versionOlder version "4.11") '' - DEBUG_NX_TEST n - TIMER_STATS y - UPROBE_EVENT y - - ${optionalString (!features.grsecurity or false) '' - DEBUG_SET_MODULE_RONX y # Detect writes to read-only module pages - ''} - ''} - - ${optionalString (versionAtLeast version "4.11") '' - DRM_DEBUG_MM_SELFTEST n - MQ_IOSCHED_DEADLINE y - TEST_PARMAN n - TEST_SORT n - UPROBE_EVENTS y - WW_MUTEX_SELFTEST n - ''} - ${optionalString (versionOlder version "4.12") '' - KVM_DEVICE_ASSIGNMENT y - PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) + KVM_DEVICE_ASSIGNMENT? y ''} - - ${optionalString (versionAtLeast version "4.12") '' - BFQ_GROUP_IOSCHED y - IOSCHED_BFQ m - MQ_IOSCHED_KYBER y + ${optionalString (versionAtLeast version "4.0") '' + KVM_GENERIC_DIRTYLOG_READ_PROTECT y ''} - - ${optionalString (versionOlder version "4.13") '' - CIFS_SMB2 y + KVM_GUEST y + KVM_MMIO y + ${optionalString (versionAtLeast version "3.13") '' + KVM_VFIO y ''} - - ${optionalString (versionAtLeast version "4.13") '' - TEST_LKM m + ${optionalString (stdenv.isx86_64 || stdenv.isi686) '' + XEN? y + XEN_DOM0? y + ${optionalString ((versionAtLeast version "3.18") && (features.xen_dom0 or false)) '' + PCI_XEN? y + HVC_XEN? y + HVC_XEN_FRONTEND? y + XEN_SYS_HYPERVISOR? y + SWIOTLB_XEN? y + XEN_BACKEND? y + XEN_BALLOON? y + XEN_BALLOON_MEMORY_HOTPLUG? y + XEN_EFI? y + XEN_HAVE_PVMMU? y + XEN_MCE_LOG? y + XEN_PVH? y + XEN_PVHVM? y + XEN_SAVE_RESTORE? y + XEN_SCRUB_PAGES? y + XEN_SELFBALLOONING? y + XEN_STUB? y + XEN_TMEM? y + ''} ''} - -# Feature dependent - - ${optionalString (!features.grsecurity or false) '' - DEVKMEM n # Disable /dev/kmem - DYNAMIC_DEBUG y - FTRACE y - FTRACE_SYSCALLS y - FUNCTION_PROFILER y - FUNCTION_TRACER y - RING_BUFFER_BENCHMARK n - SCHED_TRACER y - SECURITY_YAMA y # Prevent processes from ptracing non-children processes - STACK_TRACER y - SUNRPC_DEBUG y # Easier debugging of NFS issues + KSM y + ${optionalString (!stdenv.is64bit) '' + HIGHMEM64G? y # We need 64 GB (PAE) support for Xen guest support. ''} + ${optionalString (stdenv.is64bit) '' + VFIO_PCI_VGA y + ''} + VIRT_DRIVERS y + # Media support. + MEDIA_DIGITAL_TV_SUPPORT y + MEDIA_CAMERA_SUPPORT y + MEDIA_RC_SUPPORT y + MEDIA_USB_SUPPORT y ${optionalString (!(features.chromiumos or false)) '' MEDIA_PCI_SUPPORT y ''} + # Our initrd init uses shebang scripts, so can't be modular. + BINFMT_SCRIPT y + + # For systemd-binfmt + BINFMT_MISC? y + + # Enable the 9P cache to speed up NixOS VM tests. + 9P_FSCACHE? y + 9P_FS_POSIX_ACL? y + + # Enable transparent support for huge pages. + TRANSPARENT_HUGEPAGE? y + TRANSPARENT_HUGEPAGE_ALWAYS? n + TRANSPARENT_HUGEPAGE_MADVISE? y + + # zram support (e.g for in-memory compressed swap). + ZRAM m + ZSWAP? y + ZBUD? y + ${optionalString (versionOlder version "3.18") '' + ZSMALLOC y + ''} + ${optionalString (versionAtLeast version "3.18") '' + ZSMALLOC m + ''} + + # Enable PCIe and USB for the brcmfmac driver + BRCMFMAC_USB? y + BRCMFMAC_PCIE? y + + # Support x2APIC (which requires IRQ remapping). + ${optionalString (stdenv.system == "x86_64-linux") '' + X86_X2APIC y + IRQ_REMAP y + ''} + + # Disable the firmware helper fallback, udev doesn't implement it any more + FW_LOADER_USER_HELPER_FALLBACK? n + + # Disable various self-test modules that have no use in a production system + ${optionalString (versionOlder version "4.4") '' + ARM_KPROBES_TEST? n + ''} + + ASYNC_RAID6_TEST? n + ATOMIC64_SELFTEST? n + BACKTRACE_SELF_TEST? n + CRC32_SELFTEST? n + CRYPTO_TEST? n + GLOB_SELFTEST? n + INTERVAL_TREE_TEST? n + LNET_SELFTEST? n + LOCK_TORTURE_TEST? n + MTD_TESTS? n + NOTIFIER_ERROR_INJECTION? n + PERCPU_TEST? n + RBTREE_TEST? n + RCU_TORTURE_TEST? n + TEST_BPF? n + TEST_FIRMWARE? n + TEST_HEXDUMP? n + TEST_KSTRTOX? n + TEST_LIST_SORT? n + TEST_LKM? n + TEST_PRINTF? n + TEST_RHASHTABLE? n + TEST_STATIC_KEYS? n + TEST_STRING_HELPERS? n + TEST_UDELAY? n + TEST_USER_COPY? n + XZ_DEC_TEST? n + + ${optionalString (versionOlder version "4.4") '' + EFI_TEST? n + RCU_PERF_TEST? n + TEST_ASYNC_DRIVER_PROBE? n + TEST_BITMAP? n + TEST_HASH? n + TEST_UUID? n + ''} + + ${optionalString (versionAtLeast version "4.11") '' + DRM_DEBUG_MM_SELFTEST? n + TEST_PARMAN? n + TEST_SORT? n + WW_MUTEX_SELFTEST? n + ''} + # ChromiumOS support ${optionalString (features.chromiumos or false) '' - ANDROID_PARANOID_NETWORK n - BLK_DEV_DM y - CHARGER_CROS_USB_PD y CHROME_PLATFORMS y - CPU_FREQ_GOV_INTERACTIVE n - CPU_FREQ_STAT y - DM_BOOTCACHE n - DM_VERITY n - DRM_VGEM n - I2C y - INPUT_KEYRESET n - IPV6 y - IPV6_VTI n - MEDIA_SUBDRV_AUTOSELECT n - MFD_CROS_EC y - MFD_CROS_EC_DEV y - MFD_CROS_EC_LPC y + VGA_SWITCHEROO n MMC_SDHCI_PXAV2 n NET_IPVTI n + IPV6_VTI n REGULATOR_FIXED_VOLTAGE n TPS6105X n - UID_CPUTIME n - VGA_SWITCHEROO n + CPU_FREQ_STAT y + IPV6 y + MFD_CROS_EC y + MFD_CROS_EC_LPC y + MFD_CROS_EC_DEV y + CHARGER_CROS_USB_PD y + I2C y + MEDIA_SUBDRV_AUTOSELECT n VIDEO_IR_I2C n + BLK_DEV_DM y + ANDROID_PARANOID_NETWORK n + DM_VERITY n + DRM_VGEM n + CPU_FREQ_GOV_INTERACTIVE n + INPUT_KEYRESET n + DM_BOOTCACHE n + UID_CPUTIME n ${optionalString (versionAtLeast version "3.18") '' - BCMDHD n - CHROMEOS_OF_FIRMWARE y CPUFREQ_DT n - DRM_POWERVR_ROGUE n EXTCON_CROS_EC n + DRM_POWERVR_ROGUE n + CHROMEOS_OF_FIRMWARE y TEST_RHASHTABLE n + BCMDHD n TRUSTY n ''} ${optionalString (versionOlder version "3.18") '' + MALI_MIDGARD n + DVB_USB_DIB0700 n + DVB_USB_DW2102 n + DVB_USB_PCTV452E n + DVB_USB_TTUSB2 n DVB_USB_AF9015 n DVB_USB_AF9035 n DVB_USB_ANYSEE n DVB_USB_AZ6007 n - DVB_USB_DIB0700 n - DVB_USB_DW2102 n DVB_USB_IT913X n DVB_USB_LME2510 n - DVB_USB_PCTV452E n DVB_USB_RTL28XXU n - DVB_USB_TTUSB2 n - MALI_MIDGARD n - SPEAKUP n - USB_DWC2 n - USB_GADGET n - USB_GSPCA n USB_S2255 n VIDEO_EM28XX n VIDEO_TM6000 n + USB_DWC2 n + USB_GSPCA n + SPEAKUP n XO15_EBOOK n + USB_GADGET n ''} ''} -# Extra configuration - ${kernelPlatform.kernelExtraConfig or ""} ${extraConfig} '' From 7bc42a89713b0e8824ea47218ba14e75e0b2d921 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 8 Aug 2017 01:14:58 +0200 Subject: [PATCH 32/36] xmonad service: add defaultText to extraPackages to fix rendering in docs --- nixos/modules/services/x11/window-managers/xmonad.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix index e25a8ae2282..43de746ab1f 100644 --- a/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/nixos/modules/services/x11/window-managers/xmonad.nix @@ -29,6 +29,7 @@ in extraPackages = mkOption { default = self: []; + defaultText = "self: []"; example = literalExample '' haskellPackages: [ haskellPackages.xmonad-contrib From a809cf409a772f15ba4f71ec86ac35dc91a13ddb Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Tue, 8 Aug 2017 01:28:12 +0200 Subject: [PATCH 33/36] geekbench: init at 4.1.1 --- pkgs/tools/misc/geekbench/default.nix | 35 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/misc/geekbench/default.nix diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix new file mode 100644 index 00000000000..9172c13636a --- /dev/null +++ b/pkgs/tools/misc/geekbench/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, makeWrapper }: + +stdenv.mkDerivation rec { + name = "geekbench-${version}"; + version = "4.1.1"; + + src = fetchurl { + url = "http://cdn.primatelabs.com/Geekbench-${version}-Linux.tar.gz"; + sha256 = "1n9jyzf0a0w37hb30ip76hz73bvim76jd2fgd6131hh0shp1s4v6"; + }; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + cp -r dist/Geekbench-${version}-Linux/. $out/bin + rm $out/bin/geekbench_x86_32 + + for f in geekbench4 geekbench_x86_64 ; do + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $out/bin/$f + wrapProgram $out/bin/$f --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" + done + ''; + + meta = with stdenv.lib; { + description = "Cross-platform benchmark"; + homepage = http://geekbench.com/; + license = licenses.unfree; + maintainers = [ maintainers.michalrus ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c26ba7c826..f039113e3bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1031,6 +1031,8 @@ with pkgs; go-dependency-manager = callPackage ../development/tools/gdm { }; + geekbench = callPackage ../tools/misc/geekbench { }; + gencfsm = callPackage ../tools/security/gencfsm { }; genromfs = callPackage ../tools/filesystems/genromfs { }; From b32a1199f88e64ec3191b0322017b11379c36d90 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 7 Aug 2017 21:58:01 +0000 Subject: [PATCH 34/36] orackejdk: untie from gnome2 Nothing should change unless you override ```gtk2``` or ```gnome2.gtk``` so they become different --- pkgs/development/compilers/oraclejdk/jdk-linux-base.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index fec038199ad..2a00cf5f2d2 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -27,7 +27,8 @@ , mesa_noglu , freetype , fontconfig -, gnome2 +, gtk2 +, pango , cairo , alsaLib , atk @@ -196,7 +197,7 @@ let result = stdenv.mkDerivation rec { * libXt is only needed on amd64 */ libraries = - [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango gnome2.gtk cairo gdk_pixbuf atk] ++ + [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk] ++ (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []); rpath = stdenv.lib.strings.makeLibraryPath libraries; From 739b4b42e634c9b1004c4f6332281bcf53c196f5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 8 Aug 2017 08:40:26 +0200 Subject: [PATCH 35/36] searx: fix typo, fixes #28015 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b31eefc9f8a..1f32cc4cee3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11588,7 +11588,7 @@ with pkgs; tt-rss = callPackage ../servers/tt-rss { }; - searx = callPackages ../servers/web-apps/searx { }; + searx = callPackage ../servers/web-apps/searx { }; selfoss = callPackage ../servers/web-apps/selfoss { }; From 2141086af83455aabc1f62dc63459d918e010e8a Mon Sep 17 00:00:00 2001 From: Casey Rodarmor Date: Mon, 7 Aug 2017 20:14:53 -0700 Subject: [PATCH 36/36] python.pkgs.feedgen: init at 0.5.1 --- lib/maintainers.nix | 1 + .../python-modules/feedgen/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/feedgen/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 048d8c4760e..2acf014eed6 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -94,6 +94,7 @@ campadrenalin = "Philip Horger "; canndrew = "Andrew Cann "; carlsverre = "Carl Sverre "; + casey = "Casey Rodarmor "; cdepillabout = "Dennis Gosnell "; cfouche = "Chaddaï Fouché "; changlinli = "Changlin Li "; diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix new file mode 100644 index 00000000000..9ad28e52baa --- /dev/null +++ b/pkgs/development/python-modules/feedgen/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, fetchurl, dateutil, lxml }: + +buildPythonPackage rec { + pname = "feedgen"; + version = "0.5.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "3a344b5e3662e9012d095a081a7f216f188dccf3a8f44ad7882960fef05e6787"; + }; + + propagatedBuildInputs = [ dateutil lxml ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Python module to generate ATOM feeds, RSS feeds and Podcasts."; + downloadPage = https://github.com/lkiesow/python-feedgen/releases; + homepage = https://github.com/lkiesow/python-feedgen; + license = with licenses; [ bsd2 lgpl3 ]; + maintainers = with maintainers; [ casey ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bb5aef27f13..6df0af98295 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9795,6 +9795,8 @@ in { }; }; + feedgen = callPackage ../development/python-modules/feedgen { }; + feedgenerator = callPackage ../development/python-modules/feedgenerator { inherit (pkgs) glibcLocales; };