From 5453971b64ed41244c00ffa67f2b08fec7825ae7 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 5 Dec 2022 15:21:01 +0100 Subject: [PATCH 01/39] usbmuxd2: init at unstable-2022-02-07 --- pkgs/tools/misc/usbmuxd2/default.nix | 85 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 87 insertions(+) create mode 100644 pkgs/tools/misc/usbmuxd2/default.nix diff --git a/pkgs/tools/misc/usbmuxd2/default.nix b/pkgs/tools/misc/usbmuxd2/default.nix new file mode 100644 index 000000000000..f4ac629d073c --- /dev/null +++ b/pkgs/tools/misc/usbmuxd2/default.nix @@ -0,0 +1,85 @@ +{ lib +, clangStdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, libimobiledevice +, libusb1 +, avahi +, clang +}: let + + libgeneral = clangStdenv.mkDerivation rec { + pname = "libgeneral"; + version = "unstable-2021-12-12"; + src = fetchFromGitHub { + owner = "tihmstar"; + repo = pname; + rev = "017d71edb0a12ff4fa01a39d12cd297d8b3d8d34"; + sha256 = "sha256-NrSl/BeKe3wahiYTHGRVSq3PLgQfu76kHCC5ziY7cgQ="; + }; + postPatch = '' + # Set package version so we don't require git + sed -i '/AC_INIT/s/m4_esyscmd.*/${version})/' configure.ac + ''; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + meta = with lib; { + description = "Helper library used by usbmuxd2"; + homepage = "https://github.com/tihmstar/libgeneral"; + license = licenses.lgpl21; + platforms = platforms.all; + }; + }; + +in +clangStdenv.mkDerivation rec { + pname = "usbmuxd2"; + version = "unstable-2022-02-07"; + + src = fetchFromGitHub { + owner = "tihmstar"; + repo = pname; + rev = "753b79eaf317c56df6c8b1fb6da5847cc54a0bb0"; + hash = "sha256-T9bt3KOJwFpdPeFuXfBhkBZNaNzix3Q3D47vASR+fVg="; + }; + + postPatch = '' + # Set package version so we don't require git + sed -i '/AC_INIT/s/m4_esyscmd.*/${version})/' configure.ac + # Do not check libgeneral version + sed -i 's/libgeneral >= 39/libgeneral/' configure.ac + ''; + + nativeBuildInputs = [ + autoreconfHook + clang + pkg-config + ]; + + propagatedBuildInputs = [ + avahi + libgeneral + libimobiledevice + libusb1 + ]; + + configureFlags = [ + "--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d" + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + ]; + + makeFlags = [ + "sbindir=${placeholder "out"}/bin" + ]; + + meta = with lib; { + homepage = "https://github.com/tihmstar/usbmuxd2"; + description = "A socket daemon to multiplex connections from and to iOS devices"; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b721e3997ba..5b2e7deb45c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12550,6 +12550,8 @@ with pkgs; usbmuxd = callPackage ../tools/misc/usbmuxd {}; + usbmuxd2 = callPackage ../tools/misc/usbmuxd2 {}; + ustreamer = callPackage ../applications/video/ustreamer { }; usync = callPackage ../applications/misc/usync { }; From cbd77f4e7455d9641ebfaad71144afef32a6beef Mon Sep 17 00:00:00 2001 From: Florian Warzecha Date: Fri, 9 Dec 2022 18:22:03 +0100 Subject: [PATCH 02/39] linuxPackages.tuxedo-keyboard: 3.0.9 -> 3.1.1 Expose the uniwill-wmi module in addition to the already exported modules. That module is required to run the Tuxedo Control Center and as a dependency of the tuxedo-keyboard module. --- pkgs/os-specific/linux/tuxedo-keyboard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix index f122aaf641db..effba31ef8fd 100644 --- a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix +++ b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tuxedo-keyboard-${kernel.version}"; - version = "3.0.9"; + version = "3.1.1"; src = fetchFromGitHub { owner = "tuxedocomputers"; repo = "tuxedo-keyboard"; rev = "v${version}"; - sha256 = "HGN2CKJ76FzgKkOsU5pLMsRl7hEGMcZ8Loa2YP0P558="; + sha256 = "+59/5vfwx9fys7Q63SahVPS/ckvwkr4w6T37UqAnwZ4="; }; buildInputs = [ linuxHeaders ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out/lib/modules/${kernel.modDirVersion}" - for module in clevo_acpi.ko clevo_wmi.ko tuxedo_keyboard.ko tuxedo_io/tuxedo_io.ko; do + for module in clevo_acpi.ko clevo_wmi.ko tuxedo_keyboard.ko tuxedo_io/tuxedo_io.ko uniwill_wmi.ko; do mv src/$module $out/lib/modules/${kernel.modDirVersion} done ''; From 9be81d0acfd8a5ac8c6a2222255ea9665f66d511 Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Tue, 13 Dec 2022 02:47:50 +0100 Subject: [PATCH 03/39] nixos/grafana: allow @chown syscalls when using unix sockets Grafana will unconditionally call chown on the socket after creating it, even if the configuration does not ask for a different socket gid. --- nixos/modules/services/monitoring/grafana.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 9b3068796d8e..5061666f57ce 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -1291,7 +1291,10 @@ in { SystemCallArchitectures = "native"; # Upstream grafana is not setting SystemCallFilter for compatibility # reasons, see https://github.com/grafana/grafana/pull/40176 - SystemCallFilter = [ "@system-service" "~@privileged" ]; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ] ++ lib.optional (cfg.settings.server.protocol == "socket") [ "@chown" ]; UMask = "0027"; }; preStart = '' From a0b60725473c3f0646f5b6f9b1352a8d848c8b9e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 14 Dec 2022 13:57:51 +0100 Subject: [PATCH 04/39] nixos/grafana: add test case for socket proxy --- nixos/tests/grafana/basic.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/nixos/tests/grafana/basic.nix b/nixos/tests/grafana/basic.nix index f6566d449709..8bf4caad7fbf 100644 --- a/nixos/tests/grafana/basic.nix +++ b/nixos/tests/grafana/basic.nix @@ -25,6 +25,22 @@ let extraNodeConfs = { sqlite = {}; + socket = { config, ... }: { + services.grafana.settings.server = { + protocol = "socket"; + socket = "/run/grafana/sock"; + socket_gid = config.users.groups.nginx.gid; + }; + + users.users.grafana.extraGroups = [ "nginx" ]; + + services.nginx = { + enable = true; + recommendedProxySettings = true; + virtualHosts."_".locations."/".proxyPass = "http://unix:/run/grafana/sock"; + }; + }; + declarativePlugins = { services.grafana.declarativePlugins = [ pkgs.grafanaPlugins.grafana-clock-panel ]; }; @@ -92,6 +108,17 @@ in { ) sqlite.shutdown() + with subtest("Successful API query as admin user with sqlite db listening on socket"): + socket.wait_for_unit("grafana.service") + socket.wait_for_open_port(80) + print(socket.succeed( + "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1/api/org/users -i" + )) + socket.succeed( + "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1/api/org/users | grep admin\@localhost" + ) + socket.shutdown() + with subtest("Successful API query as admin user with postgresql db"): postgresql.wait_for_unit("grafana.service") postgresql.wait_for_unit("postgresql.service") From 83f6beddab6999712d93f4f865055be4f0d0c63f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 18 Dec 2022 19:43:30 +0000 Subject: [PATCH 05/39] clisp: pin to readline6 to fix the build On readline8 clisp fails to find the variables and fails to build: https://hydra.nixos.org/log/rbykd92038rp80a71diyxqmbiz4m8f60-clisp-2.49.drv *** - FFI::FIND-FOREIGN-VARIABLE: foreign variable # does not have the required size or alignment The pin back fixes build for me. Noticed by Athas on libera/#nixos. --- pkgs/top-level/all-packages.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 780477ad777b..b57d68294731 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15809,7 +15809,13 @@ with pkgs; openssl = openssl_1_1; }; - clisp = callPackage ../development/interpreters/clisp { }; + clisp = callPackage ../development/interpreters/clisp { + # On newer readline8 fails as: + # # + # does not have the required size or alignment + readline = readline6; + }; + clisp-tip = callPackage ../development/interpreters/clisp/hg.nix { }; clojupyter = callPackage ../applications/editors/jupyter-kernels/clojupyter { From 90500667a009a204f4126508b29aeef5bcb4201d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Dec 2022 21:24:43 +0100 Subject: [PATCH 06/39] python310Packages.phonenumbers: 8.12.57 -> 8.13.2 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index ff8265beac92..5123b9be6856 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.57"; + version = "8.13.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BX0ZZpYvuGs9xEe/rCyOJc7td0UJ5JsYCSahOpmRAxg="; + hash = "sha256-AXn2iNSMDn4WHre52G1YeUCvH1F0+Xwf39iTxZnA2Uo="; }; checkInputs = [ From 71223d3bae2b7ab1460edfd3b826c3685d922510 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Dec 2022 21:37:21 +0100 Subject: [PATCH 07/39] python310Packages.pre-commit-hooks: add changelog to meta --- pkgs/development/python-modules/pre-commit-hooks/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pre-commit-hooks/default.nix b/pkgs/development/python-modules/pre-commit-hooks/default.nix index db3aef0b2bb0..7d335eb4c128 100644 --- a/pkgs/development/python-modules/pre-commit-hooks/default.nix +++ b/pkgs/development/python-modules/pre-commit-hooks/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-qdsSM+7ScSfxhmLAqwi1iraGHrhb5NBee/j+TKr2WUA="; + hash = "sha256-qdsSM+7ScSfxhmLAqwi1iraGHrhb5NBee/j+TKr2WUA="; }; propagatedBuildInputs = [ @@ -55,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Some out-of-the-box hooks for pre-commit"; homepage = "https://github.com/pre-commit/pre-commit-hooks"; + changelog = "https://github.com/pre-commit/pre-commit-hooks/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; }; From b4dd2e11c9a4a7f8c9417ea67a4f89319909af6e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Dec 2022 21:40:01 +0100 Subject: [PATCH 08/39] python310Packages.pre-commit-hooks: 4.3.0 -> 4.4.0 Diff: https://github.com/pre-commit/pre-commit-hooks/compare/refs/tags/v4.3.0...v4.4.0 Changelog: https://github.com/pre-commit/pre-commit-hooks/blob/v4.4.0/CHANGELOG.md --- pkgs/development/python-modules/pre-commit-hooks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pre-commit-hooks/default.nix b/pkgs/development/python-modules/pre-commit-hooks/default.nix index 7d335eb4c128..23d4c3f7f5f4 100644 --- a/pkgs/development/python-modules/pre-commit-hooks/default.nix +++ b/pkgs/development/python-modules/pre-commit-hooks/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pre-commit-hooks"; - version = "4.3.0"; + version = "4.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qdsSM+7ScSfxhmLAqwi1iraGHrhb5NBee/j+TKr2WUA="; + hash = "sha256-V23pgHQ9GdZ2mukFEMAhkp+dl/CQTGxWHAhF7s1VvHo="; }; propagatedBuildInputs = [ From f76ec8395344718882cc94342e09b090f0c99273 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Dec 2022 21:09:49 +0000 Subject: [PATCH 09/39] python310Packages.trimesh: 3.15.8 -> 3.17.1 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 56f79842c7a4..8384c45e6600 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.15.8"; + version = "3.17.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bFUDm6/4XUyyrMxc1KKqbVi1gmUJ7Lxonei/HxlmGwI="; + sha256 = "sha256-Aluy+jouh73Whz8R20Wnyhkhby+Lau0pFA/KV+MsKY4="; }; propagatedBuildInputs = [ numpy ]; From eab197845fbc9849b97a4957cc7ffee55e9436ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Dec 2022 04:22:02 +0000 Subject: [PATCH 10/39] appthreat-depscan: 3.5.0 -> 3.5.3 --- pkgs/development/tools/appthreat-depscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/appthreat-depscan/default.nix b/pkgs/development/tools/appthreat-depscan/default.nix index 63d7a3919511..461b250fa6b9 100644 --- a/pkgs/development/tools/appthreat-depscan/default.nix +++ b/pkgs/development/tools/appthreat-depscan/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "appthreat-depscan"; - version = "3.5.0"; + version = "3.5.3"; src = fetchFromGitHub { owner = "AppThreat"; repo = "dep-scan"; rev = "refs/tags/v${version}"; - hash = "sha256-kwur74jaAjGch4Jruq6OX1lWqX8b3NZYvxxNsp+n/TI="; + hash = "sha256-D/i1KGKPuhayKU8jaXhWnVgpU5Z/SG12AW8R7bgSQh8="; }; propagatedBuildInputs = with python3.pkgs; [ From 74adcac57c6bac86e9ac10fce02e6f28c61ea608 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 09:29:30 +0100 Subject: [PATCH 11/39] python310Packages.aiolifx-themes: 0.3.0 -> 0.4.0 Diff: https://github.com/Djelibeybi/aiolifx-themes/compare/refs/tags/v0.3.0...v0.4.0 Changelog: https://github.com/Djelibeybi/aiolifx-themes/releases/tag/v0.4.0 --- pkgs/development/python-modules/aiolifx-themes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index 98d86b25c67f..8263104c3915 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiolifx-themes"; - version = "0.3.0"; + version = "0.4.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Djelibeybi"; repo = "aiolifx-themes"; rev = "refs/tags/v${version}"; - hash = "sha256-2ZruUkSpLclsz3ZSyTM+UshfGG4bHwfQMM8UFjlkvBg="; + hash = "sha256-U3hIKmgnafkuVLi1r42BBXDKVcSSvLaRnmOEANasEyY="; }; prePatch = '' From acbe577109cadefae67cc5aac89ea233453d8091 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 09:41:50 +0100 Subject: [PATCH 12/39] python310Packages.types-python-dateutil: 2.8.19.4 -> 2.8.19.5 --- .../python-modules/types-python-dateutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-python-dateutil/default.nix b/pkgs/development/python-modules/types-python-dateutil/default.nix index acf092b8411c..39430b92140d 100644 --- a/pkgs/development/python-modules/types-python-dateutil/default.nix +++ b/pkgs/development/python-modules/types-python-dateutil/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-python-dateutil"; - version = "2.8.19.4"; + version = "2.8.19.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-NRqMqa/UrqZi+HwXJNLhrln59fmWkb47OxHSOTzTqqE="; + hash = "sha256-q5H8X3FffXbZpQ09100MaN/jilTwI5z6BQZXWuTYep0="; }; # Modules doesn't have tests From 435b8a6d639d54c95994d3e12d0d7739ed679320 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 09:42:17 +0100 Subject: [PATCH 13/39] python310Packages.types-pytz: 2022.6.0.1 -> 2022.7.0.0 --- pkgs/development/python-modules/types-pytz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index 7ba9ad6d971a..e1ff2f67a315 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2022.6.0.1"; + version = "2022.7.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0HgZY3TRJ36fmYTUk3PqBDzyxk1dXEkfvIbCWFV71G8="; + sha256 = "sha256-TyDClTs6OgWH6USJ7EyeAsPTrtubpc1+eW4S9M+nAn4="; }; # Modules doesn't have tests From 49836f4b8df454f6cca4d290cb8ee5611959134c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 09:42:30 +0100 Subject: [PATCH 14/39] python310Packages.types-redis: 4.3.21.3 -> 4.3.21.6 --- pkgs/development/python-modules/types-redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index 8928dda88fef..e69d9dc8ec48 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.3.21.3"; + version = "4.3.21.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Lh8YQFYYjIdU3tC1Fz3AGCTSv+QZdf4xgGimi+7ftiw="; + sha256 = "sha256-95afc6D3np54lfBToG2LQp+3tdT+Emm47kBGM4j2U60="; }; # Module doesn't have tests From 0e23c91f087f0eac1df01c27b289749ce31a8e88 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 09:42:47 +0100 Subject: [PATCH 15/39] python310Packages.types-typed-ast: 1.5.8.1 -> 1.5.8.3 --- pkgs/development/python-modules/types-typed-ast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-typed-ast/default.nix b/pkgs/development/python-modules/types-typed-ast/default.nix index f9bc60a8b92c..fe16137f19a8 100644 --- a/pkgs/development/python-modules/types-typed-ast/default.nix +++ b/pkgs/development/python-modules/types-typed-ast/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-typed-ast"; - version = "1.5.8.1"; + version = "1.5.8.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-9kwV7ATAkRgZrEwP0AUnlRMgAfv16iPR1+T+rX3km/w="; + hash = "sha256-OmK8JRaPi0TOdOERT5+8Luh9bpbjiAy+85qtlSJVW04="; }; # Module doesn't have tests From 2198c022f828e821d493fdd5402b8299fcc71356 Mon Sep 17 00:00:00 2001 From: = Date: Thu, 8 Dec 2022 05:43:16 +0000 Subject: [PATCH 16/39] gitlab: 15.6.1 -> 15.6.2 --- pkgs/applications/version-management/gitlab/data.json | 10 +++++----- .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- .../version-management/gitlab/rubyEnv/Gemfile | 3 +-- .../version-management/gitlab/rubyEnv/Gemfile.lock | 4 ++-- .../version-management/gitlab/rubyEnv/gemset.nix | 9 ++++++--- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index fe0bed84b505..6a9707dd4110 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "15.6.1", - "repo_hash": "sha256-cdwfljmJvApU2q0pmWSmcMnHkQH4hfN7+cld5oP880g=", + "version": "15.6.2", + "repo_hash": "sha256-WMDst9BHjqK5UIYKzqJJnhrLPHxV0PmW+r8FGBueBs8=", "yarn_hash": "0lgl8rs9mlrwpzq75rywdbjbiib17wxvzlv1jibnx66iw1ym2rvh", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.6.1-ee", + "rev": "v15.6.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.6.1", + "GITALY_SERVER_VERSION": "15.6.2", "GITLAB_PAGES_VERSION": "1.63.0", "GITLAB_SHELL_VERSION": "14.13.0", - "GITLAB_WORKHORSE_VERSION": "15.6.1" + "GITLAB_WORKHORSE_VERSION": "15.6.2" }, "vendored_gems": [ "bundler-checksum", diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 14e9344b1854..5f47a29cf1e5 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.6.1"; + version = "15.6.2"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -22,7 +22,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-mzX+6kMXqdrxqMaUwN2tG5kJgKSRv0/tNN8ibHqBbzU="; + sha256 = "sha256-or5Z96BCLFUC4r9bAZf9ytUOt4WozqwwuWGFuX2ix9k="; }; vendorSha256 = "sha256-SEPfso27PHHpvnQwdeMQYECw/CZIa/NdpMBSTRJEwIo="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index be226c94f43b..3cf201a9fef5 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "15.6.1"; + version = "15.6.2"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index cf08454a6496..a2997bff4d3b 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -336,8 +336,7 @@ gem 'pg_query', '~> 2.2' gem 'premailer-rails', '~> 1.10.3' -# LabKit: Tracing and Correlation -gem 'gitlab-labkit', '~> 0.28.0' +gem 'gitlab-labkit', '~> 0.29.0' gem 'thrift', '>= 0.16.0' # I18n diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 2174cec05f8a..c179654f21dd 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -575,7 +575,7 @@ GEM fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.28.0) + gitlab-labkit (0.29.0) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) grpc (>= 1.37) @@ -1668,7 +1668,7 @@ DEPENDENCIES gitlab-dangerfiles (~> 3.6.2) gitlab-experiment (~> 0.7.1) gitlab-fog-azure-rm (~> 1.4.0) - gitlab-labkit (~> 0.28.0) + gitlab-labkit (~> 0.29.0) gitlab-license (~> 2.2.1) gitlab-mail_room (~> 0.0.9) gitlab-markup (~> 1.8.0) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 54d4cfb85aab..8338a10cbe02 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -290,6 +290,9 @@ }; version = "0.2.0"; }; + attr_encrypted = { + dependencies = ["encryptor"]; + }; attr_required = { groups = ["default"]; platforms = []; @@ -1093,7 +1096,7 @@ version = "4.8.1"; }; devise-two-factor = { - dependencies = ["activesupport" "devise" "railties" "rotp"]; + dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"]; groups = ["default"]; platforms = []; source = { @@ -2084,10 +2087,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m2n5lvnm5nxn7bc6bqm3ycwk47kck6nl1c0s83pcvsn6qizbsx7"; + sha256 = "09xlv72nbys9a5iqvhxfzdr7vy3s3m2a6ixqb9vq71k925faq6gb"; type = "gem"; }; - version = "0.28.0"; + version = "0.29.0"; }; gitlab-license = { groups = ["default"]; From 8aeaaac2390963b30098cbe0258b4ddcdd4331c1 Mon Sep 17 00:00:00 2001 From: = Date: Thu, 8 Dec 2022 05:44:44 +0000 Subject: [PATCH 17/39] gitlab: workaround: remove attr_encrypted gem from rubyEnv --- .../version-management/gitlab/rubyEnv/gemset.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 8338a10cbe02..69ac4830afce 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -290,9 +290,6 @@ }; version = "0.2.0"; }; - attr_encrypted = { - dependencies = ["encryptor"]; - }; attr_required = { groups = ["default"]; platforms = []; @@ -1096,7 +1093,7 @@ version = "4.8.1"; }; devise-two-factor = { - dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"]; + dependencies = ["activesupport" "devise" "railties" "rotp"]; groups = ["default"]; platforms = []; source = { From f7089f73c09b3834a9998893c7e60789fae80b26 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 09:48:55 +0100 Subject: [PATCH 18/39] python310Packages.yfinance: add changelog to meta --- pkgs/development/python-modules/yfinance/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 1a5e718d451b..4614833a44bc 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -41,8 +41,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Yahoo! Finance market data downloader (+faster Pandas Datareader)"; - homepage = "https://aroussi.com/post/python-yahoo-finance"; + description = "Module to doiwnload Yahoo! Finance market data"; + homepage = "https://github.com/ranaroussi/yfinance"; + changelog = "https://github.com/ranaroussi/yfinance/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; }; From 3c5393bfdb7e5c826b1cc4d2a2bc66849dcc7919 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 09:49:50 +0100 Subject: [PATCH 19/39] python310Packages.yfinance: 0.1.77 -> 0.1.80 Diff: https://github.com/ranaroussi/yfinance/compare/refs/tags/0.1.77...0.1.80 Changelog: https://github.com/ranaroussi/yfinance/blob/0.1.80/CHANGELOG.rst --- pkgs/development/python-modules/yfinance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 4614833a44bc..6cd2a0ab594b 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.1.77"; + version = "0.1.80"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gg9wX3WWacS5BmbR1wgdicFxhPN5b45KH0+obWmJ65g="; + hash = "sha256-Kf9zXfZtt27ZzQDeqUErbxDQqye51+4RIoZ3BAbUL0U="; }; propagatedBuildInputs = [ From 62ab4ceea4e378b8a2f7267f4e68d4497ecec30c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 09:50:04 +0100 Subject: [PATCH 20/39] python310Packages.yfinance: 0.1.80 -> 0.1.82 Diff: https://github.com/ranaroussi/yfinance/compare/refs/tags/0.1.80...0.1.82 Changelog: https://github.com/ranaroussi/yfinance/blob/0.1.82/CHANGELOG.rst --- pkgs/development/python-modules/yfinance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 6cd2a0ab594b..97608db4c7cb 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.1.80"; + version = "0.1.82"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Kf9zXfZtt27ZzQDeqUErbxDQqye51+4RIoZ3BAbUL0U="; + hash = "sha256-FCl87PtA8PeC1K1MRRba5WfwMYbEvL8N4pfC5DbcToI="; }; propagatedBuildInputs = [ From e556617f917628d63c4d53bdcec517273bacb493 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 09:50:12 +0100 Subject: [PATCH 21/39] python310Packages.yfinance: 0.1.82 -> 0.1.83 Diff: https://github.com/ranaroussi/yfinance/compare/refs/tags/0.1.82...0.1.83 Changelog: https://github.com/ranaroussi/yfinance/blob/0.1.83/CHANGELOG.rst --- pkgs/development/python-modules/yfinance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 97608db4c7cb..60d18de459bd 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.1.82"; + version = "0.1.83"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FCl87PtA8PeC1K1MRRba5WfwMYbEvL8N4pfC5DbcToI="; + hash = "sha256-1g2iEIlB+ne01nTMFC6PVvqu3iJ5+De/zDeBdRkYRHg="; }; propagatedBuildInputs = [ From b64b52c0076356fcd34250118e24d73887d3a06d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 09:50:21 +0100 Subject: [PATCH 22/39] python310Packages.yfinance: 0.1.83 -> 0.1.85 Diff: https://github.com/ranaroussi/yfinance/compare/refs/tags/0.1.83...0.1.85 Changelog: https://github.com/ranaroussi/yfinance/blob/0.1.85/CHANGELOG.rst --- pkgs/development/python-modules/yfinance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 60d18de459bd..11a506aa463a 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.1.83"; + version = "0.1.85"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-1g2iEIlB+ne01nTMFC6PVvqu3iJ5+De/zDeBdRkYRHg="; + hash = "sha256-G4NAaKd37W82NE9fMnFnTVe2ieF0VDJD6/qpaOZg1/s="; }; propagatedBuildInputs = [ From 4fdaf1097ec0ed92b58658e8451744349c20b4fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 09:50:29 +0100 Subject: [PATCH 23/39] python310Packages.yfinance: 0.1.85 -> 0.1.86 Diff: https://github.com/ranaroussi/yfinance/compare/refs/tags/0.1.85...0.1.86 Changelog: https://github.com/ranaroussi/yfinance/blob/0.1.86/CHANGELOG.rst --- pkgs/development/python-modules/yfinance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 11a506aa463a..72de40625d1f 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.1.85"; + version = "0.1.86"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-G4NAaKd37W82NE9fMnFnTVe2ieF0VDJD6/qpaOZg1/s="; + hash = "sha256-jlCqcaKQ8IFERAudNze37RJQzomN2wZCSGFNdMdu0Go="; }; propagatedBuildInputs = [ From 9c27ba3135c87304f852f62423819e130697a914 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 09:50:38 +0100 Subject: [PATCH 24/39] python310Packages.yfinance: 0.1.86 -> 0.1.89 Diff: https://github.com/ranaroussi/yfinance/compare/refs/tags/0.1.86...0.1.89 Changelog: https://github.com/ranaroussi/yfinance/blob/0.1.89/CHANGELOG.rst --- pkgs/development/python-modules/yfinance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 72de40625d1f..3a7bafd38e30 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.1.86"; + version = "0.1.89"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-jlCqcaKQ8IFERAudNze37RJQzomN2wZCSGFNdMdu0Go="; + hash = "sha256-ok7PAC+m9MyQT8DaGR8Gz7E2C8SziVYKPhqSTgtG6Qg="; }; propagatedBuildInputs = [ From b3c7a238dd25be674c9f79d69422003f64499c10 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 09:51:06 +0100 Subject: [PATCH 25/39] python310Packages.yfinance: 0.1.89 -> 0.1.90 Diff: https://github.com/ranaroussi/yfinance/compare/refs/tags/0.1.89...0.1.90 Changelog: https://github.com/ranaroussi/yfinance/blob/0.1.90/CHANGELOG.rst --- pkgs/development/python-modules/yfinance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 3a7bafd38e30..9f2b9c7da011 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.1.89"; + version = "0.1.90"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ok7PAC+m9MyQT8DaGR8Gz7E2C8SziVYKPhqSTgtG6Qg="; + hash = "sha256-iXgvHfS1/mbyORA8r2NN/nm17EeG+kin83nZTEXp5QU="; }; propagatedBuildInputs = [ From 89dc2434b47bd63e39e4c37b1aecfc0738f97bc4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 09:51:54 +0100 Subject: [PATCH 26/39] python310Packages.yfinance: 0.1.90 -> 0.1.91 Changelog: https://github.com/ranaroussi/yfinance/blob/0.1.91/CHANGELOG.rst --- pkgs/development/python-modules/yfinance/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 9f2b9c7da011..0f3db2cce56d 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -1,6 +1,7 @@ { lib , appdirs , buildPythonPackage +, cryptography , fetchFromGitHub , multitasking , numpy @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.1.90"; + version = "0.1.91"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,11 +22,12 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-iXgvHfS1/mbyORA8r2NN/nm17EeG+kin83nZTEXp5QU="; + hash = "sha256-/jNqd/cYtcapzAafIFoLqxCYcxrnmGuqtuquPowNtlM="; }; propagatedBuildInputs = [ appdirs + cryptography multitasking numpy pandas From 3f74b2b67e471a5c4e63b775a43b54bc79acc11f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 09:52:03 +0100 Subject: [PATCH 27/39] python310Packages.yfinance: 0.1.91 -> 0.1.92 Diff: https://github.com/ranaroussi/yfinance/compare/refs/tags/0.1.91...0.1.92 Changelog: https://github.com/ranaroussi/yfinance/blob/0.1.92/CHANGELOG.rst --- pkgs/development/python-modules/yfinance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 0f3db2cce56d..4780bba64d14 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.1.91"; + version = "0.1.92"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/jNqd/cYtcapzAafIFoLqxCYcxrnmGuqtuquPowNtlM="; + hash = "sha256-8KrfWdwTcxXMB+D5fmXMjw8pmAR1m+pguFIwSRNKtLU="; }; propagatedBuildInputs = [ From 36da2f615f1273a03fa6334250fb91400070b547 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 09:52:11 +0100 Subject: [PATCH 28/39] python310Packages.yfinance: 0.1.92 -> 0.1.93 Diff: https://github.com/ranaroussi/yfinance/compare/refs/tags/0.1.92...0.1.93 Changelog: https://github.com/ranaroussi/yfinance/blob/0.1.93/CHANGELOG.rst --- pkgs/development/python-modules/yfinance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 4780bba64d14..7a76ebeb8f28 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.1.92"; + version = "0.1.93"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8KrfWdwTcxXMB+D5fmXMjw8pmAR1m+pguFIwSRNKtLU="; + hash = "sha256-AyuIngXReI4PX554SuGIgoQoklFieZiEZzeVBcvPvEk="; }; propagatedBuildInputs = [ From 41456d91188621c2fbd9bb3b6f3fdda25d5e626a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 09:57:29 +0100 Subject: [PATCH 29/39] python310Packages.tweepy: add changelog to meta --- pkgs/development/python-modules/tweepy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index c530218b79fc..766c7b88f46c 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Twitter library for Python"; homepage = "https://github.com/tweepy/tweepy"; + changelog = "https://github.com/tweepy/tweepy/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; From 5b7c3a327082edd8f4ecfcb3cd94888fe17ae6b0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 09:58:51 +0100 Subject: [PATCH 30/39] python310Packages.tweepy: 4.12.0 -> 4.12.1 Diff: https://github.com/tweepy/tweepy/compare/refs/tags/v4.12.0...v4.12.1 Changelog: https://github.com/tweepy/tweepy/releases/tag/v4.12.1 --- pkgs/development/python-modules/tweepy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index 766c7b88f46c..325ce0e5fce8 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "tweepy"; - version = "4.12.0"; + version = "4.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Ru0DCl9MOrU4uZvLXDxM4txD0D/GR4eYBHvqeMcbTVA="; + hash = "sha256-jyH2qJoVFuNwZCOtl2CvuuMCpJXCvlxcaHJd7fT1XzA="; }; propagatedBuildInputs = [ From e4dc6cb94ab678fd87a4404a0cacbac65e4c53ec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 10:07:27 +0100 Subject: [PATCH 31/39] python310Packages.python-engineio: add changelog to meta --- pkgs/development/python-modules/python-engineio/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index c9b344e5acf9..a23de9c8d70c 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "v${version}"; - sha256 = "sha256-fymO9WqkYaRsHKCJHQJpySHqZor2t8BfVrfYUfYoJno="; + hash = "sha256-fymO9WqkYaRsHKCJHQJpySHqZor2t8BfVrfYUfYoJno="; }; checkInputs = [ @@ -66,6 +66,7 @@ buildPythonPackage rec { bidirectional event-based communication between clients and a server. ''; homepage = "https://github.com/miguelgrinberg/python-engineio/"; + changelog = "https://github.com/miguelgrinberg/python-engineio/blob/v${version}/CHANGES.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ mic92 ]; }; From 24c01b4df59ae6d557911138bd63d82b97a64fe0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 10:10:51 +0100 Subject: [PATCH 32/39] python310Packages.python-socketio: add changelog to meta --- pkgs/development/python-modules/python-socketio/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index a6b2bc0d247a..980e62428aff 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "v${version}"; - sha256 = "sha256-KVaBSBWLeFJYiNJYTwoExExUmUaeNJ40c/WTgTc2Y/w="; + hash = "sha256-KVaBSBWLeFJYiNJYTwoExExUmUaeNJ40c/WTgTc2Y/w="; }; propagatedBuildInputs = [ @@ -51,6 +51,7 @@ buildPythonPackage rec { bidirectional event-based communication between clients and a server. ''; homepage = "https://github.com/miguelgrinberg/python-socketio/"; + changelog = "https://github.com/miguelgrinberg/python-socketio/blob/v${version}/CHANGES.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ mic92 ]; }; From 9cf8875ab07d387d053487e79bdcf3f97146a4e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Dec 2022 09:11:53 +0000 Subject: [PATCH 33/39] python39Packages.tpm2-pytss: 1.2.0 -> 2.0.0 --- pkgs/development/python-modules/tpm2-pytss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix index 8f8d49d34f1a..947a26f4c8df 100644 --- a/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "tpm2-pytss"; - version = "1.2.0"; + version = "2.0.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OgWWTjcj3Qd4dSaCwY+fuRQpLSFn4+9o11kPR9n8a54="; + sha256 = "sha256-iN5ePKMnYh1VzGbKtwdIx1tG74T+8ax/AqDGgermr90="; }; nativeBuildInputs = [ From fba6c4a986e73eedcfc247bc4fdc1ff9ee5e5999 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 10:13:32 +0100 Subject: [PATCH 34/39] python310Packages.python-socketio: 5.7.1 -> 5.7.2 Diff: https://github.com/miguelgrinberg/python-socketio/compare/v5.7.1...v5.7.2 Changelog: https://github.com/miguelgrinberg/python-socketio/blob/v5.7.2/CHANGES.md --- .../python-modules/python-socketio/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index 980e62428aff..99cbce9ae1c3 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "5.7.1"; + version = "5.7.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,17 +23,24 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "v${version}"; - hash = "sha256-KVaBSBWLeFJYiNJYTwoExExUmUaeNJ40c/WTgTc2Y/w="; + hash = "sha256-mSFs/k+3Lp5w4WdOLKj65kOA5b+Nc1uuksVmeeqV58E="; }; propagatedBuildInputs = [ - aiohttp bidict python-engineio - requests - websocket-client ]; + passthru.optional-dependencies = { + client = [ + requests + websocket-client + ]; + asyncio_client = [ + aiohttp + ]; + }; + checkInputs = [ mock msgpack From d03e4fe4d510aae83f02a3269473bce669edffe4 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 12 Dec 2022 07:54:50 +0100 Subject: [PATCH 35/39] ocamlPackages.xenstore_transport: minor cleaning --- pkgs/development/ocaml-modules/xenstore-tool/default.nix | 2 +- pkgs/development/ocaml-modules/xenstore_transport/default.nix | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/xenstore-tool/default.nix b/pkgs/development/ocaml-modules/xenstore-tool/default.nix index 34f32e4f117c..4b6c0d89a82a 100644 --- a/pkgs/development/ocaml-modules/xenstore-tool/default.nix +++ b/pkgs/development/ocaml-modules/xenstore-tool/default.nix @@ -3,7 +3,7 @@ buildDunePackage { pname = "xenstore-tool"; - inherit (xenstore_transport) src version useDune2 minimumOCamlVersion; + inherit (xenstore_transport) src version; buildInputs = [ xenstore_transport xenstore lwt ]; diff --git a/pkgs/development/ocaml-modules/xenstore_transport/default.nix b/pkgs/development/ocaml-modules/xenstore_transport/default.nix index 1981f2d5cabb..a7fb853f3bec 100644 --- a/pkgs/development/ocaml-modules/xenstore_transport/default.nix +++ b/pkgs/development/ocaml-modules/xenstore_transport/default.nix @@ -4,8 +4,7 @@ buildDunePackage rec { pname = "xenstore_transport"; version = "1.3.0"; - minimumOCamlVersion = "4.04"; - useDune2 = true; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "xapi-project"; From 0a95411b713688133b0227363fce49de48f32313 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 12 Dec 2022 07:54:55 +0100 Subject: [PATCH 36/39] =?UTF-8?q?ocamlPackages.xenstore:=202.1.1=20?= =?UTF-8?q?=E2=86=92=202.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/xenstore/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/xenstore/default.nix b/pkgs/development/ocaml-modules/xenstore/default.nix index 189920290e37..745752947232 100644 --- a/pkgs/development/ocaml-modules/xenstore/default.nix +++ b/pkgs/development/ocaml-modules/xenstore/default.nix @@ -1,25 +1,23 @@ { lib, buildDunePackage, fetchurl -, cstruct, ppx_cstruct, lwt, ounit, stdlib-shims +, cstruct, ppx_cstruct, lwt, ounit2 }: buildDunePackage rec { pname = "xenstore"; - version = "2.1.1"; + version = "2.2.0"; - minimumOCamlVersion = "4.04"; - - useDune2 = true; + minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/mirage/ocaml-xenstore/releases/download/${version}/xenstore-${version}.tbz"; - sha256 = "283814ea21adc345c4d59cfcb17b2f7c1185004ecaecc3871557c961874c84f5"; + url = "https://github.com/mirage/ocaml-xenstore/releases/download/v${version}/xenstore-${version}.tbz"; + hash = "sha256-1Mnqtt5zHeRdYJHvhdQNjN8d4yxUEKD2cpwtoc7DGC0="; }; nativeBuildInputs = [ ppx_cstruct ]; - propagatedBuildInputs = [ stdlib-shims cstruct lwt ]; + propagatedBuildInputs = [ cstruct lwt ]; doCheck = true; - checkInputs = [ ounit ]; + checkInputs = [ ounit2 ]; meta = with lib; { description = "Xenstore protocol in pure OCaml"; From 07589a631c1556399c55bff3d651ad682a0747da Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 10:19:40 +0100 Subject: [PATCH 37/39] python310Packages.tpm2-pytss: add changelog to meta --- .../development/python-modules/tpm2-pytss/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix index 947a26f4c8df..0f67fe231a33 100644 --- a/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -19,16 +19,18 @@ buildPythonPackage rec { pname = "tpm2-pytss"; version = "2.0.0"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-iN5ePKMnYh1VzGbKtwdIx1tG74T+8ax/AqDGgermr90="; + hash = "sha256-iN5ePKMnYh1VzGbKtwdIx1tG74T+8ax/AqDGgermr90="; }; nativeBuildInputs = [ cffi - pkgconfig # this is the python module + pkgconfig # this is the Python module pkg-config # this is the actual pkg-config tool setuptools-scm ]; @@ -52,10 +54,13 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "tpm2_pytss" ]; + pythonImportsCheck = [ + "tpm2_pytss" + ]; meta = with lib; { homepage = "https://github.com/tpm2-software/tpm2-pytss"; + changelog = "https://github.com/tpm2-software/tpm2-pytss/blob/${version}/CHANGELOG.md"; description = "TPM2 TSS Python bindings for Enhanced System API (ESYS)"; license = licenses.bsd2; maintainers = with maintainers; [ baloo ]; From 9c8472b021cb2018a0790d2b98d557d217276531 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 10:24:52 +0100 Subject: [PATCH 38/39] python310Packages.ripe-atlas-cousteau: add changelog to meta --- .../ripe-atlas-cousteau/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix b/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix index 6d3c9d5e397d..730560a00821 100644 --- a/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix +++ b/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix @@ -1,24 +1,27 @@ { lib -, python-dateutil -, python-socketio -, requests -, jsonschema -, pythonOlder -, pytestCheckHook , buildPythonPackage , fetchFromGitHub +, jsonschema +, pytestCheckHook +, python-dateutil +, python-socketio +, pythonOlder +, requests }: buildPythonPackage rec { pname = "ripe-atlas-cousteau"; version = "1.5.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "RIPE-NCC"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EHZt9Po/1wDwDacXUCVGcuVSOwcIkPCT2JCKGchu8G4="; + hash = "sha256-EHZt9Po/1wDwDacXUCVGcuVSOwcIkPCT2JCKGchu8G4="; }; postPatch = '' @@ -44,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client library for RIPE ATLAS API"; homepage = "https://github.com/RIPE-NCC/ripe-atlas-cousteau"; + changelog = "https://github.com/RIPE-NCC/ripe-atlas-cousteau/blob/v${version}/CHANGES.rst"; license = licenses.gpl3Only; maintainers = with maintainers; [ raitobezarius ]; }; From 38ddf5a423de63c14b9816bc6a28c055d908edbd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Dec 2022 10:26:34 +0100 Subject: [PATCH 39/39] python310Packages.ripe-atlas-cousteau: adjust python-socketio input --- pkgs/development/python-modules/ripe-atlas-cousteau/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix b/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix index 730560a00821..34b22109d8e4 100644 --- a/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix +++ b/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { python-dateutil requests python-socketio - ]; + ] ++ python-socketio.optional-dependencies.client; checkInputs = [ pytestCheckHook