Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

5 files changed, 14 insertions, 33 deletions

diff --git a/nixpkgs/pkgs/os-specific/linux/anbox/anbox-image.nix b/nixpkgs/pkgs/os-specific/linux/anbox/anbox-image.nix
deleted file mode 100644
index 77bcd8a09f78..000000000000
--- a/nixpkgs/pkgs/os-specific/linux/anbox/anbox-image.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl }:
-
-let
-  imgroot = "https://build.anbox.io/android-images";
-in
-  {
-    armv7l-linux = fetchurl {
-      url = imgroot + "/2017/06/12/android_1_armhf.img";
-      sha256 = "1za4q6vnj8wgphcqpvyq1r8jg6khz7v6b7h6ws1qkd5ljangf1w5";
-    };
-    aarch64-linux = fetchurl {
-      url = imgroot + "/2017/08/04/android_1_arm64.img";
-      sha256 = "02yvgpx7n0w0ya64y5c7bdxilaiqj9z3s682l5s54vzfnm5a2bg5";
-    };
-    x86_64-linux = fetchurl {
-      url = imgroot + "/2018/07/19/android_amd64.img";
-      sha256 = "1jlcda4q20w30cm9ikm6bjq01p547nigik1dz7m4v0aps4rws13b";
-    };
-  }.${stdenv.system} or (throw "Unsupported platform ${stdenv.system}")
diff --git a/nixpkgs/pkgs/os-specific/linux/anbox/default.nix b/nixpkgs/pkgs/os-specific/linux/anbox/default.nix
index 7368079510d6..856664fed806 100644
--- a/nixpkgs/pkgs/os-specific/linux/anbox/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/anbox/default.nix
@@ -154,9 +154,7 @@ stdenv.mkDerivation rec {
   '';
 
   passthru.tests = { inherit (nixosTests) anbox; };
-
   passthru.image = callPackage ./postmarketos-image.nix { };
-  passthru.postmarketos-image = callPackage ./anbox-image.nix { };
 
   meta = with lib; {
     homepage = "https://anbox.io";
diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 01144f5d4ef5..c3fd01670a2a 100644
--- a/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -3,14 +3,14 @@
 let
   # These names are how they are designated in https://xanmod.org.
   ltsVariant = {
-    version = "6.1.52";
-    hash = "sha256-uzBmgrjNto2CwqkxdFCPeEPQnPSUZEO2pYMnKe8rCfY=";
+    version = "6.1.53";
+    hash = "sha256-+70dp+zVOvfKJv9hEy3FpEs2ldrxHiWbokaUnXrNj5o=";
     variant = "lts";
   };
 
   mainVariant = {
-    version = "6.4.15";
-    hash = "sha256-WupJJMLqgHJ7FATwNyMwAHIUl9qj0lNH7wRYRBm0CAA=";
+    version = "6.5.3";
+    hash = "sha256-2giaFyN3kWzQ9cl1mTM9ecSlwoQS+dm3/LvbTAHjZ/A=";
     variant = "main";
   };
 
diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix b/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 3db9dcf31016..28e0158394fb 100644
--- a/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -4,16 +4,16 @@ let
   # comments with variant added for update script
   # ./update-zen.py zen
   zenVariant = {
-    version = "6.5.2"; #zen
+    version = "6.5.3"; #zen
     suffix = "zen1"; #zen
-    sha256 = "0rvf07i80cfrlpd7mfbba6dhzznh47zjw1pmiw04104z9lm84faq"; #zen
+    sha256 = "0jc50cb30dzysqdhm91ykcg5xhy062dc69gwak6q33bn56n7dw3m"; #zen
     isLqx = false;
   };
   # ./update-zen.py lqx
   lqxVariant = {
-    version = "6.4.14"; #lqx
+    version = "6.4.15"; #lqx
     suffix = "lqx1"; #lqx
-    sha256 = "1f85g081ijv2f1yclnhyci69ad8n1amcv9ccg3ma6mkf1n3qw6kk"; #lqx
+    sha256 = "1xhm73z074niz1dd0w24q5lxlpma6xraqil5kzp3j4qsyr5wg8hz"; #lqx
     isLqx = true;
   };
   zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
diff --git a/nixpkgs/pkgs/os-specific/linux/nftables/default.nix b/nixpkgs/pkgs/os-specific/linux/nftables/default.nix
index f91dc84d2187..e84d6aa6ac5c 100644
--- a/nixpkgs/pkgs/os-specific/linux/nftables/default.nix
+++ b/nixpkgs/pkgs/os-specific/linux/nftables/default.nix
@@ -1,9 +1,10 @@
 { lib, stdenv, fetchurl, pkg-config, bison, flex
 , asciidoc, libxslt, findXMLCatalogs, docbook_xml_dtd_45, docbook_xsl
 , libmnl, libnftnl, libpcap
-, gmp, jansson, libedit
+, gmp, jansson
 , autoreconfHook
 , withDebugSymbols ? false
+, withCli ? true, libedit
 , withPython ? false, python3
 , withXtables ? true, iptables
 , nixosTests
@@ -26,8 +27,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libmnl libnftnl libpcap
-    gmp jansson libedit
-  ] ++ lib.optional withXtables iptables
+    gmp jansson
+  ] ++ lib.optional withCli libedit
+    ++ lib.optional withXtables iptables
     ++ lib.optionals withPython [
       python3
       python3.pkgs.setuptools
@@ -35,7 +37,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-json"
-    "--with-cli=editline"
+    (lib.withFeatureAs withCli "cli" "editline")
   ] ++ lib.optional (!withDebugSymbols) "--disable-debug"
     ++ lib.optional (!withPython) "--disable-python"
     ++ lib.optional withPython "--enable-python"