Merge branch 'master' into staging-next

The point is to include the revert of `bpftools` rebuild.

pkgs/applications/science/math/mathematica/generic.nix

@@ -41,6 +41,8 @@
 , pciutils
 , tre
 , unixODBC
+, xcbutilimage
+, xcbutilkeysyms
 , xkeyboard_config
 , xorg
 , zlib
@@ -94,6 +96,8 @@ in stdenv.mkDerivation {
     pciutils
     tre
     unixODBC
+    xcbutilimage
+    xcbutilkeysyms
     xkeyboard_config
   ] ++ (with xorg; [
     libICE

pkgs/applications/science/math/mathematica/versions.nix

@@ -1,6 +1,13 @@
 { lib, requireFile }:
 
 let versions = [
+  {
+    version = "13.1.0";
+    lang = "en";
+    language = "English";
+    sha256 = "sha256-LIpGAJ3uTkZgjc0YykwusyyHQKlCnTvrZGStFfSOz60=";
+    installer = "Mathematica_13.1.0_BNDL_LINUX.sh";
+  }
   {
     version = "13.0.1";
     lang = "en";

pkgs/development/python-modules/crownstone-sse/default.nix

@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "crownstone-sse";
-  version = "2.0.3";
+  version = "2.0.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "crownstone";
     repo = "crownstone-lib-python-sse";
     rev = version;
-    sha256 = "sha256-O1joOH7HCXYCro26p6foMMpg0UXfOgXD0BXuN50OK7U=";
+    sha256 = "sha256-z/z8MmydHkHubwuX02gGbOcOEZ+FHX4i82vAK5gAl+c=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/gehomesdk/default.nix

@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "gehomesdk";
-  version = "0.5.6";
+  version = "0.5.7";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-EW26TzmD+F2IkzJkcoUdfYIJ3vkBYQhIFiEqnfDSmiw=";
+    sha256 = "sha256-FmCoryNX1DnqMlGalad5iWO2ZRZwXgWgARQMYlJ6yVo=";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/pep440/default.nix

@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pep440";
-  version = "0.1.1";
+  version = "0.1.2";
   format = "flit";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-E9F4mHaavQKK8PYnRcnOdfW7mXcBKn1dTInCknLeNO4=";
+    hash = "sha256-WLNyRswrE/7hyio8CSyzcE0h7PYhpb27Fo5E5pf20E0=";
   };
 
   nativeBuildInputs = [
@@ -26,6 +26,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTestPaths = [
+    # Don't run CLI tests
+    "tests/test_cli.py"
+  ];
+
   pythonImportsCheck = [
     "pep440"
   ];

pkgs/development/python-modules/pyvicare/default.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pyvicare";
-  version = "2.16.4";
+  version = "2.17.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "somm15";
     repo = "PyViCare";
     rev = version;
-    sha256 = "sha256-RFnQKGISPMrC53yAv3fu7FpbDNugLPQILXCPi5ik2qU=";
+    sha256 = "sha256-MlGohD9W1HNLz6ZPawt55127S3zPSA1tFLNs2gu7hLk=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

pkgs/os-specific/linux/bpftools/default.nix

@@ -1,14 +1,19 @@
-{ lib, stdenv
+{ lib, stdenv, fetchurl
 , libopcodes, libopcodes_2_38
 , libbfd, libbfd_2_38
 , elfutils, readline
-, linuxPackages_latest, zlib
+, zlib
 , python3, bison, flex
 }:
 
 stdenv.mkDerivation rec {
   pname = "bpftools";
-  inherit (linuxPackages_latest.kernel) version src;
+  version = "5.19.8";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
+    sha256 = "1kl7fifsa6vsm34xg3kd2svhx18n771hfj67nhwnlalmb9whhqv1";
+  };
 
   nativeBuildInputs = [ python3 bison flex ];
   buildInputs = (if (lib.versionAtLeast version "5.20")

pkgs/tools/misc/lnav/default.nix

@@ -15,19 +15,19 @@
 
 stdenv.mkDerivation rec {
   pname = "lnav";
-  version = "0.10.1";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "tstack";
     repo = "lnav";
     rev = "v${version}";
-    sha256 = "sha256-1b4mVKIUotMSK/ADHnpiM42G98JF0abL8sXXGFyS3sw=";
+    sha256 = "sha256-SkaJvIfFKD7xzxm3qnYUltKEpQRNNn6KkRwMP6eWte4=";
   };
 
   patches = [ ./0001-Forcefully-disable-docs-build.patch ];
   postPatch = ''
     substituteInPlace Makefile.am \
-      --replace "SUBDIRS = src test" "SUBDIRS = src"
+      --replace "SUBDIRS = tools src test" "SUBDIRS = tools src"
   '';
 
   enableParallelBuilding = true;

pkgs/top-level/aliases.nix

@@ -915,6 +915,7 @@ mapAliases ({
   multimc = throw "multimc was removed from nixpkgs; use polymc instead (see https://github.com/NixOS/nixpkgs/pull/154051 for more information)"; # Added 2022-01-08
   mumble_git = pkgs.mumble; # Added 2019-08-01
   murmur_git = pkgs.murmur; # Added 2019-08-01
+  mutt-with-sidebar = mutt; # Added 2022-09-17
   mysql-client = hiPrio mariadb.client;
   mysql = mariadb; # moved from top-level 2021-03-14
 

pkgs/top-level/all-packages.nix

@@ -29810,9 +29810,7 @@ with pkgs;
 
   mmh = callPackage ../applications/networking/mailreaders/mmh { };
   mutt = callPackage ../applications/networking/mailreaders/mutt { };
-  mutt-with-sidebar = mutt.override {
-    withSidebar = true;
-  };
+
   mutt-wizard = callPackage ../tools/misc/mutt-wizard { };
 
   mutt-ics = callPackage ../tools/networking/mutt-ics { };