From 4822155d49fba8bd8adec7212b6c71517b60e10e Mon Sep 17 00:00:00 2001 From: Craig Hall Date: Sat, 20 Jun 2020 17:12:52 +0100 Subject: [PATCH 001/207] nixos/hostapd: Remove blank default for cfg.interface Leaving this blank leads to a confusing error about systemd unit dependencies. --- nixos/modules/services/networking/hostapd.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 5d73038363a9..0a26c466bb0e 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -66,7 +66,6 @@ in }; interface = mkOption { - default = ""; example = "wlp2s0"; description = '' The interfaces hostapd will use. From 8b7740d1b2fc6f9e89bf405ba090e5931a8e8546 Mon Sep 17 00:00:00 2001 From: Craig Hall Date: Sat, 20 Jun 2020 17:14:42 +0100 Subject: [PATCH 002/207] nixos/hostapd: Disable insecure TKIP by default It's possible that setting wpa=2 disables TKIP anyway, but on my machine I could not get 802.11n to work without setting rsn_pairwise=CCMP. N.B. rsn_pairwise takes its default from wpa_pairwise. --- nixos/modules/services/networking/hostapd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 0a26c466bb0e..b1abf88b0d99 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -34,6 +34,7 @@ let ${optionalString cfg.wpa '' wpa=2 + wpa_pairwise=CCMP wpa_passphrase=${cfg.wpaPassphrase} ''} ${optionalString cfg.noScan "noscan=1"} From 5d012c4bb21fa9bee9f34339f95ef8fffa052d56 Mon Sep 17 00:00:00 2001 From: Craig Hall Date: Sat, 20 Jun 2020 17:29:26 +0100 Subject: [PATCH 003/207] nixos/hostapd: Enable 802.11n / 802.11ac by default --- nixos/modules/services/networking/hostapd.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index b1abf88b0d99..01a1b298cda6 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -20,6 +20,8 @@ let ssid=${cfg.ssid} hw_mode=${cfg.hwMode} channel=${toString cfg.channel} + ieee80211n=1 + ieee80211ac=1 ${optionalString (cfg.countryCode != null) ''country_code=${cfg.countryCode}''} ${optionalString (cfg.countryCode != null) ''ieee80211d=1''} From b376ec113b8bab7b4dbae054bd2805e501e1a6f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yannik=20R=C3=B6del?= Date: Tue, 19 Jul 2022 13:25:52 +0200 Subject: [PATCH 004/207] home-assistant: fix packageOverrides ordering As documented by lib.composeManyExtensions, overrides intended to be applied later should come last in the list. This commit switches the order to make sure that custom overrides are in fact evaluated after the default ones. Also, since the previous version was basically a reimplementation of composeManyExtensions anyway, switching to that makes it a bit cleaner. --- pkgs/servers/home-assistant/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 5dd4d60cbde7..369c859db51b 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -155,8 +155,7 @@ let }; python = python3.override { - # Put packageOverrides at the start so they are applied after defaultOverrides - packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); + packageOverrides = lib.composeManyExtensions (defaultOverrides ++ [ packageOverrides ]); }; componentPackages = import ./component-packages.nix; From b601f9c047d65982af248ce54327234f584916cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Aug 2022 08:10:37 +0000 Subject: [PATCH 005/207] usbredir: 0.12.0 -> 0.13.0 --- pkgs/development/libraries/usbredir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 797c32cb6d2d..c7e8a361ee16 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "usbredir"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "spice"; repo = "usbredir"; rev = "${pname}-${version}"; - sha256 = "sha256-OVLc3FWLBjWJnqIhhe6k+pl/HsJGzqD6xp/fXXEgRwY="; + sha256 = "sha256-zehf0DkqSSvmatbk/UB1oySjyqiFUYTuIhqb5xKeK7I="; }; nativeBuildInputs = [ From 8bdba2a2c0d66ae15a4914fc587a272a88cdea9e Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Sat, 21 Jan 2023 19:13:16 +0100 Subject: [PATCH 006/207] buildbot: add badges plugin --- .../python-modules/buildbot/plugins.nix | 26 ++++++++++++++++++- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index ee36e10531f1..e6f78dfc0bd7 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, buildbot-pkg, mock }: +{ lib, buildPythonPackage, fetchPypi, buildbot-pkg, mock, cairosvg, klein, jinja2 }: { www = buildPythonPackage rec { @@ -115,4 +115,28 @@ license = licenses.gpl2; }; }; + + badges = buildPythonPackage rec { + pname = "buildbot-badges"; + inherit (buildbot-pkg) version; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-H0Dn+uTtFyZgyqbk3QQEc5t7CJovyzU+XuCoTe4Ajug="; + }; + + buildInputs = [ buildbot-pkg ]; + propagatedBuildInputs = [ cairosvg klein jinja2 ]; + + # No tests + doCheck = false; + + meta = with lib; { + homepage = "https://buildbot.net/"; + description = "Buildbot Badges Plugin"; + maintainers = with maintainers; [ julienmalka ]; + license = licenses.gpl2; + }; + }; + } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7cc0f49178e9..e6daf5c22473 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1465,7 +1465,7 @@ self: super: with self; { buildbot-ui = self.buildbot.withPlugins (with self.buildbot-plugins; [ www ]); - buildbot-full = self.buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards ]); + buildbot-full = self.buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards badges ]); buildbot-pkg = callPackage ../development/python-modules/buildbot/pkg.nix { }; From 7197d45919af9bf6b87b1c87198aaf0fe87504fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Sat, 4 Feb 2023 13:42:28 +0100 Subject: [PATCH 007/207] etebase-server: fix optional dependencies --- pkgs/servers/etebase/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/etebase/default.nix b/pkgs/servers/etebase/default.nix index 079b87fe9a73..1b50e3cbe459 100644 --- a/pkgs/servers/etebase/default.nix +++ b/pkgs/servers/etebase/default.nix @@ -36,11 +36,8 @@ buildPythonPackage rec { pynacl redis typing-extensions - ] ++ lib.optional withLdap [ - python-ldap - ] ++ lib.optional withPostgres [ - psycopg2 - ]; + ] ++ lib.optional withLdap python-ldap + ++ lib.optional withPostgres psycopg2; installPhase = '' mkdir -p $out/bin $out/lib From fe6c577c412cc91765f0cb2fbb6e155bf5be290f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= Date: Mon, 6 Feb 2023 12:48:25 +0000 Subject: [PATCH 008/207] swaylock: 1.7 -> 1.7.2 --- pkgs/applications/window-managers/sway/lock.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index 30e43fa0c902..20a7a5ed7fe0 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "swaylock"; - version = "1.7"; + version = "1.7.2"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaylock"; - rev = version; - hash = "sha256-xbcVsnE0DecC+g49NOBNpqPl5JTtuxUUc7KinKhi5TE="; + rev = "v${version}"; + hash = "sha256-ZsOLDqmkyhel8QAezdVZ51utruJrBZWqaZ7NzimXWQ4="; }; strictDeps = true; From 307918ba5e1f9792794a4fabff45a29a5bfa816f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Feb 2023 20:59:05 +0000 Subject: [PATCH 009/207] python310Packages.bitarray: 2.6.1 -> 2.7.0 --- pkgs/development/python-modules/bitarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index a9bbef0e4325..30a5b338617b 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.6.1"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hEClSTIh9u1sTg2csrpuTmAKX7Y59mAD6vFbcVCkkjA="; + hash = "sha256-ALtyPPcFnjCzKLZWizt1wPZS7JIo2VnVTpl4UqMaMaI="; }; checkPhase = '' From 641b5ae1f77bac3c94774f56716720a88cc7cd73 Mon Sep 17 00:00:00 2001 From: Atemu Date: Tue, 7 Feb 2023 14:00:28 +0100 Subject: [PATCH 010/207] dnscrypt-proxy2: 2.1.3 -> 2.1.4 --- pkgs/tools/networking/dnscrypt-proxy2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/pkgs/tools/networking/dnscrypt-proxy2/default.nix index b0f03c093202..5457cf4ab53c 100644 --- a/pkgs/tools/networking/dnscrypt-proxy2/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy2/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "dnscrypt-proxy2"; - version = "2.1.3"; + version = "2.1.4"; vendorSha256 = null; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "DNSCrypt"; repo = "dnscrypt-proxy"; rev = version; - sha256 = "sha256-5wfxjx8SxynY6DpPIvOLwSsBdM/0zSzfaVDQTI/RUD0="; + sha256 = "sha256-98DeCrDp0TmPCSvOrJ7KgIQZBR2K1fFJrmNccZ7nSug="; }; meta = with lib; { From 05c30ca2bf5edae8c1c4f9c4aea96e99b31b375a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Feb 2023 07:26:29 +0000 Subject: [PATCH 011/207] tutanota-desktop: 3.106.4 -> 3.108.12 --- .../networking/mailreaders/tutanota-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index a2972f9bfb96..6b5e8a254c89 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -3,12 +3,12 @@ electron, libsecret }: stdenv.mkDerivation rec { pname = "tutanota-desktop"; - version = "3.106.4"; + version = "3.108.12"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; name = "tutanota-desktop-${version}.tar.gz"; - sha256 = "sha256-RU2JEFtYOpxqA02YDuB/V4t/ZZ608EHGMPpwxVOzRz4="; + sha256 = "sha256-ZXQCth5nhCkEZI348057cRjzFWl/IEytQmkmBuJzw3w="; }; nativeBuildInputs = [ From a846eac3b49704648ce3879355783b5189568166 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Wed, 8 Feb 2023 19:28:46 +0100 Subject: [PATCH 012/207] joystickwake: add recommended dep dbus-next --- pkgs/tools/games/joystickwake/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/games/joystickwake/default.nix b/pkgs/tools/games/joystickwake/default.nix index ad7fc339feab..203c58b8f619 100644 --- a/pkgs/tools/games/joystickwake/default.nix +++ b/pkgs/tools/games/joystickwake/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-0rVVxaaAFHkmJeG3e181x7faTIeFwupplWepoyxc51g="; }; - propagatedBuildInputs = with python3.pkgs; [ pyudev xlib ]; + propagatedBuildInputs = with python3.pkgs; [ dbus-next pyudev xlib ]; postInstall = '' # autostart file From 8d5410c7a90032ac5eb4bcb33a104bd79eba9d15 Mon Sep 17 00:00:00 2001 From: linsui Date: Thu, 9 Feb 2023 21:43:48 +0800 Subject: [PATCH 013/207] vscode-extensions.ms-toolsai.jupyter: 2022.11.1003381023 -> 2023.2.1000411022 --- .../vscode/extensions/ms-toolsai-jupyter/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix b/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix index e713ba29e84b..7089f9e3d39d 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix @@ -1,14 +1,11 @@ { lib, vscode-utils, jq, moreutils }: -let - inherit (vscode-utils) buildVscodeMarketplaceExtension; - -in buildVscodeMarketplaceExtension { +vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "jupyter"; publisher = "ms-toolsai"; - version = "2022.11.1003381023"; - sha256 = "0cbnr52pq0yw6i4yzyrifyrz186l482m9s01h4l7d74fby9ska8h"; + version = "2023.2.1000411022"; + sha256 = "sha256-gMK/t/rLXYN3rlHxxVeW0W/FWEP0ZCiEwzM8DY14vYg="; }; nativeBuildInputs = [ From 48deb111694549bdbfbe5796a86842150e900d57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Feb 2023 16:24:41 +0000 Subject: [PATCH 014/207] buttercup-desktop: 2.17.0 -> 2.18.2 --- pkgs/tools/security/buttercup-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/buttercup-desktop/default.nix b/pkgs/tools/security/buttercup-desktop/default.nix index 27cf191018e4..4c00f41919c9 100644 --- a/pkgs/tools/security/buttercup-desktop/default.nix +++ b/pkgs/tools/security/buttercup-desktop/default.nix @@ -2,10 +2,10 @@ let pname = "buttercup-desktop"; - version = "2.17.0"; + version = "2.18.2"; src = fetchurl { url = "https://github.com/buttercup/buttercup-desktop/releases/download/v${version}/Buttercup-linux-x86_64.AppImage"; - sha256 = "sha256-JD3ZFRWGCJq5VDGkTgIZuZPScQrNF4vsuCavBD3pigA="; + sha256 = "sha256-1WLhT94FNZ7be58uov/0vtvB7ET/WNY/tPSIuaW5zfc="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; From 7a8e96fe1f1c890c2c8e995ff0922619e6d0ab02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 9 Feb 2023 08:34:43 -0800 Subject: [PATCH 015/207] deltachat-desktop: 1.34.3 -> 1.34.4 Diff: https://github.com/deltachat/deltachat-desktop/compare/v1.34.3...v1.34.4 Changelog: https://github.com/deltachat/deltachat-desktop/blob/v1.34.4/CHANGELOG.md --- .../instant-messengers/deltachat-desktop/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index 3d9fc7627b60..f4eb47428b5b 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -21,17 +21,17 @@ let libdeltachat' = libdeltachat.overrideAttrs (old: rec { - version = "1.107.0"; + version = "1.107.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-fjiS7GZy1BLgmxu4LFOWgucORcVx+9KleQcga+hRkSY="; + hash = "sha256-ISAUZyFrp86ILtRrlowceBQNJ7+tbJReIAe6+u4wwQI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${old.pname}-${version}"; - hash = "sha256-7XhSI/C0GEmsaL0UupvufB1bfPGbzSQJH720Y4/Do3o="; + hash = "sha256-B4BMxiI3GhsjeD3gYrq5ZpbZ7l77ycrIMWu2sUzZiz4="; }; }); esbuild' = esbuild.override { @@ -48,16 +48,16 @@ let }; in buildNpmPackage rec { pname = "deltachat-desktop"; - version = "1.34.3"; + version = "1.34.4"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - hash = "sha256-6WZJD8lMsk1WNguMkXygBCTVpOzNkNuVZJ3Ygv6VBkM="; + hash = "sha256-LV8/r6psUZuCEGbaH1nWlrkeNbEYG8R5O1aCxECPH1E="; }; - npmDepsHash = "sha256-B91yQ/xi8+uyOllqYR7lZTfLBpJvZat1cIIJk9TkM/c="; + npmDepsHash = "sha256-rdZVvsyCo/6C4+gjytCCn9Qcl+chc6U+6orkcM59I8U="; nativeBuildInputs = [ makeWrapper From 80a73ad663f85ff573fedbadf182b8e4ff77496b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Feb 2023 21:12:31 +0000 Subject: [PATCH 016/207] qbe: 1.0 -> 1.1 --- pkgs/development/compilers/qbe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/qbe/default.nix b/pkgs/development/compilers/qbe/default.nix index c9464813d3f2..ee075ec04056 100644 --- a/pkgs/development/compilers/qbe/default.nix +++ b/pkgs/development/compilers/qbe/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "qbe"; - version = "1.0"; + version = "1.1"; src = fetchzip { url = "https://c9x.me/compile/release/qbe-${version}.tar.xz"; - sha256 = "sha256-Or6m/y5hb9SlSToBevjhaSbk5Lo5BasbqeJmKd1QpGM="; + sha256 = "sha256-yFZ3cpp7eLjf7ythKFTY1YEJYyfeg2en4/D8+9oM1B4="; }; makeFlags = [ "PREFIX=$(out)" ]; From b30dd1b8b5ab52b7aac49b8f394a1c5d6ed04fc6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Feb 2023 21:45:15 +0000 Subject: [PATCH 017/207] rpcs3: 0.0.26-14684-8652b7d35 -> 0.0.26-14702-cfb788941 --- pkgs/applications/emulators/rpcs3/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index d3d5f1e11f5f..41d82a120499 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -9,10 +9,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "14684-8652b7d35"; - rpcs3Version = "0.0.26-14684-8652b7d35"; - rpcs3Revision = "8652b7d358fe975242dd2c51c91fd2968e6bcb82"; - rpcs3Sha256 = "08cd082cih9pcppipkhid1x1s7bq4grsz0zfa1rlxkzw3lajxnrf"; + rpcs3GitVersion = "14702-cfb788941"; + rpcs3Version = "0.0.26-14702-cfb788941"; + rpcs3Revision = "cfb788941ce73ebf41060baf0867861dd6bd3e13"; + rpcs3Sha256 = "0kwd3x043x3gsqlax3jcb5g1w2v7v7gghmqgbrn3vimcc47x62vn"; ittapi = fetchFromGitHub { owner = "intel"; From 56fd717ee3069dc07805afc78ca6af5f02e4ac9b Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Thu, 9 Feb 2023 16:41:07 -0500 Subject: [PATCH 018/207] cudnn: init 8.0.5, 8.2.4, 8.7.0; update 8.3.2 -> 8.3.3, 8.4.0 -> 8.4.1 --- .../science/math/cudnn/extension.nix | 128 ++++++++++++++---- 1 file changed, 104 insertions(+), 24 deletions(-) diff --git a/pkgs/development/libraries/science/math/cudnn/extension.nix b/pkgs/development/libraries/science/math/cudnn/extension.nix index ac22faeabb02..dc538411211b 100644 --- a/pkgs/development/libraries/science/math/cudnn/extension.nix +++ b/pkgs/development/libraries/science/math/cudnn/extension.nix @@ -68,12 +68,47 @@ final: prev: let supportedCudaVersions = [ "10.2" ]; } ]; + "8.0.5" = [ + rec { + fileVersion = "10.1"; + fullVersion = "8.0.5.39"; + hash = "sha256-kJCElSmIlrM6qVBjo0cfk8NmJ9esAcF9w211xl7qSgA="; + url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-805/support-matrix/index.html + supportedCudaVersions = [ "10.1" ]; + } + rec { + fileVersion = "10.2"; + fullVersion = "8.0.5.39"; + hash = "sha256-IfhMBcZ78eyFnnfDjM1b8VSWT6HDCPRJlZvkw1bjgvM="; + url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-805/support-matrix/index.html + supportedCudaVersions = [ "10.2" ]; + } + rec { + fileVersion = "11.0"; + fullVersion = "8.0.5.39"; + hash = "sha256-ThbueJXetKixwZS4ErpJWG730mkCBRQB03F1EYmKm3M="; + url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-805/support-matrix/index.html + supportedCudaVersions = [ "11.0" ]; + } + rec { + fileVersion = "11.1"; + fullVersion = "8.0.5.39"; + hash = "sha256-HQRr+nk5navMb2yxUHkYdUQ5RC6gyp4Pvs3URvmwDM4="; + url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-805/support-matrix/index.html + supportedCudaVersions = [ "11.1" ]; + } + ]; "8.1.1" = [ rec { fileVersion = "10.2"; fullVersion = "8.1.1.33"; hash = "sha256-Kkp7mabpv6aQ6xm7QeSVU/KnpJGls6v8rpAOFmxbbr0="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-811/support-matrix/index.html#cudnn-versions-810-811 supportedCudaVersions = [ "10.2" ]; } rec { @@ -81,38 +116,61 @@ final: prev: let fullVersion = "8.1.1.33"; hash = "sha256-mKh4TpKGLyABjSDCgbMNSgzZUfk2lPZDPM9K6cUCumo="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz"; - supportedCudaVersions = [ "11.2" ]; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-811/support-matrix/index.html#cudnn-versions-810-811 + supportedCudaVersions = [ "11.0" "11.1" "11.2" ]; } ]; - "8.3.2" = [ + "8.2.4" = [ rec { fileVersion = "10.2"; - fullVersion = "8.3.2.44"; - hash = "sha256-1vVu+cqM+PketzIQumw9ykm6REbBZhv6/lXB7EC2aaw="; + fullVersion = "8.2.4.15"; + hash = "sha256-0jyUoxFaHHcRamwSfZF1+/WfcjNkN08mo0aZB18yIvE="; + url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-824/support-matrix/index.html + supportedCudaVersions = [ "10.2" ]; + } + rec { + fileVersion = "11.4"; + fullVersion = "8.2.4.15"; + hash = "sha256-Dl0t+JC5ln76ZhnaQhMQ2XMjVlp58FoajLm3Fluq0Nc="; + url = "${urlPrefix}/v${majorMinorPatch fullVersion}/cudnn-${fileVersion}-linux-x64-v${fullVersion}.tgz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-824/support-matrix/index.html + supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" ]; + } + ]; + "8.3.3" = [ + rec { + fileVersion = "10.2"; + fullVersion = "8.3.3.40"; + hash = "sha256-2FVPKzLmKV1fyPOsJeaPlAWLAYyAHaucFD42gS+JJqs="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-833/support-matrix/index.html supportedCudaVersions = [ "10.2" ]; } rec { fileVersion = "11.5"; - fullVersion = "8.3.2.44"; - hash = "sha256-VQCVPAjF5dHd3P2iNPnvvdzb5DpTsm3AqCxyP6FwxFc="; + fullVersion = "8.3.3.40"; + hash = "sha256-6r6Wx1zwPqT1N5iU2RTx+K4UzqsSGYnoSwg22Sf7dzE="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz"; - supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" ]; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-833/support-matrix/index.html + supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" ]; } ]; - "8.4.0" = [ + "8.4.1" = [ rec { fileVersion = "10.2"; - fullVersion = "8.4.0.27"; - hash = "sha256-FMXjykJYJxmW0f2VnELRfFgs5Nmv9FH4RSRGnnhP0VQ="; + fullVersion = "8.4.1.50"; + hash = "sha256-I88qMmU6lIiLVmaPuX7TTbisgTav839mssxUo3lQNjg="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-841/support-matrix/index.html supportedCudaVersions = [ "10.2" ]; } rec { fileVersion = "11.6"; - fullVersion = "8.4.0.27"; - hash = "sha256-0Zva/ZgAx50p5vb/+p+eLBDREy1sL/ELFZPgV+dN0FA="; + fullVersion = "8.4.1.50"; + hash = "sha256-7JbSN22B/KQr3T1MPXBambKaBlurV/kgVhx2PinGfQE="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-841/support-matrix/index.html supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" ]; } ]; @@ -122,6 +180,7 @@ final: prev: let fullVersion = "8.5.0.96"; hash = "sha256-1mzhbbzR40WKkHnQLtJHhg0vYgf7G8a0OBcCwIOkJjM="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${major fileVersion}-archive.tar.xz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-850/support-matrix/index.html supportedCudaVersions = [ "10.2" ]; } rec { @@ -129,6 +188,7 @@ final: prev: let fullVersion = "8.5.0.96"; hash = "sha256-VFSm/ZTwCHKMqumtrZk8ToXvNjAuJrzkO+p9RYpee20="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${major fileVersion}-archive.tar.xz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-850/support-matrix/index.html supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" ]; } ]; @@ -138,6 +198,7 @@ final: prev: let fullVersion = "8.6.0.163"; hash = "sha256-t4sr/GrFqqdxu2VhaJQk5K1Xm/0lU4chXG8hVL09R9k="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${major fileVersion}-archive.tar.xz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-860/support-matrix/index.html supportedCudaVersions = [ "10.2" ]; } rec { @@ -145,6 +206,25 @@ final: prev: let fullVersion = "8.6.0.163"; hash = "sha256-u8OW30cpTGV+3AnGAGdNYIyxv8gLgtz0VHBgwhcRFZ4="; url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${major fileVersion}-archive.tar.xz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-860/support-matrix/index.html + supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" "11.8" ]; + } + ]; + "8.7.0" = [ + rec { + fileVersion = "10.2"; + fullVersion = "8.7.0.84"; + hash = "sha256-bZhaqc8+GbPV2FQvvbbufd8VnEJgvfkICc2N3/gitRg="; + url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${major fileVersion}-archive.tar.xz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-870/support-matrix/index.html + supportedCudaVersions = [ "10.2" ]; + } + rec { + fileVersion = "11.8"; + fullVersion = "8.7.0.84"; + hash = "sha256-l2xMunIzyXrnQAavq1Fyl2MAukD1slCiH4z3H1nJ920="; + url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${major fileVersion}-archive.tar.xz"; + # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-870/support-matrix/index.html supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" "11.7" "11.8" ]; } ]; @@ -153,17 +233,17 @@ final: prev: let # Default attributes cuDnnDefaultVersion = { "10.0" = "7.4.2"; - "10.1" = "7.6.5"; - "10.2" = "8.6.0"; - "11.0" = "8.6.0"; - "11.1" = "8.6.0"; - "11.2" = "8.6.0"; - "11.3" = "8.6.0"; - "11.4" = "8.6.0"; - "11.5" = "8.6.0"; - "11.6" = "8.6.0"; - "11.7" = "8.6.0"; - "11.8" = "8.6.0"; - }.${cudaVersion} or "8.6.0"; + "10.1" = "8.0.5"; + "10.2" = "8.7.0"; + "11.0" = "8.7.0"; + "11.1" = "8.7.0"; + "11.2" = "8.7.0"; + "11.3" = "8.7.0"; + "11.4" = "8.7.0"; + "11.5" = "8.7.0"; + "11.6" = "8.7.0"; + "11.7" = "8.7.0"; + "11.8" = "8.7.0"; + }.${cudaVersion} or "8.7.0"; in cuDnnPackages From cd85cbf7e3022ac2d41fe583eeb91e32653ccb1c Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 9 Feb 2023 22:02:56 -0500 Subject: [PATCH 019/207] lipl: init at 0.1.3 --- pkgs/tools/misc/lipl/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/misc/lipl/default.nix diff --git a/pkgs/tools/misc/lipl/default.nix b/pkgs/tools/misc/lipl/default.nix new file mode 100644 index 000000000000..b24fcaa3d2d1 --- /dev/null +++ b/pkgs/tools/misc/lipl/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "lipl"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "yxdunc"; + repo = "lipl"; + rev = "v${version}"; + hash = "sha256-ZeYz9g06vMsOk3YDmy0I+8e6BtLfweXqVH5uRt+mtes="; + }; + + cargoHash = "sha256-hcvC12dd6KDi7kYilXtBtyDQQG62YPMvSZA5trFqwWc="; + + meta = with lib; { + description = "A command line tool to analyse the output over time of custom shell commands"; + homepage = "https://github.com/yxdunc/lipl"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 345252b22a5a..ebbfd065961b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9512,6 +9512,8 @@ with pkgs; linuxquota = callPackage ../tools/misc/linuxquota { }; + lipl = callPackage ../tools/misc/lipl { }; + liquidctl = with python3Packages; toPythonApplication liquidctl; lmp = callPackage ../tools/security/lmp { }; From d5335155887fc5a098d63f602e4fccea02efb0e6 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 9 Feb 2023 22:17:24 -0500 Subject: [PATCH 020/207] muffet: init at 2.7.0 --- pkgs/tools/networking/muffet/default.nix | 26 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/networking/muffet/default.nix diff --git a/pkgs/tools/networking/muffet/default.nix b/pkgs/tools/networking/muffet/default.nix new file mode 100644 index 000000000000..71c32ae7ad7d --- /dev/null +++ b/pkgs/tools/networking/muffet/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "muffet"; + version = "2.7.0"; + + src = fetchFromGitHub { + owner = "raviqqe"; + repo = "muffet"; + rev = "v${version}"; + hash = "sha256-Kk0HRs4mzpEI9URFIegAVWejBZLGWW08vdsjw9ZHLxU="; + }; + + vendorHash = "sha256-auTDSL3J+LuW6M5LRAWJCvL1xAiyqluPt6EQpFztYpA="; + + meta = with lib; { + description = "A website link checker which scrapes and inspects all pages in a website recursively"; + homepage = "https://github.com/raviqqe/muffet"; + changelog = "https://github.com/raviqqe/muffet/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 345252b22a5a..8fc9217be5c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9892,6 +9892,8 @@ with pkgs; mubeng = callPackage ../tools/networking/mubeng { }; + muffet = callPackage ../tools/networking/muffet { }; + multipass = libsForQt5.callPackage ../tools/virtualization/multipass { }; multitime = callPackage ../tools/misc/multitime { }; From 5dffbc4dd935ea7c46f855255d94173d9556a3d0 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 9 Feb 2023 22:49:25 -0500 Subject: [PATCH 021/207] pkgtop: init at 2.4.1 --- pkgs/tools/misc/pkgtop/default.nix | 30 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/misc/pkgtop/default.nix diff --git a/pkgs/tools/misc/pkgtop/default.nix b/pkgs/tools/misc/pkgtop/default.nix new file mode 100644 index 000000000000..1d2f0c048f26 --- /dev/null +++ b/pkgs/tools/misc/pkgtop/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "pkgtop"; + version = "2.4.1"; + + src = fetchFromGitHub { + owner = "orhun"; + repo = "pkgtop"; + rev = version; + hash = "sha256-Skk7Zur2UMxNjrJmcp+FvUuNvbh9HmzuZ5mWcvhxcKk="; + }; + + vendorHash = "sha256-dlDbNym7CNn5088znMNgGAr2wBM3+nYv3q362353aLs="; + + postInstall = '' + mv $out/bin/{cmd,pkgtop} + ''; + + meta = with lib; { + description = "Interactive package manager and resource monitor designed for the GNU/Linux"; + homepage = "https://github.com/orhun/pkgtop"; + changelog = "https://github.com/orhun/pkgtop/releases/tag/${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 345252b22a5a..4cfcbc7d7f03 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22633,6 +22633,8 @@ with pkgs; pkgdiff = callPackage ../tools/misc/pkgdiff { }; + pkgtop = callPackage ../tools/misc/pkgtop { }; + place-cursor-at = haskell.lib.compose.justStaticExecutables haskellPackages.place-cursor-at; platform-folders = callPackage ../development/libraries/platform-folders { }; From 431bcb448ff3a6bcabcf54a914f9b8f44427057f Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Fri, 10 Feb 2023 14:44:35 +0100 Subject: [PATCH 022/207] lego: 4.9.1 -> 4.10.0 Version v4.10.0 was released on 2023-02-10: https://github.com/go-acme/lego/releases/tag/v4.10.0 --- pkgs/tools/admin/lego/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 9d7c35a73bea..aab033b0ee28 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lego"; - version = "4.9.1"; + version = "4.10.0"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YaJT+gTnw9A2joL8D3P7fs/NTyHpH4gDhg6STv19SZU="; + sha256 = "sha256-FT1cXnMyMrEpZpTMp+kE8ueHReAYf2XQZ/9Nw53TYbg="; }; - vendorSha256 = "sha256-gHwyXzmws99tPRJKR/boc0Hf+b5h9ZkzH2aiN8u6Z0I="; + vendorSha256 = "sha256-Rf1HY2Q0t3iOuopnPRCkDKauWLFy9qhRh94QiwbDuOQ="; doCheck = false; From cc69e31283353336028ac3e3e103f713b34d9ee9 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 10 Feb 2023 19:50:10 +0100 Subject: [PATCH 023/207] mjolnir: fix build on darwin --- pkgs/servers/mjolnir/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/mjolnir/default.nix b/pkgs/servers/mjolnir/default.nix index 4162ea9d6ce3..72c18cd6d2ab 100644 --- a/pkgs/servers/mjolnir/default.nix +++ b/pkgs/servers/mjolnir/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { runHook preBuild ln -s ${nodeDependencies}/lib/node_modules . + export HOME=$(mktemp -d) export PATH="${nodeDependencies}/bin:$PATH" npm run build From 1dad98b003f262e3fed3a2878d15a28f898e9780 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Feb 2023 19:30:55 +0000 Subject: [PATCH 024/207] python310Packages.pymodbus: 3.1.2 -> 3.1.3 --- pkgs/development/python-modules/pymodbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index a6e3f5eb9a74..e9cf439d36c1 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "3.1.2"; + version = "3.1.3"; format = "setuptools"; src = fetchFromGitHub { owner = "pymodbus-dev"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-kae/TADu23NnCrXkJ/dkDBNIgBm/+BxXf+lh8uMxz/s="; + hash = "sha256-GHyDlt046v4KP9KQRnXH6F+3ikoCjbhVHEQuSdm99a8="; }; # Twisted asynchronous version is not supported due to a missing dependency From 057adb42c7d2edc2d6cf3ea66f8f9ff8e9bfcd9e Mon Sep 17 00:00:00 2001 From: Paolo Stivanin Date: Fri, 10 Feb 2023 10:37:24 +0100 Subject: [PATCH 025/207] otpclient: 2.5.1 -> 3.1.4 Lots of changes between these two releases. Everything that changed can be found here: https://github.com/paolostivanin/OTPClient/releases --- pkgs/applications/misc/otpclient/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix index 9f416ff75a3c..bb1c725dff8b 100644 --- a/pkgs/applications/misc/otpclient/default.nix +++ b/pkgs/applications/misc/otpclient/default.nix @@ -10,21 +10,26 @@ , libzip , libpng , libcotp +, protobuf +, protobufc +, qrencode +, libsecret +, libuuid , zbar }: stdenv.mkDerivation rec { pname = "otpclient"; - version = "2.5.1"; + version = "3.1.4"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VUrLbGaDfPE+Ak20ZCJDmO/sgBzdf4S+SqvyQ7F6SQU="; + sha256 = "sha256-Cz3fxmtpSe7GMGmmSLDG9kDifmIMgCBlBRjX/qardXA="; }; - buildInputs = [ gtk3 jansson libgcrypt libzip libpng libcotp zbar ]; + buildInputs = [ gtk3 jansson libgcrypt libzip libpng libcotp zbar protobuf protobufc libsecret qrencode libuuid ]; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; meta = with lib; { From 2323698c942ca1d7bd17b673f08235558444c7a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Feb 2023 19:49:53 +0000 Subject: [PATCH 026/207] kubelogin: 0.0.25 -> 0.0.26 --- pkgs/applications/networking/cluster/kubelogin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index 45f0ee66f61e..9726edcf5f09 100644 --- a/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.0.25"; + version = "0.0.26"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-28snlCqvQ0aF7DHjeHWyjOYuy2wHd2EqEDqmst9MQLc="; + sha256 = "sha256-FDcNrtdAMiSvY84I4zdVEEfOf48n7vE26yQf3IZ69xg="; }; - vendorSha256 = "sha256-mjIB0ITf296yDQJP46EI6pLYkZfyU3yzD9iwP0iIXvQ="; + vendorHash = "sha256-mjIB0ITf296yDQJP46EI6pLYkZfyU3yzD9iwP0iIXvQ="; ldflags = [ "-X main.version=${version}" From 9487540a09160087b17b4f6602d8a5f95252dc18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Feb 2023 20:05:22 +0000 Subject: [PATCH 027/207] elementsd: 22.0.2 -> 22.1 --- pkgs/applications/blockchains/elements/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/elements/default.nix b/pkgs/applications/blockchains/elements/default.nix index a39cbc341e89..80fa1e94589f 100644 --- a/pkgs/applications/blockchains/elements/default.nix +++ b/pkgs/applications/blockchains/elements/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = if withGui then "elements" else "elementsd"; - version = "22.0.2"; + version = "22.1"; src = fetchFromGitHub { owner = "ElementsProject"; repo = "elements"; rev = "elements-${version}"; - sha256 = "sha256-20Tem6CD7XAt1EDfkl46Nxhb+Vq3sCk/UqnLCAm85FU="; + sha256 = "sha256-HDV06O9k+TpYR0ZwLas2hvDwxvnfoa8VUzgvkXv/WV8="; }; nativeBuildInputs = From 7b3bd00a19bd4c6640b81de366dcbd0b2e79038c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Feb 2023 20:24:31 +0000 Subject: [PATCH 028/207] flyctl: 0.0.451 -> 0.0.456 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index e12230f4531b..b19e2e7a288c 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.451"; + version = "0.0.456"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-Tm05vO1mdeTGLpz++rahUubb69ajw04eK57VKZFUoDo="; + sha256 = "sha256-RKdw8Yk7G1QhtxYyQtaYS1iKECXxD8kEavzRcvPtmdM="; }; - vendorHash = "sha256-oJa+HUuv8RG4ldAe/cS8iR6QcWdPl8BgHE4sRASauRM="; + vendorHash = "sha256-57Ccqiuu2KQWdNqzqrmVXf7KnvjUjB9S1TMnDYu6b/I="; subPackages = [ "." ]; From ada4e200eeac8a341d6b897be7425a4a27bb2f78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Feb 2023 20:32:11 +0000 Subject: [PATCH 029/207] zef: 0.15.0 -> 0.16.0 --- pkgs/development/interpreters/rakudo/zef.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index efd08f7d85b7..6602a6484f73 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-MJKG/8b8l2RqWec5JoWcYLYrEKI9zrhJMyLqVcvAY+g="; + sha256 = "sha256-p8BihjMB0y8jcoFP/pxJNkwF3vEacMywV6W1Znv2fyo="; }; nativeBuildInputs = [ makeWrapper ]; From 3d5101344e5be1e849a34e602c97d003d2e65159 Mon Sep 17 00:00:00 2001 From: Henri Menke Date: Fri, 10 Feb 2023 21:36:00 +0100 Subject: [PATCH 030/207] gtkcord4: 0.0.8 -> 0.0.9 --- pkgs/applications/audio/gtkcord4/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/gtkcord4/default.nix b/pkgs/applications/audio/gtkcord4/default.nix index 7471a0afb4ca..f5b2cf5576e3 100644 --- a/pkgs/applications/audio/gtkcord4/default.nix +++ b/pkgs/applications/audio/gtkcord4/default.nix @@ -19,13 +19,13 @@ buildGoModule rec { pname = "gtkcord4"; - version = "0.0.8"; + version = "0.0.9"; src = fetchFromGitHub { owner = "diamondburned"; repo = pname; rev = "v${version}"; - hash = "sha256-aJRVk9KFCJbIFInkg5BCJ6ygBlDCFF53WXO9qyACFus="; + hash = "sha256-55mS+hrhLLRkhgih5lvdM9Xka+WKg2iliFm6TYF6n3w="; }; nativeBuildInputs = [ @@ -61,7 +61,7 @@ buildGoModule rec { install -D -m 444 internal/icons/png/logo.png $out/share/icons/hicolor/256x256/apps/gtkcord4.png ''; - vendorHash = "sha256-usnlaOqyMd8rdnFpuCqfaCES8bPaB+NbdL4pFybKJbM="; + vendorHash = "sha256-IQpokMeo46vZIdVA1F7JILXCN9bUqTMOCa/SQ0JSjaM="; meta = with lib; { description = "GTK4 Discord client in Go, attempt #4."; From 14ab222d2c69962b20b0dbbf6933e06938db85a0 Mon Sep 17 00:00:00 2001 From: aktaboot Date: Fri, 10 Feb 2023 21:52:46 +0100 Subject: [PATCH 031/207] qmk-udev-rules: update --- pkgs/os-specific/linux/qmk-udev-rules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/qmk-udev-rules/default.nix b/pkgs/os-specific/linux/qmk-udev-rules/default.nix index 5e956f3baf34..6fc6e0012b31 100644 --- a/pkgs/os-specific/linux/qmk-udev-rules/default.nix +++ b/pkgs/os-specific/linux/qmk-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "qmk-udev-rules"; - version = "0.15.25"; + version = "0.19.11"; src = fetchFromGitHub { owner = "qmk"; repo = "qmk_firmware"; rev = version; - sha256 = "4U1/9DgoKZ1Al76lZ2P8x4LIvtqaJPLq81cCSCy+9iE="; + hash = "sha256-RevCj+tFlleH08VGRwJjKhZdXwU6VlMsSCR9090pgRI="; }; dontBuild = true; From 65b9a4a973663069a9d23311cfe94a458c12efa3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Feb 2023 21:06:35 +0000 Subject: [PATCH 032/207] afterburn: 5.4.0 -> 5.4.1 --- pkgs/tools/admin/afterburn/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/afterburn/default.nix b/pkgs/tools/admin/afterburn/default.nix index ddbcaf051825..f0aa3edd8a69 100644 --- a/pkgs/tools/admin/afterburn/default.nix +++ b/pkgs/tools/admin/afterburn/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "afterburn"; - version = "5.4.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "coreos"; repo = "afterburn"; rev = "v${version}"; - sha256 = "sha256-Y9Z2PdQU7yHTlEXW+/C6v9k+5TkeQMagbC/gGG+JssQ="; + sha256 = "sha256-QsdTrd9p89SiLCmvNlsLk9ET2BVeaJncDyWzycn5CLw="; }; - cargoHash = "sha256-ZDyB/s2ig3aklEeB1JzNHat+roQniKrMcw4rvy9Z5pk="; + cargoHash = "sha256-lCtG7UmXJegGVbjyYn9YJWSynikOK4qPmLS1XNesMUk="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; From e84f1438a1241235452b3fdf978784db0e353a0a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 11 Feb 2023 07:15:39 +1000 Subject: [PATCH 033/207] containerd: 1.6.16 -> 1.6.17 https://github.com/containerd/containerd/releases/tag/v1.6.17 --- pkgs/applications/virtualization/containerd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index d95b37ef1d30..3c76f5679778 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.6.16"; + version = "1.6.17"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-p2I188MGoxnd7dBAMQ0bM5+GT8z3y9S4cZW2Q99DyzY="; + hash = "sha256-5Kpqgn4g08i8UVw9mfK5gc2wSx4wTk6NIzbT7tzY+ho="; }; vendorHash = null; From 13504907e0d2a9e3bf9f848ef3574bdae29e3d6b Mon Sep 17 00:00:00 2001 From: fleaz Date: Fri, 10 Feb 2023 17:17:09 +0100 Subject: [PATCH 034/207] python310Packages.pytapo: init at 2.9.2 --- .../python-modules/pytapo/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/pytapo/default.nix diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix new file mode 100644 index 000000000000..1a8ee768fb65 --- /dev/null +++ b/pkgs/development/python-modules/pytapo/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi + +# propagates +, pycryptodome +, requests +, urllib3 +}: + +buildPythonPackage rec { + pname = "pytapo"; + version = "2.9.2"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-LW14uDQBqIVsigOzO0bNTpjY7Fk0IWAeDMPEuWM/nOo="; + }; + + propagatedBuildInputs = [ + pycryptodome + requests + urllib3 + ]; + + pythonImportsCheck = [ + "pytapo" + ]; + + # Tests require actual hardware + doCheck = false; + + meta = with lib; { + description = "Python library for communication with Tapo Cameras "; + homepage = "https://github.com/JurajNyiri/pytapo"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fleaz ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 511fea250077..a70dfe8ba3b2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8772,6 +8772,8 @@ self: super: with self; { pytap2 = callPackage ../development/python-modules/pytap2 { }; + pytapo = callPackage ../development/python-modules/pytapo { }; + pytautulli = callPackage ../development/python-modules/pytautulli { }; pyte = callPackage ../development/python-modules/pyte { }; From 54e414a270badfe03ccf28ebf58897cae849bb11 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 10 Feb 2023 17:10:07 -0500 Subject: [PATCH 035/207] stylua: 0.16.0 -> 0.16.1 Diff: https://github.com/johnnymorganz/stylua/compare/v0.16.0...v0.16.1 Changelog: https://github.com/johnnymorganz/stylua/blob/v0.16.1/CHANGELOG.md --- pkgs/development/tools/stylua/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index 19187643d187..60110d6c99f3 100644 --- a/pkgs/development/tools/stylua/default.nix +++ b/pkgs/development/tools/stylua/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DDK/ANBR0wH87/9wnZYwyYMbCl/N/m4KUvQJ/dB8las="; + sha256 = "sha256-PpkJwCVZr21P1WmU2Kid+X9JwKdJs1krY6keQoMqDvc="; }; - cargoSha256 = "sha256-xgOPjdy+uoUOdtYXq/lXR872QdzA1/r8Shi0q1E+e9Q="; + cargoSha256 = "sha256-oCoE+Fk2zcVlV8H+f/soAWlhXNsLTysmqLXx9yjdnFY="; # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu postPatch = '' From 809c0e97b661a168d693948174981abfc55eceeb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Feb 2023 22:33:27 +0000 Subject: [PATCH 036/207] mdbook: 0.4.25 -> 0.4.26 --- pkgs/tools/text/mdbook/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index d3bf8b2d8bf4..9d00c8e1fd12 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook"; - version = "0.4.25"; + version = "0.4.26"; src = fetchFromGitHub { owner = "rust-lang"; repo = "mdBook"; rev = "refs/tags/v${version}"; - sha256 = "sha256-9zq3y7fNbGkprekzPDnJV4/IkAFUGEydkWAtr49mhdg="; + sha256 = "sha256-+K2mbVbOMQDumcPgiPtqDts/RGi+E0lF7Cftt86X/5A="; }; - cargoSha256 = "sha256-6UiE/b6iJkuM/9g5yhB33WwTZ2VYlWFWQdfdHzA39CM="; + cargoHash = "sha256-C9ziW3LUBGR/K+nR3mDr62KoE9p3mn+50nfd/3NFjro="; auditable = true; # TODO: remove when this is the default From 0b8e02e744aa8cfa504d516035d4f070895a1621 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 10 Feb 2023 22:34:53 +0000 Subject: [PATCH 037/207] plasma5Packages.kguiaddons: use a better homepage Otherwise, it defaults to https://kde.org/, which doesn't have anything on it specific to kguiaddons. --- pkgs/development/libraries/kde-frameworks/kguiaddons.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix index 98f7e178fb64..9254043117ae 100644 --- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix @@ -11,4 +11,6 @@ mkDerivation { propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; + + meta.homepage = "https://invent.kde.org/frameworks/kguiaddons"; } From 63a2b2278f7556cfa092cd1b9429c121168c4693 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 10 Feb 2023 22:35:59 +0000 Subject: [PATCH 038/207] extra-cmake-modules: use a better homepage Otherwise, it defaults to https://kde.org/, which doesn't have anything on it specific to extra-cmake-modules. --- .../libraries/kde-frameworks/extra-cmake-modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index ac7f75f5e742..dcd7a76acb33 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -19,7 +19,7 @@ mkDerivation { meta = with lib; { platforms = platforms.linux ++ platforms.darwin; - homepage = "http://www.kde.org"; + homepage = "https://invent.kde.org/frameworks/extra-cmake-modules"; license = licenses.bsd2; }; } From 3d23945d491f2605fa0d3a7699304988cf77b2ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Feb 2023 23:04:02 +0000 Subject: [PATCH 039/207] bun: 0.5.5 -> 0.5.6 --- pkgs/development/web/bun/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 5bcdc410289b..3b294c4c80bd 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "0.5.5"; + version = "0.5.6"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -33,19 +33,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - sha256 = "n7OfH93qXfu8608mMJ1tMoe9rAngu0cSHflwJZlKPYU="; + sha256 = "0LEoOwsZrEV819UpdwHaIRk9vT14JMDiXghUMf3fEoY="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - sha256 = "YPX5+wfXumYSvdjSOgb0rc/RrIU9vMYEqQmhObsg3ak="; + sha256 = "sE6DnfyPIj/Rpo9+pME87TcBvdxKFP4B7UXPvq4Rars="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - sha256 = "yiCpnO9Y8+m4fGIVyKyxeXMBe0e8qxoTAgOB8HHH4Nw="; + sha256 = "VJyv92H18wsp9F3zwu1KwwjNE1qGBCHVj7vnmnb2RbI="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - sha256 = "4eziS6QRQzg/KyKrgAmyOrMxXb+YH2pNX1RX4dL/zhM="; + sha256 = "Sdj/hdGaMvqN35N7tnAgvPQPELeW2IHA3uCVyTLYPw0="; }; }; updateScript = writeShellScript "update-bun" '' From 5dd8bf8146d12fd0f0b39bf3481a65742bfb8d1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20He=C3=9Felmann?= Date: Sat, 11 Feb 2023 01:05:53 +0100 Subject: [PATCH 040/207] kubernetes-helm: fix darwin build --- .../networking/cluster/helm/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 3537b2b9515b..12868dcc5afc 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kubernetes-helm }: buildGoModule rec { pname = "kubernetes-helm"; @@ -20,12 +20,13 @@ buildGoModule rec { "-X helm.sh/helm/v3/internal/version.gitCommit=${src.rev}" ]; + __darwinAllowLocalNetworking = true; + preCheck = '' # skipping version tests because they require dot git directory substituteInPlace cmd/helm/version_test.go \ --replace "TestVersion" "SkipVersion" - '' + lib.optionalString stdenv.isLinux '' - # skipping plugin tests on linux + # skipping plugin tests substituteInPlace cmd/helm/plugin_test.go \ --replace "TestPluginDynamicCompletion" "SkipPluginDynamicCompletion" \ --replace "TestLoadPlugins" "SkipLoadPlugins" @@ -41,6 +42,12 @@ buildGoModule rec { installShellCompletion helm.{bash,zsh,fish} ''; + passthru.tests.version = testers.testVersion { + package = kubernetes-helm; + command = "helm version"; + version = "v${version}"; + }; + meta = with lib; { homepage = "https://github.com/kubernetes/helm"; description = "A package manager for kubernetes"; From 2f5623dda2c0ada35a86ba0e075f77dcdb3cd6d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20He=C3=9Felmann?= Date: Sat, 11 Feb 2023 01:39:08 +0100 Subject: [PATCH 041/207] jira-cli-go: fix darwin build --- pkgs/development/tools/jira-cli-go/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/jira-cli-go/default.nix b/pkgs/development/tools/jira-cli-go/default.nix index 31d6d281ba5f..a64fab3353fe 100644 --- a/pkgs/development/tools/jira-cli-go/default.nix +++ b/pkgs/development/tools/jira-cli-go/default.nix @@ -20,6 +20,8 @@ buildGoModule rec { "-X github.com/ankitpokhrel/jira-cli/internal/version.Version=${version}" ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ less more ]; # Tests expect a pager in $PATH passthru = { From 2f431d194940bcced4469187ee3e031b276f0542 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Feb 2023 01:29:10 +0000 Subject: [PATCH 042/207] jackett: 0.20.3004 -> 0.20.3017 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index ae8b8eacabe4..cebf1249e59a 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.3004"; + version = "0.20.3017"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-UNGkcCQeeMxonJ9Kf1SDMTgSC8uTM2gD377qA+ViSfpWoOGQCY003EZ0c3c0q6oSGVbiIma1wvyW/T/ILLi5yw=="; + hash = "sha512-Hc4EzHqydcBGbiQkr4Hhnfjly9CwaCJXau7WwBb/T+qYdCkOKwrGeuNr3UEMP2x4dth+713HQRrgXviQo+jJlw=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; From 95cb1a90b23e870bf3defccc8eedd4a371614999 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 10 Feb 2023 17:53:48 -0800 Subject: [PATCH 043/207] python310Packages.pyrogram: 2.0.97 -> 2.0.98 Diff: https://github.com/pyrogram/pyrogram/compare/v2.0.97...v2.0.98 --- pkgs/development/python-modules/pyrogram/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix index b143a6c40fd2..7c41032c5565 100644 --- a/pkgs/development/python-modules/pyrogram/default.nix +++ b/pkgs/development/python-modules/pyrogram/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyrogram"; - version = "2.0.97"; + version = "2.0.98"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pyrogram"; repo = "pyrogram"; rev = "v${version}"; - hash = "sha256-cYwH2o2ss8qnOST8Cjh+88PNM5NTO2B11PW7mWS1ctk="; + hash = "sha256-pxhErSlJxaQmms3T/AelsudPFYfH7YaH3ePSR5L33tY="; }; propagatedBuildInputs = [ From 8cd35e0ef683697456556384241cd75347af3be1 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 10 Feb 2023 10:26:32 -0300 Subject: [PATCH 044/207] irr1: init 1.9.4 Release: https://github.com/berndporr/iir1/releases/tag/1.9.4 --- pkgs/development/libraries/irr1/default.nix | 28 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/irr1/default.nix diff --git a/pkgs/development/libraries/irr1/default.nix b/pkgs/development/libraries/irr1/default.nix new file mode 100644 index 000000000000..8740919ce3ae --- /dev/null +++ b/pkgs/development/libraries/irr1/default.nix @@ -0,0 +1,28 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "irr1"; + version = "1.9.4"; + + src = fetchFromGitHub { + owner = "berndporr"; + repo = "iir1"; + rev = version; + hash = "sha256-T8gl51IkZIGq+6D5ge4Kb3wm5aw7Rhphmnf6TTGwHbs="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = { + description = "A DSP IIR realtime filter library written in C++"; + downloadPage = "https://github.com/berndporr/iir1"; + homepage = "http://berndporr.github.io/iir1/"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d3fb3c56467..4a2dab30fc3b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20470,6 +20470,8 @@ with pkgs; ip2location-c = callPackage ../development/libraries/ip2location-c { }; + irr1 = callPackage ../development/libraries/irr1 { }; + irrlicht = if !stdenv.isDarwin then callPackage ../development/libraries/irrlicht { } else callPackage ../development/libraries/irrlicht/mac.nix { From d8b83ecc3ac5803f4d8e39cff9f5734255eef42c Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 10 Feb 2023 10:58:34 -0300 Subject: [PATCH 045/207] dosbox-staging: 0.78.1 -> 0.80.1 * clean-up, ordered alphabetically --- .../emulators/dosbox-staging/default.nix | 43 +++++++++++-------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/emulators/dosbox-staging/default.nix b/pkgs/applications/emulators/dosbox-staging/default.nix index c1820646dc62..f26fb7c9d76c 100644 --- a/pkgs/applications/emulators/dosbox-staging/default.nix +++ b/pkgs/applications/emulators/dosbox-staging/default.nix @@ -1,39 +1,42 @@ -{ lib -, stdenv -, fetchFromGitHub -, SDL2 -, SDL2_net -, alsa-lib +{ alsa-lib , copyDesktopItems +, fetchFromGitHub , fluidsynth +, glib , gtest +, lib , libGL , libGLU +, libjack2 +, libmt32emu , libogg , libpng +, libpulseaudio , libslirp +, libsndfile , makeDesktopItem , makeWrapper , meson -, libmt32emu , ninja , opusfile , pkg-config -, libpulseaudio -, glib -, libjack2 -, libsndfile +, irr1 +, SDL2 +, SDL2_image +, SDL2_net +, speexdsp +, stdenv }: stdenv.mkDerivation rec { pname = "dosbox-staging"; - version = "0.78.1"; + version = "0.80.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-gozFZcJorZtbEK0joksig6qWmAMy03hmBHiyJMONfpk="; + hash = "sha256-I90poBeLSq1c8PXyjrx7/UcbfqFNnnNiXfJdWhLPGMc="; }; nativeBuildInputs = [ @@ -46,11 +49,10 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - SDL2 - SDL2_net alsa-lib fluidsynth glib + irr1 libGL libGLU libjack2 @@ -61,11 +63,16 @@ stdenv.mkDerivation rec { libslirp libsndfile opusfile + SDL2 + SDL2_image + SDL2_net + speexdsp ]; - NIX_CFLAGS_COMPILE = [ - "-I${SDL2_net}/include/SDL2" - ]; + NIX_CFLAGS_COMPILE = [ + "-I${SDL2_image}/include/SDL2" + "-I${SDL2_net}/include/SDL2" + ]; desktopItems = [ (makeDesktopItem { From 97c6b5e65d0f1d592e90e7231d1874bab89e67fd Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 10 Feb 2023 18:50:12 -0800 Subject: [PATCH 046/207] =?UTF-8?q?mdl:=200.11.0=20=E2=86=92=200.12.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg --- pkgs/development/tools/misc/mdl/Gemfile.lock | 18 +++++---- pkgs/development/tools/misc/mdl/gemset.nix | 39 +++++++++++++------- 2 files changed, 35 insertions(+), 22 deletions(-) diff --git a/pkgs/development/tools/misc/mdl/Gemfile.lock b/pkgs/development/tools/misc/mdl/Gemfile.lock index 0e5b7b016722..40fb2f51a60d 100644 --- a/pkgs/development/tools/misc/mdl/Gemfile.lock +++ b/pkgs/development/tools/misc/mdl/Gemfile.lock @@ -1,24 +1,26 @@ GEM remote: https://rubygems.org/ specs: - chef-utils (16.7.61) - kramdown (2.3.0) + chef-utils (18.1.0) + concurrent-ruby + concurrent-ruby (1.2.0) + kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - mdl (0.11.0) + mdl (0.12.0) kramdown (~> 2.3) kramdown-parser-gfm (~> 1.1) mixlib-cli (~> 2.1, >= 2.1.1) mixlib-config (>= 2.2.1, < 4) mixlib-shellout mixlib-cli (2.1.8) - mixlib-config (3.0.9) + mixlib-config (3.0.27) tomlrb - mixlib-shellout (3.2.2) + mixlib-shellout (3.2.7) chef-utils - rexml (3.2.4) - tomlrb (2.0.0) + rexml (3.2.5) + tomlrb (2.0.3) PLATFORMS ruby @@ -27,4 +29,4 @@ DEPENDENCIES mdl BUNDLED WITH - 2.1.4 + 2.4.6 diff --git a/pkgs/development/tools/misc/mdl/gemset.nix b/pkgs/development/tools/misc/mdl/gemset.nix index eaaa7bed5a5e..1fd09e878088 100644 --- a/pkgs/development/tools/misc/mdl/gemset.nix +++ b/pkgs/development/tools/misc/mdl/gemset.nix @@ -1,13 +1,24 @@ { chef-utils = { + dependencies = ["concurrent-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14xd2md3cda42afl28hr5q4ng195zmqfn04w2bxr4s2fb0gglbrz"; + sha256 = "0ckbnra3cs71syrvfhgcrg1icqxh6pj21by2f9sy6r6kbr19g4w3"; type = "gem"; }; - version = "16.7.61"; + version = "18.1.0"; + }; + concurrent-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5"; + type = "gem"; + }; + version = "1.2.0"; }; kramdown = { dependencies = ["rexml"]; @@ -15,10 +26,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7"; + sha256 = "1ic14hdcqxn821dvzki99zhmcy130yhv5fqfffkcf87asv5mnbmn"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; kramdown-parser-gfm = { dependencies = ["kramdown"]; @@ -37,10 +48,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vgzq6v2scd8n4cmx8rrypqmchnhg4wccrhiakg2i8fzv7wxplqq"; + sha256 = "1gk42gayn8d2084ak6wvdwch00wb0acvncglfdhi5n0ap93q6wb6"; type = "gem"; }; - version = "0.11.0"; + version = "0.12.0"; }; mixlib-cli = { groups = ["default"]; @@ -58,10 +69,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1askip583sfnz25gywd508l3vj5wnvx9vp7gm1sfnixm7amssrwq"; + sha256 = "0j0122lv2qgccl61njqi0pj6sp6nb85y07gcmw16bwg4k0c8nx6p"; type = "gem"; }; - version = "3.0.9"; + version = "3.0.27"; }; mixlib-shellout = { dependencies = ["chef-utils"]; @@ -69,29 +80,29 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y1z0phkdhpbsn8vz7a86nhkr7ra619j86z5p75amz61kfpw42z9"; + sha256 = "0zkwg76y96nkh1mv0k92ybq46cr06v1wmic16129ls3yqzwx3xj6"; type = "gem"; }; - version = "3.2.2"; + version = "3.2.7"; }; rexml = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; type = "gem"; }; - version = "3.2.4"; + version = "3.2.5"; }; tomlrb = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ssyvjcvaisv70f21arlmnw5a1ryzmxzz4538vdwfslz9xxl27sr"; + sha256 = "1xyl2nlfm39lklyaf0p7zj9psr60jvrlyfh26hrpk7wi4k7nlwy2"; type = "gem"; }; - version = "2.0.0"; + version = "2.0.3"; }; } From e44cac10e95dc9898e8e3bda11ae8f820c161c2a Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Fri, 10 Feb 2023 19:38:06 -0800 Subject: [PATCH 047/207] biodiff: 1.0.4 -> 1.1.0 --- pkgs/development/tools/biodiff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/biodiff/default.nix b/pkgs/development/tools/biodiff/default.nix index 610b991ec52a..819cccf95c61 100644 --- a/pkgs/development/tools/biodiff/default.nix +++ b/pkgs/development/tools/biodiff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "biodiff"; - version = "1.0.4"; + version = "1.1.0"; src = fetchFromGitHub { owner = "8051Enthusiast"; repo = "biodiff"; rev = "v${version}"; - sha256 = "sha256-anGiqTiZVm6q8BII1Ahg2ph7OwX5isCa16orEcf4aFE="; + hash = "sha256-IrIRBozW2nNqt3/643jQ9sHT/YIpYhWeG749bTR4+60="; }; - cargoSha256 = "sha256-uyATu6M04IRFtzFb2ox0xUYFXjkW+t+71Iy58TuqCko="; + cargoHash = "sha256-EkvZk5l2Jw/6Ejrz4gYFWz9IZLjz0Op/1z3BGBV07dA="; meta = with lib; { description = "Hex diff viewer using alignment algorithms from biology"; From f8dc9663d7a8b38542050013c65d3ff06dd0a1a3 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Thu, 9 Feb 2023 23:33:22 -0600 Subject: [PATCH 048/207] signal-desktop: 6.4.1 -> 6.5.1 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 2c34523f5513..2cd0dcbbb9f7 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,8 +1,8 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.4.1"; - hash = "sha256-/Rrph74nVr64Z6blNNn3oMM25YK92MZY/vuF1d+r6Yc="; + version = "6.5.1"; + hash = "sha256-At4ILl6nHltP1TMI5cjK7gE4NENAccS4MPMHXJoGveM="; }; signal-desktop-beta = { dir = "Signal Beta"; From 334c645375a166f9144797fc482cb1f1a585ae51 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Thu, 9 Feb 2023 23:33:48 -0600 Subject: [PATCH 049/207] signal-desktop-beta: 6.5.0-beta.2 -> 6.6.0-beta.1 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 2cd0dcbbb9f7..d8f3fcb17939 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -6,7 +6,7 @@ }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.5.0-beta.2"; - hash = "sha256-cAX9oU3bJrTOH3RbbfUK+49OiRSLjEZLdpJNOMAa94I="; + version = "6.6.0-beta.1"; + hash = "sha256-txSvMg7Q+r9UWJMC9Rj2XQ8y1WN3xphMruvOZok/VPk="; }; } From ba7956304ab932264eceac27fa79f4fa748fc905 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Feb 2023 03:56:43 +0000 Subject: [PATCH 050/207] suricata: 6.0.8 -> 6.0.10 --- pkgs/applications/networking/ids/suricata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index a44f3f555dee..bf7626759b36 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -34,11 +34,11 @@ in stdenv.mkDerivation rec { pname = "suricata"; - version = "6.0.8"; + version = "6.0.10"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-JTzjzA35Z62TcdbqjU7tkexZPfPtBOCCKcfPhXgMkaM="; + sha256 = "sha256-Wb/Rv12cFZYib6SBW/dmQ85ZaYhmwQeiYmnEgfElxNc="; }; nativeBuildInputs = [ From 58006feb6fd891dd284ecd65868d0cc0c476fa80 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Feb 2023 04:10:05 +0000 Subject: [PATCH 051/207] flyway: 9.12.0 -> 9.14.1 --- pkgs/development/tools/flyway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 2921a7b39445..2f111370d222 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec{ pname = "flyway"; - version = "9.12.0"; + version = "9.14.1"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-8Zx+0lWaPAgPhxcvb84FzT2z58yAwDDLHegtXpRTr5M="; + sha256 = "sha256-a4wApae08oQBVOSvLJFfU0ZB8mOJbjsnD/SgpCq6IYc="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; From d742d614effa92789d6dd18e582728eac1eee0b1 Mon Sep 17 00:00:00 2001 From: Melvyn Date: Fri, 10 Feb 2023 18:25:00 -0800 Subject: [PATCH 052/207] qbittorrent: 4.4.5 -> 4.5.0 https://github.com/qbittorrent/qBittorrent/blob/release-4.5.0/Changelog --- pkgs/applications/networking/p2p/qbittorrent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 319a5e7f0dc8..757c1652f15c 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -11,13 +11,13 @@ assert trackerSearch -> (python3 != null); mkDerivation rec { pname = "qbittorrent"; - version = "4.4.5"; + version = "4.5.0"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - sha256 = "sha256-EgRDNOJ4szdZA5ipOuGy2R0oVdjWcuqPU3ecU3ZNK3g="; + sha256 = "sha256-mDjY6OAegMjU/z5+/BUbodxJjntFbk5bsfOfqIWa87o="; }; enableParallelBuilding = true; From 9c4947b54a45b2fec445e6335c7ff2566501a201 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Feb 2023 05:26:24 +0000 Subject: [PATCH 053/207] python310Packages.huey: 2.4.2 -> 2.4.5 --- pkgs/development/python-modules/huey/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/huey/default.nix b/pkgs/development/python-modules/huey/default.nix index 38c25fa1b0c8..76e487f0534b 100644 --- a/pkgs/development/python-modules/huey/default.nix +++ b/pkgs/development/python-modules/huey/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "huey"; - version = "2.4.2"; + version = "2.4.5"; src = fetchFromGitHub { owner = "coleifer"; repo = pname; - rev = version; - sha256 = "00fi04991skq61gjrmig8ry6936pc8zs7p8py8spfipbxf1irkjg"; + rev = "refs/tags/${version}"; + sha256 = "sha256-7ZMkA5WzWJKSwvpOoZYQO9JgedCdxNGrkFuPmYm4aRE="; }; propagatedBuildInputs = [ redis ]; From 681319eba7389c2b95037c0606a7b9991be91f69 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 03:07:19 +0000 Subject: [PATCH 054/207] =?UTF-8?q?terraform-providers.equinix:=201.11.1?= =?UTF-8?q?=20=E2=86=92=201.12.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ec486127924c..2f41a5cd4995 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -355,14 +355,13 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-hU0mqMuB3yvLWJ6ggDvATQeSFdpsEfs/hmvLV6A2Md4=", + "hash": "sha256-aah3f/5Bd+IgXbyJpDhcyklIYHlK3yy16UkYlOprh0c=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", - "proxyVendor": true, "repo": "terraform-provider-equinix", - "rev": "v1.11.1", + "rev": "v1.12.0", "spdx": "MIT", - "vendorHash": "sha256-NLvw606QxUwCDViLbR5LjoWGZnk48/zG0NownEATYKM=" + "vendorHash": "sha256-Zi2e/Vg9iKTrU8Mb37Y8xHYIBL+IfDnWMUUg5Vqrbfo=" }, "exoscale": { "hash": "sha256-48msmXj7SFmi5TA0/QYm66oIETymWi5ayF+yExyp+hk=", From b137d166fa8ff4d9b8bd67ad7bbaa688a5575abc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 03:09:10 +0000 Subject: [PATCH 055/207] =?UTF-8?q?terraform-providers.okta:=203.41.0=20?= =?UTF-8?q?=E2=86=92=203.42.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2f41a5cd4995..65d450853132 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -820,11 +820,11 @@ "vendorHash": null }, "okta": { - "hash": "sha256-wKs5XRyyCda6pljtuo8ukAQl5ZZxeDSyt0CQWe8eXqY=", + "hash": "sha256-UMQ1YEXYdaLwYZBhGzbikhExW/HT/u4QSNk08vhmbwA=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v3.41.0", + "rev": "v3.42.0", "spdx": "MPL-2.0", "vendorHash": "sha256-KWSHVI51YHHF3HXpyd1WB5Za721ak+cFhwDIfvC/ax4=" }, From 663a1894ee08d94785528376cadbbab060049671 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 03:11:39 +0000 Subject: [PATCH 056/207] =?UTF-8?q?terraform-providers.vultr:=202.12.0=20?= =?UTF-8?q?=E2=86=92=202.12.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 65d450853132..c230ab561cb7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1227,11 +1227,11 @@ "vendorHash": "sha256-guUjkk7oW+Gvu015LUAxGqUwZF4H+4xmmOaMqKixZaI=" }, "vultr": { - "hash": "sha256-DfiJgN1R7qW3c13hBabsMizY3mYamIq8AGms1q9kdVU=", + "hash": "sha256-5pI/jLG8UdMxgubvp5SJDW49C6iHKXOtlnr3EuzwtsQ=", "homepage": "https://registry.terraform.io/providers/vultr/vultr", "owner": "vultr", "repo": "terraform-provider-vultr", - "rev": "v2.12.0", + "rev": "v2.12.1", "spdx": "MPL-2.0", "vendorHash": null }, From 59101f53e21ed7e5db5ab566701936bf426015bc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 03:13:43 +0000 Subject: [PATCH 057/207] =?UTF-8?q?terraform-providers.tencentcloud:=201.7?= =?UTF-8?q?9.8=20=E2=86=92=201.79.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c230ab561cb7..428fc225e1b5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1090,11 +1090,11 @@ "vendorHash": "sha256-2wPmLpjhG6QgG+BUCO0oIzHjBOWIOYuptgdtSIm9TZw=" }, "tencentcloud": { - "hash": "sha256-yVI1f86Gpkwl3jCAs5d54rZS8lM7cjbwWq+HUXwi8EU=", + "hash": "sha256-NglAzuZr3OqLHunMbmLm7Cnh24otQXRP1y3ZaDFrXAc=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.79.8", + "rev": "v1.79.9", "spdx": "MPL-2.0", "vendorHash": null }, From acb0628924c0a68537a67b870480ff64a64784df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Feb 2023 06:18:57 +0000 Subject: [PATCH 058/207] unciv: 4.4.11 -> 4.4.13-gp --- pkgs/games/unciv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index 97976f9d66f2..7849de17cf6d 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.4.11"; + version = "4.4.13-gp"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-UvTEqptA9Dp1wdri12sAYDB6rjiZCvk2tiG5i0AWU78="; + hash = "sha256-HVjBuqzi+LpqkxureKSi7zXzmTALtErW6rPJyzQBgXk="; }; dontUnpack = true; From 84c20a3d0c10f663f3d91d192b7ed438436c3681 Mon Sep 17 00:00:00 2001 From: Samuel Tam Date: Sat, 11 Feb 2023 14:21:31 +0800 Subject: [PATCH 059/207] gcc-arm-embedded-12: support aarch64-darwin --- .../compilers/gcc-arm-embedded/12/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/gcc-arm-embedded/12/default.nix b/pkgs/development/compilers/gcc-arm-embedded/12/default.nix index caff0ad023f8..668391b2645b 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/12/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/12/default.nix @@ -10,17 +10,19 @@ stdenv.mkDerivation rec { version = "12.2.rel1"; platform = { - aarch64-linux = "aarch64"; - x86_64-darwin = "darwin-x86_64"; - x86_64-linux = "x86_64"; + aarch64-darwin = "darwin-arm64"; + aarch64-linux = "aarch64"; + x86_64-darwin = "darwin-x86_64"; + x86_64-linux = "x86_64"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz"; sha256 = { - aarch64-linux = "131ydgndff7dyhkivfchbk43lv3cv2p172knkqilx64aapvk5qvy"; - x86_64-darwin = "00i9gd1ny00681pwinh6ng9x45xsyrnwc6hm2vr348z9gasyxh00"; - x86_64-linux = "0rv8r5zh0a5621v0xygxi8f6932qgwinw2s9vnniasp9z7897gl4"; + aarch64-darwin = "0j12n631bmbfvnfbmv4q7cfhmh4l7ka3vcjcvyw0vjqb4msyia91"; + aarch64-linux = "131ydgndff7dyhkivfchbk43lv3cv2p172knkqilx64aapvk5qvy"; + x86_64-darwin = "00i9gd1ny00681pwinh6ng9x45xsyrnwc6hm2vr348z9gasyxh00"; + x86_64-linux = "0rv8r5zh0a5621v0xygxi8f6932qgwinw2s9vnniasp9z7897gl4"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; @@ -47,6 +49,6 @@ stdenv.mkDerivation rec { homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; maintainers = with maintainers; [ prusnak ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } From ff42c8f525bf7623e1e64e8a6c4187a87ff4148e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Feb 2023 06:30:07 +0000 Subject: [PATCH 060/207] linkerd: 2.12.3 -> 2.12.4 --- pkgs/applications/networking/cluster/linkerd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 896c2ac5a016..7ac3f68b35ee 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "stable"; - version = "2.12.3"; - sha256 = "01vnqhn5lc4pv1rgwmmzzf7ynqc4ss0jysqhjq0m5yzll2k40d8z"; - vendorSha256 = "sha256-7CkeWbgiQIKhuCrJErZrkkx0MD41qxaWAY/18VafLZE="; + version = "2.12.4"; + sha256 = "1nl831xjhxyw1r2zvdxy3455sfn1cnn6970n02q7aalmqgz9rpdd"; + vendorSha256 = "sha256-c7x2vNO6ap5Ecx4+1hKy6PImFuclSQqvkBKr0LPdX4M="; } From ce83955b9ebf58cf871c1f33af2f6936e9532408 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Feb 2023 06:57:50 +0000 Subject: [PATCH 061/207] reuse: 1.1.1 -> 1.1.2 --- pkgs/tools/package-management/reuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/reuse/default.nix b/pkgs/tools/package-management/reuse/default.nix index c350a1c0735e..11d08c0dfd5a 100644 --- a/pkgs/tools/package-management/reuse/default.nix +++ b/pkgs/tools/package-management/reuse/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "reuse"; - version = "1.1.1"; + version = "1.1.2"; format = "pyproject"; src = fetchFromGitHub { owner = "fsfe"; repo = "reuse-tool"; rev = "refs/tags/v${version}"; - hash = "sha256-4L5VQtjpJ1P95S3vkbgLYTO/lTFReGiSAVuWSwh14i4="; + hash = "sha256-J+zQrokrAX5tRU/2RPPSaFDyfsACPHHQYbK5sO99CMs="; }; nativeBuildInputs = with python3Packages; [ From d83d7bd84b83a7d251045fbc32b6c25fbf87f71f Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Sat, 11 Feb 2023 08:11:29 +0100 Subject: [PATCH 062/207] forgejo: 1.18.3-0 -> 1.18.3-1 https://codeberg.org/forgejo/forgejo/src/commit/fbf5449d87d63443376c6af3f0a8b30aa063f967/RELEASE-NOTES.md#1-18-3-1 --- pkgs/applications/version-management/forgejo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index 65eee3d93b55..fddf3b24fdbb 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -20,13 +20,13 @@ buildGoModule rec { pname = "forgejo"; - version = "1.18.3-0"; + version = "1.18.3-1"; src = fetchurl { name = "${pname}-src-${version}.tar.gz"; # see https://codeberg.org/forgejo/forgejo/releases - url = "https://codeberg.org/attachments/384fd9ab-7c64-4c29-9b1b-cdb803c48103"; - hash = "sha256-zBGd+wPJDw7bwRvAlscqbQHDG6po3dlbpYccfanbtyU="; + url = "https://codeberg.org/attachments/3fdf0967-d3f4-4488-a2bf-276c4a64d97c"; + hash = "sha256-H69qKdmz5qHJ353UZYztUlStpj/RyE6LA8cDaRnVYAQ="; }; vendorHash = null; From 60cfeaf546dc97b1f983bf73da8ba100cf57c8a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Feb 2023 07:16:20 +0000 Subject: [PATCH 063/207] oh-my-posh: 14.2.4 -> 14.2.5 --- pkgs/development/tools/oh-my-posh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index 8ce09c8e39b3..526f52c86786 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "14.2.4"; + version = "14.2.5"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4o0Z3xXsVTr2dE5td/i2uQoaqsBGOMSrzt2X6C9gYbA="; + hash = "sha256-XhpahA2BPtZeymNwlZ40FzLC5biThBBLna28zRw81Bw="; }; vendorHash = "sha256-ehG71B351u+LoXDuKQkuEdEpUdHslVU2HcPKUz6FAnQ="; From dcd8bd6fb27b905f97c3b726f8b500d76244a212 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Feb 2023 07:24:28 +0000 Subject: [PATCH 064/207] SDL2_ttf: 2.20.1 -> 2.20.2 --- pkgs/development/libraries/SDL2_ttf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index f424a2e67f56..06793ee5e551 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "SDL2_ttf"; - version = "2.20.1"; + version = "2.20.2"; src = fetchurl { url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz"; - sha256 = "sha256-eM2tUfPMOtppMrG7bpFLM3mKuXCh6Bd2PyLdv9l9DFc="; + sha256 = "sha256-ncce2TSHUhsQeixKnKa/Q/ti9r3dXCawVea5FBiiIFM="; }; configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; From 7921b2d453891973914f43391013880cdf4d16a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 10 Feb 2023 23:25:51 -0800 Subject: [PATCH 065/207] abcmidi: 2023.02.07 -> 2023.02.08 --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 4551d8b6664a..a83c1c81c416 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2023.02.07"; + version = "2023.02.08"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-/EET65zdkHtVCNMurydskk1CO9pObCfWn7qVGGD9U3M="; + hash = "sha256-cJrRt+if3Ymn/nMCGsw2iObkRQF3hDxaUT9OEYp6j/g="; }; meta = with lib; { From e68d888d5069124bd0f30c164945f54d5cfc6710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 10 Feb 2023 23:30:31 -0800 Subject: [PATCH 066/207] python310Packages.huey: add meta.changelog --- pkgs/development/python-modules/huey/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/huey/default.nix b/pkgs/development/python-modules/huey/default.nix index 76e487f0534b..1be0ddbfc469 100644 --- a/pkgs/development/python-modules/huey/default.nix +++ b/pkgs/development/python-modules/huey/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { + changelog = "https://github.com/coleifer/huey/blob/${src.rev}/CHANGELOG.md"; description = "A little task queue for python"; homepage = "https://github.com/coleifer/huey"; license = licenses.mit; From b43835bff722a86b4fb37f7f278b28d6464d4f2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 10 Feb 2023 23:33:02 -0800 Subject: [PATCH 067/207] python310Packages.huey: use pyproject format --- .../development/python-modules/huey/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/huey/default.nix b/pkgs/development/python-modules/huey/default.nix index 1be0ddbfc469..a622017bebcf 100644 --- a/pkgs/development/python-modules/huey/default.nix +++ b/pkgs/development/python-modules/huey/default.nix @@ -1,16 +1,29 @@ -{ lib, buildPythonPackage, fetchFromGitHub, redis }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, redis +}: buildPythonPackage rec { pname = "huey"; version = "2.4.5"; + format = "pyproject"; + src = fetchFromGitHub { owner = "coleifer"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-7ZMkA5WzWJKSwvpOoZYQO9JgedCdxNGrkFuPmYm4aRE="; + hash = "sha256-7ZMkA5WzWJKSwvpOoZYQO9JgedCdxNGrkFuPmYm4aRE="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ redis ]; # connects to redis From 51f387beffc5cb9a37d2b5cb3d25ea9594e5525e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 11 Feb 2023 09:04:08 +0100 Subject: [PATCH 068/207] nushell: fix build on x86_64-darwin --- pkgs/shells/nushell/default.nix | 2 -- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 2f89521f934b..2264f0abd892 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -12,7 +12,6 @@ , xorg , libiconv , AppKit -, Foundation , Security # darwin.apple_sdk.sdk , sdk @@ -47,7 +46,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl zstd ] ++ lib.optionals stdenv.isDarwin [ zlib libiconv Security ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ - Foundation ( # Pull a header that contains a definition of proc_pid_rusage(). # (We pick just that one because using the other headers from `sdk` is not diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ca442444ac9..0a436b47e5bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26203,8 +26203,8 @@ with pkgs; nsh = callPackage ../shells/nsh { }; - nushell = callPackage ../shells/nushell { - inherit (darwin.apple_sdk.frameworks) AppKit Foundation Security; + nushell = darwin.apple_sdk_11_0.callPackage ../shells/nushell { + inherit (darwin.apple_sdk_11_0.frameworks) AppKit Security; inherit (darwin.apple_sdk) sdk; }; From e0d6c17bca78dd45b7199c41951ee07e0c0ffe72 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 09:07:08 +0100 Subject: [PATCH 069/207] libreddit: 0.29.0 -> 0.29.1 Diff: https://github.com/libreddit/libreddit/compare/refs/tags/v0.29.0...v0.29.1 Changelog: https://github.com/libreddit/libreddit/releases/tag/v0.29.1 --- pkgs/servers/libreddit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/libreddit/default.nix b/pkgs/servers/libreddit/default.nix index 098fdb6e02b6..508a3319d632 100644 --- a/pkgs/servers/libreddit/default.nix +++ b/pkgs/servers/libreddit/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "libreddit"; - version = "0.29.0"; + version = "0.29.1"; src = fetchFromGitHub { owner = "libreddit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ZH1mtFfbM+acEY1oyoFXPltgPbtgI1kzoO59op1zZfo="; + hash = "sha256-W/vUOioZpA2UYPyJOVTGC1mek574m48NKQXG2o7emjU="; }; - cargoHash = "sha256-2DBptAvJ0J65AehgHG7f4JZf1QA4ZXn8dqG09wcXsiU="; + cargoHash = "sha256-WrkUW9fV69RswS3qBMqBGxNBq6W4eJmJaTrEDp9byrM="; buildInputs = lib.optionals stdenv.isDarwin [ Security From e264207ecf29708b0ce07e10b417c6422319ca94 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 09:17:30 +0100 Subject: [PATCH 070/207] python310Packages.acquire: 3.3 -> 3.4 Diff: https://github.com/fox-it/acquire/compare/3.3...3.4 --- pkgs/development/python-modules/acquire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index b1b13bf581d1..aa690db41352 100644 --- a/pkgs/development/python-modules/acquire/default.nix +++ b/pkgs/development/python-modules/acquire/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "acquire"; - version = "3.3"; + version = "3.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "acquire"; rev = version; - hash = "sha256-S7EZZxNcoLcZyyRNGlZj6nGoCAlqCxNdh3azIVKvOTM="; + hash = "sha256-VkO+XLIC/UQzvfLsgbKcx9i8OxTC6J32nkxPHWWn7m8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From ca3873e2d965caa9e1d176f6b198056cfa488c05 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 09:19:14 +0100 Subject: [PATCH 071/207] python310Packages.acquire: add changelog to meta --- pkgs/development/python-modules/acquire/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index aa690db41352..c3b32bbc5dee 100644 --- a/pkgs/development/python-modules/acquire/default.nix +++ b/pkgs/development/python-modules/acquire/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "acquire"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-VkO+XLIC/UQzvfLsgbKcx9i8OxTC6J32nkxPHWWn7m8="; }; @@ -64,6 +64,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tool to quickly gather forensic artifacts from disk images or a live system"; homepage = "https://github.com/fox-it/acquire"; + changelog = "https://github.com/fox-it/acquire/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; From 96c05ed392d5f292e24e17926198665a9a61b0db Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 11 Feb 2023 09:43:18 +0100 Subject: [PATCH 072/207] qbittorrent-nox: fix build on darwin --- pkgs/applications/networking/p2p/qbittorrent/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 757c1652f15c..64394696caf0 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,14 +10,14 @@ assert guiSupport -> (dbus != null); assert trackerSearch -> (python3 != null); mkDerivation rec { - pname = "qbittorrent"; + pname = "qbittorrent" + lib.optionalString (!guiSupport) "-nox"; version = "4.5.0"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - sha256 = "sha256-mDjY6OAegMjU/z5+/BUbodxJjntFbk5bsfOfqIWa87o="; + hash = "sha256-mDjY6OAegMjU/z5+/BUbodxJjntFbk5bsfOfqIWa87o="; }; enableParallelBuilding = true; @@ -43,8 +43,8 @@ mkDerivation rec { postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/{Applications,bin} - cp -R src/qbittorrent.app $out/Applications - makeWrapper $out/{Applications/qbittorrent.app/Contents/MacOS,bin}/qbittorrent + cp -R src/${pname}.app $out/Applications + makeWrapper $out/{Applications/${pname}.app/Contents/MacOS,bin}/${pname} ''; meta = with lib; { From cc7591f90e0632c1c5cbea3f0e85fc811ca3b539 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Feb 2023 08:43:59 +0000 Subject: [PATCH 073/207] eggnog-mapper: 2.1.9 -> 2.1.10 --- pkgs/applications/science/biology/eggnog-mapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/pkgs/applications/science/biology/eggnog-mapper/default.nix index 9aa655932d35..c555a30b15a8 100644 --- a/pkgs/applications/science/biology/eggnog-mapper/default.nix +++ b/pkgs/applications/science/biology/eggnog-mapper/default.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "eggnog-mapper"; - version = "2.1.9"; + version = "2.1.10"; src = fetchFromGitHub { owner = "eggnogdb"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Fn7hJhZG/T8f2nP+ltl1/FBFwXz0Kxz/4mIma/Z0bnE="; + hash = "sha256-6R2gl2l2Cl/eva0g+kxDLBI2+5T9cFTgaGMsEfeDVU0="; }; postPatch = '' From 6d6e6912d18d7742cd9bf22ca33e27c5e6b35382 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 09:55:26 +0100 Subject: [PATCH 074/207] python310Packages.dissect-fat: add changelog to meta --- pkgs/development/python-modules/dissect-fat/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect-fat/default.nix b/pkgs/development/python-modules/dissect-fat/default.nix index 47b2cafdb813..af5ad8363ccc 100644 --- a/pkgs/development/python-modules/dissect-fat/default.nix +++ b/pkgs/development/python-modules/dissect-fat/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.fat"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-kqdVgUkvW9I5CI4T9b7VeX6hPm3Ufwrdnhmo1jR5Fdg="; }; @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the FAT file system"; homepage = "https://github.com/fox-it/dissect.fat"; + changelog = "https://github.com/fox-it/dissect.fat/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; From 9966beec91ed2db9a45fd9593864a52e4c8d237b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 09:56:40 +0100 Subject: [PATCH 075/207] python310Packages.dissect-fat: 3.2 -> 3.3 Diff: https://github.com/fox-it/dissect.fat/compare/refs/tags/3.2...3.3 Changelog: https://github.com/fox-it/dissect.fat/releases/tag/3.3 --- pkgs/development/python-modules/dissect-fat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-fat/default.nix b/pkgs/development/python-modules/dissect-fat/default.nix index af5ad8363ccc..b384fb5cba9f 100644 --- a/pkgs/development/python-modules/dissect-fat/default.nix +++ b/pkgs/development/python-modules/dissect-fat/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-fat"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.fat"; rev = "refs/tags/${version}"; - hash = "sha256-kqdVgUkvW9I5CI4T9b7VeX6hPm3Ufwrdnhmo1jR5Fdg="; + hash = "sha256-v4GjI6DdDfxO3kGZ7Z5C6mkdRj9axsT9mvlSOQyiMBw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 17c79629f05dcd35e3bd0259ca28601680fb3668 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 09:57:07 +0100 Subject: [PATCH 076/207] python310Packages.dissect-volume: add changelog to meta --- pkgs/development/python-modules/dissect-volume/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect-volume/default.nix b/pkgs/development/python-modules/dissect-volume/default.nix index cff900efbefa..846251320314 100644 --- a/pkgs/development/python-modules/dissect-volume/default.nix +++ b/pkgs/development/python-modules/dissect-volume/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.volume"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-NwY4J1FSCvNIoH9uUHJVlM3jJt6A9CZ7uCWhlIdYztM="; }; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing various utility functions for the other Dissect modules"; homepage = "https://github.com/fox-it/dissect.volume"; + changelog = "https://github.com/fox-it/dissect.volume/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; From 9ff65069977c73054f7830ee4ff2f627663c9add Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 09:57:55 +0100 Subject: [PATCH 077/207] python310Packages.dissect-volume: 3.2 -> 3.3 Diff: https://github.com/fox-it/dissect.volume/compare/refs/tags/3.2...3.3 Changelog: https://github.com/fox-it/dissect.volume/releases/tag/3.3 --- pkgs/development/python-modules/dissect-volume/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-volume/default.nix b/pkgs/development/python-modules/dissect-volume/default.nix index 846251320314..9053d83f0e49 100644 --- a/pkgs/development/python-modules/dissect-volume/default.nix +++ b/pkgs/development/python-modules/dissect-volume/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-volume"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.volume"; rev = "refs/tags/${version}"; - hash = "sha256-NwY4J1FSCvNIoH9uUHJVlM3jJt6A9CZ7uCWhlIdYztM="; + hash = "sha256-5O2ywPJi9M7gvcreS7DrW2qJ32MoR3Qero7jJ5gv0ow="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 0c6fa79b6c6413e64893f093535d1e242e36ee07 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 09:59:23 +0100 Subject: [PATCH 078/207] python310Packages.dissect-clfs: add changelog to meta --- pkgs/development/python-modules/dissect-clfs/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect-clfs/default.nix b/pkgs/development/python-modules/dissect-clfs/default.nix index 3e807d3bd260..111777d15ec5 100644 --- a/pkgs/development/python-modules/dissect-clfs/default.nix +++ b/pkgs/development/python-modules/dissect-clfs/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.clfs"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-1nh81ppJpYre3y7hJ9xS+TNU1NfTH+9NMHdV55kPEXI="; }; @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the CLFS (Common Log File System) file system"; homepage = "https://github.com/fox-it/dissect.clfs"; + changelog = "https://github.com/fox-it/dissect.clfs/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; From a9992aba3e25d7b52794ee0fd98b3b7d766b9df9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:00:09 +0100 Subject: [PATCH 079/207] python310Packages.dissect-clfs: 1.2 -> 1.3 Diff: https://github.com/fox-it/dissect.clfs/compare/refs/tags/1.2...1.3 Changelog: https://github.com/fox-it/dissect.clfs/releases/tag/1.3 --- pkgs/development/python-modules/dissect-clfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-clfs/default.nix b/pkgs/development/python-modules/dissect-clfs/default.nix index 111777d15ec5..d73d2145985f 100644 --- a/pkgs/development/python-modules/dissect-clfs/default.nix +++ b/pkgs/development/python-modules/dissect-clfs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-clfs"; - version = "1.2"; + version = "1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.clfs"; rev = "refs/tags/${version}"; - hash = "sha256-1nh81ppJpYre3y7hJ9xS+TNU1NfTH+9NMHdV55kPEXI="; + hash = "sha256-QzEcJvujkNVUXtqu7yY7sJ/U55jzGBbUHxOVDxg4vac="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From e8b741df94048078deb812304339a9fc83df47de Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:01:36 +0100 Subject: [PATCH 080/207] python310Packages.dissect-vmfs: add changelog to meta --- pkgs/development/python-modules/dissect-vmfs/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect-vmfs/default.nix b/pkgs/development/python-modules/dissect-vmfs/default.nix index a520ce8c05a5..1f7db013864e 100644 --- a/pkgs/development/python-modules/dissect-vmfs/default.nix +++ b/pkgs/development/python-modules/dissect-vmfs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.vmfs"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-6ZNybNRL97Zz6O32r4X0K3/+vZF3Qid98rj2pgGWgvI="; }; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the VMFS file system"; homepage = "https://github.com/fox-it/dissect.vmfs"; + changelog = "https://github.com/fox-it/dissect.vmfs/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; From eec67e4769f6e01008427db83f84ff459abbc798 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:02:42 +0100 Subject: [PATCH 081/207] python310Packages.dissect-vmfs: 3.2 -> 3.3 Diff: https://github.com/fox-it/dissect.vmfs/compare/refs/tags/3.2...3.3 Changelog: https://github.com/fox-it/dissect.vmfs/releases/tag/3.3 --- pkgs/development/python-modules/dissect-vmfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-vmfs/default.nix b/pkgs/development/python-modules/dissect-vmfs/default.nix index 1f7db013864e..0834e967b2d6 100644 --- a/pkgs/development/python-modules/dissect-vmfs/default.nix +++ b/pkgs/development/python-modules/dissect-vmfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-vmfs"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.vmfs"; rev = "refs/tags/${version}"; - hash = "sha256-6ZNybNRL97Zz6O32r4X0K3/+vZF3Qid98rj2pgGWgvI="; + hash = "sha256-9+1geOJ+vzy6+eGibX+BUHbtzyLhq3MPBsad98ykn3I="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From fd2c97dd2442d536b887b91c5b27cacc7a72cfb2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:04:15 +0100 Subject: [PATCH 082/207] python310Packages.dissect-ntfs: add changelog to meta --- pkgs/development/python-modules/dissect-ntfs/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect-ntfs/default.nix b/pkgs/development/python-modules/dissect-ntfs/default.nix index 1b27129e9d58..00a3afcb8af6 100644 --- a/pkgs/development/python-modules/dissect-ntfs/default.nix +++ b/pkgs/development/python-modules/dissect-ntfs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.ntfs"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-4QEsWTdqlHIP1a9g45+zv1SdHY0Ofsr7Rf1z+ctssSw="; }; @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the NTFS file system"; homepage = "https://github.com/fox-it/dissect.ntfs"; + changelog = "https://github.com/fox-it/dissect.ntfs/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; From 197ef1ac403b4be2ced8cf5283329585b0da8599 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:04:58 +0100 Subject: [PATCH 083/207] python310Packages.dissect-ntfs: 3.2 -> 3.3 Diff: https://github.com/fox-it/dissect.ntfs/compare/refs/tags/3.2...3.3 Changelog: https://github.com/fox-it/dissect.ntfs/releases/tag/3.3 --- pkgs/development/python-modules/dissect-ntfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-ntfs/default.nix b/pkgs/development/python-modules/dissect-ntfs/default.nix index 00a3afcb8af6..611f9b56226e 100644 --- a/pkgs/development/python-modules/dissect-ntfs/default.nix +++ b/pkgs/development/python-modules/dissect-ntfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-ntfs"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.ntfs"; rev = "refs/tags/${version}"; - hash = "sha256-4QEsWTdqlHIP1a9g45+zv1SdHY0Ofsr7Rf1z+ctssSw="; + hash = "sha256-xhtAN0QaLLbQk/aAd9PlEkyW39w33iPaQtGzbouI6hc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 6ec542108207f021cc22efad5bfc64e39a53d298 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:06:08 +0100 Subject: [PATCH 084/207] python310Packages.dissect-sql: add changelog to meta --- pkgs/development/python-modules/dissect-sql/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect-sql/default.nix b/pkgs/development/python-modules/dissect-sql/default.nix index 55e52c9c9120..672a3024a6ad 100644 --- a/pkgs/development/python-modules/dissect-sql/default.nix +++ b/pkgs/development/python-modules/dissect-sql/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.sql"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-yw0EUxlgm7/3FpecGGvxkukudyFMv0fmPbOLJqc2tC0="; }; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parsers for the SQLite database file format"; homepage = "https://github.com/fox-it/dissect.sql"; + changelog = "https://github.com/fox-it/dissect.sql/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; From 891bc7e77a92f76494863f3421802b03ec0a97b2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:07:03 +0100 Subject: [PATCH 085/207] python310Packages.dissect-sql: 3.2 -> 3.3 Diff: https://github.com/fox-it/dissect.sql/compare/refs/tags/3.2...3.3 Changelog: https://github.com/fox-it/dissect.sql/releases/tag/3.3 --- pkgs/development/python-modules/dissect-sql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-sql/default.nix b/pkgs/development/python-modules/dissect-sql/default.nix index 672a3024a6ad..69bfbb4a659e 100644 --- a/pkgs/development/python-modules/dissect-sql/default.nix +++ b/pkgs/development/python-modules/dissect-sql/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-sql"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.sql"; rev = "refs/tags/${version}"; - hash = "sha256-yw0EUxlgm7/3FpecGGvxkukudyFMv0fmPbOLJqc2tC0="; + hash = "sha256-sIXFEckHFr9H4oGFw8uuC+c54PR8ZbQxJKb5x5EixxQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From d892466e1cc0fb11512e5e33d4386d373ce21f91 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:08:53 +0100 Subject: [PATCH 086/207] python310Packages.dissect-util: add changelog to meta --- pkgs/development/python-modules/dissect-util/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect-util/default.nix b/pkgs/development/python-modules/dissect-util/default.nix index cac7233b9efb..7d9dac701f5d 100644 --- a/pkgs/development/python-modules/dissect-util/default.nix +++ b/pkgs/development/python-modules/dissect-util/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.util"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-HGlWyRjvXu1d0n1PPkMyl8NNRRhsjMzXZJMS1MjdTWQ="; }; @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing various utility functions for the other Dissect modules"; homepage = "https://github.com/fox-it/dissect.util"; + changelog = "https://github.com/fox-it/dissect.util/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; From 0ddb6cedaf7aa96034852c89fc81e621f0b07a02 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:09:31 +0100 Subject: [PATCH 087/207] python310Packages.dissect-util: 3.3 -> 3.6 Diff: https://github.com/fox-it/dissect.util/compare/refs/tags/3.3...3.6 Changelog: https://github.com/fox-it/dissect.util/releases/tag/3.6 --- pkgs/development/python-modules/dissect-util/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-util/default.nix b/pkgs/development/python-modules/dissect-util/default.nix index 7d9dac701f5d..b816656a53b1 100644 --- a/pkgs/development/python-modules/dissect-util/default.nix +++ b/pkgs/development/python-modules/dissect-util/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "dissect-util"; - version = "3.3"; + version = "3.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.util"; rev = "refs/tags/${version}"; - hash = "sha256-HGlWyRjvXu1d0n1PPkMyl8NNRRhsjMzXZJMS1MjdTWQ="; + hash = "sha256-hijwu2QT9xJZ1F0wz5NO0mAVe/VA3JcPmoEYQiQRLtM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 32f13e3535fe15f79e369eb26e13f2c1d249768a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:11:47 +0100 Subject: [PATCH 088/207] python310Packages.dissect-ffs: add changelog to meta --- pkgs/development/python-modules/dissect-ffs/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect-ffs/default.nix b/pkgs/development/python-modules/dissect-ffs/default.nix index fd4d4372e2ac..c74c762d9058 100644 --- a/pkgs/development/python-modules/dissect-ffs/default.nix +++ b/pkgs/development/python-modules/dissect-ffs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.ffs"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-kcYSoY3a8ljY9LWzOUekLBzokE+wJrG1KEr0p5CCj0U="; }; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the FFS file system"; homepage = "https://github.com/fox-it/dissect.ffs"; + changelog = "https://github.com/fox-it/dissect.ffs/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; From e53ea68511411f08fa5237e2cf5cf8d2e3abf7a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:12:38 +0100 Subject: [PATCH 089/207] python310Packages.dissect-ffs: 3.2 -> 3.3 Diff: https://github.com/fox-it/dissect.ffs/compare/refs/tags/3.2...3.3 Changelog: https://github.com/fox-it/dissect.ffs/releases/tag/3.3 --- pkgs/development/python-modules/dissect-ffs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-ffs/default.nix b/pkgs/development/python-modules/dissect-ffs/default.nix index c74c762d9058..37f95807fcc6 100644 --- a/pkgs/development/python-modules/dissect-ffs/default.nix +++ b/pkgs/development/python-modules/dissect-ffs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-ffs"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.ffs"; rev = "refs/tags/${version}"; - hash = "sha256-kcYSoY3a8ljY9LWzOUekLBzokE+wJrG1KEr0p5CCj0U="; + hash = "sha256-nGxojXslFVcqU+9StBOacmCyoZJJB4B4OIvql/cbcZE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 443751bc5ce98e31e0f32540209fd416fc2641a1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:14:23 +0100 Subject: [PATCH 090/207] python310Packages.dissect-regf: add changelog to meta --- pkgs/development/python-modules/dissect-regf/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect-regf/default.nix b/pkgs/development/python-modules/dissect-regf/default.nix index d731aeb68a08..ef7dce797bc9 100644 --- a/pkgs/development/python-modules/dissect-regf/default.nix +++ b/pkgs/development/python-modules/dissect-regf/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.regf"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-hSMdgGkSmFDAiO6C1xTJDmKClHwrGc887wqO3/5NZn4="; }; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for Windows registry file format"; homepage = "https://github.com/fox-it/dissect.regf"; + changelog = "https://github.com/fox-it/dissect.regf/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; From a7f5d1cb32cb00790ae831aed25c019e65dbfa35 Mon Sep 17 00:00:00 2001 From: Yaya Date: Sat, 11 Feb 2023 09:15:43 +0000 Subject: [PATCH 091/207] gitlab-runner: 15.8.0 -> 15.8.2 https://gitlab.com/gitlab-org/gitlab-runner/blob/v15.8.2/CHANGELOG.md --- .../tools/continuous-integration/gitlab-runner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 14984ba9519e..29d9412137a9 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let - version = "15.8.0"; + version = "15.8.2"; in buildGoModule rec { inherit version; @@ -23,7 +23,7 @@ buildGoModule rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-U7yVlnEzwqcgTX8WjXe2i4SQ0KyW7PgSM3UyuGkjm9g="; + sha256 = "sha256-kb1xDvU2aP6bI9oziAlUfxbmIq8CgFXPs04hRUmaPyE="; }; patches = [ From 3d2433e4fc9f566f7d056cf940ac998853923169 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:15:50 +0100 Subject: [PATCH 092/207] python310Packages.dissect-regf: 3.2 -> 3.3 Diff: https://github.com/fox-it/dissect.regf/compare/refs/tags/3.2...3.3 Changelog: https://github.com/fox-it/dissect.regf/releases/tag/3.3 --- pkgs/development/python-modules/dissect-regf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-regf/default.nix b/pkgs/development/python-modules/dissect-regf/default.nix index ef7dce797bc9..c453cbf9a439 100644 --- a/pkgs/development/python-modules/dissect-regf/default.nix +++ b/pkgs/development/python-modules/dissect-regf/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-regf"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.regf"; rev = "refs/tags/${version}"; - hash = "sha256-hSMdgGkSmFDAiO6C1xTJDmKClHwrGc887wqO3/5NZn4="; + hash = "sha256-3QJ1N9LukvEa74rndN/Sj6Vq10YJVBsOGdlMzR9TrKA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 2cba520ed50c81771ea6717db8cebeeda9387180 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:16:53 +0100 Subject: [PATCH 093/207] python310Packages.dissect-extfs: add changelog to meta --- pkgs/development/python-modules/dissect-extfs/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect-extfs/default.nix b/pkgs/development/python-modules/dissect-extfs/default.nix index 45aea2685d59..5242514ec398 100644 --- a/pkgs/development/python-modules/dissect-extfs/default.nix +++ b/pkgs/development/python-modules/dissect-extfs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.extfs"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-KGqmguKwCSQw2USKuWFMQCz+D8XMv5W12eJfUxgz324="; }; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the ExtFS file system"; homepage = "https://github.com/fox-it/dissect.extfs"; + changelog = "https://github.com/fox-it/dissect.extfs/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; From 414f0533a728a0c0414cf8f39fe1ec1ec976f07d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 11 Feb 2023 10:17:56 +0100 Subject: [PATCH 094/207] signalbackup-tools: 20230203 -> 20230211 --- .../instant-messengers/signalbackup-tools/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 35846f4b7e45..3fe012fd0b59 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20230203"; + version = "20230211"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - sha256 = "sha256-xXIdXv2U5VpRSuJ9Kl6HMDBZGpXRYGPZFBBk9QYODtU="; + hash = "sha256-NeArgsl5xbgcXY8OKjF2wMdwJqgsBdR1XSrIWPqRWMs="; }; postPatch = '' @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = [ maintainers.malo ]; platforms = platforms.all; + broken = stdenv.isDarwin; }; } From 256b00d04faaf99e3401ee3d6a87345ee031bbb3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:18:09 +0100 Subject: [PATCH 095/207] python310Packages.dissect-extfs: 3.2 -> 3.3 Diff: https://github.com/fox-it/dissect.extfs/compare/refs/tags/3.2...3.3 Changelog: https://github.com/fox-it/dissect.extfs/releases/tag/3.3 --- pkgs/development/python-modules/dissect-extfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-extfs/default.nix b/pkgs/development/python-modules/dissect-extfs/default.nix index 5242514ec398..f337d3ae8efd 100644 --- a/pkgs/development/python-modules/dissect-extfs/default.nix +++ b/pkgs/development/python-modules/dissect-extfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-extfs"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.extfs"; rev = "refs/tags/${version}"; - hash = "sha256-KGqmguKwCSQw2USKuWFMQCz+D8XMv5W12eJfUxgz324="; + hash = "sha256-VCPNY/4SUkFpLuSs2Cxu8u5qt2sQ9VGlfdPssybxhk8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 8c388cb6293140fad75ea878d39592926749fe3f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:20:43 +0100 Subject: [PATCH 096/207] python310Packages.dissect-etl: add changelog to meta --- pkgs/development/python-modules/dissect-etl/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect-etl/default.nix b/pkgs/development/python-modules/dissect-etl/default.nix index ffde95490763..4eaa4619acfc 100644 --- a/pkgs/development/python-modules/dissect-etl/default.nix +++ b/pkgs/development/python-modules/dissect-etl/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.etl"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-s3Ls8tuqp/COBF+WV9RRyfo7FAqPcXmBZ08gHZMPzOU="; }; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for Event Trace Log (ETL) files"; homepage = "https://github.com/fox-it/dissect.etl"; + changelog = "https://github.com/fox-it/dissect.etl/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; From b59573da55ae79d33548048729c0634c84375396 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:23:35 +0100 Subject: [PATCH 097/207] python310Packages.dissect-cstruct: add changelog to meta --- pkgs/development/python-modules/dissect-cstruct/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect-cstruct/default.nix b/pkgs/development/python-modules/dissect-cstruct/default.nix index 722e1a75f775..1fa47f124afc 100644 --- a/pkgs/development/python-modules/dissect-cstruct/default.nix +++ b/pkgs/development/python-modules/dissect-cstruct/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.cstruct"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-8OxAsrECgsQf8+EaZtJ3XNhwdhBI08o3r+xhD/D1NhQ="; }; @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for C-like structures"; homepage = "https://github.com/fox-it/dissect.cstruct"; + changelog = "https://github.com/fox-it/dissect.cstruct/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; From 3a375a00a94d8331f3ee8fc7d7906283365dae5e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:24:09 +0100 Subject: [PATCH 098/207] python310Packages.dissect-cstruct: 3.3 -> 3.5 Diff: https://github.com/fox-it/dissect.cstruct/compare/refs/tags/3.3...3.5 Changelog: https://github.com/fox-it/dissect.cstruct/releases/tag/3.5 --- pkgs/development/python-modules/dissect-cstruct/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-cstruct/default.nix b/pkgs/development/python-modules/dissect-cstruct/default.nix index 1fa47f124afc..6b0f74f16bd7 100644 --- a/pkgs/development/python-modules/dissect-cstruct/default.nix +++ b/pkgs/development/python-modules/dissect-cstruct/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "dissect-cstruct"; - version = "3.3"; + version = "3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.cstruct"; rev = "refs/tags/${version}"; - hash = "sha256-8OxAsrECgsQf8+EaZtJ3XNhwdhBI08o3r+xhD/D1NhQ="; + hash = "sha256-tEWqw3ySF1ebOMztZwAlkTiY0mFCzTM58wD0XDfljFA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 75ecfe762bcf335fb830bc00f3e695d18e3f032b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:24:35 +0100 Subject: [PATCH 099/207] python310Packages.dissect-etl: 3.2 -> 3.3 Changelog: https://github.com/fox-it/dissect.etl/releases/tag/3.3 --- pkgs/development/python-modules/dissect-etl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-etl/default.nix b/pkgs/development/python-modules/dissect-etl/default.nix index 4eaa4619acfc..6c0bc54c42fb 100644 --- a/pkgs/development/python-modules/dissect-etl/default.nix +++ b/pkgs/development/python-modules/dissect-etl/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-etl"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.etl"; rev = "refs/tags/${version}"; - hash = "sha256-s3Ls8tuqp/COBF+WV9RRyfo7FAqPcXmBZ08gHZMPzOU="; + hash = "sha256-rEYWTMBzMyaADqT1Pp5z1J2Uf/t/GeX/FAnZVnaycYs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From a1791b3ec7952711d3818fbb1b3e2fc13e979d6f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:26:13 +0100 Subject: [PATCH 100/207] python310Packages.dissect-xfs: add changelog to meta --- pkgs/development/python-modules/dissect-xfs/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect-xfs/default.nix b/pkgs/development/python-modules/dissect-xfs/default.nix index 60a7ee1abb2f..d35f824e9777 100644 --- a/pkgs/development/python-modules/dissect-xfs/default.nix +++ b/pkgs/development/python-modules/dissect-xfs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.xfs"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-S05Y+Oe1q4DcTR9al2K82Q41EP0FnDGUp1gfzYiS/Yk="; }; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the XFS file system"; homepage = "https://github.com/fox-it/dissect.xfs"; + changelog = "https://github.com/fox-it/dissect.xfs/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; From 675d89f08143974d037f5e7c9e987261752c26e9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:27:01 +0100 Subject: [PATCH 101/207] python310Packages.dissect-xfs: 3.2 -> 3.3 Diff: https://github.com/fox-it/dissect.xfs/compare/refs/tags/3.2...3.3 Changelog: https://github.com/fox-it/dissect.xfs/releases/tag/3.3 --- pkgs/development/python-modules/dissect-xfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-xfs/default.nix b/pkgs/development/python-modules/dissect-xfs/default.nix index d35f824e9777..772e223c5979 100644 --- a/pkgs/development/python-modules/dissect-xfs/default.nix +++ b/pkgs/development/python-modules/dissect-xfs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-xfs"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.xfs"; rev = "refs/tags/${version}"; - hash = "sha256-S05Y+Oe1q4DcTR9al2K82Q41EP0FnDGUp1gfzYiS/Yk="; + hash = "sha256-OasoZ+HGvW8PPWDBvKdrfiE3FqnXPx0xjBVFWLBYHwQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 5e96d9c02fe8d5f7c361eeb8baafe29e609f04ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Feb 2023 09:28:59 +0000 Subject: [PATCH 102/207] python310Packages.djangorestframework-camel-case: 1.3.0 -> 1.4.0 --- .../python-modules/djangorestframework-camel-case/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/djangorestframework-camel-case/default.nix b/pkgs/development/python-modules/djangorestframework-camel-case/default.nix index c4d1d300cca7..cdecb5beff5d 100644 --- a/pkgs/development/python-modules/djangorestframework-camel-case/default.nix +++ b/pkgs/development/python-modules/djangorestframework-camel-case/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "djangorestframework-camel-case"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-31kTYv+kSMjwo1TFauilP7eruxXiIpUdDG9feBYzkH4="; + sha256 = "sha256-SNkv1llh/2uzIKAMkmqnpab3sCeNCP0cXpYFSycIF58="; }; propagatedBuildInputs = [ From a27f9bea2587ac084307ac6566af58a9c3345d86 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:29:24 +0100 Subject: [PATCH 103/207] python310Packages.dissect-ole: add changelog to meta --- pkgs/development/python-modules/dissect-ole/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect-ole/default.nix b/pkgs/development/python-modules/dissect-ole/default.nix index fb5ead471abb..74c3607c9178 100644 --- a/pkgs/development/python-modules/dissect-ole/default.nix +++ b/pkgs/development/python-modules/dissect-ole/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.ole"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-0bIlnRFKBvSXnBIU4+1V7WzyXCvulUpNSXG1Rj2k4jY="; }; @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the Object Linking & Embedding (OLE) format"; homepage = "https://github.com/fox-it/dissect.ole"; + changelog = "https://github.com/fox-it/dissect.ole/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; From 0d0be6bd66ed9cc9634c79d10cc60f3544428cb8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:30:44 +0100 Subject: [PATCH 104/207] python310Packages.dissect-ole: 3.2 -> 3.3 Diff: https://github.com/fox-it/dissect.ole/compare/refs/tags/3.2...3.3 Changelog: https://github.com/fox-it/dissect.ole/releases/tag/3.3 --- pkgs/development/python-modules/dissect-ole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-ole/default.nix b/pkgs/development/python-modules/dissect-ole/default.nix index 74c3607c9178..5540c62a8baf 100644 --- a/pkgs/development/python-modules/dissect-ole/default.nix +++ b/pkgs/development/python-modules/dissect-ole/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-ole"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.ole"; rev = "refs/tags/${version}"; - hash = "sha256-0bIlnRFKBvSXnBIU4+1V7WzyXCvulUpNSXG1Rj2k4jY="; + hash = "sha256-m2+AcKp8rH+VQIdT85oKoA8QoyNQOmrZ2DvBELZnEqM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 6ff234755aecd56108aba165aa9ef662b506d0b1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:32:47 +0100 Subject: [PATCH 105/207] python310Packages.dissect-hypervisor: add changelog to meta --- pkgs/development/python-modules/dissect-hypervisor/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect-hypervisor/default.nix b/pkgs/development/python-modules/dissect-hypervisor/default.nix index 92c885907f15..0621ab332ce6 100644 --- a/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.hypervisor"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-Q7lbFr+gc6inQEJT54DXjpyyis5GxrKQHI5qqa1INKo="; }; @@ -55,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing parsers for various hypervisor disk, backup and configuration files"; homepage = "https://github.com/fox-it/dissect.hypervisor"; + changelog = "https://github.com/fox-it/dissect.hypervisor/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; From 285918f16766021e9c601e36dbb778e35bf2df7a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:34:20 +0100 Subject: [PATCH 106/207] python310Packages.dissect-hypervisor: 3.3 -> 3.5 Diff: https://github.com/fox-it/dissect.hypervisor/compare/refs/tags/3.3...3.5 Changelog: https://github.com/fox-it/dissect.hypervisor/releases/tag/3.5 --- .../development/python-modules/dissect-hypervisor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-hypervisor/default.nix b/pkgs/development/python-modules/dissect-hypervisor/default.nix index 0621ab332ce6..b5ee17918a6f 100644 --- a/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dissect-hypervisor"; - version = "3.3"; + version = "3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.hypervisor"; rev = "refs/tags/${version}"; - hash = "sha256-Q7lbFr+gc6inQEJT54DXjpyyis5GxrKQHI5qqa1INKo="; + hash = "sha256-dWaU3v2QcoqVIygeufy0ZYVliBE1tijV3qEsvCOIarM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 1005a9c615799d17d49263669b8b4356cfe2d93f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:35:54 +0100 Subject: [PATCH 107/207] python310Packages.dissect-cim: add changelog to meta --- pkgs/development/python-modules/dissect-cim/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect-cim/default.nix b/pkgs/development/python-modules/dissect-cim/default.nix index e13da65aee19..50ce9a112568 100644 --- a/pkgs/development/python-modules/dissect-cim/default.nix +++ b/pkgs/development/python-modules/dissect-cim/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.cim"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-d02P6RXIiriOujGns9mOkyiJLNQFNTTW61kInzS17Y4="; }; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the Windows Common Information Model (CIM) database"; homepage = "https://github.com/fox-it/dissect.cim"; + changelog = "https://github.com/fox-it/dissect.cim/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; From 7cdefbce835cdef0058b5e43c2a9772033e9c373 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:36:58 +0100 Subject: [PATCH 108/207] python310Packages.dissect-cim: 3.3 -> 3.4 Diff: https://github.com/fox-it/dissect.cim/compare/refs/tags/3.3...3.4 Changelog: https://github.com/fox-it/dissect.cim/releases/tag/3.4 --- pkgs/development/python-modules/dissect-cim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-cim/default.nix b/pkgs/development/python-modules/dissect-cim/default.nix index 50ce9a112568..ccd426f94bad 100644 --- a/pkgs/development/python-modules/dissect-cim/default.nix +++ b/pkgs/development/python-modules/dissect-cim/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-cim"; - version = "3.3"; + version = "3.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.cim"; rev = "refs/tags/${version}"; - hash = "sha256-d02P6RXIiriOujGns9mOkyiJLNQFNTTW61kInzS17Y4="; + hash = "sha256-RlkTsAvX+9c69JBy+DZbcCfAvcCnWDisgdQQMBkphtg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From b375c12994d0a118cfcd364e208fa46cbff2f512 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:40:22 +0100 Subject: [PATCH 109/207] python310Packages.dissect-esedb: add changelog to meta --- pkgs/development/python-modules/dissect-esedb/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect-esedb/default.nix b/pkgs/development/python-modules/dissect-esedb/default.nix index 74c8bdf9ec70..f8033e34cbf8 100644 --- a/pkgs/development/python-modules/dissect-esedb/default.nix +++ b/pkgs/development/python-modules/dissect-esedb/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.esedb"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-ErPihjAcukMerCAxLdDQVUApeNdFnFn0Zejo3LhgZFc="; }; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for Microsofts Extensible Storage Engine Database (ESEDB)"; homepage = "https://github.com/fox-it/dissect.esedb"; + changelog = "https://github.com/fox-it/dissect.esedb/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; From 1d4007ae507a68104a5ee8bac70bf328adf3878a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Feb 2023 09:41:09 +0000 Subject: [PATCH 110/207] python310Packages.ibm-cloud-sdk-core: 3.16.1 -> 3.16.2 --- .../development/python-modules/ibm-cloud-sdk-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 6eb64f79ed32..deff4de058e1 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.16.1"; + version = "3.16.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TsM56eE2qCJsr+ZHTaY7Wd/ZjhFqWJXA7Z3O+2MCgPc="; + hash = "sha256-fPYl9cz9GIDAKZYEH+8g+omRtGMU+abBx16If7H5i3I="; }; propagatedBuildInputs = [ From f3372ce00b30125bfe06c146d30e58f8e1817ff1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:41:26 +0100 Subject: [PATCH 111/207] python310Packages.dissect-esedb: 3.3 -> 3.5 Diff: https://github.com/fox-it/dissect.esedb/compare/refs/tags/3.3...3.5 Changelog: https://github.com/fox-it/dissect.esedb/releases/tag/3.5 --- pkgs/development/python-modules/dissect-esedb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-esedb/default.nix b/pkgs/development/python-modules/dissect-esedb/default.nix index f8033e34cbf8..e2188b70ff75 100644 --- a/pkgs/development/python-modules/dissect-esedb/default.nix +++ b/pkgs/development/python-modules/dissect-esedb/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-esedb"; - version = "3.3"; + version = "3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.esedb"; rev = "refs/tags/${version}"; - hash = "sha256-ErPihjAcukMerCAxLdDQVUApeNdFnFn0Zejo3LhgZFc="; + hash = "sha256-wTzr9b95jhPbZVWM/C9T1OSBLK39sCIjbsNK/6Z83JE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From ce04ef0e7b78abef2713f780596c495ea75aab46 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:42:47 +0100 Subject: [PATCH 112/207] python310Packages.dissect-evidence: add changelog to meta --- pkgs/development/python-modules/dissect-evidence/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect-evidence/default.nix b/pkgs/development/python-modules/dissect-evidence/default.nix index f6608aac9f71..ba74bc959b68 100644 --- a/pkgs/development/python-modules/dissect-evidence/default.nix +++ b/pkgs/development/python-modules/dissect-evidence/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.evidence"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-rm9IjsXHz4GS8M/oPaDoaxjwqMMtD0qjRtQ3vFJQyQY="; }; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parsers for various forensic evidence file containers"; homepage = "https://github.com/fox-it/dissect.evidence"; + changelog = "https://github.com/fox-it/dissect.evidence/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; From 93186a15afea23f0d164de941ecf7c8e98ad517c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:43:48 +0100 Subject: [PATCH 113/207] python310Packages.dissect-evidence: 3.2 -> 3.3 Diff: https://github.com/fox-it/dissect.evidence/compare/refs/tags/3.2...3.3 Changelog: https://github.com/fox-it/dissect.evidence/releases/tag/3.3 --- pkgs/development/python-modules/dissect-evidence/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-evidence/default.nix b/pkgs/development/python-modules/dissect-evidence/default.nix index ba74bc959b68..ed3cbb56eb07 100644 --- a/pkgs/development/python-modules/dissect-evidence/default.nix +++ b/pkgs/development/python-modules/dissect-evidence/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-evidence"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.evidence"; rev = "refs/tags/${version}"; - hash = "sha256-rm9IjsXHz4GS8M/oPaDoaxjwqMMtD0qjRtQ3vFJQyQY="; + hash = "sha256-R4ua7JeT09GkoBwM2YGf2T0PJXhldUpqAS3xsB9L79c="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From c95d428a25c5848bed804a398082d5f502df882c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:44:47 +0100 Subject: [PATCH 114/207] python310Packages.dissect-shellitem: add changelog to meta --- pkgs/development/python-modules/dissect-shellitem/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect-shellitem/default.nix b/pkgs/development/python-modules/dissect-shellitem/default.nix index 4a4b3802128e..200ad2914d6f 100644 --- a/pkgs/development/python-modules/dissect-shellitem/default.nix +++ b/pkgs/development/python-modules/dissect-shellitem/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.shellitem"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-z0/KSOgo5Gnl4MLOY5eUPHlI/8dCyYaEEiKMmkP7cgg="; }; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the Shellitem structures"; homepage = "https://github.com/fox-it/dissect.shellitem"; + changelog = ""; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; From 3c6db8941cc1552ff3e83b59203769befe2aac82 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:46:02 +0100 Subject: [PATCH 115/207] python310Packages.dissect-shellitem: 3.2 -> 3.3 Diff: https://github.com/fox-it/dissect.shellitem/compare/refs/tags/3.2...3.3 Changelog: https://github.com/fox-it/dissect.shellitem/releases/tag/3.3 --- .../python-modules/dissect-shellitem/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-shellitem/default.nix b/pkgs/development/python-modules/dissect-shellitem/default.nix index 200ad2914d6f..c0f4228593a6 100644 --- a/pkgs/development/python-modules/dissect-shellitem/default.nix +++ b/pkgs/development/python-modules/dissect-shellitem/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-shellitem"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.shellitem"; rev = "refs/tags/${version}"; - hash = "sha256-z0/KSOgo5Gnl4MLOY5eUPHlI/8dCyYaEEiKMmkP7cgg="; + hash = "sha256-flTv2Y+UwMTQnvqRS/pZRPkTsIjvCAp7B4rKAQPOJL4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the Shellitem structures"; homepage = "https://github.com/fox-it/dissect.shellitem"; - changelog = ""; + changelog = "https://github.com/fox-it/dissect.shellitem/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; From ad079972ea607c72b21277620d65ee7c0c615731 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:47:45 +0100 Subject: [PATCH 116/207] python310Packages.dissect-thumbcache: add changelog to meta --- pkgs/development/python-modules/dissect-thumbcache/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect-thumbcache/default.nix b/pkgs/development/python-modules/dissect-thumbcache/default.nix index ca48d44d344d..832becfc55cc 100644 --- a/pkgs/development/python-modules/dissect-thumbcache/default.nix +++ b/pkgs/development/python-modules/dissect-thumbcache/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.thumbcache"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-4yUVJwIQniE9AAtAgzHczOZfyWZly86JKc0Qh3byYf4="; }; @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing a parser for the Windows thumbcache"; homepage = "https://github.com/fox-it/dissect.thumbcache"; + changelog = "https://github.com/fox-it/dissect.thumbcache/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; From 02a74fcab82e97225a4dd6089b30903ffcc763a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:48:42 +0100 Subject: [PATCH 117/207] python310Packages.dissect-thumbcache: 1.1 -> 1.2 Diff: https://github.com/fox-it/dissect.thumbcache/compare/refs/tags/1.1...1.2 Changelog: https://github.com/fox-it/dissect.thumbcache/releases/tag/1.2 --- .../development/python-modules/dissect-thumbcache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-thumbcache/default.nix b/pkgs/development/python-modules/dissect-thumbcache/default.nix index 832becfc55cc..8a47b9eeaab0 100644 --- a/pkgs/development/python-modules/dissect-thumbcache/default.nix +++ b/pkgs/development/python-modules/dissect-thumbcache/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-thumbcache"; - version = "1.1"; + version = "1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.thumbcache"; rev = "refs/tags/${version}"; - hash = "sha256-4yUVJwIQniE9AAtAgzHczOZfyWZly86JKc0Qh3byYf4="; + hash = "sha256-lTtTZQgEvgaVoNPnVeRGO/BQU/8RfQ2ktljSBflhlOw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From e45ad177bb287de49c7f4af8148d2e30f53c58dd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:49:51 +0100 Subject: [PATCH 118/207] python310Packages.dissect-eventlog: add changelog to meta --- pkgs/development/python-modules/dissect-eventlog/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect-eventlog/default.nix b/pkgs/development/python-modules/dissect-eventlog/default.nix index 7fa3e68cabc6..5cbcd2deb7e5 100644 --- a/pkgs/development/python-modules/dissect-eventlog/default.nix +++ b/pkgs/development/python-modules/dissect-eventlog/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.eventlog"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-emNGZs/5LWD29xE5BmXQKQfkZApLZlGs6KNIqobaKvM="; }; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module implementing parsers for the Windows EVT, EVTX and WEVT log file formats"; homepage = "https://github.com/fox-it/dissect.eventlog"; + changelog = "https://github.com/fox-it/dissect.eventlog/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; From 3f9a63cbb98e377fa8726d9d3651343e7701679b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:50:41 +0100 Subject: [PATCH 119/207] python310Packages.dissect-eventlog: 3.2 -> 3.3 Diff: https://github.com/fox-it/dissect.eventlog/compare/refs/tags/3.2...3.3 Changelog: https://github.com/fox-it/dissect.eventlog/releases/tag/3.3 --- pkgs/development/python-modules/dissect-eventlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-eventlog/default.nix b/pkgs/development/python-modules/dissect-eventlog/default.nix index 5cbcd2deb7e5..00021187679e 100644 --- a/pkgs/development/python-modules/dissect-eventlog/default.nix +++ b/pkgs/development/python-modules/dissect-eventlog/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-eventlog"; - version = "3.2"; + version = "3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.eventlog"; rev = "refs/tags/${version}"; - hash = "sha256-emNGZs/5LWD29xE5BmXQKQfkZApLZlGs6KNIqobaKvM="; + hash = "sha256-PbU9Rd0D+xdleTIMAV+esw1WynWU4++8KeXlHS9yiJs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From f93506e3870f727cd82de5bd9da84edb5c705b71 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:52:10 +0100 Subject: [PATCH 120/207] python310Packages.dissect-target: add changelog to meta --- pkgs/development/python-modules/dissect-target/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index 0c69d93ef3ee..e1770a4c6e54 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.target"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-QwEznweETwDTuTctOnq0n27JYXC9BO5l6BYpXsMRVq4="; }; @@ -106,6 +106,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect module that provides a programming API and command line tools"; homepage = "https://github.com/fox-it/dissect.target"; + changelog = "https://github.com/fox-it/dissect.target/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; From 8c889fe25a38ce68a3c1a567eac263dbb0e0084e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:54:54 +0100 Subject: [PATCH 121/207] python310Packages.flow-record: add changelog to meta --- pkgs/development/python-modules/flow-record/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix index b46b1df5410a..68be46c41937 100644 --- a/pkgs/development/python-modules/flow-record/default.nix +++ b/pkgs/development/python-modules/flow-record/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "flow.record"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-bXI7q+unlrXvagKisAO4INfzeXlC4g918xmPmwMDCK8="; }; @@ -69,6 +69,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for defining and creating structured data"; homepage = "https://github.com/fox-it/flow.record"; + changelog = "https://github.com/fox-it/flow.record/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; From fe256a560ec54712038b3c12fd59b9d59eb2eed1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 10:56:19 +0100 Subject: [PATCH 122/207] python310Packages.flow-record: 3.7 -> 3.9 Diff: https://github.com/fox-it/flow.record/compare/refs/tags/3.7...3.9 Changelog: https://github.com/fox-it/flow.record/releases/tag/3.9 --- pkgs/development/python-modules/flow-record/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix index 68be46c41937..825c7f19436b 100644 --- a/pkgs/development/python-modules/flow-record/default.nix +++ b/pkgs/development/python-modules/flow-record/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "flow-record"; - version = "3.7"; + version = "3.9"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "flow.record"; rev = "refs/tags/${version}"; - hash = "sha256-bXI7q+unlrXvagKisAO4INfzeXlC4g918xmPmwMDCK8="; + hash = "sha256-hvd5I1n3lOuP9sUtVO69yGCVOVEWYKKfFf7OjAJCXIg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 4cdbe5bb03fad5aea978c240def7c1c0ec5b912e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 11:03:43 +0100 Subject: [PATCH 123/207] python310Packages.dissect-target: 3.4 -> 3.7 Changelog: https://github.com/fox-it/dissect.target/releases/tag/3.7 --- .../python-modules/dissect-target/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index e1770a4c6e54..65786ef0a9e2 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -24,6 +24,7 @@ , flow-record , fusepy , ipython +, pycryptodome , pytestCheckHook , pythonOlder , pyyaml @@ -36,7 +37,7 @@ buildPythonPackage rec { pname = "dissect-target"; - version = "3.4"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -45,7 +46,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.target"; rev = "refs/tags/${version}"; - hash = "sha256-QwEznweETwDTuTctOnq0n27JYXC9BO5l6BYpXsMRVq4="; + hash = "sha256-jFQ8BxCC4PW135igfXA5EmlWYIZ0zF12suiUMiLbArA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -56,6 +57,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + defusedxml dissect-cstruct dissect-eventlog dissect-evidence @@ -71,7 +73,6 @@ buildPythonPackage rec { passthru.optional-dependencies = { full = [ asn1crypto - defusedxml dissect-cim dissect-clfs dissect-esedb @@ -84,6 +85,7 @@ buildPythonPackage rec { dissect-xfs fusepy ipython + pycryptodome pyyaml yara-python zstandard @@ -101,6 +103,8 @@ buildPythonPackage rec { disabledTests = [ # Test requires rdump "test_exec_target_command" + # Issue with tar file + "test_tar_sensitive_drive_letter" ]; meta = with lib; { From 88e0332e0a52139b7682472bcd6e7f8106299f34 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 11:04:24 +0100 Subject: [PATCH 124/207] python310Packages.dissect: add changelog to meta --- pkgs/development/python-modules/dissect/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix index e6da0a1a6a8e..27e6b0122895 100644 --- a/pkgs/development/python-modules/dissect/default.nix +++ b/pkgs/development/python-modules/dissect/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fox-it"; repo = "dissect"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-1m5reKmPFSqMW/wYdiMw95l8A9E5FS8RHLb8/i1rQKY="; }; @@ -82,6 +82,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dissect meta module"; homepage = "https://github.com/fox-it/dissect"; + changelog = "https://github.com/fox-it/dissect/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; }; From dfae8e615ac27ac470731dd7430abb4b50c40687 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 11:23:25 +0100 Subject: [PATCH 125/207] python310Packages.dissect-executable: init at 1.1 --- .../dissect-executable/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/dissect-executable/default.nix diff --git a/pkgs/development/python-modules/dissect-executable/default.nix b/pkgs/development/python-modules/dissect-executable/default.nix new file mode 100644 index 000000000000..0b932de9a2a2 --- /dev/null +++ b/pkgs/development/python-modules/dissect-executable/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, dissect-cstruct +, dissect-util +, fetchFromGitHub +, setuptools +, setuptools-scm +, pythonOlder +}: + +buildPythonPackage rec { + pname = "dissect-executable"; + version = "1.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "fox-it"; + repo = "dissect.executable"; + rev = "refs/tags/${version}"; + hash = "sha256-c58g2L3B/3/pC+iyXphYsjhpBs0I0Q64B8+rv5k1dtg="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + dissect-cstruct + dissect-util + ]; + + pythonImportsCheck = [ + "dissect.executable" + ]; + + meta = with lib; { + description = "Dissect module implementing a parser for various executable formats such as PE, ELF and Macho-O"; + homepage = "https://github.com/fox-it/dissect.executable"; + changelog = "https://github.com/fox-it/dissect.executable/releases/tag/${version}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cfbb687af4c5..2268557ac2f0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2461,6 +2461,8 @@ self: super: with self; { dissect-evidence = callPackage ../development/python-modules/dissect-evidence { }; + dissect-executable = callPackage ../development/python-modules/dissect-executable { }; + dissect-extfs = callPackage ../development/python-modules/dissect-extfs { }; dissect-hypervisor = callPackage ../development/python-modules/dissect-hypervisor { }; From ff88951714ed966aa34dd311a5dad467ad0d0b79 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 11:28:45 +0100 Subject: [PATCH 126/207] python310Packages.dissect-squashfs: init at 1.0 --- .../dissect-squashfs/default.nix | 59 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/dissect-squashfs/default.nix diff --git a/pkgs/development/python-modules/dissect-squashfs/default.nix b/pkgs/development/python-modules/dissect-squashfs/default.nix new file mode 100644 index 000000000000..1413b352f03c --- /dev/null +++ b/pkgs/development/python-modules/dissect-squashfs/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, dissect-cstruct +, dissect-util +, fetchFromGitHub +, lz4 +, python-lzo +, pythonOlder +, setuptools +, setuptools-scm +, zstandard +}: + +buildPythonPackage rec { + pname = "dissect-squashfs"; + version = "1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "fox-it"; + repo = "dissect.squashfs"; + rev = "refs/tags/${version}"; + hash = "sha256-bDR6GAgl1dOhZ3fWA7E27KS6pj9AXInNxwmwNXXV3lc="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + dissect-cstruct + dissect-util + ]; + + passthru.optional-dependencies = { + full = [ + lz4 + python-lzo + zstandard + ]; + }; + + pythonImportsCheck = [ + "dissect.squashfs" + ]; + + meta = with lib; { + description = "Dissect module implementing a parser for the SquashFS file system"; + homepage = "https://github.com/fox-it/dissect.squashfs"; + changelog = "https://github.com/fox-it/dissect.squashfs/releases/tag/${version}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2268557ac2f0..9641bc03c287 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2475,6 +2475,8 @@ self: super: with self; { dissect-shellitem = callPackage ../development/python-modules/dissect-shellitem { }; + dissect-squashfs = callPackage ../development/python-modules/dissect-squashfs { }; + dissect-sql = callPackage ../development/python-modules/dissect-sql { }; dissect-target = callPackage ../development/python-modules/dissect-target { }; From 08ba92eedc8dd5c48f7c76eebe62d41b21a75294 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 11:29:37 +0100 Subject: [PATCH 127/207] python310Packages.dissect: 3.3 -> 3.4 Changelog: https://github.com/fox-it/dissect/releases/tag/3.4 --- pkgs/development/python-modules/dissect/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix index 27e6b0122895..59db158b6636 100644 --- a/pkgs/development/python-modules/dissect/default.nix +++ b/pkgs/development/python-modules/dissect/default.nix @@ -10,12 +10,14 @@ , dissect-extfs , dissect-fat , dissect-ffs +, dissect-executable , dissect-hypervisor , dissect-ntfs , dissect-ole , dissect-regf , dissect-shellitem , dissect-sql +, dissect-squashfs , dissect-target , dissect-util , dissect-vmfs @@ -29,7 +31,7 @@ buildPythonPackage rec { pname = "dissect"; - version = "3.3"; + version = "3.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -38,7 +40,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect"; rev = "refs/tags/${version}"; - hash = "sha256-1m5reKmPFSqMW/wYdiMw95l8A9E5FS8RHLb8/i1rQKY="; + hash = "sha256-+t6v553lP9NEimNlp48NQ+6dpIOrgfZ1FU3LNJF44YY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -56,6 +58,7 @@ buildPythonPackage rec { dissect-etl dissect-eventlog dissect-evidence + dissect-executable dissect-extfs dissect-fat dissect-ffs @@ -65,6 +68,7 @@ buildPythonPackage rec { dissect-regf dissect-shellitem dissect-sql + dissect-squashfs dissect-target dissect-util dissect-vmfs From 98d253427b8c169c4b07b5bb434a730cccaa0673 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Feb 2023 10:56:18 +0000 Subject: [PATCH 128/207] tellico: 3.4.5 -> 3.4.6 --- pkgs/applications/misc/tellico/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix index af8a538a822b..d732fdde136a 100644 --- a/pkgs/applications/misc/tellico/default.nix +++ b/pkgs/applications/misc/tellico/default.nix @@ -24,14 +24,14 @@ mkDerivation rec { pname = "tellico"; - version = "3.4.5"; + version = "3.4.6"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "office"; repo = pname; rev = "v${version}"; - hash = "sha256-XWzSbtyxOkASTwT5b7+hIEwaKe2bEo6ij+CnPbYNEc0="; + hash = "sha256-aHA4DYuxh4vzXL82HRGMPfqS0DGqq/FLMEuhsr4eLko="; }; postPatch = '' From edc2be2e51992b9a8ac503a5acb7bef14a9111fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Feb 2023 11:13:01 +0000 Subject: [PATCH 129/207] python310Packages.django-webpack-loader: 1.8.0 -> 1.8.1 --- .../python-modules/django-webpack-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix index 7b5b6c67cff4..d550ea9862d4 100644 --- a/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-webpack-loader"; - version = "1.8.0"; + version = "1.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-puZ5gF6WB7Bz7lJwLZtCa6waVGCdlmExqkNMeGAqwFA="; + hash = "sha256-BzvtoY4pKfpc2DuvvKr5deWUXoShe/qBkny2yfWhe5Q="; }; propagatedBuildInputs = [ From 1518b4cd0b974bf9e8c934a127b67c280d6006a2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 12:22:59 +0100 Subject: [PATCH 130/207] python310Packages.meshtastic: 2.0.11 -> 2.0.12 Diff: https://github.com/meshtastic/Meshtastic-python/compare/refs/tags/2.0.11...2.0.12 Changelog: https://github.com/meshtastic/python/releases/tag/2.0.12 --- pkgs/development/python-modules/meshtastic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index a76d3ff3eff6..66bcc5f3dfa2 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.0.11"; + version = "2.0.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-XIYzlGtj+S28N7RLvA38WSLv7LNZqKs8aJUaEG1CslI="; + hash = "sha256-Y3X5LW85e+OQ548H13fQ0s+R870Hzp0kVd+v+lbdqtg="; }; propagatedBuildInputs = [ From 5c41e01e2ed3d56f71cb0f3b91ad5410b081f17c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 12:24:51 +0100 Subject: [PATCH 131/207] python310Packages.msgspec: 0.13.0 -> 0.13.1 Diff: https://github.com/jcrist/msgspec/compare/refs/tags/0.13.0...0.13.1 Changelog: https://github.com/jcrist/msgspec/releases/tag/0.13.1 --- pkgs/development/python-modules/msgspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix index 6844ba5e0d1d..78aa7eb6e61e 100644 --- a/pkgs/development/python-modules/msgspec/default.nix +++ b/pkgs/development/python-modules/msgspec/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "msgspec"; - version = "0.13.0"; + version = "0.13.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jcrist"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-R3/ljUBm0WTRIdp5qoHtH3k1ReaMzASsD4tB8bHKAMc="; + hash = "sha256-TGCdsimcoY3441/nOXxHGqYM4q8uoWd78HtUts6EOJY="; }; # Requires libasan to be accessible From b4120fb17f3e8f349a29fdb923e296c3c7862650 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 12:26:53 +0100 Subject: [PATCH 132/207] python310Packages.boschshcpy: 0.2.53 -> 0.2.54 Diff: https://github.com/tschamm/boschshcpy/compare/0.2.53...0.2.54 --- pkgs/development/python-modules/boschshcpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index 2115eb273d66..765c52dddc07 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.53"; + version = "0.2.54"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = pname; rev = version; - sha256 = "sha256-V7FNuVXKJqIOsDqwg6Bn2Vb9QnuQ1XYzE4m0x2ipXW8="; + sha256 = "sha256-1MoC69klHIHMmvQSS8bnuEQGm6IloyzR0RcROIx0GNI="; }; propagatedBuildInputs = [ From aa680bde642889b2decd1187f4ace6cfc74ea292 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 12:28:05 +0100 Subject: [PATCH 133/207] python310Packages.peaqevcore: 11.2.0 -> 12.0.1 --- pkgs/development/python-modules/peaqevcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index 3e1776b97b49..151389fbfd9d 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "11.2.0"; + version = "12.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-L4QUQsLdFwJPGq8ZdpTHRv5dNn1o6lc1q37LVNNCOOM="; + hash = "sha256-nhipggmTd0BgYOPo4SoezrvPmw7wQL71K5y1EKoHRDw="; }; postPatch = '' From a8b1e8d7b121b98f7a823e0a1f92e0dfb4b42917 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 12:29:55 +0100 Subject: [PATCH 134/207] python310Packages.md-toc: 8.1.8 -> 8.1.9 Diff: https://github.com/frnmst/md-toc/compare/8.1.8...8.1.9 Changelog: https://blog.franco.net.eu.org/software/CHANGELOG-md-toc.html --- pkgs/development/python-modules/md-toc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix index a8d1c18c471e..193fca714ad5 100644 --- a/pkgs/development/python-modules/md-toc/default.nix +++ b/pkgs/development/python-modules/md-toc/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "md-toc"; - version = "8.1.8"; + version = "8.1.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "frnmst"; repo = pname; rev = version; - hash = "sha256-2Q/NcsGupYV80byrKmuoxA0d6/z7Z+fmGB6bfzDRvqQ="; + hash = "sha256-t3G8nQCVUUuDb+W+Gw+f2miXQ2i/hdVfT6yGxdNWKpw="; }; propagatedBuildInputs = [ From 9a0e82797e4687926d2cd548ea46d100df525189 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 12:30:36 +0100 Subject: [PATCH 135/207] python310Packages.aliyun-python-sdk-cdn: 3.8.1 -> 3.8.2 Changelog: https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-cdn/ChangeLog.txt --- .../python-modules/aliyun-python-sdk-cdn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix index 6d0a9d5eb2a4..ddbd7f1e2891 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-cdn"; - version = "3.8.1"; + version = "3.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bcAaFwAS9xAbCLtqYtSiALHtlGklHFgGXpgiZZpR6no="; + hash = "sha256-pNWqow396BB5cC1dOhDelykjqeWFN+IKosKEDu5nB1o="; }; propagatedBuildInputs = [ From 98700e481e02b9b8eea91ea7afbd4e0385e9208e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 12:33:55 +0100 Subject: [PATCH 136/207] python310Packages.aliyun-python-sdk-iot: 8.49.0 -> 8.50.0 Changelog: https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-iot/ChangeLog.txt --- .../python-modules/aliyun-python-sdk-iot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix index 6a5802c388f9..06c56116de4e 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-iot"; - version = "8.49.0"; + version = "8.50.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-POrDx4xXCIOBU4hvXu03XcZI2F6xHsjHNJRBaGFC8U8="; + hash = "sha256-tFI6iPvKWp69PKvkBrMQrkMZD03VHhLIIDy0VI5XLEA="; }; propagatedBuildInputs = [ From 8b55a288c075765a42cc90eb8d28827b0caff91e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 12:34:46 +0100 Subject: [PATCH 137/207] python310Packages.netutils: 1.4.0 -> 1.4.1 Diff: https://github.com/networktocode/netutils/compare/refs/tags/v1.4.0...v1.4.1 Changelog: https://github.com/networktocode/netutils/releases/tag/v1.4.1 --- pkgs/development/python-modules/netutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index 9bf6f3c7817b..3ca143638ca4 100644 --- a/pkgs/development/python-modules/netutils/default.nix +++ b/pkgs/development/python-modules/netutils/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "netutils"; - version = "1.4.0"; + version = "1.4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RT6KAliRlH285sEx2fbIXJNwe1gcyH6CrQ8pXKgY/hQ="; + hash = "sha256-hSSHCWi0L/ZfFz0JQ6Al5mjhb2g0DpykLF66uMKMIN8="; }; nativeBuildInputs = [ From 7cee38c2f0d6ec4c1a93be6903a43d9748cc4c48 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 12:40:02 +0100 Subject: [PATCH 138/207] python310Packages.incomfort-client: 0.4.5 -> 0.5.0 Diff: https://github.com/zxdavb/incomfort-client/compare/refs/tags/0.4.5...0.5.0 --- .../incomfort-client/default.nix | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/incomfort-client/default.nix b/pkgs/development/python-modules/incomfort-client/default.nix index d281ece24635..496c98488910 100644 --- a/pkgs/development/python-modules/incomfort-client/default.nix +++ b/pkgs/development/python-modules/incomfort-client/default.nix @@ -1,29 +1,43 @@ { lib , aiohttp +, aioresponses , buildPythonPackage , fetchFromGitHub +, pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "incomfort-client"; - version = "0.4.5"; + version = "0.5.0"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "zxdavb"; repo = pname; - rev = version; - sha256 = "0r9f15fcjwhrq6ldji1dzbb76wsvinpkmyyaj7n55rl6ibnsyrwp"; + rev = "refs/tags/${version}"; + hash = "sha256-kdPue3IfF85O+0dgvX+dN6S4WoQmjxdCfwfv83SnO8E="; }; propagatedBuildInputs = [ aiohttp ]; - # Project has no tests - doCheck = false; - pythonImportsCheck = [ "incomfortclient" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + checkInputs = [ + aioresponses + pytest-asyncio + ]; + + pythonImportsCheck = [ + "incomfortclient" + ]; meta = with lib; { description = "Python module to poll Intergas boilers via a Lan2RF gateway"; From 7b4ed5fc89ab0783c223bcdfac93ea676c3e4df9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sat, 11 Feb 2023 08:59:01 -0300 Subject: [PATCH 139/207] theme-obsidian2: reformat nix expression --- pkgs/data/themes/obsidian2/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/obsidian2/default.nix b/pkgs/data/themes/obsidian2/default.nix index 6e5dc5f35a18..ee3b1a32c2d0 100644 --- a/pkgs/data/themes/obsidian2/default.nix +++ b/pkgs/data/themes/obsidian2/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl, gtk-engine-murrine }: +{ lib +, stdenv +, fetchurl +, gtk-engine-murrine +}: stdenv.mkDerivation rec { pname = "theme-obsidian2"; @@ -11,7 +15,9 @@ stdenv.mkDerivation rec { sourceRoot = "."; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; installPhase = '' runHook preInstall @@ -21,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Gnome theme, based upon Adwaita-Maia dark skin"; + description = "Gnome theme based upon Adwaita-Maia dark skin"; homepage = "https://github.com/madmaxms/theme-obsidian-2"; license = with licenses; [ gpl3Only ]; platforms = platforms.linux; From 1d204295889d275cf7cdfbc9799a17a1d980a514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sat, 11 Feb 2023 09:01:13 -0300 Subject: [PATCH 140/207] theme-obsidian2: add update script --- pkgs/data/themes/obsidian2/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/data/themes/obsidian2/default.nix b/pkgs/data/themes/obsidian2/default.nix index ee3b1a32c2d0..52c7a6c4411c 100644 --- a/pkgs/data/themes/obsidian2/default.nix +++ b/pkgs/data/themes/obsidian2/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , gtk-engine-murrine +, gitUpdater }: stdenv.mkDerivation rec { @@ -26,6 +27,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = gitUpdater { + url = "https://github.com/madmaxms/theme-obsidian-2"; + rev-prefix = "v"; + }; + meta = with lib; { description = "Gnome theme based upon Adwaita-Maia dark skin"; homepage = "https://github.com/madmaxms/theme-obsidian-2"; From 4fb806003b0c6a6a2ecc4cd6803c48e58be49089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sat, 11 Feb 2023 09:23:13 -0300 Subject: [PATCH 141/207] theme-obsidian2: 2.21 -> 2.22 --- pkgs/data/themes/obsidian2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/obsidian2/default.nix b/pkgs/data/themes/obsidian2/default.nix index 52c7a6c4411c..a5bfac658b42 100644 --- a/pkgs/data/themes/obsidian2/default.nix +++ b/pkgs/data/themes/obsidian2/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "theme-obsidian2"; - version = "2.21"; + version = "2.22"; src = fetchurl { url = "https://github.com/madmaxms/theme-obsidian-2/releases/download/v${version}/obsidian-2-theme.tar.xz"; - sha256 = "sha256-ptiJeb4ebfnH6HpTN1NsPAYbkLlPcZtn2aBKO0zW2Tw="; + sha256 = "sha256-WvSlzCock0UMdvajHRBNHSugVMStR1FDt9vjzX5Kp8A="; }; sourceRoot = "."; From 73d3af8712dd3c7f1e2fd906f13ee3030fa12271 Mon Sep 17 00:00:00 2001 From: Jason Yundt Date: Sat, 11 Feb 2023 07:26:48 -0500 Subject: [PATCH 142/207] beret: remove leftover file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR #146312 removed the beret package, but didn’t remove a patch file that was only used by beret. This commit gets rid of that unused file. --- pkgs/games/beret/use-home-dir.patch | 48 ----------------------------- 1 file changed, 48 deletions(-) delete mode 100644 pkgs/games/beret/use-home-dir.patch diff --git a/pkgs/games/beret/use-home-dir.patch b/pkgs/games/beret/use-home-dir.patch deleted file mode 100644 index c8597a0303b8..000000000000 --- a/pkgs/games/beret/use-home-dir.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Naur beret-beret-orig/game.c beret-beret/game.c ---- beret-beret-orig/game.c 2011-12-17 18:51:32.000000000 -0500 -+++ beret-beret/game.c 2011-12-21 13:16:37.047511020 -0500 -@@ -10,12 +10,10 @@ - #include - #include - #include --#ifdef __APPLE__ - #include - #include - #include - #include --#endif - - #define CAMSCROLL 15 - #define SCR_WIDTH 780 -@@ -88,12 +86,8 @@ - #define DIRSEP "/" - #endif - --#ifdef __APPLE__ --#define SUPPORT_PATH "Library/Application Support/Beret/" --#define RESOURCE_PATH "Beret.app/Contents/Resources/" --#else -+#define SUPPORT_PATH ".beret" - #define RESOURCE_PATH "" --#endif - - #define QUITMOD_WIN KMOD_ALT - #define QUITKEY_WIN SDLK_F4 -@@ -812,7 +806,6 @@ - - int init() { - -- #ifdef __APPLE__ - char filestr[512]; - // Get the home directory of the user. - struct passwd *pwd = getpwuid(getuid()); -@@ -827,9 +820,6 @@ - sprintf(filestr, "%s/saves", support_path); - mkdir(filestr, S_IRWXU); - } -- #else -- sprintf(support_path, ""); -- #endif - - if (SDL_Init(SDL_INIT_EVERYTHING) == -1) { - printf("Error: couldn't initialize SDL\n"); From e107a769e7d5e36090a38c2f5415e3aef4d09d28 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 13:35:00 +0100 Subject: [PATCH 143/207] python310Packages.pydanfossair: 0.1.0 -> 0.2.0 Diff: https://github.com/JonasPed/pydanfoss-air/compare/v0.1.0...v0.2.0 --- pkgs/development/python-modules/pydanfossair/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydanfossair/default.nix b/pkgs/development/python-modules/pydanfossair/default.nix index d492923f07ab..11332ecb6f0f 100644 --- a/pkgs/development/python-modules/pydanfossair/default.nix +++ b/pkgs/development/python-modules/pydanfossair/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "pydanfossair"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "JonasPed"; repo = "pydanfoss-air"; rev = "v${version}"; - sha256 = "0950skga7x930whdn9f765x7fi8g6rr3zh99zpzaj8avjdwf096b"; + sha256 = "sha256-WTRiEQbd3wwNAz1gk0rS3khy6lg61rcGZQTMlBc0uO8="; }; # Project has no tests From cb2f6885116c9ab28b42998055e83f3c0d6d42d1 Mon Sep 17 00:00:00 2001 From: Enno Richter Date: Sat, 11 Feb 2023 13:38:05 +0100 Subject: [PATCH 144/207] python3Packages.blis: enable non-x86_64 platforms --- pkgs/development/python-modules/blis/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index 69bc78ddda65..2a0e2183cba5 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -50,6 +50,5 @@ buildPythonPackage rec { homepage = "https://github.com/explosion/cython-blis"; license = licenses.bsd3; maintainers = with maintainers; [ ]; - platforms = platforms.x86_64; }; } From 0eaace8c1229536df8a19b150881014fddd3fcd2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 13:41:53 +0100 Subject: [PATCH 145/207] python310Packages.renault-api: add changelog to meta --- pkgs/development/python-modules/renault-api/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index 321b3daec198..1df10175047e 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hacf-fr"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-71UFVXfww3wgSO2qoRCuV80+33B91Bjl2+nuuCbQRLg="; + rev = "refs/tags/v${version}"; + hash = "sha256-71UFVXfww3wgSO2qoRCuV80+33B91Bjl2+nuuCbQRLg="; }; nativeBuildInputs = [ @@ -58,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to interact with the Renault API"; homepage = "https://github.com/hacf-fr/renault-api"; + changelog = "https://github.com/hacf-fr/renault-api/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 4981f6a40e350c99c385fe6276503280727cb81b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Feb 2023 13:43:06 +0100 Subject: [PATCH 146/207] python310Packages.renault-api: 0.1.11 -> 0.1.12 Diff: https://github.com/hacf-fr/renault-api/compare/refs/tags/v0.1.11...v0.1.12 Changelog: https://github.com/hacf-fr/renault-api/releases/tag/v0.1.12 --- pkgs/development/python-modules/renault-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index 1df10175047e..1a9c2b509fbb 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "renault-api"; - version = "0.1.11"; + version = "0.1.12"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-71UFVXfww3wgSO2qoRCuV80+33B91Bjl2+nuuCbQRLg="; + hash = "sha256-uSyqAs0JqrsFuMpfuILoIGxLL+HVOGI/euCZziCgEdQ="; }; nativeBuildInputs = [ From b67383f279d59761f0d8d51e8adc6b8178acb114 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Feb 2023 13:25:36 +0000 Subject: [PATCH 147/207] snappymail: 2.25.3 -> 2.25.5 --- pkgs/servers/snappymail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index dd08098b8a26..cf87168224a2 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.25.3"; + version = "2.25.5"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-FK0F1STRdE1Ny+l0ILQMofXSXDhyzoMgZCT+MuCSmcA="; + sha256 = "sha256-oNZxlzaaIIK+Y0twZmddV7bJXEscN22pLWskEPGaB3c="; }; sourceRoot = "snappymail"; From 2ea402c369ca7dc3c7c97863daa3d831a4151c44 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Feb 2023 13:45:00 +0000 Subject: [PATCH 148/207] mmark: 2.2.30 -> 2.2.31 --- pkgs/tools/typesetting/mmark/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/mmark/default.nix b/pkgs/tools/typesetting/mmark/default.nix index 0513035094bd..a5b677888420 100644 --- a/pkgs/tools/typesetting/mmark/default.nix +++ b/pkgs/tools/typesetting/mmark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mmark"; - version = "2.2.30"; + version = "2.2.31"; src = fetchFromGitHub { owner = "mmarkdown"; repo = "mmark"; rev = "v${version}"; - sha256 = "sha256-14SGA3a72i+HYptTEpxf4YiLXZzZ1R/t1agvm3ie4g8="; + sha256 = "sha256-mCnlLsvkkB7ZvBCLYHvYanz9XgWo92v5M/kKulhUKTE="; }; - vendorSha256 = "sha256-GjR9cOGLB6URHQi+qcyNbP7rm0+y4wypvgUxgJzIgGQ="; + vendorHash = "sha256-GjR9cOGLB6URHQi+qcyNbP7rm0+y4wypvgUxgJzIgGQ="; ldflags = [ "-s" "-w" ]; From 8845d70a9afbd32162891800597cb71b6e2dfad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Fri, 10 Feb 2023 13:16:12 +0100 Subject: [PATCH 149/207] wasilibc: 17 -> 19 https://github.com/WebAssembly/wasi-libc/releases/tag/wasi-sdk-19 --- pkgs/development/libraries/wasilibc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wasilibc/default.nix b/pkgs/development/libraries/wasilibc/default.nix index d978e911c3a8..8a8c4ec059ef 100644 --- a/pkgs/development/libraries/wasilibc/default.nix +++ b/pkgs/development/libraries/wasilibc/default.nix @@ -8,7 +8,7 @@ let pname = "wasilibc"; - version = "17"; + version = "19"; in stdenv.mkDerivation { inherit pname version; @@ -17,7 +17,7 @@ stdenv.mkDerivation { owner = "WebAssembly"; repo = "wasi-libc"; rev = "refs/tags/wasi-sdk-${version}"; - hash = "sha256-h2X78icCmnn6Y6baOxp8Xm7F2+RZZgaV2fszzi2q/iA="; + hash = "sha256-yQSKoSil/C/1lIHwEO9eQKC/ye3PJIFGYjHyNDn61y4="; fetchSubmodules = true; }; From c0380c7bff694c7102c7425d7869901a4d40d628 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Feb 2023 13:53:59 +0000 Subject: [PATCH 150/207] netbird: 0.12.0 -> 0.13.0 --- pkgs/tools/networking/netbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index c1becc886a59..4301f606a402 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -14,13 +14,13 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ajfNHkdYNJCuDhFmww1X0d9F0dmo2/h0GlfLYWvTHKc="; + sha256 = "sha256-Afj2pllGPL86hhSNDSbvO+GkA62CI8V5dnUa0mjEMCg="; }; vendorHash = "sha256-3uEcb0nVHrfHZTZ/j/9l6zR1zMfLR0mVaN/Hydyam4Q="; From f08bb600991179d631882ddf65b2bbb9ca622a6d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 11 Feb 2023 11:38:04 +0000 Subject: [PATCH 151/207] lispPackages_new.sbclPackages.cl-freeimage: fix build --- pkgs/development/lisp-modules-new/ql.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/lisp-modules-new/ql.nix b/pkgs/development/lisp-modules-new/ql.nix index aa04a8dce2e2..0367d9ec3623 100644 --- a/pkgs/development/lisp-modules-new/ql.nix +++ b/pkgs/development/lisp-modules-new/ql.nix @@ -51,6 +51,9 @@ let nativeBuildInputs = [ pkgs.libdevil ]; nativeLibs = [ pkgs.libdevil ]; }; + cl-freeimage = pkg: { + nativeLibs = [ freeimage ]; + }; cl-freetype2 = pkg: { nativeLibs = [ freetype ]; nativeBuildInputs = [ freetype ]; From 785cd824a36b7c9b1e90f1c12eefe2484632fff3 Mon Sep 17 00:00:00 2001 From: Marin Date: Fri, 10 Feb 2023 17:13:09 -0500 Subject: [PATCH 152/207] nixos/yubikey-agent: Add dependency to pcsd.service Issue: after installing, running `yubikey-agent -setup` produces the following error: ``` nixOS: Failed to connect to the YubiKey: connecting to pscs: the Smart card resource manager is not running ``` More on this issue: https://github.com/FiloSottile/yubikey-agent/issues/137 --- nixos/modules/services/security/yubikey-agent.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/security/yubikey-agent.nix b/nixos/modules/services/security/yubikey-agent.nix index c91ff3e69a0a..ee57ec8bf812 100644 --- a/nixos/modules/services/security/yubikey-agent.nix +++ b/nixos/modules/services/security/yubikey-agent.nix @@ -57,6 +57,9 @@ in ]; }; + # Yubikey-agent expects pcsd to be running in order to function. + services.pcscd.enable = true; + environment.extraInit = '' if [ -z "$SSH_AUTH_SOCK" -a -n "$XDG_RUNTIME_DIR" ]; then export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/yubikey-agent/yubikey-agent.sock" From e6611180eac8a32b0681e19bea2f8057675ad255 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 11 Feb 2023 14:06:29 +0000 Subject: [PATCH 153/207] lispPackages_new.sbclPackages.classimp: mark broken --- pkgs/development/lisp-modules-new/ql.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/lisp-modules-new/ql.nix b/pkgs/development/lisp-modules-new/ql.nix index 0367d9ec3623..f65a55dae117 100644 --- a/pkgs/development/lisp-modules-new/ql.nix +++ b/pkgs/development/lisp-modules-new/ql.nix @@ -147,6 +147,7 @@ let }; classimp = pkg: { nativeLibs = [ assimp ]; + meta.broken = true; # Requires assimp ≤ 5.0.x. }; clsql-postgresql = pkg: { nativeLibs = [ postgresql.lib ]; From aebc76376ca2da5ee4524326e6f83a3a18587d54 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 10 Feb 2023 22:43:52 +0000 Subject: [PATCH 154/207] wlroots_0_16: 0.16.1 -> 0.16.2 Tested that sway builds and runs. --- pkgs/development/libraries/wlroots/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 9d03d193d81c..8e0ebab220af 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -121,8 +121,8 @@ rec { }; wlroots_0_16 = generic { - version = "0.16.1"; - hash = "sha256-UyPN7zmytre4emwx/ztZ4JefXHwixPV6UEEqnhSLbIY="; + version = "0.16.2"; + hash = "sha256-JeDDYinio14BOl6CbzAPnJDOnrk4vgGNMN++rcy2ItQ="; extraBuildInputs = [ vulkan-loader ]; extraNativeBuildInputs = [ glslang ]; extraPatch = '' From 30826d6035ffff0ccc16b53f5f42111661214882 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 11 Feb 2023 17:03:26 +0200 Subject: [PATCH 155/207] tevent: copy cross fix from talloc & add libxcrypt testing pyembed configuration : Could not build a python embedded interpreter tevent-aarch64-unknown-linux-gnu> In file included from ../../pytevent.c:26: tevent-aarch64-unknown-linux-gnu> ../../lib/replace/replace.h:885:10: fatal error: crypt.h: No such file or directory tevent-aarch64-unknown-linux-gnu> 885 | #include tevent-aarch64-unknown-linux-gnu> | ^~~~~~~~~ tevent-aarch64-unknown-linux-gnu> compilation terminated. --- pkgs/development/libraries/tevent/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index f10235650c4a..7b798d00b01e 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -10,6 +10,7 @@ , docbook_xml_dtd_42 , which , wafHook +, libxcrypt }: stdenv.mkDerivation rec { @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { cmocka readline # required to build python talloc + libxcrypt ]; # otherwise the configure script fails with @@ -52,6 +54,11 @@ stdenv.mkDerivation rec { "--builtin-libraries=replace" ]; + # python-config from build Python gives incorrect values when cross-compiling. + # If python-config is not found, the build falls back to using the sysconfig + # module, which works correctly in all cases. + PYTHON_CONFIG = "/invalid"; + meta = with lib; { description = "An event system based on the talloc memory management library"; homepage = "https://tevent.samba.org/"; From 0d4a49af8670cf2adf2e23a65830ca4e0bdbe4b2 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 11 Feb 2023 17:52:13 +0200 Subject: [PATCH 156/207] ldb: fix cross & add libxcrypt ERROR: Python module pytdb of version 1.4.7 not found, and bundling disabled --- pkgs/development/libraries/ldb/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 37856f5a0130..bdd630103e37 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -12,6 +12,7 @@ , docbook_xml_dtd_42 , cmocka , wafHook +, libxcrypt }: stdenv.mkDerivation rec { @@ -32,6 +33,8 @@ stdenv.mkDerivation rec { libxslt docbook-xsl-nons docbook_xml_dtd_42 + tdb + tevent ]; buildInputs = [ @@ -42,6 +45,7 @@ stdenv.mkDerivation rec { tevent popt cmocka + libxcrypt ]; # otherwise the configure script fails with From 524ebdd7e1b6aaf90a21372911778c732d994c44 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Feb 2023 15:58:04 +0000 Subject: [PATCH 157/207] python310Packages.globus-sdk: 3.15.1 -> 3.16.0 --- pkgs/development/python-modules/globus-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 57f869842c83..c04bb6e7f873 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.15.1"; + version = "3.16.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-qxqGfbrnMvmjbBD7l8OtGKx7WJr65Jbd9y5IyZDXwW4="; + hash = "sha256-zl5+22r0KMqdBKIlBe+8xxgh6h9am34USc1dLy+VGyY="; }; propagatedBuildInputs = [ From 5b7d66bc32ce6d89df5af4f880435137804bef64 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 11 Feb 2023 16:59:44 +0100 Subject: [PATCH 158/207] license-generator: 0.8.1 -> 1.0.0 --- pkgs/tools/misc/license-generator/default.nix | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/misc/license-generator/default.nix b/pkgs/tools/misc/license-generator/default.nix index b880c66f971c..5662b356f34e 100644 --- a/pkgs/tools/misc/license-generator/default.nix +++ b/pkgs/tools/misc/license-generator/default.nix @@ -1,20 +1,20 @@ { lib, fetchCrate, rustPlatform }: rustPlatform.buildRustPackage rec { - pname = "license-generator"; - version = "0.8.1"; + pname = "license-generator"; + version = "1.0.0"; - src = fetchCrate { - inherit pname version; - sha256 = "sha256-ZVhsbaJJ9WBcQPx2yikIAQJeBXwC6ZAJkfCRmokNV3I="; - }; + src = fetchCrate { + inherit pname version; + hash = "sha256-ijA/AqLeQ9/XLeCriWNUA6R3iKyq+QPDH5twSvqFmEA="; + }; - cargoSha256 = "sha256-Yh9q/aYHXUF2eIFpJ7ccgeyIO5mQMgRDCNr+ZyS166Y="; + cargoHash = "sha256-FfkCV4anPHElGGIOYDSzHam5ohVGpOgtu/nM0aw9HzU="; - meta = with lib; { - description = "Command-line tool for generating license files"; - homepage = "https://github.com/azu/license-generator"; - license = licenses.mit; - maintainers = with maintainers; [ loicreynier ]; - }; + meta = with lib; { + description = "Command-line tool for generating license files"; + homepage = "https://github.com/azu/license-generator"; + license = licenses.mit; + maintainers = with maintainers; [ loicreynier ]; + }; } From 6ff065a44ccb9b91ee42cfebcd787330fb373384 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 10 Feb 2023 19:53:14 -0500 Subject: [PATCH 159/207] qt5.qtbase: Add `meta.pkgConfigModules` and test --- .../libraries/qt-5/modules/qtbase.nix | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 44f72701854c..b718f69610d4 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -24,13 +24,14 @@ , debug ? false , developerBuild ? false , decryptSslTraffic ? false +, testers }: let debugSymbols = debug || developerBuild; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "qtbase"; inherit qtCompatVersion src version; debug = debugSymbols; @@ -338,12 +339,33 @@ stdenv.mkDerivation { setupHook = ../hooks/qtbase-setup-hook.sh; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://www.qt.io/"; description = "A cross-platform application framework for C++"; license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; maintainers = with maintainers; [ qknight ttuegel periklis bkchr ]; + pkgConfigModules = [ + "Qt5Concurrent" + "Qt5Core" + "Qt5DBus" + "Qt5Gui" + "Qt5Network" + "Qt5OpenGL" + "Qt5OpenGLExtensions" + "Qt5PrintSupport" + #"Qt5Qml" + #"Qt5QmlModels" + #"Qt5Quick" + #"Qt5QuickTest" + #"Qt5QuickWidgets" + "Qt5Sql" + "Qt5Test" + "Qt5Widgets" + "Qt5Xml" + ]; platforms = platforms.unix; }; -} +}) From 839288b52affdf9177c168df0dacf16e967f56df Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 10 Feb 2023 20:26:38 -0500 Subject: [PATCH 160/207] bzip3: Add `meta.pkgConfigModules` and test --- pkgs/tools/compression/bzip3/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/compression/bzip3/default.nix b/pkgs/tools/compression/bzip3/default.nix index 55ef5309d57d..37a4519c9454 100644 --- a/pkgs/tools/compression/bzip3/default.nix +++ b/pkgs/tools/compression/bzip3/default.nix @@ -3,9 +3,10 @@ , fetchFromGitHub , autoreconfHook , pkg-config +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bzip3"; version = "1.2.2"; @@ -14,12 +15,12 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "kspalaiologos"; repo = "bzip3"; - rev = version; + rev = finalAttrs.version; hash = "sha256-B59Z7+5SFjt/UgppNtdUtzw96y+EVglHoKzq9Il9ud8="; }; postPatch = '' - echo -n "${version}" > .tarball-version + echo -n "${finalAttrs.version}" > .tarball-version patchShebangs build-aux # build-aux/ax_subst_man_date.m4 calls git if the file exists @@ -35,12 +36,15 @@ stdenv.mkDerivation rec { "--disable-arch-native" ] ++ lib.optionals stdenv.isDarwin [ "--disable-link-time-optimization" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { description = "A better and stronger spiritual successor to BZip2"; homepage = "https://github.com/kspalaiologos/bzip3"; - changelog = "https://github.com/kspalaiologos/bzip3/blob/${src.rev}/NEWS"; + changelog = "https://github.com/kspalaiologos/bzip3/blob/${finalAttrs.src.rev}/NEWS"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ dotlambda ]; + pkgConfigModules = [ "bzip3" ]; platforms = lib.platforms.unix; }; -} +}) From 8e24bfb36aebbdbdf5a30dcaebbb34e5e9cb2b12 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 10 Feb 2023 20:28:51 -0500 Subject: [PATCH 161/207] bzip2_1_1: Add `meta.pkgConfigModules` and test --- pkgs/tools/compression/bzip2/1_1.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/bzip2/1_1.nix b/pkgs/tools/compression/bzip2/1_1.nix index ca5670a2e512..e9d6f7c44dab 100644 --- a/pkgs/tools/compression/bzip2/1_1.nix +++ b/pkgs/tools/compression/bzip2/1_1.nix @@ -3,9 +3,10 @@ , meson , python3 , ninja +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bzip2-unstable"; version = "2020-08-11"; @@ -34,10 +35,13 @@ stdenv.mkDerivation rec { strictDeps = true; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "High-quality data compression program"; license = licenses.bsdOriginal; + pkgConfigModules = [ "bz2" ]; platforms = platforms.all; maintainers = []; }; -} +}) From 0c9a9dd4551488687db0ee4d05a803a0a09ea91b Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 10 Feb 2023 20:32:13 -0500 Subject: [PATCH 162/207] libzip: Add `meta.pkgConfigModules` and test --- pkgs/development/libraries/libzip/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index d3b7e5642546..6ba8eaf6f170 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -12,14 +12,15 @@ , openssl , withZstd ? false , zstd +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libzip"; version = "1.9.2"; src = fetchurl { - url = "https://libzip.org/download/${pname}-${version}.tar.gz"; + url = "https://libzip.org/download/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; sha256 = "sha256-/Wp/dF3j1pz1YD7cnLM9KJDwGY5BUlXQmHoM8Q2CTG8="; }; @@ -41,11 +42,14 @@ stdenv.mkDerivation rec { patchShebangs regress ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://libzip.org/"; description = "A C library for reading, creating and modifying zip archives"; license = licenses.bsd3; + pkgConfigModules = [ "libzip" ]; platforms = platforms.unix; changelog = "https://github.com/nih-at/libzip/blob/v${version}/NEWS.md"; }; -} +}) From e7d06f4b0c6fa035b4b4a1f12aabe410d9d8f58e Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 10 Feb 2023 20:34:40 -0500 Subject: [PATCH 163/207] cairo: Fix `cairo-pdf` in `meta.pkgConfigModules` --- pkgs/development/libraries/cairo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index ee8e436d2926..70a59bfa0db7 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -156,7 +156,7 @@ in { "cairo-ps" "cairo-svg" ] ++ lib.optional gobjectSupport "cairo-gobject" - ++ lib.optional pdfSupport "cairo-gobject"; + ++ lib.optional pdfSupport "cairo-pdf"; platforms = platforms.all; }; }) From 3d239f2b76dee2c530482f406193e08ade807c62 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 10 Feb 2023 20:36:45 -0500 Subject: [PATCH 164/207] freeault: Add `meta.pkgConfigModules` and test --- pkgs/development/libraries/freealut/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/freealut/default.nix b/pkgs/development/libraries/freealut/default.nix index 36bc4a256777..c29899922979 100644 --- a/pkgs/development/libraries/freealut/default.nix +++ b/pkgs/development/libraries/freealut/default.nix @@ -1,11 +1,13 @@ -{ lib, stdenv, darwin, fetchurl, openal }: +{ lib, stdenv, darwin, fetchurl, openal +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freealut"; version = "1.1.0"; src = fetchurl { - url = "http://www.openal.org/openal_webstf/downloads/freealut-${version}.tar.gz"; + url = "http://www.openal.org/openal_webstf/downloads/freealut-${finalAttrs.version}.tar.gz"; sha256 = "0kzlil6112x2429nw6mycmif8y6bxr2cwjcvp18vh6s7g63ymlb0"; }; @@ -14,10 +16,13 @@ stdenv.mkDerivation rec { darwin.apple_sdk.frameworks.OpenAL ; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { homepage = "http://openal.org/"; description = "Free implementation of OpenAL's ALUT standard"; license = lib.licenses.lgpl2; + pkgConfigModules = [ "freealut" ]; platforms = lib.platforms.unix; }; -} +}) From 6861492a22ab6ebe8bd1ca4a2c234efc26d5db65 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 10 Feb 2023 20:41:00 -0500 Subject: [PATCH 165/207] freetype: Add `meta.pkgConfigModules` and test --- pkgs/development/libraries/freetype/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 68907d798e19..48048e4a9108 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -22,14 +22,15 @@ , qt5 , texmacs , ttfautohint +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freetype"; version = "2.12.1"; - src = fetchurl { + src = let inherit (finalAttrs) pname version; in fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz"; sha256 = "sha256-R2byAVfMTPDNKS+Av5F/ktHEObJDrDAY3r9rkUDEGn8="; }; @@ -82,6 +83,7 @@ stdenv.mkDerivation rec { ttfautohint; inherit (python3.pkgs) freetype-py; inherit (qt5) qtbase; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; meta = with lib; { @@ -96,6 +98,7 @@ stdenv.mkDerivation rec { homepage = "https://www.freetype.org/"; license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause) platforms = platforms.all; + pkgConfigModules = [ "freetype2" ]; maintainers = with maintainers; [ ttuegel ]; }; -} +}) From d43e540f891eb804513683b0393b1bf1e0d8d372 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 10 Feb 2023 20:48:14 -0500 Subject: [PATCH 166/207] gtk: Add `meta.pkgConfigModules` and test --- pkgs/development/libraries/gtk/2.x.nix | 19 +++++++++++++++---- pkgs/development/libraries/gtk/3.x.nix | 21 ++++++++++++++++----- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index 23680c9b6757..88dfc54094f3 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -5,6 +5,7 @@ , gdktarget ? if stdenv.isDarwin then "quartz" else "x11" , AppKit, Cocoa , fetchpatch, buildPackages +, testers }: let @@ -17,12 +18,12 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtk+"; version = "2.24.33"; src = fetchurl { - url = "mirror://gnome/sources/gtk+/2.24/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gtk+/2.24/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; sha256 = "rCrHV/WULTGKMRpUsMgLXvKV8pnCpzxjL2v7H/Scxto="; }; @@ -37,7 +38,9 @@ stdenv.mkDerivation rec { ]; - nativeBuildInputs = setupHooks ++ [ perl pkg-config gettext gobject-introspection ]; + nativeBuildInputs = finalAttrs.setupHooks ++ [ + perl pkg-config gettext gobject-introspection + ]; patches = [ ./patches/2.0-immodules.cache.patch @@ -90,6 +93,7 @@ stdenv.mkDerivation rec { $out/bin/gtk-query-immodules-2.0 $out/lib/gtk-2.0/2.10.0/immodules/*.so > $out/lib/gtk-2.0/2.10.0/immodules.cache ''; # workaround for bug of nix-mode for Emacs */ ''; inherit gdktarget; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; meta = with lib; { @@ -97,6 +101,13 @@ stdenv.mkDerivation rec { homepage = "https://www.gtk.org/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 raskin ]; + pkgConfigModules = [ + "gdk-2.0" + "gtk+-2.0" + ] ++ lib.optionals (gdktarget == "x11") [ + "gdk-x11-2.0" + "gtk+-x11-2.0" + ]; platforms = platforms.all; longDescription = '' @@ -111,4 +122,4 @@ stdenv.mkDerivation rec { ''; changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS"; }; -} +}) diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 1533f59b4aec..6737cdd7e410 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -46,6 +46,7 @@ , QuartzCore , broadwaySupport ? true , wayland-scanner +, testers }: let @@ -58,7 +59,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtk+3"; version = "3.24.36"; @@ -70,7 +71,9 @@ stdenv.mkDerivation rec { gtkCleanImmodulesCache ]; - src = fetchurl { + src = let + inherit (finalAttrs) version; + in fetchurl { url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; sha256 = "sha256-J6bvFXdDNQyAf/6lm6odcCJtvt6CpelT/9WOpgWf5pE="; }; @@ -99,7 +102,7 @@ stdenv.mkDerivation rec { python3 sassc gdk-pixbuf - ] ++ setupHooks ++ lib.optionals withGtkDoc [ + ] ++ finalAttrs.setupHooks ++ lib.optionals withGtkDoc [ docbook_xml_dtd_43 docbook-xsl-nons gtk-doc @@ -212,7 +215,7 @@ stdenv.mkDerivation rec { for program in ''${demos[@]}; do wrapProgram $dev/bin/$program \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${pname}-${version}" + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${finalAttrs.pname}-${finalAttrs.version}" done '' + lib.optionalString stdenv.isDarwin '' # a comment created a cycle between outputs @@ -225,6 +228,7 @@ stdenv.mkDerivation rec { attrPath = "gtk3"; freeze = true; }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; meta = with lib; { @@ -242,7 +246,14 @@ stdenv.mkDerivation rec { homepage = "https://www.gtk.org/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ raskin ] ++ teams.gnome.members; + pkgConfigModules = [ + "gdk-3.0" + "gtk+-3.0" + ] ++ lib.optionals x11Support [ + "gdk-x11-3.0" + "gtk+-x11-3.0" + ]; platforms = platforms.all; changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS"; }; -} +}) From 36b6027957c729e4a4bb786fa130212a29f98a5e Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 10 Feb 2023 20:53:45 -0500 Subject: [PATCH 167/207] gdk-pixbuf: Add `meta.pkgConfigModules` and test --- pkgs/development/libraries/gdk-pixbuf/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 5e44d2221f2a..ca0e8f81c4d0 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -19,16 +19,19 @@ , doCheck ? false , makeWrapper , lib +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gdk-pixbuf"; version = "2.42.10"; outputs = [ "out" "dev" "man" "devdoc" ] ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) "installedTests"; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "7ptsddE7oJaQei48aye2G80X9cfr6rWltDnS8uOf5Es="; }; @@ -97,7 +100,7 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.isDarwin '' # meson erroneously installs loaders with .dylib extension on Darwin. # Their @rpath has to be replaced before gdk-pixbuf-query-loaders looks at them. - for f in $out/${passthru.moduleDir}/*.dylib; do + for f in $out/${finalAttrs.passthru.moduleDir}/*.dylib; do install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f mv $f ''${f%.dylib}.so done @@ -127,12 +130,13 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = finalAttrs.pname; versionPolicy = "odd-unstable"; }; tests = { installedTests = nixosTests.installed-tests.gdk-pixbuf; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; # gdk_pixbuf_moduledir variable from gdk-pixbuf-2.0.pc @@ -145,6 +149,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; maintainers = [ maintainers.eelco ] ++ teams.gnome.members; mainProgram = "gdk-pixbuf-thumbnailer"; + pkgConfigModules = [ "gdk-pixbuf-2.0" ]; platforms = platforms.unix; }; -} +}) From 5df263bdc01163b684cd2c5f8f2c99636d4bc3fd Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 11 Feb 2023 08:55:46 -0500 Subject: [PATCH 168/207] geos: Add `meta.pkgConfigModules` and test --- pkgs/development/libraries/geos/3.9.nix | 15 +++++++++++---- pkgs/development/libraries/geos/default.nix | 13 +++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/geos/3.9.nix b/pkgs/development/libraries/geos/3.9.nix index fd0531fa747f..415746d3e544 100644 --- a/pkgs/development/libraries/geos/3.9.nix +++ b/pkgs/development/libraries/geos/3.9.nix @@ -1,11 +1,15 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "geos"; version = "3.9.2"; src = fetchurl { - url = "https://download.osgeo.org/geos/${pname}-${version}.tar.bz2"; + url = "https://download.osgeo.org/geos/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; sha256 = "sha256-RKWpviHX1HNDa/Yhwt3MPPWou+PHhuEyKWGKO52GEpc="; }; @@ -14,12 +18,15 @@ stdenv.mkDerivation rec { # https://trac.osgeo.org/geos/ticket/993 configureFlags = lib.optional stdenv.isAarch32 "--disable-inline"; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "C++ port of the Java Topology Suite (JTS)"; homepage = "https://trac.osgeo.org/geos"; license = licenses.lgpl21Only; + pkgConfigModules = [ "geos" ]; maintainers = with lib.maintainers; [ willcohen ]; }; -} +}) diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index a331e0254568..670fa30cb0f1 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -2,14 +2,16 @@ , stdenv , fetchurl , fetchpatch -, cmake }: +, cmake +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "geos"; version = "3.11.1"; src = fetchurl { - url = "https://download.osgeo.org/geos/${pname}-${version}.tar.bz2"; + url = "https://download.osgeo.org/geos/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; hash = "sha256-bQ6zz6n5LZR3Mcx18XUDVrO9/AfqAgVT2vavHHaOC+I="; }; @@ -17,12 +19,15 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "C++ port of the Java Topology Suite (JTS)"; homepage = "https://trac.osgeo.org/geos"; license = licenses.lgpl21Only; + pkgConfigModules = [ "geos" ]; maintainers = with lib.maintainers; [ willcohen ]; }; -} +}) From b1aa0e9f2a7d126eba37a7d6dc5f162be9716459 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 11 Feb 2023 09:06:48 -0500 Subject: [PATCH 169/207] glib: Add `meta.pkgConfigModules` and test --- pkgs/development/libraries/glib/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index ac7977d0f62f..9e932e547f43 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -19,6 +19,7 @@ , desktop-file-utils, shared-mime-info , darwin , makeHardcodeGsettingsPatch +, testers }: assert stdenv.isLinux -> util-linuxMinimal != null; @@ -280,7 +281,10 @@ stdenv.mkDerivation (finalAttrs: { getSchemaPath = pkg: makeSchemaPath pkg pkg.name; getSchemaDataDirPath = pkg: makeSchemaDataDirPath pkg pkg.name; - tests.withChecks = finalAttrs.finalPackage.overrideAttrs (_: { doCheck = true; }); + tests = { + withChecks = finalAttrs.finalPackage.overrideAttrs (_: { doCheck = true; }); + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; inherit flattenInclude; updateScript = gnome.updateScript { @@ -306,6 +310,11 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://wiki.gnome.org/Projects/GLib"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 raskin ]); + pkgConfigModules = [ + "gio-2.0" + "gobject-2.0" + "gthread-2.0" + ]; platforms = platforms.unix; longDescription = '' From b58f0d0fa51f502a1a3f9d8d206fe6106ffd2643 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 11 Feb 2023 09:10:54 -0500 Subject: [PATCH 170/207] libGLU: Add `meta.pkgConfigModules` and test --- pkgs/development/libraries/mesa-glu/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index d2e92da0ea96..1c08812db45c 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -1,10 +1,14 @@ -{ lib, stdenv, fetchurl, pkg-config, libGL, ApplicationServices }: +{ lib, stdenv, fetchurl, pkg-config, libGL, ApplicationServices +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "glu"; version = "9.0.2"; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "https://mesa.freedesktop.org/archive/${pname}/${pname}-${version}.tar.xz"; sha256 = "sha256-bnKA/1hcah2d/N8vykiSUWNLM3e/wzwp5AAkZqONAtQ="; }; @@ -15,11 +19,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { description = "OpenGL utility library"; homepage = "https://cgit.freedesktop.org/mesa/glu/"; license = lib.licenses.sgi-b-20; + pkgConfigModules = [ "glu" ]; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isAndroid; }; -} +}) From 5fd449df4162fd1f17fffd42be51230305769603 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 11 Feb 2023 09:21:55 -0500 Subject: [PATCH 171/207] glew: Add `meta.pkgConfigModules` and test --- pkgs/development/libraries/glew/1.10.nix | 10 +++++++--- pkgs/development/libraries/glew/default.nix | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index 8fa77013e105..3f355deb33b9 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -1,13 +1,14 @@ { lib, stdenv, fetchurl, libGLU, libXmu, libXi, libXext , AGL, OpenGL +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "glew"; version = "1.10.0"; src = fetchurl { - url = "mirror://sourceforge/glew/glew-${version}.tgz"; + url = "mirror://sourceforge/glew/${finalAttrs.pname}-${finalAttrs.version}.tgz"; sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r"; }; @@ -41,11 +42,14 @@ stdenv.mkDerivation rec { "SYSTEM=${if stdenv.hostPlatform.isMinGW then "mingw" else stdenv.hostPlatform.parsed.kernel.name}" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "An OpenGL extension loading library for C(++)"; homepage = "https://glew.sourceforge.net/"; license = licenses.free; # different files under different licenses #["BSD" "GLX" "SGI-B" "GPL2"] + pkgConfigModules = [ "glew" ]; platforms = platforms.mesaPlatforms; }; -} +}) diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 1e30eb744ba8..4cbd85e7a04c 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,14 +1,15 @@ { lib, stdenv, fetchurl, fetchpatch, cmake, libGLU, libXmu, libXi, libXext , OpenGL , enableEGL ? false +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "glew"; version = "2.2.0"; src = fetchurl { - url = "mirror://sourceforge/glew/${pname}-${version}.tgz"; + url = "mirror://sourceforge/glew/${finalAttrs.pname}-${finalAttrs.version}.tgz"; sha256 = "1qak8f7g1iswgswrgkzc7idk7jmqgwrs58fhg2ai007v7j4q5z6l"; }; @@ -44,14 +45,17 @@ stdenv.mkDerivation rec { EOF ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "An OpenGL extension loading library for C/C++"; homepage = "https://glew.sourceforge.net/"; license = with licenses; [ /* modified bsd */ free mit gpl2Only ]; # For full details, see https://github.com/nigels-com/glew#copyright-and-licensing + pkgConfigModules = [ "glew" ]; platforms = with platforms; if enableEGL then subtractLists darwin mesaPlatforms else mesaPlatforms; }; -} +}) From 68326eb1f4009c10072161033b10589bbf735e1c Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 11 Feb 2023 10:09:01 -0500 Subject: [PATCH 172/207] freeglut: Add `meta.pkgConfigModules` and test --- pkgs/development/libraries/freeglut/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 776023f35f01..8c12766204cf 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -1,11 +1,13 @@ -{ lib, stdenv, fetchurl, libICE, libXext, libXi, libXrandr, libXxf86vm, libGL, libGLU, cmake }: +{ lib, stdenv, fetchurl, libICE, libXext, libXi, libXrandr, libXxf86vm, libGL, libGLU, cmake +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freeglut"; version = "3.2.2"; src = fetchurl { - url = "mirror://sourceforge/freeglut/freeglut-${version}.tar.gz"; + url = "mirror://sourceforge/freeglut/freeglut-${finalAttrs.version}.tar.gz"; sha256 = "sha256-xZRKCC3wu6lrV1bd2x910M1yzie1OVxsHd6Fwv8pelA="; }; @@ -22,6 +24,8 @@ stdenv.mkDerivation rec { "-DFREEGLUT_BUILD_STATIC:BOOL=OFF" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Create and manage windows containing OpenGL contexts"; longDescription = '' @@ -34,7 +38,8 @@ stdenv.mkDerivation rec { ''; homepage = "https://freeglut.sourceforge.net/"; license = licenses.mit; + pkgConfigModules = [ "glut" ]; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; }; -} +}) From 9808e6d89116d4d3eb55ce001280afd5bb54f206 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 11 Feb 2023 10:27:08 -0500 Subject: [PATCH 173/207] libgnome-keyring{,3}: Add `meta.pkgConfigModules` and test --- .../gnome/core/libgnome-keyring/default.nix | 13 +++++++++---- .../libraries/libgnome-keyring/default.nix | 15 +++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome/core/libgnome-keyring/default.nix index aa3c7ed39811..9d2e3d4eff74 100644 --- a/pkgs/desktops/gnome/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome/core/libgnome-keyring/default.nix @@ -1,14 +1,16 @@ -{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool, gobject-introspection, gnome }: +{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool, gobject-introspection, gnome +, testers +}: let pname = "libgnome-keyring"; version = "3.12.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783"; }; @@ -17,10 +19,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gobject-introspection dbus libgcrypt ]; nativeBuildInputs = [ pkg-config intltool ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { description = "Framework for managing passwords and other secrets"; homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; license = with lib.licenses; [ gpl2Plus lgpl2Plus ]; + pkgConfigModules = [ "gnome-keyring-1" ]; inherit (glib.meta) platforms maintainers; longDescription = '' @@ -29,4 +34,4 @@ stdenv.mkDerivation rec { with the gnome-keyring system. ''; }; -} +}) diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix index 3f5a5961ba0f..775bcf2f2a43 100644 --- a/pkgs/development/libraries/libgnome-keyring/default.nix +++ b/pkgs/development/libraries/libgnome-keyring/default.nix @@ -1,10 +1,14 @@ -{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool }: +{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgnome-keyring"; version = "2.32.0"; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "030gka96kzqg1r19b4xrmac89hf1xj1kr5p461yvbzfxh46qqf2n"; }; @@ -14,9 +18,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib dbus libgcrypt ]; nativeBuildInputs = [ pkg-config intltool ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = { + pkgConfigModules = [ "gnome-keyring-1" ]; inherit (glib.meta) platforms maintainers; homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; license = with lib.licenses; [ gpl2 lgpl2 ]; }; -} +}) From a938c505f388f25c120a99287923648101db0c37 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 11 Feb 2023 10:32:16 -0500 Subject: [PATCH 174/207] gnome2.gnome_vfs: Add `meta.pkgConfigModules` and test --- .../gnome-2/platform/gnome-vfs/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index 4c9f28230c31..7ce615fb3c71 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -1,12 +1,16 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, libxml2, bzip2, openssl, dbus-glib -, glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: +, glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-vfs"; version = "2.24.4"; - src = fetchurl { - url = "mirror://gnome/sources/gnome-vfs/${lib.versions.majorMinor version}/gnome-vfs-${version}.tar.bz2"; + src = let + inherit (finalAttrs) pname version; + in fetchurl { + url = "mirror://gnome/sources/gnome-vfs/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2"; }; @@ -35,4 +39,10 @@ stdenv.mkDerivation rec { postPatch = "find . -name Makefile.in | xargs sed 's/-DG_DISABLE_DEPRECATED//g' -i "; doCheck = false; # needs dbus daemon -} + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = { + pkgConfigModules = [ "gnome-vfs-2.0" "gnome-vfs-module-2.0" ]; + }; +}) From 81655d432d0b7a27f70e35cd56878c0aece04551 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 11 Feb 2023 10:33:51 -0500 Subject: [PATCH 175/207] gobject-introspection: Add `meta.pkgConfigModules` and test --- pkgs/development/libraries/gobject-introspection/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 4ab8cbbf9650..f83b7c10819e 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -21,6 +21,7 @@ , gobject-introspection-unwrapped , nixStoreDir ? builtins.storeDir , x11Support ? true +, testers }: # now that gobject-introspection creates large .gir files (eg gtk3 case) @@ -145,12 +146,14 @@ stdenv.mkDerivation (finalAttrs: { packageName = "gobject-introspection"; versionPolicy = "odd-unstable"; }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; meta = with lib; { description = "A middleware layer between C libraries and language bindings"; homepage = "https://gi.readthedocs.io/"; maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 artturin ]); + pkgConfigModules = [ "gobject-introspection-1.0" ]; platforms = platforms.unix; license = with licenses; [ gpl2 lgpl2 ]; From 4180befaaf1ebfccae53fccfbaf1ba779fd849fe Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 11 Feb 2023 10:40:35 -0500 Subject: [PATCH 176/207] gstreamer: Add `meta.pkgConfigModules` and test --- .../libraries/gstreamer/base/default.nix | 17 ++++++++++++++--- .../libraries/gstreamer/core/default.nix | 16 ++++++++++++---- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 395708c2a680..e03f9f0b844f 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -37,15 +37,18 @@ , enableCdparanoia ? (!stdenv.isDarwin) , cdparanoia , glib +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-base"; version = "1.20.3"; outputs = [ "out" "dev" ]; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "sha256-fjCz3YGnA4D/dVT5mEcdaZb/drvm/FRHCW+FHiRHPJ8="; }; @@ -146,11 +149,19 @@ stdenv.mkDerivation rec { waylandEnabled = enableWayland; }; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Base GStreamer plug-ins and helper libraries"; homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl2Plus; + pkgConfigModules = [ + "gstreamer-audio-1.0" + "gstreamer-base-1.0" + "gstreamer-net-1.0" + "gstreamer-video-1.0" + ]; platforms = platforms.unix; maintainers = with maintainers; [ matthewbauer ]; }; -} +}) diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 41acd079583e..80fc921a3679 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -17,9 +17,10 @@ , lib , CoreServices , gobject-introspection +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gstreamer"; version = "1.20.3"; @@ -32,7 +33,9 @@ stdenv.mkDerivation rec { # - https://github.com/NixOS/nixpkgs/issues/98769#issuecomment-702296551 ]; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; sha256 = "sha256-YH2vZLu9X7GK+dF+IcDSLE1wL//oOyPLItGxryyiOio="; }; @@ -108,11 +111,16 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - meta = with lib ;{ + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = with lib; { description = "Open source multimedia framework"; homepage = "https://gstreamer.freedesktop.org"; license = licenses.lgpl2Plus; + pkgConfigModules = [ + "gstreamer-controller-1.0" + ]; platforms = platforms.unix; maintainers = with maintainers; [ ttuegel matthewbauer ]; }; -} +}) From 03c5c0a2c47261383efe01acd09f4bd7cfc02b08 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 11 Feb 2023 10:56:58 -0500 Subject: [PATCH 177/207] gtksourceview: Add `meta.pkgConfigModules` and test --- .../gnome-2/desktop/gtksourceview/default.nix | 20 ++++++++++++++----- .../libraries/gtksourceview/3.x.nix | 17 +++++++++++----- .../libraries/gtksourceview/4.x.nix | 12 ++++++++--- .../libraries/gtksourceview/5.x.nix | 12 ++++++++--- 4 files changed, 45 insertions(+), 16 deletions(-) diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index df63449c2f61..9db253dab3a2 100644 --- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -1,15 +1,19 @@ {lib, stdenv, fetchpatch, fetchurl, autoreconfHook, pkg-config, atk, cairo, glib , gnome-common, gtk2, pango -, libxml2Python, perl, intltool, gettext, gtk-mac-integration-gtk2 }: +, libxml2Python, perl, intltool, gettext, gtk-mac-integration-gtk2 +, testers +}: with lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; version = "2.10.5"; - src = fetchurl { - url = "mirror://gnome/sources/gtksourceview/2.10/${pname}-${version}.tar.bz2"; + src = let + inherit (finalAttrs) pname version; + in fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; sha256 = "c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e"; }; @@ -40,4 +44,10 @@ stdenv.mkDerivation rec { ''; doCheck = false; # requires X11 daemon -} + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = { + pkgConfigModules = [ "gtksourceview-2.0" ]; + }; +}) diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index 447e7d061fdb..704a7c3e9c54 100644 --- a/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -1,12 +1,16 @@ { lib, stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, vala -, libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb-run, shared-mime-info }: +, libxml2, perl, intltool, gettext, gobject-introspection, dbus, xvfb-run, shared-mime-info +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; version = "3.24.11"; - src = fetchurl { - url = "mirror://gnome/sources/gtksourceview/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + src = let + inherit (finalAttrs) pname version; + in fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1zbpj283b5ycz767hqz5kdq02wzsga65pp4fykvhg8xj6x50f6v9"; }; @@ -42,10 +46,13 @@ stdenv.mkDerivation rec { make check ''; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; + pkgConfigModules = [ "gtksourceview-3.0" ]; platforms = with platforms; linux ++ darwin; license = licenses.lgpl21; maintainers = teams.gnome.members; }; -} +}) diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index 95e6e8d2e107..e824e1ed9c67 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -19,15 +19,18 @@ , dbus , xvfb-run , shared-mime-info +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; version = "4.8.4"; outputs = [ "out" "dev" ]; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "fsnRj7KD0fhKOj7/O3pysJoQycAGWXs/uru1lYQgqH0="; }; @@ -101,11 +104,14 @@ stdenv.mkDerivation rec { }; }; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Source code editing widget for GTK"; homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; + pkgConfigModules = [ "gtksourceview-4" ]; platforms = platforms.unix; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; }; -} +}) diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index 849c3caf2672..100e3e44a88f 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -20,15 +20,18 @@ , dbus , xvfb-run , shared-mime-info +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; version = "5.6.2"; outputs = [ "out" "dev" "devdoc" ]; - src = fetchurl { + src = let + inherit (finalAttrs) pname version; + in fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "HxRsFW8TWmBJnZeeNXfJm24VoRFEV2er5iGbs0xUXHc="; }; @@ -117,11 +120,14 @@ stdenv.mkDerivation rec { }; }; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Source code editing widget for GTK"; homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; + pkgConfigModules = [ "gtksourceview-5" ]; platforms = platforms.unix; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; }; -} +}) From 3927f4fcbd1016ed57f96db869accc5b1423da70 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 11 Feb 2023 17:26:04 +0100 Subject: [PATCH 178/207] ydotool: 1.0.3 -> 1.0.4 --- pkgs/tools/wayland/ydotool/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/wayland/ydotool/default.nix b/pkgs/tools/wayland/ydotool/default.nix index 319a9249f0a4..42f95735de59 100644 --- a/pkgs/tools/wayland/ydotool/default.nix +++ b/pkgs/tools/wayland/ydotool/default.nix @@ -1,24 +1,26 @@ -{ lib, stdenv, fetchFromGitHub, cmake, scdoc, util-linux }: +{ lib, stdenv, fetchFromGitHub, cmake, scdoc, util-linux, xorg }: stdenv.mkDerivation rec { pname = "ydotool"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "ReimuNotMoe"; repo = "ydotool"; rev = "v${version}"; - sha256 = "sha256-RcPHQFXD3YgfF11OFpcnSowPlEjxy2c2RWhGYr30GhI="; + hash = "sha256-MtanR+cxz6FsbNBngqLE+ITKPZFHmWGsD1mBDk0OVng="; }; + postPatch = '' + substituteInPlace Daemon/ydotoold.c \ + --replace "/usr/bin/xinput" "${xorg.xinput}/bin/xinput" + substituteInPlace Daemon/ydotool.service.in \ + --replace "/usr/bin/kill" "${util-linux}/bin/kill" + ''; + strictDeps = true; nativeBuildInputs = [ cmake scdoc ]; - postInstall = '' - substituteInPlace ${placeholder "out"}/lib/systemd/user/ydotool.service \ - --replace /usr/bin/kill "${util-linux}/bin/kill" - ''; - meta = with lib; { homepage = "https://github.com/ReimuNotMoe/ydotool"; description = "Generic Linux command-line automation tool"; From 68bfdaec5737cbd68703dc8a4e3a5f4c70ac6d73 Mon Sep 17 00:00:00 2001 From: Lana Black Date: Sat, 11 Feb 2023 12:07:01 +0000 Subject: [PATCH 179/207] solo5: fix tests --- pkgs/os-specific/solo5/0001-Fix-test.patch | 25 ++++++++++++++++++++++ pkgs/os-specific/solo5/default.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/os-specific/solo5/0001-Fix-test.patch diff --git a/pkgs/os-specific/solo5/0001-Fix-test.patch b/pkgs/os-specific/solo5/0001-Fix-test.patch new file mode 100644 index 000000000000..bd01c129bec2 --- /dev/null +++ b/pkgs/os-specific/solo5/0001-Fix-test.patch @@ -0,0 +1,25 @@ +From bf1f143455d1c8283d90964e0121b50c14a67bda Mon Sep 17 00:00:00 2001 +From: Lana Black +Date: Sat, 11 Feb 2023 11:53:21 +0000 +Subject: [PATCH] Fix test. + +--- + tests/tests.bats | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/tests.bats b/tests/tests.bats +index c542b7a..98520ee 100644 +--- a/tests/tests.bats ++++ b/tests/tests.bats +@@ -196,7 +196,7 @@ xen_expect_abort() { + run test_hello/test_hello.hvt + case "${CONFIG_HOST}" in + Linux) +- [ "$status" -eq 127 ] && [[ "$output" == *"No such file or directory"* ]] ++ [ "$status" -eq 127 ] && ([[ "$output" == *"No such file or directory"* ]] || [[ "$output" == *"required file not found"* ]]) + ;; + FreeBSD) + # XXX: imgact_elf.c:load_interp() outputs the "ELF interpreter ... not +-- +2.39.0 + diff --git a/pkgs/os-specific/solo5/default.nix b/pkgs/os-specific/solo5/default.nix index c449e46a998e..c436f247866f 100644 --- a/pkgs/os-specific/solo5/default.nix +++ b/pkgs/os-specific/solo5/default.nix @@ -24,6 +24,8 @@ in stdenv.mkDerivation { sha256 = "sha256-viwrS9lnaU8sTGuzK/+L/PlMM/xRRtgVuK5pixVeDEw="; }; + patches = [ ./0001-Fix-test.patch ]; + hardeningEnable = [ "pie" ]; configurePhase = '' From bb69864c554805b54751550e010df67cea77d29b Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 11 Feb 2023 14:05:13 -0300 Subject: [PATCH 180/207] dev86: 0.16.21 -> unstable-2022-07-19 --- pkgs/development/compilers/dev86/default.nix | 38 +++++++++++--------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/pkgs/development/compilers/dev86/default.nix b/pkgs/development/compilers/dev86/default.nix index 2e6b0d3f68f1..67448f38f257 100644 --- a/pkgs/development/compilers/dev86/default.nix +++ b/pkgs/development/compilers/dev86/default.nix @@ -1,29 +1,35 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchFromGitHub +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (self: { pname = "dev86"; - version = "0.16.21"; + version = "unstable-2022-07-19"; - src = fetchurl { - url = "http://v3.sk/~lkundrak/dev86/Dev86src-${version}.tar.gz"; - sha256 = "154dyr2ph4n0kwi8yx0n78j128kw29rk9r9f7s2gddzrdl712jr3"; + src = fetchFromGitHub { + owner = "jbruchon"; + repo = "dev86"; + rev = "f5cd3e5c17a0d3cd8298bac8e30bed6e59c4e57a"; + hash = "sha256-CWeboFkJkpKHZ/wkuvMj5a+5qB2uzAtoYy8OdyYErMg="; }; - hardeningDisable = [ "format" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; - makeFlags = [ "PREFIX=$(out)" ]; - - # Parallel builds are not supported due to build process structure: - # tools are built sequentially in submakefiles and are reusing the - # same targets as dependencies. Building dependencies in parallel - # from different submakes is not synchronized and fails: + # Parallel builds are not supported due to build process structure: tools are + # built sequentially in submakefiles and are reusing the same targets as + # dependencies. Building dependencies in parallel from different submakes is + # not synchronized and fails: # make[3]: Entering directory '/build/dev86-0.16.21/libc' # Unable to execute as86. enableParallelBuilding = false; meta = { - description = "Linux 8086 development environment"; - homepage = "https://github.com/lkundrak/dev86"; + homepage = "https://github.com/jbruchon/dev86"; + description = + "C compiler, assembler and linker environment for the production of 8086 executables"; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.AndersonTorres ]; platforms = lib.platforms.linux; }; -} +}) From fb7ddb6681ada2bacc2e70e6e985abab240cd9e7 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 9 Feb 2023 23:52:57 -0300 Subject: [PATCH 181/207] harePackages: refactor --- pkgs/development/compilers/hare/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/hare/default.nix b/pkgs/development/compilers/hare/default.nix index c04897fad1bb..121365320812 100644 --- a/pkgs/development/compilers/hare/default.nix +++ b/pkgs/development/compilers/hare/default.nix @@ -1,7 +1,7 @@ { config, lib, pkgs }: -lib.makeScope pkgs.newScope (self: with self; { +lib.makeScope pkgs.newScope (self: { - harec = callPackage ./harec { }; - hare = callPackage ./hare { }; + harec = pkgs.callPackage ./harec { }; + hare = pkgs.callPackage ./hare { }; }) From 4c4ce6a06850691ca9137ac7b886db4fbb278784 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 9 Feb 2023 23:52:23 -0300 Subject: [PATCH 182/207] harePackages.harec: 2022-07-02 -> 2023-02-08 --- .../compilers/hare/harec/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/hare/harec/default.nix b/pkgs/development/compilers/hare/harec/default.nix index bdc9ef56b9d1..b29f53151ae4 100644 --- a/pkgs/development/compilers/hare/harec/default.nix +++ b/pkgs/development/compilers/hare/harec/default.nix @@ -4,15 +4,15 @@ , qbe }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (self: { pname = "harec"; - version = "unstable-2022-07-02"; + version = "unstable-2023-02-08"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "harec"; - rev = "56359312644f76941de1878d33a1a0b840be8056"; - hash = "sha256-8SFYRJSvX8hmsHBgaLUfhLUV7d54im22ETZds1eASc4="; + rev = "4730fa6b835f08c44bd7991cc8b264fbc27d752b"; + hash = "sha256-XOhZWdmkMAuXbj7svILJI3wI7RF9OAb/OE1uGel4/vE="; }; nativeBuildInputs = [ @@ -30,15 +30,15 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - meta = with lib; { + meta = { homepage = "http://harelang.org/"; description = "Bootstrapping Hare compiler written in C for POSIX systems"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ AndersonTorres ]; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.AndersonTorres ]; # The upstream developers do not like proprietary operating systems; see # https://harelang.org/platforms/ - platforms = with platforms; + platforms = with lib.platforms; lib.intersectLists (freebsd ++ linux) (aarch64 ++ x86_64 ++ riscv64); - badPlatforms = with platforms; darwin; + badPlatforms = lib.platforms.darwin; }; }) From ad966da3478fd7c9ad6327565b7cabb37de33d0c Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Thu, 9 Feb 2023 23:50:44 -0300 Subject: [PATCH 183/207] harePackages.hare: 2022-07-30 -> 2023-02-10 --- ...ch => 000-disable-failing-test-cases.diff} | 0 .../compilers/hare/hare/config-template.mk | 17 ++++++++++++++ .../compilers/hare/hare/default.nix | 23 +++++++++++-------- 3 files changed, 31 insertions(+), 9 deletions(-) rename pkgs/development/compilers/hare/hare/{disable-failing-test-cases.patch => 000-disable-failing-test-cases.diff} (100%) diff --git a/pkgs/development/compilers/hare/hare/disable-failing-test-cases.patch b/pkgs/development/compilers/hare/hare/000-disable-failing-test-cases.diff similarity index 100% rename from pkgs/development/compilers/hare/hare/disable-failing-test-cases.patch rename to pkgs/development/compilers/hare/hare/000-disable-failing-test-cases.diff diff --git a/pkgs/development/compilers/hare/hare/config-template.mk b/pkgs/development/compilers/hare/hare/config-template.mk index 1d0783b118d3..b3b0f535915a 100644 --- a/pkgs/development/compilers/hare/hare/config-template.mk +++ b/pkgs/development/compilers/hare/hare/config-template.mk @@ -25,3 +25,20 @@ SCDOC = scdoc # Where to store build artifacts # set HARECACHE externally + +# Cross-compiler toolchains +# # TODO: fixup this +AARCH64_AS=aarch64-as +AARCH64_AR=aarch64-ar +AARCH64_CC=aarch64-cc +AARCH64_LD=aarch64-ld + +RISCV64_AS=riscv64-as +RISCV64_AR=riscv64-ar +RISCV64_CC=riscv64-cc +RISCV64_LD=riscv64-ld + +X86_64_AS=as +X86_64_AR=ar +X86_64_CC=cc +X86_64_LD=ld diff --git a/pkgs/development/compilers/hare/hare/default.nix b/pkgs/development/compilers/hare/hare/default.nix index 2c6b8da6e342..342a85933834 100644 --- a/pkgs/development/compilers/hare/hare/default.nix +++ b/pkgs/development/compilers/hare/hare/default.nix @@ -2,25 +2,30 @@ , stdenv , fetchFromSourcehut , binutils-unwrapped -, harec +, harePackages , makeWrapper , qbe , scdoc , substituteAll }: -stdenv.mkDerivation (finalAttrs: { +let + inherit (harePackages) harec; +in +stdenv.mkDerivation (self: { pname = "hare"; - version = "unstable-2022-07-30"; + version = "unstable-2023-02-10"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "hare"; - rev = "296925c91d79362d6b8ac94e0336a38e9af0f1c9"; - hash = "sha256-LeIUnpTMZ6vxgAy/LPm9/IMit41RgezdVESIv+gQFHc="; + rev = "52b3f2d0c7a85e04a79666a954101e527b7f1272"; + hash = "sha256-/zP8LbZ113Ar06MZF1zP20LKMGko+4HcOXSntLVAQAU="; }; - patches = [ ./disable-failing-test-cases.patch ]; + patches = [ + ./000-disable-failing-test-cases.diff + ]; nativeBuildInputs = [ binutils-unwrapped @@ -86,12 +91,12 @@ stdenv.mkDerivation (finalAttrs: { setupHook = ./setup-hook.sh; - meta = with lib; { + meta = { homepage = "http://harelang.org/"; description = "A systems programming language designed to be simple, stable, and robust"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ AndersonTorres ]; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.AndersonTorres ]; inherit (harec.meta) platforms badPlatforms; }; }) From 45d1e00708a24558adf3da3c86bf18be61799d15 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 11 Feb 2023 12:51:10 -0300 Subject: [PATCH 184/207] harePackages.hare: mark as broken on ARM64 --- pkgs/development/compilers/hare/hare/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/hare/hare/default.nix b/pkgs/development/compilers/hare/hare/default.nix index 342a85933834..c1d5e7800c95 100644 --- a/pkgs/development/compilers/hare/hare/default.nix +++ b/pkgs/development/compilers/hare/hare/default.nix @@ -98,5 +98,6 @@ stdenv.mkDerivation (self: { license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.AndersonTorres ]; inherit (harec.meta) platforms badPlatforms; + broken = stdenv.isAarch64; # still figuring how to set cross-compiling stuff }; }) From 989a1a6ef5cb048daecc0101d438b26f7684f0f1 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Thu, 9 Feb 2023 09:39:38 +0100 Subject: [PATCH 185/207] nixos/envoy: use lists in `serviceConfig` where appropriate Using type `list` instead of `str` in `serviceConfig` entries which accept multiple values allows easier extension of the unit configuration. --- nixos/modules/services/networking/envoy.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/networking/envoy.nix b/nixos/modules/services/networking/envoy.nix index 20cfebb79914..c6817f12f1b8 100644 --- a/nixos/modules/services/networking/envoy.nix +++ b/nixos/modules/services/networking/envoy.nix @@ -56,16 +56,16 @@ in ExecStart = "${pkgs.envoy}/bin/envoy -c ${validateConfig conf}"; DynamicUser = true; Restart = "no"; - CacheDirectory = "envoy"; - LogsDirectory = "envoy"; - AmbientCapabilities = "CAP_NET_BIND_SERVICE"; - CapabilityBoundingSet = "CAP_NET_BIND_SERVICE"; - RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6 AF_NETLINK AF_XDP"; + CacheDirectory = [ "envoy" ]; + LogsDirectory = [ "envoy" ]; + AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; + CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" "AF_NETLINK" "AF_XDP" ]; SystemCallArchitectures = "native"; LockPersonality = true; RestrictNamespaces = true; RestrictRealtime = true; - PrivateUsers = false; # breaks CAP_NET_BIND_SERVICE + PrivateUsers = false; # breaks CAP_NET_BIND_SERVICE PrivateDevices = true; ProtectClock = true; ProtectControlGroups = true; @@ -77,7 +77,7 @@ in ProtectHostname = true; ProtectSystem = "strict"; UMask = "0066"; - SystemCallFilter = "~@clock @module @mount @reboot @swap @obsolete @cpu-emulation"; + SystemCallFilter = [ "~@clock" "~@module" "~@mount" "~@reboot" "~@swap" "~@obsolete" "~@cpu-emulation" ]; }; }; }; From 8fff553f7efbcc0a065c2e494274013731016ffe Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Thu, 9 Feb 2023 09:48:02 +0100 Subject: [PATCH 186/207] nixos/envoy: sort `serviceConfig` entries --- nixos/modules/services/networking/envoy.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/networking/envoy.nix b/nixos/modules/services/networking/envoy.nix index c6817f12f1b8..f41eaa62425e 100644 --- a/nixos/modules/services/networking/envoy.nix +++ b/nixos/modules/services/networking/envoy.nix @@ -54,30 +54,31 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { ExecStart = "${pkgs.envoy}/bin/envoy -c ${validateConfig conf}"; - DynamicUser = true; - Restart = "no"; CacheDirectory = [ "envoy" ]; LogsDirectory = [ "envoy" ]; + Restart = "no"; + # Hardening AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; - RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" "AF_NETLINK" "AF_XDP" ]; - SystemCallArchitectures = "native"; + DynamicUser = true; LockPersonality = true; - RestrictNamespaces = true; - RestrictRealtime = true; - PrivateUsers = false; # breaks CAP_NET_BIND_SERVICE PrivateDevices = true; + PrivateUsers = false; # breaks CAP_NET_BIND_SERVICE ProtectClock = true; ProtectControlGroups = true; ProtectHome = true; + ProtectHostname = true; ProtectKernelLogs = true; ProtectKernelModules = true; ProtectKernelTunables = true; ProtectProc = "ptraceable"; - ProtectHostname = true; ProtectSystem = "strict"; - UMask = "0066"; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" "AF_NETLINK" "AF_XDP" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; SystemCallFilter = [ "~@clock" "~@module" "~@mount" "~@reboot" "~@swap" "~@obsolete" "~@cpu-emulation" ]; + UMask = "0066"; }; }; }; From a36fc1d72afcb5cba99c516432a1a26240aa0be8 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Thu, 9 Feb 2023 11:22:06 +0100 Subject: [PATCH 187/207] nixosTests.envoy: use port 80 to test `CAP_NET_BIND_SERVICE` --- nixos/tests/envoy.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/envoy.nix b/nixos/tests/envoy.nix index 9d2c32ce102f..a14c1fca3bb5 100644 --- a/nixos/tests/envoy.nix +++ b/nixos/tests/envoy.nix @@ -13,7 +13,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { socket_address = { protocol = "TCP"; address = "127.0.0.1"; - port_value = 9901; + port_value = 80; }; }; }; @@ -27,7 +27,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { testScript = '' machine.start() machine.wait_for_unit("envoy.service") - machine.wait_for_open_port(9901) - machine.wait_until_succeeds("curl -fsS localhost:9901/ready") + machine.wait_for_open_port(80) + machine.wait_until_succeeds("curl -fsS localhost:80/ready") ''; }) From 3c3da8768be059beae12c87173146666c81c55ca Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Thu, 9 Feb 2023 09:54:48 +0100 Subject: [PATCH 188/207] nixos/envoy: further service hardening --- nixos/modules/services/networking/envoy.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/envoy.nix b/nixos/modules/services/networking/envoy.nix index f41eaa62425e..7552234f1ee0 100644 --- a/nixos/modules/services/networking/envoy.nix +++ b/nixos/modules/services/networking/envoy.nix @@ -60,10 +60,14 @@ in # Hardening AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; + DeviceAllow = [ "" ]; + DevicePolicy = "closed"; DynamicUser = true; LockPersonality = true; + MemoryDenyWriteExecute = false; # at least wasmr needs WX permission PrivateDevices = true; PrivateUsers = false; # breaks CAP_NET_BIND_SERVICE + ProcSubset = "pid"; ProtectClock = true; ProtectControlGroups = true; ProtectHome = true; @@ -77,7 +81,8 @@ in RestrictNamespaces = true; RestrictRealtime = true; SystemCallArchitectures = "native"; - SystemCallFilter = [ "~@clock" "~@module" "~@mount" "~@reboot" "~@swap" "~@obsolete" "~@cpu-emulation" ]; + SystemCallErrorNumber = "EPERM"; + SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ]; UMask = "0066"; }; }; From 84220a70983948dd611f0cfdecb70ffe02556312 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Thu, 9 Feb 2023 12:08:52 +0100 Subject: [PATCH 189/207] nixos/envoy: add `package` option --- nixos/modules/services/networking/envoy.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/envoy.nix b/nixos/modules/services/networking/envoy.nix index 7552234f1ee0..3e2616185500 100644 --- a/nixos/modules/services/networking/envoy.nix +++ b/nixos/modules/services/networking/envoy.nix @@ -8,7 +8,7 @@ let conf = format.generate "envoy.json" cfg.settings; validateConfig = file: pkgs.runCommand "validate-envoy-conf" { } '' - ${pkgs.envoy}/bin/envoy --log-level error --mode validate -c "${file}" + ${cfg.package}/bin/envoy --log-level error --mode validate -c "${file}" cp "${file}" "$out" ''; @@ -18,6 +18,8 @@ in options.services.envoy = { enable = mkEnableOption (lib.mdDoc "Envoy reverse proxy"); + package = mkPackageOptionMD pkgs "envoy" { }; + settings = mkOption { type = format.type; default = { }; @@ -46,14 +48,14 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.envoy ]; + environment.systemPackages = [ cfg.package ]; systemd.services.envoy = { description = "Envoy reverse proxy"; after = [ "network-online.target" ]; requires = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.envoy}/bin/envoy -c ${validateConfig conf}"; + ExecStart = "${cfg.package}/bin/envoy -c ${validateConfig conf}"; CacheDirectory = [ "envoy" ]; LogsDirectory = [ "envoy" ]; Restart = "no"; From 8dade1f713c7f64f0514ba4c00fa6e2bb1be8d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20St=C3=BChrk?= Date: Thu, 9 Feb 2023 12:19:58 +0100 Subject: [PATCH 190/207] nixos/envoy: add option `requireValidConfig` to make config validation errors non-fatal Co-authored-by: Vincent Haupert --- nixos/modules/services/networking/envoy.nix | 17 ++++++++--- nixos/tests/envoy.nix | 33 +++++++++++++++++---- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/networking/envoy.nix b/nixos/modules/services/networking/envoy.nix index 3e2616185500..c68ceab9619c 100644 --- a/nixos/modules/services/networking/envoy.nix +++ b/nixos/modules/services/networking/envoy.nix @@ -6,12 +6,11 @@ let cfg = config.services.envoy; format = pkgs.formats.json { }; conf = format.generate "envoy.json" cfg.settings; - validateConfig = file: + validateConfig = required: file: pkgs.runCommand "validate-envoy-conf" { } '' - ${cfg.package}/bin/envoy --log-level error --mode validate -c "${file}" + ${cfg.package}/bin/envoy --log-level error --mode validate -c "${file}" ${lib.optionalString (!required) "|| true"} cp "${file}" "$out" ''; - in { @@ -20,6 +19,16 @@ in package = mkPackageOptionMD pkgs "envoy" { }; + requireValidConfig = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + Whether a failure during config validation at build time is fatal. + When the config can't be checked during build time, for example when it includes + other files, disable this option. + ''; + }; + settings = mkOption { type = format.type; default = { }; @@ -55,7 +64,7 @@ in requires = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${cfg.package}/bin/envoy -c ${validateConfig conf}"; + ExecStart = "${cfg.package}/bin/envoy -c ${validateConfig cfg.requireValidConfig conf}"; CacheDirectory = [ "envoy" ]; LogsDirectory = [ "envoy" ]; Restart = "no"; diff --git a/nixos/tests/envoy.nix b/nixos/tests/envoy.nix index a14c1fca3bb5..1e4bfe626398 100644 --- a/nixos/tests/envoy.nix +++ b/nixos/tests/envoy.nix @@ -22,12 +22,33 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { clusters = []; }; }; + specialisation = { + withoutConfigValidation.configuration = { ... }: { + services.envoy = { + requireValidConfig = false; + settings.admin.access_log_path = lib.mkForce "/var/log/envoy/access.log"; + }; + }; + }; }; - testScript = '' - machine.start() - machine.wait_for_unit("envoy.service") - machine.wait_for_open_port(80) - machine.wait_until_succeeds("curl -fsS localhost:80/ready") - ''; + testScript = { nodes, ... }: + let + specialisations = "${nodes.machine.system.build.toplevel}/specialisation"; + in + '' + machine.start() + + with subtest("envoy.service starts and responds with ready"): + machine.wait_for_unit("envoy.service") + machine.wait_for_open_port(80) + machine.wait_until_succeeds("curl -fsS localhost:80/ready") + + with subtest("envoy.service works with config path not available at eval time"): + machine.succeed('${specialisations}/withoutConfigValidation/bin/switch-to-configuration test') + machine.wait_for_unit("envoy.service") + machine.wait_for_open_port(80) + machine.wait_until_succeeds("curl -fsS localhost:80/ready") + machine.succeed('test -f /var/log/envoy/access.log') + ''; }) From f831445c5d645fb37027a1fbfd8548f5fb490bb6 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Fri, 10 Feb 2023 15:59:24 -0600 Subject: [PATCH 191/207] gometer: remove --- pkgs/applications/misc/gometer/default.nix | 48 ---------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 pkgs/applications/misc/gometer/default.nix diff --git a/pkgs/applications/misc/gometer/default.nix b/pkgs/applications/misc/gometer/default.nix deleted file mode 100644 index 8c68f8672c3b..000000000000 --- a/pkgs/applications/misc/gometer/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchurl, rpmextract, wrapGAppsHook, nwjs }: - -stdenv.mkDerivation rec { - pname = "gometer"; - version = "5.2.0"; - - src = fetchurl { - url = "https://gometer-prod-new-apps.s3-accelerate.amazonaws.com/${version}/goMeter-linux64.rpm"; - sha256 = "sha256-E53sVvneW2EMPz9HNCgbGuHnDlVihE+Lf+DkFIP+j28="; - }; - - nativeBuildInputs = [ - rpmextract - wrapGAppsHook - ]; - - dontBuild = true; - dontConfigure = true; - - unpackPhase = '' - rpmextract ${src} - ''; - - installPhase = '' - runHook preInstall - - mv usr $out - mv opt $out - - mkdir $out/share/applications - mv $out/opt/goMeter/goMeter.desktop $out/share/applications/gometer.desktop - substituteInPlace $out/share/applications/gometer.desktop \ - --replace '/opt/goMeter/' "" - - makeWrapper ${nwjs}/bin/nw $out/bin/goMeter \ - --add-flags $out/opt/goMeter/package.nw - - runHook postInstall - ''; - - meta = with lib; { - description = "Analytic-Tracking tool for GoLance"; - homepage = "https://golance.com/download-gometer"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ wolfangaukang ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 818abd1e3672..e21c14874964 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -582,6 +582,7 @@ mapAliases ({ go-mk = throw "go-mk has been dropped due to the lack of maintanence from upstream since 2015"; # Added 2022-06-02 go-pup = throw "'go-pup' has been renamed to/replaced by 'pup'"; # Converted to throw 2022-02-22 go-repo-root = throw "go-repo-root has been dropped due to the lack of maintanence from upstream since 2014"; # Added 2022-06-02 + gometer = throw "gometer has been removed from nixpkgs because goLance stopped offering Linux support"; # Added 2023-02-10 gpgstats = throw "gpgstats has been removed: upstream is gone"; # Added 2022-02-06 gpshell = throw "gpshell has been removed, because it was unmaintained in nixpkgs"; # added 2021-12-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0f76053ee29..1ec362f90cff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25803,8 +25803,6 @@ with pkgs; gmailctl = callPackage ../applications/networking/gmailctl { }; - gometer = callPackage ../applications/misc/gometer { }; - gomp = callPackage ../applications/version-management/gomp { }; gomplate = callPackage ../development/tools/gomplate { }; From 4734c1fce6b123dd65bf5d3cd11debb48932e3d9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 Feb 2023 10:24:03 -0800 Subject: [PATCH 192/207] cwltool: 3.1.20230201130431 -> 3.1.20230209161050 (#215856) --- pkgs/applications/science/misc/cwltool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix index 8ac8adcbf594..815ccc6cc249 100644 --- a/pkgs/applications/science/misc/cwltool/default.nix +++ b/pkgs/applications/science/misc/cwltool/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cwltool"; - version = "3.1.20230201130431"; + version = "3.1.20230209161050"; format = "setuptools"; src = fetchFromGitHub { owner = "common-workflow-language"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rx5rdB8OgJ7Mck3pm1GRrymZbQ3lHlXFecICb/pbnKg="; + hash = "sha256-gc/KSJS3KcxXc3xDyJSXavaxtwhKBiihgdI7yc7d2I8="; }; postPatch = '' From 4e5dac05750620ef5d96c5b6e02d352d815710f5 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 11 Feb 2023 19:13:32 +0000 Subject: [PATCH 193/207] v8: add homepage --- pkgs/development/libraries/v8/8_x.nix | 1 + pkgs/development/libraries/v8/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/libraries/v8/8_x.nix b/pkgs/development/libraries/v8/8_x.nix index b5184bafcbff..2d260b2042cd 100644 --- a/pkgs/development/libraries/v8/8_x.nix +++ b/pkgs/development/libraries/v8/8_x.nix @@ -162,6 +162,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "https://v8.dev/"; description = "Google's open source JavaScript engine"; maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 7ca5080cb74c..7cdad40d9701 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -171,6 +171,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "https://v8.dev/"; description = "Google's open source JavaScript engine"; maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ]; platforms = platforms.unix; From b5afd5924dbda626d1c70902bfaa21a74fd3766d Mon Sep 17 00:00:00 2001 From: Sandro Date: Sat, 11 Feb 2023 21:03:21 +0100 Subject: [PATCH 194/207] dino: 0.3.1 -> 0.4.0 (#215211) https://github.com/dino/dino/releases/tag/v0.4.0 Switched to gtk4, cleaned up dependencies and tested in a MUC. --- .../instant-messengers/dino/default.nix | 67 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 41 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 5a65b43a8acb..d9288c4a4464 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -1,37 +1,48 @@ { lib, stdenv, fetchFromGitHub , vala, cmake, ninja, wrapGAppsHook, pkg-config, gettext -, gobject-introspection, gnome, glib, gdk-pixbuf, gtk3, glib-networking -, xorg, libXdmcp, libxkbcommon +, gobject-introspection, glib, gdk-pixbuf, gtk4, glib-networking +, libadwaita , libnotify, libsoup, libgee -, librsvg, libsignal-protocol-c +, libsignal-protocol-c , libgcrypt -, libepoxy -, at-spi2-core , sqlite -, dbus , gpgme -, pcre +, pcre2 , qrencode , icu , gspell -, srtp, libnice, gnutls, gstreamer, gst-plugins-base, gst-plugins-good, webrtc-audio-processing - }: +, srtp +, libnice +, gnutls +, gstreamer +, gst-plugins-base +, gst-plugins-good +, gst-plugins-bad +, gst-vaapi +, webrtc-audio-processing +}: stdenv.mkDerivation rec { pname = "dino"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; rev = "v${version}"; - sha256 = "sha256-wjSgs1mUMV7j/8ZeXqWs8aOeWvJHwKziUfbtOC1HS3s="; + sha256 = "sha256-FZ7MVeVxIzxzSQi5G9y+nn487pKLcXEZV1JK9mCY2MQ="; }; + postPatch = '' + # don't overwrite manually set version information + substituteInPlace CMakeLists.txt \ + --replace "include(ComputeVersion)" "" + ''; + nativeBuildInputs = [ vala cmake - ninja + ninja # https://github.com/dino/dino/issues/230 pkg-config wrapGAppsHook gettext @@ -40,40 +51,42 @@ stdenv.mkDerivation rec { buildInputs = [ qrencode gobject-introspection - glib-networking glib + glib-networking # required for TLS support + libadwaita libgee - gnome.adwaita-icon-theme sqlite gdk-pixbuf - gtk3 + gtk4 libnotify gpgme libgcrypt libsoup - pcre - libepoxy - at-spi2-core - dbus + pcre2 icu libsignal-protocol-c - librsvg gspell srtp libnice gnutls gstreamer gst-plugins-base - gst-plugins-good + gst-plugins-good # contains rtpbin, required for VP9 + gst-plugins-bad # required for H264, MSDK + gst-vaapi # required for VAAPI webrtc-audio-processing - ] ++ lib.optionals (!stdenv.isDarwin) [ - xorg.libxcb - xorg.libpthreadstubs - libXdmcp - libxkbcommon ]; - cmakeFlags = ["-DBUILD_TESTS=yes"]; + cmakeFlags = [ + "-DBUILD_TESTS=true" + "-DRTP_ENABLE_H264=true" + "-DRTP_ENABLE_MSDK=true" + "-DRTP_ENABLE_VAAPI=true" + "-DRTP_ENABLE_VP9=true" + "-DVERSION_FOUND=true" + "-DVERSION_IS_RELEASE=true" + "-DVERSION_FULL=${version}" + ]; # Undefined symbols for architecture arm64: "_gpg_strerror" NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lgpg-error"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ec362f90cff..46a945f44f44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4408,7 +4408,7 @@ with pkgs; ditaa = callPackage ../tools/graphics/ditaa { }; dino = callPackage ../applications/networking/instant-messengers/dino { - inherit (gst_all_1) gstreamer gst-plugins-base; + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad gst-vaapi; gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; }; From 43659969168b73cf525279484f058351456585f3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 11 Feb 2023 20:16:22 +0000 Subject: [PATCH 195/207] mirakurun: add license --- pkgs/applications/video/mirakurun/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mirakurun/default.nix b/pkgs/applications/video/mirakurun/default.nix index d0d52ade25ad..ce4d412b77f8 100644 --- a/pkgs/applications/video/mirakurun/default.nix +++ b/pkgs/applications/video/mirakurun/default.nix @@ -86,8 +86,9 @@ stdenvNoCC.mkDerivation rec { yarn2nix; }; - meta = { + meta = with lib; { inherit (mirakurun.meta) description platforms; - maintainers = with lib.maintainers; [ midchildan ]; + license = licenses.asl20; + maintainers = with maintainers; [ midchildan ]; }; } From 519f9b3d298e84a6ad2efda06d166203681cac33 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 11 Feb 2023 19:06:16 +0000 Subject: [PATCH 196/207] v8_8_x: mark broken with GCC 12 --- pkgs/development/libraries/v8/8_x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/v8/8_x.nix b/pkgs/development/libraries/v8/8_x.nix index 2d260b2042cd..b467bd83e2d4 100644 --- a/pkgs/development/libraries/v8/8_x.nix +++ b/pkgs/development/libraries/v8/8_x.nix @@ -167,5 +167,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ]; platforms = platforms.unix; license = licenses.bsd3; + broken = lib.versionAtLeast stdenv.cc.version "12"; }; } From 77dbe93d0d2c56e129fcb99255929131fb816cfb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Feb 2023 20:41:31 +0000 Subject: [PATCH 197/207] python310Packages.pyvisa-py: 0.6.1 -> 0.6.2 --- pkgs/development/python-modules/pyvisa-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvisa-py/default.nix b/pkgs/development/python-modules/pyvisa-py/default.nix index bd5b31869cba..d4b3d70b72a9 100644 --- a/pkgs/development/python-modules/pyvisa-py/default.nix +++ b/pkgs/development/python-modules/pyvisa-py/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyvisa-py"; - version = "0.6.1"; + version = "0.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pyvisa"; repo = "pyvisa-py"; rev = "refs/tags/${version}"; - hash = "sha256-cXxiT/PWDf5WV+s8GbEA2u+1dPyfUKu19IQ2+Q4GTqM="; + hash = "sha256-2jNf/jmqpAE4GoX7xGvQTr0MF/UalIWDMAQHUq+B4v4="; }; nativeBuildInputs = [ From cbff2010dec85ec733dd243b077a25b9f09ab20e Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Wed, 1 Feb 2023 15:38:11 +0100 Subject: [PATCH 198/207] pjsip: add pythonSupport option --- pkgs/applications/networking/pjsip/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index eae9a8a3d87a..781b8462a392 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -4,8 +4,11 @@ , fetchpatch , openssl , libsamplerate +, swig , alsa-lib , AppKit +, python3 +, pythonSupport ? true }: stdenv.mkDerivation rec { @@ -33,6 +36,9 @@ stdenv.mkDerivation rec { }) ]; + nativeBuildInputs = + lib.optionals pythonSupport [ swig python3 ]; + buildInputs = [ openssl libsamplerate ] ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optional stdenv.isDarwin AppKit; @@ -41,11 +47,22 @@ stdenv.mkDerivation rec { export LD=$CC ''; + postBuild = lib.optionalString pythonSupport '' + make -C pjsip-apps/src/swig/python + ''; + + outputs = [ "out" ] + ++ lib.optional pythonSupport "py"; + postInstall = '' mkdir -p $out/bin cp pjsip-apps/bin/pjsua-* $out/bin/pjsua mkdir -p $out/share/${pname}-${version}/samples cp pjsip-apps/bin/samples/*/* $out/share/${pname}-${version}/samples + '' + lib.optionalString pythonSupport '' + (cd pjsip-apps/src/swig/python && \ + python setup.py install --prefix=$py + ) ''; # We need the libgcc_s.so.1 loadable (for pthread_cancel to work) From 237abc78ec6bd915207a481f7b8f1f8941a9624f Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Fri, 3 Feb 2023 15:17:26 +0100 Subject: [PATCH 199/207] pythonPackages: pjsua2: init pjsua2 from pjsip --- pkgs/top-level/python-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c672707b90ef..741d6b653ec1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7174,6 +7174,11 @@ self: super: with self; { pixelmatch = callPackage ../development/python-modules/pixelmatch { }; + pjsua2 = (toPythonModule (pkgs.pjsip.override { + pythonSupport = true; + python3 = self.python; + })).py; + pkce = callPackage ../development/python-modules/pkce { }; pkgconfig = callPackage ../development/python-modules/pkgconfig { }; From c2a0dc782d5036dd71302d83ea9e79109442dd17 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Fri, 3 Feb 2023 15:17:47 +0100 Subject: [PATCH 200/207] pjsip: enable building shared libraries --- pkgs/applications/networking/pjsip/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 781b8462a392..33747e2d669b 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -54,6 +54,8 @@ stdenv.mkDerivation rec { outputs = [ "out" ] ++ lib.optional pythonSupport "py"; + configureFlags = [ "--enable-shared" ]; + postInstall = '' mkdir -p $out/bin cp pjsip-apps/bin/pjsua-* $out/bin/pjsua From 829b777f5309827eb22e5044fa24c7bb5c9a0ea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 11 Feb 2023 12:21:48 -0800 Subject: [PATCH 201/207] python310Packages.torch-bin: correct meta.platforms --- pkgs/development/python-modules/torch/bin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix index e9018c123d46..6e66aa75b068 100644 --- a/pkgs/development/python-modules/torch/bin.nix +++ b/pkgs/development/python-modules/torch/bin.nix @@ -76,7 +76,7 @@ in buildPythonPackage { # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html license = licenses.bsd3; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; hydraPlatforms = []; # output size 3.2G on 1.11.0 maintainers = with maintainers; [ junjihashimoto ]; }; From b9acfcab07bb0d3d8b50152a9cfd2e7e5e2d970b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 11 Feb 2023 13:02:00 -0800 Subject: [PATCH 202/207] python310Packages.home-assistant-chip-core: correct meta.platforms --- .../python-modules/home-assistant-chip-core/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix index c5c199f50539..a3a8cf93b810 100644 --- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -87,7 +87,7 @@ buildPythonPackage rec { homepage = "https://github.com/home-assistant-libs/chip-wheels"; license = licenses.asl20; maintainers = teams.home-assistant.members; - platforms = platforms.linux; + platforms = [ "aarch64-linux" "x86_64-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } From e93108d02724d8455818fea6736c64f8d4074a64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 11 Feb 2023 13:08:39 -0800 Subject: [PATCH 203/207] python310Packages.torchaudio-bin: correct meta.platforms --- pkgs/development/python-modules/torchaudio/bin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index f3656aa0a46f..f840b10e2b87 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html license = licenses.bsd3; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ junjihashimoto ]; }; } From 6615030dddd11222fc54e61f2f128793d5a72ad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 11 Feb 2023 13:10:43 -0800 Subject: [PATCH 204/207] python310Packages.torchvision-bin: correct meta.platforms --- pkgs/development/python-modules/torchvision/bin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index afa862ab4778..3c7aa4bb6248 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -61,7 +61,7 @@ in buildPythonPackage { # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html license = licenses.bsd3; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ junjihashimoto ]; }; } From 78367ae5cbc49899e69c3d58ed83df264e583528 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 8 Feb 2023 20:01:43 +0000 Subject: [PATCH 205/207] ocaml-ng.ocamlPackages_4_09.ocaml: fix with GCC 12 --- .../compilers/ocaml/4.09.1-Werror.patch | 16 ++++++++++++++++ pkgs/development/compilers/ocaml/4.09.nix | 1 + 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/compilers/ocaml/4.09.1-Werror.patch diff --git a/pkgs/development/compilers/ocaml/4.09.1-Werror.patch b/pkgs/development/compilers/ocaml/4.09.1-Werror.patch new file mode 100644 index 000000000000..153c8a06e34e --- /dev/null +++ b/pkgs/development/compilers/ocaml/4.09.1-Werror.patch @@ -0,0 +1,16 @@ +The 4.09.1 tarball appears to have been acidentally generated as a +development tarball, which causes configure to enable -Werror. This +means newer compilers will make the build fail. + +diff a/configure b/configure +--- a/configure ++++ b/configure +@@ -12360,7 +12360,7 @@ case $ocaml_cv_cc_vendor in #( + msvc-*) : + outputobj=-Fo; CPP="cl -nologo -EP"; gcc_warnings="" ;; #( + *) : +- outputobj='-o $(EMPTY)'; case 4.09.1+dev1-2020-03-13 in #( ++ outputobj='-o $(EMPTY)'; case 4.09.1 in #( + *+dev*) : + gcc_warnings="-Wall -Werror" ;; #( + *) : diff --git a/pkgs/development/compilers/ocaml/4.09.nix b/pkgs/development/compilers/ocaml/4.09.nix index c5f649c15d6b..2d0672093905 100644 --- a/pkgs/development/compilers/ocaml/4.09.nix +++ b/pkgs/development/compilers/ocaml/4.09.nix @@ -8,6 +8,7 @@ import ./generic.nix { hardeningDisable = [ "strictoverflow" ]; patches = [ + ./4.09.1-Werror.patch # Compatibility with Glibc 2.34 { url = "https://github.com/ocaml/ocaml/commit/8eed2e441222588dc385a98ae8bd6f5820eb0223.patch"; sha256 = "sha256:1b3jc6sj2k23yvfwrv6nc1f4x2n2biqbhbbp74aqb6iyqyjsq35n"; } From 0492d670913ebec88564b2f99e8a32a480db9340 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Feb 2023 22:19:29 +0000 Subject: [PATCH 206/207] python310Packages.aiolifx: 0.8.7 -> 0.8.9 --- pkgs/development/python-modules/aiolifx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index 6cae53c1bce8..4c5ea7191940 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiolifx"; - version = "0.8.7"; + version = "0.8.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pqneX4O3BnDH7vT7RgFiEIMpLcoXOpBvKOYuMla3Iq4="; + hash = "sha256-Ih82dNDZd3sbGHhxDTtzJQXkjn6Pgefb0S24gttiOO8="; }; propagatedBuildInputs = [ From 73ef12485825a2d793a5241cd9602b30a4bb21d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Feb 2023 22:50:10 +0000 Subject: [PATCH 207/207] python310Packages.vertica-python: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/vertica-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix index 1bd12d4a3dc2..11bf821e0e6c 100644 --- a/pkgs/development/python-modules/vertica-python/default.nix +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "vertica-python"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zfeXJJL5pWzv9y39MWHYZggBRBAPGJItUKKaxp8MlRM="; + hash = "sha256-UC8RkZCRodsK4DV0Pnn2jUohM7pNiqGWrbjWlDqn72I="; }; propagatedBuildInputs = [