From 8bed62821cd942d9ff1dbeb0395cba9f6241f1e0 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 31 Dec 2022 17:01:17 -0800 Subject: [PATCH 01/76] nzbhydra2: 3.14.2 -> 4.7.6 --- pkgs/servers/nzbhydra2/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/nzbhydra2/default.nix b/pkgs/servers/nzbhydra2/default.nix index 375224dfdc28..fa6234a34eba 100644 --- a/pkgs/servers/nzbhydra2/default.nix +++ b/pkgs/servers/nzbhydra2/default.nix @@ -1,16 +1,23 @@ -{ lib, stdenv, fetchzip, makeWrapper, jre, python3, unzip }: - +{ + lib, + stdenv, + fetchzip, + makeWrapper, + jre, + python3, + unzip, +}: stdenv.mkDerivation rec { pname = "nzbhydra2"; - version = "3.14.2"; + version = "4.7.6"; src = fetchzip { url = "https://github.com/theotherp/${pname}/releases/download/v${version}/${pname}-${version}-linux.zip"; - sha512 = "sha512-wC2GhCjkRt/rmLAhe6nDCdF4PsfBpOo0T4BOSdw4wlBr7eCfo4Cibt9VvK6DNLuDk7EGkUfxvw9HI9sbRJlpCw=="; + hash = "sha512-vc+VInEnh00bASxcEwSjJcsa0QJHmtRzSz30uW60wGmA24tlaJYSk42N5KpGFbkQkOkb2ijHmKGxPogSa4izRQ=="; stripRoot = false; }; - nativeBuildInputs = [ jre makeWrapper unzip ]; + nativeBuildInputs = [jre makeWrapper unzip]; installPhase = '' runHook preInstall @@ -30,7 +37,7 @@ stdenv.mkDerivation rec { description = "Usenet meta search"; homepage = "https://github.com/theotherp/nzbhydra2"; license = licenses.asl20; - maintainers = with maintainers; [ jamiemagee ]; + maintainers = with maintainers; [jamiemagee]; platforms = with platforms; linux; }; } From 939d238cd792b764fc978a5878a203d3934ee2c2 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Wed, 18 Jan 2023 23:43:52 -0700 Subject: [PATCH 02/76] elfutils: Disable failing test on RISC-V --- pkgs/development/tools/misc/elfutils/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 87271cf50ffa..7eead6137e97 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -41,6 +41,11 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs tests/*.sh + '' + lib.optionalString stdenv.hostPlatform.isRiscV '' + # disable failing test: + # + # > dwfl_thread_getframes: No DWARF information found + sed -i s/run-backtrace-dwarf.sh//g tests/Makefile.in ''; outputs = [ "bin" "dev" "out" "man" ]; From 72faef96c6e9265589e66fbe9a15dd1c62ac1265 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 15 Jan 2023 12:31:10 +0100 Subject: [PATCH 03/76] libgda: apply patch for CVE-2021-39359 Upstream issue: https://gitlab.gnome.org/GNOME/libgda/-/issues/249 --- pkgs/development/libraries/libgda/6.x.nix | 6 ++++++ pkgs/development/libraries/libgda/default.nix | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/pkgs/development/libraries/libgda/6.x.nix b/pkgs/development/libraries/libgda/6.x.nix index c02c6116e648..1f551ec9b4b1 100644 --- a/pkgs/development/libraries/libgda/6.x.nix +++ b/pkgs/development/libraries/libgda/6.x.nix @@ -50,6 +50,12 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/57f618a3b2a3758ee3dcbf9bbdc566122dd8566d.patch"; sha256 = "pyfymUd61m1kHaGyMbUQMma+szB8mlqGWwcFBBQawf8="; }) + + (fetchpatch { + name = "CVE-2021-39359.patch"; + url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/bebdffb4de586fb43fd07ac549121f4b22f6812d.patch"; + sha256 = "sha256-UjHP1nhb5n6TOdaMdQeE2s828T4wv/0ycG3FAk+I1QA="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index e29482a34d4e..1ef0a397c8e7 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -37,6 +37,11 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/9859479884fad5f39e6c37e8995e57c28b11b1b9.diff"; sha256 = "158sncc5bg9lkri1wb0i1ri1nhx4c34rzi47gbfkwphlp7qd4qqv"; }) + (fetchpatch { + name = "CVE-2021-39359.patch"; + url = "https://src.fedoraproject.org/rpms/libgda5/raw/72bb769f12e861e27e883dac5fab34f1ba4bd97e/f/bebdffb4de586fb43fd07ac549121f4b22f6812d.patch"; + sha256 = "sha256-hIKuY5NEqOzntdlLb541bA4xZU5ypTRmV1u765K6KbM="; + }) ]; nativeBuildInputs = [ From 4ce21899540aa538dd1b2b1bca187ed99ddb0506 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 24 Jan 2023 04:20:00 +0000 Subject: [PATCH 04/76] esbuild: 0.17.3 -> 0.17.5 https://github.com/evanw/esbuild/releases/tag/v0.17.4 https://github.com/evanw/esbuild/releases/tag/v0.17.5 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 0aebdeeb47c3..34a7a166efd6 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.17.3"; + version = "0.17.5"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-hqp5K+FOS+UzwIkUTLrw+q4PIQ9OV+8OKKx6wgXBnI0="; + hash = "sha256-QLV6+1se3F7naG3jgXtSfmoTR0d7cFByRznzf+xjDpk="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; From 730a075ea8870f11f70e4e1ec37b531e0a02de0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Jan 2023 13:22:44 +0000 Subject: [PATCH 05/76] python310Packages.toposort: 1.7 -> 1.9 --- pkgs/development/python-modules/toposort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/toposort/default.nix b/pkgs/development/python-modules/toposort/default.nix index a9722b053bfb..2559399b25c5 100644 --- a/pkgs/development/python-modules/toposort/default.nix +++ b/pkgs/development/python-modules/toposort/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "toposort"; - version = "1.7"; + version = "1.9"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3cIYLEKRKkQFEb1/9dPmocq8Osy8Z0oyWMjEHL+7ISU="; + sha256 = "sha256-9Bo0SQ1Ek0tTOnva/5ee6KRyA/0tinRtuD8tWrEkWLk="; }; nativeBuildInputs = [ From 6ca99874bec2262f098b7904873c7e19ebb07d6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Jan 2023 04:21:05 +0000 Subject: [PATCH 06/76] plexRaw: 1.30.1.6562-915986d62 -> 1.30.2.6563-3d4dc0cce --- pkgs/servers/plex/raw.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index c7d1ec7f36e2..3cee78f571ee 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.30.1.6562-915986d62"; + version = "1.30.2.6563-3d4dc0cce"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "sha256-fUt8fh4jeZiUbDoc8ivuSpx0Hf4ShYYcfJUJjU+GCxQ="; + sha256 = "0sz6xc484flh1cnlrvwin7x34bl118yy2mwj034f8p9ngiy5hrkw"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "sha256-ho/r/ouaFsdCH0xcFuy4TWamu0c/ZBZDJO6cYQK/pW0="; + sha256 = "0ymxfy3s9nygv9syiy2bdwmjfqg8m4i5n8c37z1ib6393iwj8mgi"; }; outputs = [ "out" "basedb" ]; From 1e31eed1232ffe8fae6b08de7b30986485421042 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Sun, 1 Jan 2023 16:27:16 +0000 Subject: [PATCH 07/76] runescape-launcher: organize package lists --- pkgs/games/runescape-launcher/default.nix | 63 +++++++++++++++++------ 1 file changed, 47 insertions(+), 16 deletions(-) diff --git a/pkgs/games/runescape-launcher/default.nix b/pkgs/games/runescape-launcher/default.nix index 9fd89c062e46..8f7938782c45 100644 --- a/pkgs/games/runescape-launcher/default.nix +++ b/pkgs/games/runescape-launcher/default.nix @@ -1,8 +1,27 @@ -{ stdenv, lib, buildFHSUserEnv, dpkg, glibc, gcc-unwrapped, autoPatchelfHook, fetchurl, wrapGAppsHook -, gnome2, xorg -, libSM, libXxf86vm, libX11, glib, pango, cairo, gtk2-x11, zlib, openssl_1_1 +{ stdenv +, lib +, autoPatchelfHook +, buildFHSUserEnv +, cairo +, dpkg +, fetchurl +, gcc-unwrapped +, glib +, glibc +, gnome2 +, gtk2-x11 +, libGL , libpulseaudio -, SDL2, xorg_sys_opengl, libGL +, libSM +, libXxf86vm +, libX11 +, openssl_1_1 +, pango +, SDL2 +, wrapGAppsHook +, xorg +, xorg_sys_opengl +, zlib }: let @@ -19,30 +38,30 @@ let nativeBuildInputs = [ autoPatchelfHook - wrapGAppsHook dpkg + wrapGAppsHook ]; buildInputs = [ - glibc + cairo gcc-unwrapped + glib + glibc + gtk2-x11 libSM libXxf86vm libX11 - glib - pango - cairo - gtk2-x11 - zlib openssl_1_1 + pango + zlib ]; runtimeDependencies = [ - libpulseaudio libGL + libpulseaudio SDL2 - xorg_sys_opengl openssl_1_1 + xorg_sys_opengl zlib ]; @@ -95,11 +114,23 @@ in name = "RuneScape"; targetPkgs = pkgs: [ runescape - dpkg glibc gcc-unwrapped - libSM libXxf86vm libX11 glib pango cairo gtk2-x11 zlib openssl_1_1 + cairo + dpkg + gcc-unwrapped + glib + glibc + gtk2-x11 + libGL libpulseaudio + libSM + libXxf86vm + libX11 + openssl_1_1 + pango + SDL2 xorg.libX11 - SDL2 xorg_sys_opengl libGL + xorg_sys_opengl + zlib ]; multiPkgs = pkgs: [ libGL ]; runScript = "runescape-launcher"; From ca66dbc21fe533574d0af12aadba6f219cfa9572 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Sun, 1 Jan 2023 16:29:51 +0000 Subject: [PATCH 08/76] runescape-launcher: install xdg-utils The launcher uses the 'xdg-open' command to open http URIs in the browser. Without this installed, clicking links in the launcher will result in nothing happening. --- pkgs/games/runescape-launcher/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/games/runescape-launcher/default.nix b/pkgs/games/runescape-launcher/default.nix index 8f7938782c45..44a5b95974ed 100644 --- a/pkgs/games/runescape-launcher/default.nix +++ b/pkgs/games/runescape-launcher/default.nix @@ -19,6 +19,7 @@ , pango , SDL2 , wrapGAppsHook +, xdg-utils , xorg , xorg_sys_opengl , zlib @@ -61,6 +62,7 @@ let libpulseaudio SDL2 openssl_1_1 + xdg-utils # The launcher uses `xdg-open` to open HTTP URLs in the user's browser xorg_sys_opengl zlib ]; @@ -128,6 +130,7 @@ in openssl_1_1 pango SDL2 + xdg-utils xorg.libX11 xorg_sys_opengl zlib From 5eb7be85665f4d0f051510a92c1d6d03b0487063 Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Thu, 26 Jan 2023 21:40:13 -0600 Subject: [PATCH 09/76] oil: 0.12.9 -> 0.14.0 --- pkgs/shells/oil/default.nix | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index bff43f683fae..ec2909109188 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -1,16 +1,24 @@ -{ stdenv, lib, fetchurl, withReadline ? true, readline }: +{ stdenv, lib, fetchurl, symlinkJoin, withReadline ? true, readline }: +let + readline-all = symlinkJoin { + name = "readline-all"; paths = [ readline readline.dev ]; + }; +in stdenv.mkDerivation rec { pname = "oil"; - version = "0.12.9"; + version = "0.14.0"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - hash = "sha256-HY/SZiVOfOrA69gGxEp+qdRnuTJ72XveAk9Xp45zcf8="; + hash = "sha256-ZrT2vHfbc0S9Q9e9lDiyptfSC3CIiQs8Co9FODil7oY="; }; postPatch = '' patchShebangs build + # TODO: workaround for https://github.com/oilshell/oil/issues/1467 + # check for removability on updates :) + substituteInPlace configure --replace "echo '#define HAVE_READLINE 1'" "echo '#define HAVE_READLINE 1' && return 0" ''; preInstall = '' @@ -19,7 +27,12 @@ stdenv.mkDerivation rec { strictDeps = true; buildInputs = lib.optional withReadline readline; - configureFlags = lib.optional withReadline "--with-readline"; + configureFlags = [ + "--datarootdir=${placeholder "out"}" + ] ++ lib.optionals withReadline [ + "--with-readline" + "--readline=${readline-all}" + ]; # Stripping breaks the bundles by removing the zip file from the end. dontStrip = true; From c73c40d673655d0f3b590b71a2feb178e3d42523 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 27 Jan 2023 04:20:00 +0000 Subject: [PATCH 10/76] papis: enable tests --- pkgs/development/python-modules/papis/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index 1989e844ddd4..052758c41ac4 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -27,7 +27,6 @@ , tqdm , typing-extensions , whoosh -, xdg-utils }: buildPythonPackage rec { @@ -76,13 +75,8 @@ buildPythonPackage rec { --replace "--cov=papis" "" ''; - # Tests are failing on Python > 3.9 - doCheck = !stdenv.isDarwin && !(pythonAtLeast "3.10"); - - nativeCheckInputs = ([ + checkInputs = [ pytestCheckHook - ]) ++ [ - xdg-utils ]; preCheck = '' @@ -106,6 +100,8 @@ buildPythonPackage rec { "test_get_data" "test_validate_arxivid" "test_yaml" + ] ++ lib.optionals stdenv.isDarwin [ + "test_default_opener" ]; pythonImportsCheck = [ From d678653756985ea90cc172265f22e56a92c3739c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 27 Jan 2023 04:20:00 +0000 Subject: [PATCH 11/76] papis: install bash completion --- pkgs/development/python-modules/papis/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index 052758c41ac4..26282decb062 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -69,8 +69,9 @@ buildPythonPackage rec { ]; postPatch = '' + # Remove when https://github.com/papis/papis/pull/478 lands in upstream substituteInPlace setup.py \ - --replace "isbnlib>=3.9.1,<3.10" "isbnlib>=3.9" + --replace "etc/bash_completion.d/" "share/bash-completion/completions/" substituteInPlace setup.cfg \ --replace "--cov=papis" "" ''; From 3bf49567536e6e37b760da23bb3be2eea817213c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 27 Jan 2023 04:20:00 +0000 Subject: [PATCH 12/76] papis: add changelog to meta --- pkgs/development/python-modules/papis/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index 26282decb062..46bc013be362 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -112,6 +112,7 @@ buildPythonPackage rec { meta = with lib; { description = "Powerful command-line document and bibliography manager"; homepage = "https://papis.readthedocs.io/"; + changelog = "https://github.com/papis/papis/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ nico202 teto ]; }; From 35d7a747551c134ffb061eca22a7f93464914f3c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 27 Jan 2023 04:20:00 +0000 Subject: [PATCH 13/76] papis: add marsam to maintainers --- pkgs/development/python-modules/papis/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index 46bc013be362..8e84896079c1 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -114,6 +114,6 @@ buildPythonPackage rec { homepage = "https://papis.readthedocs.io/"; changelog = "https://github.com/papis/papis/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nico202 teto ]; + maintainers = with maintainers; [ nico202 teto marsam ]; }; } From d89c79969683190e11d6cc955f5a7959fd697e55 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 27 Jan 2023 04:20:00 +0000 Subject: [PATCH 14/76] gallery-dl: 1.24.4 -> 1.24.5 https://github.com/mikf/gallery-dl/releases/tag/v1.24.5 --- pkgs/applications/misc/gallery-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 883ebc797053..4da566bcfc82 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "gallery-dl"; - version = "1.24.4"; + version = "1.24.5"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - sha256 = "sha256-g+nbHpbo6O4zoDJm6MRwCXY9pM73NV7RKR59s+8LM10="; + sha256 = "sha256-P71JiGI9PpWMAlgk5TwQa/h3AUEZSEZ6/MahY+IIy9M="; }; propagatedBuildInputs = [ From ea35811e4abc22223a48082f02e6ab05c94b0c8b Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Fri, 27 Jan 2023 13:17:53 -0800 Subject: [PATCH 15/76] openai: 0.26.2 -> 0.26.4 Diff: https://github.com/openai/openai-python/compare/v0.26.2...v0.26.4 --- pkgs/development/python-modules/openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index a5529af2ab15..d4cedc80be11 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.26.2"; + version = "0.26.4"; format = "setuptools"; disabled = pythonOlder "3.7.1"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "v${version}"; - hash = "sha256-rUXwrr8hgKwqJ/ittK2DOKaqxTAs8wKyVTSdEhfiWfI="; + hash = "sha256-WcUH6zbb5kIH0qk67M+lUx9CbMEbYDXQm6IVzzuQo9w="; }; propagatedBuildInputs = [ From a07160db94b3f4e63a63eb3eb9f3a65a2ec3a2fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Jan 2023 21:36:11 +0000 Subject: [PATCH 16/76] bambootracker: 0.5.3 -> 0.6.0 --- pkgs/applications/audio/bambootracker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index 875daa196d5d..08e347911924 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -12,14 +12,14 @@ mkDerivation rec { pname = "bambootracker"; - version = "0.5.3"; + version = "0.6.0"; src = fetchFromGitHub { owner = "BambooTracker"; repo = "BambooTracker"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-OaktEUWWDEW+MYnQkaB8FvkuH29VDXFqBVSTEJ7Sz7A="; + sha256 = "sha256-yubaKTc8NFLxMY0/5c2VubRHgAGOsRlitmXJ1UHzl60="; }; nativeBuildInputs = [ qmake qttools pkg-config ]; From 8ac0ce1527cf4124973ce636f59db8230763ed9b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Jan 2023 03:33:53 +0000 Subject: [PATCH 17/76] usbimager: 1.0.8 -> 1.0.9 --- pkgs/tools/misc/usbimager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/usbimager/default.nix b/pkgs/tools/misc/usbimager/default.nix index 6903039f6a5c..89ce91ef3e19 100644 --- a/pkgs/tools/misc/usbimager/default.nix +++ b/pkgs/tools/misc/usbimager/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "usbimager"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitLab { owner = "bztsrc"; repo = pname; rev = version; - sha256 = "1j0g1anmdwc3pap3m4kfzqjfkn7q0vpmqniii2kcz7svs5h3ybga"; + sha256 = "sha256-CEGUXJXqXmD8uT93T9dg49Lf5vTpAzQjdnhYmbR5zTI="; }; sourceRoot = "source/src/"; From 3447172e92a0bed801f1c8f3c46745c1cfb578ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Jan 2023 05:22:01 +0000 Subject: [PATCH 18/76] stayrtr: 0.3.0 -> 0.4.0 --- pkgs/servers/stayrtr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/stayrtr/default.nix b/pkgs/servers/stayrtr/default.nix index a168cf5b1eec..0193f3ede566 100644 --- a/pkgs/servers/stayrtr/default.nix +++ b/pkgs/servers/stayrtr/default.nix @@ -7,15 +7,15 @@ buildGoModule rec { pname = "stayrtr"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "bgp"; repo = "stayrtr"; rev = "v${version}"; - sha256 = "10ndb8p7znnjycwg56m63gzqf9zc6lq9mcvz4n48j0c4il5xyn8x"; + sha256 = "sha256-oRFBvue5Tcgty1GgsZGb/CMHmKM0mIc5vWOMsL/0IfI="; }; - vendorSha256 = "1nwrzbpqycr4ixk8a90pgaxcwakv5nlfnql6hmcc518qrva198wp"; + vendorHash = "sha256-VomrmyNa5I6AVSpw5sg0e4b7w/JlFQINBYm+eh1FoNw="; ldflags = [ "-s" From 2c2e503e7bd2ffe7015c48e10d3125af2b42a8d4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 Jan 2023 09:06:49 +0100 Subject: [PATCH 19/76] python310Packages.cwl-utils: 0.21 -> 0.22 Diff: https://github.com/common-workflow-language/cwl-utils/compare/refs/tags/v0.21...v0.22 Changelog: https://github.com/common-workflow-language/cwl-utils/releases/tag/v0.22 --- pkgs/development/python-modules/cwl-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cwl-utils/default.nix b/pkgs/development/python-modules/cwl-utils/default.nix index 038bf395e962..2f605950bc59 100644 --- a/pkgs/development/python-modules/cwl-utils/default.nix +++ b/pkgs/development/python-modules/cwl-utils/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "cwl-utils"; - version = "0.21"; + version = "0.22"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "common-workflow-language"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-y1zuYaxoE0XUk8UpCLsg4ty0sn+5Uu4ztRnUoJezO/o="; + hash = "sha256-vOIheOcDG8qdPtcN0kkBN3URodknDLTC7BzYGIiD2RA="; }; propagatedBuildInputs = [ From 08d26bbb726b6a833c3825e5ff1693b0a79c912e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 28 Jan 2023 09:19:23 +0100 Subject: [PATCH 20/76] nixos/tests/networking.nix: hotfix evaluation It broke by merge 8803f1da6. --- nixos/tests/networking.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index b16ee7d05967..5d6f204ee839 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -953,6 +953,7 @@ let } else { name = "RenameInterface"; testScript = ""; + }; # even with disabled networkd, systemd.network.links should work # (as it's handled by udev, not networkd) link = { From 672ff8a4a3cbca2a4320dbeb45b5242580bcc920 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 28 Jan 2023 10:44:12 +0100 Subject: [PATCH 21/76] xtl: 0.7.2 -> 0.7.5 --- pkgs/development/libraries/xtl/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/xtl/default.nix b/pkgs/development/libraries/xtl/default.nix index 7bd07c2433d4..694f6511f0c5 100644 --- a/pkgs/development/libraries/xtl/default.nix +++ b/pkgs/development/libraries/xtl/default.nix @@ -2,17 +2,18 @@ , stdenv , fetchFromGitHub , cmake +, doctest , gtest }: stdenv.mkDerivation rec { pname = "xtl"; - version = "0.7.2"; + version = "0.7.5"; src = fetchFromGitHub { owner = "xtensor-stack"; repo = "xtl"; rev = version; - sha256 = "177ym67sz544wdylksfkkpi6bqn34kagycfnb3cv0nkmpipqj9lg"; + hash = "sha256-Vc1VKOWmG1sAw3UQpNJAhm9PvXSqJ0iO2qLjP6/xjtI="; }; nativeBuildInputs = [ cmake ]; @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_TESTS=ON" ]; doCheck = true; - nativeCheckInputs = [ gtest ]; + nativeCheckInputs = [ doctest ]; checkTarget = "xtest"; meta = with lib; { From 6c158919a3dea99f0ca841e29084908603a4a6c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Jan 2023 10:39:16 +0000 Subject: [PATCH 22/76] vtm: 0.9.8n -> 0.9.8q --- pkgs/tools/misc/vtm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index fddef03c9cf8..93b451bedc8f 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vtm"; - version = "0.9.8n"; + version = "0.9.8q"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${version}"; - sha256 = "sha256-uH4nyhc3u9yuUZfMJ8rU8cZGtyqMfL+LyNB0/h3X45E="; + sha256 = "sha256-oY0zmyAgxMHPcBxFNdByQfeLIquw6eQ2SSfCgTKtO7Q="; }; nativeBuildInputs = [ cmake ]; From 426e5b7edd013a87ec528521a62d1f5c9a901827 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 28 Jan 2023 12:12:52 +0100 Subject: [PATCH 23/76] freefilesync: 11.29 -> 12.0 --- pkgs/applications/networking/freefilesync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/freefilesync/default.nix b/pkgs/applications/networking/freefilesync/default.nix index 5ef5feb3a16b..49bc342724e0 100644 --- a/pkgs/applications/networking/freefilesync/default.nix +++ b/pkgs/applications/networking/freefilesync/default.nix @@ -14,13 +14,13 @@ gcc12Stdenv.mkDerivation rec { pname = "freefilesync"; - version = "11.29"; + version = "12.0"; src = fetchFromGitHub { owner = "hkneptune"; repo = "FreeFileSync"; rev = "v${version}"; - sha256 = "sha256-UQ+CWqtcTwMGUTn6t3N+BkXs4qxddZtxDjcq7nz5F6U="; + hash = "sha256-7vdhSEh43mpVbrzJzt005EkwoXfknYnAC+FZIAZF020="; }; # Patches from ROSA Linux From c69a77073a46eeda5390ca3636849926d51973a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Madrid-Menc=C3=ADa?= Date: Sat, 28 Jan 2023 13:07:26 +0100 Subject: [PATCH 24/76] ameba: 1.3.1 -> 1.4.0 --- pkgs/development/tools/ameba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/development/tools/ameba/default.nix index 27068cbc4c49..303275e3b9c5 100644 --- a/pkgs/development/tools/ameba/default.nix +++ b/pkgs/development/tools/ameba/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "ameba"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "crystal-ameba"; repo = "ameba"; rev = "v${version}"; - hash = "sha256-SZ2sBQeZgtPOYioH9eK5MveFtWVGPvgKMrqsCfjoRGM="; + hash = "sha256-9dMzT/SnO16jfUfYYiT4MOGnlgrw0jWTNL37u1Y5oBI="; }; format = "make"; From be5f70b7ff5a30fcb45e1ff0215e340354327508 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 Jan 2023 13:46:57 +0100 Subject: [PATCH 25/76] python310Packages.branca: enable tests --- .../python-modules/branca/default.nix | 61 +++++++++++++++---- 1 file changed, 48 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix index c0e19fc48682..65b80267c1d4 100644 --- a/pkgs/development/python-modules/branca/default.nix +++ b/pkgs/development/python-modules/branca/default.nix @@ -1,31 +1,66 @@ { lib , buildPythonPackage -, fetchPypi -, pytest +, fetchFromGitHub , jinja2 +, pytestCheckHook +, pythonOlder +, setuptools-scm , selenium -, six -, setuptools }: buildPythonPackage rec { pname = "branca"; version = "0.6.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-VZSYVSFFBMdYO3G5oDqE3OLpaoQCdhO7U7QtBIRM4k4="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "python-visualization"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-bcqr+vGKBga4rR4XFRWbjtw5xL+pWkIt+ihtKlKF6Y8="; }; - nativeCheckInputs = [ pytest selenium ]; - propagatedBuildInputs = [ jinja2 six setuptools ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; - # Seems to require a browser - doCheck = false; + postPatch = '' + # We don't want flake8 + rm setup.cfg + ''; - meta = { + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + jinja2 + ]; + + nativeCheckInputs = [ + pytestCheckHook + selenium + ]; + + pythonImportsCheck = [ + "branca" + ]; + + disabledTestPaths = [ + # Some tests require a browser + "tests/test_utilities.py" + ]; + + disabledTests = [ + "test_rendering_utf8_iframe" + "test_rendering_figure_notebook" + ]; + + meta = with lib; { description = "Generate complex HTML+JS pages with Python"; homepage = "https://github.com/python-visualization/branca"; - license = with lib.licenses; [ mit ]; + changelog = "https://github.com/python-visualization/branca/blob/v${version}/CHANGES.txt"; + license = with licenses; [ mit ]; + maintainers = with lib.maintainers; [ ]; }; } From e973e7da30e1b3a0fd7535380a8680916b2a537c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Jan 2023 13:30:44 +0000 Subject: [PATCH 26/76] frugal: 3.16.12 -> 3.16.14 --- pkgs/development/tools/frugal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index 42f76eb092be..5a68519f660e 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.16.12"; + version = "3.16.14"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Kdy3bh76c2sgwAwSxzCs83jTVLJmnH0YcYtKH9UvJew="; + sha256 = "sha256-6U4mYS5ukcOaxGeIiI2UFYlz0PpjKdtQH9cOshYRUg0="; }; subPackages = [ "." ]; - vendorHash = "sha256-S45/wxwyoSBmHsttY+pQSE1Ipg7oH3RrCoBeuC1pxeo="; + vendorHash = "sha256-CbneZtwGab5dlGASZqa69Y70fXgt4PJzAODPJlcpJoA="; meta = with lib; { description = "Thrift improved"; From 2b9581da296b9d6ae98e27d65ff104718c97dbf1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 Jan 2023 14:02:26 +0100 Subject: [PATCH 27/76] python310Packages.osmnx: add changelog to meta --- .../python-modules/osmnx/default.nix | 54 +++++++++++++++---- 1 file changed, 45 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix index 9f26c06eaf3a..5a9adc7a449c 100755 --- a/pkgs/development/python-modules/osmnx/default.nix +++ b/pkgs/development/python-modules/osmnx/default.nix @@ -1,27 +1,63 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, geopandas, matplotlib, networkx, numpy -, pandas, requests, Rtree, shapely, folium, scikit-learn, scipy, gdal, rasterio}: +{ lib +, buildPythonPackage +, fetchFromGitHub +, folium +, gdal +, geopandas +, matplotlib +, networkx +, numpy +, pandas +, pythonOlder +, rasterio +, requests +, Rtree +, scikit-learn +, scipy +, shapely +}: buildPythonPackage rec { pname = "osmnx"; version = "1.2.2"; + format = "setuptools"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = "gboeing"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-+dUv1QrUmCIOCyUyjYX1kJtZrPuSp3t9xz/sRV7ppgA="; + owner = "gboeing"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-+dUv1QrUmCIOCyUyjYX1kJtZrPuSp3t9xz/sRV7ppgA="; }; - propagatedBuildInputs = [ geopandas matplotlib networkx numpy pandas requests Rtree shapely folium scikit-learn scipy gdal rasterio ]; + propagatedBuildInputs = [ + geopandas + matplotlib + networkx + numpy + pandas + requests + Rtree + shapely + folium + scikit-learn + scipy + gdal + rasterio + ]; - # requires network + # Tests require network doCheck = false; - pythonImportsCheck = [ "osmnx" ]; + + pythonImportsCheck = [ + "osmnx" + ]; meta = with lib; { description = "A package to easily download, construct, project, visualize, and analyze complex street networks from OpenStreetMap with NetworkX."; homepage = "https://github.com/gboeing/osmnx"; + changelog = "https://github.com/gboeing/osmnx/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; From b58ed75dcdcd493be2c2116ca460ebf28114ec57 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 Jan 2023 14:17:53 +0100 Subject: [PATCH 28/76] python310Packages.rasterio: add changelog to meta --- .../python-modules/rasterio/default.nix | 48 +++++++++---------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 48fda6557a4f..ce4c65ddbb0c 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -1,44 +1,38 @@ { lib , stdenv -, buildPythonPackage -, fetchFromGitHub -, pythonOlder - -# build time -, cython -, gdal - -# runtime , affine , attrs , boto3 +, buildPythonPackage , click , click-plugins , cligj +, cython +, fetchFromGitHub +, gdal +, hypothesis , matplotlib , numpy -, snuggs -, setuptools - -# tests -, hypothesis , packaging , pytest-randomly , pytestCheckHook +, pythonOlder +, setuptools , shapely +, snuggs }: buildPythonPackage rec { pname = "rasterio"; - version = "4"; # not x.y[ab]z, those are alpha/beta versions + version = "4"; format = "pyproject"; + disabled = pythonOlder "3.6"; - # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "rasterio"; repo = "rasterio"; - rev = "refs/tags/release-test-${version}"; + rev = "refs/tags/${version}"; hash = "sha256-YO0FnmIEt+88f6k2mdXDSQg7UKq1Swr8wqVUGdRyQR4="; }; @@ -60,18 +54,18 @@ buildPythonPackage rec { setuptools # needs pkg_resources at runtime ]; + nativeCheckInputs = [ + hypothesis + packaging + pytest-randomly + pytestCheckHook + shapely + ]; + preCheck = '' rm -rf rasterio ''; - nativeCheckInputs = [ - pytest-randomly - pytestCheckHook - packaging - hypothesis - shapely - ]; - pytestFlagsArray = [ "-m 'not network'" ]; @@ -85,13 +79,15 @@ buildPythonPackage rec { ]; doInstallCheck = true; + installCheckPhase = '' $out/bin/rio --version | grep ${version} > /dev/null ''; meta = with lib; { description = "Python package to read and write geospatial raster data"; - homepage = "https://rasterio.readthedocs.io/en/latest/"; + homepage = "https://rasterio.readthedocs.io/"; + changelog = "https://github.com/rasterio/rasterio/blob/1.3.5/CHANGES.txt"; license = licenses.bsd3; maintainers = with maintainers; [ mredaelli ]; }; From 9fe4560f258f33e17ba2d68279a9fd9f30e3d2d5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 Jan 2023 14:33:37 +0100 Subject: [PATCH 29/76] python310Packages.folium: remove patch - adjust inputs - disable failing tests --- .../python-modules/folium/default.nix | 38 ++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index 30a2bcf77312..09c2137872d2 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -1,42 +1,36 @@ { lib +, branca , buildPythonPackage , fetchFromGitHub -, fetchpatch -, pythonOlder -, pytestCheckHook -, branca +, geopandas , jinja2 , nbconvert , numpy , pandas , pillow +, pytestCheckHook +, pythonOlder , requests , selenium , setuptools-scm +, xyzservices }: buildPythonPackage rec { pname = "folium"; version = "0.14.0"; + format = "setuptools"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "python-visualization"; repo = "folium"; rev = "refs/tags/v${version}"; - sha256 = "sha256-zxLFj5AeTVAxE0En7ZlbBdJEm3WrcPv23MgOhyfNi14="; + hash = "sha256-zxLFj5AeTVAxE0En7ZlbBdJEm3WrcPv23MgOhyfNi14="; }; - patches = [ - # Fix test failures with latest branca - (fetchpatch { - url = "https://github.com/python-visualization/folium/commit/b410ab21cc46ec6756c2f755e5e81dcdca029c53.patch"; - hash = "sha256-SVN4wKEep+VnAKnkJTf59rhnzHnbk6dV9XL5ntv4bog="; - }) - ]; - - SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; + SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ setuptools-scm @@ -50,24 +44,34 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + geopandas nbconvert - pytestCheckHook pandas pillow + pytestCheckHook selenium + xyzservices ]; disabledTests = [ - # requires internet connection + # Tests require internet connection + "test__repr_png_is_bytes" "test_geojson" "test_heat_map_with_weights" "test_json_request" "test_notebook" + "test_valid_png_size" + "test_valid_png" + ]; + + pythonImportsCheck = [ + "folium" ]; meta = { description = "Make beautiful maps with Leaflet.js & Python"; homepage = "https://github.com/python-visualization/folium"; + changelog = "https://github.com/python-visualization/folium/blob/v${version}/CHANGES.txt"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fridh ]; }; From 43dd4300ac4df5c486a860d75c60e8e0049ee8bc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 Jan 2023 14:35:29 +0100 Subject: [PATCH 30/76] python310Packages.rasterio: test-4 -> 1.3.5 Changelog: https://github.com/rasterio/rasterio/blob/1.3.5/CHANGES.txt --- .../python-modules/rasterio/default.nix | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index ce4c65ddbb0c..16661032fff1 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -7,11 +7,13 @@ , click , click-plugins , cligj +, certifi , cython , fetchFromGitHub , gdal , hypothesis , matplotlib +, ipython , numpy , packaging , pytest-randomly @@ -24,16 +26,16 @@ buildPythonPackage rec { pname = "rasterio"; - version = "4"; + version = "1.3.5"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "rasterio"; repo = "rasterio"; rev = "refs/tags/${version}"; - hash = "sha256-YO0FnmIEt+88f6k2mdXDSQg7UKq1Swr8wqVUGdRyQR4="; + hash = "sha256-VZE58xbTTAicGqkl8ktYBhN+5tFj8FoUYxg8fi05bmo="; }; nativeBuildInputs = [ @@ -44,16 +46,27 @@ buildPythonPackage rec { propagatedBuildInputs = [ affine attrs - boto3 click click-plugins cligj - matplotlib + certifi numpy snuggs - setuptools # needs pkg_resources at runtime + setuptools ]; + passthru.optional-dependencies = { + ipython = [ + ipython + ]; + plot = [ + matplotlib + ]; + s3 = [ + boto3 + ]; + }; + nativeCheckInputs = [ hypothesis packaging @@ -62,10 +75,6 @@ buildPythonPackage rec { shapely ]; - preCheck = '' - rm -rf rasterio - ''; - pytestFlagsArray = [ "-m 'not network'" ]; @@ -87,7 +96,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package to read and write geospatial raster data"; homepage = "https://rasterio.readthedocs.io/"; - changelog = "https://github.com/rasterio/rasterio/blob/1.3.5/CHANGES.txt"; + changelog = "https://github.com/rasterio/rasterio/blob/${version}/CHANGES.txt"; license = licenses.bsd3; maintainers = with maintainers; [ mredaelli ]; }; From 01358a7c79fdbef780f22f0c5f85abd77202b6d0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 Jan 2023 14:36:30 +0100 Subject: [PATCH 31/76] python310Packages.osmnx: 1.2.3 - 1.3.0 Changelog: https://github.com/gboeing/osmnx/blob/v1.3.0/CHANGELOG.md --- pkgs/development/python-modules/osmnx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix index 5a9adc7a449c..330385625d2e 100755 --- a/pkgs/development/python-modules/osmnx/default.nix +++ b/pkgs/development/python-modules/osmnx/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "osmnx"; - version = "1.2.2"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "gboeing"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+dUv1QrUmCIOCyUyjYX1kJtZrPuSp3t9xz/sRV7ppgA="; + hash = "sha256-17duWrg48Qb4ojYYFX4HBpPLeVgHn1WV84KVATvBnzY="; }; propagatedBuildInputs = [ From bb4765192b0ccb7e22309b5867fc08d292b95ef8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Jan 2023 10:24:20 +0100 Subject: [PATCH 32/76] python310Packages.archinfo: 9.2.34 -> 9.2.35 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 432ea73e7c3b..b2824ed9ae7e 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.34"; + version = "9.2.35"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-RsIknVuhDzPbVJudjilNnMjBTH6cxPROQEXxRiAbDEs="; + hash = "sha256-/GGchV+B/1gleZM0mW8vVk/9Uwf1zYH0B7HwziAla6w="; }; nativeBuildInputs = [ From 8ff29a0559aab5fb637d83ed3e6bd01148fab5ed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Jan 2023 10:24:25 +0100 Subject: [PATCH 33/76] python310Packages.ailment: 9.2.34 -> 9.2.35 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 47fe8d1bad77..d5ec32348e75 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.34"; + version = "9.2.35"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-qFnr+HzDqzhub9MKHjmpbEI3CGMuUkpwX763ykoP9No="; + hash = "sha256-t4t9TATmskvi/Qr9Eje7l+tRiKa+NiwI+KVYqEiSNgo="; }; nativeBuildInputs = [ From f568ebcd864eb919a4b49ca680876fc76b9e9b10 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Jan 2023 10:24:30 +0100 Subject: [PATCH 34/76] python310Packages.pyvex: 9.2.34 -> 9.2.35 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 2c69497dfbcd..7c647293176c 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.34"; + version = "9.2.35"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-3IWhMhiaGm0LXxgVy1HgCxNIBYuGzCJKf3Nual13xe8="; + hash = "sha256-4qLfwzJhmcB1CwWTOvgX9qzYSfd2f3WOcXh+Aer1O3I="; }; nativeBuildInputs = [ From f480f53dc4ed8b7bd52fedfc2ddcf1fd8675c3e2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Jan 2023 10:24:35 +0100 Subject: [PATCH 35/76] python310Packages.claripy: 9.2.34 -> 9.2.35 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 38c7ee4a2d7f..a7b7564fd65b 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.34"; + version = "9.2.35"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-2oUUIPHBT/pAAWUy+8fuEqZv0pG1OHDn6eaphOsrevE="; + hash = "sha256-vfyrYcwQopwSxGAA+8JFCkog0Po/s9HkGI3PJzSALSI="; }; nativeBuildInputs = [ From b3358590c5196bc88bdc827c0596d803a17aa856 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Jan 2023 10:24:40 +0100 Subject: [PATCH 36/76] python310Packages.cle: 9.2.34 -> 9.2.35 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 80f82d1ac946..0464777b5168 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.34"; + version = "9.2.35"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-mbYitM0ibUSxBRhbF1ecB1MOryhWRPZZ1ujRFD8iiWs="; + hash = "sha256-0qDSxB77kKwYCLPWt/Wb//LLTJC8WJIv0Cw+HwE21sQ="; }; nativeBuildInputs = [ From 46404c5d6931488e0d47aa168e4a14ac12d027b8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Jan 2023 10:24:46 +0100 Subject: [PATCH 37/76] python310Packages.angr: 9.2.34 -> 9.2.35 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 64da0be72e25..c8b80357ca77 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.34"; + version = "9.2.35"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-Ar74eYEUinHmAosec7r5C9Rg6iqYl2uLZo87UdOquJY="; + hash = "sha256-zJ3dURT2T44Nl0KPSw8bTeJO33siBLAOu/lXGaQeEdQ="; }; propagatedBuildInputs = [ From cd72e7709065f5b71565665064200f563368f748 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 Jan 2023 15:38:15 +0100 Subject: [PATCH 38/76] python310Packages.regional: disable failing tests --- .../python-modules/regional/default.nix | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/regional/default.nix b/pkgs/development/python-modules/regional/default.nix index 62d6ab1ea6dc..0fc894e9f011 100644 --- a/pkgs/development/python-modules/regional/default.nix +++ b/pkgs/development/python-modules/regional/default.nix @@ -4,38 +4,48 @@ , numpy , scipy , matplotlib -, pytest +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "regional"; version = "1.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "freeman-lab"; repo = pname; rev = "e3a29c58982e5cd3d5700131ac96e5e0b84fb981"; # no tags in repo - sha256 = "03qgm35q9sa5cy0kkw4bj60zfylw0isfzb96nlhdfrsigzs2zkxv"; + hash = "sha256-u88v9H9RZ9cgtSat73QEnHr3gZGL8DmBZ0XphMuoDw8="; }; propagatedBuildInputs = [ + matplotlib numpy scipy - matplotlib ]; nativeCheckInputs = [ - pytest + pytestCheckHook ]; - checkPhase = '' - pytest - ''; + pythonImportsCheck = [ + "regional" + ]; + + disabledTests = [ + "test_dilate" + "test_outline" + "test_mask" + ]; meta = with lib; { description = "Simple manipualtion and display of spatial regions"; homepage = "https://github.com/freeman-lab/regional"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } From bd4e6bf0319c00b2521ce30dc4a09022398607b4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 Jan 2023 16:17:31 +0100 Subject: [PATCH 39/76] python310Packages.garminconnect: 0.1.51 -> 0.1.53 Changelog: https://github.com/cyberjunky/python-garminconnect/releases/tag/0.1.53 --- pkgs/development/python-modules/garminconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index 9a4303b1dd5e..adadfc030bf1 100644 --- a/pkgs/development/python-modules/garminconnect/default.nix +++ b/pkgs/development/python-modules/garminconnect/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "garminconnect"; - version = "0.1.51"; + version = "0.1.53"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "cyberjunky"; repo = "python-garminconnect"; rev = "refs/tags/${version}"; - hash = "sha256-SEolk0bbq3vNNMFz5B/qELaiCFCZFXJD4zTH8hBUX+Y="; + hash = "sha256-bUOdurCuAxpVag+mv3brxYIyNu9KhoDauL+lcrcob/k="; }; propagatedBuildInputs = [ From f4cb17d383d01ae9c020d0f47e8590e99b482cd6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 Jan 2023 16:31:29 +0100 Subject: [PATCH 40/76] python3Packages.huum: add changelog to meta --- pkgs/development/python-modules/huum/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/huum/default.nix b/pkgs/development/python-modules/huum/default.nix index 0df01749e953..2da86db365a7 100644 --- a/pkgs/development/python-modules/huum/default.nix +++ b/pkgs/development/python-modules/huum/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-PYOjfLPa/vZZP0IZuUZnQ74IrTRvizgYhKOmhd83aMQ="; + hash = "sha256-PYOjfLPa/vZZP0IZuUZnQ74IrTRvizgYhKOmhd83aMQ="; }; nativeBuildInputs = [ @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for for Huum saunas"; homepage = "https://github.com/frwickst/pyhuum"; + changelog = "https://github.com/frwickst/pyhuum/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 8d9f8e9bcfe5adf877276cd9863f777bb3572fb7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 Jan 2023 16:32:14 +0100 Subject: [PATCH 41/76] python3Packages.huum: 0.6.0 -> 0.7.1 Changelog: https://github.com/frwickst/pyhuum/releases/tag/0.7.1 --- pkgs/development/python-modules/huum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/huum/default.nix b/pkgs/development/python-modules/huum/default.nix index 2da86db365a7..bc9861d5aa4e 100644 --- a/pkgs/development/python-modules/huum/default.nix +++ b/pkgs/development/python-modules/huum/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "huum"; - version = "0.6.0"; + version = "0.7.1"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-PYOjfLPa/vZZP0IZuUZnQ74IrTRvizgYhKOmhd83aMQ="; + hash = "sha256-/NWeQfYmSRiWH/9lfpRZbpKygC5m/bTjogK/1UGdH2Y="; }; nativeBuildInputs = [ From c0c9af0824d2efc1771214a9586885068ed05a23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 28 Jan 2023 16:33:11 +0100 Subject: [PATCH 42/76] jnetmap: 0.5.4 -> 0.5.5 This fixes a startup crash: $ jnetmap Exception in thread "main" java.lang.NoClassDefFoundError: edu/uci/ics/jung/graph/MultiGraph ... (exit code 1) --- pkgs/applications/networking/jnetmap/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/jnetmap/default.nix b/pkgs/applications/networking/jnetmap/default.nix index 2a686fdd8b9e..3da5ff4bd284 100644 --- a/pkgs/applications/networking/jnetmap/default.nix +++ b/pkgs/applications/networking/jnetmap/default.nix @@ -2,11 +2,12 @@ stdenv.mkDerivation rec { pname = "jnetmap"; - version = "0.5.4"; + version = "0.5.5"; + versionSuffix = "-703"; src = fetchurl { - url = "mirror://sourceforge/project/jnetmap/jNetMap%20${version}/jNetMap-${version}.jar"; - sha256 = "0nxsfa600jhazwbabxmr9j37mhwysp0fyrvczhv3f1smiy8rjanl"; + url = "mirror://sourceforge/project/jnetmap/jNetMap%20${version}/jNetMap-${version}${versionSuffix}.jar"; + sha256 = "sha256-e4Ssm2Sq/v1YZ7ZudAqgQ7Cz2ffwWbSmLFoKhaZvTPg="; }; nativeBuildInputs = [ makeWrapper ]; From 8f3f1e97045d600519e58b6dd381c8c1297dfca4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 Jan 2023 16:34:56 +0100 Subject: [PATCH 43/76] python3Packages.huum: enable tests --- .../python-modules/huum/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/huum/default.nix b/pkgs/development/python-modules/huum/default.nix index bc9861d5aa4e..68cba094ab31 100644 --- a/pkgs/development/python-modules/huum/default.nix +++ b/pkgs/development/python-modules/huum/default.nix @@ -1,9 +1,11 @@ { lib , aiohttp , buildPythonPackage -, fetchPypi +, fetchFromGitHub , poetry-core , pydantic +, pytest-asyncio +, pytestCheckHook , pythonOlder }: @@ -14,9 +16,11 @@ buildPythonPackage rec { disabled = pythonOlder "3.9"; - src = fetchPypi { - inherit pname version; - hash = "sha256-/NWeQfYmSRiWH/9lfpRZbpKygC5m/bTjogK/1UGdH2Y="; + src = fetchFromGitHub { + owner = "frwickst"; + repo = "pyhuum"; + rev = "refs/tags/${version}"; + hash = "sha256-vYHwcEOzxYEBav5YbmWpm+izFlivzu2UIR6hmAXXi0U="; }; nativeBuildInputs = [ @@ -28,16 +32,17 @@ buildPythonPackage rec { pydantic ]; - # Tests are not shipped and source not tagged - # https://github.com/frwickst/pyhuum/issues/2 - doCheck = false; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; pythonImportsCheck = [ "huum" ]; meta = with lib; { - description = "Library for for Huum saunas"; + description = "Library for Huum saunas"; homepage = "https://github.com/frwickst/pyhuum"; changelog = "https://github.com/frwickst/pyhuum/releases/tag/${version}"; license = with licenses; [ mit ]; From 207094ef84109f1e72515b577e1807e5dc2631c1 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 28 Jan 2023 17:47:29 +0200 Subject: [PATCH 44/76] gnuradio: 3.10.5.0 -> 3.10.5.1 --- pkgs/applications/radio/gnuradio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 6ca669a8fe94..e06e3437281c 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -49,12 +49,12 @@ , versionAttr ? { major = "3.10"; minor = "5"; - patch = "0"; + patch = "1"; } }: let - sourceSha256 = "sha256-NP7OH4kRulWpWxyHudIzCJPfjiiilgnhBlixmwOj70I="; + sourceSha256 = "sha256-D5Bsj70IHFOLPZQbaxkGdx7Lz94bXhCfnNfhZb3dDp4="; featuresInfo = { # Needed always basic = { From 41a9aa05800353e2b86276bee11593af234a0533 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 Jan 2023 16:59:41 +0100 Subject: [PATCH 45/76] chisel: 1.7.7 -> 1.8.1 Diff: https://github.com/jpillora/chisel/compare/v1.7.7...v1.8.1 --- pkgs/tools/networking/chisel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/chisel/default.nix b/pkgs/tools/networking/chisel/default.nix index d7dac44b2802..8656ccb42f93 100644 --- a/pkgs/tools/networking/chisel/default.nix +++ b/pkgs/tools/networking/chisel/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "chisel"; - version = "1.7.7"; + version = "1.8.1"; src = fetchFromGitHub { owner = "jpillora"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3EaVUGcwkJWX0FxIaHddUehJIdbxAPfBm8esXKCUuhM="; + sha256 = "sha256-N2voSclNH7lGbUkZo2gkrEb6XoA5f0BzNgAzQs1lOKQ="; }; - vendorSha256 = "sha256-Oko9nduKW76NIUCVyF0lPzEH+TFT1el9VGIbm5lQXtM="; + vendorSha256 = "sha256-p/5g4DLoUhEPFBtAbMiIgc6O4eAfbiqBjCqYkyUHy70="; ldflags = [ "-s" "-w" "-X github.com/jpillora/chisel/share.BuildVersion=${version}" ]; From fb2c343fa13e08164b8438309a71a62c7102545b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 Jan 2023 17:06:27 +0100 Subject: [PATCH 46/76] chisel: add changelog to meta --- pkgs/tools/networking/chisel/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/chisel/default.nix b/pkgs/tools/networking/chisel/default.nix index 8656ccb42f93..d14dd66e1407 100644 --- a/pkgs/tools/networking/chisel/default.nix +++ b/pkgs/tools/networking/chisel/default.nix @@ -1,6 +1,6 @@ -{ buildGoModule +{ lib +, buildGoModule , fetchFromGitHub -, lib }: buildGoModule rec { @@ -10,15 +10,19 @@ buildGoModule rec { src = fetchFromGitHub { owner = "jpillora"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-N2voSclNH7lGbUkZo2gkrEb6XoA5f0BzNgAzQs1lOKQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-N2voSclNH7lGbUkZo2gkrEb6XoA5f0BzNgAzQs1lOKQ="; }; - vendorSha256 = "sha256-p/5g4DLoUhEPFBtAbMiIgc6O4eAfbiqBjCqYkyUHy70="; + vendorHash = "sha256-p/5g4DLoUhEPFBtAbMiIgc6O4eAfbiqBjCqYkyUHy70="; - ldflags = [ "-s" "-w" "-X github.com/jpillora/chisel/share.BuildVersion=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/jpillora/chisel/share.BuildVersion=${version}" + ]; - # tests require access to the network + # Tests require access to the network doCheck = false; meta = with lib; { @@ -30,6 +34,7 @@ buildGoModule rec { used to provide a secure endpoint into your network. ''; homepage = "https://github.com/jpillora/chisel"; + changelog = "https://github.com/jpillora/chisel/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From bcf9b6ee33b4569fab5d6e27ef130df75bea5bc9 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sat, 28 Jan 2023 17:09:40 +0100 Subject: [PATCH 47/76] ipfs-cluster: 1.0.4 -> 1.0.5 https://github.com/ipfs-cluster/ipfs-cluster/releases/tag/v1.0.5 --- pkgs/applications/networking/ipfs-cluster/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index 43bc47b17af4..996677f8a11b 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ipfs-cluster"; - version = "1.0.4"; + version = "1.0.5"; - vendorSha256 = "sha256-krjTtH8C1SGhaKMCtsbA2S9ognImof6mwD+vJ/qbyrM="; + vendorHash = "sha256-sLCgPXyOiGaigcVuwUU4+Lmb7SjopWKhCReBzrZyuRs="; src = fetchFromGitHub { owner = "ipfs-cluster"; repo = "ipfs-cluster"; rev = "v${version}"; - sha256 = "sha256-LdcCGUbrS6te03y8R7XJJOcG1j6uU0v8uEMeUHLeidg="; + hash = "sha256-c0COSf4ktFxkPJwzq/0RyG1JvNUvhdWpeRlrbAirGec="; }; meta = with lib; { From e1ae6d3aed2371fd55922c0a2c4ec48cd5541461 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Jan 2023 16:23:36 +0000 Subject: [PATCH 48/76] python310Packages.cma: 3.2.2 -> 3.3.0 --- pkgs/development/python-modules/cma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cma/default.nix b/pkgs/development/python-modules/cma/default.nix index 5f1121c8e914..ee3a552b94f3 100644 --- a/pkgs/development/python-modules/cma/default.nix +++ b/pkgs/development/python-modules/cma/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "cma"; - version = "3.2.2"; + version = "3.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "CMA-ES"; repo = "pycma"; rev = "refs/tags/r${version}"; - hash = "sha256-STF7jtLqI2KiWvvI9/reRjP1XyW8l4/qy9uAPpE9mTs="; + hash = "sha256-+UJI3hDVbDMfRF4bkwHED3eJCHzxS2hO4YPUzJqcoQI="; }; propagatedBuildInputs = [ From 077fffc1989da7da2c098dca6b843601d2ba681c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Jan 2023 16:39:13 +0000 Subject: [PATCH 49/76] protoc-gen-connect-go: 1.4.1 -> 1.5.0 --- pkgs/development/tools/protoc-gen-connect-go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/protoc-gen-connect-go/default.nix b/pkgs/development/tools/protoc-gen-connect-go/default.nix index a968c26ff583..5941b2cc51e1 100644 --- a/pkgs/development/tools/protoc-gen-connect-go/default.nix +++ b/pkgs/development/tools/protoc-gen-connect-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "protoc-gen-connect-go"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "connect-go"; rev = "refs/tags/v${version}"; - hash = "sha256-9dLILgDolHgQx33dAtYT3RJ0scWUVh52z+2Fh6FS+K4="; + hash = "sha256-lk7PcSsqm2oLYerhXGxcyqkw5VJ46JIASU87ppybd78="; }; vendorHash = "sha256-Bh2JCWTaML/QU/sLBsxLKMzzH++K22BTGusfcVW2GBw="; From 43439da71a75db36614e9e19c4415aa5971634ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Jan 2023 17:20:58 +0000 Subject: [PATCH 50/76] crowdin-cli: 3.9.3 -> 3.10.0 --- pkgs/tools/text/crowdin-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix index 5d97f8195f7c..aaafad279491 100644 --- a/pkgs/tools/text/crowdin-cli/default.nix +++ b/pkgs/tools/text/crowdin-cli/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "crowdin-cli"; - version = "3.9.3"; + version = "3.10.0"; src = fetchurl { url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; - sha256 = "sha256-p8abIgCAXo/LW/AZN2esSYVkVoggQ2vj5QkAseHwXJo="; + sha256 = "sha256-4OEwee7izd2gxv7HMq5ziu88sj78QRtGH4bgooZXLow="; }; nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; From 11973e45c0c2bbad1a3cad600d69ca656a0262d8 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 28 Jan 2023 11:54:32 -0500 Subject: [PATCH 51/76] ruff: 0.0.236 -> 0.0.237 Diff: https://github.com/charliermarsh/ruff/compare/v0.0.236...v0.0.237 Changelog: https://github.com/charliermarsh/ruff/releases/tag/v0.0.237 --- pkgs/development/tools/ruff/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 72aa21aa9c76..54ff2962f983 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -1,22 +1,27 @@ { lib , rustPlatform , fetchFromGitHub +, installShellFiles , stdenv , darwin }: rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.236"; + version = "0.0.237"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2JV0isbVkpEt6bsLdTbII9LjtvdGB22ZDSpf7bj6dto="; + sha256 = "sha256-c2mD03gxbBnnifTXPpdJk4kwpeHdrwckymaFGKJwDc8="; }; - cargoSha256 = "sha256-cjMz3L24CRk1Qoz7sapk3EKtFfm8Uto+jtLy71rDGvQ="; + cargoSha256 = "sha256-pYOMCmNrI4uzqXkbc2D9UvNHg2PlibmEhtml+A1V1BQ="; + + nativeBuildInputs = [ + installShellFiles + ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices @@ -25,6 +30,13 @@ rustPlatform.buildRustPackage rec { # building tests fails with `undefined symbols` doCheck = false; + postInstall = '' + installShellCompletion --cmd ruff \ + --bash <($out/bin/ruff generate-shell-completion bash) \ + --fish <($out/bin/ruff generate-shell-completion fish) \ + --zsh <($out/bin/ruff generate-shell-completion zsh) + ''; + meta = with lib; { description = "An extremely fast Python linter"; homepage = "https://github.com/charliermarsh/ruff"; From 53a5eccfb8fa5c3982350422ea709bcc3d1b5365 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Jan 2023 17:25:54 +0000 Subject: [PATCH 52/76] xq: 0.2.40 -> 0.2.42 --- pkgs/tools/misc/xq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/xq/default.nix b/pkgs/tools/misc/xq/default.nix index 8168f9603a5a..410531d5a74d 100644 --- a/pkgs/tools/misc/xq/default.nix +++ b/pkgs/tools/misc/xq/default.nix @@ -6,14 +6,14 @@ rustPlatform.buildRustPackage rec { pname = "xq"; - version = "0.2.40"; + version = "0.2.42"; src = fetchCrate { inherit pname version; - sha256 = "sha256-sOCdNQ+prQRdj3Oeaa4HLhufbwtClUzzhnMDwSU4SJE="; + sha256 = "sha256-VR2ZUt0qvQBaFZr7Gui/LywsRrPubQlzYj1PQj05xhY="; }; - cargoSha256 = "sha256-b41D/sg+qD/SbwQvEqv3sFWuW15VQ4gEiL51I7/hOmI="; + cargoHash = "sha256-rX0fwJM8sHTuHIsmk9JpgWrTq1EA6Ksx7fFqWqY5R4k="; meta = with lib; { description = "Pure rust implementation of jq"; From 79ff8344968c2cef237a829378c146083d105895 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 28 Jan 2023 18:56:10 +0100 Subject: [PATCH 53/76] jnetmap: add missing runHook in installPhase --- pkgs/applications/networking/jnetmap/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/jnetmap/default.nix b/pkgs/applications/networking/jnetmap/default.nix index 3da5ff4bd284..8aea49decb7e 100644 --- a/pkgs/applications/networking/jnetmap/default.nix +++ b/pkgs/applications/networking/jnetmap/default.nix @@ -16,12 +16,16 @@ stdenv.mkDerivation rec { dontUnpack = true; installPhase = '' + runHook preInstall + mkdir -p "$out/bin" mkdir -p "$out/lib" cp "${src}" "$out/lib/jnetmap.jar" makeWrapper "${jre}/bin/java" "$out/bin/jnetmap" \ --add-flags "-jar \"$out/lib/jnetmap.jar\"" + + runHook postInstall ''; meta = with lib; { From a78ac90bfe2c0e3e79ed408fb9b0cd264a5bc106 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 Jan 2023 19:19:16 +0100 Subject: [PATCH 54/76] python311Packages.volvooncall: add patch to remove asynctest --- .../python-modules/volvooncall/default.nix | 46 ++++++++++++------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix index 604901c8da7e..f3df712c3d51 100644 --- a/pkgs/development/python-modules/volvooncall/default.nix +++ b/pkgs/development/python-modules/volvooncall/default.nix @@ -1,34 +1,43 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchFromGitHub -, setuptools -, geopy -, docopt -, certifi -, amqtt -, websockets , aiohttp -, pytestCheckHook -, asynctest +, amqtt +, buildPythonPackage +, certifi +, docopt +, fetchFromGitHub +, fetchpatch +, geopy +, mock , pytest-asyncio +, pytestCheckHook +, pythonOlder +, setuptools +, websockets }: buildPythonPackage rec { pname = "volvooncall"; version = "0.10.1"; + format = "setuptools"; disabled = pythonOlder "3.8"; - format = "setuptools"; - src = fetchFromGitHub { owner = "molobrakos"; repo = "volvooncall"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-udYvgKj7Rlc/hA86bbeBfnoVRjKkXT4TwpceWz226cU="; }; + patches = [ + # Remove async, https://github.com/molobrakos/volvooncall/pull/92 + (fetchpatch { + name = "remove-asnyc.patch"; + url = "https://github.com/molobrakos/volvooncall/commit/ef0df403250288c00ed4c600e9dfa79dcba8941e.patch"; + hash = "sha256-U+hM7vzD9JSEUumvjPSLpVQcc8jAuZHG3/1dQ3wnIcA="; + }) + ]; + propagatedBuildInputs = [ aiohttp ]; @@ -45,17 +54,20 @@ buildPythonPackage rec { ]; }; - nativeCheckInputs = [ - asynctest + checkInputs = [ + mock pytest-asyncio pytestCheckHook ] ++ passthru.optional-dependencies.mqtt; - pythonImportsCheck = [ "volvooncall" ]; + pythonImportsCheck = [ + "volvooncall" + ]; meta = with lib; { description = "Retrieve information from the Volvo On Call web service"; homepage = "https://github.com/molobrakos/volvooncall"; + changelog = "https://github.com/molobrakos/volvooncall/releases/tag/v${version}"; license = licenses.unlicense; maintainers = with maintainers; [ dotlambda ]; }; From 0ca2f14270b547538bcbd9b30e424e09b730c405 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sat, 28 Jan 2023 10:33:27 -0800 Subject: [PATCH 55/76] probe-rs-cli: 0.14.0 -> 0.14.2 --- pkgs/development/tools/rust/probe-rs-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/probe-rs-cli/default.nix b/pkgs/development/tools/rust/probe-rs-cli/default.nix index 3f26e4bd3ab1..9992e09d98b1 100644 --- a/pkgs/development/tools/rust/probe-rs-cli/default.nix +++ b/pkgs/development/tools/rust/probe-rs-cli/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "probe-rs-cli"; - version = "0.14.0"; + version = "0.14.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-y9EHksRDVbw58XiV7/dKzy4p6OWWAkQ3X9LP/WDWD2c="; + sha256 = "sha256-CrBgj0M3slhPrAYc2+I80ZfUC/CJzcmFwLc9yX2SSR4="; }; - cargoSha256 = "sha256-vv8XSAsGs1M97Y6cIGYevCdaxmPy3aDmHFF00exumq8="; + cargoSha256 = "sha256-nHjVldLsi9Xr6pPOeLpb6anvno2244g/LNIv7DnbSI4="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; From 499bf077d821ba3d9ac21664618a56637c3e24c0 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 28 Jan 2023 16:04:31 -0300 Subject: [PATCH 56/76] locate-dominating-file: add meta.homepage --- .../misc/locate-dominating-file/default.nix | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/misc/locate-dominating-file/default.nix b/pkgs/tools/misc/locate-dominating-file/default.nix index 8932b6f62259..c4c55ca3b068 100644 --- a/pkgs/tools/misc/locate-dominating-file/default.nix +++ b/pkgs/tools/misc/locate-dominating-file/default.nix @@ -15,11 +15,9 @@ stdenvNoCC.mkDerivation { owner = "roman"; repo = "locate-dominating-file"; rev = "v${version}"; - sha256 = "sha256-gwh6fAw7BV7VFIkQN02QIhK47uxpYheMk64UeLyp2IY="; + hash = "sha256-gwh6fAw7BV7VFIkQN02QIhK47uxpYheMk64UeLyp2IY="; }; - doCheck = true; - postPatch = '' for file in $(find src tests -type f); do patchShebangs "$file" @@ -28,14 +26,7 @@ stdenvNoCC.mkDerivation { buildInputs = [ getopt ]; - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp src/locate-dominating-file.sh $out/bin/locate-dominating-file - - runHook postInstall - ''; + doCheck = true; checkInputs = [ (bats.withLibraries (p: [ p.bats-support p.bats-assert ])) ]; @@ -47,7 +38,17 @@ stdenvNoCC.mkDerivation { runHook postCheck ''; + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp src/locate-dominating-file.sh $out/bin/locate-dominating-file + + runHook postInstall + ''; + meta = with lib; { + homepage = "https://github.com/roman/locate-dominating-file"; description = "Program that looks up in a directory hierarchy for a given filename"; license = licenses.mit; maintainers = [ maintainers.roman ]; From d200764b366cb6b1a29601378650e2692765a7cc Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 28 Jan 2023 20:08:27 +0100 Subject: [PATCH 57/76] gpac: 2.0.0 -> 2.2.0 https://github.com/gpac/gpac/releases/tag/v2.2.0 Also add an additional patch for a recent issue (CVE-2023-0358). --- pkgs/applications/video/gpac/default.nix | 25 ++++++++++-------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index 6390558013f5..afc97cd7e1a9 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -1,19 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, zlib }: stdenv.mkDerivation rec { - version = "2.0.0"; + version = "2.2.0"; pname = "gpac"; src = fetchFromGitHub { owner = "gpac"; repo = "gpac"; rev = "v${version}"; - sha256 = "sha256-MIX32lSqf/lrz9240h4wMIQp/heUmwvDJz8WN08yf6c="; + sha256 = "sha256-m2qXTXLGgAyU9y6GEk4Hp/7Al57IPRSqImJatIcwswQ="; }; - postPatch = '' - substituteInPlace Makefile --replace 'dh_link' 'ln -s' - ''; + patches = [ + (fetchpatch { + name = "CVE-2023-0358.patch"; + url = "https://github.com/gpac/gpac/commit/9971fb125cf91cefd081a080c417b90bbe4a467b.patch"; + sha256 = "sha256-0PDQXahbJCOo1JJAC0T0N1u2mqmwAkdm87wXMJnBicM="; + }) + ]; # this is the bare minimum configuration, as I'm only interested in MP4Box # For most other functionality, this should probably be extended @@ -41,14 +45,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; maintainers = with maintainers; [ bluescreen303 mgdelacroix ]; platforms = platforms.linux; - knownVulnerabilities = [ - "CVE-2022-1035" - "CVE-2022-1172" - "CVE-2022-1222" - "CVE-2022-1795" - "CVE-2022-2453" - "CVE-2022-2454" - "CVE-2022-2549" - ]; }; } From edc8e8e14167b5a220e405f1dfe7f1e4d5295428 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Jan 2023 19:25:06 +0000 Subject: [PATCH 58/76] health-check: 0.03.10 -> 0.03.11 --- pkgs/os-specific/linux/health-check/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/health-check/default.nix b/pkgs/os-specific/linux/health-check/default.nix index e876808b461a..9e85281ea4c0 100644 --- a/pkgs/os-specific/linux/health-check/default.nix +++ b/pkgs/os-specific/linux/health-check/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "health-check"; - version = "0.03.10"; + version = "0.03.11"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-1dm7tl7DHv1CzuLe1/UewDSUOanO0hN+STkPrAHcZmI="; + hash = "sha256-QLa/7kA0juefzOba7ELopDmOVfiGJReo4LCfhnxW1tk="; }; buildInputs = [ json_c libbsd ]; From 26fc1080e05098ec717ca14fbf1af7971c71b2bf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 17 Jan 2023 03:03:46 +0100 Subject: [PATCH 59/76] python3Packages.tensorflow-estimator: 2.10.0 -> 2.11.0 --- .../python-modules/tensorflow-estimator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-estimator/default.nix b/pkgs/development/python-modules/tensorflow-estimator/default.nix index 24fb681f3b6f..c7d8e4d630be 100644 --- a/pkgs/development/python-modules/tensorflow-estimator/default.nix +++ b/pkgs/development/python-modules/tensorflow-estimator/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "tensorflow-estimator"; - version = "2.10.0"; + version = "2.11.0"; format = "wheel"; src = fetchPypi { pname = "tensorflow_estimator"; inherit version format; - hash = "sha256-8yTqF81X8W4zvxiHEdUHfmsuX1oSwyjW4BoHsjiI7c0="; + hash = "sha256-6jtkrP/z2aJE8GF4yb3ty90/Eltn0IiNuoIpSY0GRos="; }; propagatedBuildInputs = [ mock numpy absl-py ]; From 1fa67dd7fd080db53ea66daf2680ffcc414a7664 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 17 Jan 2023 03:09:35 +0100 Subject: [PATCH 60/76] python3Packages.tensorflow-estimator-bin: Rename from tensorflow-estimator --- .../tensorflow-estimator/{default.nix => bin.nix} | 0 pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) rename pkgs/development/python-modules/tensorflow-estimator/{default.nix => bin.nix} (100%) diff --git a/pkgs/development/python-modules/tensorflow-estimator/default.nix b/pkgs/development/python-modules/tensorflow-estimator/bin.nix similarity index 100% rename from pkgs/development/python-modules/tensorflow-estimator/default.nix rename to pkgs/development/python-modules/tensorflow-estimator/bin.nix diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 5430ab54c662..4ad9b845adc8 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -218,6 +218,7 @@ mapAliases ({ SQLAlchemy-ImageAttach = throw "sqlalchemy-imageattach has been removed as it is incompatible with sqlalchemy 1.4 and unmaintained"; # added 2022-04-23 tensorflow-bin_2 = tensorflow-bin; # added 2021-11-25 tensorflow-build_2 = tensorflow-build; # added 2021-11-25 + tensorflow-estimator = tensorflow-estimator-bin; # added 2023-01-17 tensorflow-estimator_2 = tensorflow-estimator; # added 2021-11-25 tensorflow-tensorboard = tensorboard; # added 2022-03-06 tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dac63cf3b790..d7dcddcfac07 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11227,7 +11227,7 @@ self: super: with self; { tensorflow-datasets = callPackage ../development/python-modules/tensorflow-datasets { }; - tensorflow-estimator = callPackage ../development/python-modules/tensorflow-estimator { }; + tensorflow-estimator-bin = callPackage ../development/python-modules/tensorflow-estimator/bin.nix { }; tensorflow-metadata = callPackage ../development/python-modules/tensorflow-metadata { }; From 91b2868b6d7acabdc93ff1fe3ce7b13ba6d93a57 Mon Sep 17 00:00:00 2001 From: ayes-web Date: Sat, 28 Jan 2023 21:22:00 +0200 Subject: [PATCH 61/76] progress: add darwin to platforms --- pkgs/tools/misc/progress/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix index 9feee484170e..94eeace1dc2e 100644 --- a/pkgs/tools/misc/progress/default.nix +++ b/pkgs/tools/misc/progress/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Xfennec/progress"; description = "Tool that shows the progress of coreutils programs"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pSub ]; }; } From 44533f595444dbc9018e514ec1a13f92a5b73ddc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 28 Jan 2023 20:30:37 +0100 Subject: [PATCH 62/76] zsh-powerlevel10k: 1.16.1 -> 1.17.0 https://github.com/romkatv/powerlevel10k/releases/tag/v1.17.0 https://github.com/romkatv/gitstatus/releases/tag/v1.5.4 --- pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 4f5e21ec8cf7..3fd0920e9b3f 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -7,25 +7,25 @@ let # match gitstatus version with given `gitstatus_version`: # https://github.com/romkatv/powerlevel10k/blob/master/gitstatus/build.info gitstatus = pkgs.gitstatus.overrideAttrs (oldAtttrs: rec { - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; - rev = "v${version}"; - sha256 = "17giwdjrsmr71xskxxf506n8kaab8zx77fv267fx37ifi57nffk5"; + rev = "refs/tags/v${version}"; + hash = "sha256-mVfB3HWjvk4X8bmLEC/U8SKBRytTh/gjjuReqzN5qTk="; }; }); in stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.16.1"; + version = "1.17.0"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; - rev = "v${version}"; - sha256 = "0fkfh8j7rd8mkpgz6nsx4v7665d375266shl1aasdad8blgqmf0c"; + rev = "refs/tags/v${version}"; + hash = "sha256-fgrwbWj6CcPoZ6GbCZ47HRUg8ZSJWOsa7aipEqYuE0Q="; }; strictDeps = true; @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { ''; meta = { + changelog = "https://github.com/romkatv/powerlevel10k/releases/tag/v${version}"; description = "A fast reimplementation of Powerlevel9k ZSH theme"; homepage = "https://github.com/romkatv/powerlevel10k"; license = lib.licenses.mit; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.hexa ]; + maintainers = with lib.maintainers; [ hexa ]; }; } From 577fa81532e6e50c98e821bf7be52d4776b50bf3 Mon Sep 17 00:00:00 2001 From: Matt Wittmann Date: Fri, 27 Jan 2023 16:18:53 -0800 Subject: [PATCH 63/76] python310Packages.redshift-connector: init at 2.0.910 --- .../redshift-connector/default.nix | 62 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/development/python-modules/redshift-connector/default.nix diff --git a/pkgs/development/python-modules/redshift-connector/default.nix b/pkgs/development/python-modules/redshift-connector/default.nix new file mode 100644 index 000000000000..467d5e1340b4 --- /dev/null +++ b/pkgs/development/python-modules/redshift-connector/default.nix @@ -0,0 +1,62 @@ +{ beautifulsoup4 +, boto3 +, buildPythonPackage +, fetchFromGitHub +, lib +, lxml +, packaging +, pytest-mock +, pytestCheckHook +, pythonOlder +, pytz +, requests +, scramp +}: + +buildPythonPackage rec { + pname = "redshift-connector"; + version = "2.0.910"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "aws"; + repo = "amazon-redshift-python-driver"; + rev = "refs/tags/v${version}"; + hash = "sha256-24yI6pXSHxhT30N3rJXAMtpCOhhGsBuDrwx9jMO1FW0="; + }; + + # disable test coverage + postPatch = '' + sed -i "/--cov/d" setup.cfg + ''; + + propagatedBuildInputs = [ + beautifulsoup4 + boto3 + lxml + packaging + pytz + requests + scramp + ]; + + nativeCheckInputs = [ + pytest-mock + pytestCheckHook + ]; + + # integration tests require a Redshift cluster + pytestFlagsArray = [ "test/unit" ]; + + __darwinAllowLocalNetworking = true; # required for tests + + meta = { + description = "Redshift interface library"; + homepage = "https://github.com/aws/amazon-redshift-python-driver"; + changelog = "https://github.com/aws/amazon-redshift-python-driver/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ mcwitt ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dac63cf3b790..362c7b9909cf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9848,6 +9848,8 @@ self: super: with self; { rednose = callPackage ../development/python-modules/rednose { }; + redshift-connector = callPackage ../development/python-modules/redshift-connector { }; + reedsolo = callPackage ../development/python-modules/reedsolo { }; reflink = callPackage ../development/python-modules/reflink { }; From 0fa1ff5ce8c919390ac580491190da2e9a7b64da Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 28 Jan 2023 20:44:08 +0000 Subject: [PATCH 64/76] electrum: 4.3.3 -> 4.3.4 --- pkgs/applications/misc/electrum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 40b4569d11f5..5cae20d831bd 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -20,7 +20,7 @@ }: let - version = "4.3.3"; + version = "4.3.4"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -37,7 +37,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "sha256-40GfOKBTAi8RAsAVrG9rv1Jr5IqM+1yro6YYRsSULxw="; + sha256 = "sha256-0xYGTCk+Sk7LP+E9r2Y7UJZsfbobLe6Yb+x5ZRCN40Y="; postFetch = '' mv $out ./all @@ -53,7 +53,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "sha256-NPXGfbEjT9l88ZnGbDcE3+oGxThTzW7YfesBzssGsbc="; + sha256 = "sha256-+Z4NZK/unFN6mxCuMleHBxAoD+U1PzVk3/ZnZRmOOxo="; }; postUnpack = '' From dd5386ee0e6fc9b3b6949313b954135f23073bec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Jan 2023 21:00:04 +0000 Subject: [PATCH 65/76] python310Packages.google-nest-sdm: 2.2.2 -> 2.2.4 --- pkgs/development/python-modules/google-nest-sdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index 9168d3f046f1..d8fe3ca62f97 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "2.2.2"; + version = "2.2.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = "refs/tags/${version}"; - hash = "sha256-QeT4S8UlJQ0rCYG8+hc4cP1mM3KZlu/afFqz+LPIuVA="; + hash = "sha256-HQzU6no/DV2QOC+LV7kUSrygTwgAvfMSmYIKaBd/PCE="; }; propagatedBuildInputs = [ From 02ee33a5c177334f1cc7c2d5573babf5e7d70d8f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 26 Jan 2023 20:10:29 +0000 Subject: [PATCH 66/76] python3.pkgs: simplify ensurePythonModules logic It wasn't clear before, but it turns out that this is just four separate conditions, and an attribute is valid if any of the conditions is true, so we don't need a sea of parentheses to express it. --- pkgs/development/interpreters/python/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index faab3eb785e4..ef358c7b63fc 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -36,7 +36,7 @@ stdenv ]; providesSetupHook = lib.attrByPath [ "provides" "setupHook"] false; - valid = value: !((lib.isDerivation value) && !((pythonPackages.hasPythonModule value) || (providesSetupHook value))) || (lib.elem value exceptions); + valid = value: !lib.isDerivation value || pythonPackages.hasPythonModule value || providesSetupHook value || lib.elem value exceptions; func = name: value: if (valid value) then value else throw "${name} should use `buildPythonPackage` or `toPythonModule` if it is to be part of the Python packages set."; in lib.mapAttrs func items; in ensurePythonModules (callPackage From b682fef8e96996812fd95fe033b58cf4545e2a70 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 26 Jan 2023 20:12:52 +0000 Subject: [PATCH 67/76] python3.pkgs: fix splice through unsupported hosts Previously, unless unsupported platforms were allowed, the following would fail to evaluate (from an "x86_64-linux" system): pkgsCross.x86_64-freebsd.__splicedPackages.docutils.__spliced.buildHost It shouldn't have, because the buildHost package ends up being for Linux. This broke evaluation of e.g. pkgsCross.x86_64-freebsd.libdrm, because it has docutils in nativeBuildInputs. mkDerivation would try to go through __spliced.buildHost on docutils to get to the Linux version, but the check in ensurePythonModules would kick in first, triggering the meta check because of the equality check in the implementation of hasPythonModule, which would fail because Python is not marked as supported on FreeBSD in Nixpkgs at the moment. Thus, even though they're not supposed to be, the meta checks would be triggered even though the only attribute being accessed on the unsupported derivation was __spliced. We can fix this by using the same mechanism used to implement the meta checks themselves: lib.extendDerivation. Now, attempting to access drvPath or outPath on an attribute that fails the validity check will produce the same error as before, but other accesses will be allowed through, fixing splicing. I've tested evaluation of packages that pass and fail the validity check, and confirmed that the behaviour is still correct. --- pkgs/development/interpreters/python/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index ef358c7b63fc..bb709694dc61 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -36,8 +36,12 @@ stdenv ]; providesSetupHook = lib.attrByPath [ "provides" "setupHook"] false; - valid = value: !lib.isDerivation value || pythonPackages.hasPythonModule value || providesSetupHook value || lib.elem value exceptions; - func = name: value: if (valid value) then value else throw "${name} should use `buildPythonPackage` or `toPythonModule` if it is to be part of the Python packages set."; + valid = value: pythonPackages.hasPythonModule value || providesSetupHook value || lib.elem value exceptions; + func = name: value: + if lib.isDerivation value then + lib.extendDerivation (valid value || throw "${name} should use `buildPythonPackage` or `toPythonModule` if it is to be part of the Python packages set.") {} value + else + value; in lib.mapAttrs func items; in ensurePythonModules (callPackage # Function that when called From fc4ae19ff11e77cfd9e931dea5dcc5912138a274 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 17 Jan 2023 03:11:32 +0100 Subject: [PATCH 68/76] python3Packages.tensorflow: 2.10.1 -> 2.11.0 https://github.com/tensorflow/tensorflow/releases/tag/v2.11.0 Drop dependency on tensorflow-io until we succeed in packaged it. --- .../python-modules/tensorflow/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index f0729fc28dcc..fef979b70d18 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -74,7 +74,7 @@ let tfFeature = x: if x then "1" else "0"; - version = "2.10.1"; + version = "2.11.0"; variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; @@ -187,8 +187,8 @@ let src = fetchFromGitHub { owner = "tensorflow"; repo = "tensorflow"; - rev = "v${version}"; - hash = "sha256-AYHUtJEXYZdVDigKZo7mQnV+PDeQg8mi45YH18qXHZA="; + rev = "refs/tags/v${version}"; + hash = "sha256-OYh61/83yv+ycivylfdS8yFUIUAk8euAPvmfjPzldGs="; }; # On update, it can be useful to steal the changes from gentoo @@ -372,11 +372,11 @@ let fetchAttrs = { sha256 = { x86_64-linux = if cudaSupport - then "sha256-Q6a/Q4fr5cmqqkIoL8ZBJOKfF4NXnrhqFi2VgUpHC3E=" - else "sha256-RBrmxWBn5Yj5fIHlPYXuWOFMTqDGbgk+IvUXk7kIXHM="; - aarch64-linux = "sha256-MEkn2DplUW1R95q+A6uuIKNtMEBv08jU8kvTbMgIKJU="; - x86_64-darwin = "sha256-bqZTu0AABeg6M2IVwlkUPuF8EMsbQXurcmjWZY0EN9E="; - aarch64-darwin = "sha256-q1PfVqyZ3KG65aKw6l9vhxCfPoxH6Nb5y1Eh9P8Ovqk="; + then "sha256-/wB9EpaDPg3TrD9qggdA4vPgzvmaKc6dDnLjoYTJC5o=" + else "sha256-QgOaUaq0V5HG9BOv9nEw8OTSlzINNFvbnyP8Vx+r9Xw="; + aarch64-linux = "sha256-zjnRtTG1j9cZTbP0Xnk2o/zWTNsP8T0n4Ai8IiAT3PE="; + x86_64-darwin = "sha256-RBLox9rzBKcZMm4NwnT7vQ/EjapWQJkqxuQ0LIdaM1E="; + aarch64-darwin = "sha256-BRzh79lYvMHsUMk8BEYDLHTpnmeZ9+0lrDtj4XI1YY4="; }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; @@ -419,6 +419,7 @@ let }; meta = with lib; { + changelog = "https://github.com/tensorflow/tensorflow/releases/tag/v${version}"; description = "Computation using data flow graphs for scalable machine learning"; homepage = "http://tensorflow.org"; license = licenses.asl20; @@ -438,11 +439,13 @@ in buildPythonPackage { src = bazel-build.python; # Adjust dependency requirements: + # - Drop tensorflow-io dependency until we get it to build # - Relax flatbuffers and gast version requirements # - The purpose of python3Packages.libclang is not clear at the moment and we don't have it packaged yet # - keras and tensorlow-io-gcs-filesystem will be considered as optional for now. postPatch = '' sed -i setup.py \ + -e '/tensorflow-io-gcs-filesystem/,+1d' \ -e "s/'flatbuffers[^']*',/'flatbuffers',/" \ -e "s/'gast[^']*',/'gast',/" \ -e "/'libclang[^']*',/d" \ From 3bec41fb5e5e23b0972800c7dd2de4f749df058e Mon Sep 17 00:00:00 2001 From: Noah Fontes Date: Mon, 19 Sep 2022 11:53:22 -0700 Subject: [PATCH 69/76] doc/python: fix attr name for unittestCheckHook flags The name should end in Array per the current conventions. This change also contains some minor formatting fixes, as the heading levels were inconsistent. --- doc/languages-frameworks/python.section.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 7b8a804106af..0ca20617b851 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -744,17 +744,17 @@ work in any of the formats supported by `buildPythonPackage` currently, with the exception of `other` (see `format` in [`buildPythonPackage` parameters](#buildpythonpackage-parameters) for more details). -### Using unittestCheckHook {#using-unittestcheckhook} +#### Using unittestCheckHook {#using-unittestcheckhook} `unittestCheckHook` is a hook which will substitute the setuptools `test` command for a `checkPhase` which runs `python -m unittest discover`: ``` nativeCheckInputs = [ unittestCheckHook ]; - unittestFlags = [ "-s" "tests" "-v" ]; + unittestFlagsArray = [ "-s" "tests" "-v" ]; ``` -##### Using sphinxHook {#using-sphinxhook} +#### Using sphinxHook {#using-sphinxhook} The `sphinxHook` is a helpful tool to build documentation and manpages using the popular Sphinx documentation generator. From bdabb2fdc15738d490ea8f29fee3457183afd7d9 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 28 Jan 2023 21:22:40 +0000 Subject: [PATCH 70/76] torq: 0.16.15 -> 0.17.3 --- pkgs/applications/blockchains/torq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/torq/default.nix b/pkgs/applications/blockchains/torq/default.nix index 85041accbc4b..cf7722238ef7 100644 --- a/pkgs/applications/blockchains/torq/default.nix +++ b/pkgs/applications/blockchains/torq/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "torq"; - version = "0.16.15"; + version = "0.17.3"; src = fetchFromGitHub { owner = "lncapital"; repo = pname; rev = "v${version}"; - hash = "sha256-ibrPq/EC61ssn4072gTNvJg9QO41+aTsU1Hhc6X6NPk="; + hash = "sha256-fqHJZi1NQCrZqsa+N+FVYZ8s9o0D555Sqn5qNlJ1MmI="; }; vendorHash = "sha256-HETN2IMnpxnTyg6bQDpoD0saJu+gKocdEf0VzEi12Gs="; From 300f91c41d04395fa2b9bf3dca79e8fe89912c75 Mon Sep 17 00:00:00 2001 From: urlordjames <32751441+urlordjames@users.noreply.github.com> Date: Wed, 25 Jan 2023 21:56:27 -0500 Subject: [PATCH 71/76] drogon: 1.8.2 -> 1.8.3 --- pkgs/development/libraries/drogon/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix index 3df87efba19d..0eca838dfce8 100644 --- a/pkgs/development/libraries/drogon/default.nix +++ b/pkgs/development/libraries/drogon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, jsoncpp, libossp_uuid, zlib, lib +{ stdenv, fetchFromGitHub, cmake, jsoncpp, libossp_uuid, zlib, lib, fetchpatch # optional but of negligible size , openssl, brotli, c-ares # optional databases @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "drogon"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "drogonframework"; repo = "drogon"; rev = "v${version}"; - sha256 = "sha256-IpECYpPuheoLelEdgV+J26b+95fMfRmeQ44q6JvqRtw="; + sha256 = "sha256-I3f/8TMGm1G4CFMJJLyiVYso9yTHjeLefS5eaGySvC4="; fetchSubmodules = true; }; @@ -43,6 +43,12 @@ stdenv.mkDerivation rec { # this part of the test would normally fail because it attempts to configure a CMake project that uses find_package on itself # this patch makes drogon and trantor visible to the test ./fix_find_package.patch + + # see https://github.com/drogonframework/drogon/issues/1491 + (fetchpatch { + url = "https://github.com/drogonframework/drogon/commit/7d87d7e0b264ce53aa5ee006fb022d3516c9d666.patch"; + sha256 = "sha256-C4zH9oNMfhkaeVNvZuBuzu1v2vNgg/t+YPitbrmHg+Y="; + }) ]; # modifying PATH here makes drogon_ctl visible to the test From a46b82e666a75e350d4db894596304370b31bed9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 28 Jan 2023 22:53:09 +0100 Subject: [PATCH 72/76] python3Packages.scikit-learn: 1.2.0 -> 1.2.1 https://scikit-learn.org/stable/whats_new/v1.2.html#version-1-2-1 --- pkgs/development/python-modules/scikit-learn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index dbe2d10b780a..7499eb6e9de9 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "1.2.0"; + version = "1.2.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-aAtls8ruRpVBOF0spbA/9wQI9sYYxYOUgxLw0hJd9oA="; + sha256 = "sha256-+/ilyJPJtLmbzH7Y+z6FAJV6ET9BAYYDhtBmNVIPfPs="; }; buildInputs = [ From ba610e8aea88265f5dbb7495dab30c795769b57b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 28 Jan 2023 23:27:20 +0100 Subject: [PATCH 73/76] python3Packages.umap-learn: Fix sklearn 1.2.0 compat --- .../python-modules/umap-learn/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix index 79d7e40bbc94..001a5f1b4208 100644 --- a/pkgs/development/python-modules/umap-learn/default.nix +++ b/pkgs/development/python-modules/umap-learn/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , keras , numba , numpy @@ -27,6 +28,22 @@ buildPythonPackage rec { hash = "sha256-S2+k7Ec4AxsN6d0GUGnU81oLnBgmlZp8OmUFCNaUJYw="; }; + patches = [ + # Fix tests with sklearn>=1.2.0 + (fetchpatch { + url = "https://github.com/lmcinnes/umap/commit/a714b59bd9e2ca2e63312bc3491b2b037a42f2f2.patch"; + hash = "sha256-WOSWNN5ewVTV7IEBEA7ZzgZYMZxctF1jAWs9ylKTyLs="; + }) + (fetchpatch { + url = "https://github.com/lmcinnes/umap/commit/c7d05683325589ad432a55e109cacb9d631cfaa9.patch"; + hash = "sha256-hE2Svxf7Uja+DbCmTDCnd7mZynjNbC5GUjfqg4ZRO9Y="; + }) + (fetchpatch { + url = "https://github.com/lmcinnes/umap/commit/949abd082524fce8c45dfb147bcd8e8ef49eade3.patch"; + hash = "sha256-8/1k8iYeF77FIaUApNtY07auPJkrt3vNRR/HTYRvq+0="; + }) + ]; + propagatedBuildInputs = [ numba numpy From 332a06e011fe738f261b655602da62df793b7237 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Mon, 23 Jan 2023 23:20:49 +0100 Subject: [PATCH 74/76] pythonPackages.drawille: init at 0.1.0 --- .../python-modules/drawille/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/drawille/default.nix diff --git a/pkgs/development/python-modules/drawille/default.nix b/pkgs/development/python-modules/drawille/default.nix new file mode 100644 index 000000000000..a00b0b16892b --- /dev/null +++ b/pkgs/development/python-modules/drawille/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "drawille"; + version = "0.1.0"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-t4nS8TWbEGKHibIbLfZZycPQxTiEzuJ7DYsa6Twi+8s="; + }; + + doCheck = false; # pypi package has no tests, git has no tags + + pythonImportsCheck = [ + "drawille" + ]; + + meta = with lib; { + description = "Drawing in terminal with unicode braille characters"; + homepage = "https://github.com/asciimoo/drawille"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ nobbz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 94ed8a184db9..dfcd4127b3fb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2814,6 +2814,8 @@ self: super: with self; { dragonfly = callPackage ../development/python-modules/dragonfly { }; + drawille = callPackage ../development/python-modules/drawille { }; + dremel3dpy = callPackage ../development/python-modules/dremel3dpy { }; drf-jwt = callPackage ../development/python-modules/drf-jwt { }; From ac3d289481a3d4519cfce58a3a56d630416dbbcf Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 24 Jan 2023 08:49:45 +0100 Subject: [PATCH 75/76] pythonPackages.drawilleplot: init at 0.1.0 --- .../python-modules/drawilleplot/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/drawilleplot/default.nix diff --git a/pkgs/development/python-modules/drawilleplot/default.nix b/pkgs/development/python-modules/drawilleplot/default.nix new file mode 100644 index 000000000000..1ed452c1d109 --- /dev/null +++ b/pkgs/development/python-modules/drawilleplot/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, drawille +, matplotlib +}: + +buildPythonPackage rec { + pname = "drawilleplot"; + version = "0.1.0"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-ZEDroo7KkI2VxdESb2QDX+dPY4UahuuK9L0EddrxJjQ="; + }; + + doCheck = false; # does not have any tests at all + + propagatedBuildInputs = [ + drawille + matplotlib + ]; + + pythonImportsCheck = [ + "drawilleplot" + ]; + + meta = with lib; { + description = "matplotlib backend for graph output in unicode terminals using drawille"; + homepage = "https://github.com/gooofy/drawilleplot"; + license = licenses.asl20; + maintainers = with maintainers; [ nobbz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dfcd4127b3fb..ed5abdbd50c8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2816,6 +2816,8 @@ self: super: with self; { drawille = callPackage ../development/python-modules/drawille { }; + drawilleplot = callPackage ../development/python-modules/drawilleplot { }; + dremel3dpy = callPackage ../development/python-modules/dremel3dpy { }; drf-jwt = callPackage ../development/python-modules/drf-jwt { }; From ac47db290b0600c64649d19dea8aa0ca5b3bd2e7 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 24 Jan 2023 11:14:21 +0100 Subject: [PATCH 76/76] hledger-utils: init at 1.12.1 --- .../python-modules/hledger-utils/default.nix | 68 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 71 insertions(+) create mode 100644 pkgs/development/python-modules/hledger-utils/default.nix diff --git a/pkgs/development/python-modules/hledger-utils/default.nix b/pkgs/development/python-modules/hledger-utils/default.nix new file mode 100644 index 000000000000..58fe5f3e8714 --- /dev/null +++ b/pkgs/development/python-modules/hledger-utils/default.nix @@ -0,0 +1,68 @@ +{ lib +, buildPythonPackage +, fetchFromGitLab +, setuptools +, setuptools-scm +, unittestCheckHook +, hledger +, perl +, rich +, pandas +, scipy +, psutil +, matplotlib +, drawilleplot +, asteval +}: + +buildPythonPackage rec { + pname = "hledger-utils"; + version = "1.12.1"; + + format = "pyproject"; + + src = fetchFromGitLab { + owner = "nobodyinperson"; + repo = "hledger-utils"; + rev = "refs/tags/v${version}"; + hash = "sha256-uAFqBNRET3RaWDTyV53onrBs1fjPR4b5rAvg5lweUN0="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + rich + pandas + scipy + psutil + matplotlib + drawilleplot + asteval + ]; + + checkInputs = [ + unittestCheckHook + ]; + + nativeCheckInputs = [ + hledger + perl + ]; + + preCheck = '' + export PATH=$out/bin:$PATH + ''; + + meta = with lib; { + description = "Utilities extending hledger"; + homepage = "https://gitlab.com/nobodyinperson/hledger-utils"; + license = with licenses; [cc0 cc-by-40 gpl3]; + maintainers = with maintainers; [ nobbz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf00bf10fc8b..d58b4e4c5687 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29831,6 +29831,7 @@ with pkgs; hledger-interest = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-interest; hledger-ui = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-ui; hledger-web = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-web; + hledger-utils = with python3.pkgs; toPythonApplication hledger-utils; homebank = callPackage ../applications/office/homebank { gtk = gtk3; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ed5abdbd50c8..81a7953e44f7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4319,6 +4319,8 @@ self: super: with self; { hkdf = callPackage ../development/python-modules/hkdf { }; + hledger-utils = callPackage ../development/python-modules/hledger-utils { }; + hlk-sw16 = callPackage ../development/python-modules/hlk-sw16 { }; hmmlearn = callPackage ../development/python-modules/hmmlearn { };