From b2d9d9928f75bfa2b3135b699e0433e34529397d Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 22 Apr 2023 09:09:23 +0200 Subject: [PATCH 01/32] cargo-llvm-cov: 0.5.16 -> 0.5.17 Signed-off-by: Matthias Beyer --- pkgs/development/tools/rust/cargo-llvm-cov/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index 1808440ab33a..97806055096f 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-cov"; - version = "0.5.16"; + version = "0.5.17"; src = fetchzip { url = "https://crates.io/api/v1/crates/${pname}/${version}/download#${pname}-${version}.tar.gz"; - sha256 = "sha256-aVvYQ9/04juse89EzYY6f9HEwRHjZxbDnuJpX6jzlbc="; + sha256 = "sha256-kU8Wq0BRE/Tajmi/PV6dja9HJy0lbZwzGuMIXDnFUw0="; }; - cargoSha256 = "sha256-dxKtOWhHSZdr5RNQ+w+CXFHN+oQXUmSQ7w9i9IO7Q6I="; + cargoSha256 = "sha256-Zv6CkUhMTMqGM8PH+ciDV20vq88tU5THSw0NByO1v70="; # skip tests which require llvm-tools-preview checkFlags = [ From 97666f3ae0584b7c2dddc70fe7f962b5f4d995d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 22 Apr 2023 10:14:47 +0000 Subject: [PATCH 02/32] mapserver: 8.0.0 -> 8.0.1 --- pkgs/servers/geospatial/mapserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/geospatial/mapserver/default.nix b/pkgs/servers/geospatial/mapserver/default.nix index ac8af5b7de0c..d131d331c763 100644 --- a/pkgs/servers/geospatial/mapserver/default.nix +++ b/pkgs/servers/geospatial/mapserver/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "mapserver"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "MapServer"; repo = "MapServer"; rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; - sha256 = "sha256-t9tthHszqtbFEh50IhQMtBb9rD9tU3QbDlUsVRVkQ6U="; + sha256 = "sha256-fAf4kOe/6bQW0i46+EZbD/6iWI2Bjkn2no6XeR/+mg4="; }; nativeBuildInputs = [ From fd42fb3bdb5dc4ed295fee9c3b7882f79df04871 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 22 Apr 2023 18:26:27 +0800 Subject: [PATCH 03/32] cargo-llvm-cov: use fetchCrate --- pkgs/development/tools/rust/cargo-llvm-cov/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index 97806055096f..64d6e70a0f50 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchzip +, fetchCrate , rustPlatform }: @@ -8,8 +8,8 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-cov"; version = "0.5.17"; - src = fetchzip { - url = "https://crates.io/api/v1/crates/${pname}/${version}/download#${pname}-${version}.tar.gz"; + src = fetchCrate { + inherit pname version; sha256 = "sha256-kU8Wq0BRE/Tajmi/PV6dja9HJy0lbZwzGuMIXDnFUw0="; }; cargoSha256 = "sha256-Zv6CkUhMTMqGM8PH+ciDV20vq88tU5THSw0NByO1v70="; From 97bc2824dce24e31df459b20921688faf79f6e79 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Apr 2023 08:08:31 +0200 Subject: [PATCH 04/32] python310Packages.enaml: add changelog to meta --- pkgs/development/python-modules/enaml/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix index e53b38d04e91..9bf3fe1b56a5 100644 --- a/pkgs/development/python-modules/enaml/default.nix +++ b/pkgs/development/python-modules/enaml/default.nix @@ -53,8 +53,9 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; meta = with lib; { - homepage = "https://github.com/nucleic/enaml"; description = "Declarative User Interfaces for Python"; + homepage = "https://github.com/nucleic/enaml"; + changelog = "https://github.com/nucleic/enaml/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ raboof ]; }; From e34a17ca0a5295b5448882c6ec28130c7c24a544 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Apr 2023 08:10:57 +0200 Subject: [PATCH 05/32] python310Packages.enaml: add pegen - update ordering --- .../python-modules/enaml/default.nix | 47 +++++++++++-------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix index 9bf3fe1b56a5..cdbe4ab05912 100644 --- a/pkgs/development/python-modules/enaml/default.nix +++ b/pkgs/development/python-modules/enaml/default.nix @@ -1,14 +1,15 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, setuptools-scm , atom -, ply -, kiwisolver -, qtpy -, sip_4 -, cppy +, buildPythonPackage , bytecode +, cppy +, fetchFromGitHub +, kiwisolver +, pegen +, ply +, qtpy +, setuptools-scm +, sip_4 }: buildPythonPackage rec { @@ -22,6 +23,24 @@ buildPythonPackage rec { hash = "sha256-0W5FWGS4vu5+O6/C4El60QDsRNj+P4xGQ62NdkfJd5I="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + atom + bytecode + cppy + kiwisolver + pegen + ply + qtpy + sip_4 + ]; + + # qt bindings cannot be found during tests doCheck = false; @@ -40,18 +59,6 @@ buildPythonPackage rec { "enaml.workbench" ]; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ - atom - ply - kiwisolver - qtpy - sip_4 - cppy - bytecode - ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - meta = with lib; { description = "Declarative User Interfaces for Python"; homepage = "https://github.com/nucleic/enaml"; From 5171e6a356467585a40d8e1b09ae983ab9bb001d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Apr 2023 08:16:25 +0200 Subject: [PATCH 06/32] python310Packages.enaml: disable on unsupported Python releases - add format --- pkgs/development/python-modules/enaml/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix index cdbe4ab05912..6d6d596e80b4 100644 --- a/pkgs/development/python-modules/enaml/default.nix +++ b/pkgs/development/python-modules/enaml/default.nix @@ -8,13 +8,18 @@ , pegen , ply , qtpy +, setuptools , setuptools-scm +, pythonOlder , sip_4 }: buildPythonPackage rec { pname = "enaml"; version = "0.16.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "nucleic"; @@ -26,6 +31,7 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ + setuptools setuptools-scm ]; @@ -40,7 +46,6 @@ buildPythonPackage rec { sip_4 ]; - # qt bindings cannot be found during tests doCheck = false; From 7d9fe0a83587bfb7ac0932a1ab662fac496f83c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Apr 2023 08:31:31 +0200 Subject: [PATCH 07/32] python310Packages.pegen: init at 0.2.0 --- .../python-modules/pegen/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/pegen/default.nix diff --git a/pkgs/development/python-modules/pegen/default.nix b/pkgs/development/python-modules/pegen/default.nix new file mode 100644 index 000000000000..bc88e02a642e --- /dev/null +++ b/pkgs/development/python-modules/pegen/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "pegen"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "we-like-parsers"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-5nxOMgkDAkHtVFSNXf0SPoag6/E7b97eVnFoAqyJE3g="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pegen" + ]; + + meta = with lib; { + description = "Library to generate PEG parsers"; + homepage = "https://github.com/we-like-parsers/pegen"; + changelog = "https://github.com/we-like-parsers/pegen/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8a784017465c..f6af5c709edb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7191,6 +7191,8 @@ self: super: with self; { peaqevcore = callPackage ../development/python-modules/peaqevcore { }; + pegen = callPackage ../development/python-modules/pegen { }; + pebble = callPackage ../development/python-modules/pebble { }; pecan = callPackage ../development/python-modules/pecan { }; From 2f54a3bcef6c3a7be14f5984940f7d4546f01f0f Mon Sep 17 00:00:00 2001 From: Jan Schmitt Date: Tue, 18 Apr 2023 14:06:59 +0200 Subject: [PATCH 08/32] phpunit: enable for all platforms --- pkgs/development/tools/misc/phpunit/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/phpunit/default.nix b/pkgs/development/tools/misc/phpunit/default.nix index e640209e9f64..8a75ecafe954 100644 --- a/pkgs/development/tools/misc/phpunit/default.nix +++ b/pkgs/development/tools/misc/phpunit/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation { homepage = "https://phpunit.de"; changelog = "https://github.com/sebastianbergmann/phpunit/blob/${version}/ChangeLog-${lib.versions.majorMinor version}.md"; maintainers = with maintainers; [ onny ] ++ teams.php.members; + platforms = platforms.all; }; } From 547cd3cfd122c8ac59f50b2d4e7704087fce2232 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 23 Apr 2023 00:29:01 +0200 Subject: [PATCH 09/32] python310Packages.pyroute2: 0.7.5 -> 0.7.7 Changelog: https://github.com/svinota/pyroute2/blob/0.7.7/CHANGELOG.rst --- .../python-modules/pyroute2/default.nix | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 908fb0c8a0ae..a9d95e8e45a5 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.7.5"; + version = "0.7.7"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Husvo+JUM1ffCpN6cAxbZ2GyqlKEQArtRiBkcP5cC+U="; + hash = "sha256-j0mxWXwPbjD/W2wdqh17L0FP2eREI8IusLL9cuySGAY="; }; nativeBuildInputs = [ @@ -34,20 +34,21 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyroute2" - "pr2modules.common" - "pr2modules.config" - "pr2modules.ethtool" - "pr2modules.ipdb" - "pr2modules.ipset" - "pr2modules.ndb" - "pr2modules.nftables" - "pr2modules.nslink" - "pr2modules.protocols" + "pyroute2.common" + "pyroute2.config" + "pyroute2.ethtool" + "pyroute2.ipdb" + "pyroute2.ipset" + "pyroute2.ndb" + "pyroute2.nftables" + "pyroute2.nslink" + "pyroute2.protocols" ]; meta = with lib; { description = "Python Netlink library"; homepage = "https://github.com/svinota/pyroute2"; + changelog = "https://github.com/svinota/pyroute2/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; maintainers = with maintainers; [ fab mic92 ]; platforms = platforms.unix; From 9ac500b2b34d34c2258a3dca3f5ecf5037168477 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 23 Apr 2023 00:59:41 +0000 Subject: [PATCH 10/32] =?UTF-8?q?gnome.eog:=2044.0=20=E2=86=92=2044.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/eog/-/compare/44.0...44.1 --- pkgs/desktops/gnome/core/eog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix index 4613df1caf31..1c244d089c63 100644 --- a/pkgs/desktops/gnome/core/eog/default.nix +++ b/pkgs/desktops/gnome/core/eog/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "44.0"; + version = "44.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-QdhfqwXEMImNv9hH5I4fW0k13Dy87lRudZqQftpnEFQ="; + sha256 = "sha256-4slj8jL+WhCR3MGL7CWnMOkbAq9uRmYB76VeUAzXTKs="; }; patches = [ From fd00edb3997226ec56c4de475847f1072c4b9b61 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 23 Apr 2023 01:00:37 +0000 Subject: [PATCH 11/32] =?UTF-8?q?gnome.gnome-calendar:=2044.0=20=E2=86=92?= =?UTF-8?q?=2044.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-calendar/-/compare/44.0...44.1 --- pkgs/desktops/gnome/apps/gnome-calendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix index 7c7b14b23e30..3cd8ef3ba313 100644 --- a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "44.0"; + version = "44.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "lqzXTL9FZSk0UVzDRHo7iV6TP4YyTKkkNvZ93WPDqAI="; + sha256 = "MKG3OLZwvRJORiRo5nEYf8DbpbnuKvao69nnh0vzt34="; }; nativeBuildInputs = [ From f057d60a1d6b0638c15cbe5ed281d294d784469d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 23 Apr 2023 01:02:13 +0000 Subject: [PATCH 12/32] =?UTF-8?q?gnome.gnome-remote-desktop:=2044.0=20?= =?UTF-8?q?=E2=86=92=2044.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/compare/44.0...44.1 --- pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index 32d1b6a07224..10a24bf2ff52 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "44.0"; + version = "44.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-9+UIjBj9sIaQrgNL92oa6tWafc0Xsm4ffJl1SAUQoP0="; + hash = "sha256-0RB+r47hNai/8Yqv1dDtTomLEoQdBLmZxUHZ1LJO9iM="; }; nativeBuildInputs = [ From a45bbf6c9b079d454781576a7e066a07586fcb61 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 23 Apr 2023 01:04:36 +0000 Subject: [PATCH 13/32] =?UTF-8?q?gnome.rygel:=200.42.2=20=E2=86=92=200.42.?= =?UTF-8?q?3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/rygel/-/compare/rygel-0.42.2...rygel-0.42.3 --- pkgs/desktops/gnome/core/rygel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/rygel/default.nix b/pkgs/desktops/gnome/core/rygel/default.nix index b9491a236dfd..6fe843282614 100644 --- a/pkgs/desktops/gnome/core/rygel/default.nix +++ b/pkgs/desktops/gnome/core/rygel/default.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation rec { pname = "rygel"; - version = "0.42.2"; + version = "0.42.3"; # TODO: split out lib outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "FYHjkw9dOv4XSHLJawoc014UJ5VCUffnMs5iZlOBioc="; + sha256 = "D97CEoU36LVcPFQNCoDcfCSaspFT9L4Bl6XzECWlpaA="; }; patches = [ From 2ddb47d131d5aafbc30e4a0190ea569db9b661e6 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 23 Apr 2023 01:12:27 +0000 Subject: [PATCH 14/32] =?UTF-8?q?shotwell:=200.31.7=20=E2=86=92=200.32.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/shotwell/-/compare/shotwell-0.31.7...shotwell-0.32.0 --- pkgs/applications/graphics/shotwell/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 623a8d783f76..c326b9725b8e 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch2 , meson , ninja , gtk3 @@ -42,22 +41,13 @@ stdenv.mkDerivation rec { pname = "shotwell"; - version = "0.31.7"; + version = "0.32.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-gPCj2HVS+L3vpeNig77XZ9AFdtqMyWpEo9NKQjXEmeA="; + sha256 = "sha256-F3Ky+h56VHnVKAKLyaMD8oVeHZWaWzyReSLmOpipCxk="; }; - patches = [ - # Fix build with vala 0.56.4, can be removed on next update - # https://gitlab.gnome.org/GNOME/shotwell/-/merge_requests/69 - (fetchpatch2 { - url = "https://gitlab.gnome.org/GNOME/shotwell/-/commit/cd82759231e5ece2fa0dea40397c9051d15fd5c2.patch"; - hash = "sha256-Vy2kvUlmPdEEuPB1RTcI5pGYNveeiQ+lId0YVlWo4wU="; - }) - ]; - nativeBuildInputs = [ meson ninja From 100e4784659cdb6ea81f872c19d4cc4031578abd Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 19 Apr 2023 14:13:39 +0800 Subject: [PATCH 15/32] deepin.dtkcommon: 5.6.3 -> 5.6.9 --- pkgs/desktops/deepin/library/dtkcommon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/library/dtkcommon/default.nix b/pkgs/desktops/deepin/library/dtkcommon/default.nix index 24e22e99c502..a0845277355e 100644 --- a/pkgs/desktops/deepin/library/dtkcommon/default.nix +++ b/pkgs/desktops/deepin/library/dtkcommon/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "dtkcommon"; - version = "5.6.3"; + version = "5.6.9"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-9gFJ0Uun0q/XVaegxTUu4Kkc+/GE09eAV68VZgWurrM="; + sha256 = "sha256-FHXwgFTevCGTNUPlb/oeltE2//Sjwz7YVvko7QPOsRo="; }; nativeBuildInputs = [ From 6bbb08f744862d21f29dadd2807afff8047e70a6 Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 19 Apr 2023 14:30:51 +0800 Subject: [PATCH 16/32] deepin.dtkcore: 5.6.3 -> 5.6.10 --- .../deepin/library/dtkcore/default.nix | 35 +++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/deepin/library/dtkcore/default.nix b/pkgs/desktops/deepin/library/dtkcore/default.nix index 282d079570d3..3ca5622d197c 100644 --- a/pkgs/desktops/deepin/library/dtkcore/default.nix +++ b/pkgs/desktops/deepin/library/dtkcore/default.nix @@ -1,23 +1,29 @@ { stdenv , lib , fetchFromGitHub -, pkg-config , cmake -, gsettings-qt +, pkg-config +, qttools +, doxygen , wrapQtAppsHook +, qtbase +, gsettings-qt , lshw +, libuchardet , dtkcommon +, systemd +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd }: stdenv.mkDerivation rec { pname = "dtkcore"; - version = "5.6.3"; + version = "5.6.10"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-DEpo/eKMjtTVGEkq5JofkRNSHtTOZ1t2QNjrdulUtPQ="; + sha256 = "sha256-ge8DiJMSaZo7GeQEgnDbi5SLsLxtOQ/P5/9aBgaG7Ds="; }; postPatch = '' @@ -28,23 +34,40 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config + qttools + doxygen wrapQtAppsHook ]; buildInputs = [ + qtbase gsettings-qt lshw - ]; + libuchardet + ] + ++ lib.optional withSystemd systemd; propagatedBuildInputs = [ dtkcommon ]; cmakeFlags = [ "-DDVERSION=${version}" - "-DBUILD_DOCS=OFF" + "-DBUILD_EXAMPLES=OFF" + "-DBUILD_DOCS=ON" + "-DQCH_INSTALL_DESTINATION=${qtbase.qtDocPrefix}" "-DDSG_PREFIX_PATH='/run/current-system/sw'" "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DD_DSG_APP_DATA_FALLBACK=/var/dsg/appdata" + "-DBUILD_WITH_SYSTEMD=${if withSystemd then "ON" else "OFF"}" ]; + preConfigure = '' + # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" + # A workaround is to set QT_PLUGIN_PATH explicitly + export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix} + ''; + meta = with lib; { description = "Deepin tool kit core library"; homepage = "https://github.com/linuxdeepin/dtkcore"; From 8f7d0e6ab29fb4acd2474ab5eaf3017952b0e3ea Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 19 Apr 2023 14:37:01 +0800 Subject: [PATCH 17/32] deepin.dtkgui: 5.6.3 -> 5.6.10 --- .../deepin/library/dtkgui/default.nix | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/deepin/library/dtkgui/default.nix b/pkgs/desktops/deepin/library/dtkgui/default.nix index b408055b0c37..5112feffd9ec 100644 --- a/pkgs/desktops/deepin/library/dtkgui/default.nix +++ b/pkgs/desktops/deepin/library/dtkgui/default.nix @@ -4,36 +4,42 @@ , pkg-config , cmake , qttools +, doxygen , wrapQtAppsHook -, librsvg -, lxqt +, qtbase , dtkcore , qtimageformats +, lxqt +, librsvg , freeimage +, libraw }: stdenv.mkDerivation rec { pname = "dtkgui"; - version = "5.6.3"; + version = "5.6.10"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-r6ZwGPiK6CcKEg8RoHV07wJbQI3idJFV3WFtuKim8n4="; + sha256 = "sha256-4NHt/hLtt99LhWvBX9e5ueB5G86SXx553G6fyHZBXcE="; }; nativeBuildInputs = [ cmake qttools + doxygen pkg-config wrapQtAppsHook ]; buildInputs = [ + qtbase lxqt.libqtxdg librsvg freeimage + libraw ]; propagatedBuildInputs = [ @@ -43,10 +49,19 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DDVERSION=${version}" - "-DBUILD_DOCS=OFF" + "-DBUILD_DOCS=ON" + "-DQCH_INSTALL_DESTINATION=${qtbase.qtDocPrefix}" "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" ]; + preConfigure = '' + # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" + # A workaround is to set QT_PLUGIN_PATH explicitly + export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix} + ''; + meta = with lib; { description = "Deepin Toolkit, gui module for DDE look and feel"; homepage = "https://github.com/linuxdeepin/dtkgui"; From b62a9507791712c6a7ca47b1294db8e3d6644b49 Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 19 Apr 2023 14:43:21 +0800 Subject: [PATCH 18/32] deepin.dtkwidget: 5.6.3 -> 5.6.10 --- .../deepin/library/dtkwidget/default.nix | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/deepin/library/dtkwidget/default.nix b/pkgs/desktops/deepin/library/dtkwidget/default.nix index 170ae821eba2..65c556d77b74 100644 --- a/pkgs/desktops/deepin/library/dtkwidget/default.nix +++ b/pkgs/desktops/deepin/library/dtkwidget/default.nix @@ -1,14 +1,16 @@ { stdenv , lib , fetchFromGitHub -, dtkgui -, pkg-config , cmake +, pkg-config , qttools +, doxygen +, wrapQtAppsHook +, dtkgui +, qtbase , qtmultimedia , qtsvg , qtx11extras -, wrapQtAppsHook , cups , gsettings-qt , libstartup_notification @@ -17,13 +19,13 @@ stdenv.mkDerivation rec { pname = "dtkwidget"; - version = "5.6.3"; + version = "5.6.10"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-APk2p8pdLsaKvPp95HtEI1F1LM4ySUL+fhGsC5vHasU="; + sha256 = "sha256-PhVK/lUFrDW1bn9lUhLuKWLAVj7E7+/YC5USShrg3ds="; }; postPatch = '' @@ -35,11 +37,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake qttools + doxygen pkg-config wrapQtAppsHook ]; buildInputs = [ + qtbase qtmultimedia qtsvg qtx11extras @@ -53,10 +57,19 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DDVERSION=${version}" - "-DBUILD_DOCS=OFF" + "-DBUILD_DOCS=ON" + "-DQCH_INSTALL_DESTINATION=${qtbase.qtDocPrefix}" "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" ]; + preConfigure = '' + # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" + # A workaround is to set QT_PLUGIN_PATH explicitly + export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix} + ''; + meta = with lib; { description = "Deepin graphical user interface library"; homepage = "https://github.com/linuxdeepin/dtkwidget"; From 9431b2a0f064e6219ae9302160a11e5fe599b272 Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 19 Apr 2023 14:53:11 +0800 Subject: [PATCH 19/32] deepin.qt5integration: 5.6.4 -> 5.6.6 --- pkgs/desktops/deepin/library/qt5integration/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/library/qt5integration/default.nix b/pkgs/desktops/deepin/library/qt5integration/default.nix index b3e5a189135c..426cb091a32c 100644 --- a/pkgs/desktops/deepin/library/qt5integration/default.nix +++ b/pkgs/desktops/deepin/library/qt5integration/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "qt5integration"; - version = "5.6.4"; + version = "5.6.6"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-MZkhTvjTyBrlntgFq2F3iGK7WvfmnGJQLk5B1OM5kQo="; + sha256 = "sha256-7b18ydyy/TIEGDkFAoium1LSx3Qs4I4pYpMfehOBZbY="; }; nativeBuildInputs = [ From 6d6d177020b6d05aaf1f603215c5a1561311bbfd Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 19 Apr 2023 14:56:39 +0800 Subject: [PATCH 20/32] deepin.qt5platform-plugins: 5.6.5 -> 5.6.9 --- pkgs/desktops/deepin/library/qt5platform-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix index 272a7b9d8700..1255bdb1534a 100644 --- a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix +++ b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "qt5platform-plugins"; - version = "5.6.5"; + version = "5.6.9"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-DHgnfJTUw1hY53DmDfzVFM6Ff8q6pbNDPmPeSsV7MwY="; + sha256 = "sha256-EG5M4rcMK62DX4ywm2IH0lGHC510BnMqcefMlF9pyr8="; }; nativeBuildInputs = [ From 642f20cae1ebf9e9495d0154adc6922ea30ada7d Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 19 Apr 2023 15:32:48 +0800 Subject: [PATCH 21/32] deepin.dde-launcher: fix build with new dtk --- pkgs/desktops/deepin/core/dde-launcher/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/desktops/deepin/core/dde-launcher/default.nix b/pkgs/desktops/deepin/core/dde-launcher/default.nix index cd73cf8dc7e0..7d850c544d53 100644 --- a/pkgs/desktops/deepin/core/dde-launcher/default.nix +++ b/pkgs/desktops/deepin/core/dde-launcher/default.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { }; postPatch = '' + #fix build with new dtk(https://github.com/linuxdeepin/dde-launcher/pull/369) + substituteInPlace src/windowedframe.h \ + --replace "#include " " " substituteInPlace src/boxframe/{backgroundmanager.cpp,boxframe.cpp} \ --replace "/usr/share/backgrounds" "/run/current-system/sw/share/backgrounds" substituteInPlace dde-launcher.desktop dde-launcher-wapper src/dbusservices/com.deepin.dde.Launcher.service \ From 3da8641170ae8ec6afc5dd54ceba1eb40636518f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Apr 2023 03:05:32 +0000 Subject: [PATCH 22/32] terragrunt: 0.45.2 -> 0.45.4 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 2fc75004cd0d..a5fb59b3bc49 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.45.2"; + version = "0.45.4"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-elaCrClNLTw3YiEjygwJxjiqYlp7BWwjvdIYDx5rWE8="; + hash = "sha256-rqMi+rBWOWoJeoOBpBPKp1lFKzZlWQJfShN5Uyxb5eM="; }; vendorHash = "sha256-eY9YwXSIOrXbVWUIfVrUIRso1F5weBGKbPFv43k8t2Y="; From cc3a18251f7fcf789f1cc457c7b2074ca79f5b6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 22 Apr 2023 20:13:05 -0700 Subject: [PATCH 23/32] python310Packages.sense-energy: 0.11.1 -> 0.11.2 Diff: https://github.com/scottbonline/sense/compare/refs/tags/0.11.1...0.11.2 Changelog: https://github.com/scottbonline/sense/releases/tag/0.11.2 --- .../python-modules/sense-energy/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sense-energy/default.nix b/pkgs/development/python-modules/sense-energy/default.nix index a0855cd3f0f7..61f1477c7c51 100644 --- a/pkgs/development/python-modules/sense-energy/default.nix +++ b/pkgs/development/python-modules/sense-energy/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchFromGitHub , aiohttp +, async-timeout +, orjson , pythonOlder , requests , websocket-client @@ -10,7 +12,7 @@ buildPythonPackage rec { pname = "sense-energy"; - version = "0.11.1"; + version = "0.11.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,15 +21,18 @@ buildPythonPackage rec { owner = "scottbonline"; repo = "sense"; rev = "refs/tags/${version}"; - hash = "sha256-lfqQelAHh/xJH1jPz3JK32AIEA7ghUP6Mnya2M34V/w="; + hash = "sha256-i6XI6hiQTOGHB4KcDgz/MlYAhdEKaElLfNMq2R0fgu8="; }; postPatch = '' - sed -i '/download_url/d' setup.py + substituteInPlace setup.py \ + --replace "{{VERSION_PLACEHOLDER}}" "${version}" ''; propagatedBuildInputs = [ aiohttp + async-timeout + orjson requests websocket-client websockets From e90dd763e10a56debe6c377c066210f4cea61646 Mon Sep 17 00:00:00 2001 From: rewine Date: Sun, 23 Apr 2023 11:27:33 +0800 Subject: [PATCH 24/32] deepin-system-monitor: 5.9.32 -> 5.9.33 --- pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix index 2a499b428898..c3ff184d9197 100644 --- a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "deepin-system-monitor"; - version = "5.9.32"; + version = "5.9.33"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-jze5Pigk4edjojmpNNwaVVfcpk5Aed/S0y9YE0HdC0A"; + sha256 = "sha256-X7/YwnJyA/HOLsOGARjsHWgL2qxW1eU1TvoWulvz0j4="; }; postPatch = '' From 25e3d8fc97cd3f7f711a5134b5acdd515bd9f4f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 22 Apr 2023 20:21:05 -0700 Subject: [PATCH 25/32] python310Packages.docformatter: 1.6.0 -> 1.6.2 Diff: https://github.com/PyCQA/docformatter/compare/refs/tags/v1.6.0...v1.6.2 Changelog: https://github.com/PyCQA/docformatter/releases/tag/v1.6.1 https://github.com/PyCQA/docformatter/releases/tag/v1.6.2 --- pkgs/development/python-modules/docformatter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docformatter/default.nix b/pkgs/development/python-modules/docformatter/default.nix index 2415a0a528f6..cc3fecb63ee7 100644 --- a/pkgs/development/python-modules/docformatter/default.nix +++ b/pkgs/development/python-modules/docformatter/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "docformatter"; - version = "1.6.0"; + version = "1.6.2"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-CzfJk8EkUKPGIJwaDC/IT4CDCJpQI7XEZFnH+RahURI="; + hash = "sha256-fQm+eMA1p7uCVgQ3Hbm3UY1mhROsThtgkjRRPg3XcsI="; }; patches = [ From e5aabf059e02038674b09b8c161bac2fcbf8823d Mon Sep 17 00:00:00 2001 From: Artturi Date: Fri, 21 Apr 2023 22:18:33 +0300 Subject: [PATCH 26/32] Merge #227471: texinfo: apply gnulib patch only to version 6.7 (cherry picked from commit db3ab32a6982d2afcbbec29cdd99249753d40aea) Fixes build of version 6.5: https://hydra.nixos.org/build/216602149 --- pkgs/development/tools/misc/texinfo/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index 51df8c555e63..364f9b148d8c 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { # This patch is needed for IEEE-standard long doubles on # powerpc64; it does not apply cleanly to texinfo 5.x or # earlier. It is merged upstream in texinfo 6.8. - + lib.optionalString (with lib.strings; versionAtLeast version "6.0" && versionOlder version "6.8") '' + + lib.optionalString (version == "6.7") '' patch -p1 -d gnulib < ${gnulib.passthru.longdouble-redirect-patch} ''; From 44548422375dd0cd990af3e8191f232ed20cf250 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Apr 2023 07:21:51 +0000 Subject: [PATCH 27/32] tun2socks: 2.4.1 -> 2.5.0 --- pkgs/tools/networking/tun2socks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/tun2socks/default.nix b/pkgs/tools/networking/tun2socks/default.nix index 7706ff8e8886..2dfbba299dee 100644 --- a/pkgs/tools/networking/tun2socks/default.nix +++ b/pkgs/tools/networking/tun2socks/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tun2socks"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "xjasonlyu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FBYRqxS8DJbIc8j8X6WNxl6a1YRcNrPSnNfrq/Y0fMM="; + sha256 = "sha256-uu0FBhckZ06eXEEuKwN3MopGMDbMjjcABYa/lgM48n4="; }; - vendorSha256 = "sha256-XWzbEtYd8h63QdpAQZTGxyxMAAnpKO9Fp4y8/eeZ7Xw="; + vendorHash = "sha256-QIXgRoxmJaeYGx77EB53zIb94InlQbUSOXE+cUdBttI="; ldflags = [ "-w" "-s" "-buildid=" From e057b8492aa5985c38222e60d19cadf653e1d087 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 17 Apr 2023 21:18:55 +0200 Subject: [PATCH 28/32] libreoffice*: drop test which regressed on libxml2 update https://hydra.nixos.org/build/215973648/nixlog/6/tail (cherry picked from commit 9a0662c50374bdec6ed6029b2c33559f7623ed23) --- pkgs/applications/office/libreoffice/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index e7633cdde0df..25e8f18998e2 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -356,6 +356,9 @@ in sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlencryption.cxx" sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/odfexport/odfexport.cxx" sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/unowriter/unowriter.cxx" + + # testReqIfTable fails since libxml2: 2.10.3 -> 2.10.4 + sed -e 's@.*"/html/body/div/table/tr/th".*@//&@' -i sw/qa/extras/htmlexport/htmlexport.cxx '' # This to avoid using /lib:/usr/lib at linking + '' From 5ea90577ffedaa09a52b4979565f3850592ebe91 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 23 Apr 2023 09:57:33 +0200 Subject: [PATCH 29/32] python310Packages.docformatter: update disabled --- pkgs/development/python-modules/docformatter/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/docformatter/default.nix b/pkgs/development/python-modules/docformatter/default.nix index cc3fecb63ee7..11958148d879 100644 --- a/pkgs/development/python-modules/docformatter/default.nix +++ b/pkgs/development/python-modules/docformatter/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "docformatter"; version = "1.6.2"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; format = "pyproject"; From 31fc7838182b415b2ea37550167fcb1293e2ce21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Apr 2023 08:13:35 +0000 Subject: [PATCH 30/32] terrascan: 1.18.0 -> 1.18.1 --- pkgs/tools/security/terrascan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index fcd1487dfb5d..bb71c3134d88 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.18.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-EzdyJzUPoWcLux6RiEZL3DiB65T+pgY70bpD1fX1JN4="; + hash = "sha256-w0ZOkPw8Y6Z1hyZecZfjd/YrTP8v6S0jNhgNzLjMRrY="; }; - vendorHash = "sha256-yTndvnlCmXsQSpImcwuwSXB0WuF2naGJEHfU1iAJApM="; + vendorHash = "sha256-0WkOIgIA1fKn2SeS5QFeLGCGMstdlkU+eDRUVAs3ETA="; # Tests want to download a vulnerable Terraform project doCheck = false; From 513975ec4b1fc2293ffd48c984f0913817d78626 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 19 Apr 2023 18:44:28 +0000 Subject: [PATCH 31/32] systemd: disable libbpf if compiler-rt unsupported If we can't build compiler-rt, we can't have a clang for that platform. Example affected architecture: s390, which is useful for testing assumptions in Nixpkgs because it's a Linux architecture that we can't emulate. I've written buildPackages.targetPackages.llvmPackages even though it's the same thing as llvmPackages because of the comment in this file that warns people against relying on splicing for llvmPackages. Taking llvmPackages as an input directly would make it easier for people to make that mistake without seeing the comment. --- pkgs/os-specific/linux/systemd/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 81c1c801f96f..4b4f4f808547 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -100,6 +100,10 @@ , withLibBPF ? lib.versionAtLeast buildPackages.llvmPackages.clang.version "10.0" && (stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6") # assumes hard floats && !stdenv.hostPlatform.isMips64 # see https://github.com/NixOS/nixpkgs/pull/194149#issuecomment-1266642211 + # buildPackages.targetPackages.llvmPackages is the same as llvmPackages, + # but we do it this way to avoid taking llvmPackages as an input, and + # risking making it too easy to ignore the above comment about llvmPackages. + && lib.meta.availableOn stdenv.hostPlatform buildPackages.targetPackages.llvmPackages.compiler-rt , withLibidn2 ? true , withLocaled ? true , withLogind ? true From de4e75a79b0ba8fb0a4365ff4831da093cd91320 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 23 Apr 2023 04:36:47 -0700 Subject: [PATCH 32/32] cri-o: 1.26.3 -> 1.27.0 --- pkgs/applications/virtualization/cri-o/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index cd27ceef5ac8..7b5a26975f3b 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,15 +15,15 @@ buildGoModule rec { pname = "cri-o"; - version = "1.26.3"; + version = "1.27.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-mWhWL886lZggjow4xd02jbxaVl9PTEG24jiys4N19Lw="; + sha256 = "sha256-ZFt8KcEJ7iN2JgKbOGDgpq0+pjlxEU7V9GSX+c3VnbY="; }; - vendorSha256 = null; + vendorHash = null; doCheck = false;