From 0b8ac7d2b31c339d8327a51aa16031b1a70179f7 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Thu, 8 Dec 2022 09:14:22 +0100 Subject: [PATCH 01/27] pythonPackages.cvelib: add version test --- pkgs/development/python-modules/cvelib/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/cvelib/default.nix b/pkgs/development/python-modules/cvelib/default.nix index 49b5c7590691..a1fc547ce767 100644 --- a/pkgs/development/python-modules/cvelib/default.nix +++ b/pkgs/development/python-modules/cvelib/default.nix @@ -6,6 +6,8 @@ , pytestCheckHook , pythonOlder , requests +, testers +, cve }: buildPythonPackage rec { @@ -38,10 +40,13 @@ buildPythonPackage rec { "cvelib" ]; + passthru.tests.version = testers.testVersion { package = cve; }; + meta = with lib; { description = "Library and a command line interface for the CVE Services API"; homepage = "https://github.com/RedHatProductSecurity/cvelib"; license = licenses.mit; maintainers = with maintainers; [ raboof ]; + mainProgram = "cve"; }; } From 84d7fbefcf76461e0928e6ab46649f754e17a891 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Dec 2022 20:26:05 +0000 Subject: [PATCH 02/27] stalonetray: 0.8.4 -> 0.8.5 --- pkgs/applications/window-managers/stalonetray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/stalonetray/default.nix b/pkgs/applications/window-managers/stalonetray/default.nix index 218b2a4fefd2..5cd0f7569caa 100644 --- a/pkgs/applications/window-managers/stalonetray/default.nix +++ b/pkgs/applications/window-managers/stalonetray/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "stalonetray"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "kolbusa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-grxPqSYPLUstLIOKqzMActaSQ2ftYrjbalfR4HcPDRY="; + sha256 = "sha256-/55oP6xA1LeLawOBkhh9acaDcObO4L4ojcy7e3vwnBw="; }; preConfigure = From 1880157ac18be8a1a7106691660fe7d5d6a11d70 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Sat, 28 May 2022 11:32:21 +0200 Subject: [PATCH 03/27] gbl: fix darwin-aarch64 build Compilation failed due to an old transitive dependency on 'ring', https://github.com/briansmith/ring/issues/1063. --- pkgs/tools/archivers/gbl/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/archivers/gbl/default.nix b/pkgs/tools/archivers/gbl/default.nix index b46d30a323e7..90c66e8ac7c5 100644 --- a/pkgs/tools/archivers/gbl/default.nix +++ b/pkgs/tools/archivers/gbl/default.nix @@ -22,15 +22,20 @@ rustPlatform.buildRustPackage rec { }; cargoPatches = [ - # Upstream does not include Cargo.lock, even though this is recommended for applications. - # This patch adds it. https://github.com/dac-gmbh/gbl/pull/62 + # update ring to fix building on Mac M1 + # https://github.com/dac-gmbh/gbl/pull/64 (fetchpatch { - url = "https://github.com/raboof/gbl/commit/99078da334c6e1ffd8189c691bbc711281fae5cc.patch"; - sha256 = "sha256-sAKkn4//8P87ZJ6NTHm2NUJH1sAFFwfrybv2QtQ3nnM="; + url = "https://github.com/raboof/gbl/commit/17e154d66932af59abe8677309792606b7f64c7d.patch"; + sha256 = "sha256-5Itoi86Q+9FzSTtnggODKPwwYPp5BpIVgR2vYMLHBts="; + }) + # Upstream does not include Cargo.lock, even though this is recommended for applications. + (fetchpatch { + url = "https://github.com/raboof/gbl/commit/9423d36ee3168bca8db7a7cb65611dc7ddc2daf0.patch"; + sha256 = "sha256-zwHXgUVkAYiQs/AT/pINnZoECoXzh+9astWMYENGTL8="; }) ]; - cargoSha256 = "sha256-RUZ6wswRtV8chq3+bY9LTRf6IYMbZ9/GPl2X5UcF7d8="; + cargoSha256 = "sha256-CeGLSseKUe2XudRqZm5Y7o7ZLDtDBg/MFunOGqxFZGM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; @@ -44,10 +49,8 @@ rustPlatform.buildRustPackage rec { Utility to read, create and manipulate `.gbl` firmware update files targeting the Silicon Labs Gecko Bootloader. ''; - homepage = "https://github.com/dac-gmbh/gbl"; + homepage = "https://github.com/jonas-schievink/gbl"; license = licenses.mit; maintainers = [ maintainers.raboof ]; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } From 9383b34f0439a1aa438fb5536c9e85530ab559fd Mon Sep 17 00:00:00 2001 From: EsAu79p Date: Wed, 4 Jan 2023 12:50:34 +0100 Subject: [PATCH 04/27] anki-bin: 2.1.54 -> 2.1.55 --- pkgs/games/anki/bin.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 82064325ab5f..cdec20572bd9 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -3,22 +3,22 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "2.1.54"; + version = "2.1.55"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - sha256 = "sha256-NFhgVd4ctEsh7iaSZ9v0OMszd81H41eq+y+FRIhcCtE="; + sha256 = "sha256-fi7efWBZZnqOEztVOhOsfspcTBDxqw2Rr/eAGMFYbAU="; }; # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version darwin-x86_64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg"; - sha256 = "sha256-kus59Z9Oe4sbAlF4szeg751hlSEUR0ijKz4rjfHEWgA="; + sha256 = "sha256-+Ceo03bMNnDQWgDmF1MIlrTQyHaJUKG8gF1/+ZEFCYw="; }; darwin-aarch64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - sha256 = "sha256-ROIpGB3W21ttWj+cRkf0rpLFrO4LR6+ZyGRsalz5J+E="; + sha256 = "sha256-3ppE+APPUJ6H/ud67KNwfQJnFCa7g7Hdxx4oZD0ip6E="; }; }; From e29dd5e157e5d0f57fb38a955a3d21c54a6aa89f Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 6 Jan 2023 10:26:41 +0800 Subject: [PATCH 05/27] nvidia-x11: remove unused binding to kernelModVersion --- pkgs/os-specific/linux/nvidia-x11/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 769ea7e369d9..692705281569 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -13,8 +13,6 @@ let kernel = callPackage # a hacky way of extracting parameters from callPackage ({ kernel, libsOnly ? false }: if libsOnly then { } else kernel) { }; - kernelModVersion = lib.versions.majorMinor kernel.modDirVersion; - selectHighestVersion = a: b: if lib.versionOlder a.version b.version then b else a; From b7a1f8484c51129b50066077e16834e5d5c76739 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 6 Jan 2023 10:45:26 +0800 Subject: [PATCH 06/27] linuxPackages.nvidia_x11_production: 525.60.11 -> 525.78.01 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 692705281569..5f238e7e14d7 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -25,11 +25,11 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest; production = generic { - version = "525.60.11"; - sha256_64bit = "sha256-gW7mwuCBPMw9SnlY9x/EmjfGDv4dUdYUbBznJAOYPV0="; - openSha256 = "sha256-33ATZuYu+SOOxM6UKXp6J+f1+zbmHvaK4v13X3UZTTM="; - settingsSha256 = "sha256-gA1x6oEpnkr/OPP4eR1L5gC5srvEKtDrSpnv2QEaEpE="; - persistencedSha256 = "sha256-AFMy3agoJ6yVsGgUvTfOzHlz30iApBpAReckq9iS7AA="; + version = "525.78.01"; + sha256_64bit = "sha256-Q9pC0r9pvDfqnHwPoC9S2w3MSDwnL1LtrK2JpctJWpM="; + openSha256 = "sha256-fxpyXVl735ZJ3NnK7jN95gPstu7YopYH/K7UK0iAC7k="; + settingsSha256 = "sha256-1d3Cn+7Gm1ORQxmTKr18GFmYHVb8t050XVLler1dCtw="; + persistencedSha256 = "sha256-t6dViuvA2fw28w4kh4koIoxh9pQ8f7KI1PIUFJcGlYA="; }; latest = selectHighestVersion production (generic { From fa908526f3858e5f6d321d7f242db47e1776d60e Mon Sep 17 00:00:00 2001 From: maddiethecafebabe Date: Fri, 6 Jan 2023 21:18:31 +0100 Subject: [PATCH 07/27] uefi-run: 0.5.0 -> 0.6.0 --- pkgs/tools/virtualization/uefi-run/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/virtualization/uefi-run/default.nix b/pkgs/tools/virtualization/uefi-run/default.nix index 8174f8980897..9de84ae8fc23 100644 --- a/pkgs/tools/virtualization/uefi-run/default.nix +++ b/pkgs/tools/virtualization/uefi-run/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "uefi-run"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "Richard-W"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fwzWdOinW/ECVI/65pPB1shxPdl2nZThAqlg8wlWg/g="; + sha256 = "sha256-OL21C3J4M7q1nNB6lL9xaU6ryZN45UDUqiKsbqQhYH8="; }; - cargoSha256 = "sha256-c+wzMzTkG0FpfQ1rZ8e9dn0ez12vmoecrtNeFk90sdQ="; + cargoSha256 = "sha256-ieX8jQKv9Fht1p7JtTieZ5M+rXdn6/Oo/LgJ8NEBIuQ="; meta = with lib; { description = "Directly run UEFI applications in qemu"; From 9729c49162d88ff9b3b17b7a1c930782ddfa0bef Mon Sep 17 00:00:00 2001 From: piousdeer <31318219+piousdeer@users.noreply.github.com> Date: Sat, 7 Jan 2023 05:21:44 +0700 Subject: [PATCH 08/27] gnomeExtensions.pano: patch missing dependencies --- pkgs/desktops/gnome/extensions/extensionOverrides.nix | 11 +++++++++++ .../extensionOverridesPatches/pano_at_elhan.io.patch | 10 ++++++++++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/desktops/gnome/extensions/extensionOverridesPatches/pano_at_elhan.io.patch diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index b1c762a018f4..81622db59c1e 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -3,7 +3,9 @@ , gjs , gnome , gobject-introspection +, gsound , hddtemp +, libgda , liquidctl , lm_sensors , netcat-gnu @@ -79,6 +81,15 @@ super: lib.trivial.pipe super [ ''; })) + (patchExtension "pano@elhan.io" (old: { + patches = [ + (substituteAll { + src = ./extensionOverridesPatches/pano_at_elhan.io.patch; + inherit gsound libgda; + }) + ]; + })) + (patchExtension "screen-autorotate@kosmospredanie.yandex.ru" (old: { # Requires gjs # https://github.com/NixOS/nixpkgs/issues/164865 diff --git a/pkgs/desktops/gnome/extensions/extensionOverridesPatches/pano_at_elhan.io.patch b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/pano_at_elhan.io.patch new file mode 100644 index 000000000000..448418d573ca --- /dev/null +++ b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/pano_at_elhan.io.patch @@ -0,0 +1,10 @@ +diff --git a/extension.js b/extension.js +index 26561f2..01209e7 100644 +--- a/extension.js ++++ b/extension.js +@@ -1,3 +1,5 @@ ++imports.gi.GIRepository.Repository.prepend_search_path('@gsound@/lib/girepository-1.0') ++imports.gi.GIRepository.Repository.prepend_search_path('@libgda@/lib/girepository-1.0') + + try { + From 2a69c78928a0a7db5bba23627bee9fb819293eb7 Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Fri, 6 Jan 2023 23:36:54 +0100 Subject: [PATCH 09/27] maintainers: add e1mo --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5ef20edab1af..a8888b9cc74f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3892,6 +3892,16 @@ githubId = 15128988; name = "Maksim Dzabraev"; }; + e1mo = { + email = "nixpkgs@e1mo.de"; + matrix = "@e1mo:chaos.jetzt"; + github = "e1mo"; + githubId = 61651268; + name = "Moritz Fromm"; + keys = [{ + fingerprint = "67BE E563 43B6 420D 550E DF2A 6D61 7FD0 A85B AADA"; + }]; + }; eadwu = { email = "edmund.wu@protonmail.com"; github = "eadwu"; From 8d4251f4916c0f87cf00096372b51d46d00d647b Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Fri, 6 Jan 2023 23:40:09 +0100 Subject: [PATCH 10/27] nixos/dokuwiki: Add e1mo as maintainer --- nixos/modules/services/web-apps/dokuwiki.nix | 1 + nixos/tests/dokuwiki.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index d90dd8ace412..36871178d85e 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -601,5 +601,6 @@ in _1000101 onny dandellion + e1mo ]; } diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix index 034d6f94af29..0b6e29348b7a 100644 --- a/nixos/tests/dokuwiki.nix +++ b/nixos/tests/dokuwiki.nix @@ -89,6 +89,7 @@ in { maintainers = with maintainers; [ _1000101 onny + e1mo ]; }; From 7fbf1dc790110cea845ce56d3693a370a98b6beb Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Fri, 6 Jan 2023 23:53:59 +0100 Subject: [PATCH 11/27] electrs: 0.9.10 -> 0.9.11 --- pkgs/applications/blockchains/electrs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index 0bc5c7baa416..1ce458ffb11b 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -12,16 +12,16 @@ let in rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.9.10"; + version = "0.9.11"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - hash = "sha256-GqFtCK5hxnEfIfw3ITufeu26yueknuFZhLtGSXmJ8fE="; + hash = "sha256-iudHdsSjoPal+ORMB3lU7ejGYv69q/8HcxScZS8D/u8="; }; - cargoHash = "sha256-p4t+G13XaCl7+IbX5YyBFF0PmARbw4XlRvnA0PRcjvQ="; + cargoHash = "sha256-Ft1AluPfV6BIRGEddrrIGNRmaZIzUsA2DN2TcghCnSQ="; # needed for librocksdb-sys nativeBuildInputs = [ rustPlatform.bindgenHook ]; From e7800b4ed06931b559e33bee3178e372613c3180 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 7 Jan 2023 10:33:47 +1000 Subject: [PATCH 12/27] yt-dlp: 2023.1.2 -> 2023.1.6 https://github.com/yt-dlp/yt-dlp/releases/tag/2023.01.06 --- pkgs/tools/misc/yt-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index 4bcb98532eba..f99632fac2de 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2023.1.2"; + version = "2023.1.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uNe7tcFZX3GIVaMfNNigJ2pwhvXT9ULAIaje2LJtNq4="; + sha256 = "sha256-Ong6NnUc7RY2j0CzuoZas5swaJ7YBW8e4jRqo4OaCw8="; }; propagatedBuildInputs = [ brotli certifi mutagen pycryptodomex websockets ]; From 39cbf0b76ff069352480814223782c366d82b3ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jan 2023 02:34:18 +0000 Subject: [PATCH 13/27] python310Packages.django_treebeard: 4.5.1 -> 4.6.0 --- pkgs/development/python-modules/django_treebeard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_treebeard/default.nix b/pkgs/development/python-modules/django_treebeard/default.nix index be63c1e9e3c9..9157f03ff507 100644 --- a/pkgs/development/python-modules/django_treebeard/default.nix +++ b/pkgs/development/python-modules/django_treebeard/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-treebeard"; - version = "4.5.1"; + version = "4.6.0"; src = fetchPypi { inherit pname version; - sha256 = "80150017725239702054e5fa64dc66e383dc13ac262c8d47ee5a82cb005969da"; + sha256 = "sha256-frHrcbJCFPLn3DvSFfDDrjL9Z2QXnNR3SveqtJE53qA="; }; buildInputs = [ pytest ]; From 06e2cce29afa803e1fdbe2a34692fe2dc5df8401 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jan 2023 05:57:12 +0000 Subject: [PATCH 14/27] python310Packages.cloudscraper: 1.2.66 -> 1.2.67 --- pkgs/development/python-modules/cloudscraper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cloudscraper/default.nix b/pkgs/development/python-modules/cloudscraper/default.nix index d3e9431e6743..0e8ba8952b1e 100644 --- a/pkgs/development/python-modules/cloudscraper/default.nix +++ b/pkgs/development/python-modules/cloudscraper/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cloudscraper"; - version = "1.2.66"; + version = "1.2.67"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XwzeI3dCcOigkt5o4PvWjheFTHZ/wtQEKpG9qeSBaHE="; + hash = "sha256-J3bHDzZhwCjln9MGrCsQSILJs8s/eYCGJR4A/C1yw6I="; }; propagatedBuildInputs = [ From 95b6bbf1924bb4e9b4471ba9c38640fe08ff9000 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jan 2023 06:27:31 +0000 Subject: [PATCH 15/27] flexget: 3.5.16 -> 3.5.17 --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 8782816b232a..6a8bed0c92bc 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.5.16"; + version = "3.5.17"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-9hcl7OZLi86hZHLotsN1QlPzQ1Ep5vJumAyZxSxxIE8="; + hash = "sha256-7r/3rB0TI/sRTi69+tx24dGjETBhX0KS1Arhg8aeoCk="; }; postPatch = '' From 259f9d759581f9467c59992c527b3fb9d53b682d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jan 2023 06:37:04 +0000 Subject: [PATCH 16/27] python310Packages.ansible-lint: 6.10.1 -> 6.10.2 --- pkgs/development/python-modules/ansible-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index b567c10e8d92..a4bf438f5ab3 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "6.10.1"; + version = "6.10.2"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-JPFbYa9SvCKwXQCPnrdmLxz0KrdACNqfia9x/FQMz6Q="; + hash = "sha256-4ihEmsLxDRwW3zXEdpKCtSmsH+K1B2czP60chaYt9nE="; }; postPatch = '' From 12ebab84bd69c7e86adaa8e684cc6da3e4b642c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jan 2023 09:00:52 +0000 Subject: [PATCH 17/27] python310Packages.aws-lambda-builders: 1.23.1 -> 1.24.0 --- .../python-modules/aws-lambda-builders/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index 57aa49c23ce2..1b147b1c952d 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.23.1"; + version = "1.24.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "refs/tags/v${version}"; - hash = "sha256-t/fdj0p3Z0J0C1v+TWx5jWNOjdAK2f0sPPkNM3SthXk="; + hash = "sha256-Qr1E6MNBAKyNr0XbCIP0yJUFRvBpLhTZzTG06tdg31I="; }; propagatedBuildInputs = [ From b4e082b2e7db3a3a82a14c54904641e0e2439ed5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jan 2023 09:19:28 +0000 Subject: [PATCH 18/27] python310Packages.sqlalchemy-continuum: 1.3.13 -> 1.3.14 --- .../python-modules/sqlalchemy-continuum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix index 0d2ef66cfa88..1d7191a1828f 100644 --- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "SQLAlchemy-Continuum"; - version = "1.3.13"; + version = "1.3.14"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JTqlHQmaVH2qKz7CFyCqpous3ecOpoFrxVlzasbc21I="; + sha256 = "sha256-1+k/lx6R8tW9gM3M2kqaVEwpmx8cMhDXeqCjyd8O2hM="; }; propagatedBuildInputs = [ From 61d3c76d583394c254830f4c2eac762820ba9fa2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jan 2023 09:25:21 +0000 Subject: [PATCH 19/27] python310Packages.google-cloud-bigquery-datatransfer: 3.8.0 -> 3.9.0 --- .../google-cloud-bigquery-datatransfer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 3643cf69b767..d97dc95ad748 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.8.0"; + version = "3.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TR41fn/e4185RW8zkd3SY1E/jNQZuUYJr1n+TwNPHT4="; + hash = "sha256-AH6Xq5jMIo1arGQazoPWgWnKefEavHnas6FIy+LFNP8="; }; propagatedBuildInputs = [ From 65ea52793a8f0afde364f64f321a0e343229cb11 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Jan 2023 10:26:18 +0100 Subject: [PATCH 20/27] python310Packages.sqlalchemy-continuum: add changelog --- .../python-modules/sqlalchemy-continuum/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix index 1d7191a1828f..2fe47baf4fe1 100644 --- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1+k/lx6R8tW9gM3M2kqaVEwpmx8cMhDXeqCjyd8O2hM="; + hash = "sha256-1+k/lx6R8tW9gM3M2kqaVEwpmx8cMhDXeqCjyd8O2hM="; }; propagatedBuildInputs = [ @@ -40,6 +40,8 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/kvesteri/sqlalchemy-continuum/"; description = "Versioning and auditing extension for SQLAlchemy"; + changelog = "https://github.com/kvesteri/sqlalchemy-continuum/blob/${version}/CHANGES.rst"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } From 3b898e7270dfd75c434d85f713e533ebebd8330a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Jan 2023 10:42:19 +0100 Subject: [PATCH 21/27] python310Packages.sqlalchemy-continuum: normalize pname - move to optional-dependencies --- .../sqlalchemy-continuum/default.nix | 54 ++++++++++++++----- 1 file changed, 42 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix index 2fe47baf4fe1..4338763d65dd 100644 --- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -1,22 +1,29 @@ { lib -, fetchPypi , buildPythonPackage +, fetchPypi , flask , flask-login , flask-sqlalchemy , flexmock +, psycopg2 +, pymysql , pytestCheckHook +, pythonOlder , sqlalchemy -, sqlalchemy-utils , sqlalchemy-i18n +, sqlalchemy-utils }: buildPythonPackage rec { - pname = "SQLAlchemy-Continuum"; + pname = "sqlalchemy-continuum"; version = "1.3.14"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + pname = "SQLAlchemy-Continuum"; + inherit version; hash = "sha256-1+k/lx6R8tW9gM3M2kqaVEwpmx8cMhDXeqCjyd8O2hM="; }; @@ -25,21 +32,44 @@ buildPythonPackage rec { sqlalchemy-utils ]; + passthru.optional-dependencies = { + flask = [ + flask + ]; + flask-login = [ + flask-login + ]; + flask-sqlalchemy = [ + flask-sqlalchemy + ]; + flexmock = [ + flexmock + ]; + i18n = [ + sqlalchemy-i18n + ]; + }; + + checkInputs = [ + psycopg2 + pymysql + pytestCheckHook + ] ++ passthru.optional-dependencies.flask + ++ passthru.optional-dependencies.flask-login + ++ passthru.optional-dependencies.flask-sqlalchemy + ++ passthru.optional-dependencies.flexmock + ++ passthru.optional-dependencies.i18n; + # indicate tests that we don't have a database server at hand DB = "sqlite"; - checkInputs = [ - pytestCheckHook - sqlalchemy-i18n - flask - flask-login - flask-sqlalchemy - flexmock + pythonImportsCheck = [ + "sqlalchemy_continuum" ]; meta = with lib; { - homepage = "https://github.com/kvesteri/sqlalchemy-continuum/"; description = "Versioning and auditing extension for SQLAlchemy"; + homepage = "https://github.com/kvesteri/sqlalchemy-continuum/"; changelog = "https://github.com/kvesteri/sqlalchemy-continuum/blob/${version}/CHANGES.rst"; license = licenses.bsd3; maintainers = with maintainers; [ ]; From da03a99da5977f50a8505f2aa0ddf72569911c98 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Jan 2023 10:52:27 +0100 Subject: [PATCH 22/27] python310Packages.django_treebeard: add changelog to meta --- .../python-modules/django_treebeard/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/django_treebeard/default.nix b/pkgs/development/python-modules/django_treebeard/default.nix index 9157f03ff507..39cad0896080 100644 --- a/pkgs/development/python-modules/django_treebeard/default.nix +++ b/pkgs/development/python-modules/django_treebeard/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-frHrcbJCFPLn3DvSFfDDrjL9Z2QXnNR3SveqtJE53qA="; + hash = "sha256-frHrcbJCFPLn3DvSFfDDrjL9Z2QXnNR3SveqtJE53qA="; }; buildInputs = [ pytest ]; @@ -21,10 +21,10 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - description = "Efficient tree implementations for Django 1.6+"; + description = "Efficient tree implementations for Django"; homepage = "https://tabo.pe/projects/django-treebeard/"; - maintainers = with maintainers; [ desiderius ]; + changelog = "https://github.com/django-treebeard/django-treebeard/blob/${version}/CHANGES.md"; license = licenses.asl20; + maintainers = with maintainers; [ desiderius ]; }; - } From cd08c5186af2837cae1301fe0e2d21c32afebd1c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Dec 2022 21:53:10 +0000 Subject: [PATCH 23/27] glooctl: 1.12.37 -> 1.13.1 --- pkgs/applications/networking/cluster/glooctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index de9f2e78f961..afd41814dc30 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "glooctl"; - version = "1.12.37"; + version = "1.13.1"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-3dm60ySi/IdiAzZ+LWMLwxUJRv2HX0tQR5s+XMFqyGg="; + hash = "sha256-dCMseU7rHxfyLCr+RlmsSJM7TSg3x/lQoCZpUtuPboQ="; }; subPackages = [ "projects/gloo/cli/cmd" ]; - vendorSha256 = "sha256-b4Nl6uuZmcbxht4IRupyzQJL/o8nj4fIUuHvlHZWYTU="; + vendorSha256 = "sha256-Lpc/fzOJLIyI2O5DP8K/LBYg6ZA1ixristercAM5VUQ="; nativeBuildInputs = [ installShellFiles ]; From 0cdebad845742d119a63b26d7469788244a3adb8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Jan 2023 10:57:06 +0100 Subject: [PATCH 24/27] python310Packages.django_treebeard: enable tests - add pythonImportsCheck --- .../django_treebeard/default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/django_treebeard/default.nix b/pkgs/development/python-modules/django_treebeard/default.nix index 39cad0896080..d334705784ab 100644 --- a/pkgs/development/python-modules/django_treebeard/default.nix +++ b/pkgs/development/python-modules/django_treebeard/default.nix @@ -1,24 +1,36 @@ { lib , buildPythonPackage -, fetchPypi -, pytest , django +, fetchPypi +, pytest-django +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "django-treebeard"; version = "4.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; hash = "sha256-frHrcbJCFPLn3DvSFfDDrjL9Z2QXnNR3SveqtJE53qA="; }; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ django ]; + propagatedBuildInputs = [ + django + ]; - # tests fail "AppRegistryNotReady("Apps aren't loaded yet.")" - doCheck = false; + checkInputs = [ + pytest-django + pytestCheckHook + ]; + + pythonImportsCheck = [ + "treebeard" + ]; meta = with lib; { description = "Efficient tree implementations for Django"; From 92db726a3eaf5ee58118b2f328839796dc8249d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jan 2023 08:47:57 +0000 Subject: [PATCH 25/27] sarasa-gothic: 0.37.4 -> 0.38.0 --- pkgs/data/fonts/sarasa-gothic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index 24ebfe40d58b..9bfe95518dc1 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -1,14 +1,14 @@ { lib, fetchurl, libarchive }: let - version = "0.37.4"; + version = "0.38.0"; in fetchurl { name = "sarasa-gothic-${version}"; # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; - sha256 = "sha256-fbZN4+SHb2Qelnp122M2I0enbcEl+Qh1oSMiDLAYwSs="; + sha256 = "sha256-lGkb3e2EFHkDLm+/KArfOQ50qBFRThlpcID06g0t4aI="; recursiveHash = true; downloadToTemp = true; From 2fc85042238006704f6203c14814ca9da1f49b64 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Tue, 8 Nov 2022 01:54:14 -0500 Subject: [PATCH 26/27] nixos/etebase-server: Leverage $PATH This simplifies the existing module but also enables consumers to call `etebase-server` from custom preStart commands (i.e. user creation commands). --- nixos/modules/services/misc/etebase-server.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/misc/etebase-server.nix b/nixos/modules/services/misc/etebase-server.nix index c3723d188146..045048a1a2e3 100644 --- a/nixos/modules/services/misc/etebase-server.nix +++ b/nixos/modules/services/misc/etebase-server.nix @@ -179,21 +179,21 @@ in description = "An Etebase (EteSync 2.0) server"; after = [ "network.target" "systemd-tmpfiles-setup.service" ]; wantedBy = [ "multi-user.target" ]; + path = [ pythonEnv ]; serviceConfig = { User = cfg.user; Restart = "always"; WorkingDirectory = cfg.dataDir; }; environment = { - PYTHONPATH = "${pythonEnv}/${pkgs.python3.sitePackages}"; ETEBASE_EASY_CONFIG_PATH = configIni; }; preStart = '' # Auto-migrate on first run or if the package has changed versionFile="${cfg.dataDir}/src-version" if [[ $(cat "$versionFile" 2>/dev/null) != ${pkgs.etebase-server} ]]; then - ${pythonEnv}/bin/etebase-server migrate --no-input - ${pythonEnv}/bin/etebase-server collectstatic --no-input --clear + etebase-server migrate --no-input + etebase-server collectstatic --no-input --clear echo ${pkgs.etebase-server} > "$versionFile" fi ''; @@ -204,7 +204,7 @@ in else "-b 0.0.0.0 -p ${toString cfg.port}"; in '' cd "${pythonEnv}/lib/etebase-server"; - ${pythonEnv}/bin/daphne ${networking} \ + daphne ${networking} \ etebase_server.asgi:application ''; }; From ac7445e754463cfcf3942c537dc31425bf9b26b6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Jan 2023 04:00:01 -0800 Subject: [PATCH 27/27] rmview: 3.1.1 -> 3.1.2 (#209463) --- pkgs/applications/misc/remarkable/rmview/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/remarkable/rmview/default.nix b/pkgs/applications/misc/remarkable/rmview/default.nix index b0a09f4e0ebd..e3fd00d8cdc4 100644 --- a/pkgs/applications/misc/remarkable/rmview/default.nix +++ b/pkgs/applications/misc/remarkable/rmview/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "rmview"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "bordaigorl"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-lUzmOayMHftvCukXSxXr6tBzrr2vaua1ey9gsuCKOBc="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-oCF37WQqNIXut2k+xr528twGxwPoH/sQ2leThagQJAU="; }; nativeBuildInputs = with python3Packages; [ pyqt5 wrapQtAppsHook ];