From eaa981dcdcf2ce3789132ed04cb8d7279854526c Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Sat, 17 Sep 2022 12:21:09 +0100 Subject: [PATCH 1/9] mutt-with-sidebar: remove, mutt provides sidebar The sidebar patch has been included since 1.7.0 and is enabled by default in regular mutt. Move mutt-with-sidebar to aliases and let it provide regular mutt. --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6abfacc7d726..0df3ba637ae4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -913,6 +913,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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c094df38748b..93f189bb3aa8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29838,9 +29838,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 { }; From 12cbb4cd549a008a14f654e9f60d047ea4a2d7c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Sep 2022 15:20:46 +0200 Subject: [PATCH 2/9] python310Packages.pyvicare: 2.16.4 -> 2.17.0 --- pkgs/development/python-modules/pyvicare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index 7d75cf359d18..7a919bf0ec49 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/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; From 4de579f8c8b192e3a875ae84407076423f56953e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 17 Sep 2022 18:20:04 +0200 Subject: [PATCH 3/9] lnav: 0.10.1 -> 0.11.0 ChangeLog: https://github.com/tstack/lnav/releases/tag/v0.11.0 --- pkgs/tools/misc/lnav/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index d88ea9b750a3..bad9b5a3ceb5 100644 --- a/pkgs/tools/misc/lnav/default.nix +++ b/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; From 68fcdc4bc6f3dac1f64a45327eae1a0320b9059a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Sep 2022 20:18:31 +0200 Subject: [PATCH 4/9] python310Packages.pep440: 0.1.1 -> 0.1.2 --- pkgs/development/python-modules/pep440/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pep440/default.nix b/pkgs/development/python-modules/pep440/default.nix index 2bb4cdde5d20..ebaade39ce99 100644 --- a/pkgs/development/python-modules/pep440/default.nix +++ b/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" ]; From 6a149eeef35471de4466820de236af8ab1724db0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Sep 2022 23:28:28 +0200 Subject: [PATCH 5/9] python310Packages.crownstone-sse: 2.0.3 -> 2.0.4 --- pkgs/development/python-modules/crownstone-sse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/crownstone-sse/default.nix b/pkgs/development/python-modules/crownstone-sse/default.nix index 2c4226c6a3ef..7bde66a8a37e 100644 --- a/pkgs/development/python-modules/crownstone-sse/default.nix +++ b/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 = [ From 01462a9e8b0183759760cef16922365e79f4b2cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Sep 2022 01:18:36 +0000 Subject: [PATCH 6/9] python310Packages.gehomesdk: 0.5.6 -> 0.5.7 --- pkgs/development/python-modules/gehomesdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gehomesdk/default.nix b/pkgs/development/python-modules/gehomesdk/default.nix index 0acd9b6f104e..d1a9f146db79 100644 --- a/pkgs/development/python-modules/gehomesdk/default.nix +++ b/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 = [ From f12d2f016b6c69b702d89cc29eb50567d1088831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 18 Sep 2022 08:25:17 +0200 Subject: [PATCH 7/9] bpftools: decouple version from linux_latest bpftools causes way too many rebuilds nowadays, so its updates are not suitable for merging directly to nixpkgs master. We want to update linux_latest faster than that. --- pkgs/os-specific/linux/bpftools/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/bpftools/default.nix b/pkgs/os-specific/linux/bpftools/default.nix index 5a02a1022d59..b042654fede1 100644 --- a/pkgs/os-specific/linux/bpftools/default.nix +++ b/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.9"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "0dvzjbyknzlx4ndz77fsm6v28fj2chxbq1z85fbc3bckcscbbm8a"; + }; nativeBuildInputs = [ python3 bison flex ]; buildInputs = (if (lib.versionAtLeast version "5.20") From 192b63e2250cf015e3c0cb86f271b9732333fe31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 18 Sep 2022 08:26:51 +0200 Subject: [PATCH 8/9] bpftools: revert version to the one that's fully rebuilt That's before 9f80f6bfa96d (PR #191364). --- pkgs/os-specific/linux/bpftools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bpftools/default.nix b/pkgs/os-specific/linux/bpftools/default.nix index b042654fede1..640ab5f76a96 100644 --- a/pkgs/os-specific/linux/bpftools/default.nix +++ b/pkgs/os-specific/linux/bpftools/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "bpftools"; - version = "5.19.9"; + version = "5.19.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0dvzjbyknzlx4ndz77fsm6v28fj2chxbq1z85fbc3bckcscbbm8a"; + sha256 = "1kl7fifsa6vsm34xg3kd2svhx18n771hfj67nhwnlalmb9whhqv1"; }; nativeBuildInputs = [ python3 bison flex ]; From 34b08c6c3413bfbbd98453b5b5a298ede27bc084 Mon Sep 17 00:00:00 2001 From: Guanpeng Xu Date: Sun, 18 Sep 2022 14:08:51 +0800 Subject: [PATCH 9/9] mathematica: 13.0.1 -> 13.1.0 --- pkgs/applications/science/math/mathematica/generic.nix | 4 ++++ pkgs/applications/science/math/mathematica/versions.nix | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/pkgs/applications/science/math/mathematica/generic.nix b/pkgs/applications/science/math/mathematica/generic.nix index b081640c97d5..f8e6555d7632 100644 --- a/pkgs/applications/science/math/mathematica/generic.nix +++ b/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 diff --git a/pkgs/applications/science/math/mathematica/versions.nix b/pkgs/applications/science/math/mathematica/versions.nix index 8f056a234270..225ceb6e3b2d 100644 --- a/pkgs/applications/science/math/mathematica/versions.nix +++ b/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";