From dd6b901a38c1b734cba404ed1295f4e3de61f8a6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 14 Mar 2022 14:36:37 +0100 Subject: [PATCH 1/4] qt515.qtwebengine: drop obsoleted patch regarding glibc2.34 compat It does not apply anymore, which makes the build fail. --- pkgs/development/libraries/qt-5/5.15/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 74b92dda1df2..5943a80a701e 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -56,13 +56,7 @@ let qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; - qtwebengine = [ - # glibc 2.34 compat - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/d122c011631137b79455850c363676c655cf9e09/f/qtwebengine-everywhere-src-5.15.5-SIGSTKSZ.patch"; - sha256 = "sha256-1zS7nvbe5ZVuW/wSNOUBc2Qz0aB483Kfnz1JbzKEI+M="; - }) - ] ++ lib.optionals stdenv.isDarwin [ + qtwebengine = lib.optionals stdenv.isDarwin [ ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-mac-dont-set-dsymutil-path.patch ]; From 56f739973423c00f655192aa1b2559e885c5496a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Mar 2022 06:54:09 +0000 Subject: [PATCH 2/4] btrfs-progs: 5.16.1 -> 5.16.2 --- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index c51cc12da36b..fad1944c4a0e 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.16.1"; + version = "5.16.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-PaTaU2HPhr3dqA7bTE8w6gdstOvsKZBPoIr8kw754ag="; + sha256 = "sha256-npswOh0P2c6q8gTudMHI+h/VV5TiI9n+K8Yodey9U9I="; }; nativeBuildInputs = [ From 35e2c61dfd57be97b3df2c8de76d959a7908e1ad Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 23 Mar 2022 08:04:28 +0000 Subject: [PATCH 3/4] systemd: 250.3 -> 250.4 Among other things fixes build failure on linux-headers-5.17: ../src/basic/meson.build:389:8: ERROR: Problem encountered: found unknown filesystem(s) defined in kernel headers: Filesystem found in kernel header but not in filesystems-gperf.gperf: CIFS_SUPER_MAGIC Filesystem found in kernel header but not in filesystems-gperf.gperf: SMB2_SUPER_MAGIC --- pkgs/os-specific/linux/systemd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index fda8092ec98f..691b4587fa1f 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -127,7 +127,7 @@ assert withCryptsetup -> (cryptsetup != null); let wantCurl = withRemote || withImportd; wantGcrypt = withResolved || withImportd; - version = "250.3"; + version = "250.4"; # Bump this variable on every (major) version change. See below (in the meson options list) for why. # command: @@ -144,7 +144,7 @@ stdenv.mkDerivation { owner = "systemd"; repo = "systemd-stable"; rev = "v${version}"; - sha256 = "sha256-O1XE0BhIuDAlFVX7WIy02M9YTIxLX0Q8atJAYsUgQDQ="; + sha256 = "sha256-AdzPh7dGVrGbbjL9+PqytQOpRzNDUUEftmKZAbFH3L4="; }; # On major changes, or when otherwise required, you *must* reformat the patches, From bf65cd57cae8ecd513fe024389b03207532a7c12 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 23 Mar 2022 21:11:55 +0100 Subject: [PATCH 4/4] python3Packages.convertdate: disable on older Python releases --- .../python-modules/convertdate/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/convertdate/default.nix b/pkgs/development/python-modules/convertdate/default.nix index cb47546055ec..b20066c51d8b 100644 --- a/pkgs/development/python-modules/convertdate/default.nix +++ b/pkgs/development/python-modules/convertdate/default.nix @@ -1,23 +1,24 @@ { lib , buildPythonPackage -, isPy27 , fetchFromGitHub , pymeeus , pytz , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "convertdate"; version = "2.4.0"; - disabled = isPy27; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # Tests are not available in the PyPI tarball so use GitHub instead. src = fetchFromGitHub { owner = "fitnr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iOHK3UJulXJJR50nhiVgfk3bt+CAtG3BRySJ8DkBuJE="; + hash = "sha256-iOHK3UJulXJJR50nhiVgfk3bt+CAtG3BRySJ8DkBuJE="; }; propagatedBuildInputs = [ @@ -29,11 +30,13 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "convertdate" ]; + pythonImportsCheck = [ + "convertdate" + ]; meta = with lib; { - homepage = "https://github.com/fitnr/convertdate"; description = "Utils for converting between date formats and calculating holidays"; + homepage = "https://github.com/fitnr/convertdate"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; };