From 10ac9199553f17ad22e5f92e37e329126d6de951 Mon Sep 17 00:00:00 2001 From: Jason Yundt Date: Sat, 17 Feb 2024 20:55:58 -0500 Subject: [PATCH 001/617] ecwolf: add passthru.updateScript Before this change, nixpkgs-update had to rely on on Repology in order to determine if there was an ECWolf update. When it comes to ECWolf updates, Repology is a tertiary source of information. This change allows nixpkgs-update (and any other tools) to use debian.drdteam.org to determine if there is an ECWolf update. When it comes to ECWolf updates, debian.drdteam.org is a primary source of information. --- pkgs/games/ecwolf/default.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/pkgs/games/ecwolf/default.nix b/pkgs/games/ecwolf/default.nix index 542b414d8a45..323edaa037d3 100644 --- a/pkgs/games/ecwolf/default.nix +++ b/pkgs/games/ecwolf/default.nix @@ -12,6 +12,9 @@ , SDL2_net , SDL2_mixer , gtk3 +, writers +, python3Packages +, nix-update }: stdenv.mkDerivation rec { @@ -41,6 +44,33 @@ stdenv.mkDerivation rec { makeWrapper $out/{Applications/ecwolf.app/Contents/MacOS,bin}/ecwolf ''; + passthru.updateScript = let + updateScriptPkg = writers.writePython3 "ecwolf_update_script" { + libraries = with python3Packages; [ debian-inspector requests ]; + } '' + from os import execl + from sys import argv + + from debian_inspector.debcon import get_paragraphs_data + from requests import get + + # The debian.drdteam.org repo is a primary source of information. It’s + # run by Blzut3, the creator and primary developer of ECWolf. It’s also + # listed on ECWolf’s download page: + # . + url = 'https://debian.drdteam.org/dists/stable/multiverse/binary-amd64/Packages' # noqa: E501 + response = get(url) + packages = get_paragraphs_data(response.text) + for package in packages: + if package['package'] == 'ecwolf': + latest_version = package['version'] + break + nix_update_path = argv[1] + + execl(nix_update_path, nix_update_path, '--version', latest_version) + ''; + in [ updateScriptPkg (lib.getExe nix-update) ]; + meta = with lib; { description = "Enhanched SDL-based port of Wolfenstein 3D for various platforms"; homepage = "https://maniacsvault.net/ecwolf/"; From 34bdc3a46a5591dc82c08dc64e9a7b608973cd89 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sat, 25 May 2024 16:45:23 +0800 Subject: [PATCH 002/617] libchewing: move Nix expression under pkgs/by-name --- .../default.nix => by-name/li/libchewing/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/libchewing/default.nix => by-name/li/libchewing/package.nix} (100%) diff --git a/pkgs/development/libraries/libchewing/default.nix b/pkgs/by-name/li/libchewing/package.nix similarity index 100% rename from pkgs/development/libraries/libchewing/default.nix rename to pkgs/by-name/li/libchewing/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05aca9f4018f..0253ac57fa9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21910,8 +21910,6 @@ with pkgs; libchardet = callPackage ../development/libraries/libchardet { }; - libchewing = callPackage ../development/libraries/libchewing { }; - libchipcard = callPackage ../development/libraries/aqbanking/libchipcard.nix { }; libcrafter = callPackage ../development/libraries/libcrafter { }; From 222c7ca7a9d0102232f0ed8b9be7ace0f04175a5 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sat, 25 May 2024 15:46:19 +0800 Subject: [PATCH 003/617] libchewing: canonicalise unstable version naming Prefix the "unstable" (untagged) version with the previously tagged version number. --- pkgs/by-name/li/libchewing/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libchewing/package.nix b/pkgs/by-name/li/libchewing/package.nix index 7cfa864fc06f..e40cd9ddd52e 100644 --- a/pkgs/by-name/li/libchewing/package.nix +++ b/pkgs/by-name/li/libchewing/package.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libchewing"; - version = "unstable-2020-06-27"; + version = "0.5.1-unstable-2020-06-27"; src = fetchFromGitHub { owner = "chewing"; From b4a64193b1865659360e29bdb8ffed100e98c7c7 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sat, 25 May 2024 16:05:51 +0800 Subject: [PATCH 004/617] libchewing: use fixed-point arguments --- pkgs/by-name/li/libchewing/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libchewing/package.nix b/pkgs/by-name/li/libchewing/package.nix index e40cd9ddd52e..fc86406e4891 100644 --- a/pkgs/by-name/li/libchewing/package.nix +++ b/pkgs/by-name/li/libchewing/package.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, sqlite, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libchewing"; version = "0.5.1-unstable-2020-06-27"; @@ -22,4 +22,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.ericsagnes ]; platforms = platforms.linux; }; -} +}) From e3b4dd81b174bc891be7b9ef6a32a51c060dc5b2 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sat, 25 May 2024 16:10:01 +0800 Subject: [PATCH 005/617] libchewing: format .override set pattern --- pkgs/by-name/li/libchewing/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libchewing/package.nix b/pkgs/by-name/li/libchewing/package.nix index fc86406e4891..416013bab2f6 100644 --- a/pkgs/by-name/li/libchewing/package.nix +++ b/pkgs/by-name/li/libchewing/package.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, sqlite, cmake }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + sqlite, +}: stdenv.mkDerivation (finalAttrs: { pname = "libchewing"; From f193ae7b67325dc19da147f78d2a5db3c7254807 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sat, 25 May 2024 16:02:58 +0800 Subject: [PATCH 006/617] libchewing: 0.5.1-unstable-2020-06-27 -> 0.6.0 --- pkgs/by-name/li/libchewing/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libchewing/package.nix b/pkgs/by-name/li/libchewing/package.nix index 416013bab2f6..6c41a2c15c30 100644 --- a/pkgs/by-name/li/libchewing/package.nix +++ b/pkgs/by-name/li/libchewing/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libchewing"; - version = "0.5.1-unstable-2020-06-27"; + version = "0.6.0"; src = fetchFromGitHub { owner = "chewing"; repo = "libchewing"; - rev = "452f6221fbad90c0706a3963b17e226216e40dd7"; - sha256 = "sha256-w3/K2O/CU+XVzqzVCYJyq1vLgToN6iIUhJ9J7ia4p9E="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-X+4Rr5Mfc4qeJxmHczu4MKgHBvQN1rhqUrJSx8SFnDk="; }; buildInputs = [ sqlite ]; From d680a8aeb0eff0a891f5dde1eb1a603d37697047 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sat, 25 May 2024 16:27:21 +0800 Subject: [PATCH 007/617] libchewing: add ShamrockLee as a maintainer --- pkgs/by-name/li/libchewing/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libchewing/package.nix b/pkgs/by-name/li/libchewing/package.nix index 6c41a2c15c30..a4d5c57826a7 100644 --- a/pkgs/by-name/li/libchewing/package.nix +++ b/pkgs/by-name/li/libchewing/package.nix @@ -25,7 +25,10 @@ stdenv.mkDerivation (finalAttrs: { description = "Intelligent Chinese phonetic input method"; homepage = "https://chewing.im/"; license = licenses.lgpl21Only; - maintainers = [ maintainers.ericsagnes ]; + maintainers = with maintainers; [ + ericsagnes + ShamrockLee + ]; platforms = platforms.linux; }; }) From a7e4ae9c8c483e57c87d99efb526ecd5f6cf2826 Mon Sep 17 00:00:00 2001 From: Quantenzitrone Date: Wed, 5 Jun 2024 18:27:04 +0200 Subject: [PATCH 008/617] added linux_{default,latest} to linuxKernel.kernels this improves discoverability, as many users (including me) have been confused why only custom kernels are available fixes #260636 --- pkgs/top-level/linux-kernels.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 24eadff372f1..ea747650f21d 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -221,6 +221,10 @@ in { then latest else testing; + linux_default = packageAliases.linux_default.kernel; + + linux_latest = packageAliases.linux_latest.kernel; + # Using zenKernels like this due lqx&zen came from one source, but may have different base kernel version # https://github.com/NixOS/nixpkgs/pull/161773#discussion_r820134708 zenKernels = callPackage ../os-specific/linux/kernel/zen-kernels.nix; From e3835b2a2eb4b4452b6156074875ce46db4b31df Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Fri, 7 Jun 2024 00:52:48 +0800 Subject: [PATCH 009/617] libchewing: build on all platforms The upstream has documented the MacOS and Windows build process years ago. It therefore makes sense to remove the Linux-only platform specification. --- pkgs/by-name/li/libchewing/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libchewing/package.nix b/pkgs/by-name/li/libchewing/package.nix index a4d5c57826a7..5fe2d1090e8a 100644 --- a/pkgs/by-name/li/libchewing/package.nix +++ b/pkgs/by-name/li/libchewing/package.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation (finalAttrs: { ericsagnes ShamrockLee ]; - platforms = platforms.linux; + platforms = platforms.all; }; }) From 0f589144a1ac500d4b24a598fed8074851b15c57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Aug 2024 13:37:39 +0000 Subject: [PATCH 010/617] rust-bindgen-unwrapped: 0.69.4 -> 0.70.1 --- pkgs/development/tools/rust/bindgen/unwrapped.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix index a862878c9f7a..fa7484a1b041 100644 --- a/pkgs/development/tools/rust/bindgen/unwrapped.nix +++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -5,15 +5,15 @@ let rustfmt-nightly = rustfmt.override { asNightly = true; }; in rustPlatform.buildRustPackage rec { pname = "rust-bindgen-unwrapped"; - version = "0.69.4"; + version = "0.70.1"; src = fetchCrate { pname = "bindgen-cli"; inherit version; - hash = "sha256-5fwJq1WsL3IEcVUjsyqKdQU8VufbbPk6TglwJg3C1Gw="; + hash = "sha256-6FRcW/VGqlmLjb64UYqk21HmQ8u0AdVD3S2F+9D/vQo="; }; - cargoHash = "sha256-UROy/MyPBKJe+EaiUIDbOYKVbge0C9LsmfnsvOLEONE="; + cargoHash = "sha256-oTeIh5278nckh5fFaEFjWht11ovGmN80MaLJl4k4NAs="; buildInputs = [ clang.cc.lib ]; From 0bde84a250e62b422b2a23595a054d9ecf3445c3 Mon Sep 17 00:00:00 2001 From: Alex <12470950+alex-nt@users.noreply.github.com> Date: Sun, 18 Aug 2024 18:07:43 +0300 Subject: [PATCH 011/617] maintainers: add alex-nt --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index caf93f53b7e8..b4f146cd28c5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -949,6 +949,12 @@ github = "Alexnortung"; githubId = 1552267; }; + alex-nt = { + email = "nix@azuremyst.org"; + github = "alex-nt"; + githubId = 12470950; + name = "AN"; + }; alexoundos = { email = "alexoundos@gmail.com"; github = "AleXoundOS"; From 503bea4333cf5c6613d41e89a28ad05d6afd1a2e Mon Sep 17 00:00:00 2001 From: Alex <12470950+alex-nt@users.noreply.github.com> Date: Sun, 18 Aug 2024 18:07:51 +0300 Subject: [PATCH 012/617] python312Packages.better-exceptions: init at 0.3.3 --- .../better-exceptions/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/better-exceptions/default.nix diff --git a/pkgs/development/python-modules/better-exceptions/default.nix b/pkgs/development/python-modules/better-exceptions/default.nix new file mode 100644 index 000000000000..622292c9bf40 --- /dev/null +++ b/pkgs/development/python-modules/better-exceptions/default.nix @@ -0,0 +1,33 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, +}: + +buildPythonPackage rec { + pname = "better-exceptions"; + version = "0.3.3"; + pyproject = true; + + src = fetchPypi { + pname = "better_exceptions"; + inherit version; + hash = "sha256-5Oa8GERNXwTm6JSxA4Hl6SHT1UQkBBgWLH21fp6zRTs="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "better_exceptions" ]; + + # As noted by @WolfangAukang, some check files need to be disabled because of various errors, same with some tests. + # After disabling and running the build, no tests are collected. + doCheck = false; + + meta = { + description = "Pretty and more helpful exceptions in Python, automatically"; + homepage = "https://github.com/qix-/better-exceptions"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.alex-nt ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5134f53d3b4c..a8df6eab8269 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1562,6 +1562,8 @@ self: super: with self; { betamax-serializers = callPackage ../development/python-modules/betamax-serializers { }; + better-exceptions = callPackage ../development/python-modules/better-exceptions { }; + betterproto = callPackage ../development/python-modules/betterproto { }; beziers = callPackage ../development/python-modules/beziers { }; From 29014765300b3d03ceb7885859e10fd46fa18468 Mon Sep 17 00:00:00 2001 From: Alex <12470950+alex-nt@users.noreply.github.com> Date: Sun, 18 Aug 2024 18:03:37 +0300 Subject: [PATCH 013/617] gaphor: 2.8.2 -> 2.26.0 --- pkgs/tools/misc/gaphor/default.nix | 50 ++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/misc/gaphor/default.nix b/pkgs/tools/misc/gaphor/default.nix index 3079a620df45..6dadc0746299 100644 --- a/pkgs/tools/misc/gaphor/default.nix +++ b/pkgs/tools/misc/gaphor/default.nix @@ -4,16 +4,23 @@ , copyDesktopItems , gobject-introspection , poetry-core -, wrapGAppsHook3 -, gtksourceview4 +, wrapGAppsHook4 +, gtksourceview5 +, libadwaita , pango , gaphas , generic , jedi , pycairo +, pillow +, dulwich +, pydot +, defusedxml +, better-exceptions +, babel , pygobject3 , tinycss2 -, gtk3 +, gtk4 , librsvg , makeDesktopItem , python @@ -21,34 +28,43 @@ buildPythonApplication rec { pname = "gaphor"; - version = "2.8.2"; - - format = "pyproject"; + version = "2.26.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-+qqsSLjdY2I19fxdfkOEQ9DhTTHccUDll4O5yqtLiz0="; + hash = "sha256-e0K5bfgPqlJh8qrAz40c/w3ANzkfa/6txuqzQDJYXfE="; }; + pythonRelaxDeps = [ "defusedxml" ]; + nativeBuildInputs = [ copyDesktopItems gobject-introspection - poetry-core - wrapGAppsHook3 + wrapGAppsHook4 ]; buildInputs = [ - gtksourceview4 + gtksourceview5 pango + libadwaita ]; - propagatedBuildInputs = [ - gaphas - generic - jedi + build-system = [ poetry-core ]; + + dependencies = [ pycairo pygobject3 + gaphas + generic tinycss2 + babel + jedi + better-exceptions + pydot + pillow + defusedxml + dulwich ]; desktopItems = makeDesktopItem { @@ -59,7 +75,7 @@ buildPythonApplication rec { desktopName = "Gaphor"; }; - # Disable automatic wrapGAppsHook3 to prevent double wrapping + # Disable automatic wrapGAppsHook4 to prevent double wrapping dontWrapGApps = true; postInstall = '' @@ -69,7 +85,7 @@ buildPythonApplication rec { preFixup = '' makeWrapperArgs+=( "''${gappsWrapperArgs[@]}" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + --prefix XDG_DATA_DIRS : "${gtk4}/share/gsettings-schemas/${gtk4.name}/" \ --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" ) ''; @@ -79,6 +95,6 @@ buildPythonApplication rec { maintainers = [ ]; homepage = "https://github.com/gaphor/gaphor"; license = licenses.asl20; - platforms = [ "x86_64-linux" ]; + platforms = lib.platforms.linux; }; } From 43f2c10893557733ebcc83dc4f070495541c4775 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 31 Aug 2024 11:16:46 +0200 Subject: [PATCH 014/617] python3Packages.django-tenants: move out of authentik --- pkgs/by-name/au/authentik/package.nix | 29 +++++--------- .../python-modules/django-tenants/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 49 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/django-tenants/default.nix diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix index 2059f4a414d2..47cf9d09be49 100644 --- a/pkgs/by-name/au/authentik/package.nix +++ b/pkgs/by-name/au/authentik/package.nix @@ -110,25 +110,6 @@ let python = python312.override { self = python; packageOverrides = final: prev: { - django-tenants = prev.buildPythonPackage rec { - pname = "django-tenants"; - version = "unstable-2024-01-11"; - src = fetchFromGitHub { - owner = "rissson"; - repo = pname; - rev = "a7f37c53f62f355a00142473ff1e3451bb794eca"; - hash = "sha256-YBT0kcCfETXZe0j7/f1YipNIuRrcppRVh1ecFS3cvNo="; - }; - format = "setuptools"; - doCheck = false; # Tests require postgres - - propagatedBuildInputs = with final; [ - django - psycopg - gunicorn - ]; - }; - django-cte = prev.buildPythonPackage rec { pname = "django-cte"; version = "1.3.3"; @@ -178,7 +159,15 @@ let ]; pyproject = true; }; - + django-tenants = prev.django-tenants.overrideAttrs { + version = "3.6.1-unstable-2024-01-11"; + src = fetchFromGitHub { + owner = "rissson"; + repo = "django-tenants"; + rev = "a7f37c53f62f355a00142473ff1e3451bb794eca"; + hash = "sha256-YBT0kcCfETXZe0j7/f1YipNIuRrcppRVh1ecFS3cvNo="; + }; + }; # Use 3.14.0 until https://github.com/encode/django-rest-framework/issues/9358 is fixed. # Otherwise applying blueprints/default/default-brand.yaml fails with: # authentik.flows.models.RelatedObjectDoesNotExist: FlowStageBinding has no target. diff --git a/pkgs/development/python-modules/django-tenants/default.nix b/pkgs/development/python-modules/django-tenants/default.nix new file mode 100644 index 000000000000..f759a1458205 --- /dev/null +++ b/pkgs/development/python-modules/django-tenants/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + django, + psycopg, +}: + +buildPythonPackage rec { + pname = "django-tenants"; + version = "3.7.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "django-tenants"; + repo = "django-tenants"; + rev = "refs/tags/v${version}"; + hash = "sha256-QdEONKVFW/DWBjXWRTG+ahvirw9BP8M6PztUMZGZ33Q="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + django + psycopg + ]; + + pythonImportsCheck = [ "django_tenants" ]; + + meta = { + description = "Django tenants using PostgreSQL Schemas"; + homepage = "https://github.com/django-tenants/django-tenants"; + changelog = "https://github.com/django-tenants/django-tenants/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4332f6d5adcc..a9c6f5f24ccb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3503,6 +3503,8 @@ self: super: with self; { django-tastypie = callPackage ../development/python-modules/django-tastypie { }; + django-tenants = callPackage ../development/python-modules/django-tenants { }; + django-timezone-field = callPackage ../development/python-modules/django-timezone-field { }; django-treebeard = callPackage ../development/python-modules/django-treebeard { }; From 0792a8433348cdec10a5d30c075a07ee3b01089c Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 31 Aug 2024 11:39:53 +0200 Subject: [PATCH 015/617] python3Packages.django-cte: move out of authentik --- pkgs/by-name/au/authentik/package.nix | 13 ---- .../python-modules/django-cte/default.nix | 64 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 66 insertions(+), 13 deletions(-) create mode 100644 pkgs/development/python-modules/django-cte/default.nix diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix index 47cf9d09be49..8f0f4d50aa4e 100644 --- a/pkgs/by-name/au/authentik/package.nix +++ b/pkgs/by-name/au/authentik/package.nix @@ -110,19 +110,6 @@ let python = python312.override { self = python; packageOverrides = final: prev: { - django-cte = prev.buildPythonPackage rec { - pname = "django-cte"; - version = "1.3.3"; - src = fetchFromGitHub { - owner = "dimagi"; - repo = pname; - rev = "v${version}"; - hash = "sha256-OCENg94xHBeeE4A2838Cu3q2am2im2X4SkFSjc6DuhE="; - }; - doCheck = false; # Tests require postgres - format = "setuptools"; - }; - django-pgactivity = prev.buildPythonPackage rec { pname = "django-pgactivity"; version = "1.4.1"; diff --git a/pkgs/development/python-modules/django-cte/default.nix b/pkgs/development/python-modules/django-cte/default.nix new file mode 100644 index 000000000000..1ccf00d9aaea --- /dev/null +++ b/pkgs/development/python-modules/django-cte/default.nix @@ -0,0 +1,64 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + unittestCheckHook, + setuptools, + django, +}: + +buildPythonPackage rec { + pname = "django-cte"; + version = "1.3.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "dimagi"; + repo = "django-cte"; + rev = "refs/tags/v${version}"; + hash = "sha256-OCENg94xHBeeE4A2838Cu3q2am2im2X4SkFSjc6DuhE="; + }; + + build-system = [ setuptools ]; + + dependencies = [ django ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTests = [ + # Require Database connection + "test_cte_queryset" + "test_experimental_left_outer_join" + "test_explain" + "test_left_outer_join_on_empty_result_set_cte" + "test_named_ctes" + "test_named_simple_ctes" + "test_non_cte_subquery" + "test_outerref_in_cte_query" + "test_simple_cte_query" + "test_update_cte_query" + "test_update_with_subquery" + "test_heterogeneous_filter_in_cte" + "test_raw_cte_sql" + "test_alias_as_subquery" + "test_alias_change_in_annotation" + "test_attname_should_not_mask_col_name" + "test_pickle_recursive_cte_queryset" + "test_recursive_cte_query" + "test_recursive_cte_reference_in_condition" + "test_union_with_first" + "test_union_with_select_related_and_first" + "test_union_with_select_related_and_order" + ]; + + pythonImportsCheck = [ "django_cte" ]; + + meta = { + description = "Common Table Expressions (CTE) for Django"; + homepage = "https://github.com/dimagi/django-cte"; + changelog = "https://github.com/dimagi/django-cte/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a9c6f5f24ccb..034a7c8d9f13 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3315,6 +3315,8 @@ self: super: with self; { django-csp = callPackage ../development/python-modules/django-csp { }; + django-cte = callPackage ../development/python-modules/django-cte { }; + django-currentuser = callPackage ../development/python-modules/django-currentuser { }; django-debug-toolbar = callPackage ../development/python-modules/django-debug-toolbar { }; From e1ac4f7d43e9e599365b1a1fd228b373bbba3b1b Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 31 Aug 2024 12:08:48 +0200 Subject: [PATCH 016/617] python3Packages.django-pgactivity: move out of authentik --- pkgs/by-name/au/authentik/package.nix | 18 --------- .../django-pgactivity/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 40 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/django-pgactivity/default.nix diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix index 8f0f4d50aa4e..133745d6a5a3 100644 --- a/pkgs/by-name/au/authentik/package.nix +++ b/pkgs/by-name/au/authentik/package.nix @@ -110,24 +110,6 @@ let python = python312.override { self = python; packageOverrides = final: prev: { - django-pgactivity = prev.buildPythonPackage rec { - pname = "django-pgactivity"; - version = "1.4.1"; - src = fetchFromGitHub { - owner = "Opus10"; - repo = pname; - rev = version; - hash = "sha256-VwH7fwLcoH2Z9D/OY9iieM0cRhyDKOpAzqQ+4YVE3vU="; - }; - nativeBuildInputs = with prev; [ - poetry-core - ]; - propagatedBuildInputs = with final; [ - django - ]; - pyproject = true; - }; - django-pglock = prev.buildPythonPackage rec { pname = "django-pglock"; version = "1.5.1"; diff --git a/pkgs/development/python-modules/django-pgactivity/default.nix b/pkgs/development/python-modules/django-pgactivity/default.nix new file mode 100644 index 000000000000..69af00e6d0ff --- /dev/null +++ b/pkgs/development/python-modules/django-pgactivity/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + django, + psycopg, +}: + +buildPythonPackage rec { + pname = "django-pgactivity"; + version = "1.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Opus10"; + repo = "django-pgactivity"; + rev = "refs/tags/${version}"; + hash = "sha256-jOpm/vYy3Ubi+NfvARH19ozZMUgyGD/ZztqxKNvAoLQ="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + django + psycopg + ]; + + pythonImportsCheck = [ "pgactivity" ]; + + meta = { + description = "View, filter, and kill Postgres queries"; + homepage = "https://github.com/Opus10/django-pgactivity"; + changelog = "https://github.com/Opus10/django-pgactivity/blob/${version}/CHANGELOG.md"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 034a7c8d9f13..d5ec49bcf5dc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3413,6 +3413,8 @@ self: super: with self; { django-payments = callPackage ../development/python-modules/django-payments { }; + django-pgactivity = callPackage ../development/python-modules/django-pgactivity { }; + django-pglocks = callPackage ../development/python-modules/django-pglocks { }; django-phonenumber-field = callPackage ../development/python-modules/django-phonenumber-field { }; From 50b83177ad4e5c0fc27ebf372f7195e392ce4389 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 31 Aug 2024 12:21:19 +0200 Subject: [PATCH 017/617] python3Packages.django-pglock: move out of authentik --- pkgs/by-name/au/authentik/package.nix | 18 --------- .../python-modules/django-pglock/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 40 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/django-pglock/default.nix diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix index 133745d6a5a3..7d4d1900eaff 100644 --- a/pkgs/by-name/au/authentik/package.nix +++ b/pkgs/by-name/au/authentik/package.nix @@ -110,24 +110,6 @@ let python = python312.override { self = python; packageOverrides = final: prev: { - django-pglock = prev.buildPythonPackage rec { - pname = "django-pglock"; - version = "1.5.1"; - src = fetchFromGitHub { - owner = "Opus10"; - repo = pname; - rev = version; - hash = "sha256-ZoEHDkGmrcNiMe/rbwXsEPZo3LD93cZp6zjftMKjLeg="; - }; - nativeBuildInputs = with prev; [ - poetry-core - ]; - propagatedBuildInputs = with final; [ - django - django-pgactivity - ]; - pyproject = true; - }; django-tenants = prev.django-tenants.overrideAttrs { version = "3.6.1-unstable-2024-01-11"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/django-pglock/default.nix b/pkgs/development/python-modules/django-pglock/default.nix new file mode 100644 index 000000000000..06ca731c76be --- /dev/null +++ b/pkgs/development/python-modules/django-pglock/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + django, + django-pgactivity, +}: + +buildPythonPackage rec { + pname = "django-pglock"; + version = "1.6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Opus10"; + repo = "django-pglock"; + rev = "refs/tags/${version}"; + hash = "sha256-KCB00W3sUyEERgK/DfDPl051uFkc0IRdbOJusUVs5SA="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + django + django-pgactivity + ]; + + pythonImportsCheck = [ "pglock" ]; + + meta = { + description = "Postgres advisory locks, table locks, and blocking lock management"; + homepage = "https://github.com/Opus10/django-pglock"; + changelog = "https://github.com/Opus10/django-pglock/blob/${version}/CHANGELOG.md"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d5ec49bcf5dc..46ee0495ff1d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3415,6 +3415,8 @@ self: super: with self; { django-pgactivity = callPackage ../development/python-modules/django-pgactivity { }; + django-pglock = callPackage ../development/python-modules/django-pglock { }; + django-pglocks = callPackage ../development/python-modules/django-pglocks { }; django-phonenumber-field = callPackage ../development/python-modules/django-phonenumber-field { }; From 13da3f3368935906924d710c78b69e2f437ed332 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 31 Aug 2024 12:35:16 +0200 Subject: [PATCH 018/617] python3Packages.tenant-schemas-celery: move out of authentik --- pkgs/by-name/au/authentik/package.nix | 19 ----------- .../tenant-schemas-celery/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 36 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/tenant-schemas-celery/default.nix diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix index 7d4d1900eaff..3da9441576e7 100644 --- a/pkgs/by-name/au/authentik/package.nix +++ b/pkgs/by-name/au/authentik/package.nix @@ -153,25 +153,6 @@ let pythonImportsCheck = [ "rest_framework" ]; }; - tenant-schemas-celery = prev.buildPythonPackage rec { - pname = "tenant-schemas-celery"; - version = "3.0.0"; - src = fetchFromGitHub { - owner = "maciej-gol"; - repo = pname; - rev = version; - hash = "sha256-3ZUXSAOBMtj72sk/VwPV24ysQK+E4l1HdwKa78xrDtg="; - }; - format = "setuptools"; - doCheck = false; - - propagatedBuildInputs = with final; [ - freezegun - more-itertools - psycopg2 - ]; - }; - scim2-filter-parser = prev.buildPythonPackage rec { pname = "scim2-filter-parser"; version = "0.5.1"; diff --git a/pkgs/development/python-modules/tenant-schemas-celery/default.nix b/pkgs/development/python-modules/tenant-schemas-celery/default.nix new file mode 100644 index 000000000000..3f85d86e7f7e --- /dev/null +++ b/pkgs/development/python-modules/tenant-schemas-celery/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + celery, +}: + +buildPythonPackage rec { + pname = "tenant-schemas-celery"; + version = "3.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "maciej-gol"; + repo = "tenant-schemas-celery"; + rev = "refs/tags/${version}"; + hash = "sha256-3ZUXSAOBMtj72sk/VwPV24ysQK+E4l1HdwKa78xrDtg="; + }; + + build-system = [ setuptools ]; + + dependencies = [ celery ]; + + pythonImportsCheck = [ "tenant_schemas_celery" ]; + + meta = { + description = "Celery application implementation that allows celery tasks to cooperate with multi-tenancy provided by django-tenant-schemas and django-tenants packages"; + homepage = "https://github.com/maciej-gol/tenant-schemas-celery"; + changelog = "https://github.com/maciej-gol/tenant-schemas-celery/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 46ee0495ff1d..4fff4c82a240 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15490,6 +15490,8 @@ self: super: with self; { tenacity = callPackage ../development/python-modules/tenacity { }; + tenant-schemas-celery = callPackage ../development/python-modules/tenant-schemas-celery { }; + tencentcloud-sdk-python = callPackage ../development/python-modules/tencentcloud-sdk-python { }; tendo = callPackage ../development/python-modules/tendo { }; From 75ff156698cabcf90608b06ec558f0d840204251 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 31 Aug 2024 13:09:31 +0200 Subject: [PATCH 019/617] authentik: use packaged scim2-filter-parser --- pkgs/by-name/au/authentik/package.nix | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix index 3da9441576e7..a21c7c8ae895 100644 --- a/pkgs/by-name/au/authentik/package.nix +++ b/pkgs/by-name/au/authentik/package.nix @@ -153,29 +153,6 @@ let pythonImportsCheck = [ "rest_framework" ]; }; - scim2-filter-parser = prev.buildPythonPackage rec { - pname = "scim2-filter-parser"; - version = "0.5.1"; - # For some reason the normal fetchPypi does not work - src = fetchzip { - url = "https://files.pythonhosted.org/packages/54/df/ad9718acce76e81a93c57327356eecd23701625f240fbe03d305250399e6/scim2_filter_parser-0.5.1.tar.gz"; - hash = "sha256-DZAdRj6qyySggsvJZC47vdvXbHrB1ra3qiYBEUiceJ4="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail 'poetry>=0.12' 'poetry-core>=1.0.0' \ - --replace-fail 'poetry.masonry.api' 'poetry.core.masonry.api' - ''; - - nativeBuildInputs = [ prev.poetry-core ]; - pyproject = true; - - propagatedBuildInputs = with final; [ - sly - ]; - }; - authentik-django = prev.buildPythonPackage { pname = "authentik-django"; inherit version src meta; From 3571c72f41c47a6261c189182c4854e7be955aa0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Sep 2024 02:20:36 +0000 Subject: [PATCH 020/617] boehmgc: 8.2.6 -> 8.2.8 --- pkgs/by-name/bo/boehmgc/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/bo/boehmgc/package.nix b/pkgs/by-name/bo/boehmgc/package.nix index 4a5418a3206b..2d7cb20c5cab 100644 --- a/pkgs/by-name/bo/boehmgc/package.nix +++ b/pkgs/by-name/bo/boehmgc/package.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , autoreconfHook -# doc: https://github.com/ivmai/bdwgc/blob/v8.2.6/doc/README.macros (LARGE_CONFIG) +# doc: https://github.com/ivmai/bdwgc/blob/v8.2.8/doc/README.macros (LARGE_CONFIG) , enableLargeConfig ? false , enableMmap ? true , enableStatic ? false @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "boehm-gc"; - version = "8.2.6"; + version = "8.2.8"; src = fetchFromGitHub { owner = "ivmai"; repo = "bdwgc"; rev = "v${finalAttrs.version}"; - hash = "sha256-y6hU5qU4qO9VvQvKNH9dvReCrf3+Ih2HHbF6IS1V3WQ="; + hash = "sha256-UQSLK/05uPal6/m+HMz0QwXVII1leonlmtSZsXjJ+/c="; }; outputs = [ "out" "dev" "doc" ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { # not fix the problem the test failure will be a reminder to # extend the set of versions requiring the workaround). makeFlags = lib.optionals (stdenv.hostPlatform.isPower64 && - finalAttrs.version == "8.2.6") + finalAttrs.version == "8.2.8") [ # do not use /proc primitives to track dirty bits; see: # https://github.com/ivmai/bdwgc/issues/479#issuecomment-1279687537 From ac1c862a3b74130b7a70ca2a4cd385505bb2c8c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 00:52:00 +0000 Subject: [PATCH 021/617] directx-headers: 1.614.0 -> 1.614.1 --- pkgs/development/libraries/directx-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/directx-headers/default.nix b/pkgs/development/libraries/directx-headers/default.nix index 061d18d15016..f1830f54035e 100644 --- a/pkgs/development/libraries/directx-headers/default.nix +++ b/pkgs/development/libraries/directx-headers/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, meson, ninja }: stdenv.mkDerivation rec { pname = "directx-headers"; - version = "1.614.0"; + version = "1.614.1"; src = fetchFromGitHub { owner = "microsoft"; repo = "DirectX-Headers"; rev = "v${version}"; - hash = "sha256-0LaN9D3cKVacMJhZCe9oxDPHpd1jdCAV0ImG2rSgnxc="; + hash = "sha256-CDmzKdV40EExLpOHPAUnytqG9x1+IGW4AZldfYs5YJk="; }; nativeBuildInputs = [ meson ninja ]; From 5bd3d7b231488cca6ea0570048b7ca9b579c745c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 01:03:07 +0000 Subject: [PATCH 022/617] imath: 3.1.11 -> 3.1.12 --- pkgs/development/libraries/imath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/imath/default.nix b/pkgs/development/libraries/imath/default.nix index ae7bbe2fba3f..a8e1ed336bcd 100644 --- a/pkgs/development/libraries/imath/default.nix +++ b/pkgs/development/libraries/imath/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "imath"; - version = "3.1.11"; + version = "3.1.12"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "imath"; rev = "v${version}"; - sha256 = "sha256-Cnl0BTXUzkDvgLSNXJbh5ATczBdbxiwbS4J9L6N8sKI="; + sha256 = "sha256-r4FNyNsWdmpZrHOpSvaSUWRYhAU+qnW4lE5uYPKn7Mw="; }; nativeBuildInputs = [ cmake ]; From ca6df3d236ac289f418004273b860759ea5ff3e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Sep 2024 01:13:34 +0000 Subject: [PATCH 023/617] libjpeg: 3.0.3 -> 3.0.4 --- pkgs/development/libraries/libjpeg-turbo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 9055e75de47f..7343dbcaaf4b 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -32,13 +32,13 @@ assert !(enableJpeg7 && enableJpeg8); # pick only one or none, not both stdenv.mkDerivation (finalAttrs: { pname = "libjpeg-turbo"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "libjpeg-turbo"; repo = "libjpeg-turbo"; rev = finalAttrs.version; - hash = "sha256-w2wJaVf4sjJ9pPPqc9R4TE6Q6Yl0U6+fI5KLpQKwEXI="; + hash = "sha256-ZNqhOfZtWcMv10VWIUxn7MSy4KhW/jBrgC1tUFKczqs="; }; patches = [ From 4d84cf2982004b9a36aee24fff78ebf156cc42d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Oct 2024 21:40:52 +0000 Subject: [PATCH 024/617] harfbuzz: 9.0.0 -> 10.0.1 --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 15208becc301..1ff6d193268e 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "harfbuzz${lib.optionalString withIcu "-icu"}"; - version = "9.0.0"; + version = "10.0.1"; src = fetchurl { url = "https://github.com/harfbuzz/harfbuzz/releases/download/${finalAttrs.version}/harfbuzz-${finalAttrs.version}.tar.xz"; - hash = "sha256-pBsnLO65IMVyY+yFFgRULZ7IXuMDBQbZRmIGfHtquJ4="; + hash = "sha256-sssTvTUZBMuQOPkH3A3uCuBxJwYSQv41VrJ5XE6XSPw="; }; postPatch = '' From 7153c0975acb31ba2d01f2b660259a498aeb2bc4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Oct 2024 14:12:56 +0000 Subject: [PATCH 025/617] libsForQt5.qcoro: 0.10.0 -> 0.11.0 --- pkgs/development/libraries/qcoro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qcoro/default.nix b/pkgs/development/libraries/qcoro/default.nix index e178dd5240d6..877292493dba 100644 --- a/pkgs/development/libraries/qcoro/default.nix +++ b/pkgs/development/libraries/qcoro/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "qcoro"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "danvratil"; repo = "qcoro"; rev = "v${version}"; - sha256 = "sha256-C4k5ClsMwzxURAQBGV5WBwlRr5N0SvUMJobZ+ROT0EY="; + sha256 = "sha256-teRuWtNR8r/MHZhqphazr7Jmn43qsHGv9eXOGrhSND0="; }; outputs = [ "out" "dev" ]; From c31e8384dd91864330b19105e932be0fc8e9673c Mon Sep 17 00:00:00 2001 From: Marvin Dostal Date: Sat, 5 Oct 2024 20:32:41 +0200 Subject: [PATCH 026/617] lilv: add meson options to include Nix and NixOS specific paths for the default lv2 plugin search --- pkgs/development/libraries/audio/lilv/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index fdd50d8af937..89b3f77a405a 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -32,10 +32,20 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ lv2 ]; mesonFlags = [ - "-Ddocs=disabled" + (lib.mesonOption "docs" "disabled") # Tests require building a shared library. (lib.mesonEnable "tests" (!stdenv.hostPlatform.isStatic)) - ]; + ] # Add nix and NixOS specific lv2 paths + # The default values are from: https://github.com/lv2/lilv/blob/master/src/lilv_config.h + ++ lib.optional stdenv.isDarwin (lib.mesonOption "default_lv2_path" + "~/.lv2:~/Library/Audio/Plug-Ins/LV2:" + + "/usr/local/lib/lv2:/usr/lib/lv2:" + + "/Library/Audio/Plug-Ins/LV2:" + + "~/.nix-profile/lib/lv2") + ++ lib.optional stdenv.isLinux (lib.mesonOption "default_lv2_path" + "~/.lv2:/usr/local/lib/lv2:/usr/lib/lv2:" + + "~/.nix-profile/lib/lv2:/run/current-system/sw/lib/lv2:" + + "/etc/profiles/per-user/$USER/lib/lv2"); passthru = { tests = { From ba3ad022bad53bc1d1ca75c63f5981f98700b732 Mon Sep 17 00:00:00 2001 From: Marvin Dostal Date: Sun, 6 Oct 2024 16:19:57 +0200 Subject: [PATCH 027/617] lilv: remove unnecessary search path for LV2 plugins --- pkgs/development/libraries/audio/lilv/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 89b3f77a405a..f0c2aa304546 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -44,8 +44,7 @@ stdenv.mkDerivation rec { + "~/.nix-profile/lib/lv2") ++ lib.optional stdenv.isLinux (lib.mesonOption "default_lv2_path" "~/.lv2:/usr/local/lib/lv2:/usr/lib/lv2:" - + "~/.nix-profile/lib/lv2:/run/current-system/sw/lib/lv2:" - + "/etc/profiles/per-user/$USER/lib/lv2"); + + "~/.nix-profile/lib/lv2:/run/current-system/sw/lib/lv2"); passthru = { tests = { From 4f9f7f80a3e13935d9d309bcf1bdc64bdfd30eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Wed, 9 Oct 2024 15:49:09 -0600 Subject: [PATCH 028/617] python3Packages.sip: 6.8.3 -> 6.8.6 --- pkgs/development/python-modules/sip/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 8a398654b08c..8fd6240e4a51 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -4,6 +4,7 @@ fetchPypi, pythonOlder, setuptools, + setuptools-scm, packaging, tomli, @@ -15,17 +16,20 @@ buildPythonPackage rec { pname = "sip"; - version = "6.8.3"; + version = "6.8.6"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-iIVHsBi7JMNq3tUZ6T0+UT1MaqC6VbfMGv+9Rc8Qdiw="; + hash = "sha256-f8lZ5I5uxdWvi9Am9p9eJNCLPLirs0IXb1q4AwzAfXo="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ + dependencies = [ packaging setuptools ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; From 63d46aaac49a7d439ee33a4526b3470d88c9b3b1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 10 Oct 2024 12:40:46 +0200 Subject: [PATCH 029/617] dconf: fix building without emulation available MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For example, Linux → FreeBSD. --- pkgs/development/libraries/dconf/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix index 1aad769c6db2..6d56ba075f49 100644 --- a/pkgs/development/libraries/dconf/default.nix +++ b/pkgs/development/libraries/dconf/default.nix @@ -15,7 +15,10 @@ , docbook-xsl-nons , docbook_xml_dtd_42 , nixosTests -, withDocs ? true +, buildPackages +, gobject-introspection +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages +, withDocs ? withIntrospection }: stdenv.mkDerivation rec { @@ -49,12 +52,14 @@ stdenv.mkDerivation rec { glib bash-completion dbus + ] ++ lib.optionals withIntrospection [ vala ]; mesonFlags = [ "--sysconfdir=/etc" - "-Dgtk_doc=${lib.boolToString withDocs}" + (lib.mesonBool "gtk_doc" withDocs) + (lib.mesonBool "vapi" withIntrospection) ]; nativeCheckInputs = [ From d604acb13610ca2564677f24adbdf47eee741c70 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 12 Oct 2024 14:48:21 -0400 Subject: [PATCH 030/617] texinfo: fix reference to build platform coreutils 0e50c09 started patching shebangs for all files in tp/maintain. There are some Perl modules in tp/maintain/lib with the shebang #!/bin/false that are eventually installed to the output. In the source tarball, some of the these file are marked executable, but when they are installed, the executable bit is cleared. Therefore, they get patched with build platform shebangs in postPatch, but these shebangs are never corrected to the host platform in the fixup phase. This leaves a reference to build platform coreutils in the output. It turns out that there is only a single file in tp/maintain that actually needs to be patched, so limit the patchShebangs call to that file to avoid the issue. --- pkgs/development/tools/misc/texinfo/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index e630489ffae3..04217bb672b4 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { postPatch = '' - patchShebangs tp/maintain + patchShebangs tp/maintain/regenerate_commands_perl_info.pl '' # This patch is needed for IEEE-standard long doubles on # powerpc64; it does not apply cleanly to texinfo 5.x or From a670466186cf20c68265f0e9fa40a1ba596467be Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 12 Oct 2024 14:55:28 -0400 Subject: [PATCH 031/617] texinfo: use substituteInPlace --replace-fail Get rid of the deprecation warning. --- pkgs/development/tools/misc/texinfo/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index 04217bb672b4..da9b2c9cbcb0 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation { postFixup = optionalString crossBuildTools '' for f in "$out"/bin/{pod2texi,texi2any}; do substituteInPlace "$f" \ - --replace ${buildPackages.perl}/bin/perl ${perl}/bin/perl + --replace-fail ${buildPackages.perl}/bin/perl ${perl}/bin/perl done ''; From 4904021426ba51c49fb7ec81f8bec88919059f82 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 19 Sep 2024 00:16:56 +0200 Subject: [PATCH 032/617] protobuf_25: 25.4 -> 25.5 Diff: https://github.com/protocolbuffers/protobuf/compare/v25.4...v25.5 Changelog: https://github.com/protocolbuffers/protobuf/releases/tag/v25.5 --- pkgs/development/libraries/protobuf/25.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/protobuf/25.nix b/pkgs/development/libraries/protobuf/25.nix index a5a6a3419b5f..5a22c869ed0e 100644 --- a/pkgs/development/libraries/protobuf/25.nix +++ b/pkgs/development/libraries/protobuf/25.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix ({ - version = "25.4"; - hash = "sha256-dIouv6QaX6Tlahjrdz250DJkKjZ74/EwoQjTs3vBS/U="; + version = "25.5"; + hash = "sha256-DFLlk4T8ODo3lmvrANlkIsrmDXZHmqMPTYxDWaz56qA="; } // args) From b9a41bcbac86c37b936b41a889fa0be5a28b3e1e Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 15 Oct 2024 00:08:25 +0200 Subject: [PATCH 033/617] libarchive: 3.7.6 -> 3.7.7 Changes: https://github.com/libarchive/libarchive/releases/tag/v3.7.7 --- pkgs/by-name/li/libarchive/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libarchive/package.nix b/pkgs/by-name/li/libarchive/package.nix index d8b11d227180..8703c1a4faba 100644 --- a/pkgs/by-name/li/libarchive/package.nix +++ b/pkgs/by-name/li/libarchive/package.nix @@ -31,13 +31,13 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation (finalAttrs: { pname = "libarchive"; - version = "3.7.6"; + version = "3.7.7"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${finalAttrs.version}"; - hash = "sha256-smj8JV5irW/StUx/Zp62w5cnlKbF6GRIOSh8i4ocJ8s="; + hash = "sha256-maV2+Whi4aDG1VLAYpOTxluO9I0zNiZ8fA3w7epGlDg="; }; outputs = [ "out" "lib" "dev" ]; From f6588327a25dd0eb0a06013a904fe2c7c9c737f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Oct 2024 03:52:05 +0000 Subject: [PATCH 034/617] libxmlb: 0.3.19 -> 0.3.20 --- pkgs/development/libraries/libxmlb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index a90ae30fec1e..49c67f74d30e 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "libxmlb"; - version = "0.3.19"; + version = "0.3.20"; outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - hash = "sha256-gXLWHkT+h/wvmmi7PyIx16gbeYznVOT7CwuBgF3bjOY="; + hash = "sha256-X1sOUaqafppEjlcq2jYFo+BXxNX1d+vLizSQM+x/pvg="; }; patches = [ From 8044c0cc0aec2509b33dd088294f69648061b632 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 16 Oct 2024 03:12:01 +0200 Subject: [PATCH 035/617] python314: init at 3.14.0a1 https://docs.python.org/3.14/whatsnew/changelog.html#python-3-14-0-alpha-1 --- doc/languages-frameworks/python.section.md | 1 + .../python/cpython/3.14/no-ldconfig.patch | 40 +++++++++++++++++++ .../interpreters/python/default.nix | 12 ++++++ pkgs/top-level/all-packages.nix | 13 +++++- 4 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/interpreters/python/cpython/3.14/no-ldconfig.patch diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 3d9736da7fa0..31f7f40346b3 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -55,6 +55,7 @@ sets are * `pkgs.python311Packages` * `pkgs.python312Packages` * `pkgs.python313Packages` +* `pkgs.python314Packages` * `pkgs.pypy27Packages` * `pkgs.pypy39Packages` * `pkgs.pypy310Packages` diff --git a/pkgs/development/interpreters/python/cpython/3.14/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.14/no-ldconfig.patch new file mode 100644 index 000000000000..5d176dd38de7 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.14/no-ldconfig.patch @@ -0,0 +1,40 @@ +diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py +index 117bf06cb01..ff50cb083bd 100644 +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py +@@ -280,34 +280,7 @@ def find_library(name, is64 = False): + else: + + def _findSoname_ldconfig(name): +- import struct +- if struct.calcsize('l') == 4: +- machine = os.uname().machine + '-32' +- else: +- machine = os.uname().machine + '-64' +- mach_map = { +- 'x86_64-64': 'libc6,x86-64', +- 'ppc64-64': 'libc6,64bit', +- 'sparc64-64': 'libc6,64bit', +- 's390x-64': 'libc6,64bit', +- 'ia64-64': 'libc6,IA-64', +- } +- abi_type = mach_map.get(machine, 'libc6') +- +- # XXX assuming GLIBC's ldconfig (with option -p) +- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s' +- regex = os.fsencode(regex % (re.escape(name), abi_type)) +- try: +- with subprocess.Popen(['/sbin/ldconfig', '-p'], +- stdin=subprocess.DEVNULL, +- stderr=subprocess.DEVNULL, +- stdout=subprocess.PIPE, +- env={'LC_ALL': 'C', 'LANG': 'C'}) as p: +- res = re.search(regex, p.stdout.read()) +- if res: +- return os.fsdecode(res.group(1)) +- except OSError: +- pass ++ return None + + def _findLib_ld(name): + # See issue #9998 for why this is needed diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 5e67c8bd4a15..9588393a33b5 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -93,6 +93,18 @@ in { hash = "sha256-CG3liC48sxDU3KSEV1IuLkgBjs1D2pzfgn9qB1nvsH0="; inherit passthruFun; }; + + python314 = callPackage ./cpython { + self = __splicedPackages.python314; + sourceVersion = { + major = "3"; + minor = "14"; + patch = "0"; + suffix = "a1"; + }; + hash = "sha256-PkZLDLt1NeLbNCYv0ZoKOT0OYr4PQ7FRPtmDebBU6tQ="; + inherit passthruFun; + }; # Minimal versions of Python (built without optional dependencies) python3Minimal = (callPackage ./cpython ({ self = __splicedPackages.python3Minimal; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd396293a78c..24dc84b84a0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16411,15 +16411,25 @@ with pkgs; bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; x11Support = true; }; + python314Full = python314.override { + self = python314Full; + pythonAttr = "python314Full"; + bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; + x11Support = true; + }; # https://py-free-threading.github.io python313FreeThreading = python313.override { pythonAttr = "python313FreeThreading"; enableGIL = false; }; + python314FreeThreading = python314.override { + pythonAttr = "python313FreeThreading"; + enableGIL = false; + }; pythonInterpreters = callPackage ./../development/interpreters/python { }; - inherit (pythonInterpreters) python27 python39 python310 python311 python312 python313 python3Minimal pypy27 pypy310 pypy39 rustpython; + inherit (pythonInterpreters) python27 python39 python310 python311 python312 python313 python314 python3Minimal pypy27 pypy310 pypy39 rustpython; # List of extensions with overrides to apply to all Python package sets. pythonPackagesExtensions = [ ]; @@ -16431,6 +16441,7 @@ with pkgs; python311Packages = recurseIntoAttrs python311.pkgs; python312Packages = recurseIntoAttrs python312.pkgs; python313Packages = python313.pkgs; + python314Packages = python314.pkgs; pypyPackages = pypy.pkgs; pypy2Packages = pypy2.pkgs; pypy27Packages = pypy27.pkgs; From 835a9710c1373bdb8f9f7943cc394e16b7bf2768 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 16 Oct 2024 03:25:18 +0200 Subject: [PATCH 036/617] python314Packages.flit-core: backport 3.14 compat patch --- .../bootstrap/flit-core/default.nix | 2 +- .../python-modules/flit-core/default.nix | 2 +- .../python-modules/flit/default.nix | 5 +++ .../flit/python314-compat.patch | 41 +++++++++++++++++++ 4 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/flit/python314-compat.patch diff --git a/pkgs/development/python-modules/bootstrap/flit-core/default.nix b/pkgs/development/python-modules/bootstrap/flit-core/default.nix index bdd4a0f535ff..01e9e43f3acd 100644 --- a/pkgs/development/python-modules/bootstrap/flit-core/default.nix +++ b/pkgs/development/python-modules/bootstrap/flit-core/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta ; - sourceRoot = "${src.name}/flit_core"; + postPatch = "cd flit_core"; buildPhase = '' runHook preBuild diff --git a/pkgs/development/python-modules/flit-core/default.nix b/pkgs/development/python-modules/flit-core/default.nix index 05157efb8648..628234d2955f 100644 --- a/pkgs/development/python-modules/flit-core/default.nix +++ b/pkgs/development/python-modules/flit-core/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { inherit (flit) src patches; - sourceRoot = "${src.name}/flit_core"; + postPatch = "cd flit_core"; # Tests are run in the "flit" package. doCheck = false; diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 9284de7d1184..825e4435535a 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -28,6 +28,11 @@ buildPythonPackage rec { hash = "sha256-yl2+PcKr7xRW4oIBWl+gzh/nKhSNu5GH9fWKRGgaNHU="; }; + patches = [ + # https://github.com/pypa/flit/commit/6ab62c91d0db451b5e9ab000f0dba5471550b442.patch + ./python314-compat.patch + ]; + nativeBuildInputs = [ flit-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flit/python314-compat.patch b/pkgs/development/python-modules/flit/python314-compat.patch new file mode 100644 index 000000000000..439592e3a63b --- /dev/null +++ b/pkgs/development/python-modules/flit/python314-compat.patch @@ -0,0 +1,41 @@ +From 6ab62c91d0db451b5e9ab000f0dba5471550b442 Mon Sep 17 00:00:00 2001 +From: Thomas A Caswell +Date: Tue, 28 May 2024 10:25:13 -0400 +Subject: [PATCH] MNT: fix compatibility with Python 3.14 + +The ast.Str class was deprecated in 3.8 and will be removed in 3.14 +--- + flit_core/flit_core/common.py | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/flit_core/flit_core/common.py b/flit_core/flit_core/common.py +index 6625224b..8bcda3fb 100644 +--- a/flit_core/flit_core/common.py ++++ b/flit_core/flit_core/common.py +@@ -148,6 +148,10 @@ def get_docstring_and_version_via_ast(target): + with target_path.open('rb') as f: + node = ast.parse(f.read()) + for child in node.body: ++ if sys.version_info >= (3, 8): ++ target_type = ast.Constant ++ else: ++ target_type = ast.Str + # Only use the version from the given module if it's a simple + # string assignment to __version__ + is_version_str = ( +@@ -157,10 +161,13 @@ def get_docstring_and_version_via_ast(target): + and target.id == "__version__" + for target in child.targets + ) +- and isinstance(child.value, ast.Str) ++ and isinstance(child.value, target_type) + ) + if is_version_str: +- version = child.value.s ++ if sys.version_info >= (3, 8): ++ version = child.value.value ++ else: ++ version = child.value.s + break + return ast.get_docstring(node), version + From b21033f825b20c663921d8f081c93cc4caf09802 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 16 Oct 2024 03:40:32 +0200 Subject: [PATCH 037/617] OWNERS: extend my python code ownership --- ci/OWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/OWNERS b/ci/OWNERS index 1e4644f16c8f..703d5336dde4 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -149,8 +149,8 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza # Python-related code and docs /doc/languages-frameworks/python.section.md @mweinelt @natsukium -/maintainers/scripts/update-python-libraries @natsukium -/pkgs/development/interpreters/python @natsukium +/maintainers/scripts/update-python-libraries @mweinelt @natsukium +/pkgs/development/interpreters/python @mweinelt @natsukium /pkgs/top-level/python-packages.nix @natsukium /pkgs/top-level/release-python.nix @natsukium From 062bd17d71320463b3986b5de2dc3b9b33417e86 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 16 Oct 2024 06:58:34 +0100 Subject: [PATCH 038/617] execline-man-pages: 2.9.6.0.1 -> 2.9.6.1.1 --- pkgs/development/skaware-packages/execline/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/skaware-packages/execline/default.nix b/pkgs/development/skaware-packages/execline/default.nix index a99f1f589264..eb552cd23957 100644 --- a/pkgs/development/skaware-packages/execline/default.nix +++ b/pkgs/development/skaware-packages/execline/default.nix @@ -16,8 +16,8 @@ in skawarePackages.buildPackage { # ${version}.3 and so on are created. manpages = skawarePackages.buildManPages { pname = "execline-man-pages"; - version = "2.9.6.0.1"; - sha256 = "sha256-0lyX3rIUZ2JqWioRSm22uDS+q9ONkwIZxfR5E2pSDC4="; + version = "2.9.6.1.1"; + sha256 = "sha256-bj+74zTkGKLdLEb1k4iHfNI1lAuxLBASc5++m17Y0O8="; description = "Port of the documentation for the execline suite to mdoc"; maintainers = [ lib.maintainers.sternenseemann ]; }; From 48f7655db81ccc8ced593f015b6b5605be3bce3f Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 16 Oct 2024 22:07:46 +0200 Subject: [PATCH 039/617] libssh2: 1.11.0 -> 1.11.1 Changes: https://libssh2.org/changes.html#1.11.1 --- .../libraries/libssh2/CVE-2023-48795.patch | 459 ------------------ .../development/libraries/libssh2/default.nix | 10 +- 2 files changed, 2 insertions(+), 467 deletions(-) delete mode 100644 pkgs/development/libraries/libssh2/CVE-2023-48795.patch diff --git a/pkgs/development/libraries/libssh2/CVE-2023-48795.patch b/pkgs/development/libraries/libssh2/CVE-2023-48795.patch deleted file mode 100644 index c89e4a137b72..000000000000 --- a/pkgs/development/libraries/libssh2/CVE-2023-48795.patch +++ /dev/null @@ -1,459 +0,0 @@ -From d34d9258b8420b19ec3f97b4cc5bf7aa7d98e35a Mon Sep 17 00:00:00 2001 -From: Michael Buckley -Date: Thu, 30 Nov 2023 15:08:02 -0800 -Subject: [PATCH] src: add 'strict KEX' to fix CVE-2023-48795 "Terrapin Attack" - -Refs: -https://terrapin-attack.com/ -https://seclists.org/oss-sec/2023/q4/292 -https://osv.dev/list?ecosystem=&q=CVE-2023-48795 -https://github.com/advisories/GHSA-45x7-px36-x8w8 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-48795 - -Fixes #1290 -Closes #1291 ---- - src/kex.c | 63 +++++++++++++++++++++++------------ - src/libssh2_priv.h | 18 +++++++--- - src/packet.c | 83 +++++++++++++++++++++++++++++++++++++++++++--- - src/packet.h | 2 +- - src/session.c | 3 ++ - src/transport.c | 12 ++++++- - 6 files changed, 149 insertions(+), 32 deletions(-) - -diff --git a/src/kex.c b/src/kex.c -index 8e7b7f0af3..a7b301e157 100644 ---- a/src/kex.c -+++ b/src/kex.c -@@ -3032,6 +3032,13 @@ kex_method_extension_negotiation = { - 0, - }; - -+static const LIBSSH2_KEX_METHOD -+kex_method_strict_client_extension = { -+ "kex-strict-c-v00@openssh.com", -+ NULL, -+ 0, -+}; -+ - static const LIBSSH2_KEX_METHOD *libssh2_kex_methods[] = { - #if LIBSSH2_ED25519 - &kex_method_ssh_curve25519_sha256, -@@ -3050,6 +3057,7 @@ static const LIBSSH2_KEX_METHOD *libssh2_kex_methods[] = { - &kex_method_diffie_helman_group1_sha1, - &kex_method_diffie_helman_group_exchange_sha1, - &kex_method_extension_negotiation, -+ &kex_method_strict_client_extension, - NULL - }; - -@@ -3302,13 +3310,13 @@ static int kexinit(LIBSSH2_SESSION * session) - return 0; - } - --/* kex_agree_instr -+/* _libssh2_kex_agree_instr - * Kex specific variant of strstr() - * Needle must be preceded by BOL or ',', and followed by ',' or EOL - */ --static unsigned char * --kex_agree_instr(unsigned char *haystack, size_t haystack_len, -- const unsigned char *needle, size_t needle_len) -+unsigned char * -+_libssh2_kex_agree_instr(unsigned char *haystack, size_t haystack_len, -+ const unsigned char *needle, size_t needle_len) - { - unsigned char *s; - unsigned char *end_haystack; -@@ -3393,7 +3401,7 @@ static int kex_agree_hostkey(LIBSSH2_SESSION * session, - while(s && *s) { - unsigned char *p = (unsigned char *) strchr((char *) s, ','); - size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); -- if(kex_agree_instr(hostkey, hostkey_len, s, method_len)) { -+ if(_libssh2_kex_agree_instr(hostkey, hostkey_len, s, method_len)) { - const LIBSSH2_HOSTKEY_METHOD *method = - (const LIBSSH2_HOSTKEY_METHOD *) - kex_get_method_by_name((char *) s, method_len, -@@ -3427,9 +3435,9 @@ static int kex_agree_hostkey(LIBSSH2_SESSION * session, - } - - while(hostkeyp && (*hostkeyp) && (*hostkeyp)->name) { -- s = kex_agree_instr(hostkey, hostkey_len, -- (unsigned char *) (*hostkeyp)->name, -- strlen((*hostkeyp)->name)); -+ s = _libssh2_kex_agree_instr(hostkey, hostkey_len, -+ (unsigned char *) (*hostkeyp)->name, -+ strlen((*hostkeyp)->name)); - if(s) { - /* So far so good, but does it suit our purposes? (Encrypting vs - Signing) */ -@@ -3463,6 +3471,12 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, - { - const LIBSSH2_KEX_METHOD **kexp = libssh2_kex_methods; - unsigned char *s; -+ const unsigned char *strict = -+ (unsigned char *)"kex-strict-s-v00@openssh.com"; -+ -+ if(_libssh2_kex_agree_instr(kex, kex_len, strict, 28)) { -+ session->kex_strict = 1; -+ } - - if(session->kex_prefs) { - s = (unsigned char *) session->kex_prefs; -@@ -3470,7 +3484,7 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, - while(s && *s) { - unsigned char *q, *p = (unsigned char *) strchr((char *) s, ','); - size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); -- q = kex_agree_instr(kex, kex_len, s, method_len); -+ q = _libssh2_kex_agree_instr(kex, kex_len, s, method_len); - if(q) { - const LIBSSH2_KEX_METHOD *method = (const LIBSSH2_KEX_METHOD *) - kex_get_method_by_name((char *) s, method_len, -@@ -3504,9 +3518,9 @@ static int kex_agree_kex_hostkey(LIBSSH2_SESSION * session, unsigned char *kex, - } - - while(*kexp && (*kexp)->name) { -- s = kex_agree_instr(kex, kex_len, -- (unsigned char *) (*kexp)->name, -- strlen((*kexp)->name)); -+ s = _libssh2_kex_agree_instr(kex, kex_len, -+ (unsigned char *) (*kexp)->name, -+ strlen((*kexp)->name)); - if(s) { - /* We've agreed on a key exchange method, - * Can we agree on a hostkey that works with this kex? -@@ -3550,7 +3564,7 @@ static int kex_agree_crypt(LIBSSH2_SESSION * session, - unsigned char *p = (unsigned char *) strchr((char *) s, ','); - size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); - -- if(kex_agree_instr(crypt, crypt_len, s, method_len)) { -+ if(_libssh2_kex_agree_instr(crypt, crypt_len, s, method_len)) { - const LIBSSH2_CRYPT_METHOD *method = - (const LIBSSH2_CRYPT_METHOD *) - kex_get_method_by_name((char *) s, method_len, -@@ -3572,9 +3586,9 @@ static int kex_agree_crypt(LIBSSH2_SESSION * session, - } - - while(*cryptp && (*cryptp)->name) { -- s = kex_agree_instr(crypt, crypt_len, -- (unsigned char *) (*cryptp)->name, -- strlen((*cryptp)->name)); -+ s = _libssh2_kex_agree_instr(crypt, crypt_len, -+ (unsigned char *) (*cryptp)->name, -+ strlen((*cryptp)->name)); - if(s) { - endpoint->crypt = *cryptp; - return 0; -@@ -3614,7 +3628,7 @@ static int kex_agree_mac(LIBSSH2_SESSION * session, - unsigned char *p = (unsigned char *) strchr((char *) s, ','); - size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); - -- if(kex_agree_instr(mac, mac_len, s, method_len)) { -+ if(_libssh2_kex_agree_instr(mac, mac_len, s, method_len)) { - const LIBSSH2_MAC_METHOD *method = (const LIBSSH2_MAC_METHOD *) - kex_get_method_by_name((char *) s, method_len, - (const LIBSSH2_COMMON_METHOD **) -@@ -3635,8 +3649,9 @@ static int kex_agree_mac(LIBSSH2_SESSION * session, - } - - while(*macp && (*macp)->name) { -- s = kex_agree_instr(mac, mac_len, (unsigned char *) (*macp)->name, -- strlen((*macp)->name)); -+ s = _libssh2_kex_agree_instr(mac, mac_len, -+ (unsigned char *) (*macp)->name, -+ strlen((*macp)->name)); - if(s) { - endpoint->mac = *macp; - return 0; -@@ -3667,7 +3682,7 @@ static int kex_agree_comp(LIBSSH2_SESSION *session, - unsigned char *p = (unsigned char *) strchr((char *) s, ','); - size_t method_len = (p ? (size_t)(p - s) : strlen((char *) s)); - -- if(kex_agree_instr(comp, comp_len, s, method_len)) { -+ if(_libssh2_kex_agree_instr(comp, comp_len, s, method_len)) { - const LIBSSH2_COMP_METHOD *method = - (const LIBSSH2_COMP_METHOD *) - kex_get_method_by_name((char *) s, method_len, -@@ -3689,8 +3704,9 @@ static int kex_agree_comp(LIBSSH2_SESSION *session, - } - - while(*compp && (*compp)->name) { -- s = kex_agree_instr(comp, comp_len, (unsigned char *) (*compp)->name, -- strlen((*compp)->name)); -+ s = _libssh2_kex_agree_instr(comp, comp_len, -+ (unsigned char *) (*compp)->name, -+ strlen((*compp)->name)); - if(s) { - endpoint->comp = *compp; - return 0; -@@ -3871,6 +3887,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, - session->local.kexinit = key_state->oldlocal; - session->local.kexinit_len = key_state->oldlocal_len; - key_state->state = libssh2_NB_state_idle; -+ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; - session->state &= ~LIBSSH2_STATE_KEX_ACTIVE; - session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; - return -1; -@@ -3896,6 +3913,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, - session->local.kexinit = key_state->oldlocal; - session->local.kexinit_len = key_state->oldlocal_len; - key_state->state = libssh2_NB_state_idle; -+ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; - session->state &= ~LIBSSH2_STATE_KEX_ACTIVE; - session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; - return -1; -@@ -3944,6 +3962,7 @@ _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, - session->remote.kexinit = NULL; - } - -+ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; - session->state &= ~LIBSSH2_STATE_KEX_ACTIVE; - session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; - -diff --git a/src/libssh2_priv.h b/src/libssh2_priv.h -index 7660366954..18d9ab2130 100644 ---- a/src/libssh2_priv.h -+++ b/src/libssh2_priv.h -@@ -736,6 +736,9 @@ struct _LIBSSH2_SESSION - /* key signing algorithm preferences -- NULL yields server order */ - char *sign_algo_prefs; - -+ /* Whether to use the OpenSSH Strict KEX extension */ -+ int kex_strict; -+ - /* (remote as source of data -- packet_read ) */ - libssh2_endpoint_data remote; - -@@ -908,6 +911,7 @@ struct _LIBSSH2_SESSION - int fullpacket_macstate; - size_t fullpacket_payload_len; - int fullpacket_packet_type; -+ uint32_t fullpacket_required_type; - - /* State variables used in libssh2_sftp_init() */ - libssh2_nonblocking_states sftpInit_state; -@@ -948,10 +952,11 @@ struct _LIBSSH2_SESSION - }; - - /* session.state bits */ --#define LIBSSH2_STATE_EXCHANGING_KEYS 0x00000001 --#define LIBSSH2_STATE_NEWKEYS 0x00000002 --#define LIBSSH2_STATE_AUTHENTICATED 0x00000004 --#define LIBSSH2_STATE_KEX_ACTIVE 0x00000008 -+#define LIBSSH2_STATE_INITIAL_KEX 0x00000001 -+#define LIBSSH2_STATE_EXCHANGING_KEYS 0x00000002 -+#define LIBSSH2_STATE_NEWKEYS 0x00000004 -+#define LIBSSH2_STATE_AUTHENTICATED 0x00000008 -+#define LIBSSH2_STATE_KEX_ACTIVE 0x00000010 - - /* session.flag helpers */ - #ifdef MSG_NOSIGNAL -@@ -1182,6 +1187,11 @@ ssize_t _libssh2_send(libssh2_socket_t socket, const void *buffer, - int _libssh2_kex_exchange(LIBSSH2_SESSION * session, int reexchange, - key_exchange_state_t * state); - -+unsigned char *_libssh2_kex_agree_instr(unsigned char *haystack, -+ size_t haystack_len, -+ const unsigned char *needle, -+ size_t needle_len); -+ - /* Let crypt.c/hostkey.c expose their method structs */ - const LIBSSH2_CRYPT_METHOD **libssh2_crypt_methods(void); - const LIBSSH2_HOSTKEY_METHOD **libssh2_hostkey_methods(void); -diff --git a/src/packet.c b/src/packet.c -index eccb8c56a8..6da14e9fa1 100644 ---- a/src/packet.c -+++ b/src/packet.c -@@ -624,14 +624,13 @@ packet_authagent_open(LIBSSH2_SESSION * session, - * layer when it has received a packet. - * - * The input pointer 'data' is pointing to allocated data that this function -- * is asked to deal with so on failure OR success, it must be freed fine. -- * The only exception is when the return code is LIBSSH2_ERROR_EAGAIN. -+ * will be freed unless return the code is LIBSSH2_ERROR_EAGAIN. - * - * This function will always be called with 'datalen' greater than zero. - */ - int - _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, -- size_t datalen, int macstate) -+ size_t datalen, int macstate, uint32_t seq) - { - int rc = 0; - unsigned char *message = NULL; -@@ -676,6 +675,70 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - break; - } - -+ if(session->state & LIBSSH2_STATE_INITIAL_KEX) { -+ if(msg == SSH_MSG_KEXINIT) { -+ if(!session->kex_strict) { -+ if(datalen < 17) { -+ LIBSSH2_FREE(session, data); -+ session->packAdd_state = libssh2_NB_state_idle; -+ return _libssh2_error(session, -+ LIBSSH2_ERROR_BUFFER_TOO_SMALL, -+ "Data too short extracting kex"); -+ } -+ else { -+ const unsigned char *strict = -+ (unsigned char *)"kex-strict-s-v00@openssh.com"; -+ struct string_buf buf; -+ unsigned char *algs = NULL; -+ size_t algs_len = 0; -+ -+ buf.data = (unsigned char *)data; -+ buf.dataptr = buf.data; -+ buf.len = datalen; -+ buf.dataptr += 17; /* advance past type and cookie */ -+ -+ if(_libssh2_get_string(&buf, &algs, &algs_len)) { -+ LIBSSH2_FREE(session, data); -+ session->packAdd_state = libssh2_NB_state_idle; -+ return _libssh2_error(session, -+ LIBSSH2_ERROR_BUFFER_TOO_SMALL, -+ "Algs too short"); -+ } -+ -+ if(algs_len == 0 || -+ _libssh2_kex_agree_instr(algs, algs_len, strict, 28)) { -+ session->kex_strict = 1; -+ } -+ } -+ } -+ -+ if(session->kex_strict && seq) { -+ LIBSSH2_FREE(session, data); -+ session->socket_state = LIBSSH2_SOCKET_DISCONNECTED; -+ session->packAdd_state = libssh2_NB_state_idle; -+ libssh2_session_disconnect(session, "strict KEX violation: " -+ "KEXINIT was not the first packet"); -+ -+ return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_DISCONNECT, -+ "strict KEX violation: " -+ "KEXINIT was not the first packet"); -+ } -+ } -+ -+ if(session->kex_strict && session->fullpacket_required_type && -+ session->fullpacket_required_type != msg) { -+ LIBSSH2_FREE(session, data); -+ session->socket_state = LIBSSH2_SOCKET_DISCONNECTED; -+ session->packAdd_state = libssh2_NB_state_idle; -+ libssh2_session_disconnect(session, "strict KEX violation: " -+ "unexpected packet type"); -+ -+ return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_DISCONNECT, -+ "strict KEX violation: " -+ "unexpected packet type"); -+ } -+ } -+ - if(session->packAdd_state == libssh2_NB_state_allocated) { - /* A couple exceptions to the packet adding rule: */ - switch(msg) { -@@ -1364,6 +1427,15 @@ _libssh2_packet_ask(LIBSSH2_SESSION * session, unsigned char packet_type, - - return 0; - } -+ else if(session->kex_strict && -+ (session->state & LIBSSH2_STATE_INITIAL_KEX)) { -+ libssh2_session_disconnect(session, "strict KEX violation: " -+ "unexpected packet type"); -+ -+ return _libssh2_error(session, LIBSSH2_ERROR_SOCKET_DISCONNECT, -+ "strict KEX violation: " -+ "unexpected packet type"); -+ } - packet = _libssh2_list_next(&packet->node); - } - return -1; -@@ -1425,7 +1497,10 @@ _libssh2_packet_require(LIBSSH2_SESSION * session, unsigned char packet_type, - } - - while(session->socket_state == LIBSSH2_SOCKET_CONNECTED) { -- int ret = _libssh2_transport_read(session); -+ int ret; -+ session->fullpacket_required_type = packet_type; -+ ret = _libssh2_transport_read(session); -+ session->fullpacket_required_type = 0; - if(ret == LIBSSH2_ERROR_EAGAIN) - return ret; - else if(ret < 0) { -diff --git a/src/packet.h b/src/packet.h -index 1d90b8af12..955351e5f6 100644 ---- a/src/packet.h -+++ b/src/packet.h -@@ -72,6 +72,6 @@ int _libssh2_packet_burn(LIBSSH2_SESSION * session, - int _libssh2_packet_write(LIBSSH2_SESSION * session, unsigned char *data, - unsigned long data_len); - int _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, -- size_t datalen, int macstate); -+ size_t datalen, int macstate, uint32_t seq); - - #endif /* LIBSSH2_PACKET_H */ -diff --git a/src/session.c b/src/session.c -index 35e7929fe7..9d89ade8ec 100644 ---- a/src/session.c -+++ b/src/session.c -@@ -469,6 +469,8 @@ libssh2_session_init_ex(LIBSSH2_ALLOC_FUNC((*my_alloc)), - session->abstract = abstract; - session->api_timeout = 0; /* timeout-free API by default */ - session->api_block_mode = 1; /* blocking API by default */ -+ session->state = LIBSSH2_STATE_INITIAL_KEX; -+ session->fullpacket_required_type = 0; - session->packet_read_timeout = LIBSSH2_DEFAULT_READ_TIMEOUT; - session->flag.quote_paths = 1; /* default behavior is to quote paths - for the scp subsystem */ -@@ -1223,6 +1225,7 @@ libssh2_session_disconnect_ex(LIBSSH2_SESSION *session, int reason, - const char *desc, const char *lang) - { - int rc; -+ session->state &= ~LIBSSH2_STATE_INITIAL_KEX; - session->state &= ~LIBSSH2_STATE_EXCHANGING_KEYS; - BLOCK_ADJUST(rc, session, - session_disconnect(session, reason, desc, lang)); -diff --git a/src/transport.c b/src/transport.c -index 21be9d2b80..a8bb588a4b 100644 ---- a/src/transport.c -+++ b/src/transport.c -@@ -186,6 +186,7 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) - struct transportpacket *p = &session->packet; - int rc; - int compressed; -+ uint32_t seq = session->remote.seqno; - - if(session->fullpacket_state == libssh2_NB_state_idle) { - session->fullpacket_macstate = LIBSSH2_MAC_CONFIRMED; -@@ -317,7 +318,7 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) - if(session->fullpacket_state == libssh2_NB_state_created) { - rc = _libssh2_packet_add(session, p->payload, - session->fullpacket_payload_len, -- session->fullpacket_macstate); -+ session->fullpacket_macstate, seq); - if(rc == LIBSSH2_ERROR_EAGAIN) - return rc; - if(rc) { -@@ -328,6 +329,11 @@ fullpacket(LIBSSH2_SESSION * session, int encrypted /* 1 or 0 */ ) - - session->fullpacket_state = libssh2_NB_state_idle; - -+ if(session->kex_strict && -+ session->fullpacket_packet_type == SSH_MSG_NEWKEYS) { -+ session->remote.seqno = 0; -+ } -+ - return session->fullpacket_packet_type; - } - -@@ -1093,6 +1099,10 @@ int _libssh2_transport_send(LIBSSH2_SESSION *session, - - session->local.seqno++; - -+ if(session->kex_strict && data[0] == SSH_MSG_NEWKEYS) { -+ session->local.seqno = 0; -+ } -+ - ret = LIBSSH2_SEND(session, p->outbuf, total_length, - LIBSSH2_SOCKET_SEND_FLAGS(session)); - if(ret < 0) diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index e548b011f66d..42f8acbc8f3f 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -15,19 +15,13 @@ stdenv.mkDerivation rec { pname = "libssh2"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { url = "https://www.libssh2.org/download/libssh2-${version}.tar.gz"; - sha256 = "sha256-NzYWHkHiaTMk3rOMJs/cPv5iCdY0ukJY2xzs/2pa1GE="; + hash = "sha256-2ex2y+NNuY7sNTn+LImdJrDIN8s+tGalaw8QnKv2WPc="; }; - patches = [ - # fetchpatch cannot be used due to infinite recursion - # https://github.com/libssh2/libssh2/commit/d34d9258b8420b19ec3f97b4cc5bf7aa7d98e35a - ./CVE-2023-48795.patch - ]; - # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion # necessary for FreeBSD code path in configure postPatch = '' From 59b91bae8c9f855411d9f4cb847a6d17e73284b5 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 17 Oct 2024 07:13:39 +0100 Subject: [PATCH 040/617] autoconf-archive: 2023.02.20 -> 2024.10.16 --- pkgs/development/tools/misc/autoconf-archive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix index 3fbfabcee265..a507fd8094ef 100644 --- a/pkgs/development/tools/misc/autoconf-archive/default.nix +++ b/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "autoconf-archive"; - version = "2023.02.20"; + version = "2024.10.16"; src = fetchurl { url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz"; - hash = "sha256-cdQEhHmuKPH1eUYZw9ct+cAd9JscYo74X943WW3DGjM="; + hash = "sha256-e81dABkW86UO10NvT3AOPSsbrePtgDIZxZLWJQKlc2M="; }; strictDeps = true; From e2e74de075a3d06facde5e2c67b66bdf4340577c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Oct 2024 06:32:14 +0000 Subject: [PATCH 041/617] vim: 9.1.0765 -> 9.1.0787 --- pkgs/applications/editors/vim/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 67cf247fe72a..afe60212baf7 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: rec { - version = "9.1.0765"; + version = "9.1.0787"; outputs = [ "out" "xxd" ]; @@ -8,7 +8,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-LtEEMpdWXA6qyjAIjgsZoc4hNXXG2ZXxCsbWKC5aEPI="; + hash = "sha256-kV2SaIOUv+ZcDsqBibZZ38gCevVLhejcYtY0TCQVtig="; }; enableParallelBuilding = true; From 68da0b94729bfcccfb7944f26b192f739b565cd8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Oct 2024 10:45:39 +0000 Subject: [PATCH 042/617] memcached: 1.6.29 -> 1.6.31 --- pkgs/servers/memcached/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index f1e2c027db6a..52dee4aa95dd 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.29"; + version = "1.6.31"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-JpZD1Ri3uiAzx6H2b9/FYNcnJaKCIZTZDII1QIxEOkk="; + sha256 = "sha256-INjTObj7H2x5zuIFWdxv+13+6E255Yn06yFPbSyHPvU="; }; configureFlags = [ From 58b590d966e4f2aefcd6271b6ae63a9a8b1b3c1a Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 17 Oct 2024 13:36:33 +0100 Subject: [PATCH 043/617] darwin.libiconv: unconditionalize static patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To ensure that it doesn’t bitrot again. --- .../apple-source-releases/libiconv/package.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/package.nix index 615e9b840751..0803ff7a4dad 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/package.nix @@ -20,15 +20,12 @@ mkAppleDerivation (finalAttrs: { xcodeHash = "sha256-IiTqhEJIZ8JYjlpBS7ITwYlp8ndU6cehus9TIr+5LYM="; - patches = - lib.optionals hostPlatform.isStatic [ - # Use gperf to implement module loading statically by looking up the module functions in the static binary. - ./patches/0001-Support-static-module-loading.patch - ] - ++ [ - # Avoid out of bounds write with ISO-2022 - ./patches/0002-Fix-ISO-2022-out-of-bounds-write-with-encoded-charac.patch - ]; + patches = [ + # Use gperf to implement module loading statically by looking up the module functions in the static binary. + ./patches/0001-Support-static-module-loading.patch + # Avoid out of bounds write with ISO-2022 + ./patches/0002-Fix-ISO-2022-out-of-bounds-write-with-encoded-charac.patch + ]; # Propagate `out` only when there are dylibs to link (i.e., don’t propagate when doing a static build). propagatedBuildOutputs = lib.optionalString (!hostPlatform.isStatic) "out"; From 11cced659e5ae12645b4542c12527d6c09d74066 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:17:39 -0400 Subject: [PATCH 044/617] python312Packages.clickclick: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/clickclick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix index 117e5c0c4196..d12463132c96 100644 --- a/pkgs/development/python-modules/clickclick/default.nix +++ b/pkgs/development/python-modules/clickclick/default.nix @@ -7,7 +7,7 @@ pyyaml, six, pytestCheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub ]; propagatedBuildInputs = [ flake8 From 195c9123542cd2489685a0a5273516fe3d622a2e Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:19:16 -0400 Subject: [PATCH 045/617] python312Packages.dbus-next: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/dbus-next/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbus-next/default.nix b/pkgs/development/python-modules/dbus-next/default.nix index 117fa8c08948..038186c8d3aa 100644 --- a/pkgs/development/python-modules/dbus-next/default.nix +++ b/pkgs/development/python-modules/dbus-next/default.nix @@ -6,7 +6,7 @@ setuptools, dbus, pytest, - pytest-cov, + pytest-cov-stub, pytest-asyncio, pytest-timeout, }: @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeCheckInputs = [ dbus pytest - pytest-cov + pytest-cov-stub pytest-asyncio pytest-timeout ]; From 6244788e1e21fc20525fb2403978ce2461127494 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:19:23 -0400 Subject: [PATCH 046/617] python312Packages.echo: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/echo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/echo/default.nix b/pkgs/development/python-modules/echo/default.nix index a07f10e8a4b1..376938a55cbe 100644 --- a/pkgs/development/python-modules/echo/default.nix +++ b/pkgs/development/python-modules/echo/default.nix @@ -11,7 +11,7 @@ qtpy, pyqt6, pytestCheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -51,7 +51,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub ]; pythonImportsCheck = [ "echo" ]; From df2eef0dedc3aeb49a2158f4dd57a2bed9b49875 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:19:32 -0400 Subject: [PATCH 047/617] python312Packages.fairscale: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/fairscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fairscale/default.nix b/pkgs/development/python-modules/fairscale/default.nix index 4472d6e24a4f..e870e2c934e7 100644 --- a/pkgs/development/python-modules/fairscale/default.nix +++ b/pkgs/development/python-modules/fairscale/default.nix @@ -11,7 +11,7 @@ # check inputs pytestCheckHook, parameterized, - pytest-cov, + pytest-cov-stub, pytest-timeout, remote-pdb, }: @@ -51,7 +51,7 @@ buildPythonPackage { nativeCheckInputs = [ pytestCheckHook parameterized - pytest-cov + pytest-cov-stub pytest-timeout remote-pdb ]; From 7d76cd700d7be8724ce472845fed933faa159484 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:19:40 -0400 Subject: [PATCH 048/617] python312Packages.fast-histogram: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/fast-histogram/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fast-histogram/default.nix b/pkgs/development/python-modules/fast-histogram/default.nix index d0621c1b539e..3a3ada743a4e 100644 --- a/pkgs/development/python-modules/fast-histogram/default.nix +++ b/pkgs/development/python-modules/fast-histogram/default.nix @@ -10,7 +10,7 @@ numpy, wheel, hypothesis, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -38,7 +38,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook hypothesis - pytest-cov + pytest-cov-stub ]; pytestFlagsArray = [ "${builtins.placeholder "out"}/${python.sitePackages}" ]; From bbfbfa07bdf92e82f0685b616badc13c82332f20 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:19:57 -0400 Subject: [PATCH 049/617] python312Packages.flufl-lock: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/flufl/lock.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix index 3c1b2ce83efd..f11178381f4b 100644 --- a/pkgs/development/python-modules/flufl/lock.nix +++ b/pkgs/development/python-modules/flufl/lock.nix @@ -5,7 +5,7 @@ fetchPypi, hatchling, psutil, - pytest-cov, + pytest-cov-stub, pytestCheckHook, pythonOlder, sybil, @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub sybil ]; From 4c0dbf162baf31e47df038392db84ce5f487931e Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:20:03 -0400 Subject: [PATCH 050/617] python312Packages.googlemaps: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/googlemaps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/googlemaps/default.nix b/pkgs/development/python-modules/googlemaps/default.nix index 0e936dd7e183..c4396a52ae30 100644 --- a/pkgs/development/python-modules/googlemaps/default.nix +++ b/pkgs/development/python-modules/googlemaps/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - pytest-cov, + pytest-cov-stub, pytestCheckHook, pythonOlder, requests, @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; nativeCheckInputs = [ - pytest-cov + pytest-cov-stub pytestCheckHook responses ]; From c97526afed386b049106a40ba6888d401bde011c Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:20:13 -0400 Subject: [PATCH 051/617] python312Packages.gunicorn: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/gunicorn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index 45a7b6862421..d6130ef31287 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -17,7 +17,7 @@ setproctitle, pytestCheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -50,7 +50,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub ] ++ lib.flatten (lib.attrValues optional-dependencies); meta = { From a07ff3b1bbebdcac1ee3d1317c47aff100c308c2 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:20:21 -0400 Subject: [PATCH 052/617] python312Packages.haystack-ai: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/haystack-ai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/haystack-ai/default.nix b/pkgs/development/python-modules/haystack-ai/default.nix index c5d12912633e..f1ac68d9374a 100644 --- a/pkgs/development/python-modules/haystack-ai/default.nix +++ b/pkgs/development/python-modules/haystack-ai/default.nix @@ -42,7 +42,7 @@ pylint, pytest, pytest-asyncio, - pytest-cov, + pytest-cov-stub, # , pytest-custom-exit-code python-multipart, reno, @@ -167,7 +167,7 @@ buildPythonPackage rec { pylint pytest pytest-asyncio - pytest-cov + pytest-cov-stub # pytest-custom-exit-code python-multipart reno From 788d11f457aada708de6c5f167d25d730d7355ec Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:20:30 -0400 Subject: [PATCH 053/617] python312Packages.injector: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/injector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/injector/default.nix b/pkgs/development/python-modules/injector/default.nix index 7ce90c23f622..734b3b3f6d33 100644 --- a/pkgs/development/python-modules/injector/default.nix +++ b/pkgs/development/python-modules/injector/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, typing-extensions, pytestCheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub ]; pythonImportsCheck = [ "injector" ]; From 8ebf13b49711009445948a328ce3d61fb78226eb Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:20:37 -0400 Subject: [PATCH 054/617] python312Packages.iocapture: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/iocapture/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iocapture/default.nix b/pkgs/development/python-modules/iocapture/default.nix index a36a01eeeead..0e44cad6916b 100644 --- a/pkgs/development/python-modules/iocapture/default.nix +++ b/pkgs/development/python-modules/iocapture/default.nix @@ -4,7 +4,7 @@ fetchPypi, flexmock, pytest, - pytest-cov, + pytest-cov-stub, six, }: @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeCheckInputs = [ flexmock pytest - pytest-cov + pytest-cov-stub six ]; From 2d53d3790721b8a67b31fe92caddb3a210e2a27d Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:20:45 -0400 Subject: [PATCH 055/617] python312Packages.ipfshttpclient: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/ipfshttpclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipfshttpclient/default.nix b/pkgs/development/python-modules/ipfshttpclient/default.nix index e44127372172..263870816dab 100644 --- a/pkgs/development/python-modules/ipfshttpclient/default.nix +++ b/pkgs/development/python-modules/ipfshttpclient/default.nix @@ -8,7 +8,7 @@ py-multiaddr, requests, pytestCheckHook, - pytest-cov, + pytest-cov-stub, pytest-dependency, pytest-localserver, pytest-mock, @@ -42,7 +42,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub pytest-dependency pytest-localserver pytest-mock From 3d7a2e91743dd7e3bb1e80736db6d63423d8507a Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:20:50 -0400 Subject: [PATCH 056/617] python312Packages.isbnlib: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/isbnlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index 8bf7e67b9ecd..627bdeadfc1e 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, - pytest-cov, + pytest-cov-stub, setuptools, }: @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub ]; pytestFlagsArray = [ "isbnlib/test/" ]; From e198a6026839ed6d451add6eafd1c622278b0b22 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:20:57 -0400 Subject: [PATCH 057/617] python312Packages.jwt: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/jwt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jwt/default.nix b/pkgs/development/python-modules/jwt/default.nix index fc058f7d7004..2da80c7e183c 100644 --- a/pkgs/development/python-modules/jwt/default.nix +++ b/pkgs/development/python-modules/jwt/default.nix @@ -6,7 +6,7 @@ cryptography, freezegun, pytestCheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook freezegun - pytest-cov + pytest-cov-stub ]; pythonImportsCheck = [ "jwt" ]; From 6d73eaa60dfabbead35a7b1781c077f9d9c613ba Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:21:04 -0400 Subject: [PATCH 058/617] python312Packages.monero: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/monero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/monero/default.nix b/pkgs/development/python-modules/monero/default.nix index a0ef05cb3b05..4fdab49a521e 100644 --- a/pkgs/development/python-modules/monero/default.nix +++ b/pkgs/development/python-modules/monero/default.nix @@ -9,7 +9,7 @@ six, varint, pytestCheckHook, - pytest-cov, + pytest-cov-stub, responses, }: @@ -44,7 +44,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub responses ]; From 87135622104d51fd84f3ff91c1369ebe77206ab0 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:21:12 -0400 Subject: [PATCH 059/617] python312Packages.pettingzoo: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/pettingzoo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pettingzoo/default.nix b/pkgs/development/python-modules/pettingzoo/default.nix index e2e562f0d0f1..f388de21a026 100644 --- a/pkgs/development/python-modules/pettingzoo/default.nix +++ b/pkgs/development/python-modules/pettingzoo/default.nix @@ -17,7 +17,7 @@ pre-commit, pynput, pytest, - pytest-cov, + pytest-cov-stub, pytest-markdown-docs, pytest-xdist, pytestCheckHook, @@ -87,7 +87,7 @@ buildPythonPackage rec { pre-commit pynput pytest - pytest-cov + pytest-cov-stub pytest-markdown-docs pytest-xdist ]; From afadc6f9260e3120cc427a7c13865c8023b2160a Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:21:20 -0400 Subject: [PATCH 060/617] python312Packages.pgmpy: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/pgmpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pgmpy/default.nix b/pkgs/development/python-modules/pgmpy/default.nix index 1217f573cdcd..810f1aa26859 100644 --- a/pkgs/development/python-modules/pgmpy/default.nix +++ b/pkgs/development/python-modules/pgmpy/default.nix @@ -20,7 +20,7 @@ # tests pytestCheckHook, - pytest-cov, + pytest-cov-stub, coverage, mock, black, @@ -69,7 +69,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook # xdoctest - pytest-cov + pytest-cov-stub coverage mock black From c56d950ff3b558bdc9c8677d8ae00b3ca5ac171b Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:21:26 -0400 Subject: [PATCH 061/617] python312Packages.plaster: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/plaster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaster/default.nix b/pkgs/development/python-modules/plaster/default.nix index 3585d4a7721b..0651404dc477 100644 --- a/pkgs/development/python-modules/plaster/default.nix +++ b/pkgs/development/python-modules/plaster/default.nix @@ -2,7 +2,7 @@ buildPythonPackage, fetchPypi, pytest, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -21,6 +21,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest - pytest-cov + pytest-cov-stub ]; } From e197c36efdc7ecde34f36cb7de8f88c1d399d0bb Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:21:34 -0400 Subject: [PATCH 062/617] python312Packages.property-manager: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/property-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/property-manager/default.nix b/pkgs/development/python-modules/property-manager/default.nix index e1eee500812e..71fa0e1aeddb 100644 --- a/pkgs/development/python-modules/property-manager/default.nix +++ b/pkgs/development/python-modules/property-manager/default.nix @@ -6,7 +6,7 @@ verboselogs, coloredlogs, pytest, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -28,7 +28,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ pytest - pytest-cov + pytest-cov-stub ]; meta = with lib; { From b703f4d0ce9e6a5b573ca81d8c7311b47869270c Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:21:42 -0400 Subject: [PATCH 063/617] python312Packages.psautohint: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/psautohint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix index 9782458b4ccb..605936dd8637 100644 --- a/pkgs/development/python-modules/psautohint/default.nix +++ b/pkgs/development/python-modules/psautohint/default.nix @@ -8,7 +8,7 @@ fs, # for fonttools extras setuptools-scm, pytestCheckHook, - pytest-cov, + pytest-cov-stub, pytest-xdist, runAllTests ? false, psautohint, # for passthru.tests @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub pytest-xdist ]; disabledTests = lib.optionals (!runAllTests) [ From 112a7efe154309cbcb1ec584134d116d9dcbf079 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:21:49 -0400 Subject: [PATCH 064/617] python312Packages.pyevtk: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/pyevtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyevtk/default.nix b/pkgs/development/python-modules/pyevtk/default.nix index 16081d1cc613..6fd66a737ceb 100644 --- a/pkgs/development/python-modules/pyevtk/default.nix +++ b/pkgs/development/python-modules/pyevtk/default.nix @@ -5,7 +5,7 @@ setuptools, numpy, pytestCheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub ]; pythonImportsCheck = [ "pyevtk" ]; From c4a2c16c76b3a7bff32edf69630d3d6a8c3350a6 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:21:57 -0400 Subject: [PATCH 065/617] python312Packages.pyexcel-xls: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/pyexcel-xls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyexcel-xls/default.nix b/pkgs/development/python-modules/pyexcel-xls/default.nix index c372ca08adf1..81bcc8ade772 100644 --- a/pkgs/development/python-modules/pyexcel-xls/default.nix +++ b/pkgs/development/python-modules/pyexcel-xls/default.nix @@ -8,7 +8,7 @@ xlwt, pyexcel, pytestCheckHook, - pytest-cov, + pytest-cov-stub, setuptools, }: @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pyexcel - pytest-cov + pytest-cov-stub ]; postPatch = '' From da9a4b0b6404960833cb6691ccd4429658aa8e97 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:22:04 -0400 Subject: [PATCH 066/617] python312Packages.pymaven-patch: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/pymaven-patch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymaven-patch/default.nix b/pkgs/development/python-modules/pymaven-patch/default.nix index c390123e4c5a..a8622f2e9bd5 100644 --- a/pkgs/development/python-modules/pymaven-patch/default.nix +++ b/pkgs/development/python-modules/pymaven-patch/default.nix @@ -7,7 +7,7 @@ six, lxml, pytestCheckHook, - pytest-cov, + pytest-cov-stub, mock, }: buildPythonPackage rec { @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub mock ]; From 5db834e1729ab3dda998cdf5feb2fdc3676e2174 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:22:23 -0400 Subject: [PATCH 067/617] python312Packages.pyscaffold*: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/pyscaffold/default.nix | 4 ++-- .../python-modules/pyscaffoldext-cookiecutter/default.nix | 4 ++-- .../python-modules/pyscaffoldext-custom-extension/default.nix | 4 ++-- .../python-modules/pyscaffoldext-django/default.nix | 4 ++-- .../python-modules/pyscaffoldext-dsproject/default.nix | 4 ++-- .../python-modules/pyscaffoldext-markdown/default.nix | 4 ++-- .../python-modules/pyscaffoldext-travis/default.nix | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/pyscaffold/default.nix b/pkgs/development/python-modules/pyscaffold/default.nix index 127ca5bb96c2..5a0b13086071 100644 --- a/pkgs/development/python-modules/pyscaffold/default.nix +++ b/pkgs/development/python-modules/pyscaffold/default.nix @@ -23,7 +23,7 @@ certifi, flake8, pytest, - pytest-cov, + pytest-cov-stub, pytest-randomly, pytest-xdist, sphinx, @@ -80,7 +80,7 @@ buildPythonPackage rec { flake8 pre-commit pytest - pytest-cov + pytest-cov-stub pytest-randomly pytest-xdist setuptools diff --git a/pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix b/pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix index a34bf93334e9..d5ba7c9b6d82 100644 --- a/pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix @@ -11,7 +11,7 @@ configupdater, pre-commit, pytest, - pytest-cov, + pytest-cov-stub, pytest-xdist, tox, virtualenv, @@ -44,7 +44,7 @@ buildPythonPackage rec { configupdater pre-commit pytest - pytest-cov + pytest-cov-stub pytest-xdist setuptools-scm tox diff --git a/pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix b/pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix index ee4bc3aa728b..0ee14743b5e9 100644 --- a/pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix @@ -11,7 +11,7 @@ pyscaffold, pre-commit, pytest, - pytest-cov, + pytest-cov-stub, pytest-xdist, tox, virtualenv, @@ -45,7 +45,7 @@ buildPythonPackage rec { configupdater pre-commit pytest - pytest-cov + pytest-cov-stub pytest-xdist setuptools-scm tox diff --git a/pkgs/development/python-modules/pyscaffoldext-django/default.nix b/pkgs/development/python-modules/pyscaffoldext-django/default.nix index e0e9ca4cf69f..6270dbc2d1d5 100644 --- a/pkgs/development/python-modules/pyscaffoldext-django/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-django/default.nix @@ -10,7 +10,7 @@ configupdater, pre-commit, pytest, - pytest-cov, + pytest-cov-stub, pytest-xdist, tox, virtualenv, @@ -42,7 +42,7 @@ buildPythonPackage rec { configupdater pre-commit pytest - pytest-cov + pytest-cov-stub pytest-xdist setuptools-scm tox diff --git a/pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix b/pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix index 9763ba8ace95..cc70d4098ab8 100644 --- a/pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix @@ -11,7 +11,7 @@ configupdater, pre-commit, pytest, - pytest-cov, + pytest-cov-stub, pytest-xdist, tox, virtualenv, @@ -44,7 +44,7 @@ buildPythonPackage rec { configupdater pre-commit pytest - pytest-cov + pytest-cov-stub pytest-xdist setuptools-scm tox diff --git a/pkgs/development/python-modules/pyscaffoldext-markdown/default.nix b/pkgs/development/python-modules/pyscaffoldext-markdown/default.nix index 4d6157ed4d99..d84320a77a95 100644 --- a/pkgs/development/python-modules/pyscaffoldext-markdown/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-markdown/default.nix @@ -11,7 +11,7 @@ configupdater, pre-commit, pytest, - pytest-cov, + pytest-cov-stub, pytest-xdist, tox, twine, @@ -46,7 +46,7 @@ buildPythonPackage rec { configupdater pre-commit pytest - pytest-cov + pytest-cov-stub pytest-xdist setuptools-scm tox diff --git a/pkgs/development/python-modules/pyscaffoldext-travis/default.nix b/pkgs/development/python-modules/pyscaffoldext-travis/default.nix index 6c08f6c23adc..4eeaafd14c22 100644 --- a/pkgs/development/python-modules/pyscaffoldext-travis/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-travis/default.nix @@ -10,7 +10,7 @@ configupdater, pre-commit, pytest, - pytest-cov, + pytest-cov-stub, pytest-xdist, tox, virtualenv, @@ -42,7 +42,7 @@ buildPythonPackage rec { configupdater pre-commit pytest - pytest-cov + pytest-cov-stub pytest-xdist setuptools-scm tox From d5886a2e3166ed668a4581182b1d6647c46fcf5e Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:23:33 -0400 Subject: [PATCH 068/617] python312Packages.pystac: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/pystac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pystac/default.nix b/pkgs/development/python-modules/pystac/default.nix index c97862176e26..3f118b581a5c 100644 --- a/pkgs/development/python-modules/pystac/default.nix +++ b/pkgs/development/python-modules/pystac/default.nix @@ -7,7 +7,7 @@ html5lib, jsonschema, - pytest-cov, + pytest-cov-stub, pytest-mock, pytest-recording, python-dateutil, @@ -36,7 +36,7 @@ buildPythonPackage rec { html5lib jsonschema pytestCheckHook - pytest-cov + pytest-cov-stub pytest-mock pytest-recording requests-mock From 73cf526286a09a8a43bf34ffe4018cdc731ffb77 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:23:42 -0400 Subject: [PATCH 069/617] python312Packages.pytest-*: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/pytest-cid/default.nix | 4 ++-- .../python-modules/pytest-filter-subpackage/default.nix | 4 ++-- pkgs/development/python-modules/pytest-notebook/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pytest-cid/default.nix b/pkgs/development/python-modules/pytest-cid/default.nix index b73648e2a673..ae5b5e848855 100644 --- a/pkgs/development/python-modules/pytest-cid/default.nix +++ b/pkgs/development/python-modules/pytest-cid/default.nix @@ -6,7 +6,7 @@ flit-core, py-cid, pytestCheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub ]; pythonImportsCheck = [ "pytest_cid" ]; diff --git a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix index 9908c3b2b4ff..cdb9765243c0 100644 --- a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix +++ b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchPypi, pytest, - pytest-cov, + pytest-cov-stub, pytest-doctestplus, pytestCheckHook, pythonOlder, @@ -28,7 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytest-doctestplus - pytest-cov + pytest-cov-stub ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-notebook/default.nix b/pkgs/development/python-modules/pytest-notebook/default.nix index 21f40beb6a89..f66f42081c58 100644 --- a/pkgs/development/python-modules/pytest-notebook/default.nix +++ b/pkgs/development/python-modules/pytest-notebook/default.nix @@ -12,7 +12,7 @@ black, coverage, ipykernel, - pytest-cov, + pytest-cov-stub, pytest-regressions, pytestCheckHook, }: @@ -54,7 +54,7 @@ buildPythonPackage rec { black coverage ipykernel - pytest-cov + pytest-cov-stub pytest-regressions pytestCheckHook ]; From 202b4b5c7ca9221a831d3680f2a5805c5e14a532 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:23:51 -0400 Subject: [PATCH 070/617] python312Packages.rdflib: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/rdflib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index f6a5ded15e74..72f6e8c8d485 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -23,7 +23,7 @@ # tests pip, - pytest-cov, + pytest-cov-stub, pytest7CheckHook, setuptools, }: @@ -59,7 +59,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pip - pytest-cov + pytest-cov-stub # Failed: DID NOT WARN. No warnings of type (,) were emitted. pytest7CheckHook setuptools From 7f7c3242afa2afb51b547e30c4c9417d1366f666 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:23:58 -0400 Subject: [PATCH 071/617] python312Packages.reikna: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/reikna/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index 716162be03a4..f1877c11e12e 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -3,7 +3,7 @@ fetchPypi, buildPythonPackage, sphinx, - pytest-cov, + pytest-cov-stub, pytest, mako, numpy, @@ -26,7 +26,7 @@ buildPythonPackage rec { nativeCheckInputs = [ sphinx - pytest-cov + pytest-cov-stub pytest ]; From 419db747e45e713fdb08019d595366d81495b16f Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:24:06 -0400 Subject: [PATCH 072/617] python312Packages.schwifty: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/schwifty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/schwifty/default.nix b/pkgs/development/python-modules/schwifty/default.nix index 02a70e00ecec..34ff86457720 100644 --- a/pkgs/development/python-modules/schwifty/default.nix +++ b/pkgs/development/python-modules/schwifty/default.nix @@ -18,7 +18,7 @@ # tests pytestCheckHook, - pytest-cov, + pytest-cov-stub, pythonOlder, }: @@ -50,7 +50,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - pytest-cov + pytest-cov-stub pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); From 9e2dc7918b3434081593933dc8505a48ff6c1a4d Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:28:04 -0400 Subject: [PATCH 073/617] python312Packages.sentence-transformers: pytest-cov -> pytest-cov-stub --- .../python-modules/sentence-transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix index c70ea216cd42..fde086510905 100644 --- a/pkgs/development/python-modules/sentence-transformers/default.nix +++ b/pkgs/development/python-modules/sentence-transformers/default.nix @@ -23,7 +23,7 @@ accelerate, datasets, pytestCheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -57,7 +57,7 @@ buildPythonPackage rec { accelerate datasets pytestCheckHook - pytest-cov + pytest-cov-stub ]; pythonImportsCheck = [ "sentence_transformers" ]; From 59d1cfb2350a2340037d0cc90184c6c62cdcf1ae Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:28:10 -0400 Subject: [PATCH 074/617] python312Packages.snapshottest: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/snapshottest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snapshottest/default.nix b/pkgs/development/python-modules/snapshottest/default.nix index 4c697fcdb923..244a1627f11c 100644 --- a/pkgs/development/python-modules/snapshottest/default.nix +++ b/pkgs/development/python-modules/snapshottest/default.nix @@ -6,7 +6,7 @@ six, termcolor, pytestCheckHook, - pytest-cov, + pytest-cov-stub, django, }: @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeCheckInputs = [ django pytestCheckHook - pytest-cov + pytest-cov-stub ]; pythonImportsCheck = [ "snapshottest" ]; From 48887a6046f6449fc6308505c4f4783854509f2b Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:28:17 -0400 Subject: [PATCH 075/617] python312Packages.sortedcollections: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/sortedcollections/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sortedcollections/default.nix b/pkgs/development/python-modules/sortedcollections/default.nix index 3ee4eff75023..a525167635b6 100644 --- a/pkgs/development/python-modules/sortedcollections/default.nix +++ b/pkgs/development/python-modules/sortedcollections/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - pytest-cov, + pytest-cov-stub, pytestCheckHook, sortedcontainers, }: @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sortedcontainers ]; nativeCheckInputs = [ - pytest-cov + pytest-cov-stub pytestCheckHook ]; From 2b8b58d8de5552a4b0d4f34e1c54a3d22f780229 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:28:25 -0400 Subject: [PATCH 076/617] python312Packages.stups-fullstop: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/stups-fullstop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stups-fullstop/default.nix b/pkgs/development/python-modules/stups-fullstop/default.nix index 494c8ecf1e9e..a2662d754c55 100644 --- a/pkgs/development/python-modules/stups-fullstop/default.nix +++ b/pkgs/development/python-modules/stups-fullstop/default.nix @@ -7,7 +7,7 @@ stups-cli-support, stups-zign, pytest, - pytest-cov, + pytest-cov-stub, isPy3k, }: @@ -36,7 +36,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest - pytest-cov + pytest-cov-stub ]; meta = with lib; { From e208ff1087bdfd2a31b40929609f9dbe22487e06 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:28:32 -0400 Subject: [PATCH 077/617] python312Packages.subliminal: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/subliminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix index 23347af0ff45..a810ecb48699 100644 --- a/pkgs/development/python-modules/subliminal/default.nix +++ b/pkgs/development/python-modules/subliminal/default.nix @@ -21,7 +21,7 @@ tomli, pytestCheckHook, - pytest-cov, + pytest-cov-stub, pytest-xdist, mypy, sympy, @@ -62,7 +62,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub pytest-xdist mypy sympy From 5391f72c5604c645ca770481027c60b2ba0e9618 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:28:38 -0400 Subject: [PATCH 078/617] python312Packages.tf2onnx: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/tf2onnx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tf2onnx/default.nix b/pkgs/development/python-modules/tf2onnx/default.nix index 54a837089bc8..5049d5043775 100644 --- a/pkgs/development/python-modules/tf2onnx/default.nix +++ b/pkgs/development/python-modules/tf2onnx/default.nix @@ -14,7 +14,7 @@ pytestCheckHook, graphviz, parameterized, - pytest-cov, + pytest-cov-stub, pyyaml, timeout-decorator, onnxruntime, @@ -57,7 +57,7 @@ buildPythonPackage rec { pytestCheckHook graphviz parameterized - pytest-cov + pytest-cov-stub pyyaml timeout-decorator keras From 6372046ee5e290c252edca127ab05632974d9e16 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:28:48 -0400 Subject: [PATCH 079/617] python312Packages.torch-geometric: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/torch-geometric/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torch-geometric/default.nix b/pkgs/development/python-modules/torch-geometric/default.nix index ed3bbdc73569..952aa7bd1294 100644 --- a/pkgs/development/python-modules/torch-geometric/default.nix +++ b/pkgs/development/python-modules/torch-geometric/default.nix @@ -52,7 +52,7 @@ onnx, onnxruntime, pytest, - pytest-cov, + pytest-cov-stub, # tests pytestCheckHook, @@ -137,7 +137,7 @@ buildPythonPackage rec { onnx onnxruntime pytest - pytest-cov + pytest-cov-stub ]; }; From c4407814cc915fc191422855ae4b65ab5e65d48b Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:28:57 -0400 Subject: [PATCH 080/617] python312Packages.uarray: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/uarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix index a151ba1f1d80..ef7284f3196f 100644 --- a/pkgs/development/python-modules/uarray/default.nix +++ b/pkgs/development/python-modules/uarray/default.nix @@ -9,7 +9,7 @@ astunparse, typing-extensions, pytest7CheckHook, - pytest-cov, + pytest-cov-stub, }: buildPythonPackage rec { @@ -39,7 +39,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest7CheckHook - pytest-cov + pytest-cov-stub ]; # Tests must be run from outside the source directory From edc1dfd1c4124182e005a719b6699036636f551a Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:29:11 -0400 Subject: [PATCH 081/617] python312Packages.unstructured*: pytest-cov -> pytest-cov-stub --- .../python-modules/unstructured-api-tools/default.nix | 4 ++-- .../python-modules/unstructured-inference/default.nix | 4 ++-- pkgs/development/python-modules/unstructured/default.nix | 4 ++-- .../python-modules/validator-collection/default.nix | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/unstructured-api-tools/default.nix b/pkgs/development/python-modules/unstructured-api-tools/default.nix index 0eae368c30c3..656fa897e8d2 100644 --- a/pkgs/development/python-modules/unstructured-api-tools/default.nix +++ b/pkgs/development/python-modules/unstructured-api-tools/default.nix @@ -22,7 +22,7 @@ flake8, httpx, ipython, - pytest-cov, + pytest-cov-stub, requests, requests-toolbelt, nbdev, @@ -77,7 +77,7 @@ buildPythonPackage { flake8 httpx ipython - pytest-cov + pytest-cov-stub requests requests-toolbelt nbdev diff --git a/pkgs/development/python-modules/unstructured-inference/default.nix b/pkgs/development/python-modules/unstructured-inference/default.nix index 96398e97c713..eacd9f8124d8 100644 --- a/pkgs/development/python-modules/unstructured-inference/default.nix +++ b/pkgs/development/python-modules/unstructured-inference/default.nix @@ -17,7 +17,7 @@ click, httpx, mypy, - pytest-cov, + pytest-cov-stub, pdf2image, }: @@ -58,7 +58,7 @@ buildPythonPackage rec { click httpx mypy - pytest-cov + pytest-cov-stub pdf2image huggingface-hub ]; diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index 6625de40c87c..74667094daa2 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -51,7 +51,7 @@ freezegun, # , label-studio-sdk mypy, - pytest-cov, + pytest-cov-stub, pytest-mock, vcrpy, grpcio, @@ -137,7 +137,7 @@ buildPythonPackage { click freezegun mypy - pytest-cov + pytest-cov-stub pytest-mock vcrpy grpcio diff --git a/pkgs/development/python-modules/validator-collection/default.nix b/pkgs/development/python-modules/validator-collection/default.nix index fbec2841fcdb..bd5117f252eb 100644 --- a/pkgs/development/python-modules/validator-collection/default.nix +++ b/pkgs/development/python-modules/validator-collection/default.nix @@ -35,7 +35,7 @@ pyparsing, pytest, pytest-benchmark, - pytest-cov, + pytest-cov-stub, pytz, readme-renderer, requests, @@ -108,7 +108,7 @@ buildPythonPackage rec { pyparsing pytest pytest-benchmark - pytest-cov + pytest-cov-stub pytz readme-renderer requests From 0684b2b042c2ef352b9a1d137908cdad9802ad5b Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:29:18 -0400 Subject: [PATCH 082/617] python312Packages.venusian: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/venusian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix index 7dd1e7a818f9..2794a7a1699b 100644 --- a/pkgs/development/python-modules/venusian/default.nix +++ b/pkgs/development/python-modules/venusian/default.nix @@ -4,7 +4,7 @@ fetchPypi, isPy27, pytestCheckHook, - pytest-cov, + pytest-cov-stub, setuptools, }: @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub ]; checkPhase = '' From bf595a9173bc473c9cea43b6a08b98dddadf6545 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 15 Oct 2024 21:29:33 -0400 Subject: [PATCH 083/617] python312Packages.xformers: pytest-cov -> pytest-cov-stub --- pkgs/development/python-modules/xformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix index 69c7583c9eac..32f5fb7c6d39 100644 --- a/pkgs/development/python-modules/xformers/default.nix +++ b/pkgs/development/python-modules/xformers/default.nix @@ -10,7 +10,7 @@ torch, # check dependencies pytestCheckHook, - pytest-cov, + pytest-cov-stub, # , pytest-mpi pytest-timeout, # , pytorch-image-models @@ -99,7 +99,7 @@ buildPythonPackage { nativeCheckInputs = [ pytestCheckHook - pytest-cov + pytest-cov-stub pytest-timeout hydra-core fairscale From 16cbbf66510f4fc496e313ae7e11ce28ea225464 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 18 Oct 2024 07:04:06 +0100 Subject: [PATCH 084/617] cmake: 3.30.4 -> 3.30.5 Changes: https://cmake.org/cmake/help/latest/release/3.30.html#id25 --- pkgs/by-name/cm/cmake/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix index 4ccac7799541..4c94ca9e9f2a 100644 --- a/pkgs/by-name/cm/cmake/package.nix +++ b/pkgs/by-name/cm/cmake/package.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString isMinimalBuild "-minimal" + lib.optionalString cursesUI "-cursesUI" + lib.optionalString qt5UI "-qt5UI"; - version = "3.30.4"; + version = "3.30.5"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-x1nJcnTx56qq/LHw0mH53pvzpdbst+LfYWMkpG/nBLI="; + hash = "sha256-n1XhpAUI8vKbfgZfoIwp+CxAL6BALag5//5koldVqG0="; }; patches = [ From a59a45073da523548ba0ffd59a936ba4bb29b6d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Oct 2024 13:51:07 +0000 Subject: [PATCH 085/617] dav1d: 1.4.3 -> 1.5.0 --- pkgs/development/libraries/dav1d/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix index d0b77e2477c9..dc7efc22e852 100644 --- a/pkgs/development/libraries/dav1d/default.nix +++ b/pkgs/development/libraries/dav1d/default.nix @@ -26,13 +26,13 @@ assert useVulkan -> withExamples; stdenv.mkDerivation rec { pname = "dav1d"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "videolan"; repo = pname; rev = version; - hash = "sha256-uudtA9ZpGIpw1yfCzbywFyH7EWYHuXfE6pBb2eksx1g="; + hash = "sha256-eOMQj88vlgoxguV+eK4iWXFjUPiXwqRTJlhehev+yGY="; }; outputs = [ "out" "dev" ]; From d4bc528d44713970bca18c97ba23c01337885978 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 18 Oct 2024 13:20:59 +0300 Subject: [PATCH 086/617] libogg: build shared library Fixes a regression from 04bf3a5a24294b530a985b95ec8aa984c7d339ae --- pkgs/development/libraries/libogg/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix index ae104d5f8df3..14ad2231d3bf 100644 --- a/pkgs/development/libraries/libogg/default.nix +++ b/pkgs/development/libraries/libogg/default.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation (finalAttrs: { cmake ]; + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + ]; + meta = { description = "Media container library to manipulate Ogg files"; longDescription = '' From 77d256a1e18af8107bb8e08731969880c42f3900 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 18 Oct 2024 17:44:36 +0200 Subject: [PATCH 087/617] python312Packages.markupsafe: 3.0.1 -> 3.0.2 https://markupsafe.palletsprojects.com/page/changes/#version-3-0-2 --- pkgs/development/python-modules/markupsafe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix index ede8b745c0f7..6e69ea0488c4 100644 --- a/pkgs/development/python-modules/markupsafe/default.nix +++ b/pkgs/development/python-modules/markupsafe/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "markupsafe"; - version = "3.0.1"; + version = "3.0.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "pallets"; repo = "markupsafe"; rev = "refs/tags/${version}"; - hash = "sha256-YMvEfrIwGy5Ug4EjkiWOlijEWltWSjJGDrpseH86778="; + hash = "sha256-BqCkQqPhjEx3qB/k3d3fSirR/HDBa7e4kpx3/VSwXJM="; }; build-system = [ setuptools ]; From 15e4102a6a0a006df68a97ddad275e7d7f63c075 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 9 Oct 2024 21:19:36 +0200 Subject: [PATCH 088/617] vvenc: init at 1.12.0 --- pkgs/by-name/vv/vvenc/package.nix | 48 +++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pkgs/by-name/vv/vvenc/package.nix diff --git a/pkgs/by-name/vv/vvenc/package.nix b/pkgs/by-name/vv/vvenc/package.nix new file mode 100644 index 000000000000..774645e29ff9 --- /dev/null +++ b/pkgs/by-name/vv/vvenc/package.nix @@ -0,0 +1,48 @@ +{ + lib, + fetchFromGitHub, + stdenv, + gitUpdater, + testers, + cmake, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "vvenc"; + version = "1.12.0"; + + outputs = [ + "out" + "lib" + "dev" + ]; + + src = fetchFromGitHub { + owner = "fraunhoferhhi"; + repo = "vvenc"; + rev = "v${finalAttrs.version}"; + hash = "sha256-C7ApayhubunkXBqJ/EqntaFPn6zk8rZ9fUqg7kbhvAk="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + (lib.cmakeBool "VVENC_INSTALL_FULLFEATURE_APP" true) + (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + homepage = "https://github.com/fraunhoferhhi/vvenc"; + description = "Fraunhofer Versatile Video Encoder"; + license = lib.licenses.bsd3Clear; + mainProgram = "vvencapp"; + pkgConfigModules = [ "libvvenc" ]; + maintainers = with lib.maintainers; [ jopejoe1 ]; + platforms = lib.platforms.all; + }; +}) From cb2ef37af34beee3624db963653a8a36e1170006 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 9 Oct 2024 22:05:36 +0200 Subject: [PATCH 089/617] lcevcdec: init at 3.2.1 --- pkgs/by-name/lc/lcevcdec/package.nix | 104 +++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 pkgs/by-name/lc/lcevcdec/package.nix diff --git a/pkgs/by-name/lc/lcevcdec/package.nix b/pkgs/by-name/lc/lcevcdec/package.nix new file mode 100644 index 000000000000..20526efebc91 --- /dev/null +++ b/pkgs/by-name/lc/lcevcdec/package.nix @@ -0,0 +1,104 @@ +{ + cmake, + copyPkgconfigItems, + fetchFromGitHub, + fmt, + git, + gitUpdater, + gtest, + lib, + makePkgconfigItem, + pkg-config, + python3, + range-v3, + rapidjson, + stdenv, + testers, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lcevcdec"; + version = "3.2.1"; + + outputs = [ + "out" + "lib" + "dev" + ]; + + src = fetchFromGitHub { + owner = "v-novaltd"; + repo = "LCEVCdec"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-Nf0YntB1A3AH0MTXlfUHhxYbzZqeB0EH9Fe9Xrqdsts="; + }; + + postPatch = '' + substituteInPlace cmake/tools/version_files.py \ + --replace-fail "args.git_version" '"${finalAttrs.version}"' \ + --replace-fail "args.git_hash" '"${finalAttrs.src.rev}"' \ + --replace-fail "args.git_date" '"1970-01-01"' + ''; + + env = { + includedir = "${placeholder "dev"}/include"; + libdir = "${placeholder "out"}/lib"; + }; + + pkgconfigItems = [ + (makePkgconfigItem rec { + name = "lcevc_dec"; + inherit (finalAttrs) version; + libs = [ + "-L${variables.libdir}" + "-llcevc_dec_api" + ]; + libsPrivate = [ + "-lpthread" + "-llcevc_dec_core" + ]; + cflags = [ + "-I${variables.includedir}" + ]; + variables = { + prefix = "@dev@"; + includedir = "@includedir@"; + libdir = "@libdir@"; + }; + }) + ]; + + nativeBuildInputs = [ + cmake + python3 + git + pkg-config + copyPkgconfigItems + ]; + + buildInputs = [ + rapidjson + fmt + range-v3 + ]; + + cmakeFlags = [ + (lib.cmakeFeature "VN_SDK_FFMPEG_LIBS_PACKAGE" "") + (lib.cmakeBool "VN_SDK_UNIT_TESTS" false) + (lib.cmakeBool "VN_SDK_SAMPLE_SOURCE" false) + ]; + + passthru = { + updateScript = gitUpdater { }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + homepage = "https://github.com/v-novaltd/LCEVCdec"; + description = "MPEG-5 LCEVC Decoder"; + license = lib.licenses.bsd3Clear; + pkgConfigModules = [ "lcevc_dec" ]; + maintainers = with lib.maintainers; [ jopejoe1 ]; + platforms = lib.platforms.all; + }; +}) From 46c012331f624423e3ac968c252eb54ce4558b67 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 9 Oct 2024 21:48:28 +0200 Subject: [PATCH 090/617] ffmpeg: add vvenc option --- pkgs/development/libraries/ffmpeg/generic.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index e6863e849324..b336948d6fe3 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -127,6 +127,7 @@ , withVpl ? false # Hardware acceleration via intel libvpl , withVpx ? withHeadlessDeps && stdenv.buildPlatform == stdenv.hostPlatform # VP8 & VP9 de/encoding , withVulkan ? withSmallDeps && !stdenv.hostPlatform.isDarwin +, withVvenc ? withFullDeps && lib.versionAtLeast version "7.1" # H.266/VVC encoding , withWebp ? withHeadlessDeps # WebP encoder , withX264 ? withHeadlessDeps && withGPL # H.264/AVC encoder , withX265 ? withHeadlessDeps && withGPL # H.265/HEVC encoder @@ -315,6 +316,7 @@ , vo-amrwbenc , vulkan-headers , vulkan-loader +, vvenc , x264 , x265 , xavs @@ -665,6 +667,9 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withVorbis "libvorbis") (enableFeature withVpx "libvpx") (enableFeature withVulkan "vulkan") + ] ++ optionals (versionAtLeast version "7.1") [ + (enableFeature withVvenc "libvvenc") + ] ++ [ (enableFeature withWebp "libwebp") (enableFeature withX264 "libx264") (enableFeature withX265 "libx265") @@ -808,6 +813,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withVpl [ libvpl ] ++ optionals withVpx [ libvpx ] ++ optionals withVulkan [ vulkan-headers vulkan-loader ] + ++ optionals withVvenc [ vvenc ] ++ optionals withWebp [ libwebp ] ++ optionals withX264 [ x264 ] ++ optionals withX265 [ x265 ] From 22faf0ac9e16a5a2457944be5a42543591addb0c Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 15 Oct 2024 15:56:42 +0200 Subject: [PATCH 091/617] ffmpeg: add lc3 option --- pkgs/development/libraries/ffmpeg/generic.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index b336948d6fe3..89aa6c64d640 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -75,6 +75,7 @@ , withJack ? withFullDeps && !stdenv.hostPlatform.isDarwin # Jack audio , withJxl ? withFullDeps && lib.versionAtLeast version "5" # JPEG XL de/encoding , withLadspa ? withFullDeps # LADSPA audio filtering +, withLc3 ? withFullDeps && lib.versionAtLeast version "7.1" # LC3 de/encoding , withLcms2 ? withFullDeps # ICC profile support via lcms2 , withLzma ? withHeadlessDeps # xz-utils , withMetal ? false # Unfree and requires manual downloading of files @@ -263,6 +264,7 @@ , libilbc , libjack2 , libjxl +, liblc3 , libmodplug , libmysofa , libopenmpt @@ -603,6 +605,8 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withJxl "libjxl") ] ++ [ (enableFeature withLadspa "ladspa") + ] ++ optionals (versionAtLeast version "7.1") [ + (enableFeature withLc3 "liblc3") ] ++ optionals (versionAtLeast version "5.1") [ (enableFeature withLcms2 "lcms2") ] ++ [ @@ -766,6 +770,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withJack [ libjack2 ] ++ optionals withJxl [ libjxl ] ++ optionals withLadspa [ ladspaH ] + ++ optionals withLc3 [ liblc3 ] ++ optionals withLcms2 [ lcms2 ] ++ optionals withLzma [ xz ] ++ optionals withMfx [ intel-media-sdk ] From fdf2cbdc1c13df3c62d1ff2e48d1e6fbf5384f8f Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 15 Oct 2024 15:57:04 +0200 Subject: [PATCH 092/617] ffmpeg: add lcevcdec option --- pkgs/development/libraries/ffmpeg/generic.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 89aa6c64d640..bd029d80c890 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -76,6 +76,7 @@ , withJxl ? withFullDeps && lib.versionAtLeast version "5" # JPEG XL de/encoding , withLadspa ? withFullDeps # LADSPA audio filtering , withLc3 ? withFullDeps && lib.versionAtLeast version "7.1" # LC3 de/encoding +, withLcevcdec ? withFullDeps && lib.versionAtLeast version "7.1" # LCEVC decoding , withLcms2 ? withFullDeps # ICC profile support via lcms2 , withLzma ? withHeadlessDeps # xz-utils , withMetal ? false # Unfree and requires manual downloading of files @@ -247,6 +248,7 @@ , intel-media-sdk , ladspaH , lame +, lcevcdec , lcms2 , libaom , libaribcaption @@ -607,6 +609,7 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withLadspa "ladspa") ] ++ optionals (versionAtLeast version "7.1") [ (enableFeature withLc3 "liblc3") + (enableFeature withLcevcdec "liblcevc-dec") ] ++ optionals (versionAtLeast version "5.1") [ (enableFeature withLcms2 "lcms2") ] ++ [ @@ -771,6 +774,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withJxl [ libjxl ] ++ optionals withLadspa [ ladspaH ] ++ optionals withLc3 [ liblc3 ] + ++ optionals withLcevcdec [ lcevcdec ] ++ optionals withLcms2 [ lcms2 ] ++ optionals withLzma [ xz ] ++ optionals withMfx [ intel-media-sdk ] From 516682d47fa439dc87c68b05a36d5b629f208f08 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Sat, 19 Oct 2024 18:01:04 +0200 Subject: [PATCH 093/617] glab: fix formatting --- pkgs/by-name/gl/glab/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix index c0a321858f0e..febf5a527a7b 100644 --- a/pkgs/by-name/gl/glab/package.nix +++ b/pkgs/by-name/gl/glab/package.nix @@ -1,4 +1,10 @@ -{ lib, buildGo123Module, fetchFromGitLab, installShellFiles, stdenv }: +{ + lib, + buildGo123Module, + fetchFromGitLab, + installShellFiles, + stdenv, +}: buildGo123Module rec { pname = "glab"; From 6fb2d94d980916b734353537d71a70e51d113429 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Sat, 19 Oct 2024 18:06:23 +0200 Subject: [PATCH 094/617] glab: 1.47.0 -> 1.48.0 --- pkgs/by-name/gl/glab/package.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix index febf5a527a7b..602d6f1ea9fc 100644 --- a/pkgs/by-name/gl/glab/package.nix +++ b/pkgs/by-name/gl/glab/package.nix @@ -8,16 +8,16 @@ buildGo123Module rec { pname = "glab"; - version = "1.47.0"; + version = "1.48.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - hash = "sha256-mAM11nQ6YJJWNFOR9xQbgma7Plvo4MdcW2Syniw7o60="; + hash = "sha256-cddXgjJR8SD/mggDzbyxp/hdffE5ZqmT9oEPaEd8ZCo="; }; - vendorHash = "sha256-uwSVdebZtIpSol553gJC0ItkEqa6qXXOAVFvzjsHSSI="; + vendorHash = "sha256-quQqQRXMByUgXlnPpR2mCPhxw5AbFdHN5sBsawuHc18="; ldflags = [ "-s" @@ -43,12 +43,15 @@ buildGo123Module rec { --zsh <($out/bin/glab completion -s zsh) ''; - meta = with lib; { + meta = { description = "GitLab CLI tool bringing GitLab to your command line"; - license = licenses.mit; + license = lib.licenses.mit; homepage = "https://gitlab.com/gitlab-org/cli"; changelog = "https://gitlab.com/gitlab-org/cli/-/releases/v${version}"; - maintainers = with maintainers; [ freezeboy ]; + maintainers = with lib.maintainers; [ + freezeboy + luftmensch-luftmensch + ]; mainProgram = "glab"; }; } From 7e38e7d4a903077d9cec737655c8d26616a277b6 Mon Sep 17 00:00:00 2001 From: Troels Henriksen Date: Sun, 20 Oct 2024 22:06:52 +0200 Subject: [PATCH 095/617] ispc: 1.24.0 -> 1.25.0 --- pkgs/development/compilers/ispc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 2aa173fdde24..e60038481505 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "ispc"; - version = "1.24.0"; + version = "1.25.0"; dontFixCmake = true; # https://github.com/NixOS/nixpkgs/pull/232522#issuecomment-2133803566 @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-1Ns8w34fXgYrSu3XE89uowjaVoW3MOgKYV1Jb/XRj1Q="; + sha256 = "sha256-DT8YjyAOdtAaWnCUvKRQGhPOazUkuRWkajBVK279Qhk="; }; nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ] ++ lib.lists.optionals stdenv.hostPlatform.isDarwin [ xcode ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { echo "================================" echo (cd ../ - PATH=${llvmPackages.clang}/bin:$PATH python run_tests.py -t $target --non-interactive --verbose --file=test_output.log + PATH=${llvmPackages.clang}/bin:$PATH python scripts/run_tests.py -t $target --non-interactive --verbose --file=test_output.log fgrep -q "No new fails" test_output.log || exit 1) done ''; From e266fb9a509e4651b3604bf4009e495c03c2f022 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 21 Oct 2024 06:55:57 +0100 Subject: [PATCH 096/617] iwd: 2.22 -> 3.0 Changes: https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog?h=3.0 --- pkgs/os-specific/linux/iwd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index fdd289722155..cdab250abd96 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "2.22"; + version = "3.0"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - hash = "sha256-t2mfBRP/PRlcfeezu3B7myCKXVv9SHeW8HlGK1cO3/I="; + hash = "sha256-pkren8mF0xg5yrkaIrMJ5auq+7w8VAldbgVflE2BmlM="; }; outputs = [ "out" "man" "doc" ] From 727427cdf541c16bda558cc9494104ca0995c47b Mon Sep 17 00:00:00 2001 From: Tomo Date: Mon, 21 Oct 2024 05:53:37 +0000 Subject: [PATCH 097/617] python3Packages.clickclick: update upstream location Upstream moved to https://codeberg.org/hjacobs/python-clickclick Source: https://github.com/hjacobs/python-clickclick/commit/ed14a63e007dab504607bc9e7aa5d09a780a82c4 Part of #346385 --- pkgs/development/python-modules/clickclick/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix index 117e5c0c4196..f3352cd062c4 100644 --- a/pkgs/development/python-modules/clickclick/default.nix +++ b/pkgs/development/python-modules/clickclick/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitHub, + fetchFromGitea, flake8, click, pyyaml, @@ -15,7 +15,8 @@ buildPythonPackage rec { version = "1.2.2"; format = "setuptools"; - src = fetchFromGitHub { + src = fetchFromGitea { + domain = "codeberg.org"; owner = "hjacobs"; repo = "python-clickclick"; rev = version; @@ -38,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Click command line utilities"; - homepage = "https://github.com/hjacobs/python-clickclick/"; + homepage = "https://codeberg.org/hjacobs/python-clickclick/"; license = licenses.asl20; }; } From c50fa5688015c3057902ce17446cc9e29d14b4ce Mon Sep 17 00:00:00 2001 From: Tomo Date: Mon, 21 Oct 2024 06:27:20 +0000 Subject: [PATCH 098/617] python3Packages.clickclick: 1.2.2 -> 20.10.2 Upstream doesn't provide changelogs, but the diff reveals no substantial changes: https://codeberg.org/hjacobs/python-clickclick/compare/1.2.2...20.10.2 --- pkgs/development/python-modules/clickclick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix index f3352cd062c4..515bbbe509d5 100644 --- a/pkgs/development/python-modules/clickclick/default.nix +++ b/pkgs/development/python-modules/clickclick/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "clickclick"; - version = "1.2.2"; + version = "20.10.2"; format = "setuptools"; src = fetchFromGitea { @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "hjacobs"; repo = "python-clickclick"; rev = version; - sha256 = "1rij9ws9nhsmagiy1vclzliiqfkxi006rf65qvrw1k3sm2s8p5g0"; + hash = "sha256-gefU6CI4ibtvonsaKZmuffuUNUioBn5ODs72BI5zXOw="; }; nativeCheckInputs = [ From 9767bb9bf1e6beaf4169e55963d7f44c637d4d22 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sun, 29 Sep 2024 18:37:00 +0200 Subject: [PATCH 099/617] stdenv/setup: make substituteInPlace require actual files I've often run into substituteInPlace doing nothing when I invoked it wrong, like: substituteInPlace --replace-fail from to file.txt The substitute function would pass file.txt on to substituteStream, which complain about the extraneous argument. However, if no files are passed, substitute is never called and substituteInPlace silently does nothing. It would be more annoying to make substituteInPlace accept file arguments anywhere (since it would need to understand the arguments to substituteStream), so let's error on this incorrect usage instead. Change-Id: Ib2daad6f49bbe516a273a35d7f2a31fc42fd053c --- pkgs/stdenv/generic/setup.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 0287b3a90a2a..67dfb1d2f3b8 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1073,6 +1073,10 @@ substituteInPlace() { fileNames+=("$arg") shift done + if ! [[ "${#fileNames[@]}" -gt 0 ]]; then + echo >&2 "substituteInPlace called without any files to operate on (files must come before options!)" + return 1 + fi for file in "${fileNames[@]}"; do substitute "$file" "$file" "$@" From ba99a7b1efacfe5d2549bdc67e6ba0561860fbbd Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Thu, 10 Oct 2024 18:09:48 +0200 Subject: [PATCH 100/617] numactl: Fix memory corruption in set_nodemask_size --- pkgs/os-specific/linux/numactl/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix index 142dd064e0f9..4eceef0b2bf1 100644 --- a/pkgs/os-specific/linux/numactl/default.nix +++ b/pkgs/os-specific/linux/numactl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { pname = "numactl"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { hash = "sha256-ry29RUNa0Hv5gIhy2RTVT94mHhgfdIwb5aqjBycxxj0="; }; + patches = [ + # Fix for memory corruption in set_nodemask_size + (fetchpatch { + url = "https://github.com/numactl/numactl/commit/f9deba0c8404529772468d6dd01389f7dbfa5ba9.patch"; + hash = "sha256-TmWfD99YaSIHA5PSsWHE91GSsdsVgVU+qIow7LOwOGw="; + }) + ]; + outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ autoreconfHook ]; From 3576b958e4397bcfbf8d664286fca8f418c906be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 21 Oct 2024 15:58:56 +0200 Subject: [PATCH 101/617] Reapply "bmake: 20240808 -> 20240921" (PR #349649) This reverts commit 65f28f123e4656ddff8fa6e1864ade99860c6b92. Update moved to staging due to causing rebuilds on staging-next. --- pkgs/by-name/bm/bmake/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix index f18b65c62552..05729f8aa848 100644 --- a/pkgs/by-name/bm/bmake/package.nix +++ b/pkgs/by-name/bm/bmake/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bmake"; - version = "20240808"; + version = "20240921"; src = fetchurl { url = "https://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-tZGJJRtIPezUSS8fdDh7KlhMA9WqRjfNSLOOxiucCEg="; + hash = "sha256-s0ZXnoLSltGk2ineqFlOPuWWEwsgeG3sDziZo+ESdcI="; }; patches = [ From 52dc9272a140389f392b109b0b171bd6cba1297f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 21 Oct 2024 16:30:13 +0200 Subject: [PATCH 102/617] meson: 1.5.2 -> 1.6.0 --- .../me/meson/007-case-sensitive-fs.patch | 87 ------------------- .../me/meson/007-freebsd-pkgconfig-path.patch | 13 +-- pkgs/by-name/me/meson/package.nix | 25 +----- 3 files changed, 10 insertions(+), 115 deletions(-) delete mode 100644 pkgs/by-name/me/meson/007-case-sensitive-fs.patch diff --git a/pkgs/by-name/me/meson/007-case-sensitive-fs.patch b/pkgs/by-name/me/meson/007-case-sensitive-fs.patch deleted file mode 100644 index 54d07d85585c..000000000000 --- a/pkgs/by-name/me/meson/007-case-sensitive-fs.patch +++ /dev/null @@ -1,87 +0,0 @@ -From a6fb2c165cda4bbf315424c96165ec9cc7052363 Mon Sep 17 00:00:00 2001 -From: Randy Eckenrode -Date: Wed, 3 Apr 2024 17:35:56 -0400 -Subject: [PATCH] dependencies: find extraframeworks on case-sensitive - filesystems - -Fixes a test failure on case-sensitive filesystems when a CMake -dependency is turned into an Apple framework. ---- - mesonbuild/dependencies/framework.py | 9 +++++++-- - test cases/osx/11 case sensitive apfs/meson.build | 5 +++++ - test cases/osx/11 case sensitive apfs/prog.c | 3 +++ - test cases/osx/11 case sensitive apfs/test.json | 5 +++++ - 4 files changed, 20 insertions(+), 2 deletions(-) - create mode 100644 test cases/osx/11 case sensitive apfs/meson.build - create mode 100644 test cases/osx/11 case sensitive apfs/prog.c - create mode 100644 test cases/osx/11 case sensitive apfs/test.json - -diff --git a/mesonbuild/dependencies/framework.py b/mesonbuild/dependencies/framework.py -index 3c880c7430af..1fbd628235ba 100644 ---- a/mesonbuild/dependencies/framework.py -+++ b/mesonbuild/dependencies/framework.py -@@ -47,6 +47,7 @@ def detect(self, name: str, paths: T.List[str]) -> None: - framework_path = self._get_framework_path(p, name) - if framework_path is None: - continue -+ framework_name = framework_path.stem - # We want to prefer the specified paths (in order) over the system - # paths since these are "extra" frameworks. - # For example, Python2's framework is in /System/Library/Frameworks and -@@ -54,11 +55,15 @@ def detect(self, name: str, paths: T.List[str]) -> None: - # Python.framework. We need to know for sure that the framework was - # found in the path we expect. - allow_system = p in self.system_framework_paths -- args = self.clib_compiler.find_framework(name, self.env, [p], allow_system) -+ args = self.clib_compiler.find_framework(framework_name, self.env, [p], allow_system) - if args is None: - continue - self.link_args = args - self.framework_path = framework_path.as_posix() -+ # The search is done case-insensitively, so the found name may differ -+ # from the one that was requested. Setting the name ensures the correct -+ # one is used when linking on case-sensitive filesystems. -+ self.name = framework_name - self.compile_args = ['-F' + self.framework_path] - # We need to also add -I includes to the framework because all - # cross-platform projects such as OpenGL, Python, Qt, GStreamer, -@@ -74,7 +79,7 @@ def _get_framework_path(self, path: str, name: str) -> T.Optional[Path]: - p = Path(path) - lname = name.lower() - for d in p.glob('*.framework/'): -- if lname == d.name.rsplit('.', 1)[0].lower(): -+ if lname == d.stem.lower(): - return d - return None - -diff --git a/test cases/osx/11 case sensitive apfs/meson.build b/test cases/osx/11 case sensitive apfs/meson.build -new file mode 100644 -index 000000000000..dd566b185f28 ---- /dev/null -+++ b/test cases/osx/11 case sensitive apfs/meson.build -@@ -0,0 +1,5 @@ -+project('case-sensitive APFS with extra frameworks test', 'c') -+ -+dep = dependency('FoUnDaTiOn') -+ -+exe = executable('prog', 'prog.c', install : true, dependencies: dep) -diff --git a/test cases/osx/11 case sensitive apfs/prog.c b/test cases/osx/11 case sensitive apfs/prog.c -new file mode 100644 -index 000000000000..9b6bdc2ec2f0 ---- /dev/null -+++ b/test cases/osx/11 case sensitive apfs/prog.c -@@ -0,0 +1,3 @@ -+int main(void) { -+ return 0; -+} -diff --git a/test cases/osx/11 case sensitive apfs/test.json b/test cases/osx/11 case sensitive apfs/test.json -new file mode 100644 -index 000000000000..a883714eaa27 ---- /dev/null -+++ b/test cases/osx/11 case sensitive apfs/test.json -@@ -0,0 +1,5 @@ -+{ -+ "installed": [ -+ {"type": "file", "file": "usr/bin/prog"} -+ ] -+} diff --git a/pkgs/by-name/me/meson/007-freebsd-pkgconfig-path.patch b/pkgs/by-name/me/meson/007-freebsd-pkgconfig-path.patch index 3a9ba6f092dd..8eb172bb1256 100644 --- a/pkgs/by-name/me/meson/007-freebsd-pkgconfig-path.patch +++ b/pkgs/by-name/me/meson/007-freebsd-pkgconfig-path.patch @@ -1,15 +1,16 @@ -diff -ur a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py ---- a/mesonbuild/modules/pkgconfig.py 2024-05-17 17:52:30.880877000 -0700 -+++ b/mesonbuild/modules/pkgconfig.py 2024-05-17 17:53:10.901068000 -0700 -@@ -693,10 +693,7 @@ +diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py +index 1bdf82931..db165ea12 100644 +--- a/mesonbuild/modules/pkgconfig.py ++++ b/mesonbuild/modules/pkgconfig.py +@@ -701,10 +701,7 @@ class PkgConfigModule(NewExtensionModule): pcfile = filebase + '.pc' pkgroot = pkgroot_name = kwargs['install_dir'] or default_install_dir if pkgroot is None: - if mesonlib.is_freebsd(): -- pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(mesonlib.OptionKey('prefix'))), 'libdata', 'pkgconfig') +- pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(OptionKey('prefix'))), 'libdata', 'pkgconfig') - pkgroot_name = os.path.join('{prefix}', 'libdata', 'pkgconfig') - elif mesonlib.is_haiku(): + if mesonlib.is_haiku(): - pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(mesonlib.OptionKey('prefix'))), 'develop', 'lib', 'pkgconfig') + pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(OptionKey('prefix'))), 'develop', 'lib', 'pkgconfig') pkgroot_name = os.path.join('{prefix}', 'develop', 'lib', 'pkgconfig') else: diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index d463190fec08..419e489e2b2e 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -13,7 +13,6 @@ , python3 , substituteAll , zlib -, fetchpatch }: let @@ -21,13 +20,13 @@ let in python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitHub { owner = "mesonbuild"; repo = "meson"; rev = "refs/tags/${version}"; - hash = "sha256-cesMepnD3fHX2CwnSQ3c5TE9kPSa0FkCVVVZDgXwo8M="; + hash = "sha256-st0dbb+GfF0KEyF+Qn/PIE2462ZrrXy8YcnrulHTI8M="; }; patches = [ @@ -74,24 +73,6 @@ python3.pkgs.buildPythonApplication rec { # This edge case is explicitly part of meson but is wrong for nix ./007-freebsd-pkgconfig-path.patch - - (fetchpatch { - name = "tests-skip-framework-recasting-if-CMake-unavailable.patch"; - url = "https://github.com/mesonbuild/meson/commit/8a8a3a0578fd8d5a8720a7a706f6f3b99e857f9c.patch"; - hash = "sha256-XkwNQ5eg/fVekhsFg/V2/S2LbIVGz3H0wsSFlUT3ZZE="; - }) - - # Fix extraframework lookup on case-sensitive APFS. - # https://github.com/mesonbuild/meson/pull/13038 - ./007-case-sensitive-fs.patch - - # Fix meson's detection for zig's linker - # https://github.com/mesonbuild/meson/pull/12293 - (fetchpatch { - name = "linker-support-zig-cc.patch"; - url = "https://github.com/mesonbuild/meson/pull/12293/commits/2baae244c995794d9addfe6ed924dfa72f01be82.patch"; - hash = "sha256-dDOmSRBKl/gs7I3kmLXIyQk3zsOdlaYov72pPSel4+I="; - }) ]; buildInputs = lib.optionals (python3.pythonOlder "3.9") [ @@ -129,7 +110,7 @@ python3.pkgs.buildPythonApplication rec { patchShebangs 'test cases' substituteInPlace \ 'test cases/native/8 external program shebang parsing/script.int.in' \ - 'test cases/common/273 customtarget exe for test/generate.py' \ + 'test cases/common/274 customtarget exe for test/generate.py' \ --replace /usr/bin/env ${coreutils}/bin/env '' ] From 1ceba9367c27ec3586766df242081ef55ba56f66 Mon Sep 17 00:00:00 2001 From: Valentin Gagarin Date: Wed, 18 Sep 2024 21:54:02 +0200 Subject: [PATCH 103/617] meson/setup-hook.sh: make build directory configurable --- doc/hooks/meson.section.md | 10 ++++++++++ pkgs/by-name/me/meson/setup-hook.sh | 6 ++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/doc/hooks/meson.section.md b/doc/hooks/meson.section.md index 3a7fb5032082..c3cd89b12e89 100644 --- a/doc/hooks/meson.section.md +++ b/doc/hooks/meson.section.md @@ -18,6 +18,16 @@ setup hook registering ninja-based build and install phases. Controls the flags passed to `meson setup` during configure phase. +#### `mesonBuildDir` {#meson-build-dir} + +Directory where Meson will put intermediate files. + +Setting this can be useful for debugging multiple Meson builds while in the same source directory, for example, when building for different platforms. +Different values for each build will prevent build artefacts from interefering with each other. +This setting has no tangible effect when running the build in a sandboxed derivation. + +The default value is `build`. + #### `mesonWrapMode` {#meson-wrap-mode} Which value is passed as diff --git a/pkgs/by-name/me/meson/setup-hook.sh b/pkgs/by-name/me/meson/setup-hook.sh index 55ea8b5c1d97..a88a276f09a8 100644 --- a/pkgs/by-name/me/meson/setup-hook.sh +++ b/pkgs/by-name/me/meson/setup-hook.sh @@ -3,6 +3,8 @@ mesonConfigurePhase() { runHook preConfigure + : ${mesonBuildDir:=build} + local flagsArray=() if [ -z "${dontAddPrefix-}" ]; then @@ -28,8 +30,8 @@ mesonConfigurePhase() { echoCmd 'mesonConfigurePhase flags' "${flagsArray[@]}" - meson setup build "${flagsArray[@]}" - cd build || { echoCmd 'mesonConfigurePhase' "could not cd to build"; exit 1; } + meson setup "$mesonBuildDir" "${flagsArray[@]}" + cd "$mesonBuildDir" || { echoCmd 'mesonConfigurePhase' "could not cd to $mesonBuildDir"; exit 1; } if ! [[ -v enableParallelBuilding ]]; then enableParallelBuilding=1 From e6f4812da2d393f7446b3f91fae69a7d85894d42 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Mon, 21 Oct 2024 09:32:03 -0700 Subject: [PATCH 104/617] tinyxxd: 1.3.5 -> 1.3.6 Diff: https://github.com/xyproto/tinyxxd/compare/v1.3.5...v1.3.6 --- pkgs/by-name/ti/tinyxxd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ti/tinyxxd/package.nix b/pkgs/by-name/ti/tinyxxd/package.nix index a19f9d7ef3f3..2da810f16614 100644 --- a/pkgs/by-name/ti/tinyxxd/package.nix +++ b/pkgs/by-name/ti/tinyxxd/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tinyxxd"; - version = "1.3.5"; + version = "1.3.6"; src = fetchFromGitHub { repo = "tinyxxd"; owner = "xyproto"; rev = "v${finalAttrs.version}"; - hash = "sha256-W7BrQga98ACrhTHF3UlGQMRmcdJaxgorDP6FpD5mr2A="; + hash = "sha256-SPKDowZrr1m9DiL7p8pKHKJuahEiwCmW5VhuE314Otw="; }; nativeBuildInputs = [ installShellFiles ]; From 72413bfe89d7499f0b9aa1b9e5cb6a93485a6c7d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 21 Oct 2024 20:05:35 +0200 Subject: [PATCH 105/617] binutils: make patches unconditional The Darwin patch was always supposed to be unconditional, and neither of these patches should have any effect when applied to other targets. Conditional application should be avoided where possible as it makes it very easy to miss when a patch needs to be updated. --- .../tools/misc/binutils/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 1e465654badd..4d90fa66ea7d 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -72,18 +72,18 @@ stdenv.mkDerivation (finalAttrs: { # not need to know binutils' BINDIR at all. It's an absolute path # where libraries are stored. ./plugins-no-BINDIR.patch - ] ++ lib.optionals hostPlatform.isDarwin [ - # Note: Conditional to avoid Linux rebuilds on staging-next. Remove the conditional with the next update. + # ld64 needs `-undefined dynamic_lookup` to link `libctf-nobfd.dylib`, but the Darwin # version detection in `libtool.m4` fails to detect the Darwin version correctly. ./0001-libtool.m4-update-macos-version-detection-block.patch - ] - # Adds AVR-specific options to "size" for compatibility with Atmel's downstream distribution - # Patch from arch-community - # https://github.com/archlinux/svntogit-community/blob/c8d53dd1734df7ab15931f7fad0c9acb8386904c/trunk/avr-size.patch - ++ lib.optional targetPlatform.isAvr ./avr-size.patch - ++ lib.optional stdenv.targetPlatform.isWindows ./windres-locate-gcc.patch - ; + + # Adds AVR-specific options to "size" for compatibility with Atmel's downstream distribution + # Patch from arch-community + # https://github.com/archlinux/svntogit-community/blob/c8d53dd1734df7ab15931f7fad0c9acb8386904c/trunk/avr-size.patch + ./avr-size.patch + + ./windres-locate-gcc.patch + ]; outputs = [ "out" "info" "man" "dev" ] # Ideally we would like to always install 'lib' into a separate From 985072e2ce4afa4201b49a20154fcc888aaccec5 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 18 Oct 2024 20:50:27 +0300 Subject: [PATCH 106/617] cc-wrapper: Hardcode path to `mktemp` and `rm` if possible These commands are run after the path backup is restored Co-authored-by: IlyaNiklyaev --- pkgs/build-support/cc-wrapper/cc-wrapper.sh | 4 ++-- pkgs/build-support/cc-wrapper/default.nix | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 4cc661721f44..a539f9da4318 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -251,8 +251,8 @@ if [[ -e @out@/nix-support/cc-wrapper-hook ]]; then fi if (( "${NIX_CC_USE_RESPONSE_FILE:-@use_response_file_by_default@}" >= 1 )); then - responseFile=$(mktemp "${TMPDIR:-/tmp}/cc-params.XXXXXX") - trap 'rm -f -- "$responseFile"' EXIT + responseFile=$(@mktemp@ "${TMPDIR:-/tmp}/cc-params.XXXXXX") + trap '@rm@ -f -- "$responseFile"' EXIT printf "%q\n" \ ${extraBefore+"${extraBefore[@]}"} \ ${params+"${params[@]}"} \ diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 01f91b408e38..37eb6692e731 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -741,6 +741,8 @@ stdenvNoCC.mkDerivation { # TODO(@sternenseemann): rename env var via stdenv rebuild shell = getBin runtimeShell + runtimeShell.shellPath or ""; gnugrep_bin = optionalString (!nativeTools) gnugrep; + rm = if nativeTools then "rm" else lib.getExe' coreutils "rm"; + mktemp = if nativeTools then "mktemp" else lib.getExe' coreutils "mktemp"; # stdenv.cc.cc should not be null and we have nothing better for now. # if the native impure bootstrap is gotten rid of this can become `inherit cc;` again. cc = optionalString (!nativeTools) cc; From 62f2fc1ae5f6e99d5aa5ae2829730c73a65cf7ed Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 19 Oct 2024 00:31:24 +0300 Subject: [PATCH 107/617] tests.cc-wrapper: Add `NIX_CC_USE_RESPONSE_FILE` check --- pkgs/test/cc-wrapper/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index 9e25be460e25..61d65784f5b9 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -131,6 +131,9 @@ in stdenv.mkDerivation { ASAN_OPTIONS=use_sigaltstack=0 ${emulator} ./sanitizers ''} + echo "Check whether CC with NIX_CC_USE_RESPONSE_FILE hardcodes all required binaries..." >&2 + NIX_CC_USE_RESPONSE_FILE=1 ${CC} -v + touch $out ''; From cc7dc58696654b1e4a74444049569e6d50d9373f Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Thu, 8 Aug 2024 15:12:21 +0300 Subject: [PATCH 108/617] cloneit: init at 0-unstable-2024-06-28 --- pkgs/by-name/cl/cloneit/package.nix | 35 +++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/cl/cloneit/package.nix diff --git a/pkgs/by-name/cl/cloneit/package.nix b/pkgs/by-name/cl/cloneit/package.nix new file mode 100644 index 000000000000..844bbd22eff8 --- /dev/null +++ b/pkgs/by-name/cl/cloneit/package.nix @@ -0,0 +1,35 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + unstableGitUpdater, +}: +rustPlatform.buildRustPackage { + pname = "cloneit"; + version = "0-unstable-2024-06-28"; + + src = fetchFromGitHub { + owner = "alok8bb"; + repo = "cloneit"; + rev = "6198556e810d964cc5938c446ef42fc21b55fe0b"; + sha256 = "sha256-RP0/kquAlSwRMeB6cjvS5JB9qfdkT8IKLVxaxrmzJ+0="; + }; + + cargoHash = "sha256-XXcqmDPEQUm4YBqY5+06X55ym3o3RqE7fNSiR4n+iyc="; + + strictDeps = true; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "CLI tool to download specific GitHub directories or files"; + homepage = "https://github.com/alok8bb/cloneit"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ NotAShelf ]; + platforms = lib.platforms.linux; + }; +} From ca81d85c856c1d9435ac1a5c5a2f38fa5b443a2d Mon Sep 17 00:00:00 2001 From: scraptux Date: Tue, 22 Oct 2024 10:50:55 +0200 Subject: [PATCH 109/617] grpc: 1.62.1 -> 1.67.0 --- pkgs/development/libraries/grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 948048895700..3fa4f5492d31 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "grpc"; - version = "1.66.1"; # N.B: if you change this, please update: + version = "1.67.0"; # N.B: if you change this, please update: # pythonPackages.grpcio-tools # pythonPackages.grpcio-status @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-CmQUUbIYPWRS7q7OX+TmkTvoqtJAUEwhL/lev8JdB8U="; + hash = "sha256-NjoSm3ZiHqe0QeVRFWO2FheoOzKjSX2oyiCM3qNUxhM="; fetchSubmodules = true; }; From f922c45fded80b7371a637203afd7bdd7dad5cbe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Oct 2024 12:34:32 +0200 Subject: [PATCH 110/617] nspr: 4.35 -> 4.36 https://groups.google.com/a/mozilla.org/g/dev-tech-crypto/c/FhX0-10xYrI --- pkgs/development/libraries/nspr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index efea4a4cc81f..1f126d256870 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "nspr"; - version = "4.35"; + version = "4.36"; src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - hash = "sha256-fqMpfqWWm10lpd2NR/JEPNqI6e50YwH24eFCb4pqvI8="; + hash = "sha256-Vd7DF/FAHNLl26hE00C5MKt1R/gYF5pAArzmLm8caJU="; }; patches = [ From 19ac92c619b942bf4a8bb3b236c82fdff0adc895 Mon Sep 17 00:00:00 2001 From: scraptux Date: Tue, 22 Oct 2024 10:51:39 +0200 Subject: [PATCH 111/617] python312Packages.grpcio-channelz: 1.66.2 -> 1.67.0 --- pkgs/development/python-modules/grpcio-channelz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix index 4d5662509e06..dc73ee462b68 100644 --- a/pkgs/development/python-modules/grpcio-channelz/default.nix +++ b/pkgs/development/python-modules/grpcio-channelz/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "grpcio-channelz"; - version = "1.66.2"; + version = "1.67.0"; pyproject = true; src = fetchPypi { pname = "grpcio_channelz"; inherit version; - hash = "sha256-SQTHg3UjQ2YkiV2QYmlPKQt/Mzg7KWoex8SXtuTH7Rk="; + hash = "sha256-F2Jfq6lOYn4RsjP9Ay21G67F6HkGeY3SIEk26Z0BWnE="; }; build-system = [ setuptools ]; From e1b88807433c5abbd98b829abf5283f67596370f Mon Sep 17 00:00:00 2001 From: scraptux Date: Tue, 22 Oct 2024 10:52:17 +0200 Subject: [PATCH 112/617] python312Packages.grpcio-health-checking: 1.66.2 -> 1.67.0 --- .../python-modules/grpcio-health-checking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix index e7b6f49f158b..c235e46bee7e 100644 --- a/pkgs/development/python-modules/grpcio-health-checking/default.nix +++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "grpcio-health-checking"; - version = "1.66.2"; + version = "1.67.0"; format = "setuptools"; src = fetchPypi { pname = "grpcio_health_checking"; inherit version; - hash = "sha256-yQ35YiRWBC7DSV03qzC190ckqsW11VMU8HPu9eJHChM="; + hash = "sha256-PepxXVboJQ/wW6Se9RF/g2skD/N5vkY2DCbO/ZydsRo="; }; propagatedBuildInputs = [ From 2853e86dfd45652cd1f5dbdd1e77c759c1e661c9 Mon Sep 17 00:00:00 2001 From: scraptux Date: Tue, 22 Oct 2024 10:52:35 +0200 Subject: [PATCH 113/617] python312Packages.grpcio-reflection: 1.66.2 -> 1.67.0 --- pkgs/development/python-modules/grpcio-reflection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix index 35fb1faaeaef..804e1fe65655 100644 --- a/pkgs/development/python-modules/grpcio-reflection/default.nix +++ b/pkgs/development/python-modules/grpcio-reflection/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "grpcio-reflection"; - version = "1.66.2"; + version = "1.67.0"; pyproject = true; src = fetchPypi { pname = "grpcio_reflection"; inherit version; - hash = "sha256-rdgn4t61bpaAPIKs4dTnf6DI7DdH1jmOmVH3OdcQZ9Q="; + hash = "sha256-xHFDc4sYl7bOSvXg4zjIXJruX9y7M1XTaKjcrkbYkzw="; }; build-system = [ setuptools ]; From 0bddc71698b5594a58b342bf55abe141929ff4a6 Mon Sep 17 00:00:00 2001 From: scraptux Date: Tue, 22 Oct 2024 10:52:50 +0200 Subject: [PATCH 114/617] python312Packages.grpcio-status: 1.64.1 -> 1.67.0 --- pkgs/development/python-modules/grpcio-status/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index 89c02c344dd7..e6c03a04a1fe 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "grpcio-status"; - version = "1.66.2"; + version = "1.67.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "grpcio_status"; inherit version; - hash = "sha256-+1XLtcLmcGL3pNXJnkidB0+1fphnjVw8ZpKi102J6a4="; + hash = "sha256-w+Wob6AH6eJjzV+YioqQdITaTKq1godOoqSmCSc0BGs="; }; postPatch = '' From 2a4535cc10bc7a06db9fa06a40f43445da7f4ef5 Mon Sep 17 00:00:00 2001 From: scraptux Date: Tue, 22 Oct 2024 10:53:03 +0200 Subject: [PATCH 115/617] python312Packages.grpcio-testing: 1.66.2 -> 1.67.0 --- pkgs/development/python-modules/grpcio-testing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix index cabad7a8cfbe..ed4fcdb36114 100644 --- a/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/pkgs/development/python-modules/grpcio-testing/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "grpcio-testing"; - version = "1.66.2"; + version = "1.67.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "grpcio_testing"; inherit version; - hash = "sha256-pje9w7MSutXZKQd2dP0TS0zJbkm0P39OwQVLR28ZRgQ="; + hash = "sha256-YVRnu0aObDSfYCIKlrvMKin70hmwDdip96I+Qyi7+Dw="; }; postPatch = '' From 6b5a8cb3f462b163674ab883bdffcda9c24f4940 Mon Sep 17 00:00:00 2001 From: scraptux Date: Tue, 22 Oct 2024 10:53:19 +0200 Subject: [PATCH 116/617] python312Packages.grpcio-tools: 1.65.1 -> 1.67.0 --- pkgs/development/python-modules/grpcio-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 50b243cdf3d2..9fa12e405e14 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.66.2"; - format = "setuptools"; + version = "1.67.0"; + pyproject = true; src = fetchPypi { pname = "grpcio_tools"; inherit version; - hash = "sha256-SjbgeRPSa6XM/SaFumPKl/JrCMJJ0syedN2jfvpJ1+Q="; + hash = "sha256-GBs9TmG4MULBguw2bzB5sAI1CXQ5huVMlGXKOMrCVfg="; }; outputs = [ From da16a24f0aff890f114d545b7d5fee89f458dc8b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Oct 2024 10:56:52 +0200 Subject: [PATCH 117/617] python312Packages.grpcio: 1.64.1 -> 1.67.0 Changelog: https://github.com/grpc/grpc/releases/tag/v1.67.0 --- .../python-modules/grpcio/default.nix | 36 +++++++++---------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 8cff17c81eb4..976b3e9c2736 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -2,24 +2,24 @@ lib, stdenv, buildPythonPackage, + c-ares, + cython, fetchPypi, grpc, - six, - protobuf, - enum34 ? null, - futures ? null, - isPy27, - pkg-config, - cython, - c-ares, openssl, + pkg-config, + protobuf, + pythonOlder, + setuptools, zlib, }: buildPythonPackage rec { pname = "grpcio"; - format = "setuptools"; - version = "1.66.2"; + version = "1.67.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; @@ -31,6 +31,8 @@ buildPythonPackage rec { "dev" ]; + build-system = [ setuptools ]; + nativeBuildInputs = [ cython pkg-config @@ -41,15 +43,8 @@ buildPythonPackage rec { openssl zlib ]; - propagatedBuildInputs = - [ - six - protobuf - ] - ++ lib.optionals (isPy27) [ - enum34 - futures - ]; + + dependencies = [ protobuf ]; preBuild = '' @@ -76,8 +71,9 @@ buildPythonPackage rec { meta = with lib; { description = "HTTP/2-based RPC framework"; - license = licenses.asl20; homepage = "https://grpc.io/grpc/python/"; + changelog = "https://github.com/grpc/grpc/releases/tag/v${version}"; + license = licenses.asl20; maintainers = [ ]; }; } From 07aa0b864b9e3852006aad9f75cafdcc3ac9ab21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Oct 2024 01:25:21 +0000 Subject: [PATCH 118/617] nghttp2: 1.63.0 -> 1.64.0 --- pkgs/development/libraries/nghttp2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 77de8633b917..64e1e255c30b 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -32,11 +32,11 @@ assert enableJemalloc -> enableApp; stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.63.0"; + version = "1.64.0"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-YHsXRVTSKoKLxTLR1zT+D3KbXV7SB/LxLpamLoPynFU="; + sha256 = "sha256-OmcN83joUrhaIpXyXk9RzCj1bg/MSWQIuMN2QpBTevU="; }; outputs = [ "out" "dev" "lib" "doc" "man" ]; From 5f6c78c303e281fbd13ff75d5d32ef39b71333d3 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 23 Oct 2024 09:53:19 +0200 Subject: [PATCH 119/617] protobuf: 28.2 -> 28.3 Diff: https://github.com/protocolbuffers/protobuf/compare/v28.2...v28.3 Changelog: https://github.com/protocolbuffers/protobuf/releases/tag/v28.3 --- pkgs/development/libraries/protobuf/28.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/protobuf/28.nix b/pkgs/development/libraries/protobuf/28.nix index 340bac0ffe43..ae6940fa050e 100644 --- a/pkgs/development/libraries/protobuf/28.nix +++ b/pkgs/development/libraries/protobuf/28.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix ( { - version = "28.2"; - hash = "sha256-+ogjfmsbPUhqETJyHxoc1gYW/7a/JMc5l1gb/7WDqLE="; + version = "28.3"; + hash = "sha256-+bb5RxITzxuX50ItmpQhWEG1kMfvlizWTMJJzwlhhYM="; } // args ) From 2c59da55cb1a4c9f30d7f88e4ea6835b71691237 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 23 Oct 2024 09:54:31 +0200 Subject: [PATCH 120/617] python312Packages.protobuf: 5.28.2 -> 5.28.3 --- pkgs/development/python-modules/protobuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 228f8140fbe6..8e0cc3cc7a51 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "protobuf"; - version = "5.28.2"; + version = "5.28.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-WTeWdP8RlxdAT3RUZHkTeHA08D/nBJy+8ddKl7tFk/A="; + hash = "sha256-ZLrbxJGApeQB83P5znqx0Ytj991KnNxDySufC0gc73s="; }; build-system = [ setuptools ]; From 5b4cc3f8048a9f1c35862fe132fca5242b027344 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 23 Oct 2024 17:16:01 +0300 Subject: [PATCH 121/617] pipewire: 1.2.5 -> 1.2.6 Diff: https://gitlab.freedesktop.org/pipewire/pipewire/-/compare/1.2.5...1.2.6 Changelog: https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/1.2.6 --- pkgs/development/libraries/pipewire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 6d5a19409b69..f8735c294a07 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation(finalAttrs: { pname = "pipewire"; - version = "1.2.5"; + version = "1.2.6"; outputs = [ "out" @@ -75,7 +75,7 @@ stdenv.mkDerivation(finalAttrs: { owner = "pipewire"; repo = "pipewire"; rev = finalAttrs.version; - sha256 = "sha256-cYzcEit5zW29GYhvH/pTXqnYFi6AEaS5wl8nD74eWVY="; + sha256 = "sha256-AmrbA1YQBeETLC9u9rQ2f85rG9TASvcbCZ/Xlz7ICdY="; }; patches = [ From 5aa080a4906bac66c70a67b940269dab503b1746 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Tue, 22 Oct 2024 21:16:48 +0200 Subject: [PATCH 122/617] upower: Fix a race condition in test_sibling_priority_no_overwrite --- pkgs/os-specific/linux/upower/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 5b4e4ede7b56..5f2321bb407f 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , makeWrapper , pkg-config , libxslt @@ -53,6 +54,13 @@ stdenv.mkDerivation (finalAttrs: { ./i686-test-remove-battery-check.patch ] ++ [ ./installed-tests-path.patch + + # Fix a race condition in test_sibling_priority_no_overwrite + # Remove when updating to > 1.90.6 + (fetchpatch { + url = "https://gitlab.freedesktop.org/upower/upower/-/commit/9ee76826bd41a5d3a377dfd6f5835f42ec50be9a.patch"; + hash = "sha256-E56iz/iHn+VM7Opo0a13A5nhnB9nf6C7Y1kyWzk4ZnU="; + }) ]; strictDeps = true; From ae207af82b4c38b878a8928d2d54454a6f6bf387 Mon Sep 17 00:00:00 2001 From: piegames Date: Wed, 23 Oct 2024 21:52:18 +0200 Subject: [PATCH 123/617] treewide: More string indentation fixes Follow-up on #350296 with the packages that cause big rebuilds and need to go through staging. --- .../version-management/git/default.nix | 15 ++++---- pkgs/by-name/cu/cue/validator.nix | 4 +-- .../development/compilers/flutter/wrapper.nix | 3 +- pkgs/development/compilers/gcc/default.nix | 3 +- .../haskell-modules/configuration-nix.nix | 2 +- pkgs/development/libraries/check/default.nix | 16 ++++----- .../development/libraries/clutter/default.nix | 24 ++++++------- pkgs/development/libraries/glibc/common.nix | 14 ++++---- pkgs/development/libraries/gmp/4.3.2.nix | 4 +-- pkgs/development/libraries/gmp/5.1.x.nix | 4 +-- pkgs/development/libraries/gmp/6.x.nix | 36 +++++++++---------- pkgs/development/libraries/gnutls/default.nix | 3 +- pkgs/development/libraries/libmpc/default.nix | 10 +++--- .../build-managers/bazel/bazel_7/tests.nix | 2 +- pkgs/development/tools/misc/gdb/default.nix | 8 ++--- .../tools/misc/gengetopt/default.nix | 10 +++--- pkgs/tools/archivers/sharutils/default.nix | 4 +-- pkgs/tools/compression/brotli/default.nix | 22 ++++++------ pkgs/tools/compression/gzip/default.nix | 20 +++++------ pkgs/tools/compression/xz/default.nix | 24 ++++++------- 20 files changed, 117 insertions(+), 111 deletions(-) diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 1b4f736ed63f..57779cb487d0 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -245,10 +245,11 @@ stdenv.mkDerivation (finalAttrs: { + (if svnSupport then '' # wrap git-svn - wrapProgram $out/libexec/git-core/git-svn \ - --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath (perlLibs ++ [svn.out])}" \ - --prefix PATH : "${svn.out}/bin" '' - else '' # replace git-svn by notification script + wrapProgram $out/libexec/git-core/git-svn \ + --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath (perlLibs ++ [svn.out])}" \ + --prefix PATH : "${svn.out}/bin" + '' else '' + # replace git-svn by notification script notSupported $out/libexec/git-core/git-svn '') @@ -261,9 +262,11 @@ stdenv.mkDerivation (finalAttrs: { notSupported $out/libexec/git-core/git-send-email '') - + lib.optionalString withManual ''# Install man pages + + lib.optionalString withManual '' + # Install man pages make -j $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html \ - -C Documentation '' + -C Documentation + '' + (if guiSupport then '' # Wrap Tcl/Tk programs diff --git a/pkgs/by-name/cu/cue/validator.nix b/pkgs/by-name/cu/cue/validator.nix index cddc3fe342b7..09e852347341 100644 --- a/pkgs/by-name/cu/cue/validator.nix +++ b/pkgs/by-name/cu/cue/validator.nix @@ -5,8 +5,8 @@ # against the fragment described by `document` or the whole definition. # The script will be strict and enforce concrete values, i.e. partial documents are not supported. cueSchemaFile: { document ? null }: - writeShellScript "validate-using-cue" - ''${cue}/bin/cue \ + writeShellScript "validate-using-cue" '' + ${cue}/bin/cue \ --all-errors \ --strict \ vet \ diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index 2c1b1ea125c8..9b4123b0e7d9 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -146,7 +146,8 @@ in '' + lib.optionalString (flutter ? engine && flutter.engine.meta.available) '' --set-default FLUTTER_ENGINE "${flutter.engine}" \ --add-flags "--local-engine-host ${flutter.engine.outName}" \ - '' + '' --suffix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \ + '' + '' + --suffix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \ --suffix PKG_CONFIG_PATH : "$FLUTTER_PKG_CONFIG_PATH" \ --suffix LIBRARY_PATH : '${lib.makeLibraryPath appStaticBuildDeps}' \ --prefix CXXFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCxxFlags)}' \ diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index d5d59adabb74..40a0484d5c50 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -226,7 +226,8 @@ pipe ((callFile ./common/builder.nix {}) ({ libc = if libcCross != null then libcCross else stdenv.cc.libc; in ( - '' echo "fixing the {GLIBC,UCLIBC,MUSL}_DYNAMIC_LINKER macros..." + '' + echo "fixing the {GLIBC,UCLIBC,MUSL}_DYNAMIC_LINKER macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h do grep -q _DYNAMIC_LINKER "$header" || continue diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 269fef0dd6a8..0a30703684c4 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -523,7 +523,7 @@ self: super: builtins.intersectAttrs super { "--extra-include-dirs=${pkgs.cwiid}/include" "--extra-include-dirs=${pkgs.bluez.dev}/include" ]; - prePatch = '' sed -i -e "/Extra-Lib-Dirs/d" -e "/Include-Dirs/d" "hcwiid.cabal" ''; + prePatch = ''sed -i -e "/Extra-Lib-Dirs/d" -e "/Include-Dirs/d" "hcwiid.cabal"''; }) super.hcwiid; # cabal2nix doesn't pick up some of the dependencies. diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index 10030f5653c2..82aca7c4ec01 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Unit testing framework for C"; - longDescription = - '' Check is a unit testing framework for C. It features a simple - interface for defining unit tests, putting little in the way of the - developer. Tests are run in a separate address space, so Check can - catch both assertion failures and code errors that cause - segmentation faults or other signals. The output from unit tests - can be used within source code editors and IDEs. - ''; + longDescription = '' + Check is a unit testing framework for C. It features a simple + interface for defining unit tests, putting little in the way of the + developer. Tests are run in a separate address space, so Check can + catch both assertion failures and code errors that cause + segmentation faults or other signals. The output from unit tests + can be used within source code editors and IDEs. + ''; homepage = "https://libcheck.github.io/check/"; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index bb7ddf08957f..3831e3105208 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -84,20 +84,20 @@ stdenv.mkDerivation rec { meta = { description = "Library for creating fast, dynamic graphical user interfaces"; - longDescription = - '' Clutter is free software library for creating fast, compelling, - portable, and dynamic graphical user interfaces. It is a core part - of MeeGo, and is supported by the open source community. Its - development is sponsored by Intel. + longDescription = '' + Clutter is free software library for creating fast, compelling, + portable, and dynamic graphical user interfaces. It is a core part + of MeeGo, and is supported by the open source community. Its + development is sponsored by Intel. - Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use - on mobile and embedded platforms), but wraps an easy to use, - efficient, flexible API around GL's complexity. + Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use + on mobile and embedded platforms), but wraps an easy to use, + efficient, flexible API around GL's complexity. - Clutter enforces no particular user interface style, but provides a - rich, generic foundation for higher-level toolkits tailored to - specific needs. - ''; + Clutter enforces no particular user interface style, but provides a + rich, generic foundation for higher-level toolkits tailored to + specific needs. + ''; license = lib.licenses.lgpl2Plus; homepage = "http://www.clutter-project.org/"; diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index a611cb38d836..09dde042848b 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -283,14 +283,14 @@ stdenv.mkDerivation ({ homepage = "https://www.gnu.org/software/libc/"; description = "GNU C Library"; - longDescription = - '' Any Unix-like operating system needs a C library: the library which - defines the "system calls" and other basic facilities such as - open, malloc, printf, exit... + longDescription = '' + Any Unix-like operating system needs a C library: the library which + defines the "system calls" and other basic facilities such as + open, malloc, printf, exit... - The GNU C library is used as the C library in the GNU system and - most systems with the Linux kernel. - ''; + The GNU C library is used as the C library in the GNU system and + most systems with the Linux kernel. + ''; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix index 9d014c266753..2700dad0db09 100644 --- a/pkgs/development/libraries/gmp/4.3.2.nix +++ b/pkgs/development/libraries/gmp/4.3.2.nix @@ -43,8 +43,8 @@ let self = stdenv.mkDerivation rec { branch = "4"; description = "GNU multiple precision arithmetic library"; - longDescription = - '' GMP is a free library for arbitrary precision arithmetic, operating + longDescription = '' + GMP is a free library for arbitrary precision arithmetic, operating on signed integers, rational numbers, and floating point numbers. There is no practical limit to the precision except the ones implied by the available memory in the machine GMP runs on. GMP has a rich diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index 43e3ca9759eb..adc4d7946862 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -56,8 +56,8 @@ let self = stdenv.mkDerivation rec { description = "GNU multiple precision arithmetic library"; license = licenses.gpl3Plus; - longDescription = - '' GMP is a free library for arbitrary precision arithmetic, operating + longDescription = '' + GMP is a free library for arbitrary precision arithmetic, operating on signed integers, rational numbers, and floating point numbers. There is no practical limit to the precision except the ones implied by the available memory in the machine GMP runs on. GMP has a rich diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index e1a8ff0ecdc1..458c7928c00e 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -64,27 +64,27 @@ let self = stdenv.mkDerivation rec { gpl2Only ]; - longDescription = - '' GMP is a free library for arbitrary precision arithmetic, operating - on signed integers, rational numbers, and floating point numbers. - There is no practical limit to the precision except the ones implied - by the available memory in the machine GMP runs on. GMP has a rich - set of functions, and the functions have a regular interface. + longDescription = '' + GMP is a free library for arbitrary precision arithmetic, operating + on signed integers, rational numbers, and floating point numbers. + There is no practical limit to the precision except the ones implied + by the available memory in the machine GMP runs on. GMP has a rich + set of functions, and the functions have a regular interface. - The main target applications for GMP are cryptography applications - and research, Internet security applications, algebra systems, - computational algebra research, etc. + The main target applications for GMP are cryptography applications + and research, Internet security applications, algebra systems, + computational algebra research, etc. - GMP is carefully designed to be as fast as possible, both for small - operands and for huge operands. The speed is achieved by using - fullwords as the basic arithmetic type, by using fast algorithms, - with highly optimised assembly code for the most common inner loops - for a lot of CPUs, and by a general emphasis on speed. + GMP is carefully designed to be as fast as possible, both for small + operands and for huge operands. The speed is achieved by using + fullwords as the basic arithmetic type, by using fast algorithms, + with highly optimised assembly code for the most common inner loops + for a lot of CPUs, and by a general emphasis on speed. - GMP is faster than any other bignum library. The advantage for GMP - increases with the operand sizes for many operations, since GMP uses - asymptotically faster algorithms. - ''; + GMP is faster than any other bignum library. The advantage for GMP + increases with the operand sizes for many operations, since GMP uses + asymptotically faster algorithms. + ''; platforms = platforms.all; maintainers = [ ]; diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 3e9395668c85..964c0acb7c78 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -98,7 +98,8 @@ stdenv.mkDerivation rec { sed '2iexit 77' -i tests/{pkgconfig,fastopen}.sh sed '/^void doit(void)/,/^{/ s/{/{ exit(77);/' -i tests/{trust-store,psk-file}.c sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh - '' + lib.optionalString stdenv.hostPlatform.isMusl '' # See https://gitlab.com/gnutls/gnutls/-/issues/945 + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + # See https://gitlab.com/gnutls/gnutls/-/issues/945 sed '2iecho "certtool tests skipped in musl build"\nexit 0' -i tests/cert-tests/certtool.sh '' + lib.optionalString stdenv.hostPlatform.isLinux '' sed '2iexit 77' -i tests/{ktls,ktls_keyupdate}.sh diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix index fe11b59f4523..053f0113b444 100644 --- a/pkgs/development/libraries/libmpc/default.nix +++ b/pkgs/development/libraries/libmpc/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { meta = { description = "Library for multiprecision complex arithmetic with exact rounding"; - longDescription = - '' GNU MPC is a C library for the arithmetic of complex numbers with - arbitrarily high precision and correct rounding of the result. It is - built upon and follows the same principles as GNU MPFR. - ''; + longDescription = '' + GNU MPC is a C library for the arithmetic of complex numbers with + arbitrarily high precision and correct rounding of the result. It is + built upon and follows the same principles as GNU MPFR. + ''; homepage = "https://www.multiprecision.org/mpc/"; license = lib.licenses.lgpl2Plus; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/tests.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/tests.nix index 0976d1c2d5a6..768804ecd555 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/tests.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/tests.nix @@ -104,7 +104,7 @@ let } ${# Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609 # about why to create a subdir for the workspace. - '' cp -r ${workspaceDir} wd && chmod ug+rw -R wd && cd wd '' + ''cp -r ${workspaceDir} wd && chmod ug+rw -R wd && cd wd'' } ${# run the actual test snippet bazelScript diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 40808bcdb439..3a41ff855d38 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -117,10 +117,10 @@ stdenv.mkDerivation rec { ++ lib.optional enableDebuginfod "--with-debuginfod=yes" ++ lib.optional (!enableSim) "--disable-sim"; - postInstall = - '' # Remove Info files already provided by Binutils and other packages. - rm -v $out/share/info/bfd.info - ''; + postInstall = '' + # Remove Info files already provided by Binutils and other packages. + rm -v $out/share/info/bfd.info + ''; # TODO: Investigate & fix the test failures. doCheck = false; diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix index 9ef5ec24d545..b0492665de1b 100644 --- a/pkgs/development/tools/misc/gengetopt/default.nix +++ b/pkgs/development/tools/misc/gengetopt/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { description = "Command-line option parser generator"; mainProgram = "gengetopt"; - longDescription = - '' GNU Gengetopt program generates a C function that uses getopt_long - function to parse the command line options, to validate them and - fills a struct - ''; + longDescription = '' + GNU Gengetopt program generates a C function that uses getopt_long + function to parse the command line options, to validate them and + fills a struct + ''; homepage = "https://www.gnu.org/software/gengetopt/"; diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index 557fdae4d22b..6a30ae1ff946 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -66,8 +66,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools for remote synchronization and `shell archives'"; - longDescription = - '' GNU shar makes so-called shell archives out of many files, preparing + longDescription = '' + GNU shar makes so-called shell archives out of many files, preparing them for transmission by electronic mail services. A shell archive is a collection of files that can be unpacked by /bin/sh. A wide range of features provide extensive flexibility in manufacturing diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index 94ed992812e5..0a7bbfe1746c 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -54,18 +54,18 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/google/brotli"; description = "Generic-purpose lossless compression algorithm and tool"; - longDescription = - '' Brotli is a generic-purpose lossless compression algorithm that - compresses data using a combination of a modern variant of the LZ77 - algorithm, Huffman coding and 2nd order context modeling, with a - compression ratio comparable to the best currently available - general-purpose compression methods. It is similar in speed with - deflate but offers more dense compression. + longDescription = '' + Brotli is a generic-purpose lossless compression algorithm that + compresses data using a combination of a modern variant of the LZ77 + algorithm, Huffman coding and 2nd order context modeling, with a + compression ratio comparable to the best currently available + general-purpose compression methods. It is similar in speed with + deflate but offers more dense compression. - The specification of the Brotli Compressed Data Format is defined - in the following internet draft: - http://www.ietf.org/id/draft-alakuijala-brotli - ''; + The specification of the Brotli Compressed Data Format is defined + in the following internet draft: + http://www.ietf.org/id/draft-alakuijala-brotli + ''; license = licenses.mit; maintainers = with maintainers; [ freezeboy ]; pkgConfigModules = [ diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index 8b10fa1c98d4..cbca093bcb4f 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -55,17 +55,17 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/gzip/"; description = "GNU zip compression program"; - longDescription = - ''gzip (GNU zip) is a popular data compression program written by - Jean-loup Gailly for the GNU project. Mark Adler wrote the - decompression part. + longDescription = '' + gzip (GNU zip) is a popular data compression program written by + Jean-loup Gailly for the GNU project. Mark Adler wrote the + decompression part. - We developed this program as a replacement for compress because of - the Unisys and IBM patents covering the LZW algorithm used by - compress. These patents made it impossible for us to use compress, - and we needed a replacement. The superior compression ratio of gzip - is just a bonus. - ''; + We developed this program as a replacement for compress because of + the Unisys and IBM patents covering the LZW algorithm used by + compress. These patents made it impossible for us to use compress, + and we needed a replacement. The superior compression ratio of gzip + is just a bonus. + ''; platforms = lib.platforms.all; diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index c05350ba9b64..47619ac751b3 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -65,19 +65,19 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/tukaani-project/xz/releases/tag/v${finalAttrs.version}"; description = "General-purpose data compression software, successor of LZMA"; homepage = "https://tukaani.org/xz/"; - longDescription = - '' XZ Utils is free general-purpose data compression software with high - compression ratio. XZ Utils were written for POSIX-like systems, - but also work on some not-so-POSIX systems. XZ Utils are the - successor to LZMA Utils. + longDescription = '' + XZ Utils is free general-purpose data compression software with high + compression ratio. XZ Utils were written for POSIX-like systems, + but also work on some not-so-POSIX systems. XZ Utils are the + successor to LZMA Utils. - The core of the XZ Utils compression code is based on LZMA SDK, but - it has been modified quite a lot to be suitable for XZ Utils. The - primary compression algorithm is currently LZMA2, which is used - inside the .xz container format. With typical files, XZ Utils - create 30 % smaller output than gzip and 15 % smaller output than - bzip2. - ''; + The core of the XZ Utils compression code is based on LZMA SDK, but + it has been modified quite a lot to be suitable for XZ Utils. The + primary compression algorithm is currently LZMA2, which is used + inside the .xz container format. With typical files, XZ Utils + create 30 % smaller output than gzip and 15 % smaller output than + bzip2. + ''; license = with licenses; [ gpl2Plus lgpl21Plus ]; maintainers = with maintainers; [ sander ]; platforms = platforms.all; From 74d8a923cb7947cc12cee722d75d5d3fd7d26c6b Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 23 Oct 2024 13:22:44 -0700 Subject: [PATCH 124/617] tinyxxd: 1.3.6 -> 1.3.7 Diff: https://github.com/xyproto/tinyxxd/compare/v1.3.6...v1.3.7 A compatibility error with vim's xxd was reported and fixed: - https://github.com/xyproto/tinyxxd/issues/15 --- pkgs/by-name/ti/tinyxxd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ti/tinyxxd/package.nix b/pkgs/by-name/ti/tinyxxd/package.nix index 2da810f16614..ed491ca42b61 100644 --- a/pkgs/by-name/ti/tinyxxd/package.nix +++ b/pkgs/by-name/ti/tinyxxd/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tinyxxd"; - version = "1.3.6"; + version = "1.3.7"; src = fetchFromGitHub { repo = "tinyxxd"; owner = "xyproto"; rev = "v${finalAttrs.version}"; - hash = "sha256-SPKDowZrr1m9DiL7p8pKHKJuahEiwCmW5VhuE314Otw="; + hash = "sha256-Yj9n/reWAjKY1spXiW/fjPGTgj1Yc18FzFln6f5LK9c="; }; nativeBuildInputs = [ installShellFiles ]; From 5e29fe353405fea970eec69ae76638c606886886 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 13 Aug 2024 23:28:48 +0200 Subject: [PATCH 125/617] kvazaar: init at 2.3.1 --- pkgs/by-name/kv/kvazaar/package.nix | 44 +++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pkgs/by-name/kv/kvazaar/package.nix diff --git a/pkgs/by-name/kv/kvazaar/package.nix b/pkgs/by-name/kv/kvazaar/package.nix new file mode 100644 index 000000000000..9fe102f82d5c --- /dev/null +++ b/pkgs/by-name/kv/kvazaar/package.nix @@ -0,0 +1,44 @@ +{ + lib, + stdenv, + fetchFromGitHub, + gitUpdater, + testers, + cmake, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "kvazaar"; + version = "2.3.1"; + + src = fetchFromGitHub { + owner = "ultravideo"; + repo = "kvazaar"; + rev = "v${finalAttrs.version}"; + hash = "sha256-d/OkX18nyHSQXJgNhBtiCLb/Fe8Y/MpddXxLpNMZiXI="; + }; + + nativeBuildInputs = [ cmake ]; + + outputs = [ + "out" + "lib" + "dev" + "man" + ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + description = "Open-source HEVC encoder"; + homepage = "https://github.com/ultravideo/kvazaar"; + changelog = "https://github.com/ultravideo/kvazaar/releases/tag/v${finalAttrs.version}"; + pkgConfigModules = [ "kvazaar" ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +}) From 77a6293b4ff3d241c37204ece7e141c491249b6b Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 13 Aug 2024 23:38:57 +0200 Subject: [PATCH 126/617] ffmpeg: add kvazaar option --- pkgs/development/libraries/ffmpeg/generic.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index e6863e849324..c7cdaa766d92 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -74,6 +74,7 @@ , withIlbc ? withFullDeps # iLBC de/encoding , withJack ? withFullDeps && !stdenv.hostPlatform.isDarwin # Jack audio , withJxl ? withFullDeps && lib.versionAtLeast version "5" # JPEG XL de/encoding +, withKvazaar ? withFullDeps # HEVC encoding , withLadspa ? withFullDeps # LADSPA audio filtering , withLcms2 ? withFullDeps # ICC profile support via lcms2 , withLzma ? withHeadlessDeps # xz-utils @@ -243,6 +244,7 @@ , gsm , harfbuzz , intel-media-sdk +, kvazaar , ladspaH , lame , lcms2 @@ -600,6 +602,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ optionals (versionAtLeast finalAttrs.version "5.0") [ (enableFeature withJxl "libjxl") ] ++ [ + (enableFeature withKvazaar "libkvazaar") (enableFeature withLadspa "ladspa") ] ++ optionals (versionAtLeast version "5.1") [ (enableFeature withLcms2 "lcms2") @@ -760,6 +763,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withIlbc [ libilbc ] ++ optionals withJack [ libjack2 ] ++ optionals withJxl [ libjxl ] + ++ optionals withKvazaar [ kvazaar ] ++ optionals withLadspa [ ladspaH ] ++ optionals withLcms2 [ lcms2 ] ++ optionals withLzma [ xz ] From 1971cea5492516371f36931c5b2793074d7815cc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 24 Oct 2024 01:47:43 +0200 Subject: [PATCH 127/617] python312Packages.pillow-simd: drop Pillow is on 11.0, pillow-simd remains on 9.5.0.post2. We've seen various CVEs since, and since pillow-simd is a leaf package we remove it now. --- .../python-modules/pillow-simd/default.nix | 63 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 5 -- 3 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 pkgs/development/python-modules/pillow-simd/default.nix diff --git a/pkgs/development/python-modules/pillow-simd/default.nix b/pkgs/development/python-modules/pillow-simd/default.nix deleted file mode 100644 index 2d3551d171e9..000000000000 --- a/pkgs/development/python-modules/pillow-simd/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - stdenv, - buildPythonPackage, - fetchFromGitHub, - isPyPy, - isPy3k, - olefile, - freetype, - libjpeg, - zlib, - libtiff, - libwebp, - libxcrypt, - tcl, - lcms2, - libxcb, - tk, - libX11, - openjpeg, - libimagequant, - pyroma, - numpy, - defusedxml, - pytestCheckHook, - setuptools, -}@args: - -import ../pillow/generic.nix ( - rec { - pname = "Pillow-SIMD"; - # check for release version on https://pypi.org/project/Pillow-SIMD/#history - # does not match the latest pillow release version! - version = "9.0.0.post1"; - format = "setuptools"; - - disabled = !isPy3k; - - src = fetchFromGitHub { - owner = "uploadcare"; - repo = "pillow-simd"; - rev = "v${version}"; - hash = "sha256-qTZYhgHjVMXqoYl3mG1xVrFaWrPidSY8HlyFQizV27Y="; - }; - - meta = with lib; { - broken = - (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; - homepage = "https://python-pillow.github.io/pillow-perf/"; - description = "Friendly PIL fork - SIMD version"; - longDescription = '' - Pillow-SIMD is "following" Pillow. Pillow-SIMD versions are 100% compatible drop-in replacements for Pillow of the same version. - - SIMD stands for "single instruction, multiple data" and its essence is in performing the same operation on multiple data points simultaneously by using multiple processing elements. Common CPU SIMD instruction sets are MMX, SSE-SSE4, AVX, AVX2, AVX512, NEON. - - Currently, Pillow-SIMD can be compiled with SSE4 (default) or AVX2 support. - ''; - license = licenses.hpnd; - maintainers = [ ]; - }; - } - // args -) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b55e051e41a5..634992d9eaee 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -402,6 +402,7 @@ mapAliases ({ pdfminer = pdfminer-six; # added 2022-05-25 pdfx = throw "pdfx has been removed because the upstream repository was archived in 2023"; # Added 2024-10-04 pep257 = pydocstyle; # added 2022-04-12 + pillow-simd = throw "pillow-simd has been removed for lagging behind pillow upstream, which exposes it to various security issues."; # Added 2024-10-24 pixelmatch = "pixelmatch has been removed as it was unmaintained"; # Added 2024-08-18 pkutils = throw "pkutils was removed as it was unused and is not applicable to modern Python build tools"; # added 2024-07-28 poetry = throw "poetry was promoted to a top-level attribute, use poetry-core to build Python packages"; # added 2023-01-09 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bc41e8b2046f..492c9dba514d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10079,11 +10079,6 @@ self: super: with self; { pillow-jpls = callPackage ../development/python-modules/pillow-jpls { }; - pillow-simd = callPackage ../development/python-modules/pillow-simd { - inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; - inherit (pkgs.xorg) libX11; - }; - pims = callPackage ../development/python-modules/pims { }; pinboard = callPackage ../development/python-modules/pinboard { }; From fa3075a22d795d1a55e50e811cecb483aed5b474 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 24 Oct 2024 03:11:22 +0200 Subject: [PATCH 128/617] lib/licenses: introduce MIT-CMU license --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index fb7b6c2e837f..495823c90a35 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -890,6 +890,11 @@ lib.mapAttrs mkLicense ({ fullName = "MIT License"; }; + mit-cmu = { + spdxId = "MIT-CMU"; + fullName = "CMU License"; + }; + mit-feh = { spdxId = "MIT-feh"; fullName = "feh License"; From 477d7f77483665a57d06c0962189dde3a9395034 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 24 Oct 2024 03:05:57 +0200 Subject: [PATCH 129/617] python312Packages.pillow: 10.4.0 -> 11.0 https://pillow.readthedocs.io/en/stable/releasenotes/11.0.0.html Removes the generalization of the package that has become obsolete with the pillow-simd removal. --- .../python-modules/pillow/default.nix | 174 +++++++++++++----- .../python-modules/pillow/generic.nix | 109 ----------- pkgs/top-level/python-packages.nix | 14 +- 3 files changed, 137 insertions(+), 160 deletions(-) delete mode 100644 pkgs/development/python-modules/pillow/generic.nix diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index b5257f5101d2..30d741052a09 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -3,26 +3,35 @@ stdenv, buildPythonPackage, pythonOlder, - fetchPypi, - isPyPy, - defusedxml, - olefile, + fetchFromGitHub, + + # build-system + setuptools, + pkg-config, + + # native dependencies freetype, + lcms2, + libimagequant, libjpeg, - zlib, + libraqm, libtiff, libwebp, - libxcrypt, - tcl, - lcms2, - tk, - libX11, libxcb, openjpeg, - libimagequant, + tkinter, + zlib, + + # optional dependencies + defusedxml, + olefile, + typing-extensions, + + # tests numpy, + pytest-cov-stub, pytestCheckHook, - setuptools, + # for passthru.tests imageio, matplotlib, @@ -30,45 +39,112 @@ pydicom, reportlab, sage, -}@args: +}: -import ./generic.nix ( - rec { - pname = "pillow"; - version = "10.4.0"; - format = "pyproject"; +buildPythonPackage rec { + pname = "pillow"; + version = "11.0.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + src = fetchFromGitHub { + owner = "python-pillow"; + repo = "pillow"; + rev = "refs/tags/${version}"; + hash = "sha256-vWNqzA2ZfJcWexXw790RgyYtP8WDtahoQIX16otCRnk="; + }; - src = fetchPypi { - pname = "pillow"; - inherit version; - hash = "sha256-Fmwc1NJDCbMNYfefSpEUt7IxPXRQkSJ3hV/139fNSgY="; - }; + build-system = [ setuptools ]; - passthru.tests = { - inherit - imageio - matplotlib - pilkit - pydicom - reportlab - sage - ; - }; + nativeBuildInputs = [ pkg-config ]; - meta = with lib; { - homepage = "https://python-pillow.org/"; - description = "Friendly PIL fork (Python Imaging Library)"; - longDescription = '' - The Python Imaging Library (PIL) adds image processing - capabilities to your Python interpreter. This library - supports many file formats, and provides powerful image - processing and graphics capabilities. - ''; - license = licenses.hpnd; - maintainers = with maintainers; [ prikhi ]; - }; - } - // args -) + # https://pillow.readthedocs.io/en/latest/installation/building-from-source.html#building-from-source + buildInputs = [ + freetype + lcms2 + libimagequant + libjpeg + libraqm + libtiff + libwebp + libxcb + openjpeg + tkinter + zlib + ]; + + pypaBuildFlags = [ + # Disable platform guessing, which tries various FHS paths + "--config=setting=--disable-platform-guessing" + ]; + + preConfigure = + let + getLibAndInclude = pkg: ''"${pkg.out}/lib", "${lib.getDev pkg}/include"''; + in + '' + # The build process fails to find the pkg-config files for these dependencies + substituteInPlace setup.py \ + --replace-fail 'IMAGEQUANT_ROOT = None' 'IMAGEQUANT_ROOT = ${getLibAndInclude libimagequant}' \ + --replace-fail 'JPEG2K_ROOT = None' 'JPEG2K_ROOT = ${getLibAndInclude openjpeg}' + + # Build with X11 support + export LDFLAGS="$LDFLAGS -L${libxcb}/lib" + export CFLAGS="$CFLAGS -I${libxcb.dev}/include" + ''; + + optional-dependencies = { + fpx = [ olefile ]; + mic = [ olefile ]; + typing = lib.optionals (pythonOlder "3.10") [ typing-extensions ]; + xmp = [ defusedxml ]; + }; + + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + numpy + ] ++ lib.flatten (lib.attrValues optional-dependencies); + + disabledTests = + [ + # Code quality mismathch 9 vs 10 + "test_pyroma" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Disable darwin tests which require executables: `iconutil` and `screencapture` + "test_grab" + "test_grabclipboard" + "test_save" + ]; + + disabledTestPaths = lib.optionals stdenv.isDarwin [ + # Crashes the interpreter + "Tests/test_imagetk.py" + ]; + + passthru.tests = { + inherit + imageio + matplotlib + pilkit + pydicom + reportlab + sage + ; + }; + + meta = with lib; { + homepage = "https://python-pillow.org"; + changelog = "https://pillow.readthedocs.io/en/stable/releasenotes/${version}.html"; + description = "Friendly PIL fork (Python Imaging Library)"; + longDescription = '' + The Python Imaging Library (PIL) adds image processing + capabilities to your Python interpreter. This library + supports many file formats, and provides powerful image + processing and graphics capabilities. + ''; + license = licenses.mit-cmu; + maintainers = with maintainers; [ hexa ]; + }; + +} diff --git a/pkgs/development/python-modules/pillow/generic.nix b/pkgs/development/python-modules/pillow/generic.nix deleted file mode 100644 index 1ecaea6b205d..000000000000 --- a/pkgs/development/python-modules/pillow/generic.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ - pname, - version, - src, - patches ? [ ], - meta, - passthru ? { }, - ... -}@args: - -with args; - -buildPythonPackage rec { - inherit - pname - version - format - src - meta - passthru - patches - ; - - # Disable imagefont tests, because they don't work well with infinality: - # https://github.com/python-pillow/Pillow/issues/1259 - postPatch = '' - rm Tests/test_imagefont.py - ''; - - disabledTests = - [ - # Code quality mismathch 9 vs 10 - "test_pyroma" - - # pillow-simd - "test_roundtrip" - "test_basic" - "test_custom_metadata" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Disable darwin tests which require executables: `iconutil` and `screencapture` - "test_grab" - "test_grabclipboard" - "test_save" - ]; - - propagatedBuildInputs = [ - olefile - ] ++ lib.optionals (lib.versionAtLeast version "8.2.0") [ defusedxml ]; - - nativeCheckInputs = [ - pytestCheckHook - numpy - ]; - - nativeBuildInputs = [ setuptools ]; - - buildInputs = - [ - freetype - libjpeg - openjpeg - libimagequant - zlib - libtiff - libwebp - libxcrypt - tcl - lcms2 - ] - ++ lib.optionals (lib.versionAtLeast version "7.1.0") [ libxcb ] - ++ lib.optionals (isPyPy) [ - tk - libX11 - ]; - - # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. - # NOTE: The Pillow install script will, by default, add paths like /usr/lib - # and /usr/include to the search paths. This can break things when building - # on a non-NixOS system that has some libraries installed that are not - # installed in Nix (for example, Arch Linux has jpeg2000 but Nix doesn't - # build Pillow with this support). We patch the `disable_platform_guessing` - # setting here, instead of passing the `--disable-platform-guessing` - # command-line option, since the command-line option doesn't work when we run - # tests. - preConfigure = - let - libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"''; - libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"''; - in - '' - sed -i "setup.py" \ - -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ; - s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ; - s|^JPEG2K_ROOT =.*$|JPEG2K_ROOT = ${libinclude openjpeg}|g ; - s|^IMAGEQUANT_ROOT =.*$|IMAGEQUANT_ROOT = ${libinclude' libimagequant}|g ; - s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ; - s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ; - s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ; - s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ; - s|self\.disable_platform_guessing = None|self.disable_platform_guessing = True|g ;' - export LDFLAGS="$LDFLAGS -L${libwebp}/lib" - export CFLAGS="$CFLAGS -I${libwebp}/include" - '' - + lib.optionalString (lib.versionAtLeast version "7.1.0") '' - export LDFLAGS="$LDFLAGS -L${libxcb}/lib" - export CFLAGS="$CFLAGS -I${libxcb.dev}/include" - ''; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 492c9dba514d..7becfdc8c678 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10071,8 +10071,18 @@ self: super: with self; { pillowfight = callPackage ../development/python-modules/pillowfight { }; pillow = callPackage ../development/python-modules/pillow { - inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; - inherit (pkgs.xorg) libX11 libxcb; + inherit (pkgs) + freetype + lcms2 + libimagequant + libjpeg + libraqm + libtiff + libwebp + openjpeg + zlib + ; + inherit (pkgs.xorg) libxcb; }; pillow-heif = callPackage ../development/python-modules/pillow-heif { }; From 2713abab68939a23b13d2add48a527167eb277da Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 24 Oct 2024 03:40:49 +0200 Subject: [PATCH 130/617] python312Packages.pillow-heif: 0.18.0 -> 0.20.0 https://github.com/bigcat88/pillow_heif/releases/tag/v0.20.0 --- pkgs/development/python-modules/pillow-heif/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix index be57d452680b..caa81ce9720b 100644 --- a/pkgs/development/python-modules/pillow-heif/default.nix +++ b/pkgs/development/python-modules/pillow-heif/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "pillow-heif"; - version = "0.18.0"; + version = "0.20.0"; pyproject = true; src = fetchFromGitHub { owner = "bigcat88"; repo = "pillow_heif"; rev = "refs/tags/v${version}"; - hash = "sha256-+HQvDf5aovUtZ++BoD22B012N32A+7++O/jbpkIVQws="; + hash = "sha256-a1qCxI+mMuEYsCk2CUYGNKCe+SONuvVizqUvmQKy3sE="; }; postPatch = '' From 464344156d32f320beafc520288df2e1ba6cdff6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 24 Oct 2024 05:24:07 +0200 Subject: [PATCH 131/617] python312Packages.imageio: disable failing test --- .../python-modules/imageio/default.nix | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 0c489b5c30d2..8ce6d5d4f4ec 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, isPyPy, substituteAll, @@ -98,15 +97,21 @@ buildPythonPackage rec { "tests/test_swf.py" ]; - disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ - # Segmentation fault - "test_bayer_write" - # RuntimeError: No valid H.264 encoder was found with the ffmpeg installation - "test_writer_file_properly_closed" - "test_writer_pixelformat_size_verbose" - "test_writer_ffmpeg_params" - "test_reverse_read" - ]; + disabledTests = + [ + # Pillow 11.0.0 compat + # https://github.com/imageio/imageio/issues/1104 + "test_gif" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Segmentation fault + "test_bayer_write" + # RuntimeError: No valid H.264 encoder was found with the ffmpeg installation + "test_writer_file_properly_closed" + "test_writer_pixelformat_size_verbose" + "test_writer_ffmpeg_params" + "test_reverse_read" + ]; meta = { description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats"; From 000c1bad0d8a0fba6b7c3753ed25a80cef707643 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 24 Oct 2024 18:13:14 +0200 Subject: [PATCH 132/617] python312Packages.starlette: 0.39.2 -> 0.40.0 https://www.starlette.io/release-notes/#0400-october-15-2024 https://github.com/encode/starlette/security/advisories/GHSA-f96h-pmfr-66vw Fixes: CVE-2024-47874 --- pkgs/development/python-modules/starlette/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index c68e0f515ce5..c1b0fa8be4bd 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.39.2"; + version = "0.40.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "encode"; repo = "starlette"; rev = "refs/tags/${version}"; - hash = "sha256-sAvtqeyfyMf+xt78bqlaNYW9xYYCFkiW45OVlI9itgg="; + hash = "sha256-CBkDDsIw9LAIeAzN5E9gdEvznFugoa/RilPmnwcJBy4="; }; build-system = [ hatchling ]; From 427db1945c38561784df1d88bae6694f0491d2a0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 24 Oct 2024 18:19:43 +0200 Subject: [PATCH 133/617] python312Packages.anyio: 4.6.0 -> 4.6.2 https://github.com/agronholm/anyio/blob/refs/tags/4.6.2/docs/versionhistory.rst --- pkgs/development/python-modules/anyio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 298bd4d7e33c..c5e13ea20f1c 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "4.6.0"; + version = "4.6.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = "anyio"; rev = "refs/tags/${version}"; - hash = "sha256-aC/+46SWrpt+4MtvrqZq4gljWb3Kgps2r2/CeN0JfHE="; + hash = "sha256-8QLOAjQpiNtbd+YSHfqcBVdtMSGJFRevOcacZErKuso="; }; build-system = [ setuptools-scm ]; From fc8e85adff2680adda0c88772d914a948ea88d0a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 24 Oct 2024 18:33:41 +0200 Subject: [PATCH 134/617] python312Packages.uvicorn: 0.31.0 -> 0.32.0 https://github.com/encode/uvicorn/blob/refs/tags/0.32.0/CHANGELOG.md --- pkgs/development/python-modules/uvicorn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index f0d29c6381a8..ab72df02971f 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "uvicorn"; - version = "0.31.0"; + version = "0.32.0"; disabled = pythonOlder "3.8"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "encode"; repo = "uvicorn"; rev = "refs/tags/${version}"; - hash = "sha256-Au8+8l8JfOUeLDxN2UONP0W+fsb38QCAunblmxJdGus="; + hash = "sha256-LTioJNDq1zsy/FO6lBgRW8Ow5qyxUD8NjNCj4nIrVDM="; }; outputs = [ From d38c5bebc6a9db57ec77303ef7c3c952512507d0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 24 Oct 2024 18:44:02 +0200 Subject: [PATCH 135/617] python312Packages.fastapi: 0.115.0 -> 0.115.3 https://github.com/fastapi/fastapi/releases/tag/0.115.1 https://github.com/fastapi/fastapi/releases/tag/0.115.2 https://github.com/fastapi/fastapi/releases/tag/0.115.3 --- pkgs/development/python-modules/fastapi/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 1f29059bba72..e9ed6eb2e2ea 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.115.0"; + version = "0.115.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = "fastapi"; rev = "refs/tags/${version}"; - hash = "sha256-TewFTbYdWIHcgRH+YNxNEUZVlaUn2aTZ0YFmDPrPZl4="; + hash = "sha256-JIaPgZVbz887liVwd3YtubJm+L4tFCM9Jcn9/smjiKo="; }; build-system = [ pdm-backend ]; @@ -106,24 +106,20 @@ buildPythonPackage rec { disabledTests = [ # Coverage test "test_fastapi_cli" - # ResourceWarning: Unclosed - "test_openapi_schema" ]; disabledTestPaths = [ # Don't test docs and examples "docs_src" - # databases is incompatible with SQLAlchemy 2.0 - "tests/test_tutorial/test_async_sql_databases" "tests/test_tutorial/test_sql_databases" ]; pythonImportsCheck = [ "fastapi" ]; meta = with lib; { - changelog = "https://github.com/tiangolo/fastapi/releases/tag/${version}"; + changelog = "https://github.com/fastapi/fastapi/releases/tag/${version}"; description = "Web framework for building APIs"; - homepage = "https://github.com/tiangolo/fastapi"; + homepage = "https://github.com/fastapi/fastapi"; license = licenses.mit; maintainers = with maintainers; [ wd15 ]; }; From a92ce87eb3d50d91a947a8ab89baab37436e8743 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 24 Oct 2024 18:49:32 +0200 Subject: [PATCH 136/617] python312Packages.aiohttp: 3.10.8 -> 3.10.10 https://github.com/aio-libs/aiohttp/blob/v3.10.10/CHANGES.rst --- pkgs/development/python-modules/aiohttp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index e021832f15d1..2ccea52e36a7 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.10.8"; + version = "3.10.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "aiohttp"; rev = "refs/tags/v${version}"; - hash = "sha256-ksvGRzar1Gp+86WrRFwyHoEdthyzvaAbyubdIhON/sk="; + hash = "sha256-c2mnt2ZQ7d7WO7Z8eDaUo9y+v0V0JwXUa1WJI9bwGTM="; }; patches = [ From 2ff66debd8c849f2a2b788f2ea0dedd31e379d28 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 24 Oct 2024 18:54:35 +0200 Subject: [PATCH 137/617] python312Packages.pdm-backend: 2.4.1 -> 2.4.3 https://github.com/pdm-project/pdm-backend/releases/tag/2.4.2 https://github.com/pdm-project/pdm-backend/releases/tag/2.4.3 --- pkgs/development/python-modules/pdm-backend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdm-backend/default.nix b/pkgs/development/python-modules/pdm-backend/default.nix index 98c6b451ee6f..b7a7f87a4fd0 100644 --- a/pkgs/development/python-modules/pdm-backend/default.nix +++ b/pkgs/development/python-modules/pdm-backend/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pdm-backend"; - version = "2.4.1"; + version = "2.4.3"; pyproject = true; src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm-backend"; rev = "refs/tags/${version}"; - hash = "sha256-YQavUP3RaZns9byli54feVtG92Stozr3T66WouQwF+s="; + hash = "sha256-XbHlzt00R0kB8I6nRvteAgpFlUTAvBcF5iaQD5V30ok="; }; env.PDM_BUILD_SCM_VERSION = version; From 514b00cf08702b31cdf873a798f1ff100d4f2cf7 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 18 Oct 2024 16:05:43 +0100 Subject: [PATCH 138/617] clang: skip the `-nostdlibinc` patch on Darwin --- pkgs/build-support/cc-wrapper/add-flags.sh | 5 ----- .../compilers/llvm/common/clang/default.nix | 18 +++++++++++------- .../compilers/llvm/common/default.nix | 18 +++++++++++++++++- pkgs/stdenv/darwin/default.nix | 11 +++++++++++ 4 files changed, 39 insertions(+), 13 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index cd5396f45f8b..838b963ead7b 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -95,11 +95,6 @@ if [ "@darwinMinVersion@" ]; then # xcbuild needs `SDKROOT` to be the name of the SDK, which it sets in its own wrapper, # but compilers expect it to point to the absolute path. SDKROOT="$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" - - # Set up various library paths since compilers may not support (or may have disabled) finding them in the sysroot. - NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@+=" -isysroot $SDKROOT" - NIX_CFLAGS_COMPILE_@suffixSalt@+=" -idirafter $SDKROOT/usr/include" - NIX_CFLAGS_COMPILE_@suffixSalt@+=" -iframework $SDKROOT/System/Library/Frameworks" fi # That way forked processes will not extend these environment variables again. diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix index 5c9662c24d58..4bf30400832a 100644 --- a/pkgs/development/compilers/llvm/common/clang/default.nix +++ b/pkgs/development/compilers/llvm/common/clang/default.nix @@ -81,13 +81,17 @@ let # Make sure clang passes the correct location of libLTO to ld64 substituteInPlace lib/Driver/ToolChains/Darwin.cpp \ --replace-fail 'StringRef P = llvm::sys::path::parent_path(D.Dir);' 'StringRef P = "${lib.getLib libllvm}";' - '' + (if lib.versionOlder release_version "13" then '' - sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ - -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ - lib/Driver/ToolChains/*.cpp - '' else '' - (cd tools && ln -s ../../clang-tools-extra extra) - '') + lib.optionalString stdenv.hostPlatform.isMusl '' + '' + ( + # See the comment on the `add-nostdlibinc-flag.patch` patch in + # `../default.nix` for why we skip Darwin here. + if lib.versionOlder release_version "13" && (!stdenv.hostPlatform.isDarwin || !stdenv.targetPlatform.isDarwin) then '' + sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ + -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ + lib/Driver/ToolChains/*.cpp + '' else '' + (cd tools && ln -s ../../clang-tools-extra extra) + '' + ) + lib.optionalString stdenv.hostPlatform.isMusl '' sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp ''; diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index eaba6f45edfe..c3a98c1f063f 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -529,8 +529,24 @@ let # mis-compilation in firefox. # See: https://bugzilla.mozilla.org/show_bug.cgi?id=1741454 (metadata.getVersionFile "clang/revert-malloc-alignment-assumption.patch") + # This patch prevents global system header directories from + # leaking through on non‐NixOS Linux. However, on macOS, the + # SDK path is used as the sysroot, and forcing `-nostdlibinc` + # breaks `-isysroot` with an unwrapped compiler. As macOS has + # no `/usr/include`, there’s essentially no risk to skipping + # the patch there. It’s possible that Homebrew headers in + # `/usr/local/include` might leak through to unwrapped + # compilers being used without an SDK set or something, but + # it hopefully shouldn’t matter. + # + # TODO: Figure out a better solution to this whole problem so + # that we won’t have to choose between breaking unwrapped + # compilers breaking libclang when we can do Linux‐to‐Darwin + # cross‐compilation again. + ++ lib.optional ( + !args.stdenv.hostPlatform.isDarwin || !args.stdenv.targetPlatform.isDarwin + ) ./clang/add-nostdlibinc-flag.patch ++ [ - ./clang/add-nostdlibinc-flag.patch (substituteAll { src = if (lib.versionOlder metadata.release_version "16") then diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 5a3ef15e392d..070d5ec23851 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -133,6 +133,17 @@ let ln -s "${compiler-rt.out}/lib" "$rsrc/lib" ln -s "${compiler-rt.out}/share" "$rsrc/share" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags + '' + + lib.optionalString (isFromBootstrapFiles prevStage.llvmPackages.clang-unwrapped) '' + # Work around the `-nostdlibinc` patch in the bootstrap tools. + # TODO: Remove after the bootstrap tools have been updated. + substituteAll ${builtins.toFile "add-flags-extra.sh" '' + if [ "@darwinMinVersion@" ]; then + NIX_CFLAGS_COMPILE_@suffixSalt@+=" -idirafter $SDKROOT/usr/include" + NIX_CFLAGS_COMPILE_@suffixSalt@+=" -iframework $SDKROOT/System/Library/Frameworks" + fi + ''} add-flags-extra.sh + cat add-flags-extra.sh >> $out/nix-support/add-flags.sh ''; cc = prevStage.llvmPackages.clang-unwrapped; From 5036d2221600877719fef7c86b4223222d37dee8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 24 Oct 2024 18:56:40 +0200 Subject: [PATCH 139/617] python312Packages.build: 1.2.2 -> 1.2.2.post1 https://github.com/pypa/build/blob/1.2.2.post1/CHANGELOG.rst --- pkgs/development/python-modules/build/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index b5077ddc5f66..75b9e2a4703e 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "build"; - version = "1.2.2"; + version = "1.2.2.post1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "pypa"; repo = "build"; rev = "refs/tags/${version}"; - hash = "sha256-pord65+Mg3TmHpAtU6PQAzxAmGtNu6MSxTruJsnA0EE="; + hash = "sha256-PHS7CjdKo5u4VTpbo409zLQAOmslV9bX0j0S83Gdv1U="; }; postPatch = '' From b75c70282f91276908adf0f286437eadbb638119 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 23 Oct 2024 17:13:28 +0100 Subject: [PATCH 140/617] ld64: search standard library locations This is basically harmless for the same reason as it is for Clang, and lets us avoid doing wrapper hacks to fix things like the .NET build. This reverts commit 4340a5addb0c9da67b1f68dc00ba2a3fc80436cb. --- .../add-darwin-ldflags-before.sh | 10 -------- ...rching-in-standard-library-locations.patch | 25 ------------------- pkgs/by-name/ld/ld64/package.nix | 2 -- pkgs/stdenv/darwin/default.nix | 13 +++++++++- 4 files changed, 12 insertions(+), 38 deletions(-) delete mode 100644 pkgs/by-name/ld/ld64/0008-Disable-searching-in-standard-library-locations.patch diff --git a/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh b/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh index 0a2961bbe46e..127f83e303a3 100644 --- a/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh +++ b/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh @@ -85,13 +85,3 @@ mangleVarSingle DEVELOPER_DIR ${role_suffixes[@]+"${role_suffixes[@]}"} # Allow wrapped bintools to do something useful when no `DEVELOPER_DIR` is set, which can happen when # the compiler is run outside of a stdenv or intentionally in an environment with no environment variables set. DEVELOPER_DIR=${DEVELOPER_DIR_@suffixSalt@:-@fallback_sdk@} - -# Darwin looks for frameworks in the SDK located at `DEVELOPER_DIR`. -extraBefore+=("-F$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks") -extraBefore+=("-L$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib") - -# While the Swift wrapper should take care of this, anything that needs to link Swift auto-linked frameworks -# also needs these paths. Note: Test and conditionally add it because the path may not exist in older SDKs. -if [ -d "$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/swift" ]; then - extraBefore+=("-L$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/swift") -fi diff --git a/pkgs/by-name/ld/ld64/0008-Disable-searching-in-standard-library-locations.patch b/pkgs/by-name/ld/ld64/0008-Disable-searching-in-standard-library-locations.patch deleted file mode 100644 index ddda588c6aaf..000000000000 --- a/pkgs/by-name/ld/ld64/0008-Disable-searching-in-standard-library-locations.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3e80d438e2a3ec50d666f2b6e32007c275d4a08a Mon Sep 17 00:00:00 2001 -From: Randy Eckenrode -Date: Thu, 11 Apr 2024 23:13:29 -0400 -Subject: [PATCH 8/8] Disable searching in standard library locations - ---- - src/ld/Options.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ld/Options.cpp b/src/ld/Options.cpp -index 67a9f53..611b583 100644 ---- a/src/ld/Options.cpp -+++ b/src/ld/Options.cpp -@@ -4320,7 +4320,7 @@ bool Options::shouldUseBuildVersion(ld::Platform plat, uint32_t minOSvers) const - - void Options::buildSearchPaths(int argc, const char* argv[]) - { -- bool addStandardLibraryDirectories = true; -+ bool addStandardLibraryDirectories = false; - ld::Platform platform = ld::Platform::unknown; - std::vector libraryPaths; - std::vector frameworkPaths; --- -2.45.1 - diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix index b5900f3576ac..d3dfe3b8b7e6 100644 --- a/pkgs/by-name/ld/ld64/package.nix +++ b/pkgs/by-name/ld/ld64/package.nix @@ -128,8 +128,6 @@ stdenv.mkDerivation (finalAttrs: { ./0006-Add-libcd_is_blob_a_linker_signature-implementation.patch # Add OpenSSL implementation of CoreCrypto digest functions. Avoids use of private and non-free APIs. ./0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch - # ld64 will search `/usr/lib`, `/Library/Frameworks`, etc by default. Disable that. - ./0008-Disable-searching-in-standard-library-locations.patch ]; postPatch = '' diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 070d5ec23851..0fb0f27f23ba 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -449,9 +449,15 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check bintools = selfDarwin.binutils-unwrapped; - # Bootstrap tools cctools needs the hook and wrappers to make sure things are signed properly. + # Bootstrap tools cctools needs the hook and wrappers to make sure things are signed properly, + # and additional linker flags to work around a since‐removed patch. # This can be dropped once the bootstrap tools cctools has been updated to 1010.6. extraBuildCommands = '' + printf %s ${lib.escapeShellArg '' + extraBefore+=("-F$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks") + extraBefore+=("-L$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib") + ''} >> $out/nix-support/add-local-ldflags-before.sh + echo 'source ${selfDarwin.postLinkSignHook}' >> $out/nix-support/post-link-hook export signingUtils=${selfDarwin.signingUtils} @@ -694,6 +700,11 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check # Bootstrap tools cctools needs the hook and wrappers to make sure things are signed properly. # This can be dropped once the bootstrap tools cctools has been updated to 1010.6. extraBuildCommands = '' + printf %s ${lib.escapeShellArg '' + extraBefore+=("-F$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks") + extraBefore+=("-L$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib") + ''} >> $out/nix-support/add-local-ldflags-before.sh + echo 'source ${selfDarwin.postLinkSignHook}' >> $out/nix-support/post-link-hook export signingUtils=${selfDarwin.signingUtils} From d831e4c17ba9568973a3e0a2cd8ce14343e7f335 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 24 Oct 2024 17:28:27 +0000 Subject: [PATCH 141/617] openjdk8: 8u422-ga -> 8u432-b06 --- pkgs/development/compilers/openjdk/8/source.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/openjdk/8/source.json b/pkgs/development/compilers/openjdk/8/source.json index 47ad1dc0596a..6cedef5ccb7b 100644 --- a/pkgs/development/compilers/openjdk/8/source.json +++ b/pkgs/development/compilers/openjdk/8/source.json @@ -1,6 +1,6 @@ { - "hash": "sha256-uMo1DIkji+FPTbFRwURXybkLE5xv+teSClWP9RfAvfo=", + "hash": "sha256-48DyJXD7D28LFa+4ONeMgSddqrCLn6FLwEGWGeP4upM=", "owner": "openjdk", "repo": "jdk8u", - "rev": "jdk8u422-ga" + "rev": "refs/tags/jdk8u432-b06" } From afa5f909846cd0f80d38d0a50e7b2aa770d65eb0 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 24 Oct 2024 17:29:39 +0000 Subject: [PATCH 142/617] openjdk11: 11.0.24+8 -> 11.0.25+9 --- pkgs/development/compilers/openjdk/11/source.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/openjdk/11/source.json b/pkgs/development/compilers/openjdk/11/source.json index 8683cdecba3d..68080694d667 100644 --- a/pkgs/development/compilers/openjdk/11/source.json +++ b/pkgs/development/compilers/openjdk/11/source.json @@ -1,6 +1,6 @@ { - "hash": "sha256-H/VmT6NYbbZBba7Js8xk+epVZ2kLfvlwTNgg5SQ4ljA=", + "hash": "sha256-HqFm4qESB5T4Y1FLgfHZxURi7l7NkLzx2w8GzmB1jSY=", "owner": "openjdk", "repo": "jdk11u", - "rev": "jdk-11.0.24+8" + "rev": "refs/tags/jdk-11.0.25+9" } From 10ba3b431ac58117e1a2254279b9ac538040d71a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 24 Oct 2024 21:07:01 +0200 Subject: [PATCH 143/617] nss_latest: 3.105 -> 3.106 https://groups.google.com/a/mozilla.org/g/dev-tech-crypto/c/c1bFm1SR6hQ --- pkgs/development/libraries/nss/latest.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 143bb32a5677..a6c5e3dd4c2b 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.105"; - hash = "sha256-Nfd7u0sdGqUCznnUxEJQFs+QuRSb+b7rZrcvKryimOQ="; + version = "3.106"; + hash = "sha256-j8B5RgEdBbtqPmIUniNF8ToGPIrPJ8gVTMplcv72fD0="; } From fe4e4a1ae23b5f96df2de7399e857c8762fc5fba Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 24 Oct 2024 17:30:51 +0000 Subject: [PATCH 144/617] openjdk17: 17.0.12+7 -> 17.0.13+11 Drop an upstreamed patch, and update another for upstream changes. --- .../17/patches/fix-library-path-jdk17.patch | 31 ++++++++++--------- .../compilers/openjdk/17/source.json | 4 +-- .../development/compilers/openjdk/generic.nix | 9 ------ 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/pkgs/development/compilers/openjdk/17/patches/fix-library-path-jdk17.patch b/pkgs/development/compilers/openjdk/17/patches/fix-library-path-jdk17.patch index 4c38aca2b48a..71d96631ef89 100644 --- a/pkgs/development/compilers/openjdk/17/patches/fix-library-path-jdk17.patch +++ b/pkgs/development/compilers/openjdk/17/patches/fix-library-path-jdk17.patch @@ -1,6 +1,8 @@ +diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp +index 7c951cee51..bcc61ff43d 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -412,18 +412,8 @@ void os::init_system_properties_values() { +@@ -416,18 +416,8 @@ // 1: ... // ... // 7: The default directories, normally /lib and /usr/lib. @@ -18,8 +20,8 @@ -#define SYS_EXT_DIR "/usr/java/packages" #define EXTENSIONS_DIR "/lib/ext" - // Buffer that fits several sprintfs. -@@ -431,7 +421,7 @@ void os::init_system_properties_values() { + // Buffer that fits several snprintfs. +@@ -435,7 +425,7 @@ // by the nulls included by the sizeof operator. const size_t bufsize = MAX2((size_t)MAXPATHLEN, // For dll_dir & friends. @@ -28,28 +30,26 @@ char *buf = NEW_C_HEAP_ARRAY(char, bufsize, mtInternal); // sysclasspath, java_home, dll_dir -@@ -478,26 +468,22 @@ void os::init_system_properties_values() { +@@ -482,24 +472,20 @@ // should always exist (until the legacy problem cited above is // addressed). const char *v = ::getenv("LD_LIBRARY_PATH"); - const char *v_colon = ":"; - if (v == NULL) { v = ""; v_colon = ""; } +- // That's +1 for the colon and +1 for the trailing '\0'. +- size_t pathsize = strlen(v) + 1 + sizeof(SYS_EXT_DIR) + sizeof("/lib/") + sizeof(DEFAULT_LIBPATH) + 1; + if (v == NULL) { v = ""; } - // That's +1 for the colon and +1 for the trailing '\0'. - char *ld_library_path = NEW_C_HEAP_ARRAY(char, -- strlen(v) + 1 + -- sizeof(SYS_EXT_DIR) + sizeof("/lib/") + sizeof(DEFAULT_LIBPATH) + 1, -+ strlen(v) + 1, - mtInternal); -- sprintf(ld_library_path, "%s%s" SYS_EXT_DIR "/lib:" DEFAULT_LIBPATH, v, v_colon); -+ sprintf(ld_library_path, "%s", v); ++ size_t pathsize = strlen(v) + 1; + char *ld_library_path = NEW_C_HEAP_ARRAY(char, pathsize, mtInternal); +- os::snprintf_checked(ld_library_path, pathsize, "%s%s" SYS_EXT_DIR "/lib:" DEFAULT_LIBPATH, v, v_colon); ++ os::snprintf_checked(ld_library_path, pathsize, "%s", v); Arguments::set_library_path(ld_library_path); FREE_C_HEAP_ARRAY(char, ld_library_path); } // Extensions directories. -- sprintf(buf, "%s" EXTENSIONS_DIR ":" SYS_EXT_DIR EXTENSIONS_DIR, Arguments::get_java_home()); -+ sprintf(buf, "%s" EXTENSIONS_DIR, Arguments::get_java_home()); +- os::snprintf_checked(buf, bufsize, "%s" EXTENSIONS_DIR ":" SYS_EXT_DIR EXTENSIONS_DIR, Arguments::get_java_home()); ++ os::snprintf_checked(buf, bufsize, "%s" EXTENSIONS_DIR, Arguments::get_java_home()); Arguments::set_ext_dirs(buf); FREE_C_HEAP_ARRAY(char, buf); @@ -57,4 +57,5 @@ -#undef DEFAULT_LIBPATH -#undef SYS_EXT_DIR #undef EXTENSIONS_DIR - } \ No newline at end of file + } + diff --git a/pkgs/development/compilers/openjdk/17/source.json b/pkgs/development/compilers/openjdk/17/source.json index 546e2fff8a19..c372853e70e0 100644 --- a/pkgs/development/compilers/openjdk/17/source.json +++ b/pkgs/development/compilers/openjdk/17/source.json @@ -1,6 +1,6 @@ { - "hash": "sha256-9UB1H3gd+b4wWxOMgsdDPgX/IGWNORKk1gMsSjYoZMw=", + "hash": "sha256-wHJlCmaE8titkfcWb2WboqemekPBn3JWc4bGyWskmoY=", "owner": "openjdk", "repo": "jdk17u", - "rev": "jdk-17.0.12+7" + "rev": "refs/tags/jdk-17.0.13+11" } diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix index 49742ca8b989..669057216a55 100644 --- a/pkgs/development/compilers/openjdk/generic.nix +++ b/pkgs/development/compilers/openjdk/generic.nix @@ -221,15 +221,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg="; }) ] - ++ lib.optionals (featureVersion == "17") [ - # Backport fixes for musl 1.2.4 which are already applied in jdk21+ - # Fetching patch from chimera because they already went through the effort of rebasing it onto jdk17 - (fetchurl { - name = "lfs64.patch"; - url = "https://raw.githubusercontent.com/chimera-linux/cports/4614075d19e9c9636f3f7e476687247f63330a35/contrib/openjdk17/patches/lfs64.patch"; - hash = "sha256-t2mRbdEiumBAbIAC0zsJNwCn59WYWHsnRtuOSL6bWB4="; - }) - ] ++ lib.optionals (!headless && enableGtk) [ ( if atLeast17 then From fc8beb4a6a025b7fceea8c2a597543c0cfcbac92 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 24 Oct 2024 17:32:03 +0000 Subject: [PATCH 145/617] openjdk21: 21.0.4+7 -> 21.0.5+11 --- pkgs/development/compilers/openjdk/21/source.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/openjdk/21/source.json b/pkgs/development/compilers/openjdk/21/source.json index d0db28246a84..9808423ccff1 100644 --- a/pkgs/development/compilers/openjdk/21/source.json +++ b/pkgs/development/compilers/openjdk/21/source.json @@ -1,6 +1,6 @@ { - "hash": "sha256-+xpQtQ1IQ7btVWnENT9XS5A/2VP101/+XR3BMo8BqYI=", + "hash": "sha256-H28Hp1SzANkrgnC6xdkiSEcRK6bm8BcT/lbJDEUvRYY=", "owner": "openjdk", "repo": "jdk21u", - "rev": "jdk-21.0.4+7" + "rev": "refs/tags/jdk-21.0.5+11" } From 860924d70406ee12fb85edf08871c285a7a228ea Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 24 Oct 2024 17:33:14 +0000 Subject: [PATCH 146/617] openjdk23: 23-ga -> 23.0.1+11 --- pkgs/development/compilers/openjdk/23/source.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/openjdk/23/source.json b/pkgs/development/compilers/openjdk/23/source.json index b47426326ecd..d56aeb591498 100644 --- a/pkgs/development/compilers/openjdk/23/source.json +++ b/pkgs/development/compilers/openjdk/23/source.json @@ -1,6 +1,6 @@ { - "hash": "sha256-lcLnWAiskWindOqWmOWiIHiYKXGSJZK4d20k19QZfrE=", + "hash": "sha256-Sl0aEtndzlyuwMtcjOeDe2CVls89ONzicP5IXhAU2FA=", "owner": "openjdk", "repo": "jdk23u", - "rev": "jdk-23-ga" + "rev": "refs/tags/jdk-23.0.1+11" } From 7bc545f5a811d2835b7b2ded7f74434439a197fe Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 24 Oct 2024 18:49:28 +0100 Subject: [PATCH 147/617] openjdk{8,11,17,21,23}: remove obsolete version logic --- pkgs/development/compilers/openjdk/generic.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix index 669057216a55..a551b974f93f 100644 --- a/pkgs/development/compilers/openjdk/generic.nix +++ b/pkgs/development/compilers/openjdk/generic.nix @@ -99,12 +99,8 @@ let atLeast23 = lib.versionAtLeast featureVersion "23"; tagPrefix = if atLeast11 then "jdk-" else "jdk"; - # TODO: Merge these `lib.removePrefix` calls once update scripts have - # been run. - version = lib.removePrefix tagPrefix (lib.removePrefix "refs/tags/" source.src.rev); - versionSplit = - # TODO: Remove `-ga` logic once update scripts have been run. - builtins.match (if atLeast11 then "(.+)[-+](.+)" else "(.+)-b?(.+)") version; + version = lib.removePrefix "refs/tags/${tagPrefix}" source.src.rev; + versionSplit = builtins.match (if atLeast11 then "(.+)+(.+)" else "(.+)-b(.+)") version; versionBuild = lib.elemAt versionSplit 1; # The JRE 8 libraries are in directories that depend on the CPU. From 09adc5dc965bb9edfb69b258876727b06f018553 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 24 Oct 2024 19:17:45 +0000 Subject: [PATCH 148/617] openjfx17: 17.0.11-ga -> 17.0.11+3 So this is fun: the hash here is actually the hash we had previously for 17.0.6+3. 614dc610feb174b3a220d7cda36e7fbf565fc172 bumped to this version, with the correct hash, but then the conversion to use the Gradle setup hook in e6f8a3babaadc3e1560e5143610cf1098fee4a77 regressed it back, presumably due to a merge issue, and of course nobody noticed until now. Drop an upstreamed WebKit Ruby compatibility fix that should never have been needed for the version we advertised this as being at the time. Fixes: e6f8a3babaadc3e1560e5143610cf1098fee4a77 --- pkgs/by-name/op/openjfx/17/deps.json | 4 ++-- pkgs/by-name/op/openjfx/17/source.json | 4 ++-- pkgs/by-name/op/openjfx/package.nix | 5 ----- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/op/openjfx/17/deps.json b/pkgs/by-name/op/openjfx/17/deps.json index a9fa40a91be1..ec1816339f40 100644 --- a/pkgs/by-name/op/openjfx/17/deps.json +++ b/pkgs/by-name/op/openjfx/17/deps.json @@ -7,8 +7,8 @@ } }, "https://github.com": { - "unicode-org/icu/releases/download/release-71-1/icu4c-71_1-data-bin-l": { - "zip": "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM=" + "unicode-org/icu/releases/download/release-73-1/icu4c-73_1-data-bin-l": { + "zip": "sha256-QDgpjuAqDDiRcYXvj/Tr3pyLVSx3f9A+TfbGtLGCXiA=" } }, "https://repo.maven.apache.org/maven2": { diff --git a/pkgs/by-name/op/openjfx/17/source.json b/pkgs/by-name/op/openjfx/17/source.json index 932875548f4b..df4010708c42 100644 --- a/pkgs/by-name/op/openjfx/17/source.json +++ b/pkgs/by-name/op/openjfx/17/source.json @@ -1,6 +1,6 @@ { + "hash": "sha256-WV8NHlYlt7buGbirLSorLnS2TnyBD17zUquFfwSL3xE=", "owner": "openjdk", "repo": "jfx17u", - "rev": "17.0.11-ga", - "sha256": "sha256-9VfXk2EfMebMyVKPohPRP2QXRFf8XemUtfY0JtBCHyw=" + "rev": "refs/tags/17.0.11+3" } diff --git a/pkgs/by-name/op/openjfx/package.nix b/pkgs/by-name/op/openjfx/package.nix index 96269280f7b6..aaac6be0c9cd 100644 --- a/pkgs/by-name/op/openjfx/package.nix +++ b/pkgs/by-name/op/openjfx/package.nix @@ -139,11 +139,6 @@ stdenv.mkDerivation { -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h - '' - + lib.optionalString (!atLeast21) '' - substituteInPlace modules/javafx.web/src/main/native/Source/JavaScriptCore/offlineasm/parser.rb \ - --replace-fail "File.exists?" "File.exist?" - '' + '' ln -s $config gradle.properties From 2c50b625cf3e496ce5a600486553908f79b13121 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 24 Oct 2024 19:35:01 +0000 Subject: [PATCH 149/617] openjfx21: 21.0.3-ga -> 21.0.3+2 Purely cosmetic change; these versions are identical. --- pkgs/by-name/op/openjfx/21/source.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/op/openjfx/21/source.json b/pkgs/by-name/op/openjfx/21/source.json index adecaa605bcc..73d3a6adbb5c 100644 --- a/pkgs/by-name/op/openjfx/21/source.json +++ b/pkgs/by-name/op/openjfx/21/source.json @@ -2,5 +2,5 @@ "hash": "sha256-7z0GIbkQwG9mXY9dssaicqaKpMo3FkNEpyAvkswoQQ4=", "owner": "openjdk", "repo": "jfx21u", - "rev": "21.0.3-ga" + "rev": "refs/tags/21.0.3+2" } From f95c2f68da044de1766fa6a6655085422e7346ee Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 24 Oct 2024 19:43:24 +0000 Subject: [PATCH 150/617] openjfx23: 23-ga -> 23.0.1+4 Drop a backported patch that was upstreamed. --- pkgs/by-name/op/openjfx/23/source.json | 4 ++-- pkgs/by-name/op/openjfx/package.nix | 16 ++++------------ 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/op/openjfx/23/source.json b/pkgs/by-name/op/openjfx/23/source.json index a67cd0f370f1..19ca02f90b00 100644 --- a/pkgs/by-name/op/openjfx/23/source.json +++ b/pkgs/by-name/op/openjfx/23/source.json @@ -1,6 +1,6 @@ { - "hash": "sha256-a/ev91Rq7D3z9O56ZZQCgvvbfj5GBt5Lonow2NH3s/E=", + "hash": "sha256-H3BPLo7yKWBiiI8sd3wkLJDN9h6jbWj5119cs2YHLwU=", "owner": "openjdk", "repo": "jfx23u", - "rev": "23-ga" + "rev": "refs/tags/23.0.1+4" } diff --git a/pkgs/by-name/op/openjfx/package.nix b/pkgs/by-name/op/openjfx/package.nix index aaac6be0c9cd..b64ce6d32e15 100644 --- a/pkgs/by-name/op/openjfx/package.nix +++ b/pkgs/by-name/op/openjfx/package.nix @@ -69,17 +69,8 @@ stdenv.mkDerivation { inherit (source) src; - patches = - if featureVersion == "23" then - [ - # 8338701: Provide media support for libavcodec version 61 - # - (fetchpatch2 { - url = "https://github.com/openjdk/jfx23u/commit/aba60fda1c82f00e8e685107592305c403a31287.patch?full_index=1"; - hash = "sha256-+aRhTwi4VQthAq1SH1jxPl0mTosNMKoTY52jm+jiKso="; - }) - ] - else if atLeast21 then + patches = lib.optionals (!atLeast23) ( + if atLeast21 then [ ./21/patches/backport-ffmpeg-7-support-jfx21.patch ] @@ -87,7 +78,8 @@ stdenv.mkDerivation { [ ./17/patches/backport-ffmpeg-6-support-jfx11.patch ./17/patches/backport-ffmpeg-7-support-jfx11.patch - ]; + ] + ); nativeBuildInputs = [ gradle_openjfx From 1b0dadd10238de0c60ed27d36cd500b8210111f2 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 24 Oct 2024 20:54:37 +0100 Subject: [PATCH 151/617] nixpkgs-openjdk-updater.openjdkSource: enforce `source.json` schema --- .../ni/nixpkgs-openjdk-updater/package.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ni/nixpkgs-openjdk-updater/package.nix b/pkgs/by-name/ni/nixpkgs-openjdk-updater/package.nix index 124a1fced4c6..e23d573d9641 100644 --- a/pkgs/by-name/ni/nixpkgs-openjdk-updater/package.nix +++ b/pkgs/by-name/ni/nixpkgs-openjdk-updater/package.nix @@ -43,11 +43,17 @@ python3Packages.buildPythonApplication { featureVersionPrefix, }: let - # TODO: Tighten up after update scripts are run. - src = fetchFromGitHub (lib.importJSON sourceFile); + sourceInfo = lib.importJSON sourceFile; in { - inherit src; + src = fetchFromGitHub { + inherit (sourceInfo) + owner + repo + rev + hash + ; + }; updateScript = { command = [ @@ -57,10 +63,10 @@ python3Packages.buildPythonApplication { sourceFile "--owner" - src.owner + sourceInfo.owner "--repo" - src.repo + sourceInfo.repo "--feature-version-prefix" featureVersionPrefix From c1f644cdccfc5b555ef90abd1536057eea7f572d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Oct 2024 10:12:46 +0000 Subject: [PATCH 152/617] ethtool: 6.9 -> 6.11 --- pkgs/tools/misc/ethtool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index ff7fe2603271..ebd26985f7f4 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "ethtool"; - version = "6.9"; + version = "6.11"; src = fetchurl { url = "mirror://kernel/software/network/ethtool/ethtool-${version}.tar.xz"; - sha256 = "sha256-pxsDVAEGYcXPF4vGBu1Q/LkYBc8Yl60OsoGDh6X9DNk="; + sha256 = "sha256-jZH1xyrj8lt+iNR4EnncsyD3HjAFiRQ3CxxXTJazEgI="; }; nativeBuildInputs = [ From d29d7043a7c3dae0371a35676ba5b5192ef32b0e Mon Sep 17 00:00:00 2001 From: Steven Keuchel Date: Fri, 25 Oct 2024 12:30:30 +0200 Subject: [PATCH 153/617] tinysparql: upstream patch to fix a test that is broken on some platforms --- pkgs/by-name/ti/tinysparql/package.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ti/tinysparql/package.nix b/pkgs/by-name/ti/tinysparql/package.nix index 82aa22d44bc7..204880568531 100644 --- a/pkgs/by-name/ti/tinysparql/package.nix +++ b/pkgs/by-name/ti/tinysparql/package.nix @@ -1,5 +1,6 @@ { stdenv , lib +, fetchpatch2 , fetchurl , gettext , meson @@ -106,13 +107,15 @@ stdenv.mkDerivation (finalAttrs: { "-Dsystemd_user_services=false" ]; - doCheck = - # https://gitlab.gnome.org/GNOME/tinysparql/-/issues/402 - !stdenv.hostPlatform.isDarwin - # https://gitlab.gnome.org/GNOME/tinysparql/-/issues/398 - && !stdenv.hostPlatform.is32bit - # https://gitlab.gnome.org/GNOME/tinysparql/-/issues/474 - && !stdenv.hostPlatform.isMusl; + patches = [ + # https://gitlab.gnome.org/GNOME/tinysparql/-/merge_requests/730 + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/tinysparql/commit/12ed969913cb579f638fa0aa0853aeb6c6c6f536.patch"; + hash = "sha256-jyx9hdWUUxfCSTGn7lZL4RUiQAF4pkf4gfCP8g9Ep3U="; + }) + ]; + + doCheck = true; postPatch = '' chmod +x \ From 49e79fb61529569688fd51af1c22a7ba805cbf9c Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 25 Oct 2024 00:32:02 +0100 Subject: [PATCH 154/617] ffmpeg_{4,6,7}: clean up old Darwin SDK pattern --- pkgs/development/libraries/ffmpeg/default.nix | 8 -------- pkgs/development/libraries/ffmpeg/generic.nix | 15 ++------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index eac16d659dac..d07551608a54 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -9,14 +9,6 @@ let initArgs: ffmpegVariant: callPackage ./generic.nix ( { - inherit (darwin.apple_sdk.frameworks) - Accelerate - AppKit - AudioToolbox - AVFoundation - CoreImage - VideoToolbox - ; inherit (darwin) xcode; inherit (cudaPackages) cuda_cudart cuda_nvcc libnpp; } diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index f6f85b5b8e2a..6dc9daa4ea0c 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -333,14 +333,8 @@ , zlib , zvbi /* - * Darwin frameworks + * Darwin */ -, Accelerate -, AppKit -, AudioToolbox -, AVFoundation -, CoreImage -, VideoToolbox , xcode # unfree contains metalcc and metallib /* * Cuda Packages @@ -735,12 +729,9 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withAlsa [ alsa-lib ] ++ optionals withAmf [ amf-headers ] ++ optionals withAom [ libaom ] - ++ optionals withAppKit [ AppKit ] ++ optionals withAribb24 [ aribb24 ] ++ optionals withAribcaption [ libaribcaption ] ++ optionals withAss [ libass ] - ++ optionals withAudioToolbox [ AudioToolbox ] - ++ optionals withAvFoundation [ AVFoundation ] ++ optionals withAvisynth [ avisynthplus ] ++ optionals withBluray [ libbluray ] ++ optionals withBs2b [ libbs2b ] @@ -750,7 +741,6 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withCelt [ celt ] ++ optionals withChromaprint [ chromaprint ] ++ optionals withCodec2 [ codec2 ] - ++ optionals withCoreImage [ CoreImage ] ++ optionals withCudaNVCC [ cuda_cudart cuda_nvcc ] ++ optionals withDav1d [ dav1d ] ++ optionals withDc1394 [ libdc1394 libraw1394 ] @@ -794,7 +784,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withQuirc [ quirc ] ++ optionals withRav1e [ rav1e ] ++ optionals withRtmp [ rtmpdump ] - ++ optionals withRubberband ([ rubberband ] ++ lib.optional stdenv.hostPlatform.isDarwin Accelerate) + ++ optionals withRubberband [ rubberband ] ++ optionals withSamba [ samba ] ++ optionals withSdl2 [ SDL2 ] ++ optionals withShaderc [ shaderc ] @@ -812,7 +802,6 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withV4l2 [ libv4l ] ++ optionals withVaapi [ (if withSmallDeps then libva else libva-minimal) ] ++ optionals withVdpau [ libvdpau ] - ++ optionals withVideoToolbox [ VideoToolbox ] ++ optionals withVidStab [ vid-stab ] ++ optionals withVmaf [ libvmaf ] ++ optionals withVoAmrwbenc [ vo-amrwbenc ] From 151d5da2e624159658d90e563e325b0c3844dfa2 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 25 Oct 2024 00:32:02 +0100 Subject: [PATCH 155/617] ffmpeg_{4,6,7}: remove redundant Darwin framework feature flags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All of these are supplied in the standard environment as part of the SDK now, so there’s no closure difference at build or runtime and no reason to turn them off. --- pkgs/development/libraries/ffmpeg/generic.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 6dc9daa4ea0c..5259fb9df4aa 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -36,12 +36,9 @@ , withAlsa ? withHeadlessDeps && stdenv.hostPlatform.isLinux # Alsa in/output supporT , withAmf ? lib.meta.availableOn stdenv.hostPlatform amf # AMD Media Framework video encoding , withAom ? withHeadlessDeps # AV1 reference encoder -, withAppKit ? withHeadlessDeps && stdenv.hostPlatform.isDarwin # Apple AppKit framework , withAribb24 ? withFullDeps # ARIB text and caption decoding , withAribcaption ? withFullDeps && lib.versionAtLeast version "6.1" # ARIB STD-B24 Caption Decoder/Renderer , withAss ? withHeadlessDeps && stdenv.hostPlatform == stdenv.buildPlatform # (Advanced) SubStation Alpha subtitle rendering -, withAudioToolbox ? withHeadlessDeps && stdenv.hostPlatform.isDarwin # Apple AudioToolbox -, withAvFoundation ? withHeadlessDeps && stdenv.hostPlatform.isDarwin # Apple AVFoundation framework , withAvisynth ? withFullDeps # AviSynth script files reading , withBluray ? withFullDeps # BluRay reading , withBs2b ? withFullDeps # bs2b DSP library @@ -51,7 +48,6 @@ , withCelt ? withHeadlessDeps # CELT decoder , withChromaprint ? withFullDeps # Audio fingerprinting , withCodec2 ? withFullDeps # codec2 en/decoding -, withCoreImage ? withHeadlessDeps && stdenv.hostPlatform.isDarwin # Apple CoreImage framework , withCuda ? withFullDeps && withNvcodec , withCudaLLVM ? withFullDeps , withCudaNVCC ? withFullDeps && withUnfree && config.cudaSupport @@ -121,7 +117,6 @@ , withV4l2M2m ? withV4l2 , withVaapi ? withHeadlessDeps && (with stdenv; isLinux || isFreeBSD) # Vaapi hardware acceleration , withVdpau ? withSmallDeps && !stdenv.hostPlatform.isMinGW # Vdpau hardware acceleration -, withVideoToolbox ? withHeadlessDeps && stdenv.hostPlatform.isDarwin # Apple VideoToolbox , withVidStab ? withHeadlessDeps && withGPL # Video stabilization , withVmaf ? withFullDeps && !stdenv.hostPlatform.isAarch64 && lib.versionAtLeast version "5" # Netflix's VMAF (Video Multi-Method Assessment Fusion) , withVoAmrwbenc ? withFullDeps && withVersion3 # AMR-WB encoder @@ -554,14 +549,11 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withAlsa "alsa") (enableFeature withAmf "amf") (enableFeature withAom "libaom") - (enableFeature withAppKit "appkit") (enableFeature withAribb24 "libaribb24") ] ++ optionals (versionAtLeast version "6.1") [ (enableFeature withAribcaption "libaribcaption") ] ++ [ (enableFeature withAss "libass") - (enableFeature withAudioToolbox "audiotoolbox") - (enableFeature withAvFoundation "avfoundation") (enableFeature withAvisynth "avisynth") (enableFeature withBluray "libbluray") (enableFeature withBs2b "libbs2b") @@ -571,7 +563,6 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withCelt "libcelt") (enableFeature withChromaprint "chromaprint") (enableFeature withCodec2 "libcodec2") - (enableFeature withCoreImage "coreimage") (enableFeature withCuda "cuda") (enableFeature withCudaLLVM "cuda-llvm") (enableFeature withCudaNVCC "cuda-nvcc") @@ -661,7 +652,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ optionals (versionAtLeast version "6.0") [ (enableFeature withVpl "libvpl") ] ++ [ - (enableFeature withVideoToolbox "videotoolbox") (enableFeature withVidStab "libvidstab") # Actual min. version 2.0 (enableFeature withVmaf "libvmaf") (enableFeature withVoAmrwbenc "libvo-amrwbenc") From 927d45eccfd8e5f922d7a35c273bad359f035b73 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 25 Oct 2024 00:32:02 +0100 Subject: [PATCH 156/617] ffmpeg_{4,6,7}: build with `apple-sdk_15` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream is pretty good about using availability checks, and there are runtime‐checked features for macOS 10.13, 11, and 12 that are only available if we build with a modern SDK. This impacts, e.g. hardware‐accelerated video decoding in mpv. FFmpeg should still continue to build and run on all our supported macOS releases, with runtime functionality being no worse than before on older versions. --- pkgs/development/libraries/ffmpeg/generic.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 5259fb9df4aa..53d2c700317f 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -330,6 +330,7 @@ /* * Darwin */ +, apple-sdk_15 , xcode # unfree contains metalcc and metallib /* * Cuda Packages @@ -716,6 +717,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withCudaNVCC [ cuda_nvcc ]; buildInputs = [] + ++ optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ] ++ optionals withAlsa [ alsa-lib ] ++ optionals withAmf [ amf-headers ] ++ optionals withAom [ libaom ] From f108380db7a157daf23e0fe957bda5690c58d2b6 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 25 Oct 2024 18:06:31 +0200 Subject: [PATCH 157/617] openssh, openssh_hpn, openssh_gssapi: 9.8p1 -> 9.9p1 (#350699) * openssh: 9.8p1 -> 9.9p1 Changes: https://www.openssh.com/releasenotes.html#9.9p1 * openssh_hpn: 9.8p1 -> 9.9p1 Changes: https://www.openssh.com/releasenotes.html#9.9p1 * openssh_gssapi: 9.8p1 -> 9.9p1 Changes: https://www.openssh.com/releasenotes.html#9.9p1 --------- Co-authored-by: Ashish SHUKLA --- pkgs/tools/networking/openssh/common.nix | 7 ------- pkgs/tools/networking/openssh/default.nix | 16 ++++++++-------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index b92f770018ac..95445b92375b 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -47,13 +47,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://git.alpinelinux.org/aports/plain/main/openssh/gss-serv.c.patch?id=a7509603971ce2f3282486a43bb773b1b522af83"; sha256 = "sha256-eFFOd4B2nccRZAQWwdBPBoKWjfEdKEVGJvKZAzLu3HU="; }) - - (fetchpatch { - name = "musl.patch"; - url = "https://anongit.mindrot.org/openssh.git/patch/?id=8b664df75966e5aed8dabea00b8838303d3488b8"; - hash = "sha256-siVg1mnGiZ2aP3IIY4y1WAp3nkOk0XKSBDqYfw6lrQg="; - }) - # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 ./dont_create_privsep_path.patch ] ++ extraPatches; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 96505155fb34..2bda81df9003 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -5,11 +5,11 @@ in { openssh = common rec { pname = "openssh"; - version = "9.8p1"; + version = "9.9p1"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - hash = "sha256-3YvQAqN5tdSZ37BQ3R+pr4Ap6ARh9LtsUjxJlz9aOfM="; + hash = "sha256-s0P7zb/4fxWxmG5uFdbU/Jp9NgZr5rf7UHCHuo+WbAI="; }; extraPatches = [ ./ssh-keysign-8.5.patch ]; @@ -18,12 +18,12 @@ in openssh_hpn = common rec { pname = "openssh-with-hpn"; - version = "9.8p1"; + version = "9.9p1"; extraDesc = " with high performance networking patches"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - hash = "sha256-3YvQAqN5tdSZ37BQ3R+pr4Ap6ARh9LtsUjxJlz9aOfM="; + hash = "sha256-s0P7zb/4fxWxmG5uFdbU/Jp9NgZr5rf7UHCHuo+WbAI="; }; extraPatches = let url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/7ba88c964b6e5724eec462021d984da3989e6a08/security/openssh-portable/files/extra-patch-hpn"; in @@ -58,12 +58,12 @@ in openssh_gssapi = common rec { pname = "openssh-with-gssapi"; - version = "9.8p1"; + version = "9.9p1"; extraDesc = " with GSSAPI support"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - hash = "sha256-3YvQAqN5tdSZ37BQ3R+pr4Ap6ARh9LtsUjxJlz9aOfM="; + hash = "sha256-s0P7zb/4fxWxmG5uFdbU/Jp9NgZr5rf7UHCHuo+WbAI="; }; extraPatches = [ @@ -71,8 +71,8 @@ in (fetchpatch { name = "openssh-gssapi.patch"; - url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%25${version}-3/debian/patches/gssapi.patch"; - hash = "sha256-BnmEZ5pMIbbysesMSm54ykdweH4JudM9D4Pn5uWf3EY="; + url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%25${version}-2/debian/patches/gssapi.patch"; + hash = "sha256-cQF5psMZpLWwVqK9CNi+Q8wHn6w6ffQUJRNI5jKGgD0="; }) ]; From 3157d712e141272f48f7e93dc03afe84d018c35a Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 24 Oct 2024 22:23:51 +0200 Subject: [PATCH 158/617] ruby.rubygems: 3.5.21 -> 3.5.22 https://github.com/rubygems/rubygems/compare/v3.5.21...v3.5.22 --- pkgs/development/interpreters/ruby/rubygems/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index 68e404be0ea8..9c56917ef5f2 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "rubygems"; - version = "3.5.21"; + version = "3.5.22"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - hash = "sha256-lZs+SIaYaXXYXQsCEXeQiD5TuNBRUp326s/mR0XvMWA="; + hash = "sha256-IpyOOTpBLpnWoP4qIvuY99Li15zbxI5ajcym+po1bIc="; }; patches = [ From 0855ae2c46caa7787bc1d0825e8795011b6f8560 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 24 Oct 2024 22:24:00 +0200 Subject: [PATCH 159/617] bundler: 2.5.21 -> 2.5.22 https://github.com/rubygems/rubygems/compare/v3.5.21...bundler-v2.5.22 --- pkgs/development/ruby-modules/bundler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 0e5c71ba2da7..ac81e5b797bf 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.5.21"; - source.sha256 = "sha256-ID1kXl9tqmC7+0zMsafUq6gXFnTgC8KHJChHQPjZ7/s="; + version = "2.5.22"; + source.sha256 = "sha256-dj8w1ZjuWHQu6ikoWHVDXqciIY1N8UneNbzjfALOlo4="; dontPatchShebangs = true; postFixup = '' From a95abfd5e49f4c6c6ca5336470e91bb88768ea0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Oct 2024 19:35:18 +0000 Subject: [PATCH 160/617] publicsuffix-list: 0-unstable-2024-09-10 -> 0-unstable-2024-10-25 --- pkgs/data/misc/publicsuffix-list/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/publicsuffix-list/default.nix b/pkgs/data/misc/publicsuffix-list/default.nix index d12c615487ad..ef24d5765133 100644 --- a/pkgs/data/misc/publicsuffix-list/default.nix +++ b/pkgs/data/misc/publicsuffix-list/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation { pname = "publicsuffix-list"; - version = "0-unstable-2024-09-10"; + version = "0-unstable-2024-10-25"; src = fetchFromGitHub { owner = "publicsuffix"; repo = "list"; - rev = "fbcc4c495e8aed1fe0e90156e6b3796556eb6978"; - hash = "sha256-L6TepLI91IWImX453GO8VNSSle75f0H1IZbFr2qepDA="; + rev = "435e07efb28973ea116592dc2291b1f8c27080aa"; + hash = "sha256-nLuZVgPHNnxOT3GcGz6TEbHkiNgVU5f2uWcgCfr7tZ8="; }; dontBuild = true; From 9142a070307ca6f18eb6e02aa2bca4855406680e Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 25 Oct 2024 19:41:08 +0100 Subject: [PATCH 161/617] {bintools-wrapper,cc-wrapper}: factor out Darwin SDK logic This reduces code duplication, makes the SDK variables available earlier in the wrappers, and makes the behaviour between the two wrappers more consistent. --- .../add-darwin-ldflags-before.sh | 6 ----- .../bintools-wrapper/default.nix | 22 ++++++++----------- .../bintools-wrapper/ld-wrapper.sh | 2 ++ pkgs/build-support/cc-wrapper/add-flags.sh | 13 +---------- pkgs/build-support/cc-wrapper/cc-wrapper.sh | 2 ++ pkgs/build-support/cc-wrapper/default.nix | 13 +++++------ .../wrapper-common/darwin-sdk-setup.bash | 16 ++++++++++++++ 7 files changed, 35 insertions(+), 39 deletions(-) create mode 100644 pkgs/build-support/wrapper-common/darwin-sdk-setup.bash diff --git a/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh b/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh index 127f83e303a3..75d9484846a8 100644 --- a/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh +++ b/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh @@ -79,9 +79,3 @@ if [ ! "$havePlatformVersionFlag" ]; then extraBefore+=(-@darwinPlatform@_version_min "${@darwinMinVersionVariable@_@suffixSalt@:-@darwinMinVersion@}") fi fi - -mangleVarSingle DEVELOPER_DIR ${role_suffixes[@]+"${role_suffixes[@]}"} - -# Allow wrapped bintools to do something useful when no `DEVELOPER_DIR` is set, which can happen when -# the compiler is run outside of a stdenv or intentionally in an environment with no environment variables set. -DEVELOPER_DIR=${DEVELOPER_DIR_@suffixSalt@:-@fallback_sdk@} diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index a2a0736c2221..fc0446274161 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -372,24 +372,15 @@ stdenvNoCC.mkDerivation { substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash + substituteAll ${../wrapper-common/darwin-sdk-setup.bash} $out/nix-support/darwin-sdk-setup.bash '' ### ### Ensure consistent LC_VERSION_MIN_MACOSX ### - + optionalString targetPlatform.isDarwin ( - let - inherit (targetPlatform) - darwinPlatform darwinSdkVersion - darwinMinVersion darwinMinVersionVariable; - in '' - export darwinPlatform=${darwinPlatform} - export darwinMinVersion=${darwinMinVersion} - export darwinSdkVersion=${darwinSdkVersion} - export darwinMinVersionVariable=${darwinMinVersionVariable} - substituteAll ${./add-darwin-ldflags-before.sh} $out/nix-support/add-local-ldflags-before.sh - '' - ) + + optionalString targetPlatform.isDarwin '' + substituteAll ${./add-darwin-ldflags-before.sh} $out/nix-support/add-local-ldflags-before.sh + '' ## ## Extra custom steps @@ -407,6 +398,11 @@ stdenvNoCC.mkDerivation { inherit dynamicLinker targetPrefix suffixSalt coreutils_bin; inherit bintools_bin libc_bin libc_dev libc_lib; default_hardening_flags_str = builtins.toString defaultHardeningFlags; + } // lib.mapAttrs (_: lib.optionalString targetPlatform.isDarwin) { + # These will become empty strings when not targeting Darwin. + inherit (targetPlatform) + darwinPlatform darwinSdkVersion + darwinMinVersion darwinMinVersionVariable; } // lib.optionalAttrs (apple-sdk != null && stdenvNoCC.targetPlatform.isDarwin) { # Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`. fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk; diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh index 7e00d02b0374..1c5b08541ac2 100644 --- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh @@ -16,6 +16,8 @@ fi source @out@/nix-support/utils.bash +source @out@/nix-support/darwin-sdk-setup.bash + if [ -z "${NIX_BINTOOLS_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then source @out@/nix-support/add-flags.sh fi diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index 838b963ead7b..2c3dc8884023 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -78,23 +78,12 @@ if [ -e @out@/nix-support/cc-cflags-before ]; then NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@="$(< @out@/nix-support/cc-cflags-before) $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@" fi -# Only add darwin min version flag and set up `DEVELOPER_DIR` if a default darwin min version is set, +# Only add darwin min version flag if a default darwin min version is set, # which is a signal that we're targetting darwin. if [ "@darwinMinVersion@" ]; then mangleVarSingle @darwinMinVersionVariable@ ${role_suffixes[@]+"${role_suffixes[@]}"} NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@="-m@darwinPlatformForCC@-version-min=${@darwinMinVersionVariable@_@suffixSalt@:-@darwinMinVersion@} $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@" - - # `DEVELOPER_DIR` is used to dynamically locate libSystem (and the SDK frameworks) based on the SDK at that path. - mangleVarSingle DEVELOPER_DIR ${role_suffixes[@]+"${role_suffixes[@]}"} - - # Allow wrapped compilers to do something useful when no `DEVELOPER_DIR` is set, which can happen when - # the compiler is run outside of a stdenv or intentionally in an environment with no environment variables set. - DEVELOPER_DIR=${DEVELOPER_DIR_@suffixSalt@:-@fallback_sdk@} - - # xcbuild needs `SDKROOT` to be the name of the SDK, which it sets in its own wrapper, - # but compilers expect it to point to the absolute path. - SDKROOT="$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" fi # That way forked processes will not extend these environment variables again. diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index a539f9da4318..5d338a0dd0dc 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -17,6 +17,8 @@ fi source @out@/nix-support/utils.bash +source @out@/nix-support/darwin-sdk-setup.bash + # Parse command line options and set several variables. # For instance, figure out if linker flags should be passed. diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index b9def8632615..001123fe3d85 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -284,13 +284,6 @@ let if (targetPlatform.darwinPlatform == "macos" && isGNU) then "macosx" else targetPlatform.darwinPlatform ); - - darwinMinVersion = optionalString targetPlatform.isDarwin ( - targetPlatform.darwinMinVersion - ); - - darwinMinVersionVariable = optionalString targetPlatform.isDarwin - targetPlatform.darwinMinVersionVariable; in assert includeFortifyHeaders' -> fortify-headers != null; @@ -707,6 +700,7 @@ stdenvNoCC.mkDerivation { substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash + substituteAll ${../wrapper-common/darwin-sdk-setup.bash} $out/nix-support/darwin-sdk-setup.bash '' + optionalString cc.langAda or false '' @@ -751,8 +745,11 @@ stdenvNoCC.mkDerivation { wrapperName = "CC_WRAPPER"; inherit suffixSalt coreutils_bin bintools; inherit libc_bin libc_dev libc_lib; - inherit darwinPlatformForCC darwinMinVersion darwinMinVersionVariable; + inherit darwinPlatformForCC; default_hardening_flags_str = builtins.toString defaultHardeningFlags; + } // lib.mapAttrs (_: lib.optionalString targetPlatform.isDarwin) { + # These will become empty strings when not targeting Darwin. + inherit (targetPlatform) darwinMinVersion darwinMinVersionVariable; } // lib.optionalAttrs (apple-sdk != null && stdenvNoCC.targetPlatform.isDarwin) { # Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`. fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk; diff --git a/pkgs/build-support/wrapper-common/darwin-sdk-setup.bash b/pkgs/build-support/wrapper-common/darwin-sdk-setup.bash new file mode 100644 index 000000000000..8c6a337a8fca --- /dev/null +++ b/pkgs/build-support/wrapper-common/darwin-sdk-setup.bash @@ -0,0 +1,16 @@ +accumulateRoles + +# Only set up `DEVELOPER_DIR` if a default darwin min version is set, +# which is a signal that we're targetting darwin. +if [[ "@darwinMinVersion@" ]]; then + # `DEVELOPER_DIR` is used to dynamically locate libSystem (and the SDK frameworks) based on the SDK at that path. + mangleVarSingle DEVELOPER_DIR ${role_suffixes[@]+"${role_suffixes[@]}"} + + # Allow wrapped compilers to do something useful when no `DEVELOPER_DIR` is set, which can happen when + # the compiler is run outside of a stdenv or intentionally in an environment with no environment variables set. + DEVELOPER_DIR=${DEVELOPER_DIR_@suffixSalt@:-@fallback_sdk@} + + # xcbuild needs `SDKROOT` to be the name of the SDK, which it sets in its own wrapper, + # but compilers expect it to point to the absolute path. + SDKROOT="$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" +fi From b50611e7496742b3d83f955ef019f2bb3dfa2892 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 26 Oct 2024 12:57:20 +0900 Subject: [PATCH 162/617] python312Packages.ipython: 8.27.0 -> 8.29.0 Changelog: https://github.com/ipython/ipython/blob/8.29.0/docs/source/whatsnew/version8.rst --- pkgs/development/python-modules/ipython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 33c3c0a8a754..45cd52fdbac3 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -42,13 +42,13 @@ buildPythonPackage rec { pname = "ipython"; - version = "8.27.0"; + version = "8.29.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-C5mi3J8V/WhpLomOVWhyXG1JxSfTap+1lg/73qqC/34="; + hash = "sha256-QLYOFbIlkUUO73PkCgJ893vWUudXUj7rxb18fEmCkOs="; }; build-system = [ setuptools ]; From 48e5645c753744e8c956f14a5c836ea682abfbbd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Oct 2024 04:36:09 +0000 Subject: [PATCH 163/617] liburing: 2.7 -> 2.8 --- pkgs/development/libraries/liburing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index c35df57b6052..931cbd77b041 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "liburing"; - version = "2.7"; + version = "2.8"; src = fetchFromGitHub { owner = "axboe"; repo = "liburing"; rev = "refs/tags/liburing-${version}"; - hash = "sha256-WhNlO2opPM7v4LOLWpmzPv31++zmn5Hmb6Su9IQBDH8="; + hash = "sha256-10zmoMDzO41oNRVXE/6FzDGPVRVJTJTARVUmc1b7f+o="; }; separateDebugInfo = true; From 2f31fd064f926b1f6534fe9d1ac134fc243ec591 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 26 Oct 2024 13:59:55 +0100 Subject: [PATCH 164/617] ffmpeg_7: remove obsolete macOS 10.12 SDK patch --- ...tion.m-macOS-SDK-10.12-compatibility.patch | 25 ------------------- pkgs/development/libraries/ffmpeg/generic.nix | 1 - 2 files changed, 26 deletions(-) delete mode 100644 pkgs/development/libraries/ffmpeg/0001-avfoundation.m-macOS-SDK-10.12-compatibility.patch diff --git a/pkgs/development/libraries/ffmpeg/0001-avfoundation.m-macOS-SDK-10.12-compatibility.patch b/pkgs/development/libraries/ffmpeg/0001-avfoundation.m-macOS-SDK-10.12-compatibility.patch deleted file mode 100644 index 60004b1766ca..000000000000 --- a/pkgs/development/libraries/ffmpeg/0001-avfoundation.m-macOS-SDK-10.12-compatibility.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a804dd05351716b1fd9a7c2b7ed636613edd9c0f Mon Sep 17 00:00:00 2001 -From: toonn -Date: Fri, 21 Jun 2024 18:59:49 +0000 -Subject: [PATCH] avfoundation.m: macOS SDK 10.12 compatibility - ---- - libavdevice/avfoundation.m | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libavdevice/avfoundation.m b/libavdevice/avfoundation.m -index d9b17ccdae..2a1f66d751 100644 ---- a/libavdevice/avfoundation.m -+++ b/libavdevice/avfoundation.m -@@ -762,7 +762,7 @@ static int get_audio_config(AVFormatContext *s) - return 0; - } - --static NSArray* getDevicesWithMediaType(AVMediaType mediaType) { -+static NSArray* getDevicesWithMediaType(NSString * mediaType) { - #if ((TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (TARGET_OS_OSX && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500)) - NSMutableArray *deviceTypes = nil; - if (mediaType == AVMediaTypeVideo) { --- -2.44.0 - diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 53d2c700317f..52104529e162 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -455,7 +455,6 @@ stdenv.mkDerivation (finalAttrs: { }) ] ++ optionals (lib.versionAtLeast version "7.1") [ - ./0001-avfoundation.m-macOS-SDK-10.12-compatibility.patch ./fix-fate-ffmpeg-spec-disposition-7.1.patch # Expose a private API for Chromium / Qt WebEngine. From e047c69ed406c834722b6ed7bb1bdd39d3e5eef0 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 25 Oct 2024 19:41:08 +0100 Subject: [PATCH 165/617] {bintools-wrapper,cc-wrapper}: allow paths relative to the Darwin SDK MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `-L` and `-I` are interpreted relative to the `$SDKROOT` by the Darwin toolchain, so we have to avoid filtering out such paths in the purity filter hacks in order to not break e.g. the .NET Core build system. It’s also just the correct thing to do for the platform. --- pkgs/build-support/bintools-wrapper/ld-wrapper.sh | 4 ++-- pkgs/build-support/cc-wrapper/cc-wrapper.sh | 2 +- pkgs/build-support/wrapper-common/utils.bash | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh index 1c5b08541ac2..310cbc001c8b 100644 --- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh @@ -44,9 +44,9 @@ if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}" while (( "$n" < "$nParams" )); do p=${params[n]} p2=${params[n+1]:-} # handle `p` being last one - if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then + if [ "${p:0:3}" = -L/ ] && badPathWithDarwinSdk "${p:2}"; then skip "${p:2}" - elif [ "$p" = -L ] && badPath "$p2"; then + elif [ "$p" = -L ] && badPathWithDarwinSdk "$p2"; then n+=1; skip "$p2" elif [ "$p" = -rpath ] && badPath "$p2"; then n+=1; skip "$p2" diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 5d338a0dd0dc..da1a709684da 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -103,7 +103,7 @@ if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "$NIX_STORE" ]]; then -[IL] | -isystem) path=$p2 skipNext=true ;; esac - if [[ -n $path ]] && badPath "$path"; then + if [[ -n $path ]] && badPathWithDarwinSdk "$path"; then skip "$path" $skipNext && n+=1 continue diff --git a/pkgs/build-support/wrapper-common/utils.bash b/pkgs/build-support/wrapper-common/utils.bash index 2faf96df15b4..c9870d1b4d41 100644 --- a/pkgs/build-support/wrapper-common/utils.bash +++ b/pkgs/build-support/wrapper-common/utils.bash @@ -118,6 +118,21 @@ badPath() { "${p#"${TEMPDIR:-/tmp}"}" = "$p" } +# Like `badPath`, but handles paths that may be interpreted relative to +# `$SDKROOT` on Darwin. For example, `-L/usr/lib/swift` is interpreted +# as `-L$SDKROOT/usr/lib/swift` when `$SDKROOT` is set and +# `$SDKROOT/usr/lib/swift` exists. +badPathWithDarwinSdk() { + path=$1 + if [[ "@darwinMinVersion@" ]]; then + sdkPath=$SDKROOT/$path + if [[ -e $sdkPath ]]; then + path=$sdkPath + fi + fi + badPath "$path" +} + expandResponseParams() { declare -ga params=("$@") local arg From 53765b0fb33db341bd67a4d97a2fed3863457c80 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 26 Oct 2024 14:27:23 -0400 Subject: [PATCH 166/617] darwin.stdenv: avoid building a second Python just for locales --- pkgs/stdenv/darwin/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 5a3ef15e392d..3c3f378fe5f9 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -1016,6 +1016,8 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check # Build expand-response-params with last stage like below inherit (prevStage) expand-response-params; }; + # Avoid rebuilding bmake (and Python) just for locales + locale = superDarwin.locale.override { inherit (prevStage) bmake; }; } ); From 04ba4d1a3bbde89a862a5cfd03277aba7a51ff0b Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 26 Oct 2024 22:21:08 +0100 Subject: [PATCH 167/617] =?UTF-8?q?bintools-wrapper:=20fix=20late=E2=80=90?= =?UTF-8?q?bound=20command=20references?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This ports 985072e2ce4afa4201b49a20154fcc888aaccec5 to bintools-wrapper. Co-authored-by: Artturin Co-authored-by: IlyaNiklyaev --- pkgs/build-support/bintools-wrapper/default.nix | 2 ++ pkgs/build-support/bintools-wrapper/ld-wrapper.sh | 4 ++-- pkgs/test/cc-wrapper/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index a2a0736c2221..05d5f0d39664 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -403,6 +403,8 @@ stdenvNoCC.mkDerivation { # TODO(@sternenseemann): rename env var via stdenv rebuild shell = (getBin runtimeShell + runtimeShell.shellPath or ""); gnugrep_bin = optionalString (!nativeTools) gnugrep; + rm = if nativeTools then "rm" else lib.getExe' coreutils "rm"; + mktemp = if nativeTools then "mktemp" else lib.getExe' coreutils "mktemp"; wrapperName = "BINTOOLS_WRAPPER"; inherit dynamicLinker targetPrefix suffixSalt coreutils_bin; inherit bintools_bin libc_bin libc_dev libc_lib; diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh index 7e00d02b0374..9b2f752af5fe 100644 --- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh @@ -251,8 +251,8 @@ PATH="$path_backup" # Old bash workaround, see above. if (( "${NIX_LD_USE_RESPONSE_FILE:-@use_response_file_by_default@}" >= 1 )); then - responseFile=$(mktemp "${TMPDIR:-/tmp}/ld-params.XXXXXX") - trap 'rm -f -- "$responseFile"' EXIT + responseFile=$(@mktemp@ "${TMPDIR:-/tmp}/ld-params.XXXXXX") + trap '@rm@ -f -- "$responseFile"' EXIT printf "%q\n" \ ${extraBefore+"${extraBefore[@]}"} \ ${params+"${params[@]}"} \ diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix index 61d65784f5b9..22991e0dc07d 100644 --- a/pkgs/test/cc-wrapper/default.nix +++ b/pkgs/test/cc-wrapper/default.nix @@ -131,8 +131,8 @@ in stdenv.mkDerivation { ASAN_OPTIONS=use_sigaltstack=0 ${emulator} ./sanitizers ''} - echo "Check whether CC with NIX_CC_USE_RESPONSE_FILE hardcodes all required binaries..." >&2 - NIX_CC_USE_RESPONSE_FILE=1 ${CC} -v + echo "Check whether CC and LD with NIX_X_USE_RESPONSE_FILE hardcodes all required binaries..." >&2 + NIX_CC_USE_RESPONSE_FILE=1 NIX_LD_USE_RESPONSE_FILE=1 ${CC} -v touch $out ''; From eb4f33e14c9710f445963ec7698c0395273ee37d Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Sun, 27 Oct 2024 06:31:52 +0100 Subject: [PATCH 168/617] cmake: Fix the FindCURL module This helps building `pkgsStatic` executables that link in `libcurl.a`. Before this patch linker options for curl's own dependencies were simply missing. --- ...ore-target-properties-from-pkg-config.diff | 32 +++++++++++++++++++ pkgs/by-name/cm/cmake/package.nix | 7 +++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/cm/cmake/008-FindCURL-Add-more-target-properties-from-pkg-config.diff diff --git a/pkgs/by-name/cm/cmake/008-FindCURL-Add-more-target-properties-from-pkg-config.diff b/pkgs/by-name/cm/cmake/008-FindCURL-Add-more-target-properties-from-pkg-config.diff new file mode 100644 index 000000000000..8dfc354a9c20 --- /dev/null +++ b/pkgs/by-name/cm/cmake/008-FindCURL-Add-more-target-properties-from-pkg-config.diff @@ -0,0 +1,32 @@ +diff --git a/Modules/FindCURL.cmake b/Modules/FindCURL.cmake +index 5ce8a9046b..f7361308b7 100644 +--- a/Modules/FindCURL.cmake ++++ b/Modules/FindCURL.cmake +@@ -239,9 +239,24 @@ if(CURL_FOUND) + IMPORTED_LOCATION_DEBUG "${CURL_LIBRARY_DEBUG}") + endif() + +- if(CURL_USE_STATIC_LIBS AND MSVC) +- set_target_properties(CURL::libcurl PROPERTIES +- INTERFACE_LINK_LIBRARIES "normaliz.lib;ws2_32.lib;wldap32.lib") ++ if(PC_CURL_FOUND) ++ if(PC_CURL_LINK_LIBRARIES) ++ set_property(TARGET CURL::libcurl PROPERTY ++ INTERFACE_LINK_LIBRARIES "${PC_CURL_LINK_LIBRARIES}") ++ endif() ++ if(PC_CURL_LDFLAGS_OTHER) ++ set_property(TARGET CURL::libcurl PROPERTY ++ INTERFACE_LINK_OPTIONS "${PC_CURL_LDFLAGS_OTHER}") ++ endif() ++ if(PC_CURL_CFLAGS_OTHER) ++ set_property(TARGET CURL::libcurl PROPERTY ++ INTERFACE_COMPILE_OPTIONS "${PC_CURL_CFLAGS_OTHER}") ++ endif() ++ else() ++ if(CURL_USE_STATIC_LIBS AND MSVC) ++ set_target_properties(CURL::libcurl PROPERTIES ++ INTERFACE_LINK_LIBRARIES "normaliz.lib;ws2_32.lib;wldap32.lib") ++ endif() + endif() + + endif() diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix index 82563e56c2b0..64dccbba31a0 100644 --- a/pkgs/by-name/cm/cmake/package.nix +++ b/pkgs/by-name/cm/cmake/package.nix @@ -76,7 +76,12 @@ stdenv.mkDerivation (finalAttrs: { substituteAll { src = ./007-darwin-bsd-ps-abspath.diff; ps = lib.getExe ps; - }); + }) + ++ [ + # Backport of https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9900 + # Needed to corretly link curl in pkgsStatic. + ./008-FindCURL-Add-more-target-properties-from-pkg-config.diff + ]; outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" "info" ]; separateDebugInfo = true; From 1472acd79c091d5f481b039867c450e74e4224af Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 27 Oct 2024 07:14:08 +0000 Subject: [PATCH 169/617] mpg123: 1.32.7 -> 1.32.8 Changes: https://www.mpg123.de/#2024-10-26 --- pkgs/applications/audio/mpg123/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 9fe4e925c13a..f18469f56588 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -22,11 +22,11 @@ assert withConplay -> !libOnly; stdenv.mkDerivation rec { pname = "${lib.optionalString libOnly "lib"}mpg123"; - version = "1.32.7"; + version = "1.32.8"; src = fetchurl { url = "mirror://sourceforge/mpg123/mpg123-${version}.tar.bz2"; - hash = "sha256-PIkZJDcHlRysDjw5u/KGU7yv/EPJj/FoAaJzUNuPDyE="; + hash = "sha256-/u4TdMeVQODkBd8LxF/eIK1nARQlw2GidZ4hRolKJ6c="; }; outputs = [ "out" "dev" "man" ] ++ lib.optional withConplay "conplay"; From 11aee2d2258ac116368cd662df490e2553237dea Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 20 Oct 2024 06:00:16 +0100 Subject: [PATCH 170/617] libgit2: 1.8.1 -> 1.8.3 Changes: - https://github.com/libgit2/libgit2/releases/tag/v1.8.2 - https://github.com/libgit2/libgit2/releases/tag/v1.8.3 --- pkgs/development/libraries/libgit2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix index af0ae5f73a7d..5e38abebd5ee 100644 --- a/pkgs/development/libraries/libgit2/default.nix +++ b/pkgs/development/libraries/libgit2/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libgit2"; - version = "1.8.1"; + version = "1.8.3"; # also check the following packages for updates: python3Packages.pygit2 and libgit2-glib outputs = ["lib" "dev" "out"]; @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "libgit2"; repo = "libgit2"; rev = "v${finalAttrs.version}"; - hash = "sha256-J2rCxTecyLbbDdsyBWn9w7r3pbKRMkI9E7RvRgAqBdY="; + hash = "sha256-ugVvXn9/ZXlJJQgh3zTBQYPGFrVDF3yxVynQyYzvXoY="; }; cmakeFlags = [ From 8fbfbf557a7aae568bf492710c34c9e75def8bf3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 27 Oct 2024 17:20:40 +0100 Subject: [PATCH 171/617] python312Packages.grpcio: fix src hash The version was bumped, but src wasn't updated to reflect that. Fixes: da16a24 ("python312Packages.grpcio: 1.64.1 -> 1.67.0") --- pkgs/development/python-modules/grpcio/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 976b3e9c2736..01751b4145a2 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -5,7 +5,6 @@ c-ares, cython, fetchPypi, - grpc, openssl, pkg-config, protobuf, @@ -23,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-VjWIxYe3XDS5KLxChUjlsA6jjEaXIYGk2Ldbp+PyQjE="; + hash = "sha256-4JCyVT4Noch1RJyOdQc91EFd1xyb3mpAYkD99MDuRnw="; }; outputs = [ From 55dfed83c07faaa7aa9d279af787ec41b8baed9a Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 27 Oct 2024 17:44:56 +0000 Subject: [PATCH 172/617] {bintools-wrapper,cc-wrapper}: export Darwin SDK variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 514b00cf08702b31cdf873a798f1ff100d4f2cf7 exposed another bug in the existing wrapper logic: Darwin SDK variables are only exported by the SDK package hook, so if those variables aren’t already exported inside the wrappers, the modified versions are not passed down to the compiler tools, breaking the fallback SDK logic. This was previously partially masked by passing down a normally‐redundant `-isysroot` to the compiler, but now we fix it at the source. This broke e.g. running `clang(1)` without any environment, something the GHC binary package `installCheckPhase` does indirectly to verify that there’s nothing missing from the wrapped GHC `$PATH`. It may also have caused issues building for the build platform inside a Darwin‐to‐non‐Darwin cross‐compilation build. --- pkgs/build-support/wrapper-common/darwin-sdk-setup.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/wrapper-common/darwin-sdk-setup.bash b/pkgs/build-support/wrapper-common/darwin-sdk-setup.bash index 8c6a337a8fca..3b31a4aa6981 100644 --- a/pkgs/build-support/wrapper-common/darwin-sdk-setup.bash +++ b/pkgs/build-support/wrapper-common/darwin-sdk-setup.bash @@ -8,9 +8,9 @@ if [[ "@darwinMinVersion@" ]]; then # Allow wrapped compilers to do something useful when no `DEVELOPER_DIR` is set, which can happen when # the compiler is run outside of a stdenv or intentionally in an environment with no environment variables set. - DEVELOPER_DIR=${DEVELOPER_DIR_@suffixSalt@:-@fallback_sdk@} + export DEVELOPER_DIR=${DEVELOPER_DIR_@suffixSalt@:-@fallback_sdk@} # xcbuild needs `SDKROOT` to be the name of the SDK, which it sets in its own wrapper, # but compilers expect it to point to the absolute path. - SDKROOT="$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" + export SDKROOT="$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" fi From fe04acd93b8cdb6aed211bdce9b164b39b6fe03d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 27 Oct 2024 11:23:52 -0700 Subject: [PATCH 173/617] python312Packages.passlib: modernize and adopt --- .../python-modules/passlib/default.nix | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix index 7bbd361cb2b1..98be7873032a 100644 --- a/pkgs/development/python-modules/passlib/default.nix +++ b/pkgs/development/python-modules/passlib/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitLab, argon2-cffi, bcrypt, cryptography, @@ -14,15 +14,20 @@ buildPythonPackage rec { pname = "passlib"; version = "1.7.4"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-3v1Q9ytlxUAqssVzgwppeOXyAq0NmEeTyN3ixBUuvgQ"; + src = fetchFromGitLab { + domain = "foss.heptapod.net"; + owner = "python-libs"; + repo = "passlib"; + rev = "refs/tags/${version}"; + hash = "sha256-Mx2Xg/KAEfvfep2B/gWATTiAPJc+f22MTcsEdRpt3n8="; }; + build-system = [ setuptools ]; + dependencies = [ setuptools ]; optional-dependencies = { @@ -60,10 +65,11 @@ buildPythonPackage rec { "--deselect=passlib/tests/test_handlers.py::sha256_crypt_os_crypt_test::test_82_crypt_support" ]; - meta = with lib; { + meta = { + changelog = "https://foss.heptapod.net/python-libs/passlib/-/blob/${version}/docs/history/${lib.versions.majorMinor version}.rst"; description = "Password hashing library for Python"; homepage = "https://foss.heptapod.net/python-libs/passlib"; - license = licenses.bsdOriginal; - maintainers = [ ]; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ dotlambda ]; }; } From 714b0306e33aa057e3f8a617644a05342053b03c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 28 Oct 2024 06:37:59 +0000 Subject: [PATCH 174/617] gjs: 1.82.0 -> 1.82.1 Changes: https://gitlab.gnome.org/GNOME/gjs/-/tags/1.82.1 --- pkgs/development/libraries/gjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index b3a9f606d17f..fee889cbd537 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -32,13 +32,13 @@ let ]; in stdenv.mkDerivation (finalAttrs: { pname = "gjs"; - version = "1.82.0"; + version = "1.82.1"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor finalAttrs.version}/gjs-${finalAttrs.version}.tar.xz"; - hash = "sha256-FEkCNoaNC/gi96p884/NMz52IHYP3PUOkyQjYR9iZiM="; + hash = "sha256-+zmqVjZXbeDloRcfVqGlgl4r0aaZcvsSC6eL0Qm1aTw="; }; patches = [ From 0b96d8b9a46a67429bdd757b99431f0378691632 Mon Sep 17 00:00:00 2001 From: Simon Hauser Date: Fri, 25 Oct 2024 08:32:53 +0200 Subject: [PATCH 175/617] python312Packages.werkzeug: 3.0.4 -> 3.0.6 Changelog: https://werkzeug.palletsprojects.com/en/3.0.x/changes/#version-3-0-5 https://werkzeug.palletsprojects.com/en/stable/changes/#version-3-0-6 --- pkgs/development/python-modules/werkzeug/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index 6da0b68c6c05..feafb29bcbd3 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "werkzeug"; - version = "3.0.4"; + version = "3.0.6"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-NPI3FQayUN9NT4S/57CSHkdiUldiu9k2YUkJ/iXNcwY="; + hash = "sha256-qN1Z1N4oynBHGjTLp5vtX37y4Danazqwg1R0JG60H40="; }; build-system = [ flit-core ]; From e774447767e998ae66203d2fceb5a326038e015e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 28 Oct 2024 15:13:02 +0200 Subject: [PATCH 176/617] python312Packages.scipy: 1.14.0 -> 1.14.1 Diff: https://github.com/scipy/scipy/compare/refs/tags/v1.14.0...v1.14.1 Changelog: https://github.com/scipy/scipy/releases/tag/v1.14.1 --- pkgs/development/python-modules/scipy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 4677b47f1188..e5b2db20a1c0 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -48,8 +48,8 @@ let # nix-shell maintainers/scripts/update.nix --argstr package python3.pkgs.scipy # # The update script uses sed regexes to replace them with the updated hashes. - version = "1.14.0"; - srcHash = "sha256-rNplvbDExmMfcPuvhs+y9j5/9G6QR1GdMgQLty6oi2c="; + version = "1.14.1"; + srcHash = "sha256-eYuUHr9wZMXvEsIhssGR35JnRBNGaOL/j1LNM5sHuYY="; datasetsHashes = { ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3"; ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj"; From 1f8bb94bcab905561b7e7e28fa9ff833ef77652c Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Mon, 28 Oct 2024 21:19:51 +0800 Subject: [PATCH 177/617] pythonOutputDistHook: append *Phases with appendToVar --- .../interpreters/python/hooks/python-output-dist-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh b/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh index 83b79d01fa40..8e4a15dc277f 100644 --- a/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh @@ -21,4 +21,4 @@ EOF echo "Finished executing pythonOutputDistPhase" } -preFixupPhases+=" pythonOutputDistPhase" +appendToVar preFixupPhases pythonOutputDistPhase From c4bc1a8bb6038a26ac3d18a84841428bdedbd711 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Wed, 11 Sep 2024 04:23:36 +0800 Subject: [PATCH 178/617] pipBuildHook: handle pipBuildFlags `__structuredAttrs`-agnostically --- .../python/hooks/pip-build-hook.sh | 25 +++++++++++-------- .../meson-python/add-build-flags.sh | 2 +- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/development/interpreters/python/hooks/pip-build-hook.sh b/pkgs/development/interpreters/python/hooks/pip-build-hook.sh index 3d70de729f2d..430951bac7c9 100644 --- a/pkgs/development/interpreters/python/hooks/pip-build-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pip-build-hook.sh @@ -1,22 +1,27 @@ # Setup hook to use for pip projects -echo "Sourcing pip-build-hook" +# shellcheck shell=bash -declare -a pipBuildFlags +echo "Sourcing pip-build-hook" pipBuildPhase() { echo "Executing pipBuildPhase" runHook preBuild mkdir -p dist + + local -a flagsArray=( + --verbose + --no-index + --no-deps + --no-clean + --no-build-isolation + --wheel-dir dist + ) + concatTo flagsArray pipBuildFlags + echo "Creating a wheel..." - @pythonInterpreter@ -m pip wheel \ - --verbose \ - --no-index \ - --no-deps \ - --no-clean \ - --no-build-isolation \ - --wheel-dir dist \ - $pipBuildFlags . + echoCmd 'pip build flags' "${flagsArray[@]}" + @pythonInterpreter@ -m pip wheel "${flagsArray[@]}" . echo "Finished creating a wheel..." runHook postBuild diff --git a/pkgs/development/python-modules/meson-python/add-build-flags.sh b/pkgs/development/python-modules/meson-python/add-build-flags.sh index d9327960eb1d..d781b1f966f6 100644 --- a/pkgs/development/python-modules/meson-python/add-build-flags.sh +++ b/pkgs/development/python-modules/meson-python/add-build-flags.sh @@ -3,7 +3,7 @@ mesonPythonBuildFlagsHook() { for f in $mesonFlags; do pypaBuildFlags+=" -Csetup-args=$f" # This requires pip>23.0.1, see: https://meson-python.readthedocs.io/en/latest/how-to-guides/config-settings.html - pipBuildFlags+=" --config-settings=setup-args=$f" + appendToVar pipBuildFlags "--config-settings=setup-args=$f" done } From 3a0f6fabff15e2e59847bfc6c9563cc37b21de0c Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Wed, 11 Sep 2024 04:46:25 +0800 Subject: [PATCH 179/617] pipInstallHook: handle pipInstallFlags `__structuredAttrs`-agnostically --- .../python/hooks/pip-install-hook.sh | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh index a4f08b8b14cb..0f718a6c4bb8 100644 --- a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh @@ -1,17 +1,27 @@ # Setup hook for pip. -echo "Sourcing pip-install-hook" +# shellcheck shell=bash -declare -a pipInstallFlags +echo "Sourcing pip-install-hook" pipInstallPhase() { echo "Executing pipInstallPhase" runHook preInstall + # shellcheck disable=SC2154 mkdir -p "$out/@pythonSitePackages@" export PYTHONPATH="$out/@pythonSitePackages@:$PYTHONPATH" + local -a flagsArray=( + --no-index + --no-warn-script-location + --prefix="$out" + --no-cache + ) + concatTo flagsArray pipInstallFlags + pushd dist || return 1 - @pythonInterpreter@ -m pip install ./*.whl --no-index --no-warn-script-location --prefix="$out" --no-cache $pipInstallFlags + echoCmd 'pip install flags' "${flagsArray[@]}" + @pythonInterpreter@ -m pip install ./*.whl "${flagsArray[@]}" popd || return 1 runHook postInstall From 1f39bb6586ec2e89076f8f8f562bfd388e749903 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Wed, 11 Sep 2024 05:01:37 +0800 Subject: [PATCH 180/617] pypaBuildHook: handle pypaBuildFlags `__structuredAttrs`-agnostically --- .../interpreters/python/hooks/pypa-build-hook.sh | 10 +++++++++- .../python-modules/meson-python/add-build-flags.sh | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh b/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh index dd49d935bcee..d1a1b10bf520 100644 --- a/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh @@ -5,8 +5,16 @@ pypaBuildPhase() { echo "Executing pypaBuildPhase" runHook preBuild + local -a flagsArray=( + --no-isolation + --outdir dist/ + --wheel + ) + concatTo flagsArray pypaBuildFlags + echo "Creating a wheel..." - @build@/bin/pyproject-build --no-isolation --outdir dist/ --wheel $pypaBuildFlags + echoCmd 'pypa build flags' "${flagsArray[@]}" + @build@/bin/pyproject-build "${flagsArray[@]}" echo "Finished creating a wheel..." runHook postBuild diff --git a/pkgs/development/python-modules/meson-python/add-build-flags.sh b/pkgs/development/python-modules/meson-python/add-build-flags.sh index d781b1f966f6..e1b2588f07fc 100644 --- a/pkgs/development/python-modules/meson-python/add-build-flags.sh +++ b/pkgs/development/python-modules/meson-python/add-build-flags.sh @@ -1,7 +1,7 @@ mesonPythonBuildFlagsHook() { # Add all of mesonFlags to -Csetup-args for pypa builds for f in $mesonFlags; do - pypaBuildFlags+=" -Csetup-args=$f" + appendToVar pypaBuildFlags "-Csetup-args=$f" # This requires pip>23.0.1, see: https://meson-python.readthedocs.io/en/latest/how-to-guides/config-settings.html appendToVar pipBuildFlags "--config-settings=setup-args=$f" done From 69f4871514c06e92dc4ead9491e4581efa9898f9 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Wed, 11 Sep 2024 04:54:28 +0800 Subject: [PATCH 181/617] pypaBuildHook: lint with ShellCheck --- pkgs/development/interpreters/python/hooks/pypa-build-hook.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh b/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh index d1a1b10bf520..88472b468688 100644 --- a/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pypa-build-hook.sh @@ -1,4 +1,6 @@ # Setup hook to use for pypa/build projects +# shellcheck shell=bash + echo "Sourcing pypa-build-hook" pypaBuildPhase() { From 967e5b43ed61d2a2bf7b2d194aa2e51c2cfc1904 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Tue, 10 Sep 2024 23:08:01 +0800 Subject: [PATCH 182/617] pythonImportsCheckHook: support __structuredAttrs = true --- .../python/hooks/python-imports-check-hook.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh index 591060aca6d0..2788a947fe95 100644 --- a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh @@ -4,15 +4,16 @@ echo "Sourcing python-imports-check-hook.sh" pythonImportsCheckPhase() { echo "Executing pythonImportsCheckPhase" - if [ -n "$pythonImportsCheck" ]; then - echo "Check whether the following modules can be imported: $pythonImportsCheck" - pythonImportsCheckOutput=$out - if [ -n "$python" ]; then + if [ -n "${pythonImportsCheck[*]-}" ]; then + echo "Check whether the following modules can be imported: ${pythonImportsCheck[*]}" + # shellcheck disable=SC2154 + pythonImportsCheckOutput="$out" + if [ -n "${python-}" ]; then echo "Using python specific output \$python for imports check" pythonImportsCheckOutput=$python fi export PYTHONPATH="$pythonImportsCheckOutput/@pythonSitePackages@:$PYTHONPATH" - (cd $pythonImportsCheckOutput && @pythonCheckInterpreter@ -c 'import os; import importlib; list(map(lambda mod: importlib.import_module(mod), os.environ["pythonImportsCheck"].split()))') + (cd "$pythonImportsCheckOutput" && @pythonCheckInterpreter@ -c 'import sys; import importlib; list(map(lambda mod: importlib.import_module(mod), sys.argv[1:]))' ${pythonImportsCheck[*]}) fi } From 34ebbd650cbae6a973dc08bf91b230e0093507ce Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Mon, 28 Oct 2024 17:05:49 +0800 Subject: [PATCH 183/617] pkgs/stdenv/generic/setup.sh: lint with ShellCheck The behaviour of [[ -n/-z "${FOO[@]}" ]] is unspecified. Use [[ -n/-z "${FOO[*]-}" ]] instead --- pkgs/stdenv/generic/setup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 0287b3a90a2a..86e8d764bab1 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -15,6 +15,7 @@ shopt -s inherit_errexit # $NIX_DEBUG must be a documented integer level, if set, so we can use it safely as an integer. # See the `Verbosity` enum in the Nix source for these levels. if ! [[ -z ${NIX_DEBUG-} || $NIX_DEBUG == [0-7] ]]; then + # shellcheck disable=SC2016 printf 'The `NIX_DEBUG` environment variable has an unexpected value: %s\n' "${NIX_DEBUG}" echo "It can only be unset or an integer between 0 and 7." exit 1 @@ -396,7 +397,7 @@ concatTo() { for arg in "$@"; do IFS="=" read -r name default <<< "$arg" local -n nameref="$name" - if [[ ! -n "${nameref[@]}" && -n "$default" ]]; then + if [[ -z "${nameref[*]}" && -n "$default" ]]; then targetref+=( "$default" ) elif type=$(declare -p "$name" 2> /dev/null); then case "${type#* }" in From 7451482dbe2fc2108b65b554d2a27047c4292e11 Mon Sep 17 00:00:00 2001 From: Reno Dakota <170618376+paparodeo@users.noreply.github.com> Date: Mon, 28 Oct 2024 09:45:14 +0000 Subject: [PATCH 184/617] python311Packages.tesnsorflow: fix evaulation error remove invalid argument grpc argument from override as it was removed in 8fbfbf557a7aae568bf492710c34c9e75def8bf3 --- pkgs/top-level/python-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f31d47437aaa..18ad97b7293a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15478,7 +15478,6 @@ self: super: with self; { }; grpcioTF = self.grpcio.override { protobuf = protobufTF; - grpc = grpcTF; }; tensorboard-plugin-profileTF = self.tensorboard-plugin-profile.override { protobuf = protobuf-pythonTF; From 593d771826649ec9a41b37315e9ef0ae1cb6c53b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 28 Oct 2024 17:41:46 +0000 Subject: [PATCH 185/617] xterm: 394 -> 395 (#351129) Changes: https://invisible-island.net/xterm/xterm.log.html#xterm_395 --- pkgs/applications/terminal-emulators/xterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 41f3b5bd8b3f..f9a2e0151f6a 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "394"; + version = "395"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - hash = "sha256-oqDLIG6wQj3tw0eU9cLTjIM5DS3REGtmq6CWDDqXbHo="; + hash = "sha256-KG48qlk46uOOICgnYhVnYp3+quaJ6AcLQTyhE5gJPcg="; }; patches = [ ./sixel-256.support.patch ]; From 87fe6550bb0daa75864e6028d04c9c9d0efb3592 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Mon, 28 Oct 2024 21:00:09 +0100 Subject: [PATCH 186/617] zed-editor: remove darwin workaround for isysroot --- pkgs/by-name/ze/zed-editor/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 07f577e685eb..8962e7fb7d83 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -197,9 +197,6 @@ rustPlatform.buildRustPackage rec { ZED_UPDATE_EXPLANATION = "Zed has been installed using Nix. Auto-updates have thus been disabled."; # Used by `zed --version` RELEASE_VERSION = version; - # Required until `-isysroot` can be used with libclang in nixpkgs on darwin, otherwise - # rust bindgen will not work as expected - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-F${apple-sdk_15.sdkroot}/System/Library/Frameworks"; }; RUSTFLAGS = if withGLES then "--cfg gles" else ""; From d85a1e50fea67aa559cb578efc4415cd6adc22ef Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 28 Oct 2024 18:59:35 +0000 Subject: [PATCH 187/617] libsForQt5.qtbase: fix Darwin build by removing obsolete patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Another existing bug exposed by 514b00cf08702b31cdf873a798f1ff100d4f2cf7: the build system was interpolating an empty SDK directory and passing `-isysroot -g0`, eating a compiler flag and breaking the build now that we don’t pass a redundant `-isysroot` of our own. Thankfully, with the new SDK pattern, we don’t need to do any of this elaborate patching; just pointing it at the right tools from `xcbuild` lets it figure everything out itself. --- .../libraries/qt-5/5.15/default.nix | 10 +- .../0001-qtbase-mkspecs-mac.patch | 485 ------------------ .../0012-qtbase-tbd-frameworks.patch | 15 - .../qtbase.patch.d/0014-aarch64-darwin.patch | 275 ---------- .../libraries/qt-5/modules/qtbase.nix | 24 +- 5 files changed, 19 insertions(+), 790 deletions(-) delete mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch delete mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch delete mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 240e914241ed..b94be6d893d2 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -28,15 +28,7 @@ let qtCompatVersion = srcs.qtbase.version; patches = { - qtbase = lib.optionals stdenv.hostPlatform.isDarwin [ - ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch - - # Patch framework detection to support X.framework/X.tbd, - # extending the current support for X.framework/X. - ./qtbase.patch.d/0012-qtbase-tbd-frameworks.patch - - ./qtbase.patch.d/0014-aarch64-darwin.patch - ] ++ [ + qtbase = [ ./qtbase.patch.d/0003-qtbase-mkspecs.patch ./qtbase.patch.d/0004-qtbase-replace-libdir.patch ./qtbase.patch.d/0005-qtbase-cmake.patch diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch deleted file mode 100644 index 9d2a47c7c348..000000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch +++ /dev/null @@ -1,485 +0,0 @@ -From 5ec1d1009d9943f20e82ffc087deabb31d447e75 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Milan=20P=C3=A4ssler?= -Date: Fri, 3 Apr 2020 21:07:58 +0200 -Subject: [PATCH 01/11] qtbase-mkspecs-mac - ---- - mkspecs/common/mac.conf | 2 +- - mkspecs/features/mac/default_post.prf | 206 -------------------------- - mkspecs/features/mac/default_pre.prf | 58 -------- - mkspecs/features/mac/sdk.mk | 25 ---- - mkspecs/features/mac/sdk.prf | 61 -------- - 5 files changed, 1 insertion(+), 351 deletions(-) - delete mode 100644 mkspecs/features/mac/sdk.mk - delete mode 100644 mkspecs/features/mac/sdk.prf - -diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf -index 61bea952b2..9909dae726 100644 ---- a/mkspecs/common/mac.conf -+++ b/mkspecs/common/mac.conf -@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ - - QMAKE_FIX_RPATH = install_name_tool -id - --QMAKE_LFLAGS_RPATH = -Wl,-rpath, -+QMAKE_LFLAGS_RPATH = - QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip - - QMAKE_LFLAGS_REL_RPATH = -diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index abc6d82ade..59b94fe5b6 100644 ---- a/mkspecs/features/mac/default_post.prf -+++ b/mkspecs/features/mac/default_post.prf -@@ -1,9 +1,5 @@ - load(default_post) - --# Recompute SDK version in case the user set it explicitly --sdk_version = $$QMAKE_MAC_SDK_VERSION --QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) -- - contains(TEMPLATE, .*app) { - !macx-xcode:if(isEmpty(BUILDS)|build_pass) { - # Detect changes to the platform SDK -@@ -16,36 +12,6 @@ contains(TEMPLATE, .*app) { - QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk) - } - -- # Detect incompatible SDK versions -- -- isEmpty(QT_MAC_SDK_VERSION_MIN): \ -- QT_MAC_SDK_VERSION_MIN = $$QT_MAC_SDK_VERSION -- -- !versionAtLeast(QMAKE_MAC_SDK_VERSION, $$QT_MAC_SDK_VERSION_MIN): \ -- warning("Qt requires at least version $$QT_MAC_SDK_VERSION_MIN of the platform SDK," \ -- "you're building against version $${QMAKE_MAC_SDK_VERSION}. Please upgrade.") -- -- !isEmpty(QT_MAC_SDK_VERSION_MAX) { -- # For Qt developers only -- !isEmpty($$list($$(QT_MAC_SDK_NO_VERSION_CHECK))): \ -- CONFIG += sdk_no_version_check -- -- QMAKE_MAC_SDK_MAJOR_VERSION = $$replace(QMAKE_MAC_SDK_VERSION, "(\\d+)(\\.\\d+)(\\.\\d+)?", \\1) -- -- !sdk_no_version_check:!versionAtMost(QMAKE_MAC_SDK_MAJOR_VERSION, $$QT_MAC_SDK_VERSION_MAX) { -- warning("Qt has only been tested with version $$QT_MAC_SDK_VERSION_MAX"\ -- "of the platform SDK, you're using $${QMAKE_MAC_SDK_MAJOR_VERSION}.") -- warning("This is an unsupported configuration. You may experience build issues," \ -- "and by using") -- warning("the $$QMAKE_MAC_SDK_VERSION SDK you are opting in to new features" \ -- "that Qt has not been prepared for.") -- -- warning("Please downgrade the SDK you use to build your app to version" \ -- "$$QT_MAC_SDK_VERSION_MAX, or configure") -- warning("with CONFIG+=sdk_no_version_check when running qmake" \ -- "to silence this warning.") -- } -- } - } - - !no_objective_c:CONFIG += objective_c -@@ -73,230 +39,6 @@ qt { - } - } - --# Add the same default rpaths as Xcode does for new projects. --# This is especially important for iOS/tvOS/watchOS where no other option is possible. --!no_default_rpath { -- uikit: QMAKE_RPATHDIR += @executable_path/Frameworks -- else: QMAKE_RPATHDIR += @executable_path/../Frameworks -- equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks --} -- --# Don't pass -headerpad_max_install_names when using Bitcode. --# In that case the linker emits a warning stating that the flag is ignored when --# used with bitcode, for reasons that cannot be determined (rdar://problem/20748962). --# Using this flag is also unnecessary in practice on UIKit platforms since they --# are sandboxed, and only UIKit platforms support bitcode to begin with. --!bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD -- --app_extension_api_only { -- QMAKE_CFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_CXXFLAGS_PRECOMPILE += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION --} -- --macos { -- !isEmpty(QMAKE_APPLE_DEVICE_ARCHS) { -- # If the user has requested a specific set of architectures, -- # build all of those by default, but limited to only those. -- CONFIG -= only_active_arch -- } else { -- # Otherwise allow building all of the architectures available -- # in Qt, but only build the active arch (unless the user has -- # manually overridden this via CONFIG -= only_active_arch). -- QMAKE_APPLE_DEVICE_ARCHS = $$QT_ARCHS -- } --} -- --macx-xcode { -- qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO -- !isEmpty(QMAKE_PKGINFO_TYPEINFO): \ -- qmake_pkginfo_typeinfo.value = $$QMAKE_PKGINFO_TYPEINFO -- else: \ -- qmake_pkginfo_typeinfo.value = "????" -- QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo -- -- bundle_version = $$VERSION -- isEmpty(bundle_version): bundle_version = 1.0.0 -- -- l = $$split(bundle_version, '.') 0 0 # make sure there are at least three -- VER_MAJ = $$member(l, 0, 0) -- VER_MIN = $$member(l, 1, 1) -- VER_PAT = $$member(l, 2, 2) -- unset(l) -- -- qmake_full_version.name = QMAKE_FULL_VERSION -- qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} -- QMAKE_MAC_XCODE_SETTINGS += qmake_full_version -- -- qmake_short_version.name = QMAKE_SHORT_VERSION -- qmake_short_version.value = $${VER_MAJ}.$${VER_MIN} -- QMAKE_MAC_XCODE_SETTINGS += qmake_short_version -- -- !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) { -- debug_information_format.name = DEBUG_INFORMATION_FORMAT -- debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT -- debug_information_format.build = debug -- QMAKE_MAC_XCODE_SETTINGS += debug_information_format -- } -- -- QMAKE_XCODE_ARCHS = -- -- arch_device.name = "ARCHS[sdk=$${device.sdk}*]" -- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS -- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS -- QMAKE_MAC_XCODE_SETTINGS += arch_device -- -- simulator { -- arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]" -- arch_simulator.value = $$QMAKE_APPLE_SIMULATOR_ARCHS -- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS -- QMAKE_MAC_XCODE_SETTINGS += arch_simulator -- } -- -- only_active_arch.name = ONLY_ACTIVE_ARCH -- only_active_arch.value = YES -- only_active_arch.build = debug -- QMAKE_MAC_XCODE_SETTINGS += only_active_arch --} else { -- device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS -- simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS -- VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS -- -- single_arch: VALID_ARCHS = $$first(VALID_ARCHS) -- -- macos { -- only_active_arch: DEFAULT_ARCHS = $$system("uname -m") -- else: DEFAULT_ARCHS = $$VALID_ARCHS -- } -- -- ARCHS = $(filter $(EXPORT_VALID_ARCHS), \ -- $(if $(ARCHS), $(ARCHS), \ -- $(if $(EXPORT_DEFAULT_ARCHS), $(EXPORT_DEFAULT_ARCHS), \ -- $(EXPORT_VALID_ARCHS)))) -- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ARCHS), $(EXPORT_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) -- -- QMAKE_EXTRA_VARIABLES += VALID_ARCHS DEFAULT_ARCHS ARCHS ARCH_ARGS -- -- arch_flags = $(EXPORT_ARCH_ARGS) -- -- QMAKE_CFLAGS += $$arch_flags -- QMAKE_CXXFLAGS += $$arch_flags -- QMAKE_LFLAGS += $$arch_flags -- -- QMAKE_PCH_ARCHS = $$VALID_ARCHS -- -- macos: deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET -- ios: deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET -- tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET -- watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET -- -- # If we're doing a simulator and device build, device and simulator -- # architectures use different paths and flags for the sysroot and -- # deployment target switch, so we must multiplex them across multiple -- # architectures using -Xarch. Otherwise we fall back to the simple path. -- # This is not strictly necessary, but results in cleaner command lines -- # and makes it easier for people to override EXPORT_VALID_ARCHS to limit -- # individual rules to a different set of architecture(s) from the overall -- # build (such as machtest in QtCore). -- simulator:device { -- QMAKE_XARCH_CFLAGS = -- QMAKE_XARCH_LFLAGS = -- QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS -- -- for (arch, VALID_ARCHS) { -- contains(VALID_SIMULATOR_ARCHS, $$arch) { -- sdk = $$simulator.sdk -- version_identifier = $$simulator.deployment_identifier -- } else { -- sdk = $$device.sdk -- version_identifier = $$device.deployment_identifier -- } -- -- version_min_flags = \ -- -Xarch_$${arch} \ -- -m$${version_identifier}-version-min=$$deployment_target -- QMAKE_XARCH_CFLAGS_$${arch} = $$version_min_flags \ -- -Xarch_$${arch} \ -- -isysroot$$xcodeSDKInfo(Path, $$sdk) -- QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \ -- -Xarch_$${arch} \ -- -isysroot$$xcodeSDKInfo(Path, $$sdk) -- -- QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch}) -- QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch}) -- -- QMAKE_EXTRA_VARIABLES += \ -- QMAKE_XARCH_CFLAGS_$${arch} \ -- QMAKE_XARCH_LFLAGS_$${arch} -- } -- -- QMAKE_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) -- QMAKE_CXXFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) -- QMAKE_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS) -- } else { -- simulator { -- version_identifier = $$simulator.deployment_identifier -- sysroot_path = $$xcodeSDKInfo(Path, $$simulator.sdk) -- } else { -- version_identifier = $$device.deployment_identifier -- sysroot_path = $$xcodeSDKInfo(Path, $$device.sdk) -- } -- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target -- QMAKE_CFLAGS += -isysroot $$sysroot_path $$version_min_flag -- QMAKE_CXXFLAGS += -isysroot $$sysroot_path $$version_min_flag -- QMAKE_LFLAGS += -isysroot $$sysroot_path $$version_min_flag -- } -- -- # Enable precompiled headers for multiple architectures -- QMAKE_CFLAGS_USE_PRECOMPILE = -- for (arch, VALID_ARCHS) { -- icc_pch_style: \ -- use_flag = "-pch-use " -- else: \ -- use_flag = -include -- -- # Only use Xarch with multi-arch, as the option confuses ccache -- count(VALID_ARCHS, 1, greaterThan): \ -- QMAKE_CFLAGS_USE_PRECOMPILE += \ -- -Xarch_$${arch} -- -- QMAKE_CFLAGS_USE_PRECOMPILE += \ -- $${use_flag}${QMAKE_PCH_OUTPUT_$${arch}} -- } -- icc_pch_style { -- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include ${QMAKE_PCH_INPUT} -- QMAKE_CFLAGS_USE_PRECOMPILE = -- } else { -- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- } -- -- QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT} --} -- --!equals(sdk_version, $$QMAKE_MAC_SDK_VERSION) { -- # Explicit SDK version has been set, respect that -- QMAKE_LFLAGS += -Wl,-sdk_version -Wl,$$sdk_version --} -- --cache(QMAKE_XCODE_DEVELOPER_PATH, stash) --!isEmpty(QMAKE_XCODE_VERSION): \ -- cache(QMAKE_XCODE_VERSION, stash) -- --QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() -- --xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER --xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX --isEmpty(xcode_product_bundle_identifier_setting.value): \ -- xcode_product_bundle_identifier_setting.value = "com.yourcompany" --xcode_product_bundle_target = $$QMAKE_BUNDLE --isEmpty(xcode_product_bundle_target): \ -- xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier} --xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}" --QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting -- - !macx-xcode { - generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS - generate_xcode_project.target = xcodeproj -diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index 2c91ba6679..a6ab233825 100644 ---- a/mkspecs/features/mac/default_pre.prf -+++ b/mkspecs/features/mac/default_pre.prf -@@ -21,61 +21,3 @@ macos { - } - - load(default_pre) -- --isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { -- # Get path of Xcode's Developer directory -- QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null") -- isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \ -- error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.") -- -- # Make sure Xcode path is valid -- !exists($$QMAKE_XCODE_DEVELOPER_PATH): \ -- error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") --} -- --isEmpty(QMAKE_XCODEBUILD_PATH): \ -- QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null") -- --!isEmpty(QMAKE_XCODEBUILD_PATH) { -- # Make sure Xcode is set up properly -- !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \ -- error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.") -- -- isEmpty(QMAKE_XCODE_VERSION) { -- # Extract Xcode version using xcodebuild -- xcode_version = $$system("/usr/bin/xcrun xcodebuild -version") -- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) -- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") -- unset(xcode_version) -- } --} -- --isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) { -- QMAKE_XCODE_PREFERENCES_FILE = $$(HOME)/Library/Preferences/com.apple.dt.Xcode.plist -- exists($$QMAKE_XCODE_PREFERENCES_FILE): \ -- QMAKE_TARGET_BUNDLE_PREFIX = $$system("/usr/libexec/PlistBuddy -c 'print IDETemplateOptions:bundleIdentifierPrefix' $$QMAKE_XCODE_PREFERENCES_FILE 2>/dev/null") -- -- !isEmpty(_QMAKE_CACHE_):!isEmpty(QMAKE_TARGET_BUNDLE_PREFIX): \ -- cache(QMAKE_TARGET_BUNDLE_PREFIX) --} -- --QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon -- --# Make the default debug info format for static debug builds --# DWARF instead of DWARF with dSYM. This cuts down build times --# for application debug builds significantly, as Xcode doesn't --# have to pull out all the DWARF info from the Qt static libs --# and put it into a dSYM file. We don't need that dSYM file in --# the first place, since the information is available in the --# object files inside the archives (static libraries). --macx-xcode:qtConfig(static): \ -- QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf -- --# This variable is used by the xcode_dynamic_library_suffix --# feature, which allows Xcode to choose the Qt libraries to link to --# at build time, depending on the current Xcode SDK and configuration. --QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX -- --xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP --xcode_copy_phase_strip_setting.value = NO --QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting -diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk ---- a/mkspecs/features/mac/sdk.mk -+++ b/mkspecs/features/mac/sdk.mk -@@ -1,27 +0,0 @@ -- --ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),) -- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>/dev/null -- CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND)) -- ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION)) -- # We don't want to complain about out of date SDK unless the target needs to be remade. -- # This covers use-cases such as running 'make check' after moving the build to a -- # computer without Xcode or with a different Xcode version. -- TARGET_UP_TO_DATE := $(shell QT_MAC_SDK_NO_VERSION_CHECK=1 $(MAKE) --question $(QMAKE_TARGET) && echo 1 || echo 0) -- ifeq ($(TARGET_UP_TO_DATE),0) -- ifneq ($(findstring missing DEVELOPER_DIR path,$(CURRENT_MAC_SDK_VERSION)),) -- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) is no longer valid.) -- else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),) -- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.) -- else ifneq ($(CURRENT_MAC_SDK_VERSION),) -- $(info The $(EXPORT_QMAKE_MAC_SDK) platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) -- else -- $(info Unknown error resolving current platform SDK version.) -- endif -- $(info This requires a fresh build of your project. Please wipe the build directory) -- ifneq ($(EXPORT__QMAKE_STASH_),) -- $(info including the qmake cache in $(EXPORT__QMAKE_STASH_)) -- endif -- $(error ^) -- endif -- endif --endif -diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -deleted file mode 100644 -index 3a9c2778bb..0000000000 ---- a/mkspecs/features/mac/sdk.prf -+++ /dev/null -@@ -1,61 +0,0 @@ -- --isEmpty(QMAKE_MAC_SDK): \ -- error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") -- --contains(QMAKE_MAC_SDK, .*/.*): \ -- error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)") -- --defineReplace(xcodeSDKInfo) { -- info = $$1 -- equals(info, "Path"): \ -- infoarg = --show-sdk-path -- equals(info, "PlatformPath"): \ -- infoarg = --show-sdk-platform-path -- equals(info, "SDKVersion"): \ -- infoarg = --show-sdk-version -- sdk = $$2 -- isEmpty(sdk): \ -- sdk = $$QMAKE_MAC_SDK -- -- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { -- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$infoarg 2>/dev/null") -- # --show-sdk-platform-path won't work for Command Line Tools; this is fine -- # only used by the XCTest backend to testlib -- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(infoarg, "--show-sdk-platform-path")): \ -- error("Could not resolve SDK $$info for \'$$sdk\' using $$infoarg") -- cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) -- } -- -- return($$eval(QMAKE_MAC_SDK.$${sdk}.$${info})) --} -- --QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path) --QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath) --QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) -- --isEmpty(QMAKE_EXPORT_INCDIR_OPENGL) { -- QMAKE_EXPORT_INCDIR_OPENGL = $$QMAKE_INCDIR_OPENGL -- sysrootified = -- for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val -- QMAKE_INCDIR_OPENGL = $$sysrootified --} -- --QMAKESPEC_NAME = $$basename(QMAKESPEC) -- --# Resolve SDK version of various tools --for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL QMAKE_LINK_C QMAKE_LINK_C_SHLIB)) { -- tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool} -- !isEmpty($$tool_variable) { -- $$tool = $$eval($$tool_variable) -- next() -- } -- -- value = $$eval($$tool) -- isEmpty(value): next() -- -- sysrooted = $$system("/usr/bin/xcrun -sdk $$QMAKE_MAC_SDK -find $$first(value) 2>/dev/null") -- isEmpty(sysrooted): next() -- -- $$tool = $$sysrooted $$member(value, 1, -1) -- cache($$tool_variable, set stash, $$tool) --} -diff --git a/mkspecs/features/mac/toolchain.prf b/mkspecs/features/mac/toolchain.prf -deleted file mode 100644 -index df191eb13c..0000000000 ---- a/mkspecs/features/mac/toolchain.prf -+++ /dev/null -@@ -1,5 +0,0 @@ --# Ensure that we process sdk.prf first, as it will update QMAKE_CXX, --# which the default path determination uses. --sdk: load(sdk) -- --load(toolchain) diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch deleted file mode 100644 index 8a5939978a6b..000000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0012-qtbase-tbd-frameworks.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 84dbbfebd4..615bfed124 100644 ---- a/src/gui/Qt5GuiConfigExtras.cmake.in -+++ b/src/gui/Qt5GuiConfigExtras.cmake.in -@@ -119,6 +119,10 @@ macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs) - if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}") - set(Qt5Gui_${_cmake_lib_name}_LIBRARY) - endif() -+ set(Qt5Gui_${_cmake_lib_name}_LIBRARY "${Qt5Gui_${_cmake_lib_name}_LIBRARY}/${_lib}.tbd") -+ if (NOT EXISTS "${Qt5Gui_${_cmake_lib_name}_LIBRARY}") -+ set(Qt5Gui_${_cmake_lib_name}_LIBRARY) -+ endif() - !!ENDIF - if (NOT Qt5Gui_${_cmake_lib_name}_LIBRARY) - # The above find_library call doesn\'t work for finding diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch deleted file mode 100644 index f0809f8f9a3f..000000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch +++ /dev/null @@ -1,275 +0,0 @@ -From abc52460201bc5c7603505bb187138b0c59291aa Mon Sep 17 00:00:00 2001 -From: Mushroom -Date: Sun, 20 Dec 2020 00:11:41 +0000 -Subject: [PATCH] [QtBase] Split macOS platforms by architecture - -Currently macOS only has one platform, which forces the default arch to -x86_64. This patch splits the platforms by architecture, and defaults to -the same as the host. - -This stops M1-based macs from compiling x64 binaries by default, -instead making them compile native binaries. - -[ChangeLog][QtBase][Platform Specific Changes][OS X] Split macOS -platforms so it doesn't default to the x64 architecture every time - -Change-Id: I34891b107bb24f68371df1c8f087eb0ad5b5dd95 ---- - configure | 9 +++- - .../clang-macx-desktop.conf} | 8 ++-- - mkspecs/common/macx.conf | 1 - - .../Info.plist.app | 0 - .../Info.plist.dSYM.in | 0 - .../Info.plist.disable_highdpi | 0 - .../Info.plist.lib | 0 - mkspecs/macx-clang-arm64/qmake.conf | 7 ++++ - .../qplatformdefs.h | 0 - mkspecs/macx-clang-x64/Info.plist.app | 24 +++++++++++ - mkspecs/macx-clang-x64/Info.plist.dSYM.in | 18 ++++++++ - .../macx-clang-x64/Info.plist.disable_highdpi | 8 ++++ - mkspecs/macx-clang-x64/Info.plist.lib | 20 +++++++++ - mkspecs/macx-clang-x64/qmake.conf | 7 ++++ - mkspecs/macx-clang-x64/qplatformdefs.h | 41 +++++++++++++++++++ - 15 files changed, 137 insertions(+), 6 deletions(-) - rename mkspecs/{macx-clang/qmake.conf => common/clang-macx-desktop.conf} (83%) - rename mkspecs/{macx-clang => macx-clang-arm64}/Info.plist.app (100%) - rename mkspecs/{macx-clang => macx-clang-arm64}/Info.plist.dSYM.in (100%) - rename mkspecs/{macx-clang => macx-clang-arm64}/Info.plist.disable_highdpi (100%) - rename mkspecs/{macx-clang => macx-clang-arm64}/Info.plist.lib (100%) - create mode 100644 mkspecs/macx-clang-arm64/qmake.conf - rename mkspecs/{macx-clang => macx-clang-arm64}/qplatformdefs.h (100%) - create mode 100644 mkspecs/macx-clang-x64/Info.plist.app - create mode 100644 mkspecs/macx-clang-x64/Info.plist.dSYM.in - create mode 100644 mkspecs/macx-clang-x64/Info.plist.disable_highdpi - create mode 100644 mkspecs/macx-clang-x64/Info.plist.lib - create mode 100644 mkspecs/macx-clang-x64/qmake.conf - create mode 100644 mkspecs/macx-clang-x64/qplatformdefs.h - -diff --git a/configure b/configure -index b6c9b462f24..a86f2ceaa5b 100755 ---- a/configure -+++ b/configure -@@ -556,7 +556,14 @@ PLATFORM_NOTES= - if [ -z "$PLATFORM" ]; then - case "$UNAME_SYSTEM:$UNAME_RELEASE" in - Darwin:*) -- PLATFORM=macx-clang -+ case "$UNAME_MACHINE" in -+ arm64) -+ PLATFORM=macx-clang-arm64 -+ ;; -+ *) -+ PLATFORM=macx-clang-x64 -+ ;; -+ esac - ;; - AIX:*) - #PLATFORM=aix-g++ -diff --git a/mkspecs/macx-clang/qmake.conf b/mkspecs/common/clang-macx-desktop.conf -similarity index 83% -rename from mkspecs/macx-clang/qmake.conf -rename to mkspecs/common/clang-macx-desktop.conf -index 0cf1f31b60d..042319a2aa3 100644 ---- a/mkspecs/macx-clang/qmake.conf -+++ b/mkspecs/common/clang-macx-desktop.conf -@@ -24,9 +24,9 @@ QMAKE_LIBS_X11 = -lX11 -lXext -lm - QMAKE_LIBDIR_X11 = /opt/X11/lib - QMAKE_INCDIR_X11 = /opt/X11/include - --include(../common/macx.conf) --include(../common/gcc-base-mac.conf) --include(../common/clang.conf) --include(../common/clang-mac.conf) -+include(macx.conf) -+include(gcc-base-mac.conf) -+include(clang.conf) -+include(clang-mac.conf) - - load(qt_config) -diff --git a/mkspecs/macx-clang/Info.plist.app b/mkspecs/macx-clang-arm64/Info.plist.app -similarity index 100% -rename from mkspecs/macx-clang/Info.plist.app -rename to mkspecs/macx-clang-arm64/Info.plist.app -diff --git a/mkspecs/macx-clang/Info.plist.dSYM.in b/mkspecs/macx-clang-arm64/Info.plist.dSYM.in -similarity index 100% -rename from mkspecs/macx-clang/Info.plist.dSYM.in -rename to mkspecs/macx-clang-arm64/Info.plist.dSYM.in -diff --git a/mkspecs/macx-clang/Info.plist.disable_highdpi b/mkspecs/macx-clang-arm64/Info.plist.disable_highdpi -similarity index 100% -rename from mkspecs/macx-clang/Info.plist.disable_highdpi -rename to mkspecs/macx-clang-arm64/Info.plist.disable_highdpi -diff --git a/mkspecs/macx-clang/Info.plist.lib b/mkspecs/macx-clang-arm64/Info.plist.lib -similarity index 100% -rename from mkspecs/macx-clang/Info.plist.lib -rename to mkspecs/macx-clang-arm64/Info.plist.lib -diff --git a/mkspecs/macx-clang-arm64/qmake.conf b/mkspecs/macx-clang-arm64/qmake.conf -new file mode 100644 -index 00000000000..0cc2361e696 ---- /dev/null -+++ b/mkspecs/macx-clang-arm64/qmake.conf -@@ -0,0 +1,7 @@ -+# -+# qmake configuration for Clang on OS X (arm64) -+# -+ -+QMAKE_APPLE_DEVICE_ARCHS=arm64 -+ -+include(../common/clang-macx-desktop.conf) -diff --git a/mkspecs/macx-clang/qplatformdefs.h b/mkspecs/macx-clang-arm64/qplatformdefs.h -similarity index 100% -rename from mkspecs/macx-clang/qplatformdefs.h -rename to mkspecs/macx-clang-arm64/qplatformdefs.h -diff --git a/mkspecs/macx-clang-x64/Info.plist.app b/mkspecs/macx-clang-x64/Info.plist.app -new file mode 100644 -index 00000000000..fa592af0897 ---- /dev/null -+++ b/mkspecs/macx-clang-x64/Info.plist.app -@@ -0,0 +1,24 @@ -+ -+ -+ -+ -+ CFBundleExecutable -+ ${EXECUTABLE_NAME} -+ CFBundleIconFile -+ ${ASSETCATALOG_COMPILER_APPICON_NAME} -+ CFBundleIdentifier -+ ${PRODUCT_BUNDLE_IDENTIFIER} -+ CFBundlePackageType -+ APPL -+ CFBundleSignature -+ ${QMAKE_PKGINFO_TYPEINFO} -+ LSMinimumSystemVersion -+ ${MACOSX_DEPLOYMENT_TARGET} -+ NOTE -+ This file was generated by Qt/QMake. -+ NSPrincipalClass -+ NSApplication -+ NSSupportsAutomaticGraphicsSwitching -+ -+ -+ -diff --git a/mkspecs/macx-clang-x64/Info.plist.dSYM.in b/mkspecs/macx-clang-x64/Info.plist.dSYM.in -new file mode 100644 -index 00000000000..a8c8d0d4fb5 ---- /dev/null -+++ b/mkspecs/macx-clang-x64/Info.plist.dSYM.in -@@ -0,0 +1,18 @@ -+ -+ -+ -+ -+ CFBundleIdentifier -+ com.apple.xcode.dsym.$${BUNDLEIDENTIFIER} -+ CFBundlePackageType -+ dSYM -+ CFBundleSignature -+ ???? -+!!IF !isEmpty(VERSION) -+ CFBundleShortVersionString -+ $${VER_MAJ}.$${VER_MIN} -+ CFBundleVersion -+ $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} -+!!ENDIF -+ -+ -diff --git a/mkspecs/macx-clang-x64/Info.plist.disable_highdpi b/mkspecs/macx-clang-x64/Info.plist.disable_highdpi -new file mode 100644 -index 00000000000..a9b89888ad4 ---- /dev/null -+++ b/mkspecs/macx-clang-x64/Info.plist.disable_highdpi -@@ -0,0 +1,8 @@ -+ -+ -+ -+ -+ NSHighResolutionCapable -+ NO -+ -+ -diff --git a/mkspecs/macx-clang-x64/Info.plist.lib b/mkspecs/macx-clang-x64/Info.plist.lib -new file mode 100644 -index 00000000000..34752ec40d9 ---- /dev/null -+++ b/mkspecs/macx-clang-x64/Info.plist.lib -@@ -0,0 +1,20 @@ -+ -+ -+ -+ -+ CFBundleExecutable -+ ${EXECUTABLE_NAME} -+ CFBundleIdentifier -+ ${PRODUCT_BUNDLE_IDENTIFIER} -+ CFBundlePackageType -+ FMWK -+ CFBundleShortVersionString -+ ${QMAKE_SHORT_VERSION} -+ CFBundleSignature -+ ${QMAKE_PKGINFO_TYPEINFO} -+ CFBundleVersion -+ ${QMAKE_FULL_VERSION} -+ NOTE -+ Please, do NOT change this file -- It was generated by Qt/QMake. -+ -+ -diff --git a/mkspecs/macx-clang-x64/qmake.conf b/mkspecs/macx-clang-x64/qmake.conf -new file mode 100644 -index 00000000000..1ac373b53b4 ---- /dev/null -+++ b/mkspecs/macx-clang-x64/qmake.conf -@@ -0,0 +1,7 @@ -+# -+# qmake configuration for Clang on OS X (arm64) -+# -+ -+QMAKE_APPLE_DEVICE_ARCHS=x86_64 -+ -+include(../common/clang-macx-desktop.conf) -diff --git a/mkspecs/macx-clang-x64/qplatformdefs.h b/mkspecs/macx-clang-x64/qplatformdefs.h -new file mode 100644 -index 00000000000..063491dd900 ---- /dev/null -+++ b/mkspecs/macx-clang-x64/qplatformdefs.h -@@ -0,0 +1,41 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2016 The Qt Company Ltd. -+** Contact: https://www.qt.io/licensing/ -+** -+** This file is part of the qmake spec of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see https://www.qt.io/terms-conditions. For further -+** information use the contact form at https://www.qt.io/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 3 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL3 included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 3 requirements -+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 2.0 or (at your option) the GNU General -+** Public license version 3 or any later version approved by the KDE Free -+** Qt Foundation. The licenses are as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -+** included in the packaging of this file. Please review the following -+** information to ensure the GNU General Public License requirements will -+** be met: https://www.gnu.org/licenses/gpl-2.0.html and -+** https://www.gnu.org/licenses/gpl-3.0.html. -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+#include "../common/mac/qplatformdefs.h" -+ diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 0dadaeeaf916..7f9b1461e3c5 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -146,13 +146,24 @@ stdenv.mkDerivation (finalAttrs: ({ patchShebangs ./bin '' + ( if stdenv.hostPlatform.isDarwin then '' + for file in \ + configure \ + mkspecs/features/mac/asset_catalogs.prf \ + mkspecs/features/mac/default_pre.prf \ + mkspecs/features/mac/sdk.mk \ + mkspecs/features/mac/sdk.prf + do + substituteInPlace "$file" \ + --replace-quiet /usr/bin/xcode-select '${lib.getExe' xcbuild "xcode-select"}' \ + --replace-quiet /usr/bin/xcrun '${lib.getExe' xcbuild "xcrun"}' \ + --replace-quiet /usr/libexec/PlistBuddy '${lib.getExe' xcbuild "PlistBuddy"}' + done + substituteInPlace configure \ - --replace-fail '/usr/bin/xcode-select' '${lib.getBin xcbuild}/bin/xcode-select' \ - --replace-fail '/usr/bin/xcrun' '${lib.getBin xcbuild}/bin/xcrun' \ - --replace-fail '/System/Library/Frameworks/Cocoa.framework' "$SDKROOT/System/Library/Frameworks/Cocoa.framework" - substituteInPlace ./mkspecs/common/mac.conf \ - --replace-fail "/System/Library/Frameworks/OpenGL.framework/" "$SDKROOT/System/Library/Frameworks/OpenGL.framework/" \ - --replace-fail "/System/Library/Frameworks/AGL.framework/" "$SDKROOT/System/Library/Frameworks/AGL.framework/" + --replace-fail /System/Library/Frameworks/Cocoa.framework "$SDKROOT/System/Library/Frameworks/Cocoa.framework" + + substituteInPlace mkspecs/common/macx.conf \ + --replace-fail 'CONFIG += ' 'CONFIG += no_default_rpath ' '' else lib.optionalString libGLSupported '' sed -i mkspecs/common/linux.conf \ -e "/^QMAKE_INCDIR_OPENGL/ s|$|${lib.getDev libGL}/include|" \ @@ -326,6 +337,7 @@ stdenv.mkDerivation (finalAttrs: ({ "-qt-freetype" "-qt-libpng" "-no-framework" + "-no-rpath" ] else [ "-rpath" ] ++ [ From 3be309eff11e2eb677199997cb653b1358ccd5fd Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 28 Oct 2024 18:59:35 +0000 Subject: [PATCH 188/617] libsForQt5.qtbase: use the macOS 13 SDK --- pkgs/development/libraries/qt-5/modules/qtbase.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 7f9b1461e3c5..0d2827a219ef 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -4,7 +4,7 @@ , coreutils, bison, flex, gdb, gperf, lndir, perl, pkg-config, python3 , which # darwin support -, darwinMinVersionHook, apple-sdk, apple-sdk_10_14, apple-sdk_14, xcbuild +, darwinMinVersionHook, apple-sdk, apple-sdk_10_14, apple-sdk_13, xcbuild , dbus, fontconfig, freetype, glib, harfbuzz, icu, libdrm, libX11, libXcomposite , libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng , libxcb @@ -38,12 +38,14 @@ let then "linux-generic-g++" else throw "Please add a qtPlatformCross entry for ${plat.config}"; - # Per https://doc.qt.io/qt-5/macos.html#supported-versions: deployment target = 10.13, build SDK = 14.x. + # Per https://doc.qt.io/qt-5/macos.html#supported-versions: deployment target = 10.13, build SDK = 13.x or 14.x. + # Despite advertising support for the macOS 14 SDK, the build system sets the maximum to 13 and complains + # about 14, so we just use that. # Note that Qt propagates the 10.14 SDK instead of the 10.13 SDK to make sure that applications linked to Qt # support automatic dark mode on x86_64-darwin (see: https://developer.apple.com/documentation/appkit/nsappearancecustomization/choosing_a_specific_appearance_for_your_macos_app). propagatedAppleSDK = if lib.versionOlder (lib.getVersion apple-sdk) "10.14" then apple-sdk_10_14 else apple-sdk; propagatedMinVersionHook = darwinMinVersionHook "10.13"; - buildAppleSDK = apple-sdk_14; + buildAppleSDK = apple-sdk_13; in stdenv.mkDerivation (finalAttrs: ({ From 38316856843f2d95aea429faec9357f0a5f122bb Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 28 Oct 2024 18:59:35 +0000 Subject: [PATCH 189/617] libsForQt5.qtbase: override the Darwin deployment target correctly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There might be a nicer way to do this, but I don’t understand qmake. --- pkgs/development/libraries/qt-5/modules/qtbase.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 0d2827a219ef..748d4d1e0386 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -44,7 +44,8 @@ let # Note that Qt propagates the 10.14 SDK instead of the 10.13 SDK to make sure that applications linked to Qt # support automatic dark mode on x86_64-darwin (see: https://developer.apple.com/documentation/appkit/nsappearancecustomization/choosing_a_specific_appearance_for_your_macos_app). propagatedAppleSDK = if lib.versionOlder (lib.getVersion apple-sdk) "10.14" then apple-sdk_10_14 else apple-sdk; - propagatedMinVersionHook = darwinMinVersionHook "10.13"; + deploymentTarget = "10.13"; + propagatedMinVersionHook = darwinMinVersionHook deploymentTarget; buildAppleSDK = apple-sdk_13; in @@ -165,7 +166,10 @@ stdenv.mkDerivation (finalAttrs: ({ --replace-fail /System/Library/Frameworks/Cocoa.framework "$SDKROOT/System/Library/Frameworks/Cocoa.framework" substituteInPlace mkspecs/common/macx.conf \ - --replace-fail 'CONFIG += ' 'CONFIG += no_default_rpath ' + --replace-fail 'CONFIG += ' 'CONFIG += no_default_rpath ' \ + --replace-fail \ + 'QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13' \ + 'QMAKE_MACOSX_DEPLOYMENT_TARGET = ${deploymentTarget}' '' else lib.optionalString libGLSupported '' sed -i mkspecs/common/linux.conf \ -e "/^QMAKE_INCDIR_OPENGL/ s|$|${lib.getDev libGL}/include|" \ From 951e05b4b794511edc00cae63f5a6f03d2b6f831 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Fri, 25 Oct 2024 19:51:07 +0200 Subject: [PATCH 190/617] serd: set license as ISC instead of MIT According to the top-level COPYING, ISC is the right license to use. --- pkgs/development/libraries/serd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 51e1f0264805..ab7002c2c586 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -51,12 +51,12 @@ stdenv.mkDerivation rec { ''; }; - meta = with lib; { + meta = { description = "Lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples"; homepage = "https://drobilla.net/software/serd"; - license = licenses.mit; + license = lib.licenses.isc; maintainers = [ ]; mainProgram = "serdi"; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } From de26abe63b3401b943aa7003a31177a8caadc054 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Fri, 25 Oct 2024 19:52:04 +0200 Subject: [PATCH 191/617] serd: set myself as maintainer --- pkgs/development/libraries/serd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index ab7002c2c586..23accbcfbe6b 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { description = "Lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples"; homepage = "https://drobilla.net/software/serd"; license = lib.licenses.isc; - maintainers = [ ]; + maintainers = with lib.maintainers; [ samueltardieu ]; mainProgram = "serdi"; platforms = lib.platforms.unix; }; From 607282c12a5d8b1db0da9ef35f5bb25f50e05f2b Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Fri, 25 Oct 2024 16:35:59 +0200 Subject: [PATCH 192/617] =?UTF-8?q?serd:=200.30.16=20=E2=86=92=200.32.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/serd/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 23accbcfbe6b..fd556b40f1cb 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -8,18 +8,19 @@ , pkg-config , python3 , sphinx +, sphinxygen , writeScript }: stdenv.mkDerivation rec { pname = "serd"; - version = "0.30.16"; + version = "0.32.2"; outputs = [ "out" "dev" "doc" "man" ]; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.xz"; - hash = "sha256-9Q9IbaUZzdjQOyDJ5CQU5FkTP1okRBHY5jyu+NmskUY="; + hash = "sha256-333CyW8rod7P11bkWOBh3tfYFY0lVVTnaTSDrAljxWs="; }; nativeBuildInputs = [ @@ -30,6 +31,7 @@ stdenv.mkDerivation rec { pkg-config python3 sphinx + sphinxygen ]; postPatch = '' From 3cd9ca4ee169ec1f0fecbaf1e332e189ad4afc4c Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Fri, 25 Oct 2024 16:42:45 +0200 Subject: [PATCH 193/617] serd: reformat file --- pkgs/development/libraries/serd/default.nix | 32 ++++++++++++--------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index fd556b40f1cb..750591e0f2e2 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -1,22 +1,28 @@ -{ lib -, stdenv -, fetchurl -, doxygen -, mandoc -, meson -, ninja -, pkg-config -, python3 -, sphinx -, sphinxygen -, writeScript +{ + lib, + stdenv, + fetchurl, + doxygen, + mandoc, + meson, + ninja, + pkg-config, + python3, + sphinx, + sphinxygen, + writeScript, }: stdenv.mkDerivation rec { pname = "serd"; version = "0.32.2"; - outputs = [ "out" "dev" "doc" "man" ]; + outputs = [ + "out" + "dev" + "doc" + "man" + ]; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.xz"; From 47dc341f33e3a654f21c6467ae013eac5d088b80 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 29 Oct 2024 07:00:36 +0000 Subject: [PATCH 194/617] mercurial: 6.8.1 -> 6.8.2 --- pkgs/applications/version-management/mercurial/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 5a790ff3f4d3..fd41363e1650 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -21,11 +21,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - hash = "sha256-Aw6Kem1ZDk6utAPuJWdWFc2A0jbzq4oLVtzIQYEViwU="; + hash = "sha256-qsYYEGdorR7ZdsP+fIZZ/smebwtTN+pupVT66EkMT04="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - hash = "sha256-i5AVyi9m7qLLubhV8fBhhZ6/RYOjMdwmv9Bek9pT/xo="; + hash = "sha256-/HjgGtjKfLLufEqyT7xHYIlC5xnVunYoA+H1xLS1bVw="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; From 7e8b51b0971b93b409a7384b9b2a8a19a62300ba Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 29 Oct 2024 07:15:29 +0000 Subject: [PATCH 195/617] libopenmpt: 0.7.10 -> 0.7.11 Changes: https://lib.openmpt.org/libopenmpt/2024/10/26/releases-0.7.11-0.6.20-0.5.34-0.4.46/ --- pkgs/development/libraries/audio/libopenmpt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/libopenmpt/default.nix b/pkgs/development/libraries/audio/libopenmpt/default.nix index fe301ae859ba..327ce1100c88 100644 --- a/pkgs/development/libraries/audio/libopenmpt/default.nix +++ b/pkgs/development/libraries/audio/libopenmpt/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libopenmpt"; - version = "0.7.10"; + version = "0.7.11"; outputs = [ "out" "dev" "bin" ]; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - hash = "sha256-CTcTwcECT08QxHeaZs6yr1H7fJCKnpn+uJLQQBkiC6E="; + hash = "sha256-U6eYuMbi4faV6K0F6ToMG1MZnlqpmBg3xBaWs3BSB2c="; }; enableParallelBuilding = true; From d08e607506d41a59fa49bcca7c6e870f5e330f14 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Oct 2024 08:40:04 +0000 Subject: [PATCH 196/617] libimobiledevice-glue: 1.3.0 -> 1.3.1 --- pkgs/development/libraries/libimobiledevice-glue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libimobiledevice-glue/default.nix b/pkgs/development/libraries/libimobiledevice-glue/default.nix index 13a2e83d0473..99eb6c3cede0 100644 --- a/pkgs/development/libraries/libimobiledevice-glue/default.nix +++ b/pkgs/development/libraries/libimobiledevice-glue/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libimobiledevice-glue"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; rev = version; - hash = "sha256-+poCrn2YHeH8RQCfWDdnlmJB4Nf+unWUVwn7YwILHIs="; + hash = "sha256-Fu0zQIryESRaTGzDlAaewX9Yo2nPEeUxmcb3yPJLuSI="; }; preAutoreconf = '' From e24121ec205cef4cf69c15408ef57f95559f6f15 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 17 Sep 2024 21:55:33 +0200 Subject: [PATCH 197/617] postgresqlPackages: replace custom installPhase with buildPostgresqlExtension helper --- .../postgresql/buildPostgresqlExtension.nix | 129 ++++++++++++++++++ pkgs/servers/sql/postgresql/ext/age.nix | 12 +- .../servers/sql/postgresql/ext/anonymizer.nix | 15 +- .../postgresql/ext/apache_datasketches.nix | 31 +---- pkgs/servers/sql/postgresql/ext/citus.nix | 18 +-- .../servers/sql/postgresql/ext/cstore_fdw.nix | 13 +- pkgs/servers/sql/postgresql/ext/h3-pg.nix | 11 +- pkgs/servers/sql/postgresql/ext/hypopg.nix | 12 +- .../sql/postgresql/ext/jsonb_deep_sum.nix | 14 +- pkgs/servers/sql/postgresql/ext/lantern.nix | 14 +- pkgs/servers/sql/postgresql/ext/periods.nix | 12 +- .../sql/postgresql/ext/pg_auto_failover.nix | 13 +- pkgs/servers/sql/postgresql/ext/pg_bigm.nix | 12 +- pkgs/servers/sql/postgresql/ext/pg_cron.nix | 14 +- .../servers/sql/postgresql/ext/pg_ed25519.nix | 15 +- .../sql/postgresql/ext/pg_embedding.nix | 12 +- .../sql/postgresql/ext/pg_hint_plan.nix | 12 +- pkgs/servers/sql/postgresql/ext/pg_hll.nix | 12 +- pkgs/servers/sql/postgresql/ext/pg_ivm.nix | 12 +- .../sql/postgresql/ext/pg_libversion.nix | 14 +- pkgs/servers/sql/postgresql/ext/pg_net.nix | 14 +- .../servers/sql/postgresql/ext/pg_partman.nix | 15 +- .../sql/postgresql/ext/pg_rational.nix | 17 +-- .../sql/postgresql/ext/pg_relusage.nix | 12 +- pkgs/servers/sql/postgresql/ext/pg_repack.nix | 11 +- .../sql/postgresql/ext/pg_roaringbitmap.nix | 14 +- .../sql/postgresql/ext/pg_safeupdate.nix | 10 +- .../sql/postgresql/ext/pg_similarity.nix | 11 +- .../servers/sql/postgresql/ext/pg_squeeze.nix | 18 +-- pkgs/servers/sql/postgresql/ext/pg_topn.nix | 14 +- pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix | 10 +- pkgs/servers/sql/postgresql/ext/pgaudit.nix | 12 +- pkgs/servers/sql/postgresql/ext/pgjwt.nix | 10 +- pkgs/servers/sql/postgresql/ext/pgmq.nix | 14 +- pkgs/servers/sql/postgresql/ext/pgroonga.nix | 16 +-- pkgs/servers/sql/postgresql/ext/pgrouting.nix | 12 +- pkgs/servers/sql/postgresql/ext/pgsodium.nix | 14 +- .../servers/sql/postgresql/ext/pgsql-http.nix | 12 +- pkgs/servers/sql/postgresql/ext/pgtap.nix | 7 +- pkgs/servers/sql/postgresql/ext/pgvector.nix | 12 +- .../sql/postgresql/ext/plpgsql_check.nix | 12 +- pkgs/servers/sql/postgresql/ext/plr.nix | 11 +- .../sql/postgresql/ext/plv8/default.nix | 17 +-- pkgs/servers/sql/postgresql/ext/postgis.nix | 29 ++-- pkgs/servers/sql/postgresql/ext/repmgr.nix | 14 +- pkgs/servers/sql/postgresql/ext/rum.nix | 11 +- pkgs/servers/sql/postgresql/ext/smlar.nix | 12 +- .../sql/postgresql/ext/system_stats.nix | 17 +-- pkgs/servers/sql/postgresql/ext/tds_fdw.nix | 13 +- .../sql/postgresql/ext/temporal_tables.nix | 12 +- .../sql/postgresql/ext/timescaledb.nix | 6 +- .../sql/postgresql/ext/tsearch_extras.nix | 11 +- pkgs/servers/sql/postgresql/ext/tsja.nix | 1 - pkgs/servers/sql/postgresql/ext/wal2json.nix | 10 +- pkgs/servers/sql/postgresql/generic.nix | 1 + 55 files changed, 261 insertions(+), 568 deletions(-) create mode 100644 pkgs/servers/sql/postgresql/buildPostgresqlExtension.nix diff --git a/pkgs/servers/sql/postgresql/buildPostgresqlExtension.nix b/pkgs/servers/sql/postgresql/buildPostgresqlExtension.nix new file mode 100644 index 000000000000..87847c368eba --- /dev/null +++ b/pkgs/servers/sql/postgresql/buildPostgresqlExtension.nix @@ -0,0 +1,129 @@ +# PostgreSQL's build system for extensions (PGXS) makes the following assumptions: +# - All extensions will be installed in the same prefix as PostgreSQL itself. +# - pg_config is able to return the correct paths for bindir/libdir/datadir etc. +# +# Both of those assumptions break with nix. Since each extension is a separate +# derivation, we need to put all its files into a different folder. At the same +# time, pg_config only points to the PostgreSQL derivation's paths. +# +# When building extensions, the paths provided by pg_config are used for two +# purposes: +# - To find postgres libs and headers and reference those paths via -L and -I flags. +# - To determine the correct install directory. +# +# The PGXS Makefiles also support an environment variable DESTDIR, which is added as +# a prefix to all install locations. This is primarily used for temporary installs +# while running the test suite. Since pg_config returns absolute paths to /nix/store +# for us, using DESTDIR will result in install locations of the form: +# $DESTIDR/nix/store//... +# +# In multiple iterations, the following approaches have been tried to work around all +# of this: +# 1. For a long time, all extensions in nixpkgs just overwrote the installPhase +# and moved the respective files to the correct location manually. This approach +# is not maintainable, because whenever upstream adds a new file, we'd have to +# make sure the file is correctly installed as well. Additionally, it makes adding +# a new extension harder than it should be. +# +# 2. A wrapper around pg_config could just replace the returned paths with paths to +# $out of currently building derivation, i.e. the extension. This works for install- +# ation, but breaks for any of the libs and headers the extension needs from postgres +# itself. +# +# 3. A variation of 2., but make the pg_config wrapper only return the changed paths +# during the installPahse. During configure and build, it would return the regular +# paths to the PostgreSQL derivation. This works better, but not for every case. +# Some extensions try to be smarter and search for the "postgres" binary to deduce +# the necessary paths from that. Those would still need special handling. +# +# 4. Use the fact that DESTDIR is prepended to every installation directory - and only +# there, to run a replacement of all Makefiles in postgres' lib/pgxs/ folder and +# all Makefiles in the extension's source. "$DESTDIR/$bindir" can be replaced with +# "$out/bin" etc. - thus mapping the installPhase directly into the right output. +# This works beautifully - for the majority of cases. But it doesn't work for +# some extensions that use CMake. And it doesn't work for some extensions that use +# custom variables instead of the default "bindir" and friends. +# +# 5. Just set DESTDIR to the extensions's output and then clean up afterward. This will +# result in paths like this: +# /nix/store//nix/store//... +# Directly after the installPhase, we'll move the files in the right folder. +# This seems to work consistently across all extensions we have in nixpkgs right now. +# Of course, it would break down for any extension that doesn't support DESTDIR - +# but that just means PGXS is not used either, so that's OK. +# +# This last approach is the one we're taking in this file. To make sure the removal of the +# nested nix/store happens immediately after the installPhase, before any other postInstall +# hooks run, this needs to be run in an override of `mkDerivation` and not in a setup hook. + +{ + lib, + stdenv, + postgresql, +}: + +args: + +let + buildPostgresqlExtension = finalAttrs: prevAttrs: { + buildInputs = [ postgresql ] ++ prevAttrs.buildInputs or [ ]; + + installFlags = [ + "DESTDIR=${placeholder "out"}" + ] ++ prevAttrs.installFlags or [ ]; + + postInstall = + '' + # DESTDIR + pg_config install the files into + # /nix/store//nix/store//... + # We'll now remove the /nix/store/ part: + if [[ -d "$out${postgresql}" ]]; then + cp -alt "$out" "$out${postgresql}"/* + rm -r "$out${postgresql}" + fi + + if [[ -d "$out${postgresql.dev}" ]]; then + mkdir -p "''${dev:-$out}" + cp -alt "''${dev:-$out}" "$out${postgresql.dev}"/* + rm -r "$out${postgresql.dev}" + fi + + if [[ -d "$out${postgresql.lib}" ]]; then + mkdir -p "''${lib:-$out}" + cp -alt "''${lib:-$out}" "$out${postgresql.lib}"/* + rm -r "$out${postgresql.lib}" + fi + + if [[ -d "$out${postgresql.doc}" ]]; then + mkdir -p "''${doc:-$out}" + cp -alt "''${doc:-$out}" "$out${postgresql.doc}"/* + rm -r "$out${postgresql.doc}" + fi + + if [[ -d "$out${postgresql.man}" ]]; then + mkdir -p "''${man:-$out}" + cp -alt "''${man:-$out}" "$out${postgresql.man}"/* + rm -r "$out${postgresql.man}" + fi + + # In some cases (postgis) parts of the install script + # actually work "OK", before we add DESTDIR, so some + # files end up in + # /nix/store//nix/store//... + if [[ -d "$out$out" ]]; then + cp -alt "$out" "$out$out"/* + rm -r "$out$out" + fi + + if [[ -d "$out/nix/store" ]]; then + if ! rmdir "$out/nix/store" "$out/nix"; then + find "$out/nix" + nixErrorLog 'Found left-overs in $out/nix/store, make sure to move them into $out properly.' + exit 1 + fi + fi + '' + + prevAttrs.postInstall or ""; + }; +in +stdenv.mkDerivation (lib.extends buildPostgresqlExtension (lib.toFunction args)) diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix index 695a0093c225..a9f74bc76ec1 100644 --- a/pkgs/servers/sql/postgresql/ext/age.nix +++ b/pkgs/servers/sql/postgresql/ext/age.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, bison, fetchFromGitHub, flex, perl, postgresql }: +{ lib, stdenv, bison, fetchFromGitHub, flex, perl, postgresql, buildPostgresqlExtension }: let hashes = { @@ -11,7 +11,7 @@ let "12" = "sha256-JFNk17ESsIt20dwXrfBkQ5E6DbZzN/Q9eS6+WjCXGd4="; }; in -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "age"; version = "1.5.0-rc0"; @@ -22,20 +22,12 @@ stdenv.mkDerivation rec { hash = hashes.${lib.versions.major postgresql.version} or (throw "Source for Age is not available for ${postgresql.version}"); }; - buildInputs = [ postgresql ]; - makeFlags = [ "BISON=${bison}/bin/bison" "FLEX=${flex}/bin/flex" "PERL=${perl}/bin/perl" ]; - installPhase = '' - install -D -t $out/lib *${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - ''; - passthru.tests = stdenv.mkDerivation { inherit version src; diff --git a/pkgs/servers/sql/postgresql/ext/anonymizer.nix b/pkgs/servers/sql/postgresql/ext/anonymizer.nix index 4bb5aa544440..587879432436 100644 --- a/pkgs/servers/sql/postgresql/ext/anonymizer.nix +++ b/pkgs/servers/sql/postgresql/ext/anonymizer.nix @@ -1,23 +1,16 @@ -{ lib, stdenv, pg-dump-anon, postgresql, runtimeShell, jitSupport, llvm }: +{ lib, stdenv, pg-dump-anon, postgresql, runtimeShell, jitSupport, llvm, buildPostgresqlExtension }: -stdenv.mkDerivation (finalAttrs: { +buildPostgresqlExtension (finalAttrs: { pname = "postgresql_anonymizer"; inherit (pg-dump-anon) version src passthru; - buildInputs = [ postgresql ]; nativeBuildInputs = [ postgresql ] ++ lib.optional jitSupport llvm; strictDeps = true; - makeFlags = [ - "BINDIR=${placeholder "out"}/bin" - "datadir=${placeholder "out"}/share/postgresql" - "pkglibdir=${placeholder "out"}/lib" - "DESTDIR=" - ]; - - postInstall = '' + # Needs to be after postInstall, where removeNestedNixStore runs + preFixup = '' cat >$out/bin/pg_dump_anon.sh <<'EOF' #!${runtimeShell} echo "This script is deprecated by upstream. To use the new script," diff --git a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix index af3df00fca64..68284da76c2f 100644 --- a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix +++ b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, postgresql, boost182, nixosTests }: +{ stdenv, lib, fetchFromGitHub, postgresql, boost182, nixosTests, buildPostgresqlExtension }: let version = "1.7.0"; @@ -20,7 +20,7 @@ let }; in -stdenv.mkDerivation { +buildPostgresqlExtension { pname = "apache_datasketches"; inherit version; @@ -28,7 +28,7 @@ stdenv.mkDerivation { sourceRoot = main_src.name; - buildInputs = [ postgresql boost182 ]; + buildInputs = [ boost182 ]; patchPhase = '' runHook prePatch @@ -36,31 +36,6 @@ stdenv.mkDerivation { runHook postPatch ''; - installPhase = '' - runHook preInstall - install -D -m 644 ./datasketches${postgresql.dlSuffix} -t $out/lib/ - cat \ - sql/datasketches_cpc_sketch.sql \ - sql/datasketches_kll_float_sketch.sql \ - sql/datasketches_kll_double_sketch.sql \ - sql/datasketches_theta_sketch.sql \ - sql/datasketches_frequent_strings_sketch.sql \ - sql/datasketches_hll_sketch.sql \ - sql/datasketches_aod_sketch.sql \ - sql/datasketches_req_float_sketch.sql \ - sql/datasketches_quantiles_double_sketch.sql \ - > sql/datasketches--${version}.sql - install -D -m 644 ./datasketches.control -t $out/share/postgresql/extension - install -D -m 644 \ - ./sql/datasketches--${version}.sql \ - ./sql/datasketches--1.3.0--1.4.0.sql \ - ./sql/datasketches--1.4.0--1.5.0.sql \ - ./sql/datasketches--1.5.0--1.6.0.sql \ - ./sql/datasketches--1.6.0--1.7.0.sql \ - -t $out/share/postgresql/extension - runHook postInstall - ''; - passthru.tests.apache_datasketches = nixosTests.apache_datasketches; meta = { diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix index b4c08b4ceab1..98d79051ddf7 100644 --- a/pkgs/servers/sql/postgresql/ext/citus.nix +++ b/pkgs/servers/sql/postgresql/ext/citus.nix @@ -4,9 +4,10 @@ , fetchFromGitHub , lz4 , postgresql +, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "citus"; version = "12.1.2"; @@ -20,23 +21,8 @@ stdenv.mkDerivation rec { buildInputs = [ curl lz4 - postgresql ]; - installPhase = '' - runHook preInstall - - install -D -t $out/lib src/backend/columnar/citus_columnar${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension src/backend/columnar/build/sql/*.sql - install -D -t $out/share/postgresql/extension src/backend/columnar/*.control - - install -D -t $out/lib src/backend/distributed/citus${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension src/backend/distributed/build/sql/*.sql - install -D -t $out/share/postgresql/extension src/backend/distributed/*.control - - runHook postInstall - ''; - meta = with lib; { # "Our soft policy for Postgres version compatibility is to support Citus' # latest release with Postgres' 3 latest releases." diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix index c9f01190c912..2236f815a823 100644 --- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix @@ -1,11 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, protobufc }: +{ lib, stdenv, fetchFromGitHub, postgresql, protobufc, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "cstore_fdw"; version = "unstable-2022-03-08"; nativeBuildInputs = [ protobufc ]; - buildInputs = [ postgresql ]; src = fetchFromGitHub { owner = "citusdata"; @@ -14,14 +13,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-02wcCqs8A5ZOZX080fgcNJTQrYQctnlwnA8+YPaRTZc="; }; - installPhase = '' - mkdir -p $out/{lib,share/postgresql/extension} - - cp *.so $out/lib - cp *.sql $out/share/postgresql/extension - cp *.control $out/share/postgresql/extension - ''; - meta = with lib; { broken = versionAtLeast postgresql.version "14"; description = "Columnar storage for PostgreSQL"; diff --git a/pkgs/servers/sql/postgresql/ext/h3-pg.nix b/pkgs/servers/sql/postgresql/ext/h3-pg.nix index 1a0c701c7702..ec73b97999c5 100644 --- a/pkgs/servers/sql/postgresql/ext/h3-pg.nix +++ b/pkgs/servers/sql/postgresql/ext/h3-pg.nix @@ -5,9 +5,10 @@ , h3_4 , postgresql , postgresqlTestExtension +, buildPostgresqlExtension }: -stdenv.mkDerivation (finalAttrs: { +buildPostgresqlExtension (finalAttrs: { pname = "h3-pg"; version = "4.1.3"; @@ -32,16 +33,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ h3_4 - postgresql ]; - installPhase = '' - install -D -t $out/lib h3/h3.so - install -D -t $out/share/postgresql/extension h3/h3-*.sql h3/h3.control - install -D -t $out/lib h3_postgis/h3_postgis.so - install -D -t $out/share/postgresql/extension h3_postgis/h3_postgis-*.sql h3_postgis/h3_postgis.control - ''; - passthru.tests.extension = postgresqlTestExtension { inherit (finalAttrs) finalPackage; withPackages = [ "postgis" ]; diff --git a/pkgs/servers/sql/postgresql/ext/hypopg.nix b/pkgs/servers/sql/postgresql/ext/hypopg.nix index 534a21bb6d69..3bc868a79f49 100644 --- a/pkgs/servers/sql/postgresql/ext/hypopg.nix +++ b/pkgs/servers/sql/postgresql/ext/hypopg.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, gitUpdater }: +{ lib, stdenv, fetchFromGitHub, postgresql, gitUpdater, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "hypopg"; version = "1.4.1"; @@ -11,14 +11,6 @@ stdenv.mkDerivation rec { hash = "sha256-88uKPSnITRZ2VkelI56jZ9GWazG/Rn39QlyHKJKSKMM="; }; - buildInputs = [ postgresql ]; - - installPhase = '' - install -D -t $out/lib *${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.control - install -D -t $out/share/postgresql/extension *.sql - ''; - passthru = { updateScript = gitUpdater { ignoredVersions = "beta"; diff --git a/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix b/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix index 092212aa3de0..eb84ec54c028 100644 --- a/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix +++ b/pkgs/servers/sql/postgresql/ext/jsonb_deep_sum.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "jsonb_deep_sum"; version = "unstable-2021-12-24"; @@ -11,16 +11,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-W1wNILAwTAjFPezq+grdRMA59KEnMZDz69n9xQUqdc0="; }; - buildInputs = [ postgresql ]; - - installPhase = '' - mkdir -p $out/{lib,share/postgresql/extension} - - cp *${postgresql.dlSuffix} $out/lib - cp *.sql $out/share/postgresql/extension - cp *.control $out/share/postgresql/extension - ''; - meta = with lib; { description = "PostgreSQL extension to easily add jsonb numeric"; homepage = "https://github.com/furstenheim/jsonb_deep_sum"; diff --git a/pkgs/servers/sql/postgresql/ext/lantern.nix b/pkgs/servers/sql/postgresql/ext/lantern.nix index 0138594cd105..07147be45c16 100644 --- a/pkgs/servers/sql/postgresql/ext/lantern.nix +++ b/pkgs/servers/sql/postgresql/ext/lantern.nix @@ -5,9 +5,10 @@ , openssl , postgresql , postgresqlTestExtension +, buildPostgresqlExtension }: -stdenv.mkDerivation (finalAttrs: { +buildPostgresqlExtension (finalAttrs: { pname = "postgresql-lantern"; version = "0.4.1"; @@ -29,19 +30,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ openssl - postgresql ]; - installPhase = '' - runHook preInstall - - install -D -t $out/lib lantern${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension lantern-*.sql - install -D -t $out/share/postgresql/extension lantern.control - - runHook postInstall - ''; - cmakeFlags = [ "-DBUILD_FOR_DISTRIBUTING=ON" "-S ../lantern_hnsw" diff --git a/pkgs/servers/sql/postgresql/ext/periods.nix b/pkgs/servers/sql/postgresql/ext/periods.nix index 422d6ddaf2b3..c5c0d4a8dc42 100644 --- a/pkgs/servers/sql/postgresql/ext/periods.nix +++ b/pkgs/servers/sql/postgresql/ext/periods.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "periods"; version = "1.2.2"; @@ -11,14 +11,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-ezt+MtDqPM8OmJCD6oQTS644l+XHZoxuivq0PUIXOY8="; }; - buildInputs = [ postgresql ]; - - installPhase = '' - install -D -t $out/lib *${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - ''; - meta = with lib; { description = "PostgreSQL extension implementing SQL standard functionality for PERIODs and SYSTEM VERSIONING"; homepage = "https://github.com/xocolatl/periods"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index 74bf0b8eda64..45b8f9562bf2 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg_auto_failover"; version = "2.1"; @@ -11,14 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-OIWykfFbVskrkPG/zSmZtZjc+W956KSfIzK7f5QOqpI="; }; - buildInputs = postgresql.buildInputs ++ [ postgresql ]; - - installPhase = '' - install -D -t $out/bin src/bin/pg_autoctl/pg_autoctl - install -D -t $out/lib src/monitor/pgautofailover.so - install -D -t $out/share/postgresql/extension src/monitor/*.sql - install -D -t $out/share/postgresql/extension src/monitor/pgautofailover.control - ''; + buildInputs = postgresql.buildInputs; meta = with lib; { description = "PostgreSQL extension and service for automated failover and high-availability"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix index f47ce5694588..e7980e305bf3 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, postgresql }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg_bigm"; version = "1.2-20200228"; @@ -19,16 +19,8 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ postgresql ]; - makeFlags = [ "USE_PGXS=1" ]; - installPhase = '' - install -D -t $out/lib pg_bigm${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - ''; - meta = with lib; { description = "Text similarity measurement and index searching based on bigrams"; homepage = "https://pgbigm.osdn.jp/"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix index 3dea36f7e740..2fef4b7c22c3 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix @@ -1,11 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg_cron"; version = "1.6.4"; - buildInputs = [ postgresql ]; - src = fetchFromGitHub { owner = "citusdata"; repo = pname; @@ -13,14 +11,6 @@ stdenv.mkDerivation rec { hash = "sha256-t1DpFkPiSfdoGG2NgNT7g1lkvSooZoRoUrix6cBID40="; }; - installPhase = '' - mkdir -p $out/{lib,share/postgresql/extension} - - cp *${postgresql.dlSuffix} $out/lib - cp *.sql $out/share/postgresql/extension - cp *.control $out/share/postgresql/extension - ''; - meta = with lib; { description = "Run Cron jobs through PostgreSQL"; homepage = "https://github.com/citusdata/pg_cron"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix index 57bf1b62e15f..c815a02229e8 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitLab, postgresql }: +{ lib, stdenv, fetchFromGitLab, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg_ed25519"; version = "0.2"; src = fetchFromGitLab { @@ -10,17 +10,6 @@ stdenv.mkDerivation rec { sha256 = "16w3qx3wj81bzfhydl2pjhn8b1jak6h7ja9wq1kc626g0siggqi0"; }; - buildInputs = [ postgresql ]; - - installPhase = '' - mkdir -p $out/bin # For buildEnv to setup proper symlinks. See #22653 - mkdir -p $out/{lib,share/postgresql/extension} - - cp *.so $out/lib - cp *.sql $out/share/postgresql/extension - cp *.control $out/share/postgresql/extension - ''; - meta = with lib; { description = "PostgreSQL extension for signing and verifying ed25519 signatures"; homepage = "https://gitlab.com/dwagin/pg_ed25519"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_embedding.nix b/pkgs/servers/sql/postgresql/ext/pg_embedding.nix index 5306a619038d..280032923717 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_embedding.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_embedding.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg_embedding"; version = "0.3.6"; @@ -11,14 +11,6 @@ stdenv.mkDerivation rec { hash = "sha256-NTBxsQB8mR7e/CWwkCEyDiYhi3Nxl/aKgRBwqc0THcI="; }; - buildInputs = [ postgresql ]; - - installPhase = '' - install -D -t $out/lib *.so - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - ''; - meta = with lib; { description = "PostgreSQL extension implementing the HNSW algorithm for vector similarity search"; homepage = "https://github.com/neondatabase/pg_embedding"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix index 8983acb3152a..db5c360196e2 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: let source = { @@ -28,7 +28,7 @@ let }; }.${lib.versions.major postgresql.version} or (throw "Source for pg_hint_plan is not available for ${postgresql.version}"); in -stdenv.mkDerivation { +buildPostgresqlExtension { pname = "pg_hint_plan"; inherit (source) version; @@ -44,14 +44,6 @@ stdenv.mkDerivation { substituteInPlace Makefile --replace "LDFLAGS+=-Wl,--build-id" "" ''; - buildInputs = [ postgresql ]; - - installPhase = '' - install -D -t $out/lib pg_hint_plan${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - ''; - meta = with lib; { description = "Extension to tweak PostgreSQL execution plans using so-called 'hints' in SQL comments"; homepage = "https://github.com/ossc-db/pg_hint_plan"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix index a60601aef569..4a754bf81a9f 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix @@ -1,11 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg_hll"; version = "2.18"; - buildInputs = [ postgresql ]; - src = fetchFromGitHub { owner = "citusdata"; repo = "postgresql-hll"; @@ -13,12 +11,6 @@ stdenv.mkDerivation rec { hash = "sha256-Latdxph1Ura8yKEokEjalJ+/GY+pAKOT3GXjuLprj6c="; }; - installPhase = '' - install -D -t $out/lib hll${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - ''; - meta = with lib; { description = "HyperLogLog for PostgreSQL"; homepage = "https://github.com/citusdata/postgresql-hll"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix index fcae540d1356..3abf23077bb2 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg_ivm"; version = "1.9"; @@ -11,14 +11,6 @@ stdenv.mkDerivation rec { hash = "sha256-Qcie7sbXcMbQkMoFIYBfttmvlYooESdSk2DyebHKPlk="; }; - buildInputs = [ postgresql ]; - - installPhase = '' - install -D -t $out/lib pg_ivm${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - ''; - meta = with lib; { description = "Materialized views with IVM (Incremental View Maintenance) for PostgreSQL"; homepage = "https://github.com/sraoss/pg_ivm"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_libversion.nix b/pkgs/servers/sql/postgresql/ext/pg_libversion.nix index b5c3ad6acab8..174a8ffc8993 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_libversion.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_libversion.nix @@ -5,9 +5,10 @@ , pkg-config , postgresql , libversion +, buildPostgresqlExtension }: -stdenv.mkDerivation (finalAttrs: { +buildPostgresqlExtension (finalAttrs: { pname = "pg_libversion"; version = "2.0.1"; @@ -23,20 +24,9 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - postgresql libversion ]; - installPhase = '' - runHook preInstall - - install -D -t $out/lib libversion${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - - runHook postInstall - ''; - passthru.updateScript = gitUpdater { }; meta = with lib; { diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix index a86f53eeef05..a4e0cb2f06c2 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_net.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, curl, postgresql }: +{ lib, stdenv, fetchFromGitHub, curl, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg_net"; version = "0.8.0"; - buildInputs = [ curl postgresql ]; + buildInputs = [ curl ]; src = fetchFromGitHub { owner = "supabase"; @@ -15,14 +15,6 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-Wno-error"; - installPhase = '' - mkdir -p $out/{lib,share/postgresql/extension} - - cp *${postgresql.dlSuffix} $out/lib - cp sql/*.sql $out/share/postgresql/extension - cp *.control $out/share/postgresql/extension - ''; - meta = with lib; { description = "Async networking for Postgres"; homepage = "https://github.com/supabase/pg_net"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index 87ee50411b75..19c7efdf70f2 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -1,11 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg_partman"; version = "5.1.0"; - buildInputs = [ postgresql ]; - src = fetchFromGitHub { owner = "pgpartman"; repo = pname; @@ -13,15 +11,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-GrVOJ5ywZMyqyDroYDLdKkXDdIJSDGhDfveO/ZvrmYs="; }; - installPhase = '' - mkdir -p $out/{lib,share/postgresql/extension} - - cp src/*${postgresql.dlSuffix} $out/lib - cp updates/* $out/share/postgresql/extension - cp -r sql/* $out/share/postgresql/extension - cp *.control $out/share/postgresql/extension - ''; - meta = with lib; { description = "Partition management extension for PostgreSQL"; homepage = "https://github.com/pgpartman/pg_partman"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_rational.nix b/pkgs/servers/sql/postgresql/ext/pg_rational.nix index df80ea49a541..084c51e7846e 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_rational.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_rational.nix @@ -2,9 +2,10 @@ , fetchFromGitHub , lib , postgresql +, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg_rational"; version = "0.0.2"; @@ -15,20 +16,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-Sp5wuX2nP3KGyWw7MFa11rI1CPIKIWBt8nvBSsASIEw="; }; - buildInputs = [ postgresql ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{lib,share/postgresql/extension} - - cp *${postgresql.dlSuffix} $out/lib - cp *.sql $out/share/postgresql/extension - cp *.control $out/share/postgresql/extension - - runHook postInstall - ''; - meta = with lib; { description = "Precise fractional arithmetic for PostgreSQL"; homepage = "https://github.com/begriffs/pg_rational"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_relusage.nix b/pkgs/servers/sql/postgresql/ext/pg_relusage.nix index 1fe9fd3cac87..1dc879275ca7 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_relusage.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_relusage.nix @@ -1,11 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg_relusage"; version = "0.0.1"; - buildInputs = [ postgresql ]; - src = fetchFromGitHub { owner = "adept"; repo = pname; @@ -13,12 +11,6 @@ stdenv.mkDerivation rec { sha256 = "8hJNjQ9MaBk3J9a73l+yQMwMW/F2N8vr5PO2o+5GvYs="; }; - installPhase = '' - install -D -t $out/lib *${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - ''; - meta = with lib; { description = "pg_relusage extension for PostgreSQL: discover and log the relations used in your statements"; homepage = "https://github.com/adept/pg_relusage"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix index b251e9e752f6..ffad30742d23 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -4,13 +4,14 @@ , postgresql , postgresqlTestExtension , testers +, buildPostgresqlExtension }: -stdenv.mkDerivation (finalAttrs: { +buildPostgresqlExtension (finalAttrs: { pname = "pg_repack"; version = "1.5.0"; - buildInputs = postgresql.buildInputs ++ [ postgresql ]; + buildInputs = postgresql.buildInputs; src = fetchFromGitHub { owner = "reorg"; @@ -19,12 +20,6 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-do80phyMxwcRIkYyUt9z02z7byNQhK+pbSaCUmzG+4c="; }; - installPhase = '' - install -D bin/pg_repack -t $out/bin/ - install -D lib/pg_repack${postgresql.dlSuffix} -t $out/lib/ - install -D lib/{pg_repack--${finalAttrs.version}.sql,pg_repack.control} -t $out/share/postgresql/extension - ''; - passthru.tests = { version = testers.testVersion { package = finalAttrs.finalPackage; diff --git a/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix b/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix index 682275fbf15c..644548f4ed98 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_roaringbitmap.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, postgresqlTestHook }: +{ lib, stdenv, fetchFromGitHub, postgresql, postgresqlTestHook, buildPostgresqlExtension }: -stdenv.mkDerivation (finalAttrs: { +buildPostgresqlExtension (finalAttrs: { pname = "pg_roaringbitmap"; version = "0.5.4"; @@ -11,16 +11,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-E6vqawnsRsAIajGDgJcTUWV1H8GFFboTjhmVfemUGbs="; }; - buildInputs = [ - postgresql - ]; - - installPhase = '' - install -D -t $out/lib roaringbitmap${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension roaringbitmap-*.sql - install -D -t $out/share/postgresql/extension roaringbitmap.control - ''; - meta = with lib; { description = "RoaringBitmap extension for PostgreSQL"; homepage = "https://github.com/ChenHuajun/pg_roaringbitmap"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix index 4aeec3e31f09..14d4db415923 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: with { "12" = { @@ -27,12 +27,10 @@ with { }; }."${lib.versions.major postgresql.version}" or (throw "pg_safeupdate: version specification for pg ${postgresql.version} missing."); -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg-safeupdate"; inherit version; - buildInputs = [ postgresql ]; - src = fetchFromGitHub { owner = "eradman"; repo = pname; @@ -40,10 +38,6 @@ stdenv.mkDerivation rec { inherit sha256; }; - installPhase = '' - install -D safeupdate${postgresql.dlSuffix} -t $out/lib - ''; - meta = with lib; { description = "Simple extension to PostgreSQL that requires criteria for UPDATE and DELETE"; homepage = "https://github.com/eradman/pg-safeupdate"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix index 8bcb8777c57b..4ec5bd83fc47 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, postgresql, unstableGitUpdater }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, postgresql, unstableGitUpdater, buildPostgresqlExtension }: -stdenv.mkDerivation { +buildPostgresqlExtension { pname = "pg_similarity"; version = "1.0-unstable-2021-01-12"; @@ -21,15 +21,8 @@ stdenv.mkDerivation { }) ]; - buildInputs = [ postgresql ]; - makeFlags = [ "USE_PGXS=1" ]; - installPhase = '' - install -D pg_similarity${postgresql.dlSuffix} -t $out/lib/ - install -D ./{pg_similarity--unpackaged--1.0.sql,pg_similarity--1.0.sql,pg_similarity.control} -t $out/share/postgresql/extension - ''; - passthru.updateScript = unstableGitUpdater {}; meta = { diff --git a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix index 7d03b21d989d..ba2f4443c557 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, postgresqlTestExtension }: +{ lib, stdenv, fetchFromGitHub, postgresql, postgresqlTestExtension, buildPostgresqlExtension }: -stdenv.mkDerivation (finalAttrs: { +buildPostgresqlExtension (finalAttrs: { pname = "pg_squeeze"; version = "1.7.0"; @@ -11,20 +11,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Kh1wSOvV5Rd1CG/na3yzbWzvaR8SJ6wmTZOnM+lbgik="; }; - buildInputs = [ - postgresql - ]; - - installPhase = '' - runHook preInstall - - install -D -t $out/lib pg_squeeze${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension pg_squeeze-*.sql - install -D -t $out/share/postgresql/extension pg_squeeze.control - - runHook postInstall - ''; - passthru.tests.extension = postgresqlTestExtension { inherit (finalAttrs) finalPackage; postgresqlExtraSettings = '' diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix index b210db910411..8c6aa60be32a 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix @@ -1,11 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg_topn"; version = "2.7.0"; - buildInputs = [ postgresql ]; - src = fetchFromGitHub { owner = "citusdata"; repo = "postgresql-topn"; @@ -13,14 +11,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-lP6Iil/BUv4ga+co+oBpKv1FBqFuBGfNjueEolM6png="; }; - installPhase = '' - mkdir -p $out/{lib,share/postgresql/extension} - - cp *${postgresql.dlSuffix} $out/lib - cp *.sql $out/share/postgresql/extension - cp *.control $out/share/postgresql/extension - ''; - meta = with lib; { description = "Efficient querying of 'top values' for PostgreSQL"; homepage = "https://github.com/citusdata/postgresql-topn"; diff --git a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix index 80afe05db808..81a4e69015e2 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix @@ -2,14 +2,13 @@ , stdenv , fetchFromGitHub , postgresql +, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pg_uuidv7"; version = "1.5.0"; - buildInputs = [ postgresql ]; - src = fetchFromGitHub { owner = "fboulnois"; repo = "pg_uuidv7"; @@ -17,11 +16,6 @@ stdenv.mkDerivation rec { hash = "sha256-oVyRtjl3KsD3j96qvQb8bFLMhoWO81OudOL4wVXrjzI="; }; - installPhase = '' - install -D -t $out/lib pg_uuidv7${postgresql.dlSuffix} - install -D {sql/pg_uuidv7--${lib.versions.majorMinor version}.sql,pg_uuidv7.control} -t $out/share/postgresql/extension - ''; - meta = with lib; { description = "Tiny Postgres extension to create version 7 UUIDs"; homepage = "https://github.com/fboulnois/pg_uuidv7"; diff --git a/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/pgaudit.nix index 1079a13b2dfc..d50da6c7e282 100644 --- a/pkgs/servers/sql/postgresql/ext/pgaudit.nix +++ b/pkgs/servers/sql/postgresql/ext/pgaudit.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libkrb5, openssl, postgresql }: +{ lib, stdenv, fetchFromGitHub, libkrb5, openssl, postgresql, buildPostgresqlExtension }: let source = { @@ -28,7 +28,7 @@ let }; }.${lib.versions.major postgresql.version} or (throw "Source for pgaudit is not available for ${postgresql.version}"); in -stdenv.mkDerivation { +buildPostgresqlExtension { pname = "pgaudit"; inherit (source) version; @@ -39,16 +39,10 @@ stdenv.mkDerivation { hash = source.hash; }; - buildInputs = [ libkrb5 openssl postgresql ]; + buildInputs = [ libkrb5 openssl ]; makeFlags = [ "USE_PGXS=1" ]; - installPhase = '' - install -D -t $out/lib pgaudit${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - ''; - meta = with lib; { description = "Open Source PostgreSQL Audit Logging"; homepage = "https://github.com/pgaudit/pgaudit"; diff --git a/pkgs/servers/sql/postgresql/ext/pgjwt.nix b/pkgs/servers/sql/postgresql/ext/pgjwt.nix index a90502c35a4e..c1582bda0002 100644 --- a/pkgs/servers/sql/postgresql/ext/pgjwt.nix +++ b/pkgs/servers/sql/postgresql/ext/pgjwt.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, unstableGitUpdater, nixosTests, postgresqlTestExtension }: +{ lib, stdenv, fetchFromGitHub, postgresql, unstableGitUpdater, nixosTests, postgresqlTestExtension, buildPostgresqlExtension }: -stdenv.mkDerivation (finalAttrs: { +buildPostgresqlExtension (finalAttrs: { pname = "pgjwt"; version = "0-unstable-2023-03-02"; @@ -11,12 +11,6 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-nDZEDf5+sFc1HDcG2eBNQj+kGcdAYRXJseKi9oww+JU="; }; - dontBuild = true; - installPhase = '' - mkdir -p $out/share/postgresql/extension - cp pg*sql *.control $out/share/postgresql/extension - ''; - passthru.updateScript = unstableGitUpdater { }; passthru.tests = { diff --git a/pkgs/servers/sql/postgresql/ext/pgmq.nix b/pkgs/servers/sql/postgresql/ext/pgmq.nix index 2cbf3caa4333..8a5319efb66b 100644 --- a/pkgs/servers/sql/postgresql/ext/pgmq.nix +++ b/pkgs/servers/sql/postgresql/ext/pgmq.nix @@ -3,9 +3,10 @@ stdenv, fetchFromGitHub, postgresql, + buildPostgresqlExtension, }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pgmq"; version = "1.4.4"; @@ -20,17 +21,6 @@ stdenv.mkDerivation rec { dontConfigure = true; - buildInputs = [ postgresql ]; - - installPhase = '' - runHook preInstall - - install -D -t $out/share/postgresql/extension sql/*.sql - install -D -t $out/share/postgresql/extension *.control - - runHook postInstall - ''; - meta = { description = "Lightweight message queue like AWS SQS and RSMQ but on Postgres"; homepage = "https://tembo.io/pgmq"; diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 3a7c9e237f98..3d855f5e1977 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, pkg-config, postgresql, msgpack-c, groonga }: +{ lib, stdenv, fetchurl, pkg-config, postgresql, msgpack-c, groonga, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pgroonga"; version = "3.2.3"; @@ -10,23 +10,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ postgresql msgpack-c groonga ]; + buildInputs = [ msgpack-c groonga ]; makeFlags = [ "HAVE_MSGPACK=1" "MSGPACK_PACKAGE_NAME=msgpack-c" ]; - installPhase = '' - install -D pgroonga${postgresql.dlSuffix} -t $out/lib/ - install -D pgroonga.control -t $out/share/postgresql/extension - install -D data/pgroonga-*.sql -t $out/share/postgresql/extension - - install -D pgroonga_database${postgresql.dlSuffix} -t $out/lib/ - install -D pgroonga_database.control -t $out/share/postgresql/extension - install -D data/pgroonga_database-*.sql -t $out/share/postgresql/extension - ''; - meta = with lib; { description = "PostgreSQL extension to use Groonga as the index"; longDescription = '' diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index d67a21755a06..65bc5ee7c8c5 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, perl, cmake, boost }: +{ lib, stdenv, fetchFromGitHub, postgresql, perl, cmake, boost, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pgrouting"; version = "3.6.3"; nativeBuildInputs = [ cmake perl ]; - buildInputs = [ postgresql boost ]; + buildInputs = [ boost ]; src = fetchFromGitHub { owner = "pgRouting"; @@ -14,12 +14,6 @@ stdenv.mkDerivation rec { hash = "sha256-VCoapUM7Vh4W1DUE/gWQ9YIRLbw63XlOWsgajJW+XNU="; }; - installPhase = '' - install -D lib/*.so -t $out/lib - install -D sql/pgrouting--${version}.sql -t $out/share/postgresql/extension - install -D sql/common/pgrouting.control -t $out/share/postgresql/extension - ''; - meta = with lib; { description = "PostgreSQL/PostGIS extension that provides geospatial routing functionality"; homepage = "https://pgrouting.org/"; diff --git a/pkgs/servers/sql/postgresql/ext/pgsodium.nix b/pkgs/servers/sql/postgresql/ext/pgsodium.nix index 59ddfcd74c8c..9e72787c56ee 100644 --- a/pkgs/servers/sql/postgresql/ext/pgsodium.nix +++ b/pkgs/servers/sql/postgresql/ext/pgsodium.nix @@ -4,9 +4,10 @@ , libsodium , postgresql , postgresqlTestExtension +, buildPostgresqlExtension }: -stdenv.mkDerivation (finalAttrs: { +buildPostgresqlExtension (finalAttrs: { pname = "pgsodium"; version = "3.1.9"; @@ -19,20 +20,11 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libsodium - postgresql ]; - installPhase = '' - runHook preInstall - - install -D -t $out/lib pgsodium${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension sql/pgsodium-*.sql - install -D -t $out/share/postgresql/extension pgsodium.control - + postInstall = '' install -D -t $out/share/pgsodium/getkey_scripts getkey_scripts/* ln -s $out/share/pgsodium/getkey_scripts/pgsodium_getkey_urandom.sh $out/share/postgresql/extension/pgsodium_getkey - - runHook postInstall ''; passthru.tests.extension = postgresqlTestExtension { diff --git a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix index bfe9052acf58..c71e255cdb51 100644 --- a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix +++ b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, curl, postgresql }: +{ lib, stdenv, fetchFromGitHub, curl, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pgsql-http"; version = "1.6.0"; @@ -11,13 +11,7 @@ stdenv.mkDerivation rec { hash = "sha256-CPHfx7vhWfxkXsoKTzyFuTt47BPMvzi/pi1leGcuD60="; }; - buildInputs = [ curl postgresql ]; - - installPhase = '' - install -D -t $out/lib *${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - ''; + buildInputs = [ curl ]; meta = with lib; { description = "HTTP client for PostgreSQL, retrieve a web page from inside the database"; diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix index 24ad1f610e8f..b09734c5f07d 100644 --- a/pkgs/servers/sql/postgresql/ext/pgtap.nix +++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix @@ -1,5 +1,6 @@ { lib , stdenv +, buildPostgresqlExtension , fetchFromGitHub , perl , perlPackages @@ -8,7 +9,7 @@ , which }: -stdenv.mkDerivation (finalAttrs: { +buildPostgresqlExtension (finalAttrs: { pname = "pgtap"; version = "1.3.3"; @@ -21,10 +22,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ postgresql perl perlPackages.TAPParserSourceHandlerpgTAP which ]; - installPhase = '' - install -D {sql/pgtap--${finalAttrs.version}.sql,pgtap.control} -t $out/share/postgresql/extension - ''; - passthru.tests.extension = stdenv.mkDerivation { name = "pgtap-test"; dontUnpack = true; diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix index 619c5e7ab24d..08db0762eddf 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "pgvector"; version = "0.6.2"; @@ -11,14 +11,6 @@ stdenv.mkDerivation rec { hash = "sha256-r+TpFJg6WrMn0L2B7RpmSRvw3XxpHzMRtpFWDCzLvgs="; }; - buildInputs = [ postgresql ]; - - installPhase = '' - install -D -t $out/lib vector${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension sql/vector-*.sql - install -D -t $out/share/postgresql/extension vector.control - ''; - meta = with lib; { description = "Open-source vector similarity search for PostgreSQL"; homepage = "https://github.com/pgvector/pgvector"; diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index e03a3bf51fe5..b5924fed6ec2 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, postgresqlTestExtension }: +{ lib, stdenv, fetchFromGitHub, postgresql, postgresqlTestExtension, buildPostgresqlExtension }: -stdenv.mkDerivation (finalAttrs: { +buildPostgresqlExtension (finalAttrs: { pname = "plpgsql-check"; version = "2.7.5"; @@ -11,14 +11,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-CD/G/wX6o+mC6gowlpFe1DdJWyh3cB9wxSsW2GXrENE="; }; - buildInputs = [ postgresql ]; - - installPhase = '' - install -D -t $out/lib *${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - ''; - passthru.tests.extension = postgresqlTestExtension { inherit (finalAttrs) finalPackage; sql = "CREATE EXTENSION plpgsql_check;"; diff --git a/pkgs/servers/sql/postgresql/ext/plr.nix b/pkgs/servers/sql/postgresql/ext/plr.nix index b30b59b86d2a..1c2266e7cfb6 100644 --- a/pkgs/servers/sql/postgresql/ext/plr.nix +++ b/pkgs/servers/sql/postgresql/ext/plr.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, R, postgresql }: +{ lib, stdenv, fetchFromGitHub, pkg-config, R, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "plr"; version = "8.4.7"; @@ -12,15 +12,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ R postgresql ]; + buildInputs = [ R ]; makeFlags = [ "USE_PGXS=1" ]; - installPhase = '' - install -D plr${postgresql.dlSuffix} -t $out/lib/ - install -D {plr--*.sql,plr.control} -t $out/share/postgresql/extension - ''; - meta = with lib; { description = "PL/R - R Procedural Language for PostgreSQL"; homepage = "https://github.com/postgres-plr/plr"; diff --git a/pkgs/servers/sql/postgresql/ext/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/plv8/default.nix index 2c375babd464..e9a9195078ed 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8/default.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8/default.nix @@ -5,6 +5,7 @@ , perl , postgresql , jitSupport +, buildPostgresqlExtension # For test , runCommand , coreutils @@ -13,7 +14,7 @@ let libv8 = nodejs_20.libv8; -in stdenv.mkDerivation (finalAttrs: { +in buildPostgresqlExtension (finalAttrs: { pname = "plv8"; version = "3.2.3"; @@ -36,7 +37,6 @@ in stdenv.mkDerivation (finalAttrs: { buildInputs = [ libv8 - postgresql ]; buildFlags = [ "all" ]; @@ -48,11 +48,6 @@ in stdenv.mkDerivation (finalAttrs: { "V8_OUTDIR=${libv8}/lib" ]; - installFlags = [ - # PGXS only supports installing to postgresql prefix so we need to redirect this - "DESTDIR=${placeholder "out"}" - ]; - # No configure script. dontConfigure = true; @@ -60,14 +55,6 @@ in stdenv.mkDerivation (finalAttrs: { patchShebangs ./generate_upgrade.sh ''; - postInstall = '' - # Move the redirected to proper directory. - # There appear to be no references to the install directories - # so changing them does not cause issues. - mv "$out/nix/store"/*/* "$out" - rmdir "$out/nix/store"/* "$out/nix/store" "$out/nix" - ''; - passthru = { tests = let diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index aa62c778a3fd..569424b00d6a 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -21,12 +21,13 @@ nixosTests, jitSupport, llvm, + buildPostgresqlExtension, }: let gdal = gdalMinimal; in -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "postgis"; version = "3.5.0"; @@ -42,7 +43,6 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 - postgresql geos proj gdal @@ -68,20 +68,18 @@ stdenv.mkDerivation rec { # postgis config directory assumes /include /lib from the same root for json-c library env.NIX_LDFLAGS = "-L${lib.getLib json_c}/lib"; + setOutputFlags = false; preConfigure = '' sed -i 's@/usr/bin/file@${file}/bin/file@' configure - configureFlags="--datadir=$out/share/postgresql --datarootdir=$out/share/postgresql --bindir=$out/bin --docdir=$doc/share/doc/${pname} --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev} --disable-extension-upgrades-install" - - makeFlags="PERL=${perl}/bin/perl datadir=$out/share/postgresql pkglibdir=$out/lib bindir=$out/bin docdir=$doc/share/doc/${pname}" ''; + + configureFlags = [ + "--with-gdalconfig=${gdal}/bin/gdal-config" + "--with-jsondir=${json_c.dev}" + "--disable-extension-upgrades-install" + ]; + postConfigure = '' - sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ; - s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g - " \ - "raster/loader/Makefile"; - sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g - " \ - "raster/scripts/python/Makefile"; mkdir -p $out/bin # postgis' build system assumes it is being installed to the same place as postgresql, and looks @@ -89,12 +87,13 @@ stdenv.mkDerivation rec { ln -s ${postgresql}/bin/postgres $out/bin/postgres ''; + makeFlags = [ + "PERL=${perl}/bin/perl" + ]; + doCheck = stdenv.hostPlatform.isLinux; preCheck = '' - substituteInPlace regress/run_test.pl --replace-fail "/share/contrib/postgis" "$out/share/postgresql/contrib/postgis" - substituteInPlace regress/Makefile --replace-fail 's,\$$libdir,$(REGRESS_INSTALLDIR)/lib,g' "s,\\$\$libdir,$PWD/regress/00-regress-install$out/lib,g" \ - --replace-fail '$(REGRESS_INSTALLDIR)/share/contrib/postgis/*.sql' "$PWD/regress/00-regress-install$out/share/postgresql/contrib/postgis/*.sql" substituteInPlace doc/postgis-out.xml --replace-fail "http://docbook.org/xml/5.0/dtd/docbook.dtd" "${docbook5}/xml/dtd/docbook/docbookx.dtd" # The test suite hardcodes it to use /tmp. export PGIS_REG_TMPDIR="$TMPDIR/pgis_reg" diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/repmgr.nix index 728f3b348c69..c4203b42f362 100644 --- a/pkgs/servers/sql/postgresql/ext/repmgr.nix +++ b/pkgs/servers/sql/postgresql/ext/repmgr.nix @@ -5,9 +5,10 @@ , flex , curl , json_c +, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "repmgr"; version = "5.4.1"; @@ -20,16 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex ]; - buildInputs = postgresql.buildInputs ++ [ postgresql curl json_c ]; - - installPhase = '' - mkdir -p $out/{bin,lib,share/postgresql/extension} - - cp repmgr{,d} $out/bin - cp *${postgresql.dlSuffix} $out/lib - cp *.sql $out/share/postgresql/extension - cp *.control $out/share/postgresql/extension - ''; + buildInputs = postgresql.buildInputs ++ [ curl json_c ]; meta = with lib; { homepage = "https://repmgr.org/"; diff --git a/pkgs/servers/sql/postgresql/ext/rum.nix b/pkgs/servers/sql/postgresql/ext/rum.nix index 629fddfcbb30..f681efd5b9df 100644 --- a/pkgs/servers/sql/postgresql/ext/rum.nix +++ b/pkgs/servers/sql/postgresql/ext/rum.nix @@ -4,9 +4,10 @@ fetchFromGitHub, postgresql, postgresqlTestHook, + buildPostgresqlExtension, }: -stdenv.mkDerivation (finalAttrs: { +buildPostgresqlExtension (finalAttrs: { pname = "rum"; version = "1.3.14"; @@ -17,16 +18,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-VsfpxQqRBu9bIAP+TfMRXd+B3hSjuhU2NsutocNiCt8="; }; - buildInputs = [ postgresql ]; - makeFlags = [ "USE_PGXS=1" ]; - installPhase = '' - install -D -t $out/lib *${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.control - install -D -t $out/share/postgresql/extension *.sql - ''; - passthru.tests.extension = stdenv.mkDerivation { inherit (finalAttrs) version; pname = "rum-test"; diff --git a/pkgs/servers/sql/postgresql/ext/smlar.nix b/pkgs/servers/sql/postgresql/ext/smlar.nix index 4188c3b9c99a..478abc1b0b9a 100644 --- a/pkgs/servers/sql/postgresql/ext/smlar.nix +++ b/pkgs/servers/sql/postgresql/ext/smlar.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchgit, postgresql }: +{ lib, stdenv, fetchgit, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "smlar-unstable"; version = "2021-11-08"; @@ -10,16 +10,8 @@ stdenv.mkDerivation rec { hash = "sha256-AC6w7uYw0OW70pQpWbK1A3rkCnMvTJzTCAdFiY3rO7A="; }; - buildInputs = [ postgresql ]; - makeFlags = [ "USE_PGXS=1" ]; - installPhase = '' - install -D -t $out/lib *.so - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - ''; - meta = with lib; { description = "Compute similary of any one-dimensional arrays"; homepage = "http://sigaev.ru/git/gitweb.cgi?p=smlar.git"; diff --git a/pkgs/servers/sql/postgresql/ext/system_stats.nix b/pkgs/servers/sql/postgresql/ext/system_stats.nix index c1700fc0380d..7d6e26fa5118 100644 --- a/pkgs/servers/sql/postgresql/ext/system_stats.nix +++ b/pkgs/servers/sql/postgresql/ext/system_stats.nix @@ -3,13 +3,12 @@ lib, stdenv, postgresql, + buildPostgresqlExtension, }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "system_stats"; version = "3.2"; - buildInputs = [ postgresql ]; - src = fetchFromGitHub { owner = "EnterpriseDB"; repo = "system_stats"; @@ -17,18 +16,6 @@ stdenv.mkDerivation rec { hash = "sha256-/xXnui0S0ZjRw7P8kMAgttHVv8T41aOhM3pM8P0OTig="; }; - installPhase = '' - runHook preInstall - - mkdir -p $out/{lib,share/postgresql/extension} - - cp *${postgresql.dlSuffix} $out/lib - cp *.sql $out/share/postgresql/extension - cp *.control $out/share/postgresql/extension - - runHook postInstall - ''; - meta = with lib; { description = "A Postgres extension for exposing system metrics such as CPU, memory and disk information"; homepage = "https://github.com/EnterpriseDB/system_stats"; diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix index 2dbf344fc624..97d5dec1566c 100644 --- a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, freetds, unstableGitUpdater }: +{ lib, stdenv, fetchFromGitHub, postgresql, freetds, unstableGitUpdater, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "tds_fdw"; version = "2.0.4"; - buildInputs = [ postgresql freetds ]; + buildInputs = [ freetds ]; src = fetchFromGitHub { owner = "tds-fdw"; @@ -13,13 +13,6 @@ stdenv.mkDerivation rec { hash = "sha256-ruelOHueaHx1royLPvDM8Abd1rQD62R4KXgtHY9qqTw="; }; - installPhase = '' - version="$(sed -En "s,^default_version *= *'([^']*)'.*,\1,p" tds_fdw.control)" - install -D tds_fdw${postgresql.dlSuffix} -t $out/lib - install -D sql/tds_fdw.sql "$out/share/postgresql/extension/tds_fdw--$version.sql" - install -D tds_fdw.control -t $out/share/postgresql/extension - ''; - meta = with lib; { description = "PostgreSQL foreign data wrapper to connect to TDS databases (Sybase and Microsoft SQL Server)"; homepage = "https://github.com/tds-fdw/tds_fdw"; diff --git a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix index cb401829b242..0be3dd60db8d 100644 --- a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix +++ b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix @@ -1,11 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "temporal_tables"; version = "1.2.2"; - buildInputs = [ postgresql ]; - src = fetchFromGitHub { owner = "arkhipov"; repo = "temporal_tables"; @@ -13,12 +11,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-7+DCSPAPhsokWDq/5IXNhd7jY6FfzxxUjlsg/VJeD3k="; }; - installPhase = '' - install -D -t $out/lib temporal_tables${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension *.sql - install -D -t $out/share/postgresql/extension *.control - ''; - meta = with lib; { description = "Temporal Tables PostgreSQL Extension"; homepage = "https://github.com/arkhipov/temporal_tables"; diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 60e14e922835..baa338d2d8c0 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, cmake, postgresql, openssl, libkrb5, nixosTests, enableUnfree ? true }: +{ lib, stdenv, fetchFromGitHub, cmake, postgresql, openssl, libkrb5, nixosTests, enableUnfree ? true, buildPostgresqlExtension }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; version = "2.14.2"; nativeBuildInputs = [ cmake ]; - buildInputs = [ postgresql openssl libkrb5 ]; + buildInputs = [ openssl libkrb5 ]; src = fetchFromGitHub { owner = "timescale"; diff --git a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix index b42095acd715..d1e1fe4741df 100644 --- a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix +++ b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, postgresql }: +{ lib, stdenv, fetchFromGitHub, postgresql, buildPostgresqlExtension }: -stdenv.mkDerivation { +buildPostgresqlExtension { pname = "tsearch-extras"; version = "0.4"; @@ -11,13 +11,6 @@ stdenv.mkDerivation { sha256 = "18j0saqblg3jhrz38splk173xjwdf32c67ymm18m8n5y94h8d2ba"; }; - buildInputs = [ postgresql ]; - - installPhase = '' - install -D tsearch_extras${postgresql.dlSuffix} -t $out/lib/ - install -D ./{tsearch_extras--1.0.sql,tsearch_extras.control} -t $out/share/postgresql/extension - ''; - meta = with lib; { description = "Provides a few PostgreSQL functions for a lower-level data full text search"; homepage = "https://github.com/zulip/tsearch_extras/"; diff --git a/pkgs/servers/sql/postgresql/ext/tsja.nix b/pkgs/servers/sql/postgresql/ext/tsja.nix index f0b9238f59ef..ed1aacca53d9 100644 --- a/pkgs/servers/sql/postgresql/ext/tsja.nix +++ b/pkgs/servers/sql/postgresql/ext/tsja.nix @@ -2,7 +2,6 @@ , fetchzip , nixosTests , stdenv - , mecab , postgresql }: diff --git a/pkgs/servers/sql/postgresql/ext/wal2json.nix b/pkgs/servers/sql/postgresql/ext/wal2json.nix index 4a1c9b18b13b..4df277e5e496 100644 --- a/pkgs/servers/sql/postgresql/ext/wal2json.nix +++ b/pkgs/servers/sql/postgresql/ext/wal2json.nix @@ -4,9 +4,10 @@ callPackage, fetchFromGitHub, postgresql, + buildPostgresqlExtension, }: -stdenv.mkDerivation rec { +buildPostgresqlExtension rec { pname = "wal2json"; version = "2.6"; @@ -17,15 +18,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-+QoACPCKiFfuT2lJfSUmgfzC5MXf75KpSoc2PzPxKyM="; }; - buildInputs = [ postgresql ]; - makeFlags = [ "USE_PGXS=1" ]; - installPhase = '' - install -D -t $out/lib *${postgresql.dlSuffix} - install -D -t $out/share/postgresql/extension sql/*.sql - ''; - passthru.tests.wal2json = lib.recurseIntoAttrs ( callPackage ../../../../../nixos/tests/postgresql-wal2json.nix { inherit (stdenv) system; diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 57aa6a8144a0..0b37507e899b 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -289,6 +289,7 @@ let ''; installPhase = "touch $out"; } // extraArgs); + buildPostgresqlExtension = newSuper.callPackage ./buildPostgresqlExtension.nix {}; }; newSelf = self // scope; newSuper = { callPackage = newScope (scope // this.pkgs); }; From 629cfe1d2de0a9895dbb1ff09d3c6a34a1d196cb Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 27 Oct 2024 19:05:08 +0100 Subject: [PATCH 198/617] sqlite: split man into man output, add documentation as doc The full sqlite documentation is now available in the `doc` output, and the manual is in `man`. --- pkgs/development/libraries/sqlite/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 63e2572614fa..df28ee6cb39b 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, zlib, readline, ncurses +{ lib, stdenv, fetchurl, unzip, zlib, readline, ncurses , updateAutotoolsGnuConfigScriptsHook # for tests @@ -24,11 +24,15 @@ stdenv.mkDerivation rec { url = "https://sqlite.org/2024/sqlite-autoconf-${archiveVersion version}.tar.gz"; hash = "sha256-Z9P+bSaObq3crjcn/OWPzI6cU4ab3Qegxh443fKWUHE="; }; + docsrc = fetchurl { + url = "https://sqlite.org/2024/sqlite-doc-${archiveVersion version}.zip"; + hash = "sha256-6WkTH5PKefvGTVdyShA1c1iBVVpSYA2+acaeq3LJ/NE="; + }; - outputs = [ "bin" "dev" "out" ]; + outputs = [ "bin" "dev" "man" "doc" "out" ]; separateDebugInfo = stdenv.hostPlatform.isLinux; - nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook unzip ]; buildInputs = [ zlib ] ++ lib.optionals interactive [ readline ncurses ]; # required for aarch64 but applied for all arches for simplicity @@ -82,6 +86,10 @@ stdenv.mkDerivation rec { postInstall = '' # Do not contaminate dependent libtool-based projects with sqlite dependencies. sed -i $out/lib/libsqlite3.la -e "s/dependency_libs=.*/dependency_libs='''/" + + mkdir -p $doc/share/doc + unzip $docsrc + mv sqlite-doc-${archiveVersion version} $doc/share/doc/sqlite ''; doCheck = false; # fails to link against tcl From 5e5aa9dd40d4d59d3245c66a1070172164a6f4a2 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 29 Oct 2024 03:30:30 +0000 Subject: [PATCH 199/617] qt6Packages.qtbase: remove obsolete Darwin patch This is so satisfying to do. --- pkgs/development/libraries/qt-6/default.nix | 1 - .../libraries/qt-6/modules/qtbase.nix | 25 +- ...-qtbase-qmake-fix-mkspecs-for-darwin.patch | 469 ------------------ 3 files changed, 23 insertions(+), 472 deletions(-) delete mode 100644 pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index e090744bc463..7159bc6ae055 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -54,7 +54,6 @@ let inherit (srcs.qtbase) src version; patches = [ ./patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch - ./patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch ./patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch ./patches/0004-qtbase-qt-cmake-always-use-cmake-from-path.patch ./patches/0005-qtbase-find-tools-in-PATH.patch diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index 78365891d6fb..d3754495d5be 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -177,7 +177,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which cmake xmlstarlet ninja ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ]; - propagatedNativeBuildInputs = [ lndir ]; + propagatedNativeBuildInputs = [ lndir ] + # I’m not sure if this is necessary, but the macOS mkspecs stuff + # tries to call `xcrun xcodebuild`, so better safe than sorry. + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; strictDeps = true; @@ -186,7 +189,24 @@ stdenv.mkDerivation rec { inherit patches; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace cmake/QtPublicAppleHelpers.cmake --replace-fail "/usr/bin/xcrun" "${xcbuild}/bin/xcrun" + # TODO: Verify that this catches all the occurrences? + for file in \ + cmake/QtPublicAppleHelpers.cmake \ + mkspecs/features/mac/asset_catalogs.prf \ + mkspecs/features/mac/default_pre.prf \ + mkspecs/features/mac/sdk.mk \ + mkspecs/features/mac/sdk.prf \ + mkspecs/features/permissions.prf \ + src/corelib/Qt6CoreMacros.cmake + do + substituteInPlace "$file" \ + --replace-quiet /usr/bin/xcrun '${lib.getExe' xcbuild "xcrun"}' \ + --replace-quiet /usr/bin/xcode-select '${lib.getExe' xcbuild "xcode-select"}' \ + --replace-quiet /usr/libexec/PlistBuddy '${lib.getExe' xcbuild "PlistBuddy"}' + done + + substituteInPlace mkspecs/common/macx.conf \ + --replace-fail 'CONFIG += ' 'CONFIG += no_default_rpath ' ''; fix_qt_builtin_paths = ../hooks/fix-qt-builtin-paths.sh; @@ -211,6 +231,7 @@ stdenv.mkDerivation rec { "-DQT_FEATURE_journald=${if systemdSupport then "ON" else "OFF"}" "-DQT_FEATURE_vulkan=ON" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "-DQT_FEATURE_rpath=OFF" # error: 'path' is unavailable: introduced in macOS 10.15 "-DQT_FEATURE_cxx17_filesystem=OFF" ] ++ lib.optionals isCrossBuild [ diff --git a/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch b/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch deleted file mode 100644 index fbe49379533b..000000000000 --- a/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch +++ /dev/null @@ -1,469 +0,0 @@ -diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf -index 61bea952b2..9909dae726 100644 ---- a/mkspecs/common/mac.conf -+++ b/mkspecs/common/mac.conf -@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ - - QMAKE_FIX_RPATH = install_name_tool -id - --QMAKE_LFLAGS_RPATH = -Wl,-rpath, -+QMAKE_LFLAGS_RPATH = - QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip - - QMAKE_LFLAGS_REL_RPATH = -diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index 22c84d6473..4d46762bec 100644 ---- a/mkspecs/features/mac/default_post.prf -+++ b/mkspecs/features/mac/default_post.prf -@@ -15,278 +15,10 @@ contains(TEMPLATE, .*app) { - - QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk) - } -- -- # Detect incompatible SDK versions -- # The CMake equivalent is in cmake/QtPublicAppleHelpers.cmake. -- -- isEmpty(QT_MAC_SDK_VERSION_MIN): \ -- QT_MAC_SDK_VERSION_MIN = $$QT_MAC_SDK_VERSION -- -- !versionAtLeast(QMAKE_MAC_SDK_VERSION, $$QT_MAC_SDK_VERSION_MIN): \ -- warning("Qt requires at least version $$QT_MAC_SDK_VERSION_MIN of the platform SDK," \ -- "you're building against version $${QMAKE_MAC_SDK_VERSION}. Please upgrade.") -- -- !isEmpty(QT_MAC_SDK_VERSION_MAX) { -- # For Qt developers only -- !isEmpty($$list($$(QT_MAC_SDK_NO_VERSION_CHECK))): \ -- CONFIG += sdk_no_version_check -- -- QMAKE_MAC_SDK_MAJOR_VERSION = $$replace(QMAKE_MAC_SDK_VERSION, "(\\d+)(\\.\\d+)(\\.\\d+)?", \\1) -- -- !sdk_no_version_check:!versionAtMost(QMAKE_MAC_SDK_MAJOR_VERSION, $$QT_MAC_SDK_VERSION_MAX) { -- warning("Qt has only been tested with version $$QT_MAC_SDK_VERSION_MAX"\ -- "of the platform SDK, you're using $${QMAKE_MAC_SDK_MAJOR_VERSION}.") -- warning("This is an unsupported configuration. You may experience build issues," \ -- "and by using") -- warning("the $$QMAKE_MAC_SDK_VERSION SDK you are opting in to new features" \ -- "that Qt has not been prepared for.") -- -- warning("Please downgrade the SDK you use to build your app to version" \ -- "$$QT_MAC_SDK_VERSION_MAX, or configure") -- warning("with CONFIG+=sdk_no_version_check when running qmake" \ -- "to silence this warning.") -- } -- } - } - - !no_objective_c:CONFIG += objective_c - --# Add the same default rpaths as Xcode does for new projects. --# This is especially important for iOS/tvOS/watchOS where no other option is possible. --!no_default_rpath { -- uikit: QMAKE_RPATHDIR += @executable_path/Frameworks -- else: QMAKE_RPATHDIR += @executable_path/../Frameworks -- equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks --} -- --# Don't pass -headerpad_max_install_names when using Bitcode. --# In that case the linker emits a warning stating that the flag is ignored when --# used with bitcode, for reasons that cannot be determined (rdar://problem/20748962). --# Using this flag is also unnecessary in practice on UIKit platforms since they --# are sandboxed, and only UIKit platforms support bitcode to begin with. --!bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD -- --app_extension_api_only { -- QMAKE_CFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_CXXFLAGS_PRECOMPILE += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION --} -- --macos { -- !isEmpty(QMAKE_APPLE_DEVICE_ARCHS) { -- # If the user has requested a specific set of architectures, -- # build all of those by default, but limited to only those. -- CONFIG -= only_active_arch -- } else { -- # Otherwise allow building all of the architectures available -- # in Qt, but only build the active arch (unless the user has -- # manually overridden this via CONFIG -= only_active_arch). -- QMAKE_APPLE_DEVICE_ARCHS = $$QT_ARCHS -- } --} -- --macx-xcode { -- qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO -- !isEmpty(QMAKE_PKGINFO_TYPEINFO): \ -- qmake_pkginfo_typeinfo.value = $$QMAKE_PKGINFO_TYPEINFO -- else: \ -- qmake_pkginfo_typeinfo.value = "????" -- QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo -- -- bundle_version = $$VERSION -- isEmpty(bundle_version): bundle_version = 1.0.0 -- -- l = $$split(bundle_version, '.') 0 0 # make sure there are at least three -- VER_MAJ = $$member(l, 0, 0) -- VER_MIN = $$member(l, 1, 1) -- VER_PAT = $$member(l, 2, 2) -- unset(l) -- -- qmake_full_version.name = QMAKE_FULL_VERSION -- qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} -- QMAKE_MAC_XCODE_SETTINGS += qmake_full_version -- -- qmake_short_version.name = QMAKE_SHORT_VERSION -- qmake_short_version.value = $${VER_MAJ}.$${VER_MIN} -- QMAKE_MAC_XCODE_SETTINGS += qmake_short_version -- -- !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) { -- debug_information_format.name = DEBUG_INFORMATION_FORMAT -- debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT -- debug_information_format.build = debug -- QMAKE_MAC_XCODE_SETTINGS += debug_information_format -- } -- -- QMAKE_XCODE_ARCHS = -- -- !isEmpty(QMAKE_APPLE_DEVICE_ARCHS) { -- arch_device.name = "ARCHS[sdk=$${device.sdk}*]" -- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS -- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS -- QMAKE_MAC_XCODE_SETTINGS += arch_device -- } -- -- ios:simulator { -- arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]" -- arch_simulator.value = $$QMAKE_APPLE_SIMULATOR_ARCHS -- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS -- QMAKE_MAC_XCODE_SETTINGS += arch_simulator -- } -- -- only_active_arch.name = ONLY_ACTIVE_ARCH -- only_active_arch.value = YES -- only_active_arch.build = debug -- QMAKE_MAC_XCODE_SETTINGS += only_active_arch --} else { -- device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS -- ios:simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS -- VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS -- -- single_arch: VALID_ARCHS = $$first(VALID_ARCHS) -- -- macos { -- only_active_arch: DEFAULT_ARCHS = $$system("uname -m") -- else: DEFAULT_ARCHS = $$VALID_ARCHS -- } -- -- ARCHS = $(filter $(EXPORT_VALID_ARCHS), \ -- $(if $(ARCHS), $(ARCHS), \ -- $(if $(EXPORT_DEFAULT_ARCHS), $(EXPORT_DEFAULT_ARCHS), \ -- $(EXPORT_VALID_ARCHS)))) -- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ARCHS), $(EXPORT_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) -- -- QMAKE_EXTRA_VARIABLES += VALID_ARCHS DEFAULT_ARCHS ARCHS ARCH_ARGS -- -- arch_flags = $(EXPORT_ARCH_ARGS) -- -- QMAKE_CFLAGS += $$arch_flags -- QMAKE_CXXFLAGS += $$arch_flags -- QMAKE_LFLAGS += $$arch_flags -- -- QMAKE_PCH_ARCHS = $$VALID_ARCHS -- -- macos: deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET -- ios: deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET -- tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET -- watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET -- -- # If we're doing a simulator and device build, device and simulator -- # architectures use different paths and flags for the sysroot and -- # deployment target switch, so we must multiplex them across multiple -- # architectures using -Xarch. Otherwise we fall back to the simple path. -- # This is not strictly necessary, but results in cleaner command lines -- # and makes it easier for people to override EXPORT_VALID_ARCHS to limit -- # individual rules to a different set of architecture(s) from the overall -- # build (such as machtest in QtCore). -- ios:simulator:device { -- QMAKE_XARCH_CFLAGS = -- QMAKE_XARCH_LFLAGS = -- QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS -- -- for (arch, VALID_ARCHS) { -- contains(VALID_SIMULATOR_ARCHS, $$arch) { -- sdk = $$simulator.sdk -- version_identifier = $$simulator.deployment_identifier -- platform_identifier = $$simulator.sdk -- } else { -- sdk = $$device.sdk -- version_identifier = $$device.deployment_identifier -- platform_identifier = $$device.sdk -- } -- -- version_min_flags = \ -- -Xarch_$${arch} \ -- -m$${version_identifier}-version-min=$$deployment_target -- QMAKE_XARCH_CFLAGS_$${arch} = $$version_min_flags \ -- -Xarch_$${arch} \ -- -isysroot$$xcodeSDKInfo(Path, $$sdk) -- QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \ -- -Xarch_$${arch} \ -- -isysroot$$xcodeSDKInfo(Path, $$sdk) -- -- QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch}) -- QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch}) -- -- QMAKE_EXTRA_VARIABLES += \ -- QMAKE_XARCH_CFLAGS_$${arch} \ -- QMAKE_XARCH_LFLAGS_$${arch} -- } -- -- QMAKE_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) -- QMAKE_CXXFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) -- QMAKE_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS) -- } else { -- ios:simulator { -- version_identifier = $$simulator.deployment_identifier -- platform_identifier = $$simulator.sdk -- sysroot_path = $$xcodeSDKInfo(Path, $$simulator.sdk) -- } else { -- version_identifier = $$device.deployment_identifier -- platform_identifier = $$device.sdk -- sysroot_path = $$xcodeSDKInfo(Path, $$device.sdk) -- } -- QMAKE_CFLAGS += -isysroot $$sysroot_path -- QMAKE_CXXFLAGS += -isysroot $$sysroot_path -- QMAKE_LFLAGS += -isysroot $$sysroot_path -- -- !isEmpty(version_identifier):!isEmpty(deployment_target) { -- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target -- QMAKE_CFLAGS += $$version_min_flag -- QMAKE_CXXFLAGS += $$version_min_flag -- QMAKE_LFLAGS += $$version_min_flag -- } -- } -- -- # Enable precompiled headers for multiple architectures -- QMAKE_CFLAGS_USE_PRECOMPILE = -- for (arch, VALID_ARCHS) { -- icc_pch_style: \ -- use_flag = "-pch-use " -- else: \ -- use_flag = -include -- -- # Only use Xarch with multi-arch, as the option confuses ccache -- count(VALID_ARCHS, 1, greaterThan): \ -- QMAKE_CFLAGS_USE_PRECOMPILE += \ -- -Xarch_$${arch} -- -- QMAKE_CFLAGS_USE_PRECOMPILE += \ -- $${use_flag}${QMAKE_PCH_OUTPUT_$${arch}} -- } -- icc_pch_style { -- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include ${QMAKE_PCH_INPUT} -- QMAKE_CFLAGS_USE_PRECOMPILE = -- } else { -- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- } -- -- QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT} --} -- --!equals(sdk_version, $$QMAKE_MAC_SDK_VERSION) { -- # Explicit SDK version has been set, respect that -- QMAKE_LFLAGS += -Wl,-sdk_version -Wl,$$sdk_version --} -- --cache(QMAKE_XCODE_DEVELOPER_PATH, stash) --!isEmpty(QMAKE_XCODE_VERSION): \ -- cache(QMAKE_XCODE_VERSION, stash) -- --QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() -- --xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER --xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX --isEmpty(xcode_product_bundle_identifier_setting.value): \ -- xcode_product_bundle_identifier_setting.value = "com.yourcompany" --xcode_product_bundle_target = $$QMAKE_BUNDLE --isEmpty(xcode_product_bundle_target): \ -- xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier} --xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}" --QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting -- - !macx-xcode { - generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS - generate_xcode_project.target = xcodeproj -diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index e3534561a5..3b01424e67 100644 ---- a/mkspecs/features/mac/default_pre.prf -+++ b/mkspecs/features/mac/default_pre.prf -@@ -1,60 +1,2 @@ - CONFIG = asset_catalogs rez $$CONFIG - load(default_pre) -- --isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { -- # Get path of Xcode's Developer directory -- QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null") -- isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \ -- error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.") -- -- # Make sure Xcode path is valid -- !exists($$QMAKE_XCODE_DEVELOPER_PATH): \ -- error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") --} -- --isEmpty(QMAKE_XCODEBUILD_PATH): \ -- QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null") -- --!isEmpty(QMAKE_XCODEBUILD_PATH) { -- # Make sure Xcode is set up properly -- !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \ -- error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.") -- -- isEmpty(QMAKE_XCODE_VERSION) { -- # Extract Xcode version using xcodebuild -- xcode_version = $$system("/usr/bin/xcrun xcodebuild -version") -- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) -- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") -- unset(xcode_version) -- } --} -- --isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) { -- QMAKE_XCODE_PREFERENCES_FILE = $$(HOME)/Library/Preferences/com.apple.dt.Xcode.plist -- exists($$QMAKE_XCODE_PREFERENCES_FILE): \ -- QMAKE_TARGET_BUNDLE_PREFIX = $$system("/usr/libexec/PlistBuddy -c 'print IDETemplateOptions:bundleIdentifierPrefix' $$QMAKE_XCODE_PREFERENCES_FILE 2>/dev/null") -- -- !isEmpty(_QMAKE_CACHE_):!isEmpty(QMAKE_TARGET_BUNDLE_PREFIX): \ -- cache(QMAKE_TARGET_BUNDLE_PREFIX) --} -- --QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon -- --# Make the default debug info format for static debug builds --# DWARF instead of DWARF with dSYM. This cuts down build times --# for application debug builds significantly, as Xcode doesn't --# have to pull out all the DWARF info from the Qt static libs --# and put it into a dSYM file. We don't need that dSYM file in --# the first place, since the information is available in the --# object files inside the archives (static libraries). --macx-xcode:qtConfig(static): \ -- QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf -- --# This variable is used by the xcode_dynamic_library_suffix --# feature, which allows Xcode to choose the Qt libraries to link to --# at build time, depending on the current Xcode SDK and configuration. --QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX -- --xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP --xcode_copy_phase_strip_setting.value = NO --QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting -diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk -index a32ceacb6c..e69de29bb2 100644 ---- a/mkspecs/features/mac/sdk.mk -+++ b/mkspecs/features/mac/sdk.mk -@@ -1,27 +0,0 @@ -- --ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),) -- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>/dev/null -- CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND)) -- ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION)) -- # We don't want to complain about out of date SDK unless the target needs to be remade. -- # This covers use-cases such as running 'make check' after moving the build to a -- # computer without Xcode or with a different Xcode version. -- TARGET_UP_TO_DATE := $(shell QT_MAC_SDK_NO_VERSION_CHECK=1 $(MAKE) --question $(QMAKE_TARGET) && echo 1 || echo 0) -- ifeq ($(TARGET_UP_TO_DATE),0) -- ifneq ($(findstring missing DEVELOPER_DIR path,$(CURRENT_MAC_SDK_VERSION)),) -- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) is no longer valid.) -- else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),) -- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.) -- else ifneq ($(CURRENT_MAC_SDK_VERSION),) -- $(info The $(EXPORT_QMAKE_MAC_SDK) platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) -- else -- $(info Unknown error resolving current platform SDK version.) -- endif -- $(info This requires a fresh build of your project. Please wipe the build directory) -- ifneq ($(EXPORT__QMAKE_STASH_),) -- $(info including the qmake cache in $(EXPORT__QMAKE_STASH_)) -- endif -- $(error ^) -- endif -- endif --endif -diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -index 3a9c2778bb..e69de29bb2 100644 ---- a/mkspecs/features/mac/sdk.prf -+++ b/mkspecs/features/mac/sdk.prf -@@ -1,61 +0,0 @@ -- --isEmpty(QMAKE_MAC_SDK): \ -- error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") -- --contains(QMAKE_MAC_SDK, .*/.*): \ -- error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)") -- --defineReplace(xcodeSDKInfo) { -- info = $$1 -- equals(info, "Path"): \ -- infoarg = --show-sdk-path -- equals(info, "PlatformPath"): \ -- infoarg = --show-sdk-platform-path -- equals(info, "SDKVersion"): \ -- infoarg = --show-sdk-version -- sdk = $$2 -- isEmpty(sdk): \ -- sdk = $$QMAKE_MAC_SDK -- -- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { -- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$infoarg 2>/dev/null") -- # --show-sdk-platform-path won't work for Command Line Tools; this is fine -- # only used by the XCTest backend to testlib -- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(infoarg, "--show-sdk-platform-path")): \ -- error("Could not resolve SDK $$info for \'$$sdk\' using $$infoarg") -- cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) -- } -- -- return($$eval(QMAKE_MAC_SDK.$${sdk}.$${info})) --} -- --QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path) --QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath) --QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) -- --isEmpty(QMAKE_EXPORT_INCDIR_OPENGL) { -- QMAKE_EXPORT_INCDIR_OPENGL = $$QMAKE_INCDIR_OPENGL -- sysrootified = -- for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val -- QMAKE_INCDIR_OPENGL = $$sysrootified --} -- --QMAKESPEC_NAME = $$basename(QMAKESPEC) -- --# Resolve SDK version of various tools --for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL QMAKE_LINK_C QMAKE_LINK_C_SHLIB)) { -- tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool} -- !isEmpty($$tool_variable) { -- $$tool = $$eval($$tool_variable) -- next() -- } -- -- value = $$eval($$tool) -- isEmpty(value): next() -- -- sysrooted = $$system("/usr/bin/xcrun -sdk $$QMAKE_MAC_SDK -find $$first(value) 2>/dev/null") -- isEmpty(sysrooted): next() -- -- $$tool = $$sysrooted $$member(value, 1, -1) -- cache($$tool_variable, set stash, $$tool) --} -diff --git a/mkspecs/features/mac/toolchain.prf b/mkspecs/features/mac/toolchain.prf -index df191eb13c..e69de29bb2 100644 ---- a/mkspecs/features/mac/toolchain.prf -+++ b/mkspecs/features/mac/toolchain.prf -@@ -1,5 +0,0 @@ --# Ensure that we process sdk.prf first, as it will update QMAKE_CXX, --# which the default path determination uses. --sdk: load(sdk) -- --load(toolchain) From 2b2e4d03e3a1f5ab568e741e78cae179cbebd01d Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 29 Oct 2024 03:45:13 +0000 Subject: [PATCH 200/617] qt6Packages.qtbase: remove obsolete Darwin flags Our deployment target is higher than macOS 10.15 now, and it looks like upstream handle GSS correctly these days. --- pkgs/development/libraries/qt-6/modules/qtbase.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index d3754495d5be..fd164b5e76f8 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -232,19 +232,12 @@ stdenv.mkDerivation rec { "-DQT_FEATURE_vulkan=ON" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DQT_FEATURE_rpath=OFF" - # error: 'path' is unavailable: introduced in macOS 10.15 - "-DQT_FEATURE_cxx17_filesystem=OFF" ] ++ lib.optionals isCrossBuild [ "-DQT_HOST_PATH=${pkgsBuildBuild.qt6.qtbase}" "-DQt6HostInfo_DIR=${pkgsBuildBuild.qt6.qtbase}/lib/cmake/Qt6HostInfo" ] ++ lib.optional (qttranslations != null && !isCrossBuild) "-DINSTALL_TRANSLATIONSDIR=${qttranslations}/translations"; - env.NIX_LDFLAGS = toString (lib.optionals stdenv.hostPlatform.isDarwin [ - # Undefined symbols for architecture arm64: "___gss_c_nt_hostbased_service_oid_desc" - "-framework GSS" - ]); - env.NIX_CFLAGS_COMPILE = "-DNIXPKGS_QT_PLUGIN_PREFIX=\"${qtPluginPrefix}\""; outputs = [ "out" "dev" ]; From 05054bce8a1081fdb2ff9cc957e542d05dde7f59 Mon Sep 17 00:00:00 2001 From: Reno Dakota <170618376+paparodeo@users.noreply.github.com> Date: Mon, 28 Oct 2024 07:53:37 +0000 Subject: [PATCH 201/617] cdparanoia: fix darwin; add security patches patches are from macports and debian: - add patches to include files containing function prototypes on darwin - fix fprintf format error -- use "%s" buffer - check buffer for null before dereferencing - use labs for long - scan additional ides 4-9 --- .../applications/audio/cdparanoia/default.nix | 39 +++++++++++++------ pkgs/top-level/all-packages.nix | 5 +-- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index bdeb8eec896d..3f15f90f5b78 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch , updateAutotoolsGnuConfigScriptsHook, autoreconfHook -, IOKit, Carbon }: stdenv.mkDerivation rec { @@ -14,8 +13,8 @@ stdenv.mkDerivation rec { patches = lib.optionals stdenv.hostPlatform.isDarwin [ (fetchpatch { - url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/osx_interface.patch"; - sha256 = "0hq3lvfr0h1m3p0r33jij0s1aspiqlpy533rwv19zrfllb39qvr8"; + url = "https://github.com/macports/macports-ports/raw/c8e15973bc3c1e1ab371bc0ee2de14209e639f17/audio/cdparanoia/files/osx_interface.patch"; + hash = "sha256-9p4+9dRvqLHkpR0RWLQcNL1m7fb7L6r+c9Q2tt4jh0U="; # Our configure patch will subsume it, but we want our configure # patch to be used on all platforms so we cannot just start where # this leaves off. @@ -23,13 +22,38 @@ stdenv.mkDerivation rec { }) (fetchurl { url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/patch-paranoia_paranoia.c.10.4.diff"; - sha256 = "17l2qhn8sh4jy6ryy5si6ll6dndcm0r537rlmk4a6a8vkn852vad"; + hash = "sha256-TW1RkJ0bKaPIrDSfUTKorNlmKDVRF++z8ZJAjSzEgp4="; + }) + # add missing include files needed for function prototypes + (fetchpatch { + url = "https://github.com/macports/macports-ports/raw/f210a6061bc53c746730a37922399c6de6d69cb7/audio/cdparanoia/files/fixing-include.patch"; + hash = "sha256-6a/u4b8/H/4XjyFup23xySgyAI9SMVMom4PLvH8KzhE="; }) ] ++ [ # Has to come after darwin patches ./fix_private_keyword.patch # Order does not matter ./configure.patch + # labs for long + (fetchpatch { + url = "https://github.com/macports/macports-ports/raw/f210a6061bc53c746730a37922399c6de6d69cb7/audio/cdparanoia/files/fixing-labs.patch"; + hash = "sha256-BMMQ5bbPP3eevuwWUVjQCtRBiWbkAHD+O0C0fp+BPaw="; + }) + # use "%s" for passing a buffer to fprintf + (fetchpatch { + url = "https://github.com/macports/macports-ports/raw/f210a6061bc53c746730a37922399c6de6d69cb7/audio/cdparanoia/files/fixing-fprintf.patch"; + hash = "sha256-2dJl16p+f5l3wxVOJhsuLiQ9a4prq7jsRZP8/ygEae4="; + }) + # add support for IDE4-9 + (fetchpatch { + url = "https://salsa.debian.org/optical-media-team/cdparanoia/-/raw/bbf353721834b3784ccc0fd54a36a6b25181f5a4/debian/patches/02-ide-devices.patch"; + hash = "sha256-S6OzftUIPPq9JHsoAE2K51ltsI1WkVaQrpgCjgm5AG4="; + }) + # check buffer is non-null before dereferencing + (fetchpatch { + url = "https://salsa.debian.org/optical-media-team/cdparanoia/-/raw/f7bab3024c5576da1fdb7497abbd6abc8959a98c/debian/patches/04-endian.patch"; + hash = "sha256-krfprwls0L3hsNfoj2j69J5k1RTKEQtzE0fLYG9EJKo="; + }) ] ++ lib.optional stdenv.hostPlatform.isMusl ./utils.patch; nativeBuildInputs = [ @@ -37,13 +61,6 @@ stdenv.mkDerivation rec { autoreconfHook ]; - propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - IOKit - ]; - - hardeningDisable = [ "format" ]; - # Build system reuses the same object file names for shared and static # library. Occasionally fails in the middle: # gcc -O2 -fsigned-char -g -O2 -c scan_devices.c diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1608ead9b65..7a598edb3cd0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28383,10 +28383,7 @@ with pkgs; cdparanoia = cdparanoiaIII; - cdparanoiaIII = callPackage ../applications/audio/cdparanoia { - inherit (darwin) IOKit; - inherit (darwin.apple_sdk.frameworks) Carbon; - }; + cdparanoiaIII = callPackage ../applications/audio/cdparanoia { }; celeste = callPackage ../applications/networking/sync/celeste { }; From b3f04cd54216082f2e6742c6cc7fa8bced5b8eb0 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Tue, 29 Oct 2024 22:15:10 +0100 Subject: [PATCH 202/617] xorg.xorgserver: 21.1.13 -> 21.1.14 Signed-off-by: Sefa Eyeoglu --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index e25f09c5f077..54d873eba040 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -4158,11 +4158,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xorg-server"; - version = "21.1.13"; + version = "21.1.14"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-21.1.13.tar.xz"; - sha256 = "033lvjihidc68v08izrr63va8jhkfmzcjg0d6rm26wizjkah4nml"; + url = "mirror://xorg/individual/xserver/xorg-server-21.1.14.tar.xz"; + sha256 = "0dgfajrnkr8d61z1fjn249s3q1pm23v9w2f1aqb7sx64pp7048cg"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 3e77aa833ec9..09652d05ca9a 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.5.tar.xz mirror://xorg/individual/util/makedepend-1.0.9.tar.xz mirror://xorg/individual/util/util-macros-1.20.1.tar.xz mirror://xorg/individual/util/xorg-cf-files-1.0.8.tar.xz -mirror://xorg/individual/xserver/xorg-server-21.1.13.tar.xz +mirror://xorg/individual/xserver/xorg-server-21.1.14.tar.xz From 070cc6e1d25a98307aa3cf32106a609648a6831a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Oct 2024 08:05:42 +0000 Subject: [PATCH 203/617] wasm-pack: 0.13.0 -> 0.13.1 --- pkgs/development/tools/wasm-pack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix index 4b978485895d..818274a35a54 100644 --- a/pkgs/development/tools/wasm-pack/default.nix +++ b/pkgs/development/tools/wasm-pack/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "wasm-pack"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "rustwasm"; repo = "wasm-pack"; rev = "refs/tags/v${version}"; - hash = "sha256-NEujk4ZPQ2xHWBCVjBCD7H6f58P4KrwCNoDHKa0d5JE="; + hash = "sha256-CN1LcLX7ag+in9sosT2NYVKfhDLGv2m3zHOk2T4MFYc="; }; - cargoHash = "sha256-pFKGQcWW1/GaIIWMyWBzts4w1hMu27hTG/uUMjkfDMo="; + cargoHash = "sha256-RdBnW8HKSgjVnyafycGFTSTc5j1A9WRDvUuZu8upRWY="; nativeBuildInputs = [ cmake From 0e190616fa810e84b59539db4ca025222c1234d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Oct 2024 10:50:30 +0000 Subject: [PATCH 204/617] libbpf: 1.4.6 -> 1.4.7 --- pkgs/os-specific/linux/libbpf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index b5e4b22dabf0..8c8adfb5e124 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libbpf"; - version = "1.4.6"; + version = "1.4.7"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - hash = "sha256-TGwGEYapanhp2RjnH6Mo+kQFmqFEX0LcAZTCk6SyIk8="; + hash = "sha256-iknPdJ1vJ5y1ncsHx+nAc6gmvJWbo1Wg6mFTfa2KDBM="; }; nativeBuildInputs = [ pkg-config ]; From e4eab5f5e60a8dd3ad02d43794b7db33904b75b9 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Wed, 30 Oct 2024 12:33:29 +0000 Subject: [PATCH 205/617] duckstation-bin: 0.1-7294 -> 0.1-7371 --- pkgs/by-name/du/duckstation-bin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/du/duckstation-bin/package.nix b/pkgs/by-name/du/duckstation-bin/package.nix index 2deddb86cbe0..8349b98ef84f 100644 --- a/pkgs/by-name/du/duckstation-bin/package.nix +++ b/pkgs/by-name/du/duckstation-bin/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "duckstation-bin"; - version = "0.1-7294"; + version = "0.1-7371"; src = fetchurl { url = "https://github.com/stenzek/duckstation/releases/download/v${finalAttrs.version}/duckstation-mac-release.zip"; - hash = "sha256-33aipZjYJOquQBbe8Ve9KRfLGW29v9xoztUsaY8LAjw="; + hash = "sha256-ukORbTG0lZIsUInkEnyPB9+PwFxxK5hbgj9D6tjOEAY="; }; nativeBuildInputs = [ unzip ]; From 04a90ffde20f9d1dccd074382d2a2d17c26908b9 Mon Sep 17 00:00:00 2001 From: Sean Gillespie Date: Wed, 30 Oct 2024 12:00:45 -0400 Subject: [PATCH 206/617] ruby: fix cross build (#348566) --- pkgs/development/interpreters/ruby/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index ea270b3a7051..e9c464e59f34 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -216,7 +216,7 @@ let for makefile in $extMakefiles; do make -C "$(dirname "$makefile")" distclean done - find "$out/${finalAttrs.passthru.gemPath}" \( -name gem_make.out -o -name mkmf.log \) -delete + find "$out/${finalAttrs.passthru.gemPath}" \( -name gem_make.out -o -name mkmf.log -o -name exts.mk \) -delete # Bundler tries to create this directory mkdir -p $out/nix-support cat > $out/nix-support/setup-hook < Date: Wed, 16 Oct 2024 21:34:32 -0700 Subject: [PATCH 207/617] pkgsStatic.dtc: fix build --- pkgs/development/compilers/dtc/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index ed35bec87c06..e7a17cba66c8 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -1,5 +1,6 @@ { stdenv , lib +, fetchpatch2 , fetchzip , meson , ninja @@ -22,6 +23,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Zl2bOGDJIe/bhMFNsy969JYCYqtXTOzgb+bbOlKqOco="; }; + patches = [ + (fetchpatch2 { + # https://github.com/dgibson/dtc/pull/141 + url = "https://github.com/dgibson/dtc/commit/56a7d0cb3be5f2f7604bc42299e24d13a39c72d8.patch"; + hash = "sha256-GmAyk/K2OolH/Z8SsgwCcq3/GOlFuSpnVPr7jsy8Cs0="; + }) + ]; + env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; nativeBuildInputs = [ From 98492c5e589e2b6cbfe0198d3df4ee409420cbe3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 30 Oct 2024 23:45:02 +0100 Subject: [PATCH 208/617] evcc: 0.131.3 -> 0.131.4 https://github.com/evcc-io/evcc/releases/tag/0.131.4 --- pkgs/servers/home-automation/evcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 07d668f2a07f..11809da781a6 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "evcc"; - version = "0.131.3"; + version = "0.131.4"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; rev = version; - hash = "sha256-HbZ/KlsiuHVsDKvCUz7+Xq6Y+XkfZ9Oe7tD3rfZrRRE="; + hash = "sha256-sU5h29sXz1am44iFGNrVfMzrI1aAc/m355Aevm81sQc="; }; vendorHash = "sha256-hPCTAK4u79r9EoHkv6g1QvkRDZ95hXzyiiQpRD+0aLQ="; From 5fdcf448eb643e3dec751cf297698c8b8d0f8d0e Mon Sep 17 00:00:00 2001 From: Yifei Sun Date: Wed, 30 Oct 2024 21:25:07 -0400 Subject: [PATCH 209/617] aldente: 1.28.5 -> 1.28.6 --- pkgs/by-name/al/aldente/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/aldente/package.nix b/pkgs/by-name/al/aldente/package.nix index 6d1806f65d20..56196cfbff95 100644 --- a/pkgs/by-name/al/aldente/package.nix +++ b/pkgs/by-name/al/aldente/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "aldente"; - version = "1.28.5"; + version = "1.28.6"; src = fetchurl { url = "https://github.com/davidwernhart/aldente-charge-limiter/releases/download/${finalAttrs.version}/AlDente.dmg"; - hash = "sha256-N+0bNgD80LLzwRAvYwxcLC0WnMgpvS4DnX/dZx0nIvE="; + hash = "sha256-g52XHx1jK0VEgLQJL+vX16bFd8eMu0dw8Fqp4hOtVtE="; }; dontBuild = true; From beda46612acfdff1ca6bd2c2bf20b21290c43136 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Thu, 31 Oct 2024 11:59:18 +0100 Subject: [PATCH 210/617] serd: move to pkgs/by-name --- .../libraries/serd/default.nix => by-name/se/serd/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/serd/default.nix => by-name/se/serd/package.nix} (100%) diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/by-name/se/serd/package.nix similarity index 100% rename from pkgs/development/libraries/serd/default.nix rename to pkgs/by-name/se/serd/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 278248c00695..11d30b5a174f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22832,8 +22832,6 @@ with pkgs; seasocks = callPackage ../development/libraries/seasocks { }; - serd = callPackage ../development/libraries/serd { }; - serf = callPackage ../development/libraries/serf { }; sev-snp-measure = with python3Packages; toPythonApplication sev-snp-measure; From 4026e88664f772ce81584390588e149dd6871ad4 Mon Sep 17 00:00:00 2001 From: Steven Keuchel Date: Sat, 26 Oct 2024 11:28:53 +0200 Subject: [PATCH 211/617] rustc: use 1.82.0 binary to bootstrap rustc 1.82.0 Change the bootstrap on all platforms to use a version of the upstream binary that is equal to the version that is being built, instead of a binary of one version prior. This is necessary for the 1.82.0 release because on some platforms (https://github.com/rust-lang/rust/issues/129268) the 1.81.0 binary can not build the 1.82.0 source. Furthermore, upstream reported that their development process (now) usually involves building a release compiler with itself and that "the Rust compiler must be able to build itself". --- pkgs/development/compilers/rust/1_82.nix | 33 ++++++++++++------------ 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/pkgs/development/compilers/rust/1_82.nix b/pkgs/development/compilers/rust/1_82.nix index 12cfbb80b2fb..83bf096224f8 100644 --- a/pkgs/development/compilers/rust/1_82.nix +++ b/pkgs/development/compilers/rust/1_82.nix @@ -103,25 +103,26 @@ import ./default.nix else llvmPackages_18; - # Note: the version MUST be one version prior to the version we're - # building - bootstrapVersion = "1.81.0"; + # Note: the version MUST be the same version that we are building. Upstream + # ensures that each released compiler can compile itself: + # https://github.com/NixOS/nixpkgs/pull/351028#issuecomment-2438244363 + bootstrapVersion = "1.82.0"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "0ab6ff2da7218220a2fb6e9538f5582c5d27448e91ff6ea2e296b2aee2b5e2d9"; - x86_64-unknown-linux-gnu = "4ca7c24e573dae2f382d8d266babfddc307155e1a0a4025f3bc11db58a6cab3e"; - x86_64-unknown-linux-musl = "2a0829c842425ab316a63adb0d604421be1c4df332388ac26d63aef47e857c12"; - arm-unknown-linux-gnueabihf = "0da7b4a3b760fa514ba5e1a731fd212f1d082468f118f19e852136a30d2c0253"; - armv7-unknown-linux-gnueabihf = "5a8d799a09cc605ea3a88dc43bd348bd6335847a0b71ba8e73b40968a0a7bf6f"; - aarch64-unknown-linux-gnu = "ef4da9c1ecd56bbbb36f42793524cce3062e6a823ae22cb679a945c075c7755b"; - aarch64-unknown-linux-musl = "fab9a1a69e61326399becab2571381b079ee42f2b648d862b0c3df05004dc864"; - x86_64-apple-darwin = "f74d8ad24cc3cbfb825da98a08d98319565e4d18ec2c3e9503bf0a33c81ba767"; - aarch64-apple-darwin = "60a41dea4ae0f4006325745a6400e6fdc3e08ad3f924fac06f04c238cf23f4ec"; - powerpc64le-unknown-linux-gnu = "bf98b27de08a2fd5a2202a2b621b02bfde2a6fde397df2a735d018aeffcdc5e2"; - riscv64gc-unknown-linux-gnu = "664e7a50c03848afc86d579a9cbf82cd0b2291a97776f7f81cee9bbf9fc1f648"; - s390x-unknown-linux-gnu = "e0450ff125cadd3813c7888f5ca42f78e68df13c212b12d5eac3325062632723"; - x86_64-unknown-freebsd = "b96ebbc043058eedebccd20f1d01e64f2241107665fe2336e6927966d8b9d8d3"; + i686-unknown-linux-gnu = "77b261fb3d9efa7fe39e87c024987495e03b647b6cb23a66b8e69aeb12a8be61"; + x86_64-unknown-linux-gnu = "0265c08ae997c4de965048a244605fb1f24a600bbe35047b811c638b8fcf676b"; + x86_64-unknown-linux-musl = "9dd781c64f71c1d3f854b0937eb751f19e8ebac1110e68e08b94223ad9b022ba"; + arm-unknown-linux-gnueabihf = "d6a2857d0ab8880c3bc691607b10b68fb2750eae35144e035a9a5eeef820b740"; + armv7-unknown-linux-gnueabihf = "eff9939c4b98c6ad91a759fa1a2ebdd81b4d05e47ac523218bf9d7093226589b"; + aarch64-unknown-linux-gnu = "d7db04fce65b5f73282941f3f1df5893be9810af17eb7c65b2e614461fe31a48"; + aarch64-unknown-linux-musl = "f061eabf0324805637c1e89e7d936365f705be1359699efbda59b637dbe9715f"; + x86_64-apple-darwin = "b1a289cabc523f259f65116a41374ac159d72fbbf6c373bd5e545c8e835ceb6a"; + aarch64-apple-darwin = "49b6d36b308addcfd21ae56c94957688338ba7b8985bff57fc626c8e1b32f62c"; + powerpc64le-unknown-linux-gnu = "44f3a1e70be33f91927ae8d89a11843a79b8b6124d62a9ddd9030a5275ebc923"; + riscv64gc-unknown-linux-gnu = "a72e8aa3fff374061ff90ada317a8d170c2a15eb079ddc828c97189179d3eebd"; + s390x-unknown-linux-gnu = "63760886a9b2de6cb38f75a236db358939d904e205e1e2bc9d96cec69e00ae83"; + x86_64-unknown-freebsd = "f7b51943dbed0af3387e3269c1767fee916fb22b8e7897b3594bf5e422403137"; }; selectRustPackage = pkgs: pkgs.rust_1_82; From 515d8061f0e3c6fa1086c5bb3b739c7026c884b9 Mon Sep 17 00:00:00 2001 From: AveryanAlex Date: Thu, 31 Oct 2024 20:57:16 +0300 Subject: [PATCH 212/617] python3Packages.sphinx-sitemap: 2.5.1 -> 2.6.0 --- pkgs/development/python-modules/sphinx-sitemap/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-sitemap/default.nix b/pkgs/development/python-modules/sphinx-sitemap/default.nix index 918282c97679..f2ad32e67a43 100644 --- a/pkgs/development/python-modules/sphinx-sitemap/default.nix +++ b/pkgs/development/python-modules/sphinx-sitemap/default.nix @@ -5,11 +5,12 @@ setuptools, sphinx, sphinx-pytest, + defusedxml, pytestCheckHook, }: let pname = "sphinx-sitemap"; - version = "2.5.1"; + version = "2.6.0"; in buildPythonPackage { inherit pname version; @@ -19,7 +20,7 @@ buildPythonPackage { owner = "jdillard"; repo = "sphinx-sitemap"; rev = "refs/tags/v${version}"; - hash = "sha256-R8nAaEPd2vQs9Z0Fa5yvTP0KP3O+DnIJLPeISZ10Xtk="; + hash = "sha256-RERa+/MVug2OQ/FAXS4LOQHB4eEuIW2rwcdZUOrr6g8="; }; nativeBuildInputs = [ setuptools ]; @@ -29,6 +30,7 @@ buildPythonPackage { nativeCheckInputs = [ pytestCheckHook sphinx-pytest + defusedxml ]; meta = with lib; { From b3727e4302bc9e34a266665a5a8155951265bdd9 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 1 Nov 2024 11:53:04 +0000 Subject: [PATCH 213/617] buf: 1.45.0 -> 1.46.0 --- pkgs/by-name/bu/buf/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/bu/buf/package.nix b/pkgs/by-name/bu/buf/package.nix index 637d21c4dc68..f77bbf9922f9 100644 --- a/pkgs/by-name/bu/buf/package.nix +++ b/pkgs/by-name/bu/buf/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.45.0"; + version = "1.46.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "buf"; rev = "v${version}"; - hash = "sha256-zmk9o0P4BaUqng9E/s6KKWntwS4NmTg/xPTrQruTQSo="; + hash = "sha256-XLVEZYQEq9qXrH7EytoHO3QExOAZX6N57amcKBy5ORE="; }; - vendorHash = "sha256-NMrPBUwbDsXW8tc5l1Liqd19+v2RrXf6dlcwVnHxVXQ="; + vendorHash = "sha256-P1MNwpz3UbaQHLFv5mMs9d0xulitfAD90T1jWxVi5/k="; patches = [ # Skip a test that requires networking to be available to work. @@ -75,12 +75,12 @@ buildGoModule rec { passthru.tests.version = testers.testVersion { package = buf; }; - meta = with lib; { + meta = { homepage = "https://buf.build"; changelog = "https://github.com/bufbuild/buf/releases/tag/v${version}"; description = "Create consistent Protobuf APIs that preserve compatibility and comply with design best-practices"; - license = licenses.asl20; - maintainers = with maintainers; [ jk lrewega aaronjheng ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jk lrewega aaronjheng ]; mainProgram = "buf"; }; } From 3c433c914456d4bca2eaf5b0a3e71bd20f20a6c5 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sat, 2 Nov 2024 00:27:38 +0800 Subject: [PATCH 214/617] elpa2nix: inline string-empty-p to support Emacs 26 Fixes https://github.com/NixOS/nixpkgs/issues/352907 --- pkgs/applications/editors/emacs/build-support/elpa2nix.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/build-support/elpa2nix.el b/pkgs/applications/editors/emacs/build-support/elpa2nix.el index b0b4ecedc360..97cf2fd58a06 100644 --- a/pkgs/applications/editors/emacs/build-support/elpa2nix.el +++ b/pkgs/applications/editors/emacs/build-support/elpa2nix.el @@ -34,9 +34,10 @@ The file can either be a tar file or an Emacs Lisp file." (let ((flag (getenv "turnCompilationWarningToError"))) (when (and flag - (not (string-empty-p flag))) + ;; we do not use `string-empty-p' because it requires subr-x in Emacs <= 26 + (not (string= flag ""))) (setq byte-compile-error-on-warn t))) (let ((flag (getenv "ignoreCompilationError"))) - (when (string-empty-p flag) + (when (string= flag "") (setq byte-compile-debug t))) From 933687c9a28a2525153dc24e04544035bff63aa0 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 1 Nov 2024 18:35:13 +0100 Subject: [PATCH 215/617] tdb: 1.4.10 -> 1.4.11 --- pkgs/development/libraries/tdb/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index c84ded6267e1..a42bb92cda13 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -7,17 +7,18 @@ , readline , libxslt , libxcrypt +, apple-sdk_11 , docbook-xsl-nons , docbook_xml_dtd_45 }: stdenv.mkDerivation rec { pname = "tdb"; - version = "1.4.10"; + version = "1.4.11"; src = fetchurl { url = "mirror://samba/tdb/${pname}-${version}.tar.gz"; - hash = "sha256-AjOOM8FsIcnilXHO9SPnaytwhjYlT28wxs8ZXUjGLa8="; + hash = "sha256-Toum2T84NWW70GG+Te7hUxgjLRu8ynIS8Y4X9Wu5dag="; }; nativeBuildInputs = [ @@ -33,6 +34,8 @@ stdenv.mkDerivation rec { python3 readline # required to build python libxcrypt + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_11 ]; # otherwise the configure script fails with From 68d2661782302af165a001ea077b48baa21b0418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 1 Nov 2024 20:27:24 +0100 Subject: [PATCH 216/617] lua-language-server: 3.11.1 -> 3.12.0 --- .../tools/language-servers/lua-language-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/language-servers/lua-language-server/default.nix b/pkgs/development/tools/language-servers/lua-language-server/default.nix index f3b40cfae31f..be9894aaff76 100644 --- a/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lua-language-server"; - version = "3.11.1"; + version = "3.12.0"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; rev = finalAttrs.version; - hash = "sha256-ZYaiSBSnO9lPb/5pYa0OiL0KParuMb4/jIBtE3S/Ruo="; + hash = "sha256-wyQ4oXGemoT5QVZughFKd386RjzlW4ArtQL0ofMnhpU="; fetchSubmodules = true; }; From b52119ac185a4515d62effc93923cd98c65ebe53 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 21:19:20 +0000 Subject: [PATCH 217/617] proto: 0.41.3 -> 0.42.0 --- pkgs/by-name/pr/proto/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index 04618f14d5e9..859dddcf17d4 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "proto"; - version = "0.41.3"; + version = "0.42.0"; src = fetchFromGitHub { owner = "moonrepo"; repo = "proto"; rev = "v${version}"; - hash = "sha256-FkuHKfrMH+l/k9lfFhbG619KoDIxmEYwoaniHSPF8hQ="; + hash = "sha256-ZCuqxsCyaw5JmX9bpsSeTpSc07DnvPE9EiRQrHR5UNo="; }; - cargoHash = "sha256-vll9ckegcECmzoOkTCe2q2M1r4s5JlUnv2DtzJEQ7bY="; + cargoHash = "sha256-ykl/WC3sfIwT1uhTrnRz2G8bzr1vkoGB03MwNP/Y5Xs="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration From 507c5dd2327ef9f5dd583ef83f37f9d8f638e74b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=A9tan=20Lepage?= <33058747+GaetanLepage@users.noreply.github.com> Date: Fri, 1 Nov 2024 23:01:38 +0100 Subject: [PATCH 218/617] neovim: remove uneffective substituteInPlace patches (#352855) --- pkgs/by-name/ne/neovim-unwrapped/package.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index bc61215ad4e9..46d941a4e40b 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -185,16 +185,12 @@ stdenv.mkDerivation ( ]; # nvim --version output retains compilation flags and references to build tools - postPatch = - '' - substituteInPlace src/nvim/version.c --replace NVIM_VERSION_CFLAGS ""; - '' - + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - sed -i runtime/CMakeLists.txt \ - -e "s|\".*/bin/nvim|\${stdenv.hostPlatform.emulator buildPackages} &|g" - sed -i src/nvim/po/CMakeLists.txt \ - -e "s|\$ Date: Fri, 1 Nov 2024 23:55:59 -0700 Subject: [PATCH 219/617] maintainers: add youwen5 --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6fd827cd72b9..bca0bc066c10 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -24010,6 +24010,13 @@ github = "youhaveme9"; githubId = 58213083; }; + youwen5 = { + name = "Youwen Wu"; + email = "youwenw@gmail.com"; + github = "youwen5"; + githubId = 38934577; + keys = [ { fingerprint = "8F5E 6C1A F909 76CA 7102 917A 8656 58ED 1FE6 1EC3"; } ]; + }; yrashk = { email = "yrashk@gmail.com"; github = "yrashk"; From fc43091447f91f867badfcb3f82663817712dda1 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Fri, 1 Nov 2024 23:57:28 -0700 Subject: [PATCH 220/617] manga-tui: add youwen5 as maintainer --- pkgs/by-name/ma/manga-tui/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/manga-tui/package.nix b/pkgs/by-name/ma/manga-tui/package.nix index aafae4ab8464..19a5e56ca4c7 100644 --- a/pkgs/by-name/ma/manga-tui/package.nix +++ b/pkgs/by-name/ma/manga-tui/package.nix @@ -44,7 +44,10 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/josueBarretogit/manga-tui"; changelog = "https://github.com/josueBarretogit/manga-tui/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ isabelroses ]; + maintainers = with lib.maintainers; [ + isabelroses + youwen5 + ]; mainProgram = "manga-tui"; }; } From bf4d9cd72342e25a1c2b7f299fc0bbdf20bae29c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 1 Nov 2024 06:54:11 +0000 Subject: [PATCH 221/617] libgit2: 1.8.3 -> 1.8.4 Changes: https://github.com/libgit2/libgit2/releases/tag/v1.8.4 --- pkgs/development/libraries/libgit2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix index 5e38abebd5ee..847894d06587 100644 --- a/pkgs/development/libraries/libgit2/default.nix +++ b/pkgs/development/libraries/libgit2/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libgit2"; - version = "1.8.3"; + version = "1.8.4"; # also check the following packages for updates: python3Packages.pygit2 and libgit2-glib outputs = ["lib" "dev" "out"]; @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "libgit2"; repo = "libgit2"; rev = "v${finalAttrs.version}"; - hash = "sha256-ugVvXn9/ZXlJJQgh3zTBQYPGFrVDF3yxVynQyYzvXoY="; + hash = "sha256-AVhDq9nC2ccwFYJmejr0hmnyV4AxZLamuHktYPlkzUs="; }; cmakeFlags = [ From cfc3ac4d4e1f91605bd990ab6a3fa2581450303a Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 10:39:21 +0100 Subject: [PATCH 222/617] azure-cli.extensions-tool: commit removals last These are most likely to require human intervention, having them last simplifies rebase. Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-tool.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-tool.py b/pkgs/by-name/az/azure-cli/extensions-tool.py index 3ba7c3636f40..e6c9a332896f 100644 --- a/pkgs/by-name/az/azure-cli/extensions-tool.py +++ b/pkgs/by-name/az/azure-cli/extensions-tool.py @@ -288,15 +288,6 @@ def main() -> None: for prev, new in updated: logger.info(f" {prev.pname} {prev.version} -> {new.version}") - for ext in removed: - extensions_local.remove(ext) - # TODO: Add additional check why this is removed - # TODO: Add an alias to extensions manual? - commit_msg = f"azure-cli-extensions.{ext.pname}: remove" - _write_extension_set(extension_file, extensions_local) - if args.commit: - _commit(repo, commit_msg, [extension_file]) - for ext in init: extensions_local.add(ext) commit_msg = f"azure-cli-extensions.{ext.pname}: init at {ext.version}" @@ -314,6 +305,15 @@ def main() -> None: if args.commit: _commit(repo, commit_msg, [extension_file]) + for ext in removed: + extensions_local.remove(ext) + # TODO: Add additional check why this is removed + # TODO: Add an alias to extensions manual? + commit_msg = f"azure-cli-extensions.{ext.pname}: remove" + _write_extension_set(extension_file, extensions_local) + if args.commit: + _commit(repo, commit_msg, [extension_file]) + if __name__ == "__main__": main() From b934fc9ec1505fff14aae8c08dfa391ee899c85c Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 10:40:53 +0100 Subject: [PATCH 223/617] azure-cli-extensions.adp: remove Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-generated.json | 7 ------- pkgs/by-name/az/azure-cli/extensions-manual.nix | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index b289e4bf7ae7..406df6254163 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -34,13 +34,6 @@ "hash": "sha256-Yd8jThB1npkWwdRHqwK4JjfeEP2XwxoXJS4fUYOFOIM=", "description": "Microsoft Azure Command-Line Tools DomainServicesResourceProvider Extension" }, - "adp": { - "pname": "adp", - "version": "0.1.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/adp-0.1.0-py3-none-any.whl", - "hash": "sha256-/WRRmDL0/TFEMfhxdlB+ECSbjRZVN/gdBcnqUYWuhOw=", - "description": "Microsoft Azure Command-Line Tools Adp Extension" - }, "aem": { "pname": "aem", "version": "0.3.0", diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index c9b907630e9b..71bc0ec86447 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -136,6 +136,7 @@ } // lib.optionalAttrs config.allowAliases { # Removed extensions + adp = throw "The 'adp' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8038 blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26 vm-repair = throw "The 'vm-repair' extension for azure-cli was deprecated upstream"; # Added 2024-08-06 } From 6d15c9df9550a7a6f033119eb3e10efaea82c7f9 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 10:40:55 +0100 Subject: [PATCH 224/617] azure-cli-extensions.connection-monitor-preview: remove Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-generated.json | 7 ------- pkgs/by-name/az/azure-cli/extensions-manual.nix | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 406df6254163..f90452c7a006 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -230,13 +230,6 @@ "hash": "sha256-tzGoIcYJqui/q34EcLNCuReefgxlSC9KQypg2HpMOV8=", "description": "Microsoft Azure Command-Line Tools Connectedvmware Extension" }, - "connection-monitor-preview": { - "pname": "connection-monitor-preview", - "version": "0.1.0", - "url": "https://azurecliprod.blob.core.windows.net/cli-extensions/connection_monitor_preview-0.1.0-py2.py3-none-any.whl", - "hash": "sha256-mnltUYdXGZDSf+ue/u3eOMGU8T6iHL+ewGExGWv9gh0=", - "description": "Microsoft Azure Command-Line Connection Monitor V2 Extension" - }, "cosmosdb-preview": { "pname": "cosmosdb-preview", "version": "1.0.1", diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index 71bc0ec86447..fca4c289fa84 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -138,5 +138,6 @@ # Removed extensions adp = throw "The 'adp' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8038 blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26 + connection-monitor-preview = throw "The 'connection-monitor-preview' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8194 vm-repair = throw "The 'vm-repair' extension for azure-cli was deprecated upstream"; # Added 2024-08-06 } From 9d4aedff0167973f672cb1d7bb1f5461cd2a9504 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 11:22:40 +0100 Subject: [PATCH 225/617] azure-cli-extensions.vm-repair: re-init at 2.0.0 I accidentally removed it during an extensions update. It wasn't actually removed upstream, just has external requirements now. Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-manual.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index fca4c289fa84..758f8c4de86f 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -133,11 +133,20 @@ propagatedBuildInputs = with python3Packages; [ azure-core ]; meta.maintainers = with lib.maintainers; [ katexochen ]; }; + + vm-repair = mkAzExtension rec { + pname = "vm-repair"; + version = "2.0.0"; + url = "https://azcliprod.blob.core.windows.net/cli-extensions/vm_repair-${version}-py2.py3-none-any.whl"; + hash = "sha256-mBa0SgKyGdxrTtrSVDp78Z0yXUMywL/9o0osKeUbhdU="; + description = "Support for repairing Azure Virtual Machines"; + propagatedBuildInputs = with python3Packages; [ opencensus ]; + meta.maintainers = with lib.maintainers; [ ]; + }; } // lib.optionalAttrs config.allowAliases { # Removed extensions adp = throw "The 'adp' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8038 - blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26 + blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26, https://github.com/Azure/azure-cli-extensions/pull/7370 connection-monitor-preview = throw "The 'connection-monitor-preview' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8194 - vm-repair = throw "The 'vm-repair' extension for azure-cli was deprecated upstream"; # Added 2024-08-06 } From 5139634ead71d83baa899c2f04426e8ddc9e1543 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:32:10 +0100 Subject: [PATCH 226/617] azure-cli.extensions-tool: workaround for commit authorship bug in gitpython Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-tool.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-tool.py b/pkgs/by-name/az/azure-cli/extensions-tool.py index e6c9a332896f..8a9d6559e32a 100644 --- a/pkgs/by-name/az/azure-cli/extensions-tool.py +++ b/pkgs/by-name/az/azure-cli/extensions-tool.py @@ -113,11 +113,11 @@ def _convert_hash_digest_from_hex_to_b64_sri(s: str) -> str: return f"sha256-{base64.b64encode(b).decode('utf-8')}" -def _commit(repo: git.Repo, message: str, files: List[Path]) -> None: +def _commit(repo: git.Repo, message: str, files: List[Path], actor: git.Actor) -> None: repo.index.add([str(f.resolve()) for f in files]) if repo.index.diff("HEAD"): logger.info(f'committing to nixpkgs "{message}"') - repo.index.commit(message) + repo.index.commit(message, author=actor, committer=actor) else: logger.warning("no changes in working tree to commit") @@ -248,6 +248,10 @@ def main() -> None: args = parser.parse_args() repo = git.Repo(Path(".").resolve(), search_parent_directories=True) + # Workaround for https://github.com/gitpython-developers/GitPython/issues/1923 + author = repo.config_reader().get_value("user", "name").lstrip('"').rstrip('"') + email = repo.config_reader().get_value("user", "email").lstrip('"').rstrip('"') + actor = git.Actor(author, email) index = get_extension_index(args.cache_dir) assert index["formatVersion"] == "1" # only support formatVersion 1 @@ -293,7 +297,7 @@ def main() -> None: commit_msg = f"azure-cli-extensions.{ext.pname}: init at {ext.version}" _write_extension_set(extension_file, extensions_local) if args.commit: - _commit(repo, commit_msg, [extension_file]) + _commit(repo, commit_msg, [extension_file], actor) for prev, new in updated: extensions_local.remove(prev) @@ -303,7 +307,7 @@ def main() -> None: ) _write_extension_set(extension_file, extensions_local) if args.commit: - _commit(repo, commit_msg, [extension_file]) + _commit(repo, commit_msg, [extension_file], actor) for ext in removed: extensions_local.remove(ext) @@ -312,7 +316,7 @@ def main() -> None: commit_msg = f"azure-cli-extensions.{ext.pname}: remove" _write_extension_set(extension_file, extensions_local) if args.commit: - _commit(repo, commit_msg, [extension_file]) + _commit(repo, commit_msg, [extension_file], actor) if __name__ == "__main__": From c63210f6e4d7d3a59eadf62f5a4d76fc01fc2652 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:35:26 +0100 Subject: [PATCH 227/617] azure-cli: add extensions-tool to tests Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix index 539571b4fb6d..4744b7d109ee 100644 --- a/pkgs/by-name/az/azure-cli/package.nix +++ b/pkgs/by-name/az/azure-cli/package.nix @@ -380,6 +380,9 @@ py.pkgs.toPythonApplication ( ${lib.getExe az} --version || exit 1 touch $out ''; + + # Ensure the extensions-tool builds. + inherit (azure-cli) extensions-tool; }; generate-extensions = writeScriptBin "${pname}-update-extensions" '' From 3c1249c5d3490b2886ed45db6c8d3ae9ee2bfa93 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:55:29 +0100 Subject: [PATCH 228/617] azure-cli.extensions-tool: add final newline when writing json Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-tool.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/az/azure-cli/extensions-tool.py b/pkgs/by-name/az/azure-cli/extensions-tool.py index 8a9d6559e32a..7a6a6913e2a9 100644 --- a/pkgs/by-name/az/azure-cli/extensions-tool.py +++ b/pkgs/by-name/az/azure-cli/extensions-tool.py @@ -101,6 +101,7 @@ def _write_extension_set(extensions_generated: Path, extensions: Set[Ext]) -> No ls.sort(key=lambda e: e.pname) with open(extensions_generated, "w") as f: json.dump({ext.pname: asdict(ext) for ext in ls}, f, indent=2) + f.write("\n") def _convert_hash_digest_from_hex_to_b64_sri(s: str) -> str: From 69c04ee31869b54e1b76defc7847e5e8f4c7e074 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:56:42 +0100 Subject: [PATCH 229/617] azure-cli.extensions-tool: fix typo in commit message Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-tool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-tool.py b/pkgs/by-name/az/azure-cli/extensions-tool.py index 7a6a6913e2a9..74e58723a099 100644 --- a/pkgs/by-name/az/azure-cli/extensions-tool.py +++ b/pkgs/by-name/az/azure-cli/extensions-tool.py @@ -304,7 +304,7 @@ def main() -> None: extensions_local.remove(prev) extensions_local.add(new) commit_msg = ( - f"azure-cli-extension.{prev.pname}: {prev.version} -> {new.version}" + f"azure-cli-extensions.{prev.pname}: {prev.version} -> {new.version}" ) _write_extension_set(extension_file, extensions_local) if args.commit: From 28a8b311d407117ec5eee15c97a0ef50fd90e315 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:01 +0100 Subject: [PATCH 230/617] azure-cli-extensions.neon: init at 1.0.0b1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index f90452c7a006..a91b798ab6fe 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -706,6 +706,13 @@ "hash": "sha256-rYQ1AWKuh3KH+KFRkgs8S9xjdd1BndYQHCcC22BqXRk=", "description": "Microsoft Azure Command-Line Tools MulticloudConnector Extension" }, + "neon": { + "pname": "neon", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/neon-1.0.0b1-py3-none-any.whl", + "hash": "sha256-JA3DOHznnpjq0nt30tAWLHSUyUv6ihfRt4Qa4l5Dajs=", + "description": "Microsoft Azure Command-Line Tools Neon Extension" + }, "network-analytics": { "pname": "network-analytics", "version": "1.0.0b1", From 8869d9b72a5daddc8cb894bba880976e85a6ab57 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:03 +0100 Subject: [PATCH 231/617] azure-cli-extensions.mcc: init at 1.0.0b1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index a91b798ab6fe..67de741e20a6 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -657,6 +657,13 @@ "hash": "sha256-It30sc3HfpkmLLYInE2WBABlgoodOKJwn9uUXTyFGDk=", "description": "Support for Management Partner preview" }, + "mcc": { + "pname": "mcc", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/mcc-1.0.0b1-py3-none-any.whl", + "hash": "sha256-anNMf7Gdca1dIQFGSyR8e//doeWcJlHphUf/eesZ7U0=", + "description": "Microsoft Connected Cache CLI Commands" + }, "mdp": { "pname": "mdp", "version": "1.0.0b2", From 2036403fdb8b5928825653dc066669d7850c1a3c Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:05 +0100 Subject: [PATCH 232/617] azure-cli-extensions.arcgateway: init at 1.0.0b1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 67de741e20a6..c402b26816ea 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -104,6 +104,13 @@ "hash": "sha256-f9ctJ+Sw7O2jsrTzAcegwwaP6ouW1w+fyq0UIkDefQ0=", "description": "Microsoft Azure Command-Line Tools App Service on Kubernetes Extension" }, + "arcgateway": { + "pname": "arcgateway", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/arcgateway-1.0.0b1-py3-none-any.whl", + "hash": "sha256-Mw/R8ZdL7OFtySTjU3MbHw9EA6WONuM0dwXwHb2/A9E=", + "description": "Microsoft Azure Command-Line Tools Arcgateway Extension" + }, "astronomer": { "pname": "astronomer", "version": "1.0.0", From c0eb4b679409ca44b9a38f3ebe77adcb05511f8f Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:07 +0100 Subject: [PATCH 233/617] azure-cli-extensions.deidservice: init at 1.0.0b1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index c402b26816ea..9f3c030e9d89 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -321,6 +321,13 @@ "hash": "sha256-8agBvQw46y6/nC+04LQ6mEcK57QLvNBesqpZbWlXnJ4=", "description": "Microsoft Azure Command-Line Tools DataShareManagementClient Extension" }, + "deidservice": { + "pname": "deidservice", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/deidservice-1.0.0b1-py3-none-any.whl", + "hash": "sha256-FJw581LzrLlcttM70PuWJwMs8BoaoyCsud1xJ0RZfNA=", + "description": "Microsoft Azure Command-Line Tools Deidservice Extension" + }, "deploy-to-azure": { "pname": "deploy-to-azure", "version": "0.2.0", From e2d832ee427ee59d848aa4293c9308af25ce32de Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:09 +0100 Subject: [PATCH 234/617] azure-cli-extensions.quantum: init at 1.0.0b4 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 9f3c030e9d89..fed7ca42e55c 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -846,6 +846,13 @@ "hash": "sha256-cGzCVQ+9B7i2djRcLybFumZVCQW8jsIkxsTlY3xJcmY=", "description": "Microsoft Azure Command-Line Tools PurviewManagementClient Extension" }, + "quantum": { + "pname": "quantum", + "version": "1.0.0b4", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/quantum-1.0.0b4-py3-none-any.whl", + "hash": "sha256-c8KlBVlkh2jxI95wOayCiMJlzuTYjpTDzthc7LzmtVI=", + "description": "Microsoft Azure Command-Line Tools Quantum Extension" + }, "qumulo": { "pname": "qumulo", "version": "1.0.0", From d68e79cd8f07d083cd68c643b8b2df0e300362b2 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:11 +0100 Subject: [PATCH 235/617] azure-cli-extensions.express-route-cross-connection: 0.1.1 -> 1.0.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index fed7ca42e55c..c81708b03b72 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -435,10 +435,10 @@ }, "express-route-cross-connection": { "pname": "express-route-cross-connection", - "version": "0.1.1", - "url": "https://azurecliprod.blob.core.windows.net/cli-extensions/express_route_cross_connection-0.1.1-py2.py3-none-any.whl", - "hash": "sha256-uD9yO6rg6gRVeofzWPohMbrxXUXNOrp6mrQtFOyA3zg=", - "description": "Manage customer ExpressRoute circuits using an ExpressRoute cross-connection" + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/express_route_cross_connection-1.0.0-py3-none-any.whl", + "hash": "sha256-x1mbd/Y28BcYqEf+T1rZcOHT8wrq9VnWnCfw9rBnl80=", + "description": "Microsoft Azure Command-Line Tools ExpressRouteCrossConnection Extension" }, "firmwareanalysis": { "pname": "firmwareanalysis", From 6eca72a9643bab6f2fe370fb5447df0c3aa19c12 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:12 +0100 Subject: [PATCH 236/617] azure-cli-extensions.scvmm: 1.1.1 -> 1.1.2 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index c81708b03b72..62a9a6b04bb5 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -918,9 +918,9 @@ }, "scvmm": { "pname": "scvmm", - "version": "1.1.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/scvmm-1.1.1-py2.py3-none-any.whl", - "hash": "sha256-fXBFeLxetguBBd4LSpJBdlgaTPL9FisIltgSRvf3Omg=", + "version": "1.1.2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/scvmm-1.1.2-py2.py3-none-any.whl", + "hash": "sha256-sbLmbA/wV5dtSPGKQ5YPT/WAK1UC6ebS1aXY8bTotvI=", "description": "Microsoft Azure Command-Line Tools SCVMM Extension" }, "self-help": { From 76de7c0b23277be5da2111122360b368914f1658 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:14 +0100 Subject: [PATCH 237/617] azure-cli-extensions.maintenance: 1.6.0 -> 1.7.0b1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 62a9a6b04bb5..b7f7582fecde 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -645,9 +645,9 @@ }, "maintenance": { "pname": "maintenance", - "version": "1.6.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/maintenance-1.6.0-py3-none-any.whl", - "hash": "sha256-Orai2sSLpxsovI7gXSVNqnK2L4TdqVN0n6YhqAyjmuU=", + "version": "1.7.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/maintenance-1.7.0b1-py3-none-any.whl", + "hash": "sha256-cZmLfV3nIjxeKuehwARFtBHROaAjh2+EeI9R8fUQsts=", "description": "Microsoft Azure Command-Line Tools MaintenanceManagementClient Extension" }, "managedccfs": { From ca98256acbc6332ccb89372d7c99a00313668eae Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:16 +0100 Subject: [PATCH 238/617] azure-cli-extensions.apic-extension: 1.0.0b5 -> 1.1.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index b7f7582fecde..6b8b8fa39904 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -92,9 +92,9 @@ }, "apic-extension": { "pname": "apic-extension", - "version": "1.0.0b5", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/apic_extension-1.0.0b5-py3-none-any.whl", - "hash": "sha256-+8ofhEYBMULWdhWbgpL9fC0xdfOeG661xNE/ljcAMlQ=", + "version": "1.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/apic_extension-1.1.0-py3-none-any.whl", + "hash": "sha256-AeXrQi6EJoOW3bAlEjC907nUdfRj6BM/BBX7Dw4DJAs=", "description": "Microsoft Azure Command-Line Tools ApicExtension Extension" }, "appservice-kube": { From 01a93ea8faea26c2f04b8a2f3afdbc4259e4966c Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:18 +0100 Subject: [PATCH 239/617] azure-cli-extensions.stack-hci-vm: 1.3.0 -> 1.4.3 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 6b8b8fa39904..44a2a4852826 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -967,9 +967,9 @@ }, "stack-hci-vm": { "pname": "stack-hci-vm", - "version": "1.3.0", - "url": "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-1.3.0-py3-none-any.whl", - "hash": "sha256-GVU+UNWcr8wZFmvn6RvkPHJferrh2DOJFPjmBDhT/Ak=", + "version": "1.4.3", + "url": "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-1.4.3-py3-none-any.whl", + "hash": "sha256-T1ulOOgw3O8ZUUfIunHHObK9SUy7moq1HoMcQLwfMyk=", "description": "Microsoft Azure Command-Line Tools Stack-HCi-VM Extension" }, "standbypool": { From 7b51dd7de86ad80c093ce0e54d8d892af8b3b42d Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:20 +0100 Subject: [PATCH 240/617] azure-cli-extensions.multicloud-connector: 1.0.0b1 -> 1.0.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 44a2a4852826..3f547a381457 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -722,9 +722,9 @@ }, "multicloud-connector": { "pname": "multicloud-connector", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/multicloud_connector-1.0.0b1-py3-none-any.whl", - "hash": "sha256-rYQ1AWKuh3KH+KFRkgs8S9xjdd1BndYQHCcC22BqXRk=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/multicloud_connector-1.0.0-py3-none-any.whl", + "hash": "sha256-8Gb946+K7DwMm5s5GROUciYRkvYvxgB7rB5Y3MRn5t8=", "description": "Microsoft Azure Command-Line Tools MulticloudConnector Extension" }, "neon": { From be2e4972bb558eab2a3f8c107563ad3037742ebc Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:22 +0100 Subject: [PATCH 241/617] azure-cli-extensions.redisenterprise: 1.2.0 -> 1.2.1b1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 3f547a381457..e564ece188cd 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -869,9 +869,9 @@ }, "redisenterprise": { "pname": "redisenterprise", - "version": "1.2.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/redisenterprise-1.2.0-py3-none-any.whl", - "hash": "sha256-bndtRkr6r2ZFbXuObTarGhLxkFRhdHnqjxNjPTpJ/6w=", + "version": "1.2.1b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/redisenterprise-1.2.1b1-py3-none-any.whl", + "hash": "sha256-mBboVxqGiYZJczJ7YzHSQ3A9oxtAwFOe2JE2udv2yeA=", "description": "Microsoft Azure Command-Line Tools RedisEnterprise Extension" }, "reservation": { From ca921dea99bcde1cf12a340fbb48840fcbff1d47 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:24 +0100 Subject: [PATCH 242/617] azure-cli-extensions.connectedmachine: 1.0.0b2 -> 1.0.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index e564ece188cd..3f6750ca2046 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -225,9 +225,9 @@ }, "connectedmachine": { "pname": "connectedmachine", - "version": "1.0.0b2", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-1.0.0b2-py3-none-any.whl", - "hash": "sha256-i4xDQMTGVS44JiIP+5W/YZRHZ1sEaTBLcfqA4uTjHIE=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-1.0.0-py3-none-any.whl", + "hash": "sha256-FJ7q1J0MBG93jqTZnXhEjzgVe4bqWR0e6lRfiJZZZRE=", "description": "Microsoft Azure Command-Line Tools ConnectedMachine Extension" }, "connectedvmware": { From 834bd5aba56cfb33275bb4ce92ace46bdb7043ed Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:25 +0100 Subject: [PATCH 243/617] azure-cli-extensions.standbypool: 1.0.0b1 -> 1.0.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 3f6750ca2046..986a9b9e1fd4 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -974,9 +974,9 @@ }, "standbypool": { "pname": "standbypool", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/standbypool-1.0.0b1-py3-none-any.whl", - "hash": "sha256-RMA+MgyLSfUjkOPBHWGyWmev7/wY1iuqUiw3MULeDhU=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/standbypool-1.0.0-py3-none-any.whl", + "hash": "sha256-WlY5U30m/7sG845ovWyTntkJBdmssYwHFhgjcy+yfPk=", "description": "Microsoft Azure Command-Line Tools Standbypool Extension" }, "staticwebapp": { From c2fa0a082f978815febe12ca2271250e87951fcd Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:27 +0100 Subject: [PATCH 244/617] azure-cli-extensions.dataprotection: 1.5.3 -> 1.5.4 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 986a9b9e1fd4..6623c7a0ec24 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -309,9 +309,9 @@ }, "dataprotection": { "pname": "dataprotection", - "version": "1.5.3", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-1.5.3-py3-none-any.whl", - "hash": "sha256-RnHOieOQZWlfIWJjUN/K1UOL2+/HFM816F7l6rD5ZmE=", + "version": "1.5.4", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-1.5.4-py3-none-any.whl", + "hash": "sha256-vAyVrv0dte1KioEwriEF8oNqrEwN3WSKDC/hyTudQtg=", "description": "Microsoft Azure Command-Line Tools DataProtectionClient Extension" }, "datashare": { From fefd810ce1c55bf49207aa9691ceccb89a6da427 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:29 +0100 Subject: [PATCH 245/617] azure-cli-extensions.managementpartner: 0.1.3 -> 1.0.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 6623c7a0ec24..14187c539645 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -666,9 +666,9 @@ }, "managementpartner": { "pname": "managementpartner", - "version": "0.1.3", - "url": "https://azurecliprod.blob.core.windows.net/cli-extensions/managementpartner-0.1.3-py2.py3-none-any.whl", - "hash": "sha256-It30sc3HfpkmLLYInE2WBABlgoodOKJwn9uUXTyFGDk=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/managementpartner-1.0.0-py2.py3-none-any.whl", + "hash": "sha256-pdSiZGR4GLShnNw1arXm+N0bCPpnE8AKFSl9LFoFlJQ=", "description": "Support for Management Partner preview" }, "mcc": { From 1c8b1b3663381bf3746161eb920f5b661497ac48 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:31 +0100 Subject: [PATCH 246/617] azure-cli-extensions.cosmosdb-preview: 1.0.1 -> 1.1.0b1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 14187c539645..dee38549d502 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -239,9 +239,9 @@ }, "cosmosdb-preview": { "pname": "cosmosdb-preview", - "version": "1.0.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-1.0.1-py2.py3-none-any.whl", - "hash": "sha256-xUABi8XaElLsPj5WRVJlDWrwjzSfP/M5vjmKeYPK8qk=", + "version": "1.1.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-1.1.0b1-py2.py3-none-any.whl", + "hash": "sha256-D8EbL83XXEhoz8Q+xL4ZwhKP0de2FrYeM2TDwaDEwdo=", "description": "Microsoft Azure Command-Line Tools Cosmosdb-preview Extension" }, "costmanagement": { From 298f842a8aa22faeb33ddc78ed23cb466c6069a2 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:33 +0100 Subject: [PATCH 247/617] azure-cli-extensions.mdp: 1.0.0b2 -> 1.0.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index dee38549d502..2b7ba0f8f435 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -680,9 +680,9 @@ }, "mdp": { "pname": "mdp", - "version": "1.0.0b2", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/mdp-1.0.0b2-py3-none-any.whl", - "hash": "sha256-BirQJtnq95G1koxPt5MUjUDGwpfO4y8XXNOhVesk2T8=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/mdp-1.0.0-py3-none-any.whl", + "hash": "sha256-wKSuGBcQO1SPHZHX4chVKEFdoBaoPUgxVIWXI7+3jYE=", "description": "Microsoft Azure Command-Line Tools Mdp Extension" }, "microsoft-fabric": { From 654e48a8043c1c970f6340d37fb954a25bbf96a4 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:35 +0100 Subject: [PATCH 248/617] azure-cli-extensions.new-relic: 1.0.0b1 -> 1.0.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 2b7ba0f8f435..bf6c8dfd1056 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -750,9 +750,9 @@ }, "new-relic": { "pname": "new-relic", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/new_relic-1.0.0b1-py3-none-any.whl", - "hash": "sha256-nOafFoTOoUrLoPL9tHPkfgoGdF44O7UUSVTF6F5BYZk=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/new_relic-1.0.0-py3-none-any.whl", + "hash": "sha256-MQUxCuwjIdQp8GjnTf4WsLZMcQCqUervLBF2WXHqb1o=", "description": "Microsoft Azure Command-Line Tools NewRelic Extension" }, "next": { From 751ee7a2b97ce7fa9d73b4c40fba18e1b0b1231c Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:37 +0100 Subject: [PATCH 249/617] azure-cli-extensions.amg: 2.4.0 -> 2.5.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index bf6c8dfd1056..1ad7f974c57d 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -78,9 +78,9 @@ }, "amg": { "pname": "amg", - "version": "2.4.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.4.0-py3-none-any.whl", - "hash": "sha256-YkyoyEfOk+zIOe5CgRXQmyY8Ts58UtoKvvOIk2RREdY=", + "version": "2.5.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.5.0-py3-none-any.whl", + "hash": "sha256-yQAtjGU/VqixCGvzPpGPO6bzJ8yEAGvnWUB4QhiH9B0=", "description": "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension" }, "amlfs": { From b078ecaab2f16efb555235faabc0aa1fb6dd7e86 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:38 +0100 Subject: [PATCH 250/617] azure-cli-extensions.networkcloud: 2.0.0b4 -> 2.0.0b5 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 1ad7f974c57d..5dac1a961bf9 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -743,9 +743,9 @@ }, "networkcloud": { "pname": "networkcloud", - "version": "2.0.0b4", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-2.0.0b4-py3-none-any.whl", - "hash": "sha256-BnB6AIQFc5pWOSMPP9CUAxCEpp+GdkhQOu1AOdEYrZ8=", + "version": "2.0.0b5", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-2.0.0b5-py3-none-any.whl", + "hash": "sha256-rHLPxU7TWDTKbNXHJ6D91x5JQ7zWbmXND/YH6K5JXHo=", "description": "Support for Azure Operator Nexus network cloud commands based on 2024-07-01 API version" }, "new-relic": { From bc06a2ab87e0fcef57f593c2c78d878efc6f3670 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:40 +0100 Subject: [PATCH 251/617] azure-cli-extensions.elastic-san: 1.0.0b2 -> 1.2.0b1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 5dac1a961bf9..8e22dcf1a033 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -421,9 +421,9 @@ }, "elastic-san": { "pname": "elastic-san", - "version": "1.0.0b2", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/elastic_san-1.0.0b2-py3-none-any.whl", - "hash": "sha256-bS8SR6545DHUg0mJ31gc0hJB0WuXBxv2cvuLce461wI=", + "version": "1.2.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/elastic_san-1.2.0b1-py3-none-any.whl", + "hash": "sha256-UvtysdxQsTTOlkSI7exVTH2ESfhB5H2LNV2fGscQzmA=", "description": "Microsoft Azure Command-Line Tools ElasticSan Extension" }, "eventgrid": { From 45a8237acb5971465d2179d0ad3b5e151b82aa24 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:42 +0100 Subject: [PATCH 252/617] azure-cli-extensions.dynatrace: 0.1.0 -> 1.1.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 8e22dcf1a033..702c9601c328 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -393,9 +393,9 @@ }, "dynatrace": { "pname": "dynatrace", - "version": "0.1.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dynatrace-0.1.0-py3-none-any.whl", - "hash": "sha256-ESp+QjRh0bb3w4X+i3O08rhQ4lcMNaVKS7zC6Hr+xmE=", + "version": "1.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dynatrace-1.1.0-py3-none-any.whl", + "hash": "sha256-CR9A2HZCRby5Zn5CLU3TchFMnwCnKggPnI75K0PFGNY=", "description": "Microsoft Azure Command-Line Tools Dynatrace Extension" }, "edgeorder": { From 488c3b55556df8a5c5c160cd84a3c51b1231b640 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:44 +0100 Subject: [PATCH 253/617] azure-cli-extensions.subscription: 0.1.5 -> 1.0.0b1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 702c9601c328..2f6701802097 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -1023,10 +1023,10 @@ }, "subscription": { "pname": "subscription", - "version": "0.1.5", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/subscription-0.1.5-py2.py3-none-any.whl", - "hash": "sha256-/3iWrrxGhiptMKxfTPZL3UDLUOVDfOoplZCJbXXxAT4=", - "description": "Support for subscription management preview" + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/subscription-1.0.0b1-py2.py3-none-any.whl", + "hash": "sha256-Pzu0+7dhF00ToPhjNit084i8ZI9/KW+bbiGRs1UHrk8=", + "description": "Microsoft Azure Command-Line Tools Subscription Extension" }, "support": { "pname": "support", From 5f8e218696bec6f4e608c7832fd2f99e6c847e77 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:46 +0100 Subject: [PATCH 254/617] azure-cli-extensions.spring: 1.25.1 -> 1.26.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 2f6701802097..2550ba6aba79 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -946,9 +946,9 @@ }, "spring": { "pname": "spring", - "version": "1.25.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/spring-1.25.1-py3-none-any.whl", - "hash": "sha256-nrim8vd7Gcn5gJUmu3AQdlkN2zX2suxDHOMYuWzEBzM=", + "version": "1.26.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/spring-1.26.0-py3-none-any.whl", + "hash": "sha256-6CxqOuyIoHNsdhR3B7ZOZM/ZuFRQM12eD6zHkOHnYbQ=", "description": "Microsoft Azure Command-Line Tools spring Extension" }, "spring-cloud": { From e5f0c98ec1a48b7788348d1374afea80094e4ec6 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:48 +0100 Subject: [PATCH 255/617] azure-cli-extensions.aks-preview: 9.0.0b6 -> 9.0.0b8 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 2550ba6aba79..e36a285646d2 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -50,9 +50,9 @@ }, "aks-preview": { "pname": "aks-preview", - "version": "9.0.0b6", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-9.0.0b6-py2.py3-none-any.whl", - "hash": "sha256-NqIV06L9tUuKl37KszDD9zwydGNoyXc2ThH9XLjgiaQ=", + "version": "9.0.0b8", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-9.0.0b8-py2.py3-none-any.whl", + "hash": "sha256-CYRK4Cug1Y+TaK43OPPUMR9cpyHtzBz3CIb8+KgMv7g=", "description": "Provides a preview for upcoming AKS features" }, "akshybrid": { From 33830c6eadfd4cb2735f4a8c59bce4b3def1b0da Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:50 +0100 Subject: [PATCH 256/617] azure-cli-extensions.traffic-collector: 0.1.3 -> 1.0.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index e36a285646d2..4be44b8ee548 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -1051,9 +1051,9 @@ }, "traffic-collector": { "pname": "traffic-collector", - "version": "0.1.3", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/traffic_collector-0.1.3-py3-none-any.whl", - "hash": "sha256-oUSk/aO86E2yIne9hhEISuGuOeC7jHtQYZ7DeHEfV7o=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/traffic_collector-1.0.0-py3-none-any.whl", + "hash": "sha256-RpWrtTcj6lCfD3oLxtT0vlzAOC/om3ZnHuB4WgUVffw=", "description": "Microsoft Azure Command-Line Tools TrafficCollector Extension" }, "trustedsigning": { From c7a8bd05d4351c346d54ae9393267e484920c2c5 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:52 +0100 Subject: [PATCH 257/617] azure-cli-extensions.bastion: 1.3.0 -> 1.3.1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 4be44b8ee548..66906785d777 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -169,9 +169,9 @@ }, "bastion": { "pname": "bastion", - "version": "1.3.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/bastion-1.3.0-py3-none-any.whl", - "hash": "sha256-FRqyXU3N4QtGxGk879rx0NWEHhXP4+xkwImqr1XmyMA=", + "version": "1.3.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/bastion-1.3.1-py3-none-any.whl", + "hash": "sha256-DMqkBnT8Mp/p+SV/hpwxnGTWyJwChmSm/1NOuu4dxek=", "description": "Microsoft Azure Command-Line Tools Bastion Extension" }, "billing-benefits": { From b536aa3e96e5b324d35750828bd1b5db149a9c21 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:54 +0100 Subject: [PATCH 258/617] azure-cli-extensions.support: 2.0.0 -> 2.0.1 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 66906785d777..da313890e3ed 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -1030,9 +1030,9 @@ }, "support": { "pname": "support", - "version": "2.0.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/support-2.0.0-py2.py3-none-any.whl", - "hash": "sha256-Xd6X+PsS6qJYUw9o7CyuAKlX8wR5g16fXtBXlAMSdBo=", + "version": "2.0.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/support-2.0.1-py2.py3-none-any.whl", + "hash": "sha256-PwcBVPg5RkqiS1SZDYfS26mdbaYOw+8xSnS6IsJo/sQ=", "description": "Microsoft Azure Command-Line Tools Support Extension" }, "terraform": { From 4cbd5a1ab7fe9354f3519e411a90f10c43a731c7 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:56 +0100 Subject: [PATCH 259/617] azure-cli-extensions.k8s-extension: 1.6.1 -> 1.6.2 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index da313890e3ed..20b877c9e264 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -596,9 +596,9 @@ }, "k8s-extension": { "pname": "k8s-extension", - "version": "1.6.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_extension-1.6.1-py3-none-any.whl", - "hash": "sha256-QYYdZbnYbgtiKYakmEznphH4e5LaV424wFJ+x0M08yw=", + "version": "1.6.2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_extension-1.6.2-py3-none-any.whl", + "hash": "sha256-hS2nusfLVQF8yEPgX1pw6juS6V3eJZLP6JL+1R41Co8=", "description": "Microsoft Azure Command-Line Tools K8s-extension Extension" }, "k8s-runtime": { From d55d16b96d71d7f513faf7e87f064e6003c4acee Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:58:58 +0100 Subject: [PATCH 260/617] azure-cli-extensions.monitor-pipeline-group: 1.0.0b1 -> 1.0.0b2 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 20b877c9e264..59e059e8c9aa 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -715,9 +715,9 @@ }, "monitor-pipeline-group": { "pname": "monitor-pipeline-group", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/monitor_pipeline_group-1.0.0b1-py3-none-any.whl", - "hash": "sha256-zzH54/qUWHFvDD0cFWmO95twfFvX0UZ3PSsq/kLmTCk=", + "version": "1.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/monitor_pipeline_group-1.0.0b2-py3-none-any.whl", + "hash": "sha256-skfHQJ7vGnKZtaDmAGmjPLtuxNfyHE44pxi1Usl9X9s=", "description": "Microsoft Azure Command-Line Tools MonitorPipelineGroup Extension" }, "multicloud-connector": { From 2fb100c0b33e9e968b389a2869f611d3bcc6cf0d Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:59:00 +0100 Subject: [PATCH 261/617] azure-cli-extensions.oracle-database: 1.0.0b1 -> 1.0.0 --- pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 59e059e8c9aa..25a7c78dee85 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -792,9 +792,9 @@ }, "oracle-database": { "pname": "oracle-database", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/oracle_database-1.0.0b1-py3-none-any.whl", - "hash": "sha256-BYw95sHhA/8MYqGIscYGo1CXpmUst+tsPlt3934VtbE=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/oracle_database-1.0.0-py3-none-any.whl", + "hash": "sha256-CtcW4Rc1noFCf4yRSC8lkgMYd5ZMaVLnaLZhSNtU284=", "description": "Microsoft Azure Command-Line Tools OracleDatabase Extension" }, "orbital": { From e7998d1f1f6bb91386e6fa95cac0d13304b48e6e Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Fri, 1 Nov 2024 08:34:52 -0400 Subject: [PATCH 262/617] python3.pkgs.jupysql: disable broken tests due to duckdb>=1.1.0 --- .../python-modules/jupysql/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/python-modules/jupysql/default.nix b/pkgs/development/python-modules/jupysql/default.nix index 350c2e43c8f2..01fa1c0f3163 100644 --- a/pkgs/development/python-modules/jupysql/default.nix +++ b/pkgs/development/python-modules/jupysql/default.nix @@ -84,6 +84,21 @@ buildPythonPackage rec { disabledTests = [ # AttributeError: 'DataFrame' object has no attribute 'frame_equal' "test_resultset_polars_dataframe" + # all of these are broken with later versions of duckdb; see + # https://github.com/ploomber/jupysql/issues/1030 + "test_resultset_getitem" + "test_resultset_dict" + "test_resultset_len" + "test_resultset_dicts" + "test_resultset_dataframe" + "test_resultset_csv" + "test_resultset_str" + "test_resultset_repr_html_when_feedback_is_2" + "test_resultset_repr_html_with_reduced_feedback" + "test_invalid_operation_error" + "test_resultset_config_autolimit_dict" + # fails due to strict warnings + "test_calling_legacy_plotting_functions_displays_warning" ]; disabledTestPaths = [ From 47d3c21a3205e29db781ce56dd29ff515e7401f3 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 2 Nov 2024 13:52:51 +0000 Subject: [PATCH 263/617] arc-browser: 1.66.0-55166 -> 1.67.0-55463 Changelog: https://arc.net/e/D9ABB038-2D44-497D-9C1A-6AF5CC9F11D6 --- pkgs/by-name/ar/arc-browser/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix index 8a45049cbf09..126880fae046 100644 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ b/pkgs/by-name/ar/arc-browser/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.66.0-55166"; + version = "1.67.0-55463"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-up+ScCjFgxlATUbCeWZcVF2jZGfCw018MfT6kAqAHO4="; + hash = "sha256-up3H6Ke3tlL0/WbOv4qgbLxBaG8o5dibAPxtEnSad6g="; }; nativeBuildInputs = [ undmg ]; From a41f2a9ba2bf2d8e33c9da919b8a31933de342ed Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 2 Nov 2024 16:33:13 +0200 Subject: [PATCH 264/617] goku: format with `nixfmt-rfc-style` --- pkgs/os-specific/darwin/goku/default.nix | 39 ++++++++++++------------ 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix index 4babe83c6351..e361186f27c5 100644 --- a/pkgs/os-specific/darwin/goku/default.nix +++ b/pkgs/os-specific/darwin/goku/default.nix @@ -1,31 +1,30 @@ -{ lib -, stdenv -, fetchurl -, unzip -, joker +{ + lib, + stdenv, + fetchurl, + unzip, + joker, }: stdenv.mkDerivation rec { pname = "goku"; version = "0.6.0"; - src = if stdenv.hostPlatform.isAarch64 then - fetchurl { - url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku-arm.zip"; - hash = "sha256-TIoda2kDckK1FBLAmKudsDs3LXO4J0KWiAD2JlFb4rk="; - } - else fetchurl { - url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku.zip"; - hash = "sha256-8HdIwtpzR6O2WCbMYIJ6PHcM27Xmb+4Tc5Fmjl0dABQ="; - }; + src = + if stdenv.hostPlatform.isAarch64 then + fetchurl { + url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku-arm.zip"; + hash = "sha256-TIoda2kDckK1FBLAmKudsDs3LXO4J0KWiAD2JlFb4rk="; + } + else + fetchurl { + url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku.zip"; + hash = "sha256-8HdIwtpzR6O2WCbMYIJ6PHcM27Xmb+4Tc5Fmjl0dABQ="; + }; - nativeBuildInputs = [ - unzip - ]; + nativeBuildInputs = [ unzip ]; - buildInputs = [ - joker - ]; + buildInputs = [ joker ]; sourceRoot = if stdenv.hostPlatform.isAarch64 then "goku" else "."; From 00baf6001ca54c985f17288383fccca957fcd5b0 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 2 Nov 2024 16:33:56 +0200 Subject: [PATCH 265/617] goku: use `finalAttrs` pattern --- pkgs/os-specific/darwin/goku/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix index e361186f27c5..5271a7d45a20 100644 --- a/pkgs/os-specific/darwin/goku/default.nix +++ b/pkgs/os-specific/darwin/goku/default.nix @@ -6,19 +6,19 @@ joker, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "goku"; version = "0.6.0"; src = if stdenv.hostPlatform.isAarch64 then fetchurl { - url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku-arm.zip"; + url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${finalAttrs.version}/goku-arm.zip"; hash = "sha256-TIoda2kDckK1FBLAmKudsDs3LXO4J0KWiAD2JlFb4rk="; } else fetchurl { - url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku.zip"; + url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${finalAttrs.version}/goku.zip"; hash = "sha256-8HdIwtpzR6O2WCbMYIJ6PHcM27Xmb+4Tc5Fmjl0dABQ="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.nikitavoloboev ]; platforms = platforms.darwin; }; -} +}) From 855ce12c2a9f08307010f3f66deadf37101e0de6 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 2 Nov 2024 16:34:39 +0200 Subject: [PATCH 266/617] goku: remove `with lib;` from `meta` --- pkgs/os-specific/darwin/goku/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix index 5271a7d45a20..339809a9c4a4 100644 --- a/pkgs/os-specific/darwin/goku/default.nix +++ b/pkgs/os-specific/darwin/goku/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation (finalAttrs: { cp gokuw $out/bin ''; - meta = with lib; { + meta = { description = "Karabiner configurator"; homepage = "https://github.com/yqrashawn/GokuRakuJoudo"; - license = licenses.gpl3; - maintainers = [ maintainers.nikitavoloboev ]; - platforms = platforms.darwin; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.nikitavoloboev ]; + platforms = lib.platforms.darwin; }; }) From 2ba3e897135ae2fdb16ec37972ad3ea80ad73fe8 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 2 Nov 2024 16:36:42 +0200 Subject: [PATCH 267/617] goku: add `passthru.updateScript` --- pkgs/os-specific/darwin/goku/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix index 339809a9c4a4..a07877b893f0 100644 --- a/pkgs/os-specific/darwin/goku/default.nix +++ b/pkgs/os-specific/darwin/goku/default.nix @@ -4,6 +4,7 @@ fetchurl, unzip, joker, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -28,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = if stdenv.hostPlatform.isAarch64 then "goku" else "."; + passthru.updateScript = nix-update-script { }; + installPhase = '' chmod +x goku chmod +x gokuw From 027352dc05195333ab8319a0b7a5ff133722609c Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 2 Nov 2024 14:39:09 +0000 Subject: [PATCH 268/617] goku: 0.6.0 -> 0.7.2 Changelog: https://github.com/yqrashawn/GokuRakuJoudo/releases/tag/v0.7.2 Diff: https://github.com/yqrashawn/GokuRakuJoudo/compare/v0.6.0...v0.7.2 --- pkgs/os-specific/darwin/goku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix index a07877b893f0..15746e52309e 100644 --- a/pkgs/os-specific/darwin/goku/default.nix +++ b/pkgs/os-specific/darwin/goku/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "goku"; - version = "0.6.0"; + version = "0.7.2"; src = if stdenv.hostPlatform.isAarch64 then fetchurl { url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${finalAttrs.version}/goku-arm.zip"; - hash = "sha256-TIoda2kDckK1FBLAmKudsDs3LXO4J0KWiAD2JlFb4rk="; + hash = "sha256-mjz1JD12U23Pi8kumELtT9ENhXpX8Db4LUS3DOtP5GM="; } else fetchurl { From 2490a405c2edfbb3b8b57124710403728c93f584 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 2 Nov 2024 16:43:37 +0200 Subject: [PATCH 269/617] goku: `stdenv` -> `stdenvNoCC` --- pkgs/os-specific/darwin/goku/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix index 15746e52309e..e97f1b51e12a 100644 --- a/pkgs/os-specific/darwin/goku/default.nix +++ b/pkgs/os-specific/darwin/goku/default.nix @@ -1,18 +1,18 @@ { lib, - stdenv, + stdenvNoCC, fetchurl, unzip, joker, nix-update-script, }: -stdenv.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "goku"; version = "0.7.2"; src = - if stdenv.hostPlatform.isAarch64 then + if stdenvNoCC.hostPlatform.isAarch64 then fetchurl { url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${finalAttrs.version}/goku-arm.zip"; hash = "sha256-mjz1JD12U23Pi8kumELtT9ENhXpX8Db4LUS3DOtP5GM="; @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ joker ]; - sourceRoot = if stdenv.hostPlatform.isAarch64 then "goku" else "."; + sourceRoot = if stdenvNoCC.hostPlatform.isAarch64 then "goku" else "."; passthru.updateScript = nix-update-script { }; From e68e39d98812c16625326f8acb077ae3ec7c803a Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 2 Nov 2024 16:46:26 +0200 Subject: [PATCH 270/617] goku: refactor `installPhase` --- pkgs/os-specific/darwin/goku/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix index e97f1b51e12a..70f76836709d 100644 --- a/pkgs/os-specific/darwin/goku/default.nix +++ b/pkgs/os-specific/darwin/goku/default.nix @@ -32,11 +32,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; installPhase = '' - chmod +x goku - chmod +x gokuw - mkdir -p $out/bin - cp goku $out/bin - cp gokuw $out/bin + runHook preInstall + mkdir -p "$out/bin" + chmod +x {goku,gokuw} + cp {goku,gokuw} "$out/bin" + runHook postInstall ''; meta = { From 21a4b4cddca798576dce4ea61eec985308df762b Mon Sep 17 00:00:00 2001 From: Igor Rzegocki Date: Sat, 2 Nov 2024 16:25:14 +0100 Subject: [PATCH 271/617] whatsie: 4.16.2 -> 4.16.3 --- pkgs/by-name/wh/whatsie/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wh/whatsie/package.nix b/pkgs/by-name/wh/whatsie/package.nix index 1a54a4f142aa..e9888da4ea15 100644 --- a/pkgs/by-name/wh/whatsie/package.nix +++ b/pkgs/by-name/wh/whatsie/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "whatsie"; - version = "4.16.2"; + version = "4.16.3"; src = fetchFromGitHub { owner = "keshavbhatt"; repo = "whatsie"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-4Ur/FNg4jqtyWGB0lW4Uw2XlfMclz080LDRNO+RnkrM="; + hash = "sha256-F6hQY3Br0iFDYkghBgRAyzLW6QhhG8UHOgkEgDjeQLg="; }; sourceRoot = "${finalAttrs.src.name}/src"; From 7e7dce448e687f84aa1628ecc812adb919aaa072 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 2 Nov 2024 19:03:26 +0100 Subject: [PATCH 272/617] sphinx: disable racy test This one fails when tests are run with too many cores. Closes: #353176 --- pkgs/development/python-modules/sphinx/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index dc79c8b664e5..f39899a2c5b6 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -115,6 +115,9 @@ buildPythonPackage rec { "test_class_alias_having_doccomment" "test_class_alias_for_imported_object_having_doccomment" "test_decorators" + # racy with too many threads + # https://github.com/NixOS/nixpkgs/issues/353176 + "test_document_toc_only" # Assertion error "test_gettext_literalblock_additional" # requires cython_0, but fails miserably on 3.11 From aaeeef5b6c7848a7569cb7a1f651550d0e5f8327 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 2 Nov 2024 15:49:04 +0100 Subject: [PATCH 273/617] stdenv: fix custom hardening settings when using `__structuredAttrs = true;` Replaces / Closes #353131 A while ago `postgresql` switched to using structured attrs[1]. In the PR it was reported that this made postgresql notably slower when importing SQL dumps[2]. After a bit of debugging it turned out that the hardening was entirely missing and the following combination of settings was the culprit: hardeningEnable = [ "pie" ]; __structuredAttrs = true; I.e. the combination of custom hardening settings and structured attrs. What happened here is that internally the default and enabled hardening flags get written into `NIX_HARDENING_ENABLE`. However, the value is a list and the setting is not in the `env` section. This means that in the structured-attrs case we get something like declare -ax NIX_HARDENING_ENABLE=([0]="bindnow" [1]="format" [2]="fortify" [3]="fortify3" [4]="pic" [5]="relro" [6]="stackprotector" [7]="strictoverflow" [8]="zerocallusedregs" [9]="pie") i.e. an actual array rather than a string with all hardening flags being space-separated which is what the hardening code of the cc-wrapper expects[3]. This only happens if `hardeningEnable` or `hardeningDisable` are explicitly set by a derivation: if none of those are set, `NIX_HARDENING_ENABLE` won't be set by `stdenv.mkDerivation` and the default hardening flags are configured by the setup hook of the cc-wrapper[4]. In other words, this _only_ applies to derivations that have both custom hardening settings _and_ `__structuredAttrs = true;`. All values of `NIX_HARDENING_ENABLE` are well-known, so we don't have to worry about escaping issues. Just forcing it to a string by concatenating the list everytime solves the issue without additional issues like eval errors when inheriting `env` from a structuredAttrs derivation[5]. The price we're paying is a full rebuild. [1] https://github.com/NixOS/nixpkgs/pull/294504 [2] https://github.com/NixOS/nixpkgs/pull/294504#issuecomment-2451482522 [3] https://github.com/NixOS/nixpkgs/blob/cf3e5d3744dc26c3498aa5dadfa0e078c632cede/pkgs/build-support/cc-wrapper/add-hardening.sh#L9 [4] https://github.com/NixOS/nixpkgs/blob/cf3e5d3744dc26c3498aa5dadfa0e078c632cede/pkgs/build-support/cc-wrapper/setup-hook.sh#L114 [5] https://github.com/NixOS/nixpkgs/pull/353131/commits/1e84a7fb95ba8770aca373efd95d1dc87ceef432 --- pkgs/stdenv/generic/make-derivation.nix | 2 +- pkgs/test/cc-wrapper/hardening.nix | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index b2b6576c4acd..d4d5ee46638a 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -413,7 +413,7 @@ else let enableParallelChecking = attrs.enableParallelChecking or true; enableParallelInstalling = attrs.enableParallelInstalling or true; } // optionalAttrs (hardeningDisable != [] || hardeningEnable != [] || stdenv.hostPlatform.isMusl) { - NIX_HARDENING_ENABLE = enabledHardeningOptions; + NIX_HARDENING_ENABLE = builtins.concatStringsSep " " enabledHardeningOptions; } // optionalAttrs (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform ? gcc.arch) { requiredSystemFeatures = attrs.requiredSystemFeatures or [] ++ [ "gccarch-${stdenv.hostPlatform.gcc.arch}" ]; } // optionalAttrs (stdenv.buildPlatform.isDarwin) ( diff --git a/pkgs/test/cc-wrapper/hardening.nix b/pkgs/test/cc-wrapper/hardening.nix index 270e9a2e8761..fb30d17841e3 100644 --- a/pkgs/test/cc-wrapper/hardening.nix +++ b/pkgs/test/cc-wrapper/hardening.nix @@ -178,6 +178,13 @@ in nameDrvAfterAttrName ({ ignorePie = false; }); + pieExplicitEnabledStructuredAttrs = brokenIf stdenv.hostPlatform.isStatic (checkTestBin (f2exampleWithStdEnv stdenv { + hardeningEnable = [ "pie" ]; + __structuredAttrs = true; + }) { + ignorePie = false; + }); + relROExplicitEnabled = checkTestBin (f2exampleWithStdEnv stdenv { hardeningEnable = [ "relro" ]; }) { From ed28ebdbb4de2cd110c7641716b140cd5522107b Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 3 Nov 2024 00:55:30 +0000 Subject: [PATCH 274/617] =?UTF-8?q?qt6Packages.*:=20don=E2=80=99t=20propag?= =?UTF-8?q?ate=20Darwin=20version=20inputs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/qt-6/default.nix | 14 ++++++-------- pkgs/development/libraries/qt-6/modules/qtbase.nix | 10 +++------- pkgs/development/libraries/qt-6/qtModule.nix | 4 ++-- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 7159bc6ae055..d306c3e430da 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -11,7 +11,6 @@ , libglvnd , darwin , apple-sdk_15 -, apple-sdk_12 , darwinMinVersionHook , buildPackages , python3 @@ -32,11 +31,10 @@ let }); # Per . - # This should reflect the lowest “Target Platform” and the - # highest “Build Environment”. - apple-sdk_qt = apple-sdk_15; - darwinDeploymentTargetDeps = [ - apple-sdk_12 + # This should reflect the highest “Build Environment” and the + # lowest “Target Platform”. + darwinVersionInputs = [ + apple-sdk_15 (darwinMinVersionHook "12.0") ]; in @@ -45,12 +43,12 @@ let inherit callPackage srcs; qtModule = callPackage ./qtModule.nix { - inherit apple-sdk_qt; + inherit darwinVersionInputs; }; qtbase = callPackage ./modules/qtbase.nix { withGtk3 = !stdenv.hostPlatform.isMinGW; - inherit apple-sdk_qt darwinDeploymentTargetDeps; + inherit darwinVersionInputs; inherit (srcs.qtbase) src version; patches = [ ./patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index fd164b5e76f8..9df79ccc89be 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -67,8 +67,7 @@ , unixODBCDrivers # darwin , moveBuildTree -, apple-sdk_qt -, darwinDeploymentTargetDeps +, darwinVersionInputs , xcbuild # mingw , pkgsBuildBuild @@ -155,8 +154,7 @@ stdenv.mkDerivation rec { xorg.libXtst xorg.xcbutilcursor libepoxy - ] ++ lib.optionals stdenv.hostPlatform.isDarwin darwinDeploymentTargetDeps - ++ lib.optionals libGLSupported [ + ] ++ lib.optionals libGLSupported [ libGL ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ vulkan-headers @@ -167,9 +165,7 @@ stdenv.mkDerivation rec { at-spi2-core ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libinput) [ libinput - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_qt - ] + ] ++ lib.optionals stdenv.hostPlatform.isDarwin darwinVersionInputs ++ lib.optional withGtk3 gtk3 ++ lib.optional (libmysqlclient != null && !stdenv.hostPlatform.isMinGW) libmysqlclient ++ lib.optional (postgresql != null && lib.meta.availableOn stdenv.hostPlatform postgresql) postgresql; diff --git a/pkgs/development/libraries/qt-6/qtModule.nix b/pkgs/development/libraries/qt-6/qtModule.nix index 610649497ba8..8b09c8cb19b8 100644 --- a/pkgs/development/libraries/qt-6/qtModule.nix +++ b/pkgs/development/libraries/qt-6/qtModule.nix @@ -1,6 +1,6 @@ { lib , stdenv -, apple-sdk_qt +, darwinVersionInputs , cmake , ninja , perl @@ -22,7 +22,7 @@ stdenv.mkDerivation (args // { buildInputs = args.buildInputs or [ ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_qt ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin darwinVersionInputs; nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ cmake ninja perl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ]; propagatedBuildInputs = From 4e3c8f45a53fdbcccaf7bc250a7da50a14a21149 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 3 Nov 2024 01:00:39 +0000 Subject: [PATCH 275/617] libsForQt5.*: consistently build with the macOS 13 SDK This was changed for `qtbase` in 3be309eff11e2eb677199997cb653b1358ccd5fd, but affects Qt WebEngine as well. --- pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 5 ++--- pkgs/development/libraries/qt-5/qtModule.nix | 8 +++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 18d9d7459feb..38ad37fc0364 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -20,7 +20,7 @@ , systemd , enableProprietaryCodecs ? true , gn -, apple-sdk_13, cctools, cups, bootstrap_cmds, xcbuild, writeScriptBin +, cctools, cups, bootstrap_cmds, xcbuild, writeScriptBin , ffmpeg ? null , lib, stdenv , version ? null @@ -51,8 +51,7 @@ let in -# Override the SDK because Qt WebEngine doesn’t seem to build using the 14.4 SDK. -(qtModule.override { apple-sdk_for_qt = apple-sdk_13; }) ({ +qtModule ({ pname = "qtwebengine"; nativeBuildInputs = [ bison flex git gperf ninja pkg-config (python.withPackages(ps: [ ps.html5lib ])) which gn nodejs diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index ee59ee76d9e9..10895ec07fd1 100644 --- a/pkgs/development/libraries/qt-5/qtModule.nix +++ b/pkgs/development/libraries/qt-5/qtModule.nix @@ -2,8 +2,8 @@ , stdenv , buildPackages , mkDerivation -, apple-sdk_14 -, apple-sdk_for_qt ? apple-sdk_14 +, apple-sdk_13 +, darwinMinVersionHook , perl , qmake , patches @@ -28,7 +28,9 @@ mkDerivation (args // { buildInputs = args.buildInputs or [ ] # Per https://doc.qt.io/qt-5/macos.html#supported-versions - ++ lib.optionals stdenv.isDarwin [ apple-sdk_for_qt ]; + ++ lib.optionals stdenv.isDarwin [ + apple-sdk_13 + ]; nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ From 8aaea3781cca59530315eafe70f3d65a03d72657 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 3 Nov 2024 01:00:39 +0000 Subject: [PATCH 276/617] =?UTF-8?q?libsForQt5.*:=20don=E2=80=99t=20propaga?= =?UTF-8?q?te=20Darwin=20version=20inputs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libraries/qt-5/modules/qtbase.nix | 20 ++++++++----------- pkgs/development/libraries/qt-5/qtModule.nix | 1 + 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 748d4d1e0386..eb3fc8af96d7 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -4,7 +4,7 @@ , coreutils, bison, flex, gdb, gperf, lndir, perl, pkg-config, python3 , which # darwin support -, darwinMinVersionHook, apple-sdk, apple-sdk_10_14, apple-sdk_13, xcbuild +, apple-sdk_13, darwinMinVersionHook, xcbuild , dbus, fontconfig, freetype, glib, harfbuzz, icu, libdrm, libX11, libXcomposite , libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng , libxcb @@ -41,12 +41,11 @@ let # Per https://doc.qt.io/qt-5/macos.html#supported-versions: deployment target = 10.13, build SDK = 13.x or 14.x. # Despite advertising support for the macOS 14 SDK, the build system sets the maximum to 13 and complains # about 14, so we just use that. - # Note that Qt propagates the 10.14 SDK instead of the 10.13 SDK to make sure that applications linked to Qt - # support automatic dark mode on x86_64-darwin (see: https://developer.apple.com/documentation/appkit/nsappearancecustomization/choosing_a_specific_appearance_for_your_macos_app). - propagatedAppleSDK = if lib.versionOlder (lib.getVersion apple-sdk) "10.14" then apple-sdk_10_14 else apple-sdk; deploymentTarget = "10.13"; - propagatedMinVersionHook = darwinMinVersionHook deploymentTarget; - buildAppleSDK = apple-sdk_13; + darwinVersionInputs = [ + apple-sdk_13 + (darwinMinVersionHook deploymentTarget) + ]; in stdenv.mkDerivation (finalAttrs: ({ @@ -63,11 +62,8 @@ stdenv.mkDerivation (finalAttrs: ({ # Image formats libjpeg libpng pcre2 - ] ++ ( - if stdenv.hostPlatform.isDarwin then [ - propagatedAppleSDK - propagatedMinVersionHook - ] else [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) ( + [ dbus glib udev # Text rendering @@ -87,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: ({ [ libinput ] ++ lib.optional withGtk3 gtk3 ) - ++ lib.optional stdenv.isDarwin buildAppleSDK + ++ lib.optional stdenv.isDarwin darwinVersionInputs ++ lib.optional developerBuild gdb ++ lib.optional (cups != null) cups ++ lib.optional (mysqlSupport) libmysqlclient diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index 10895ec07fd1..d3d810cbbf68 100644 --- a/pkgs/development/libraries/qt-5/qtModule.nix +++ b/pkgs/development/libraries/qt-5/qtModule.nix @@ -30,6 +30,7 @@ mkDerivation (args // { # Per https://doc.qt.io/qt-5/macos.html#supported-versions ++ lib.optionals stdenv.isDarwin [ apple-sdk_13 + (darwinMinVersionHook "10.13") ]; nativeBuildInputs = From fa8ce61acd0d057dd3859f9518d2545ecd1d52e8 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Thu, 31 Oct 2024 19:12:47 -0700 Subject: [PATCH 277/617] llvmPackages_19.compiler_rt: don't codesign The codesign binary is part of the bootstrapTools and is incompatible with the version required by the compiler_rt build. Remove find_program(.., codesign) from the cmake files to prevent the build from using and then breaking due to an incompatible codesign --- .../compilers/llvm/common/compiler-rt/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix index 9c634650dff2..30212e18bcaf 100644 --- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix @@ -188,6 +188,13 @@ stdenv.mkDerivation ({ substituteInPlace ../libcxx/utils/merge_archives.py \ --replace-fail "import distutils.spawn" "from shutil import which as find_executable" \ --replace-fail "distutils.spawn." "" + '' + lib.optionalString (lib.versionAtLeast release_version "19") + # codesign in sigtool doesn't support the various options used by the build + # and is present in the bootstrap-tools. Removing find_program prevents the + # build from trying to use it and failing. + '' + substituteInPlace cmake/Modules/AddCompilerRT.cmake \ + --replace-fail 'find_program(CODESIGN codesign)' "" ''; # Hack around weird upsream RPATH bug From 0efe75ec20e0275a4b8de31aabd713613f56bfe7 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Thu, 31 Oct 2024 19:34:17 -0700 Subject: [PATCH 278/617] libffi: move label before .cfi_starproc after https://github.com/llvm/llvm-project/commit/0b0672773e8b2ed01ad3fce103f4d84becfdd1ed clang_19 will produce errors if the function label comes after .cfi_starproc. Vendor upstream commit https://github.com/libffi/libffi/commit/8308bed5b2423878aa20d7884a99cf2e30b8daf7 to fix the issue --- pkgs/development/libraries/libffi/default.nix | 3 ++ .../libffi/label-before-cfi_startproc.patch | 47 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/libraries/libffi/label-before-cfi_startproc.patch diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 9293077b1aa7..021776ed3856 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation (finalAttrs: { # cgit) that are needed here should be included directly in Nixpkgs as # files. patches = [ + # https://github.com/libffi/libffi/pull/857 + # function label needs to come before .cfi_startproc + ./label-before-cfi_startproc.patch ]; strictDeps = true; diff --git a/pkgs/development/libraries/libffi/label-before-cfi_startproc.patch b/pkgs/development/libraries/libffi/label-before-cfi_startproc.patch new file mode 100644 index 000000000000..379c670b4546 --- /dev/null +++ b/pkgs/development/libraries/libffi/label-before-cfi_startproc.patch @@ -0,0 +1,47 @@ +From 3065c530d3aa50c2b5ee9c01f88a9c0b61732805 Mon Sep 17 00:00:00 2001 +From: Ivan Tadeu Ferreira Antunes Filho +Date: Mon, 16 Sep 2024 16:10:39 -0400 +Subject: [PATCH] Move cfi_startproc after CNAME(label) + +This is a fix for https://github.com/libffi/libffi/issues/852: error: invalid CFI advance_loc expression on apple targets. + +The CFI for darwin arm64 was broken because the CNAME macro was being used after the +cfi_startproc macro. +--- + src/aarch64/sysv.S | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/aarch64/sysv.S b/src/aarch64/sysv.S +index 6a9a5611f..e83bc65de 100644 +--- a/src/aarch64/sysv.S ++++ b/src/aarch64/sysv.S +@@ -89,8 +89,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + x5 closure + */ + +- cfi_startproc + CNAME(ffi_call_SYSV): ++ cfi_startproc + BTI_C + PAC_CFI_WINDOW_SAVE + /* Sign the lr with x1 since that is the CFA which is the modifer used in auth instructions */ +@@ -348,8 +348,8 @@ CNAME(ffi_closure_SYSV_V): + #endif + + .align 4 +- cfi_startproc + CNAME(ffi_closure_SYSV): ++ cfi_startproc + BTI_C + SIGN_LR + PAC_CFI_WINDOW_SAVE +@@ -647,8 +647,8 @@ CNAME(ffi_go_closure_SYSV_V): + #endif + + .align 4 +- cfi_startproc + CNAME(ffi_go_closure_SYSV): ++ cfi_startproc + BTI_C + SIGN_LR_LINUX_ONLY + PAC_CFI_WINDOW_SAVE From f91487fa13dd5d5cd5ff95982e7c00cebb744f02 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Sat, 2 Nov 2024 00:08:21 -0700 Subject: [PATCH 279/617] ld64: fix build with llvm19 remove unused and incomplete function --- pkgs/by-name/ld/ld64/package.nix | 1 + .../remove-unused-and-incomplete-blob-clone.diff | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/by-name/ld/ld64/remove-unused-and-incomplete-blob-clone.diff diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix index d3dfe3b8b7e6..b050c2ac647b 100644 --- a/pkgs/by-name/ld/ld64/package.nix +++ b/pkgs/by-name/ld/ld64/package.nix @@ -128,6 +128,7 @@ stdenv.mkDerivation (finalAttrs: { ./0006-Add-libcd_is_blob_a_linker_signature-implementation.patch # Add OpenSSL implementation of CoreCrypto digest functions. Avoids use of private and non-free APIs. ./0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch + ./remove-unused-and-incomplete-blob-clone.diff ]; postPatch = '' diff --git a/pkgs/by-name/ld/ld64/remove-unused-and-incomplete-blob-clone.diff b/pkgs/by-name/ld/ld64/remove-unused-and-incomplete-blob-clone.diff new file mode 100644 index 000000000000..88dd4304f6f7 --- /dev/null +++ b/pkgs/by-name/ld/ld64/remove-unused-and-incomplete-blob-clone.diff @@ -0,0 +1,14 @@ +diff --git a/src/ld/code-sign-blobs/blob.h b/src/ld/code-sign-blobs/blob.h +index 19c63a9..1dfb380 100644 +--- a/src/ld/code-sign-blobs/blob.h ++++ b/src/ld/code-sign-blobs/blob.h +@@ -180,9 +180,6 @@ public: + return NULL; + } + +- BlobType *clone() const +- { assert(validateBlob()); return specific(this->BlobCore::clone()); } +- + static BlobType *readBlob(int fd) + { return specific(BlobCore::readBlob(fd, _magic, sizeof(BlobType), 0), true); } + From 0fc9787683e6fef5eaf1b6de5f1f2592c2ab0b19 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Sat, 2 Nov 2024 14:48:50 -0700 Subject: [PATCH 280/617] darwin.stdenv: add file to early stdenv stages file is part of the final stdenv and llvm_19 requires it for tests. add file to the path to the early stage stdenv's for the upcoming switch to llvm_19 --- pkgs/stdenv/darwin/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 60eca7f72de8..35ad94c41633 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -191,6 +191,7 @@ let shell = bash + "/bin/bash"; initialPath = [ bash + prevStage.file bootstrapTools ]; @@ -370,6 +371,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check ld64 = null; coreutils = null; + file = null; gnugrep = null; pbzx = null; @@ -416,6 +418,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check coreutils = bootstrapTools; cpio = bootstrapTools; + file = null; gnugrep = bootstrapTools; pbzx = bootstrapTools; From 1fb8dbc65a97ce88f6a23c09a8101fea41d0f2c6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 3 Nov 2024 03:24:58 +0100 Subject: [PATCH 281/617] libjpeg: drop freeimage from passthru tests --- pkgs/development/libraries/libjpeg-turbo/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 7343dbcaaf4b..eb638d8c6e74 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -85,7 +85,6 @@ stdenv.mkDerivation (finalAttrs: { inherit dvgrab epeg - freeimage gd graphicsmagick imagemagick From 687371ab28358ca878a93f4ef4884bfecf0ac40c Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 3 Nov 2024 03:13:21 +0000 Subject: [PATCH 282/617] auto-patchelf: Don't use buildPythonApplication https://github.com/NixOS/nixpkgs/pull/340162 introduced `autoPatchelfHook` as it's own top-level attribute. This also made it use the Nixpkgs Python build infrastructure, which relies on dependency propagation, leaking Python as a dependency into many builds erroneously. This change uses a `withPackages` constructed environment instead, and manually patches the script shebangs, not triggering the `buildPython*` dependency propagation mechanism --- pkgs/by-name/au/auto-patchelf/package.nix | 27 ++++++++++++------- .../au/auto-patchelf/source/auto-patchelf.py | 5 +++- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/au/auto-patchelf/package.nix b/pkgs/by-name/au/auto-patchelf/package.nix index 5096c4fcf56a..adff3a5e40c0 100644 --- a/pkgs/by-name/au/auto-patchelf/package.nix +++ b/pkgs/by-name/au/auto-patchelf/package.nix @@ -1,18 +1,29 @@ { + stdenv, + python3, lib, - python3Packages, }: -python3Packages.buildPythonApplication { +let + pythonEnv = python3.withPackages (ps: [ ps.pyelftools ]); + +in +# Note: Not using python3Packages.buildPythonApplication because of dependency propagation. +stdenv.mkDerivation { pname = "auto-patchelf"; version = "0-unstable-2024-08-14"; - pyproject = false; + + buildInputs = [ pythonEnv ]; src = ./source; - dependencies = with python3Packages; [ - pyelftools - ]; + buildPhase = '' + runHook preBuild + + substituteInPlace auto-patchelf.py --replace-fail "@defaultBintools@" "$NIX_BINTOOLS" + + runHook postBuild + ''; installPhase = '' runHook preInstall @@ -22,10 +33,6 @@ python3Packages.buildPythonApplication { runHook postInstall ''; - makeWrapperArgs = [ - "--set DEFAULT_BINTOOLS $NIX_BINTOOLS" - ]; - meta = { description = "Automatically patch ELF binaries using patchelf"; mainProgram = "auto-patchelf"; diff --git a/pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py b/pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py index 938ea6310118..2a1090302ee9 100644 --- a/pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py +++ b/pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py @@ -21,6 +21,9 @@ from elftools.elf.elffile import ELFFile # type: ignore from elftools.elf.enums import ENUM_E_TYPE, ENUM_EI_OSABI # type: ignore +DEFAULT_BINTOOLS = "@defaultBintools@" + + @contextmanager def open_elf(path: Path) -> Iterator[ELFFile]: with path.open('rb') as stream: @@ -425,7 +428,7 @@ interpreter_arch: str = None # type: ignore libc_lib: Path = None # type: ignore if __name__ == "__main__": - nix_support = Path(os.environ.get('NIX_BINTOOLS', os.environ['DEFAULT_BINTOOLS'])) / 'nix-support' + nix_support = Path(os.environ.get('NIX_BINTOOLS', DEFAULT_BINTOOLS)) / 'nix-support' interpreter_path = Path((nix_support / 'dynamic-linker').read_text().strip()) libc_lib = Path((nix_support / 'orig-libc').read_text().strip()) / 'lib' From 285f0932e74da3f0536c7bf3f3673ec800d74857 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Oct 2024 08:27:00 +0000 Subject: [PATCH 283/617] bubblewrap: 0.10.0 -> 0.11.0 --- pkgs/tools/admin/bubblewrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix index d45e0043e21f..e4a028cb5900 100644 --- a/pkgs/tools/admin/bubblewrap/default.nix +++ b/pkgs/tools/admin/bubblewrap/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "bubblewrap"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "containers"; repo = "bubblewrap"; rev = "v${version}"; - hash = "sha256-HYJoX7DnAwHCgxCzTYGJlc4RodbVP6hutK065AmGSl0="; + hash = "sha256-8IDMLQPeO576N1lizVudXUmTV6hNOiowjzRpEWBsZ+U="; }; postPatch = '' From 9599296566c88826a42398af0981fe065d577aa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sun, 3 Nov 2024 10:26:26 +0100 Subject: [PATCH 284/617] lua-language-server: disable flaky tests --- .../tools/language-servers/lua-language-server/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/language-servers/lua-language-server/default.nix b/pkgs/development/tools/language-servers/lua-language-server/default.nix index be9894aaff76..88bde6ddfec8 100644 --- a/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -39,6 +39,10 @@ stdenv.mkDerivation (finalAttrs: { # this feature is not used in lua-language-server sed -i /filewatch/d 3rd/bee.lua/test/test.lua + # flaky tests on linux + # https://github.com/LuaLS/lua-language-server/issues/2926 + sed -i /load-relative-library/d test/tclient/init.lua + pushd 3rd/luamake '' + lib.optionalString stdenv.hostPlatform.isDarwin '' From d81b4fe176b1297e1d5aa75496fdcd6a52d235d1 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Sun, 3 Nov 2024 11:02:51 +0000 Subject: [PATCH 285/617] portaudio: use implicit apple-sdk pattern --- pkgs/development/libraries/portaudio/default.nix | 12 ++++-------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 9b06dea56b6b..e16562d85eb1 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -5,11 +5,7 @@ , libjack2 , pkg-config , which -, AudioUnit -, AudioToolbox -, CoreAudio -, CoreServices -, Carbon }: +}: stdenv.mkDerivation rec { pname = "portaudio"; @@ -22,14 +18,14 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ pkg-config which ]; - buildInputs = [ libjack2 ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform alsa-lib) [ alsa-lib ]; + buildInputs = + [ libjack2 ] + ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform alsa-lib) [ alsa-lib ]; configureFlags = [ "--disable-mac-universal" "--enable-cxx" ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=nullability-inferred-on-nested-type -Wno-error=nullability-completeness-on-arrays -Wno-error=implicit-const-int-float-conversion"; - propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ]; - # Disable parallel build as it fails as: # make: *** No rule to make target '../../../lib/libportaudio.la', # needed by 'libportaudiocpp.la'. Stop. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c9b8b9567e7..d3bec8358ef8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22445,9 +22445,7 @@ with pkgs; popt = callPackage ../development/libraries/popt { }; - portaudio = callPackage ../development/libraries/portaudio { - inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit CoreAudio CoreServices Carbon; - }; + portaudio = callPackage ../development/libraries/portaudio { }; portmidi = callPackage ../development/libraries/portmidi { inherit (darwin.apple_sdk.frameworks) Carbon CoreAudio CoreFoundation CoreMIDI CoreServices; From e166c9bb94431551b3ac4c0674261144171e5775 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Fri, 1 Nov 2024 20:15:37 -0400 Subject: [PATCH 286/617] apple-sdk: only rewrite old SDK paths Rewriting SDK paths is only needed when a text-based stub is an umbrella framework that does not include the contents of the stubs for the libraries re-exported by the framework. This is only the case for older SDKs. Once macOS introduced the dyld cache (and removed system dylibs) in 11.0, all umbrella frameworks in the SDK include the contents of their re-exported stubs. While rewriting newer SDKs is mostly harmless, it breaks Zig, which tries to interpret the paths relative to the SDKROOT. --- pkgs/by-name/ap/apple-sdk/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ap/apple-sdk/package.nix b/pkgs/by-name/ap/apple-sdk/package.nix index 2fb57182001c..31017a6a9ae5 100644 --- a/pkgs/by-name/ap/apple-sdk/package.nix +++ b/pkgs/by-name/ap/apple-sdk/package.nix @@ -48,9 +48,13 @@ let (callPackage ./common/propagate-inputs.nix { }) (callPackage ./common/propagate-xcrun.nix { }) ] - ++ [ - # These have to happen last. + # Older SDKs do not include the libraries re-exported from umbrella frameworks in the umbrellas’ stubs, which causes + # link failures for those libraries unless their paths have been rewritten to point to the store. + ++ lib.optionals (lib.versionOlder sdkVersion "11.0") [ (callPackage ./common/rewrite-sdk-paths.nix { inherit sdkVersion; }) + ] + # This has to happen last. + ++ [ (callPackage ./common/run-build-phase-hooks.nix { }) ] ); From 19fd3f030da2876f86ffbd3d99f0b24b4a81ee14 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sun, 3 Nov 2024 15:35:55 +0100 Subject: [PATCH 287/617] waf: 2.1.2 -> 2.1.3 https://gitlab.com/ita1024/waf/blob/waf-2.1.3/ChangeLog --- pkgs/by-name/wa/waf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/waf/package.nix b/pkgs/by-name/wa/waf/package.nix index 45ab6f7622db..75fb3d74c2a7 100644 --- a/pkgs/by-name/wa/waf/package.nix +++ b/pkgs/by-name/wa/waf/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "waf"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitLab { owner = "ita1024"; repo = "waf"; rev = "waf-${finalAttrs.version}"; - hash = "sha256-/7V+GA3YBhdaJkDlZ1k4IUYkgh0yuTG09G+frnnMoIw="; + hash = "sha256-7ujlE0brLFmET7tAy0/RTdDORUyr6keZ3OjvxBOC/BI="; }; nativeBuildInputs = [ @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://waf.io"; description = "Meta build system"; - changelog = "https://gitlab.com/ita1024/waf/blob/${finalAttrs.version}/ChangeLog"; + changelog = "https://gitlab.com/ita1024/waf/blob/waf-${finalAttrs.version}/ChangeLog"; license = lib.licenses.bsd3; mainProgram = "waf"; maintainers = with lib.maintainers; [ AndersonTorres ]; From 03524a85944df4da965439214cdde665cdf0ac0c Mon Sep 17 00:00:00 2001 From: Steven Keuchel Date: Sun, 3 Nov 2024 03:13:11 +0100 Subject: [PATCH 288/617] gssdp: fix cross compilation --- pkgs/development/libraries/gssdp/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index e353edd59333..a838efc15a70 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -1,5 +1,6 @@ { stdenv , lib +, fetchpatch2 , fetchurl , meson , ninja @@ -21,13 +22,21 @@ stdenv.mkDerivation rec { version = "1.4.1"; outputs = [ "out" "dev" ] - ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; + ++ lib.optionals withIntrospection [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "VySWVDV9PVGxQDFRaaJMBnHeeqUsb3XIxcmr1Ao1JSk="; }; + patches = [ + (fetchpatch2 { + # https://gitlab.gnome.org/GNOME/gssdp/-/merge_requests/11 + url = "https://gitlab.gnome.org/GNOME/gssdp/-/commit/db9d02c22005be7e5e81b43a3ab777250bd7b27b.diff"; + hash = "sha256-DJQrg6MhzpX8R0QaNnqdwA1+v8xncDU8jcX+I3scW1M="; + }) + ]; + strictDeps = true; depsBuildBuild = [ @@ -64,7 +73,7 @@ stdenv.mkDerivation rec { # Bail out! GLib-GIO-FATAL-CRITICAL: g_inet_address_to_string: assertion 'G_IS_INET_ADDRESS (address)' failed doCheck = !stdenv.hostPlatform.isDarwin; - postFixup = lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) '' + postFixup = lib.optionalString withIntrospection '' # Move developer documentation to devdoc output. # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. find -L "$out/share/doc" -type f -regex '.*\.devhelp2?' -print0 \ From a99d2b7d4fe9c5f12bd7d21f61aaa4f228bbc894 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 12 Sep 2024 21:23:08 +0200 Subject: [PATCH 289/617] python312Packages.paste: use `pyproject = true` --- pkgs/development/python-modules/paste/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index b7ac8fefb3a8..40a921726a67 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "paste"; version = "3.10.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "cdent"; + owner = "pasteorg"; repo = "paste"; rev = "refs/tags/${version}"; hash = "sha256-NY/h6hbpluEu1XAv3o4mqoG+l0LXfM1dw7+G0Rm1E4o="; @@ -26,7 +26,9 @@ buildPythonPackage rec { patchShebangs tests/cgiapp_data/ ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ setuptools six ]; @@ -43,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tools for using a Web Server Gateway Interface stack"; homepage = "https://pythonpaste.readthedocs.io/"; - changelog = "https://github.com/cdent/paste/blob/${version}/docs/news.txt"; + changelog = "https://github.com/pasteorg/paste/blob/${version}/docs/news.txt"; license = licenses.mit; maintainers = [ ]; }; From f9954062369e7426938a1bcb97ddaa354bbe47f1 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 12 Sep 2024 21:24:28 +0200 Subject: [PATCH 290/617] python312Packages.pastedeploy: 3.0.1 -> 3.1 https://github.com/Pylons/pastedeploy/compare/3.0.1...3.1 --- .../python-modules/pastedeploy/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix index a68134dfdc31..7d1eacb847e0 100644 --- a/pkgs/development/python-modules/pastedeploy/default.nix +++ b/pkgs/development/python-modules/pastedeploy/default.nix @@ -4,27 +4,30 @@ fetchFromGitHub, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "pastedeploy"; - version = "3.0.1"; - format = "setuptools"; + version = "3.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Pylons"; - repo = pname; + repo = "pastedeploy"; rev = "refs/tags/${version}"; hash = "sha256-8MNeOcYPEYAfghZN/K/1v/tAAdgz/fCvuVnBoru+81Q="; }; postPatch = '' substituteInPlace pytest.ini \ - --replace " --cov" "" + --replace-fail " --cov" "" ''; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "paste.deploy" ]; From 25a5b7ce01e554be0538b508c5219a84fa472369 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 3 Nov 2024 18:30:00 +0000 Subject: [PATCH 291/617] python312Packages.gremlinpython: 3.7.1 -> 3.7.3 --- pkgs/development/python-modules/gremlinpython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gremlinpython/default.nix b/pkgs/development/python-modules/gremlinpython/default.nix index f6539af40f5f..78b823296725 100644 --- a/pkgs/development/python-modules/gremlinpython/default.nix +++ b/pkgs/development/python-modules/gremlinpython/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "gremlinpython"; - version = "3.7.1"; + version = "3.7.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "apache"; repo = "tinkerpop"; rev = "refs/tags/${version}"; - hash = "sha256-2viZXksHNFynOm6+1Vo2a8xrXl4pQcAxAVgehp5y6us="; + hash = "sha256-Yc0l3kE+6dM9v4QUZPFpm/yjDCrqVO35Vy5srEjAExE="; }; sourceRoot = "${src.name}/gremlin-python/src/main/python"; From 42f60c5c2a69f10b5be379ca1dd4b847020f16ef Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Wed, 30 Oct 2024 13:47:11 +0100 Subject: [PATCH 292/617] python3Packages.moto: add onny as maintainer --- pkgs/development/python-modules/moto/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 99a1f58beb1c..783898d7c88c 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -259,6 +259,6 @@ buildPythonPackage rec { homepage = "https://github.com/getmoto/moto"; changelog = "https://github.com/getmoto/moto/blob/${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = [ ]; + maintainers = with maintainers; [ onny ]; }; } From eb9cde0d3a9d5598459d77903da58c54ebfb9cf0 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Wed, 30 Oct 2024 13:47:53 +0100 Subject: [PATCH 293/617] python3Packages.moto: reformat --- pkgs/development/python-modules/moto/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 783898d7c88c..313624ea3e48 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -254,11 +254,11 @@ buildPythonPackage rec { "tests/test_cognitoidp/test_cognitoidp.py" ]; - meta = with lib; { - description = "Module to allow your tests to easily mock out AWS Services"; + meta = { + description = "Allows your tests to easily mock out AWS Services"; homepage = "https://github.com/getmoto/moto"; changelog = "https://github.com/getmoto/moto/blob/${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ onny ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ onny ]; }; } From 583c82b1211b46c2e382cfcfd2d7d3940130d78c Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Wed, 30 Oct 2024 13:55:47 +0100 Subject: [PATCH 294/617] python3Packages.moto: 5.0.15 -> 5.0.18 --- pkgs/development/python-modules/moto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 313624ea3e48..baad3e643030 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -37,14 +37,14 @@ buildPythonPackage rec { pname = "moto"; - version = "5.0.16"; + version = "5.0.18"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-9K+xdqlkzXpw2pvF4FPUMQlhTOPKsmBEvLtTYQQ13/Q="; + hash = "sha256-inrS9ToubMnbL/ZcDg1LXX54vAC4Jcnh/2zDlDceduk="; }; build-system = [ setuptools ]; From 520f8db902f2f1d3541f01f96cd8d82f5235af7a Mon Sep 17 00:00:00 2001 From: nartsisss Date: Mon, 4 Nov 2024 00:32:57 +0300 Subject: [PATCH 295/617] matugen: 2.3.0 -> 2.4.0 --- pkgs/by-name/ma/matugen/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/matugen/package.nix b/pkgs/by-name/ma/matugen/package.nix index b147e74c2294..5e9e04c6bf60 100644 --- a/pkgs/by-name/ma/matugen/package.nix +++ b/pkgs/by-name/ma/matugen/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "matugen"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "InioX"; repo = "matugen"; - rev = "v${version}"; - hash = "sha256-WFitpFF1Ah4HkzSe4H4aN/ZM0EEIcP5ozLMUWaDggFU="; + rev = "refs/tags/v${version}"; + hash = "sha256-SN4m0ka5VHLIQYTszhlCIB+2D+nyWMzJM5n5bZdkG/I="; }; - cargoHash = "sha256-pD1NKUJmvMTnYKWjRrGnvbA0zVvGpWRIlf/9ovP9Jq4="; + cargoHash = "sha256-FwQhhwlldDskDzmIOxhwRuUv8NxXCxd3ZmOwqcuWz64="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security From 7a38c0547d70e5b75d68d7ebc55e501d59edea84 Mon Sep 17 00:00:00 2001 From: nartsisss Date: Mon, 4 Nov 2024 00:34:12 +0300 Subject: [PATCH 296/617] matugen: format with nixfmt-rfc-style --- pkgs/by-name/ma/matugen/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ma/matugen/package.nix b/pkgs/by-name/ma/matugen/package.nix index 5e9e04c6bf60..26690566c156 100644 --- a/pkgs/by-name/ma/matugen/package.nix +++ b/pkgs/by-name/ma/matugen/package.nix @@ -1,8 +1,9 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, darwin +{ + lib, + rustPlatform, + fetchFromGitHub, + stdenv, + darwin, }: rustPlatform.buildRustPackage rec { From 943aff98bc71efd79032009594ff7f16292357c3 Mon Sep 17 00:00:00 2001 From: nartsisss Date: Mon, 4 Nov 2024 00:34:30 +0300 Subject: [PATCH 297/617] matugen: refactor meta, remove with lib; --- pkgs/by-name/ma/matugen/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/matugen/package.nix b/pkgs/by-name/ma/matugen/package.nix index 26690566c156..afef4c26eda2 100644 --- a/pkgs/by-name/ma/matugen/package.nix +++ b/pkgs/by-name/ma/matugen/package.nix @@ -24,12 +24,12 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.SystemConfiguration ]; - meta = with lib; { + meta = { description = "Material you color generation tool"; homepage = "https://github.com/InioX/matugen"; changelog = "https://github.com/InioX/matugen/blob/${src.rev}/CHANGELOG.md"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ lampros ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ lampros ]; mainProgram = "matugen"; }; } From 0335471fde0104385ccea1a77723bd64ec8f3678 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 27 Aug 2024 20:09:01 +0100 Subject: [PATCH 298/617] immudb: 1.9DOM.2 -> 1.9.5 add mechanism to detect webconsole mismatch (vendor hash did indeed not change) https://github.com/codenotary/immudb/compare/v1.9DOM.2...v1.9.5 --- pkgs/servers/nosql/immudb/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/immudb/default.nix b/pkgs/servers/nosql/immudb/default.nix index 74571dfff5f1..2ebe92995bd9 100644 --- a/pkgs/servers/nosql/immudb/default.nix +++ b/pkgs/servers/nosql/immudb/default.nix @@ -14,15 +14,24 @@ let in buildGoModule rec { pname = "immudb"; - version = "1.9DOM.2"; + version = "1.9.5"; src = fetchFromGitHub { owner = "codenotary"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bNMJZWXelHQatW9rhqf3eYs61nJJEBwMXZhUZWQv6S0="; + sha256 = "sha256-XKioPk0Rv+I916OLInJEtOaDV9KcBMWSHmPOq2k3LTQ="; }; + postPatch = '' + EXPECTED_WEBCONSOLE_STRING='DEFAULT_WEBCONSOLE_VERSION=${webconsoleVersion}' + if ! grep -F "$EXPECTED_WEBCONSOLE_STRING" Makefile ; then + echo "Did not find $EXPECTED_WEBCONSOLE_STRING in Makefile. " \ + "Our webconsole version may need bumping (or the Makefile may have changed)" + exit 3 + fi + ''; + preBuild = '' mkdir -p webconsole/dist cp -r ${webconsoleDist}/* ./webconsole/dist From 18d48aa758d1109490e78139df7e6acc85bdc203 Mon Sep 17 00:00:00 2001 From: randomizedcoder Date: Sun, 3 Nov 2024 11:23:08 -0800 Subject: [PATCH 299/617] ffmpeg: add librist --- pkgs/development/libraries/ffmpeg/generic.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index f6f85b5b8e2a..9d765874e76c 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -101,6 +101,7 @@ , withQrencode ? withFullDeps && lib.versionAtLeast version "7" # QR encode generation , withQuirc ? withFullDeps && lib.versionAtLeast version "7" # QR decoding , withRav1e ? withFullDeps # AV1 encoder (focused on speed and safety) +, withRist ? withHeadlessDeps # Reliable Internet Stream Transport (RIST) protocol , withRtmp ? withFullDeps # RTMP[E] support , withRubberband ? withFullDeps && withGPL # Rubberband filter , withSamba ? withFullDeps && !stdenv.hostPlatform.isDarwin && withGPLv3 # Samba protocol @@ -276,6 +277,7 @@ , libplacebo_5 , libpulseaudio , libraw1394 +, librist , librsvg , libssh , libtensorflow @@ -642,6 +644,7 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withQuirc "libquirc") ] ++ [ (enableFeature withRav1e "librav1e") + (enableFeature withRist "librist") (enableFeature withRtmp "librtmp") (enableFeature withRubberband "librubberband") (enableFeature withSamba "libsmbclient") @@ -793,6 +796,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withQrencode [ qrencode ] ++ optionals withQuirc [ quirc ] ++ optionals withRav1e [ rav1e ] + ++ optionals withRist [ librist ] ++ optionals withRtmp [ rtmpdump ] ++ optionals withRubberband ([ rubberband ] ++ lib.optional stdenv.hostPlatform.isDarwin Accelerate) ++ optionals withSamba [ samba ] From 16f94ecf827be56ccdeac5c6c73dc180372c0807 Mon Sep 17 00:00:00 2001 From: Icy-Thought Date: Mon, 4 Nov 2024 03:39:19 +0100 Subject: [PATCH 300/617] galaxy-buds-client: 4.5.4 -> 5.1.0 --- .../audio/galaxy-buds-client/default.nix | 22 +- .../audio/galaxy-buds-client/deps.nix | 522 ++++++++++-------- 2 files changed, 302 insertions(+), 242 deletions(-) diff --git a/pkgs/applications/audio/galaxy-buds-client/default.nix b/pkgs/applications/audio/galaxy-buds-client/default.nix index a1ac12d00757..ee15f6dd72a1 100644 --- a/pkgs/applications/audio/galaxy-buds-client/default.nix +++ b/pkgs/applications/audio/galaxy-buds-client/default.nix @@ -2,33 +2,34 @@ , stdenv , buildDotnetModule , fetchFromGitHub +, dotnetCorePackages , fontconfig -, xorg +, glib , libglvnd +, xorg +, makeWrapper , makeDesktopItem , copyDesktopItems -, graphicsmagick }: buildDotnetModule rec { pname = "galaxy-buds-client"; - version = "4.5.4"; + version = "5.1.0"; src = fetchFromGitHub { owner = "ThePBone"; repo = "GalaxyBudsClient"; rev = version; - hash = "sha256-mmhXTtESjc8uNULc9zV2Qy/815BEEL7ybdnjArF2CXY="; + hash = "sha256-9m9H0T4rD6HIvb15h7+Q7SgLk0PkISkN8ojjh7nsiwA="; }; projectFile = [ "GalaxyBudsClient/GalaxyBudsClient.csproj" ]; nugetDeps = ./deps.nix; + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; dotnetFlags = [ "-p:Runtimeidentifier=linux-x64" ]; - nativeBuildInputs = [ - copyDesktopItems - graphicsmagick - ]; + nativeBuildInputs = [ makeWrapper copyDesktopItems ]; buildInputs = [ stdenv.cc.cc.lib fontconfig ]; @@ -40,8 +41,11 @@ buildDotnetModule rec { ]; postFixup = '' + wrapProgram "$out/bin/GalaxyBudsClient" \ + --prefix PATH : ${glib.bin}/bin + mkdir -p $out/share/icons/hicolor/256x256/apps/ - gm convert $src/GalaxyBudsClient/Resources/icon_white.ico $out/share/icons/hicolor/256x256/apps/${meta.mainProgram}.png + cp -r $src/GalaxyBudsClient/Resources/icon.png $out/share/icons/hicolor/256x256/apps/${meta.mainProgram}.png ''; desktopItems = [ diff --git a/pkgs/applications/audio/galaxy-buds-client/deps.nix b/pkgs/applications/audio/galaxy-buds-client/deps.nix index 1e72808d9068..ba4c76504890 100644 --- a/pkgs/applications/audio/galaxy-buds-client/deps.nix +++ b/pkgs/applications/audio/galaxy-buds-client/deps.nix @@ -2,237 +2,293 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "0.10.18"; sha256 = "01x7fc8rdkzba40piwi1ngsk7f8jawzn5bcq2la96hphsiahaarh"; }) - (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; sha256 = "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "0.10.18"; sha256 = "1qbb527jvhv2p8dcxi7lhm3lczy96j546gb5w09gh90dmzaq45bw"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.18"; sha256 = "0iaby5696km0yl0bs2a8i6a5ypras54mimnmh9wjwarwniqj8yjs"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "0.10.18"; sha256 = "1qsrzv1fz73p46p9v60qqds229znfv9hawnams5hxwl46jn2v9cp"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.18"; sha256 = "173apfayxkm3lgj7xk9xzsbxmdhv44svr49ccqnd1dii7y69bgny"; }) - (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "0.10.18"; sha256 = "0vcbhwckzxgcq9wxim91zk30kzjaydr9szl4rbr3rz85447hj9pi"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "0.10.18"; sha256 = "1hvmjs7wfcbycviky79g1p5q3bzs8j31sr53nnqxqy6pnbmg0nxg"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.18"; sha256 = "0phxxz4r1llklvp4svy9qlsms3qw77crai3ww70g03fifmmr9qq2"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.16"; sha256 = "1rla042nc9mc36qnpipszrf0sffwi5d83cr9dmihpa015bby42pz"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.18"; sha256 = "1vi83d9q6m2zd7b5snyzjxsj3vdp5bmi5vqhfslzghslpbhj2zwv"; }) - (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "0.10.16"; sha256 = "1gsm421gzzymc6rys4sw4hds33grg2mwpnm5xpbhwfh4bnbfblg8"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.18"; sha256 = "1rvqydbzdi2n6jw4xx9q8i025w5zsgcli9vmv0vw1d51rd4cnc4k"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.18"; sha256 = "0bzhbnz0dimxbpjxcrphnjn8nk37hqw0b83s2nsha4gzqvpc75b2"; }) - (fetchNuGet { pname = "Avalonia.Xaml.Behaviors"; version = "0.10.17"; sha256 = "05g761may9xa1n75lmzib5hknjk7k0nz453bmg2d5m0xxqw6yc13"; }) - (fetchNuGet { pname = "Avalonia.Xaml.Interactions"; version = "0.10.17"; sha256 = "0k0xnbayplndc6xld98jdla8zv769aj5s285cpbdgm2dril0rywj"; }) - (fetchNuGet { pname = "Avalonia.Xaml.Interactivity"; version = "0.10.17"; sha256 = "0smxxr0b8585x0fq57y3jcaxpl5qyxmkr0c6pd83bsczk8p4rjfy"; }) - (fetchNuGet { pname = "Castle.Core"; version = "4.4.0"; sha256 = "0rpcbmyhckvlvp6vbzpj03c1gqz56ixc6f15vgmxmyf1g40c24pf"; }) - (fetchNuGet { pname = "Config.Net"; version = "4.15.0"; sha256 = "0hsyma0r8hssz2h7bx38rr8ajx28x5ya2h4k665cbd65z3cs1di1"; }) - (fetchNuGet { pname = "Config.Net.Json"; version = "4.15.0"; sha256 = "1q6v4pj76h0hhn26ln4kc8vg75jm8jnlp1ssnrqzwxy88yf82z4h"; }) - (fetchNuGet { pname = "CS-Script.Core"; version = "1.4.2-preview"; sha256 = "0djliiixl3ncc1b29s9knal1ascg359na0pacsm73p98ad1f7pzh"; }) - (fetchNuGet { pname = "ExCSS"; version = "4.1.4"; sha256 = "1y50xp6rihkydbf5l73mr3qq2rm6rdfjrzdw9h1dw9my230q5lpd"; }) - (fetchNuGet { pname = "Fizzler"; version = "1.2.1"; sha256 = "1w5jb1d0figbv68dydbnlcsfmqlc3sv9z1zxp7d79dg2dkarc4qm"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2-preview.178"; sha256 = "1p5nwzl7jpypsd6df7hgcf47r977anjlyv21wacmalsj6lvdgnvn"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.1-preview.1"; sha256 = "1g5g7mnfr668hww9r84pfl04x0s44cq5ppykqg406a0lkdb2g8yp"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.1-preview.108"; sha256 = "0xs4px4fy5b6glc77rqswzpi5ddhxvbar1md6q9wla7hckabnq0z"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2-preview.178"; sha256 = "1402ylkxbgcnagcarqlfvg4gppy2pqs3bmin4n5mphva1g7bqb2p"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.1-preview.108"; sha256 = "16wvgvyra2g1b38rxxgkk85wbz89hspixs54zfcm4racgmj1mrj4"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2-preview.178"; sha256 = "0p8miaclnbfpacc1jaqxwfg0yfx9byagi4j4k91d9621vd19i8b2"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.1-preview.1"; sha256 = "0z0fadsicysa77ji4fnjkaaqfpc0d1w7x9qlkq40kb3jg7xhsmyx"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.1-preview.108"; sha256 = "16v7lrwwif2f5zfkx08n6y6w3m56mh4hy757biv0w9yffaf200js"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2-preview.178"; sha256 = "1n9jay9sji04xly6n8bzz4591fgy8i65p21a8mv5ip9lsyj1c320"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.1-preview.108"; sha256 = "15kqb353snwpavz3jja63mq8xjqsrw1f902scm8wxmsqrm5q6x55"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2-preview.178"; sha256 = "1r5syii96wv8q558cvsqw3lr10cdw6677lyiy82p6i3if51v3mr7"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.1-preview.1"; sha256 = "15671jvv5j98rkv249nn1fchxcd9gq8b37iwjqbmijig3r4ir718"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.1-preview.108"; sha256 = "0n6ymn9jqms3mk5hg0ar4y9jmh96myl6q0jimn7ahb1a8viq55k1"; }) - (fetchNuGet { pname = "InputSimulatorCore"; version = "1.0.5"; sha256 = "1vfqhqjcrpzahhvv5kyh6pk6j5c06wd0b2831y31fbxpdkxhbs2p"; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; }) - (fetchNuGet { pname = "libsodium"; version = "1.0.18"; sha256 = "15qzl5k31yaaapqlijr336lh4lzz1qqxlimgxy8fdyig8jdmgszn"; }) - (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.7"; sha256 = "1j0wbdmycj5xbk06p32f7xrddc40sbj3yca4d7ywg611yk26mvi1"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "2.9.6"; sha256 = "18mr1f0wpq0fir8vjnq0a8pz50zpnblr7sabff0yqx37c975934a"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.4.0"; sha256 = "12rn6gl4viycwk3pz5hp5df63g66zvba4hnkwr3f0876jj5ivmsw"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.6.0"; sha256 = "0i8x90700jr30j580mpawj6d90fngrb2zpkjjbn7f8r2p1mz75y7"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.4.0"; sha256 = "0rhylcwa95bxawcgixk64knv7p7xrykdjcabmx3gknk8hvj1ai9y"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.6.0"; sha256 = "0c44qp7lfpja6cq5nk7851qrswm2z1k2pnvsw43j9ybf10a27jrn"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.4.0"; sha256 = "1h2f0z9xnw987x8bydka1sd42ijqjx973md6v1gvpy1qc6ad244g"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.6.0"; sha256 = "0qbd995ip41x5mzyspl3asgj9w3fq3c6qsd0sj719aimqm1p57cd"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.4.0"; sha256 = "195gqnpwqkg2wlvk8x6yzm7byrxfq9bki20xmhf6lzfsdw3z4mf2"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.6.0"; sha256 = "1gz5ik2vwjdsyl5im7b37j1s2a1vsmmgkhxwm93897cx6q1bpjyg"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "3.1.6"; sha256 = "13m2na8a5mglbbjjp0dxb8ifkf23grkyk1g8585mr7v6cbj098ac"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.1.0"; sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "4.5.0"; sha256 = "0fnkv3ky12227zqg4zshx4kw2mvysq2ppxjibfw02cc3iprv4njq"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "4.7.0"; sha256 = "0pjll2a62hc576hd4wgyasva0lp733yllmk54n37svz5ac7nfz0q"; }) - (fetchNuGet { pname = "NetSparkle.New"; version = "2.0.0-preview20210114001"; sha256 = "170czxvhh285rymajc28qk34lrg09nvl6ib5ldws8fwy917w4w2s"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "10.0.1"; sha256 = "15ncqic3p2rzs8q8ppi0irl2miq75kilw4lh8yfgjq96id0ds3hv"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "12.0.3"; sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; }) - (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; }) - (fetchNuGet { pname = "NSec.Cryptography"; version = "20.2.0"; sha256 = "19slji51v8s8i4836nqqg7qb3i3p4ahqahz0fbb3gwpp67pn6izx"; }) - (fetchNuGet { pname = "Portable.BouncyCastle"; version = "1.8.9"; sha256 = "1w6kcaifklym8fwlgs7dncjpkflcyf2vyrb5i0i0lxwglyygzpqb"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) - (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "Sentry"; version = "3.17.0"; sha256 = "0gqldkxmvb0g4zsam102vk9yahdhydfzd765aq3fa8r1b8nz865d"; }) - (fetchNuGet { pname = "Sentry.Serilog"; version = "3.17.0"; sha256 = "1igf78dcz6c9bampb4vwdj798vqlk6m042j3cpfx469fxk9fkgcy"; }) - (fetchNuGet { pname = "Serilog"; version = "2.10.0"; sha256 = "08bih205i632ywryn3zxkhb15dwgyaxbhmm1z3b5nmby9fb25k7v"; }) - (fetchNuGet { pname = "Serilog"; version = "2.11.0-dev-01367"; sha256 = "1z9ddq1ym94dm8rx1x6m3mqzc424hvqfvn1zpcgm71q1p20psvx0"; }) - (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.0.1-dev-00876"; sha256 = "1s9m75hvaw4dilmgp3sdh7xb15v2mq2h252n9x76nvmw56ipsdnz"; }) - (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; sha256 = "1i7j870l47gan3gpnnlzkccn5lbm7518cnkp25a3g5gp9l0dbwpw"; }) - (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; }) - (fetchNuGet { pname = "Serilog.Sinks.Trace"; version = "3.0.0"; sha256 = "10byjmh2s0c13lmnzfw24qmr11kry9hg9y5fib3556y7759qwbqv"; }) - (fetchNuGet { pname = "ShimSkiaSharp"; version = "0.5.16"; sha256 = "06qf63bx6m18wbhvzfs89m5yl5s08spgg02gr7qy8j36r04k6cc5"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.1-preview.1"; sha256 = "1i1px67hcr9kygmbfq4b9nqzlwm7v2gapsp4isg9i19ax5g8dlhm"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.1-preview.108"; sha256 = "01sm36hdgmcgkai9m09xn2qfz8v7xhh803n8fng8rlxwnw60rgg6"; }) - (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.1-preview.1"; sha256 = "0r14s3zyn3cpic02j80xjh8x6dd8g671f9nfnng5zk1x497qdw3a"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.1-preview.1"; sha256 = "1r9qr3civk0ws1z7hg322qyr8yjm10853zfgs03szr2lvdqiy7d1"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.1-preview.108"; sha256 = "19jf2jcq2spwbpx3cfdi2a95jf4y8205rh56lmkh8zsxd2k7fjyp"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.1-preview.1"; sha256 = "1w55nrwpl42psn6klia5a9aw2j1n25hpw2fdhchypm9f0v2iz24h"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.1-preview.108"; sha256 = "1vcpqd7slh2b9gsacpd7mk1266r1xfnkm6230k8chl3ng19qlf15"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.1"; sha256 = "0mwj2yl4gn40lry03yqkj7sbi1drmm672dv88481sgah4c21lzrq"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.108"; sha256 = "0a89gqjw8k97arr0kyd0fm3f46k1qamksbnyns9xdlgydjg557dd"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.1"; sha256 = "1k50abd147pif9z9lkckbbk91ga1vv6k4skjz2n7wpll6fn0fvlv"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.108"; sha256 = "05g9blprq5msw3wshrgsk19y0fvhjlqiybs1vdyhfmww330jlypn"; }) - (fetchNuGet { pname = "Svg.Custom"; version = "0.5.16"; sha256 = "0qp0vmknclaahf1aj8y2jl4xbaq30rf4ia55fpawxi25dfxsa4wy"; }) - (fetchNuGet { pname = "Svg.Model"; version = "0.5.16"; sha256 = "0c2hk7wgvd2lbc96jxnkcwmzbbdnwgnhh4km9ijb5248qkghs1b1"; }) - (fetchNuGet { pname = "Svg.Skia"; version = "0.5.16"; sha256 = "0ra6svakyg5h6m19ww5yrxl85w8yi3v5vrzqgcnqlvzndk696cyf"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) - (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) - (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) - (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) - (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) - (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.7.0"; sha256 = "0pav0n21ghf2ax6fiwjbng29f27wkb4a2ddma0cqx04s97yyk25d"; }) - (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) - (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "4.5.0"; sha256 = "0knqa0zsm91nfr34br8gx5kjqq4v81zdhqkacvs2hzc8nqk0ddhc"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "4.7.0"; sha256 = "0yfw7cpl54mgfcylvlpvrl0c8r1b0zca6p7r3rcwkvqy23xqcyhg"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) - (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) - (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.6.0"; sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.0"; sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) - (fetchNuGet { pname = "System.Runtime.Loader"; version = "4.3.0"; sha256 = "07fgipa93g1xxgf7193a6vw677mpzgr0z0cfswbvqqb364cva8dk"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Formatters"; version = "4.3.0"; sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.3.0"; sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.7.0"; sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) - (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.7.0"; sha256 = "1s1sh8k10s0apa09c5m2lkavi3ys90y657whg2smb3y8mpkfr5vm"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { pname = "System.Security.Permissions"; version = "4.7.0"; sha256 = "13f366sj36jwbvld957gk2q64k2xbj48r8b0k9avrri2nlq1fs04"; }) - (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "4.7.0"; sha256 = "0fp3xrysccm5dkaac4yb51d793vywxks978kkl5x4db9gw29rfdr"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) - (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) - (fetchNuGet { pname = "System.Windows.Extensions"; version = "4.7.0"; sha256 = "11dmyx3j0jafjx5r9mkj1v4w2a4rzrdn8fgwm2d1g7fs1ayqcvy9"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) - (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) - (fetchNuGet { pname = "Tmds.DBus"; version = "0.9.1"; sha256 = "095vinsbb9pbphbhh7x7rxvs8a3b9w1nnz7gxn9bw5is01qnhgdm"; }) - (fetchNuGet { pname = "Trinet.Core.IO.Ntfs"; version = "4.1.1"; sha256 = "0a30xjmxjr6l8fdjivy70zsxk9p6qlgjs3g8h1q26jn40hpjbswr"; }) + (fetchNuGet { pname = "AsyncErrorHandler.Fody"; version = "1.3.0"; hash = "sha256-/H/QOyOTJnnvjU5Ikq+jj1K7fK66uzGIlLBwqtaOc58="; }) + (fetchNuGet { pname = "Avalonia"; version = "11.1.0-beta2"; hash = "sha256-iia9Ks8JoHWT/Drl9zJecOQsQPxVYLA/Qp/iFCXj4/Y="; }) + (fetchNuGet { pname = "Avalonia"; version = "11.1.0-rc1"; hash = "sha256-NjSOKJKWcrKcqEP/FAs14Y+ZzeitSyd7FvQaWpTUqhA="; }) + (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.22045.20230930"; hash = "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="; }) + (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; hash = "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.1.0-beta1"; hash = "sha256-pLB+PCR9sQ9DHiIWg65BzxhIypZP2F+a+c9FbQePAlg="; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.1.0-rc1"; hash = "sha256-u8CAZJIRbuXGxRivaGPlaXfxPQf7OCKUAU6jisYdaZs="; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.1.0-rc1"; hash = "sha256-0iiNKBQCmnO5rZUzGcsju5O81e0URM35FEz1FTZUHls="; }) + (fetchNuGet { pname = "Avalonia.Controls.ItemsRepeater"; version = "11.0.0"; hash = "sha256-OPgzdVAgHxn3Hv76cKF2yer3c+8H9iiBnsSCrUwCvOM="; }) + (fetchNuGet { pname = "Avalonia.Controls.ItemsRepeater"; version = "11.1.0-beta1"; hash = "sha256-098qNJzqnGRz77vmdzA84EVen6eTPeJoyxs1GKRjHeo="; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.1.0-rc1"; hash = "sha256-8j1qWibl5JUqAaS893TEzBQoWzsVqgAVMX4xVxWmKWo="; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.1.0-rc1"; hash = "sha256-UD0djXIpzVKxeWw5B99AGsibUy5hGF70mI9vZny6vOk="; }) + (fetchNuGet { pname = "Avalonia.Fonts.Inter"; version = "11.1.0-rc1"; hash = "sha256-kvGlKhBjDB8A5tTe0HPhVqVKy0eVjz6SE/qMQOzDyZ4="; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.1.0-rc1"; hash = "sha256-Oh9QqPL/O3a0kUsv/IHAg3/lDzQLRl5v4L5mGoqasbQ="; }) + (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "11.1.0-rc1"; hash = "sha256-fQM6vr+GHbwARROYFrEkOU9ZqBBCPCmwfa17eXeNqHA="; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.1.0-rc1"; hash = "sha256-BHdL5g1rYx7hOYXE60dmzlZ1N+7NFl8SD/SeM9nqEKA="; }) + (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.1.0-rc1"; hash = "sha256-RaSbdi+TtAeNR3NggoM4TsmMMhwGE/uJyrxBF6ubM94="; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.1.0-beta1"; hash = "sha256-bW0r+R0PXffG86ucWU+yBP85Ann3YkWpvVt856aj+cA="; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.1.0-beta2"; hash = "sha256-17FrZr4pmGST+aV/8Lg1iYGl42r3UhyTIJ61ltXxRu8="; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.1.0-rc1"; hash = "sha256-fawaToCwZWwvRJQKYVJYZeMWQEW8XPrNBJEZ3lXLOe8="; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.2"; hash = "sha256-cBwSBL5uajG2+o8YIMZWwHQ0VJGma+d5AEwI56mDxQw="; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.1.0-beta1"; hash = "sha256-AWnV0Y32VpC4w9HVyfhla1vM28vZa8LaxGX/XRZ7rGA="; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.1.0-rc1"; hash = "sha256-F06oKB97Se3JxGZRAsQCGklu5wS64agGCSUT9IBQcVU="; }) + (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "11.1.0-rc1"; hash = "sha256-prRC6GZ+dtVdYFjlGU20xHrkNHB69jegEjKFv+GK7Vw="; }) + (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.1.0-rc1"; hash = "sha256-Yy3gHV9SoZAVFHuAABjBqfdRNEVfFprAdx38e7tNucU="; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.1.0-rc1"; hash = "sha256-QfNeSeCbwQlVRCFYa8BjJlYnkSk3TC7ACenG3RAUFWU="; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.1.0-rc1"; hash = "sha256-kScofxDFq4+fAogQcSTu7axKBF2cqUjwH4c9ZbKx7s4="; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.1.0-rc1"; hash = "sha256-m0MTISz3KlQrccEIkSR+XEoiXY/iUGnQuH8NFPV6Y/Y="; }) + (fetchNuGet { pname = "Avalonia.Xaml.Behaviors"; version = "11.1.0-rc1"; hash = "sha256-/Gy7rv7nV4WYc0RCs+VpZq+qVDp61QQ3ibmhr8ligy4="; }) + (fetchNuGet { pname = "Avalonia.Xaml.Interactions"; version = "11.1.0-rc1"; hash = "sha256-xtOd6O+NVklPrKVui+J2bTyp7IBxMp8e7shtTzMNaH4="; }) + (fetchNuGet { pname = "Avalonia.Xaml.Interactions.Custom"; version = "11.1.0-rc1"; hash = "sha256-DHYhji8JXSzpKov6Gmj51ldoppcjwpGGlrkqgOHPYug="; }) + (fetchNuGet { pname = "Avalonia.Xaml.Interactions.DragAndDrop"; version = "11.1.0-rc1"; hash = "sha256-e9Z90XkZ2i83ziUwJLHI+Ut7sW85MC4XgtY5QlFapSM="; }) + (fetchNuGet { pname = "Avalonia.Xaml.Interactions.Draggable"; version = "11.1.0-rc1"; hash = "sha256-z6w5o5Mc9J8l8tr7oREEdMb5iOGlBm6Rq/tM+OrX334="; }) + (fetchNuGet { pname = "Avalonia.Xaml.Interactions.Events"; version = "11.1.0-rc1"; hash = "sha256-k7BPbdS5muS1VfNYBybjMmwPHfaJIYasgx14tq6pNKU="; }) + (fetchNuGet { pname = "Avalonia.Xaml.Interactions.Responsive"; version = "11.1.0-rc1"; hash = "sha256-jz/CUHWhc2TBlVyLiEZx4krwLMv2dSI9di70GIWZ/VE="; }) + (fetchNuGet { pname = "Avalonia.Xaml.Interactivity"; version = "11.1.0-rc1"; hash = "sha256-1JQR0Xgb1q7/XXx0fN8u3OvQwo64b630Cou3Gr6C8jg="; }) + (fetchNuGet { pname = "AvaloniaHex"; version = "0.1.0"; hash = "sha256-wMOcP+oSfe+Zhue5XbjI0w44ZOL4LuBbIgguH55C+ik="; }) + (fetchNuGet { pname = "BouncyCastle.Cryptography"; version = "2.4.0"; hash = "sha256-DoDZNWtYM+0OLIclOEZ+tjcGXymGlXvdvq2ZMPmiAJA="; }) + (fetchNuGet { pname = "Castle.Core"; version = "5.0.0"; hash = "sha256-o0dLsy0RfVOIggymFbUJMhfR3XDp6uFI3G1o4j9o2Lg="; }) + (fetchNuGet { pname = "CommandLineParser"; version = "2.9.2-ci-210"; hash = "sha256-54WTB8oSSaw118jWMxrJ29ZY9+bAE9IKmvUSY/c6JGs="; }) + (fetchNuGet { pname = "Config.Net"; version = "5.2.0"; hash = "sha256-UjHxmvrCDHj3rGVvkr0rvOp4BRxbleuajoeLmElmJmk="; }) + (fetchNuGet { pname = "CS-Script"; version = "4.8.16"; hash = "sha256-Z5B7ZklGSZMovqkJ4IV1J2IwA2f6W944Fx8xL0c+Z90="; }) + (fetchNuGet { pname = "DynamicData"; version = "7.9.5"; hash = "sha256-3XjOMuFathku9oWyss360+Ze5UMP7tSmUbMoax7qONU="; }) + (fetchNuGet { pname = "DynamicData"; version = "8.3.27"; hash = "sha256-iPZfL1x36PLf5Lq96zRFvR5OLcoRn7OdJIao98X8wac="; }) + (fetchNuGet { pname = "ExCSS"; version = "4.2.3"; hash = "sha256-M/H6P5p7qqdFz/fgAI2MMBWQ7neN/GIieYSSxxjsM9I="; }) + (fetchNuGet { pname = "FluentAvalonia.BreadcrumbBar"; version = "2.0.2"; hash = "sha256-JB1GiTESry2ZbH5q0vy32QqTr+DNJdaLSTxTBvQcAOs="; }) + (fetchNuGet { pname = "FluentAvaloniaUI"; version = "2.1.0-preview2"; hash = "sha256-Chm1WLDsm/sHdCaf4Q3UXn5m8PMPzq9Explz6a/lZAg="; }) + (fetchNuGet { pname = "FluentIcons.Avalonia.Fluent"; version = "1.1.234-exp"; hash = "sha256-/WczZLRjG7Jv4TQb/3E5GlMJWOpJCBEEeJdbtVkJ3To="; }) + (fetchNuGet { pname = "FluentIcons.Common"; version = "1.1.234"; hash = "sha256-UwKPJIoqjzp/fv6RWJ9lhIj+xmeA9Bqo05txX80VE4E="; }) + (fetchNuGet { pname = "Fody"; version = "6.0.0"; hash = "sha256-Jxvu8eKtzw4bTrZkRvT+uiqCCP/V3PyqPypOcMrHPZQ="; }) + (fetchNuGet { pname = "Fody"; version = "6.8.0"; hash = "sha256-2laYscz0i0LalGTAup7dsh6XlYRZSojYpp8XOwZJJfg="; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; hash = "sha256-4tbdgUabPjlkBm3aUFeocj4Fdslmms2olDFpzOLyqoQ="; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0"; hash = "sha256-LlPQO/NYgIMWicvLOtWsQzCp512QpIImYDP9/n2rDOc="; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0.2"; hash = "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; hash = "sha256-3xwVfNfKTkuLdnT+e3bfG9tNTdEmar7ByzY+NTlUKLg="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0"; hash = "sha256-AEHjgqX0o+Fob0SeZ6EikGKoEe6rRxess5fVJ31UL0U="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0.2"; hash = "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; hash = "sha256-ZohUEaovj/sRB4rjuJIOq6S9eim3m+qMlpHIebNDTRQ="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0"; hash = "sha256-6oFcdKb17UX5wyAUeCCKXGvzkf0w3MNdZOVMvs54tqw="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0.2"; hash = "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; hash = "sha256-ZsiBGpXfODHUHPgU/50k9QR/j6Klo7rsB0SUt8zYcBA="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "7.3.0"; hash = "sha256-9VI0xCavuuIIStuQ7ipBfWu5HrAt+Kk/F2j57C1llTU="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "7.3.0.2"; hash = "sha256-aEZr9uKAlCTeeHoYNR1Rs6L3P54765CemyrgJF8x09c="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; hash = "sha256-5GSzM5IUoOwK+zJg0d74WlT3n1VZly8pKlyjiqVocCI="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0"; hash = "sha256-WnB7l73hneU9Kpbm8S9zEYbZHjFre24vWz0vl8+v28M="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0.2"; hash = "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo="; }) + (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; hash = "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="; }) + (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="; }) + (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "6.0.0"; hash = "sha256-lNL5C4W7/p8homWooO/3ZKDZQ2M0FUTDixJwqWBPVbo="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; hash = "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; hash = "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.8.0"; hash = "sha256-3IEinVTZq6/aajMVA8XTRO3LTIEt0PuhGyITGJLtqz4="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.8.0"; hash = "sha256-MmOnXJvd/ezs5UPcqyGLnbZz5m+VedpRfB+kFZeeqkU="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "4.8.0"; hash = "sha256-DoD3XoBW2PzLKcag4h1VKhkj+PqcVwZoSZv0HL+AOdQ="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.8.0"; hash = "sha256-WNzc+6mKqzPviOI0WMdhKyrWs8u32bfGj2XwmfL7bwE="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "4.8.0"; hash = "sha256-7fT/Mu/zXo+OVBoWH2OQJIiU38u9F8Xej1IxV8pJquQ="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.8.0"; hash = "sha256-X8R4SpWVO/gpip5erVZf5jCCx8EX3VzIRtNrQiLDIoM="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; hash = "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "9.0.0-preview.3.24172.4"; hash = "sha256-mWNq7lREpUW6Qd2u2YrGGC0KUiDNzYopDgxE6pKCXrM="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "9.0.0-preview.3.24172.4"; hash = "sha256-yGALVD3xPYQ8t4Tc13JpZjYsiPaU4HfM6iVSs+qRs/E="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "9.0.0-preview.3.24172.4"; hash = "sha256-getJ8DrcDupHzqe9pEJcYyT9bFcaxNdQh57+1LPZb/w="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "9.0.0-preview.3.24172.4"; hash = "sha256-YHLlACYnsJM2lIbTZAoKuPFJbx/LErf/oSlkoj6yKpU="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; version = "9.0.0-preview.3.24172.4"; hash = "sha256-PYSomyyF6YV6luKtrRcXum5CclCVHPWoCEutNBiEVrA="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "9.0.0-preview.3.24172.4"; hash = "sha256-st1K8fquS/0ky1lrgMi2D4/ycDMAsjtOQiSblN16dJU="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; version = "9.0.0-preview.3.24172.4"; hash = "sha256-lb8u8LUxiLqTIYISjRKxRkgH5Gnl8/DdrDWIU+fUgMo="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "9.0.0-preview.3.24172.4"; hash = "sha256-5J8yGB9L2cmqvexSL1YSu896tHHM7dYtz3wB5wsnr6E="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "9.0.0-preview.3.24172.9"; hash = "sha256-Qg/VqFXF6+bjpktiuph5xifHHr5kes87YmD4Je5f5FM="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "9.0.0-preview.3.24172.9"; hash = "sha256-cU6PKi88d0HBAPtCI+UiOOR4sWFitPZnu3CaprtRoL4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "9.0.0-preview.3.24172.9"; hash = "sha256-KlQ7Ft5LC97brV+rHcZMCqQYI2Y54wlAsp9oILGwwh0="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "9.0.0-preview.3.24172.9"; hash = "sha256-GuUYI2tn4tqmXll76Hk8xQIemxS0xjuaA9VU7Zios7c="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "9.0.0-preview.3.24172.9"; hash = "sha256-Dw+1jgtPe+NoAUgN68ydMmKin1c3u7UbCM5N786Nh3Y="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "8.0.0"; hash = "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "9.0.0-preview.3.24172.9"; hash = "sha256-QsU85j3JmTbWQIn5Jf6pv83rHTTbmmTRNh9OBbl7eVY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "9.0.0-preview.3.24172.9"; hash = "sha256-WeOxx/V2d7MehPtp4W+BMV7PM/N6XtSRj+olyAOrxsA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "9.0.0-preview.3.24172.9"; hash = "sha256-pTkw8eW0166fiDUz9bptG3xKVR0PB8y7Vam4PyhnVPs="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "9.0.0-preview.3.24172.9"; hash = "sha256-0jaZbZab1G48ydHzzNDl/DAEZsnlgTMkzUlxrtGjRAQ="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "9.0.0-preview.3.24172.9"; hash = "sha256-zdUgl4vLTLcTeu48/fZj58SUbrHogkpCTn+DpWWNNvs="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="; }) + (fetchNuGet { pname = "Mono.TextTemplating"; version = "3.0.0-preview-0052-g5d0f76c785"; hash = "sha256-nv3ynCt5ZVRuzIDMoy8pEi54SYC+UycMT86/VRBP9Cg="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; hash = "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; }) + (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; hash = "sha256-ZUj6YFSMZp5CZtXiamw49eZmbp1iYBuNsIKNnjxcRzA="; }) + (fetchNuGet { pname = "ReactiveUI"; version = "18.3.1"; hash = "sha256-1rf4icGRKTR3XIWJpkQJCG7ObRM+72ITB5K+ND1is9M="; }) + (fetchNuGet { pname = "ReactiveUI"; version = "19.5.41"; hash = "sha256-FsdD1lBZyegqOVzJhZHAz1owCLh7GbVUYXiORbo5euk="; }) + (fetchNuGet { pname = "ReactiveUI.Fody"; version = "19.5.41"; hash = "sha256-LfKELxAfApQLL0fDd7UJCsZML5C4MFN+Gc5ECaBXmUM="; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; hash = "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; hash = "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190="; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; hash = "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; hash = "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) + (fetchNuGet { pname = "ScottPlot"; version = "5.0.35"; hash = "sha256-MLwAa/8nGHcBSoS8uz+NEP/9qrAZMe8DatQynuHrkQc="; }) + (fetchNuGet { pname = "ScottPlot.Avalonia"; version = "5.0.35"; hash = "sha256-qO2aEh/Eq9ItbSjObyzl58UwIh4ME7zdd7nsQ1JnHw4="; }) + (fetchNuGet { pname = "Sentry"; version = "4.2.1"; hash = "sha256-ubjnryPu0PswEdZZtgWfetjMcsv08PLNmpTD70hf/kI="; }) + (fetchNuGet { pname = "Sentry.Serilog"; version = "4.2.1"; hash = "sha256-+1f+FP+BlqY3FiUyzKm3GPjsOUxSVj5TJdLMODyPd8s="; }) + (fetchNuGet { pname = "Serilog"; version = "3.1.1"; hash = "sha256-L263y8jkn7dNFD2jAUK6mgvyRTqFe39i1tRhVZsNZTI="; }) + (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "5.0.1"; hash = "sha256-aveoZM25ykc2haBHCXWD09jxZ2t2tYIGmaNTaO2V0jI="; }) + (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; hash = "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ="; }) + (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; hash = "sha256-GKy9hwOdlu2W0Rw8LiPyEwus+sDtSOTl8a5l9uqz+SQ="; }) + (fetchNuGet { pname = "Serilog.Sinks.Trace"; version = "3.0.0"; hash = "sha256-Gy+OUznHm1LGiq749GDyeYaQKyaCu28rHYEBLWCVfoE="; }) + (fetchNuGet { pname = "SharpHook"; version = "5.3.7"; hash = "sha256-G9JIGPPuVBDM1hUmDAdX0UlTCIjJ+Ct3C7i2VaYWqlc="; }) + (fetchNuGet { pname = "ShimSkiaSharp"; version = "2.0.0-rc1"; hash = "sha256-rzSatpDash9fSNZTo1pp6ghQyGPsoOmi2pwhj1vOuN8="; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; hash = "sha256-WyMAjnQt8ZsuWpGLI89l/f4bHvv+cg7FdTAL7CtJBvs="; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.7"; hash = "sha256-Ip3afwTr4QOqtwOUKqK6g/9Ug4dMSebTci5K29Jc3Dg="; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.8"; hash = "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="; }) + (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.8"; hash = "sha256-W9jNuEo/8q+k2aHNC19FfKcBUIEWx2zDcGwM+jDZ1o8="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; hash = "sha256-eExWAAURgnwwm2fRwsK/rf+TeOAPs2n02XZzC0zeUjU="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.7"; hash = "sha256-QdQRN1IBjqohmI8U+6WJRPgOsh8a9soN2UvVObs1H1w="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.8"; hash = "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux.NoDependencies"; version = "2.88.8"; hash = "sha256-1A00g0D1BhXU6l1iDHlaC30iWJpiGh9Z5JRpFtfohUY="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; hash = "sha256-8G4swiLMr6XS3kjfO/YC1PyoVdfSq7nxZthZZ+KTKqQ="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.7"; hash = "sha256-WgPldXSqPMm0TrdUWAyjge5rcRhd9G3/Ix/v/2NQvBc="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.8"; hash = "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.3"; hash = "sha256-/SkV2pIZnt0ziSKB7gt7U2Rltk2Id+zOzbmqgfWUtvA="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.7"; hash = "sha256-oIjFF+Rv+g8AKyNaaVAgnHX3eeP/l8K2sgHs9bRyUMw="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.8"; hash = "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; hash = "sha256-2PhMTwRHitT13KCKiZltKIFieAvNY4jBmVZ2ndVynA8="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.7"; hash = "sha256-+7RxCAr+ne9MZWdXKKpV4ZbHW0k6hLD20ZFWWOCiNYU="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.8"; hash = "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="; }) + (fetchNuGet { pname = "Splat"; version = "14.4.1"; hash = "sha256-i1yzIVpKdFjZMI4J8H970nZCxszklgDitYTEKKz0zA8="; }) + (fetchNuGet { pname = "Splat"; version = "14.8.12"; hash = "sha256-9KTsYPHVN/wiL8/Yy1KQafrFRy7x8VCEHdzgB+9+8SU="; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.7"; hash = "sha256-+jzuEf2tAdo12vOKDlYAb/p+j50PeHsxyyDy4/+tKd4="; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.7"; hash = "sha256-pm3FgRoFLp9VcoXJLZf+1WRc+nZWHK37CFE8cxihcvg="; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.7"; hash = "sha256-Rigu45bRIwCSIV5MyiybZtXuUxn1oPoGDo5NZN1wfM0="; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.7"; hash = "sha256-Kz01LuseCvkJBMIe+XACzFjUj0/ug9GDDpMNezSwi00="; }) + (fetchNuGet { pname = "Svg.Custom"; version = "2.0.0-rc1"; hash = "sha256-9GbCNRjVodohzjqJkuHZV1sNuwO8rA2nYSSdd48YAHk="; }) + (fetchNuGet { pname = "Svg.Model"; version = "2.0.0-rc1"; hash = "sha256-msdN/k77sF2EitKy5hufHZ5DK/fjKWXV+CM8U9T543k="; }) + (fetchNuGet { pname = "Svg.Skia"; version = "2.0.0-rc1"; hash = "sha256-iKQOenzOfAGwmt8Tteb19L/WjY0c6aVQWJfW2DFAF9g="; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; }) + (fetchNuGet { pname = "System.CodeDom"; version = "6.0.0"; hash = "sha256-uPetUFZyHfxjScu5x4agjk9pIhbCkt5rG4Axj25npcQ="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; hash = "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; hash = "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="; }) + (fetchNuGet { pname = "System.Composition"; version = "7.0.0"; hash = "sha256-YjhxuzuVdAzRBHNQy9y/1ES+ll3QtLcd2o+o8wIyMao="; }) + (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "7.0.0"; hash = "sha256-3s52Dyk2J66v/B4LLYFBMyXl0I8DFDshjE+sMjW4ubM="; }) + (fetchNuGet { pname = "System.Composition.Convention"; version = "7.0.0"; hash = "sha256-N4MkkBXSQkcFKsEdcSe6zmyFyMmFOHmI2BNo3wWxftk="; }) + (fetchNuGet { pname = "System.Composition.Hosting"; version = "7.0.0"; hash = "sha256-7liQGMaVKNZU1iWTIXvqf0SG8zPobRoLsW7q916XC3M="; }) + (fetchNuGet { pname = "System.Composition.Runtime"; version = "7.0.0"; hash = "sha256-Oo1BxSGLETmdNcYvnkGdgm7JYAnQmv1jY0gL0j++Pd0="; }) + (fetchNuGet { pname = "System.Composition.TypedParts"; version = "7.0.0"; hash = "sha256-6ZzNdk35qQG3ttiAi4OXrihla7LVP+y2fL3bx40/32s="; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; hash = "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms="; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; }) + (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "6.0.0"; hash = "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM="; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; hash = "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; hash = "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; hash = "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="; }) + (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; hash = "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; hash = "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) + (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; hash = "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE="; }) + (fetchNuGet { pname = "System.Reactive"; version = "6.0.0"; hash = "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "7.0.0"; hash = "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; hash = "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="; }) + (fetchNuGet { pname = "System.Runtime.Loader"; version = "4.3.0"; hash = "sha256-syG1GTFjYbwX146BD/L7t55j+DZqpHDc6z28kdSNzx0="; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; hash = "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="; }) + (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; hash = "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; hash = "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY="; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; hash = "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="; }) + (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; hash = "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; hash = "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; hash = "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; hash = "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; hash = "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "9.0.0-preview.3.24172.9"; hash = "sha256-UQzDJ7IEJze+rnUP/yjSpE4EwN3Ozyw/dRHuwLvt3Vg="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; hash = "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "9.0.0-preview.3.24172.9"; hash = "sha256-X2yE5HVcrC4oqaheGM5yzy6hfpPFn7S284y5ssM8M+I="; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "7.0.0"; hash = "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; hash = "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="; }) + (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; hash = "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; }) + (fetchNuGet { pname = "Tmds.DBus"; version = "0.16.0"; hash = "sha256-TYiw2k6FxKMsUqJ7LOjAC/xy0jpwkQ9D58+H3Ws+ijk="; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.16.0"; hash = "sha256-vKYEaa1EszR7alHj48R8G3uYArhI+zh2ZgiBv955E98="; }) ] From 5a10946c77cdf0395f2bff82347a80199250fda0 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 4 Nov 2024 06:52:09 +0000 Subject: [PATCH 301/617] libvpx: 1.14.1 -> 1.15.0 Changes: https://chromium.googlesource.com/webm/libvpx/+/refs/tags/v1.15.0 --- pkgs/development/libraries/libvpx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 4f6c91d65c71..4e6e6316d9ad 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -94,13 +94,13 @@ assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; stdenv.mkDerivation rec { pname = "libvpx"; - version = "1.14.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = "webmproject"; repo = pname; rev = "v${version}"; - hash = "sha256-Pfg7g4y/dqn2VKDQU1LnTJQSj1Tont9/8Je6ShDb2GQ="; + hash = "sha256-ewkx1okhpa05jn4DyN8pkl6UJoz4Ymw4jRe6GN1lWuA="; }; postPatch = '' From 9a023e536d952be7d83df05075a83abc4d0ec93b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 4 Nov 2024 06:58:33 +0000 Subject: [PATCH 302/617] graphviz: 12.1.2 -> 12.2.0 Changes: https://gitlab.com/graphviz/graphviz/-/blob/12.2.0/CHANGELOG.md?ref_type=tags --- pkgs/tools/graphics/graphviz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index dbbe59e7468e..6baac4dc90d9 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -32,13 +32,13 @@ let in stdenv.mkDerivation rec { pname = "graphviz"; - version = "12.1.2"; + version = "12.2.0"; src = fetchFromGitLab { owner = "graphviz"; repo = "graphviz"; rev = version; - hash = "sha256-dRqGqnSGldr1Vb/wzR+jcuXCoAw35pTdm84wqJlA0mA="; + hash = "sha256-BSqCI9nIDjymPbCPWGFdWmqfyjuTkIsL1r0qv+Qjy10="; }; nativeBuildInputs = [ From 1c69b0c0e734568af54cd5d5f21231bd6d5870fa Mon Sep 17 00:00:00 2001 From: Daphne Preston-Kendal Date: Thu, 17 Oct 2024 16:16:03 +0200 Subject: [PATCH 303/617] mutagen: 0.17.1 -> 0.18.0 --- pkgs/tools/misc/mutagen/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix index d3ffa387d9f2..bb6848367fce 100644 --- a/pkgs/tools/misc/mutagen/default.nix +++ b/pkgs/tools/misc/mutagen/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mutagen"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "mutagen-io"; repo = pname; rev = "v${version}"; - hash = "sha256-M7h8qlqqGK4Nl4yXL7ZhGTq/CL+LdDpI/nv90koyu3Y="; + hash = "sha256-/UigWQMk+VDMGna/ixctU8MR7VNPpOTOGNUtuYx8DS0="; }; - vendorHash = "sha256-kfzT+230KY2TJVc0qKMi4TysmltZSgF/OvL5nPLPcbM="; + vendorHash = "sha256-J92LzjIsLlBOhnkWrp8MRgoe+4NzXyBgqQRigse5GQk="; agents = fetchzip { name = "mutagen-agents-${version}"; @@ -21,7 +21,7 @@ buildGoModule rec { postFetch = '' rm $out/mutagen # Keep only mutagen-agents.tar.gz. ''; - hash = "sha256-RFB1/gzLjs9w8mebEd4M9Ldv3BrLIj2RsN/QAIJi45E="; + hash = "sha256-EGMBsv6WjmWj/tOhtOORd6eqHmdfJb5pxPrb3zr/ynI="; }; nativeBuildInputs = [ installShellFiles ]; From 478934a2a5e314eaf15913c89b13a51ebb4c8e33 Mon Sep 17 00:00:00 2001 From: nartsisss Date: Mon, 4 Nov 2024 16:42:26 +0300 Subject: [PATCH 304/617] matugen: use new darwin sdk pattern --- pkgs/by-name/ma/matugen/package.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/by-name/ma/matugen/package.nix b/pkgs/by-name/ma/matugen/package.nix index afef4c26eda2..1a67c6cd51f7 100644 --- a/pkgs/by-name/ma/matugen/package.nix +++ b/pkgs/by-name/ma/matugen/package.nix @@ -2,8 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - stdenv, - darwin, }: rustPlatform.buildRustPackage rec { @@ -19,11 +17,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-FwQhhwlldDskDzmIOxhwRuUv8NxXCxd3ZmOwqcuWz64="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ]; - meta = { description = "Material you color generation tool"; homepage = "https://github.com/InioX/matugen"; From 2610fc983ab0d678a0914a3b61367a4ead11777b Mon Sep 17 00:00:00 2001 From: Duncan Steele Date: Mon, 4 Nov 2024 15:39:29 +0000 Subject: [PATCH 305/617] objfw: 1.1.7 -> 1.2 --- pkgs/by-name/ob/objfw/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ob/objfw/package.nix b/pkgs/by-name/ob/objfw/package.nix index 4a02e4989849..6b0efddb1741 100644 --- a/pkgs/by-name/ob/objfw/package.nix +++ b/pkgs/by-name/ob/objfw/package.nix @@ -9,13 +9,13 @@ clangStdenv.mkDerivation (finalAttrs: { pname = "objfw"; - version = "1.1.7"; + version = "1.2"; src = fetchFromGitHub { owner = "ObjFW"; repo = "ObjFW"; - rev = "refs/tags/1.1.7-release"; - hash = "sha256-0ylG/2ZSO3b8zdh6W9QJH5OJW9V344CCik1DduV5mhI="; + rev = "refs/tags/1.2-release"; + hash = "sha256-nGajiLYwkIDyJujN2zWULkQXKV2A2wzjYl9IoZBU/N4="; }; nativeBuildInputs = [ From 5e5192e6c12a630e592e38b2a119933463b8b8cb Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 4 Nov 2024 18:19:24 +0100 Subject: [PATCH 306/617] taisei: move to pkgs/by-name --- pkgs/{games => by-name/ta}/taisei/0001-lto-fix.patch | 0 .../{games/taisei/default.nix => by-name/ta/taisei/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{games => by-name/ta}/taisei/0001-lto-fix.patch (100%) rename pkgs/{games/taisei/default.nix => by-name/ta/taisei/package.nix} (100%) diff --git a/pkgs/games/taisei/0001-lto-fix.patch b/pkgs/by-name/ta/taisei/0001-lto-fix.patch similarity index 100% rename from pkgs/games/taisei/0001-lto-fix.patch rename to pkgs/by-name/ta/taisei/0001-lto-fix.patch diff --git a/pkgs/games/taisei/default.nix b/pkgs/by-name/ta/taisei/package.nix similarity index 100% rename from pkgs/games/taisei/default.nix rename to pkgs/by-name/ta/taisei/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 062a4d288373..2a8a82cba2f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34980,8 +34980,6 @@ with pkgs; t4kcommon = callPackage ../games/t4kcommon { }; - taisei = callPackage ../games/taisei { }; - tcl2048 = callPackage ../games/tcl2048 { }; the-powder-toy = callPackage ../by-name/th/the-powder-toy/package.nix { From daf3bcfbd363375a492442d0e57c1e8318594302 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 4 Nov 2024 18:21:06 +0100 Subject: [PATCH 307/617] taisei: format with nixfmt --- pkgs/by-name/ta/taisei/package.nix | 48 +++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ta/taisei/package.nix b/pkgs/by-name/ta/taisei/package.nix index ee5712f7b7f6..fc3b99db6e0a 100644 --- a/pkgs/by-name/ta/taisei/package.nix +++ b/pkgs/by-name/ta/taisei/package.nix @@ -1,9 +1,23 @@ -{ lib, stdenv, fetchurl -# Build depends -, docutils, meson, ninja, pkg-config, python3 -# Runtime depends -, glfw, SDL2, SDL2_mixer -, cglm, freetype, libpng, libwebp, libzip, zlib +{ + lib, + stdenv, + fetchurl, + # Build depends + docutils, + meson, + ninja, + pkg-config, + python3, + # Runtime depends + glfw, + SDL2, + SDL2_mixer, + cglm, + freetype, + libpng, + libwebp, + libzip, + zlib, }: stdenv.mkDerivation rec { @@ -16,12 +30,23 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - docutils meson ninja pkg-config python3 + docutils + meson + ninja + pkg-config + python3 ]; buildInputs = [ - glfw SDL2 SDL2_mixer - cglm freetype libpng libwebp libzip zlib + glfw + SDL2 + SDL2_mixer + cglm + freetype + libpng + libwebp + libzip + zlib ]; patches = [ ./0001-lto-fix.patch ]; @@ -40,7 +65,10 @@ stdenv.mkDerivation rec { folklore. ''; homepage = "https://taisei-project.org/"; - license = [ licenses.mit licenses.cc-by-40 ]; + license = [ + licenses.mit + licenses.cc-by-40 + ]; maintainers = [ maintainers.lambda-11235 ]; platforms = platforms.all; }; From 1ffa3b644df17a5ec4fa18bfeac36022c7e2e970 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 4 Nov 2024 18:40:26 +0100 Subject: [PATCH 308/617] taisei: refactor --- pkgs/by-name/ta/taisei/0001-lto-fix.patch | 13 ------------- pkgs/by-name/ta/taisei/package.nix | 14 +++++++------- 2 files changed, 7 insertions(+), 20 deletions(-) delete mode 100644 pkgs/by-name/ta/taisei/0001-lto-fix.patch diff --git a/pkgs/by-name/ta/taisei/0001-lto-fix.patch b/pkgs/by-name/ta/taisei/0001-lto-fix.patch deleted file mode 100644 index eed7b845f53c..000000000000 --- a/pkgs/by-name/ta/taisei/0001-lto-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -index 80aa58d..c7e9d0a 100644 ---- a/meson.build -+++ b/meson.build -@@ -17,7 +17,7 @@ project('taisei', 'c', - # You may want to change these for a debug build dir - 'buildtype=release', - 'strip=true', -- 'b_lto=true', -+ 'b_lto=false', - 'b_ndebug=if-release', - ] - ) diff --git a/pkgs/by-name/ta/taisei/package.nix b/pkgs/by-name/ta/taisei/package.nix index fc3b99db6e0a..0a48f6e4db8f 100644 --- a/pkgs/by-name/ta/taisei/package.nix +++ b/pkgs/by-name/ta/taisei/package.nix @@ -49,13 +49,13 @@ stdenv.mkDerivation rec { zlib ]; - patches = [ ./0001-lto-fix.patch ]; + mesonFlags = [ "-Db_lto=false" ]; preConfigure = '' patchShebangs . ''; - meta = with lib; { + meta = { broken = stdenv.hostPlatform.isDarwin; description = "Free and open-source Touhou Project clone and fangame"; mainProgram = "taisei"; @@ -65,11 +65,11 @@ stdenv.mkDerivation rec { folklore. ''; homepage = "https://taisei-project.org/"; - license = [ - licenses.mit - licenses.cc-by-40 + license = with lib.licenses; [ + mit + cc-by-40 ]; - maintainers = [ maintainers.lambda-11235 ]; - platforms = platforms.all; + maintainers = with lib.maintainers; [ lambda-11235 ]; + platforms = lib.platforms.all; }; } From fb3821722e9cb3311cdcff40e6d89595c7e9c90b Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 4 Nov 2024 18:41:01 +0100 Subject: [PATCH 309/617] taisei: add Gliczy as maintainer --- pkgs/by-name/ta/taisei/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ta/taisei/package.nix b/pkgs/by-name/ta/taisei/package.nix index 0a48f6e4db8f..e49ddb851ed7 100644 --- a/pkgs/by-name/ta/taisei/package.nix +++ b/pkgs/by-name/ta/taisei/package.nix @@ -69,7 +69,10 @@ stdenv.mkDerivation rec { mit cc-by-40 ]; - maintainers = with lib.maintainers; [ lambda-11235 ]; + maintainers = with lib.maintainers; [ + lambda-11235 + Gliczy + ]; platforms = lib.platforms.all; }; } From e2210c0ebc861bd60710ea4008316297411d3d6a Mon Sep 17 00:00:00 2001 From: Kosyrev Serge Date: Sat, 27 Jan 2024 01:40:27 +0400 Subject: [PATCH 310/617] dhcpcd: 10.0.6 -> 10.1.0 This works around #291, halfway. --- pkgs/tools/networking/dhcpcd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 5d5e4a0b32e2..2e0dbb90d63f 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "dhcpcd"; - version = "10.0.6"; + version = "10.1.0"; src = fetchFromGitHub { owner = "NetworkConfiguration"; repo = "dhcpcd"; rev = "v${version}"; - sha256 = "sha256-tNC5XCA8dShaTIff15mQz8v+YK9sZkRNLCX5qnlpxx4="; + sha256 = "sha256-Qtg9jOFMR/9oWJDmoNNcEAMxG6G1F187HF4MMBJIoTw="; }; nativeBuildInputs = [ pkg-config ]; From 23fd859f452bc1e6050b88084b5203d5ab33c96f Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 4 Nov 2024 20:30:13 +0100 Subject: [PATCH 311/617] taisei: 1.3.2 -> 1.4.2 --- pkgs/by-name/ta/taisei/package.nix | 50 +++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ta/taisei/package.nix b/pkgs/by-name/ta/taisei/package.nix index e49ddb851ed7..452fbf04d0db 100644 --- a/pkgs/by-name/ta/taisei/package.nix +++ b/pkgs/by-name/ta/taisei/package.nix @@ -1,13 +1,18 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, # Build depends docutils, meson, ninja, pkg-config, - python3, + python3Packages, + opusfile, + openssl, + gamemode, + shaderc, + ensureNewerSourcesForZipFilesHook, # Runtime depends glfw, SDL2, @@ -18,15 +23,22 @@ libwebp, libzip, zlib, + zstd, + spirv-cross, + + gamemodeSupport ? stdenv.hostPlatform.isLinux, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "taisei"; - version = "1.3.2"; + version = "1.4.2"; - src = fetchurl { - url = "https://github.com/taisei-project/${pname}/releases/download/v${version}/${pname}-v${version}.tar.xz"; - sha256 = "1g53fcyrlzmvlsb40pw90gaglysv6n1w42hk263iv61ibhdmzh6v"; + src = fetchFromGitHub { + owner = "taisei-project"; + repo = "taisei"; + rev = "v${finalAttrs.version}"; + hash = "sha256-rThLz8o6IYhIBUc0b1sAQi2aF28btajcM1ScTv+qn6c="; + fetchSubmodules = true; }; nativeBuildInputs = [ @@ -34,7 +46,10 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 + python3Packages.python + python3Packages.zstandard + ensureNewerSourcesForZipFilesHook + shaderc ]; buildInputs = [ @@ -47,16 +62,27 @@ stdenv.mkDerivation rec { libwebp libzip zlib - ]; + zstd + opusfile + openssl + spirv-cross + ] ++ lib.optional gamemodeSupport gamemode; - mesonFlags = [ "-Db_lto=false" ]; + mesonFlags = [ + (lib.mesonBool "b_lto" false) + (lib.mesonEnable "install_macos_bundle" false) + (lib.mesonEnable "install_relocatable" false) + (lib.mesonEnable "shader_transpiler" false) + (lib.mesonEnable "gamemode" gamemodeSupport) + ]; preConfigure = '' patchShebangs . ''; + strictDeps = true; + meta = { - broken = stdenv.hostPlatform.isDarwin; description = "Free and open-source Touhou Project clone and fangame"; mainProgram = "taisei"; longDescription = '' @@ -75,4 +101,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; }; -} +}) From f5048d4a6daf569c3e8cf8b3f6a36725a1b0f0f2 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 3 Nov 2024 23:34:58 +0000 Subject: [PATCH 312/617] python312Packages.django-silk: 5.2.0 -> 5.3.0 --- pkgs/development/python-modules/django-silk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django-silk/default.nix b/pkgs/development/python-modules/django-silk/default.nix index 0825ee658b93..dc7372d59c16 100644 --- a/pkgs/development/python-modules/django-silk/default.nix +++ b/pkgs/development/python-modules/django-silk/default.nix @@ -25,16 +25,16 @@ buildPythonPackage rec { pname = "django-silk"; - version = "5.2.0"; + version = "5.3.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "jazzband"; repo = "django-silk"; rev = "refs/tags/${version}"; - hash = "sha256-wSQ0yV9+UyjgsaQGNn+MdeUkx9eeRqaHvDpUxIGRmGM="; + hash = "sha256-teDvQzNmzCOWdPOqlm2GRhhlilOjM+VAcfOXPw/Rq44="; }; # "test_time_taken" tests aren't suitable for reproducible execution, but Django's From 87447256cd38dc4ec398e6b2a55ea40b58a4f1e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C3=B6lfchen?= <115360611+W-lfchen@users.noreply.github.com> Date: Mon, 4 Nov 2024 22:45:14 +0100 Subject: [PATCH 313/617] obsidian: 1.7.4 -> 1.7.5 --- pkgs/by-name/ob/obsidian/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ob/obsidian/package.nix b/pkgs/by-name/ob/obsidian/package.nix index 1060c148ea38..b8bc802cba2a 100644 --- a/pkgs/by-name/ob/obsidian/package.nix +++ b/pkgs/by-name/ob/obsidian/package.nix @@ -12,7 +12,7 @@ }: let pname = "obsidian"; - version = "1.7.4"; + version = "1.7.5"; appname = "Obsidian"; meta = with lib; { description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -26,7 +26,7 @@ let filename = if stdenv.hostPlatform.isDarwin then "Obsidian-${version}.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - hash = if stdenv.hostPlatform.isDarwin then "sha256-r3dSHx3y7BzjbWYJwXwyWCeTRya2jLMVhzV7NWpRDb4=" else "sha256-NRL8WHi+4ne48z7b9G6trJZiTt/lhwcF2CZjgyYmOug="; + hash = if stdenv.hostPlatform.isDarwin then "sha256-2gUXA0a7gcVFtTl5qiJFTAu6A9W79DiP0hd8j1Mwv3I=" else "sha256-T177UqPnPLM/2dGUdwhK21AByYrJu9wgEKOWrrGBQkA="; }; icon = fetchurl { From d8aeca87e695a8e4cae869e800b7f897c2d43e7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C3=B6lfchen?= <115360611+W-lfchen@users.noreply.github.com> Date: Mon, 4 Nov 2024 22:56:16 +0100 Subject: [PATCH 314/617] obsidian: use magick instead of convert --- pkgs/by-name/ob/obsidian/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ob/obsidian/package.nix b/pkgs/by-name/ob/obsidian/package.nix index b8bc802cba2a..03413d8eb5d6 100644 --- a/pkgs/by-name/ob/obsidian/package.nix +++ b/pkgs/by-name/ob/obsidian/package.nix @@ -61,7 +61,7 @@ let -t $out/share/applications/ for size in 16 24 32 48 64 128 256 512; do mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - convert -background none -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png + magick ${icon} -background none -resize "$size"x"$size" $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png done runHook postInstall ''; From 5b136316aacadd0447dc24ba04c449d287ca8cea Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 31 Oct 2024 22:11:49 +0000 Subject: [PATCH 315/617] pkgsi686Linux.swtpm: pull upstream 64-bit file api fix Without the change the build of `pkgsi686Linux.swtpm` fails on filesystems with 64-bit inodes as: FAIL: test_parameters FAIL: test_swtpm_setup_file_backend FAIL: test_swtpm_setup_overwrite FAIL: test_tpm2_swtpm_setup_create_cert FAIL: test_tpm2_swtpm_setup_overwrite FAIL: test_swtpm_setup_create_cert FAIL: test_tpm2_parameters --- pkgs/tools/security/swtpm/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/tools/security/swtpm/default.nix b/pkgs/tools/security/swtpm/default.nix index 6b1bdb4c03ab..0332de516e8d 100644 --- a/pkgs/tools/security/swtpm/default.nix +++ b/pkgs/tools/security/swtpm/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , pkg-config , libtasn1, openssl, fuse, glib, libseccomp, json-glib @@ -25,6 +26,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-48/BOzGPoKr/BGEXFo3FXWr6ZoPB+ixZIvv78g6L294="; }; + patches = [ + # Enable 64-bit file API on 32-bit systems: + # https://github.com/stefanberger/swtpm/pull/941 + (fetchpatch { + name = "64-bit-file-api.patch"; + url = "https://github.com/stefanberger/swtpm/commit/599e2436d4f603ef7c83fad11d76b5546efabefc.patch"; + hash = "sha256-cS/BByOJeNNevQ1B3Ij1kykJwixVwGoikowx7j9gRmA="; + }) + ]; + nativeBuildInputs = [ pkg-config unixtools.netstat expect socat perl # for pod2man From 37058d400c5f5161da1535bbf74c77b8722c49a0 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Mon, 4 Nov 2024 17:07:47 -0700 Subject: [PATCH 316/617] cosmic-edit: 1.0.0-alpha.2 -> 1.0.0-alpha.3 --- pkgs/by-name/co/cosmic-edit/Cargo.lock | 1650 +++++++++++------------ pkgs/by-name/co/cosmic-edit/package.nix | 20 +- 2 files changed, 828 insertions(+), 842 deletions(-) diff --git a/pkgs/by-name/co/cosmic-edit/Cargo.lock b/pkgs/by-name/co/cosmic-edit/Cargo.lock index 908e65e54c1b..cc3a91847999 100644 --- a/pkgs/by-name/co/cosmic-edit/Cargo.lock +++ b/pkgs/by-name/co/cosmic-edit/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.28" +version = "0.2.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb" +checksum = "ec3672c180e71eeaaac3a541fbbc5f5ad4def8b747c595ad30d674e43049f7b0" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -20,43 +20,53 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] name = "accesskit" -version = "0.12.2" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.16.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" + +[[package]] +name = "accesskit_atspi_common" +version = "0.9.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" +dependencies = [ + "accesskit", + "accesskit_consumer", + "atspi-common", + "serde", + "thiserror", + "zvariant 3.15.2", +] [[package]] name = "accesskit_consumer" -version = "0.17.0" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.24.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", + "immutable-chunkmap", ] [[package]] name = "accesskit_macos" -version = "0.11.0" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.17.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", "accesskit_consumer", - "icrate 0.1.2", - "objc2 0.5.2", + "objc2", + "objc2-app-kit", + "objc2-foundation", "once_cell", ] [[package]] name = "accesskit_unix" -version = "0.7.1" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.12.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", - "accesskit_consumer", - "async-channel", - "async-executor", - "async-task", + "accesskit_atspi_common", "atspi", "futures-lite 1.13.0", - "futures-util", - "once_cell", "serde", "tokio", "tokio-stream", @@ -65,21 +75,20 @@ dependencies = [ [[package]] name = "accesskit_windows" -version = "0.16.0" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.22.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", "accesskit_consumer", - "once_cell", "paste", "static_assertions", - "windows 0.48.0", + "windows 0.54.0", ] [[package]] name = "accesskit_winit" -version = "0.18.1" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.22.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", "accesskit_macos", @@ -91,9 +100,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] @@ -163,9 +172,9 @@ checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" [[package]] name = "android-activity" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" dependencies = [ "android-properties", "bitflags 2.6.0", @@ -177,7 +186,7 @@ dependencies = [ "log", "ndk", "ndk-context", - "ndk-sys", + "ndk-sys 0.6.0+11769913", "num_enum", "thiserror", ] @@ -205,9 +214,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.15" +version = "0.6.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338" dependencies = [ "anstyle", "anstyle-parse", @@ -220,43 +229,43 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56" [[package]] name = "anstyle-parse" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.4" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8" [[package]] name = "apply" @@ -314,11 +323,11 @@ checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" [[package]] name = "ash" -version = "0.37.3+1.3.251" +version = "0.38.0+1.3.281" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" dependencies = [ - "libloading 0.7.4", + "libloading", ] [[package]] @@ -327,7 +336,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" dependencies = [ - "async-fs 2.1.2", + "async-fs", "async-net", "enumflags2", "futures-channel", @@ -342,9 +351,9 @@ dependencies = [ [[package]] name = "ashpd" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" +checksum = "4d43c03d9e36dd40cab48435be0b09646da362c278223ca535493877b2c1dee9" dependencies = [ "enumflags2", "futures-channel", @@ -404,18 +413,6 @@ dependencies = [ "slab", ] -[[package]] -name = "async-fs" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "blocking", - "futures-lite 1.13.0", -] - [[package]] name = "async-fs" version = "2.1.2" @@ -460,7 +457,7 @@ dependencies = [ "futures-lite 2.3.0", "parking", "polling 3.7.3", - "rustix 0.38.37", + "rustix 0.38.38", "slab", "tracing", "windows-sys 0.59.0", @@ -510,7 +507,7 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.37", + "rustix 0.38.38", "windows-sys 0.48.0", ] @@ -529,7 +526,7 @@ dependencies = [ "cfg-if", "event-listener 5.3.1", "futures-lite 2.3.0", - "rustix 0.38.37", + "rustix 0.38.38", "tracing", ] @@ -541,7 +538,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -556,7 +553,7 @@ dependencies = [ "cfg-if", "futures-core", "futures-io", - "rustix 0.38.37", + "rustix 0.38.38", "signal-hook-registry", "slab", "windows-sys 0.59.0", @@ -570,13 +567,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -590,7 +587,7 @@ name = "atomicwrites" version = "0.4.2" source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768" dependencies = [ - "rustix 0.38.37", + "rustix 0.38.38", "tempfile", "windows-sys 0.48.0", ] @@ -645,9 +642,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backtrace" @@ -696,18 +693,18 @@ dependencies = [ [[package]] name = "bit-set" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" dependencies = [ "bit-vec", ] [[package]] name = "bit-vec" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" [[package]] name = "bit_field" @@ -745,42 +742,13 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" -dependencies = [ - "objc-sys", -] - -[[package]] -name = "block2" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" -dependencies = [ - "block-sys", - "objc2 0.4.1", -] - -[[package]] -name = "block2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e58aa60e59d8dbfcc36138f5f18be5f24394d33b38b24f7fd0b1caa33095f22f" -dependencies = [ - "block-sys", - "objc2 0.5.2", -] - [[package]] name = "block2" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" dependencies = [ - "objc2 0.5.2", + "objc2", ] [[package]] @@ -827,22 +795,22 @@ checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" [[package]] name = "bytemuck" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" +checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" +checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -853,9 +821,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "bzip2" @@ -878,20 +846,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "calloop" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" -dependencies = [ - "bitflags 2.6.0", - "log", - "polling 3.7.3", - "rustix 0.38.37", - "slab", - "thiserror", -] - [[package]] name = "calloop" version = "0.13.0" @@ -901,40 +855,28 @@ dependencies = [ "bitflags 2.6.0", "log", "polling 3.7.3", - "rustix 0.38.37", + "rustix 0.38.38", "slab", "thiserror", ] -[[package]] -name = "calloop-wayland-source" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" -dependencies = [ - "calloop 0.12.4", - "rustix 0.38.37", - "wayland-backend", - "wayland-client", -] - [[package]] name = "calloop-wayland-source" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ - "calloop 0.13.0", - "rustix 0.38.37", + "calloop", + "rustix 0.38.38", "wayland-backend", "wayland-client", ] [[package]] name = "cc" -version = "1.1.21" +version = "1.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" +checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" dependencies = [ "jobserver", "libc", @@ -1013,7 +955,7 @@ dependencies = [ [[package]] name = "clipboard_macos" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "objc", "objc-foundation", @@ -1023,7 +965,7 @@ dependencies = [ [[package]] name = "clipboard_wayland" version = "0.2.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "dnd", "mime 0.1.0", @@ -1033,7 +975,7 @@ dependencies = [ [[package]] name = "clipboard_x11" version = "0.4.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "thiserror", "x11rb", @@ -1087,9 +1029,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "com" @@ -1210,7 +1152,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1229,7 +1171,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "quote", "syn 1.0.109", @@ -1259,7 +1201,6 @@ dependencies = [ "regex", "rust-embed", "serde", - "smol_str", "syntect", "tokio", "two-face", @@ -1269,7 +1210,7 @@ dependencies = [ [[package]] name = "cosmic-files" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-files.git#774ccf955f59f24cf9493f9249d20788ad394d48" +source = "git+https://github.com/pop-os/cosmic-files.git#20f9292e7925da20086c7f1f3c8e3a8d03d63b99" dependencies = [ "chrono", "dirs", @@ -1293,15 +1234,14 @@ dependencies = [ "once_cell", "open", "paste", - "rayon", "recently-used-xbel", "regex", "rust-embed", "serde", "shlex", "slotmap", - "smol_str", "tar", + "tempfile", "tokio", "trash", "unix_permissions_ext", @@ -1330,13 +1270,13 @@ source = "git+https://github.com/pop-os/cosmic-text.git#4fe90bb6126c22f589b46768 dependencies = [ "bitflags 2.6.0", "cosmic_undo_2", - "fontdb", + "fontdb 0.16.2", "log", "modit", "rangemap", "rayon", - "rustc-hash", - "rustybuzz 0.14.1", + "rustc-hash 1.1.0", + "rustybuzz", "self_cell 1.0.4", "smol_str", "swash", @@ -1352,7 +1292,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "almost", "cosmic-config", @@ -1490,11 +1430,12 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" [[package]] name = "d3d12" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdbd1f579714e3c809ebd822c81ef148b1ceaeb3d535352afc73fd0c4c6a0017" dependencies = [ "bitflags 2.6.0", - "libloading 0.8.5", + "libloading", "winapi", ] @@ -1519,7 +1460,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1530,7 +1471,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1540,7 +1481,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core 0.9.10", @@ -1586,7 +1527,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1598,7 +1539,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1668,7 +1609,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1677,7 +1618,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.5", + "libloading", ] [[package]] @@ -1692,21 +1633,35 @@ dependencies = [ [[package]] name = "dnd" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "bitflags 2.6.0", "mime 0.1.0", "raw-window-handle", - "smithay-client-toolkit 0.19.2", + "smithay-client-toolkit", "smithay-clipboard", ] +[[package]] +name = "document-features" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +dependencies = [ + "litrs", +] + [[package]] name = "downcast-rs" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" +[[package]] +name = "dpi" +version = "0.1.1" +source = "git+https://github.com/pop-os/winit.git?tag=iced-xdg-surface-0.13#1cc02bdab141072eaabad639d74b032fd0fcc62e" + [[package]] name = "drm" version = "0.11.1" @@ -1717,7 +1672,7 @@ dependencies = [ "bytemuck", "drm-ffi", "drm-fourcc", - "rustix 0.38.37", + "rustix 0.38.38", ] [[package]] @@ -1727,7 +1682,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" dependencies = [ "drm-sys", - "rustix 0.38.37", + "rustix 0.38.38", ] [[package]] @@ -1754,9 +1709,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encoding_rs" -version = "0.8.34" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if", ] @@ -1776,17 +1731,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" -[[package]] -name = "enum-repr" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bad30c9c0fa1aaf1ae5010dab11f1117b15d35faf62cda4bbbc53b9987950f18" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "enumflags2" version = "0.7.10" @@ -1805,7 +1749,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1962,30 +1906,31 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" -version = "0.3.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +checksum = "07c6f4c64c1d33a3111c4466f7365ebdcc37c5bd1ea0d62aae2e3d722aacbedb" dependencies = [ "simd-adler32", ] [[package]] name = "file-id" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6584280525fb2059cba3db2c04abf947a1a29a45ddae89f3870f8281704fafc9" +checksum = "6bc904b9bbefcadbd8e3a9fb0d464a9b979de6324c03b3c663e8994f46a5be36" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "filetime" -version = "0.2.24" -source = "git+https://github.com/jackpot51/filetime#186e19d3190ead16b05329400cb5b2350d8f44cf" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "libredox 0.1.3", + "libredox", "windows-sys 0.59.0", ] @@ -2000,9 +1945,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide 0.8.0", @@ -2013,9 +1958,6 @@ name = "float-cmp" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] [[package]] name = "float_next_after" @@ -2043,7 +1985,7 @@ dependencies = [ "fluent-syntax", "intl-memoizer", "intl_pluralrules", - "rustc-hash", + "rustc-hash 1.1.0", "self_cell 0.10.3", "smallvec", "unic-langid", @@ -2069,9 +2011,9 @@ dependencies = [ [[package]] name = "flume" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" dependencies = [ "spin", ] @@ -2084,9 +2026,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "font-types" -version = "0.6.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0189ccb084f77c5523e08288d418cbaa09c451a08515678a0aa265df9a8b60" +checksum = "dda6e36206148f69fc6ecb1bb6c0dedd7ee469f3db1d0dc2045beea28430ca43" dependencies = [ "bytemuck", ] @@ -2097,7 +2039,7 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" dependencies = [ - "roxmltree 0.20.0", + "roxmltree", ] [[package]] @@ -2114,6 +2056,20 @@ dependencies = [ "ttf-parser 0.20.0", ] +[[package]] +name = "fontdb" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e32eac81c1135c1df01d4e6d4233c47ba11f6a6d07f33e0bba09d18797077770" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2 0.9.5", + "slotmap", + "tinyvec", + "ttf-parser 0.21.1", +] + [[package]] name = "foreign-types" version = "0.5.0" @@ -2132,7 +2088,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -2208,9 +2164,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -2223,9 +2179,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -2233,15 +2189,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -2251,9 +2207,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" @@ -2285,32 +2241,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -2355,16 +2311,6 @@ dependencies = [ "wasi", ] -[[package]] -name = "gif" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" -dependencies = [ - "color_quant", - "weezl", -] - [[package]] name = "gif" version = "0.13.1" @@ -2377,9 +2323,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "gl_generator" @@ -2394,9 +2340,9 @@ dependencies = [ [[package]] name = "glam" -version = "0.24.2" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" +checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3" [[package]] name = "glob" @@ -2431,24 +2377,13 @@ dependencies = [ [[package]] name = "glutin_wgl_sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" dependencies = [ "gl_generator", ] -[[package]] -name = "glyphon" -version = "0.5.0" -source = "git+https://github.com/pop-os/glyphon.git?tag=v0.5.0#1b0646ff8f74da92d3be704dfc2257d7f4d7eed8" -dependencies = [ - "cosmic-text", - "etagere", - "lru", - "wgpu", -] - [[package]] name = "gpu-alloc" version = "0.6.0" @@ -2470,9 +2405,9 @@ dependencies = [ [[package]] name = "gpu-allocator" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" +checksum = "fdd4240fc91d3433d5e5b0fc5b67672d771850dc19bbee03c1381e19322803d7" dependencies = [ "log", "presser", @@ -2483,20 +2418,20 @@ dependencies = [ [[package]] name = "gpu-descriptor" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" dependencies = [ "bitflags 2.6.0", "gpu-descriptor-types", - "hashbrown", + "hashbrown 0.14.5", ] [[package]] name = "gpu-descriptor-types" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ "bitflags 2.6.0", ] @@ -2630,6 +2565,12 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + [[package]] name = "hassle-rs" version = "0.11.0" @@ -2639,7 +2580,7 @@ dependencies = [ "bitflags 2.6.0", "com", "libc", - "libloading 0.8.5", + "libloading", "thiserror", "widestring", "winapi", @@ -2743,21 +2684,21 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.77", + "syn 2.0.85", "unic-langid", ] [[package]] name = "i18n-embed-impl" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81093c4701672f59416582fe3145676126fd23ba5db910acad0793c1108aaa58" +checksum = "0f2cc0e0523d1fe6fc2c6f66e5038624ea8091b3e7748b5e8e0c84b1698db6c2" dependencies = [ "find-crate", "i18n-config", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -2785,15 +2726,14 @@ dependencies = [ [[package]] name = "iced" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "dnd", "iced_accessibility", "iced_core", "iced_futures", "iced_renderer", - "iced_sctk", "iced_widget", "iced_winit", "image", @@ -2805,57 +2745,70 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "accesskit", - "accesskit_unix", "accesskit_winit", ] [[package]] name = "iced_core" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "bitflags 2.6.0", + "bytes", "dnd", + "glam", "iced_accessibility", "log", "mime 0.1.0", "num-traits", + "once_cell", "palette", "raw-window-handle", + "rustc-hash 2.0.0", "serde", - "smithay-client-toolkit 0.19.2", "smol_str", "thiserror", "web-time", "window_clipboard", - "xxhash-rust", ] [[package]] name = "iced_futures" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "futures", "iced_core", "log", + "rustc-hash 2.0.0", "tokio", "wasm-bindgen-futures", "wasm-timer", ] +[[package]] +name = "iced_glyphon" +version = "0.6.0" +source = "git+https://github.com/pop-os/glyphon.git?tag=iced-0.14-dev#6ef9d12a20cfd0f7bdf38136a26ded9f7459ec8b" +dependencies = [ + "cosmic-text", + "etagere", + "lru", + "rustc-hash 2.0.0", + "wgpu", +] + [[package]] name = "iced_graphics" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "bitflags 2.6.0", "bytemuck", "cosmic-text", - "glam", "half", "iced_core", "iced_futures", @@ -2865,16 +2818,15 @@ dependencies = [ "lyon_path", "once_cell", "raw-window-handle", - "rustc-hash", + "rustc-hash 2.0.0", "thiserror", "unicode-segmentation", - "xxhash-rust", ] [[package]] name = "iced_renderer" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2885,96 +2837,61 @@ dependencies = [ [[package]] name = "iced_runtime" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ + "bytes", "dnd", "iced_accessibility", "iced_core", "iced_futures", - "smithay-client-toolkit 0.19.2", - "thiserror", - "window_clipboard", -] - -[[package]] -name = "iced_sctk" -version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" -dependencies = [ - "enum-repr", - "float-cmp", - "futures", - "iced_accessibility", - "iced_futures", - "iced_graphics", - "iced_runtime", - "iced_style", - "itertools", - "lazy_static", "raw-window-handle", - "smithay-client-toolkit 0.19.2", "thiserror", - "tracing", - "wayland-backend", - "wayland-protocols 0.32.4", "window_clipboard", - "xkbcommon", - "xkbcommon-dl", - "xkeysym", -] - -[[package]] -name = "iced_style" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" -dependencies = [ - "iced_core", - "once_cell", - "palette", ] [[package]] name = "iced_tiny_skia" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "bytemuck", "cosmic-text", "iced_graphics", - "kurbo", + "kurbo 0.10.4", "log", "resvg", - "rustc-hash", + "rustc-hash 2.0.0", "softbuffer", "tiny-skia", - "xxhash-rust", ] [[package]] name = "iced_wgpu" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "as-raw-xcb-connection", "bitflags 2.6.0", "bytemuck", "futures", "glam", - "glyphon", "guillotiere", + "iced_glyphon", "iced_graphics", "log", "lyon", "once_cell", "raw-window-handle", "resvg", - "rustix 0.38.37", - "smithay-client-toolkit 0.19.2", + "rustc-hash 2.0.0", + "rustix 0.38.38", + "smithay-client-toolkit", + "thiserror", "tiny-xlib", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.4", + "wayland-protocols", "wayland-sys", "wgpu", "x11rb", @@ -2982,16 +2899,17 @@ dependencies = [ [[package]] name = "iced_widget" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "dnd", "iced_accessibility", "iced_renderer", "iced_runtime", - "iced_style", "num-traits", + "once_cell", "ouroboros", + "rustc-hash 2.0.0", "thiserror", "unicode-segmentation", "window_clipboard", @@ -2999,44 +2917,25 @@ dependencies = [ [[package]] name = "iced_winit" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "dnd", "iced_accessibility", + "iced_futures", "iced_graphics", "iced_runtime", - "iced_style", "log", + "rustc-hash 2.0.0", "thiserror", "tracing", + "wasm-bindgen-futures", "web-sys", "winapi", "window_clipboard", "winit", ] -[[package]] -name = "icrate" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" -dependencies = [ - "block2 0.3.0", - "dispatch", - "objc2 0.4.1", -] - -[[package]] -name = "icrate" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb69199826926eb864697bddd27f73d9fddcffc004f5733131e15b465e30642" -dependencies = [ - "block2 0.4.0", - "objc2 0.5.2", -] - [[package]] name = "icu_collator" version = "1.5.0" @@ -3177,7 +3076,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -3222,7 +3121,7 @@ dependencies = [ "byteorder", "color_quant", "exr", - "gif 0.13.1", + "gif", "jpeg-decoder", "num-traits", "png", @@ -3237,13 +3136,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" [[package]] -name = "indexmap" -version = "2.5.0" +name = "immutable-chunkmap" +version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "12f97096f508d54f8f8ab8957862eee2ccd628847b6217af1a335e1c44dee578" +dependencies = [ + "arrayvec 0.7.6", +] + +[[package]] +name = "indexmap" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.0", ] [[package]] @@ -3416,9 +3324,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -3439,7 +3347,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.5", + "libloading", "pkg-config", ] @@ -3480,11 +3388,22 @@ dependencies = [ [[package]] name = "kurbo" -version = "0.9.5" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +checksum = "1618d4ebd923e97d67e7cd363d80aef35fe961005cbbbb3d2dad8bdd1bc63440" dependencies = [ "arrayvec 0.7.6", + "smallvec", +] + +[[package]] +name = "kurbo" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89234b2cc610a7dd927ebde6b41dd1a5d4214cffaef4cf1fb2195d592f92518f" +dependencies = [ + "arrayvec 0.7.6", + "smallvec", ] [[package]] @@ -3514,17 +3433,17 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.159" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "apply", - "ashpd 0.9.1", + "ashpd 0.9.2", "chrono", "cosmic-config", "cosmic-theme", @@ -3538,8 +3457,6 @@ dependencies = [ "iced_futures", "iced_renderer", "iced_runtime", - "iced_sctk", - "iced_style", "iced_tiny_skia", "iced_wgpu", "iced_widget", @@ -3555,19 +3472,10 @@ dependencies = [ "tracing", "unicode-segmentation", "url", + "ustr", "zbus 4.4.0", ] -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - [[package]] name = "libloading" version = "0.8.5" @@ -3580,20 +3488,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libredox" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" -dependencies = [ - "bitflags 2.6.0", - "libc", - "redox_syscall 0.4.1", -] +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "libredox" @@ -3603,7 +3500,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", - "redox_syscall 0.5.4", + "redox_syscall 0.5.7", ] [[package]] @@ -3636,6 +3533,12 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + [[package]] name = "locale_config" version = "0.3.0" @@ -3673,12 +3576,9 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" -dependencies = [ - "hashbrown", -] +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" [[package]] name = "lyon" @@ -3702,9 +3602,9 @@ dependencies = [ [[package]] name = "lyon_geom" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9" +checksum = "8af69edc087272df438b3ee436c4bb6d7c04aa8af665cfd398feae627dbd8570" dependencies = [ "arrayvec 0.7.6", "euclid", @@ -3713,9 +3613,9 @@ dependencies = [ [[package]] name = "lyon_path" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c08a606c7a59638d6c6aa18ac91a06aa9fb5f765a7efb27e6a4da58700740d7" +checksum = "8e0b8aec2f58586f6eef237985b9a9b7cb3a3aff4417c575075cf95bf925252e" dependencies = [ "lyon_geom", "num-traits", @@ -3795,9 +3695,9 @@ dependencies = [ [[package]] name = "metal" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" dependencies = [ "bitflags 2.6.0", "block", @@ -3811,7 +3711,7 @@ dependencies = [ [[package]] name = "mime" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "smithay-clipboard", ] @@ -3845,7 +3745,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", - "simd-adler32", ] [[package]] @@ -3855,6 +3754,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ "adler2", + "simd-adler32", ] [[package]] @@ -3883,9 +3783,9 @@ dependencies = [ [[package]] name = "modit" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa21838a18a88208e85015452ef542b4fb5ce0be3dc635331df56874af16c13c" +checksum = "7dfa19a1eabc3418aab2e905785d347386cb0f1ed3fbb34957460b2f685ef359" dependencies = [ "log", ] @@ -3898,18 +3798,19 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" [[package]] name = "naga" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bd5a652b6faf21496f2cfd88fc49989c8db0825d1f6746b1a71a6ede24a63ad" dependencies = [ "arrayvec 0.7.6", "bit-set", "bitflags 2.6.0", + "cfg_aliases 0.1.1", "codespan-reporting", "hexf-parse", "indexmap", "log", - "num-traits", - "rustc-hash", + "rustc-hash 1.1.0", "spirv", "termcolor", "thiserror", @@ -3918,14 +3819,14 @@ dependencies = [ [[package]] name = "ndk" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ "bitflags 2.6.0", "jni-sys", "log", - "ndk-sys", + "ndk-sys 0.6.0+11769913", "num_enum", "raw-window-handle", "thiserror", @@ -3946,6 +3847,15 @@ dependencies = [ "jni-sys", ] +[[package]] +name = "ndk-sys" +version = "0.6.0+11769913" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" +dependencies = [ + "jni-sys", +] + [[package]] name = "nix" version = "0.26.4" @@ -4024,9 +3934,9 @@ dependencies = [ [[package]] name = "notify-debouncer-full" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f5dab59c348b9b50cf7f261960a20e389feb2713636399cd9082cd4b536154" +checksum = "fb7fd166739789c9ff169e654dc1501373db9d80a4c3f972817c8a4d7cf8f34e" dependencies = [ "crossbeam-channel", "file-id", @@ -4144,7 +4054,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -4163,7 +4073,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", - "objc_exception", ] [[package]] @@ -4183,16 +4092,6 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" -[[package]] -name = "objc2" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" -dependencies = [ - "objc-sys", - "objc2-encode 3.0.0", -] - [[package]] name = "objc2" version = "0.5.2" @@ -4200,14 +4099,84 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ "objc-sys", - "objc2-encode 4.0.3", + "objc2-encode", ] [[package]] -name = "objc2-encode" -version = "3.0.0" +name = "objc2-app-kit" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.6.0", + "block2", + "libc", + "objc2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-cloud-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", +] + +[[package]] +name = "objc2-contacts" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-core-location" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" +dependencies = [ + "block2", + "objc2", + "objc2-contacts", + "objc2-foundation", +] [[package]] name = "objc2-encode" @@ -4222,18 +4191,102 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ "bitflags 2.6.0", - "block2 0.5.1", + "block2", + "dispatch", "libc", - "objc2 0.5.2", + "objc2", ] [[package]] -name = "objc_exception" -version = "0.1.2" +name = "objc2-link-presentation" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" dependencies = [ - "cc", + "block2", + "objc2", + "objc2-app-kit", + "objc2-foundation", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-symbols" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" +dependencies = [ + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-ui-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-cloud-kit", + "objc2-core-data", + "objc2-core-image", + "objc2-core-location", + "objc2-foundation", + "objc2-link-presentation", + "objc2-quartz-core", + "objc2-symbols", + "objc2-uniform-type-identifiers", + "objc2-user-notifications", +] + +[[package]] +name = "objc2-uniform-type-identifiers" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-user-notifications" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", ] [[package]] @@ -4247,18 +4300,18 @@ dependencies = [ [[package]] name = "object" -version = "0.36.4" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "onig" @@ -4301,11 +4354,11 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "orbclient" -version = "0.3.47" +version = "0.3.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" +checksum = "ba0b26cec2e24f08ed8bb31519a9333140a6599b867dac464bb150bdb796fd43" dependencies = [ - "libredox 0.0.2", + "libredox", ] [[package]] @@ -4315,7 +4368,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" dependencies = [ "dlv-list", - "hashbrown", + "hashbrown 0.14.5", ] [[package]] @@ -4330,9 +4383,9 @@ dependencies = [ [[package]] name = "ouroboros" -version = "0.17.2" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" +checksum = "944fa20996a25aded6b4795c6d63f10014a7a83f8be9828a11860b08c5fc4a67" dependencies = [ "aliasable", "ouroboros_macro", @@ -4341,24 +4394,25 @@ dependencies = [ [[package]] name = "ouroboros_macro" -version = "0.17.2" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" +checksum = "39b0deead1528fd0e5947a8546a9642a9777c25f6e1e26f34c97b204bbb465bd" dependencies = [ "heck", - "proc-macro-error", + "itertools", "proc-macro2", + "proc-macro2-diagnostics", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "owned_ttf_parser" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" +checksum = "22ec719bbf3b2a81c109a4e20b1f129b5566b7dce654bc3872f6a05abf82b2c4" dependencies = [ - "ttf-parser 0.24.1", + "ttf-parser 0.25.0", ] [[package]] @@ -4383,7 +4437,7 @@ dependencies = [ "by_address", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -4435,7 +4489,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.4", + "redox_syscall 0.5.7", "smallvec", "windows-targets 0.52.6", ] @@ -4459,9 +4513,9 @@ dependencies = [ [[package]] name = "pathdiff" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" +checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361" [[package]] name = "pbkdf2" @@ -4481,9 +4535,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.13" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdbef9d1d47087a895abd220ed25eb4ad973a5e26f6a4367b038c25e28dfc2d9" +checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", "thiserror", @@ -4492,9 +4546,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.13" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d3a6e3394ec80feb3b6393c725571754c6188490265c61aaf260810d6b95aa0" +checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd" dependencies = [ "pest", "pest_generator", @@ -4502,22 +4556,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.13" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94429506bde1ca69d1b5601962c73f4172ab4726571a59ea95931218cb0e930e" +checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "pest_meta" -version = "2.7.13" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac8a071862e93690b6e34e9a5fb8e33ff3734473ac0245b27232222c4906a33f" +checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d" dependencies = [ "once_cell", "pest", @@ -4554,7 +4608,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -4563,7 +4617,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -4573,10 +4627,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] -name = "pin-project-lite" -version = "0.2.14" +name = "pin-project" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.85", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -4616,15 +4690,15 @@ dependencies = [ [[package]] name = "png" -version = "0.17.13" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0" dependencies = [ "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.4", + "miniz_oxide 0.8.0", ] [[package]] @@ -4653,7 +4727,7 @@ dependencies = [ "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.37", + "rustix 0.38.38", "tracing", "windows-sys 0.59.0", ] @@ -4701,7 +4775,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.22.21", + "toml_edit 0.22.22", ] [[package]] @@ -4730,18 +4804,31 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] [[package]] -name = "profiling" -version = "1.0.15" +name = "proc-macro2-diagnostics" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.85", + "version_check", + "yansi", +] + +[[package]] +name = "profiling" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d" [[package]] name = "pure-rust-locales" @@ -4854,17 +4941,11 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "rctree" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" - [[package]] name = "read-fonts" -version = "0.20.0" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c141b9980e1150201b2a3a32879001c8f975fe313ec3df5471a9b5c79a880cd" +checksum = "4a04b892cb6f91951f144c33321843790c8574c825aafdb16d815fd7183b5229" dependencies = [ "bytemuck", "font-types", @@ -4895,15 +4976,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -4915,9 +4987,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] @@ -4929,15 +5001,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", - "libredox 0.1.3", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.10.6" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -4947,9 +5019,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -4958,9 +5030,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "renderdoc-sys" @@ -4970,15 +5042,14 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] name = "resvg" -version = "0.37.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cadccb3d99a9efb8e5e00c16fbb732cbe400db2ec7fc004697ee7d97d86cf1f4" +checksum = "944d052815156ac8fa77eaac055220e95ba0b01fa8887108ca710c03805d9051" dependencies = [ - "gif 0.12.0", + "gif", "jpeg-decoder", "log", "pico-args", - "png", "rgb", "svgtypes", "tiny-skia", @@ -5029,12 +5100,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "roxmltree" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" - [[package]] name = "roxmltree" version = "0.20.0" @@ -5061,7 +5126,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.77", + "syn 2.0.85", "walkdir", ] @@ -5097,6 +5162,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustc_version" version = "0.2.3" @@ -5122,9 +5193,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a" dependencies = [ "bitflags 2.6.0", "errno", @@ -5135,25 +5206,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - -[[package]] -name = "rustybuzz" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" -dependencies = [ - "bitflags 2.6.0", - "bytemuck", - "smallvec", - "ttf-parser 0.20.0", - "unicode-bidi-mirroring 0.1.0", - "unicode-ccc 0.1.2", - "unicode-properties", - "unicode-script", -] +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "rustybuzz" @@ -5166,8 +5221,8 @@ dependencies = [ "libm", "smallvec", "ttf-parser 0.21.1", - "unicode-bidi-mirroring 0.2.0", - "unicode-ccc 0.2.0", + "unicode-bidi-mirroring", + "unicode-ccc", "unicode-properties", "unicode-script", ] @@ -5201,14 +5256,14 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sctk-adwaita" -version = "0.8.3" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70b31447ca297092c5a9916fc3b955203157b37c19ca8edde4f52e9843e602c7" +checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec" dependencies = [ "ab_glyph", "log", "memmap2 0.9.5", - "smithay-client-toolkit 0.18.1", + "smithay-client-toolkit", "tiny-skia", ] @@ -5244,29 +5299,29 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "indexmap", "itoa", @@ -5283,14 +5338,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -5354,10 +5409,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] -name = "skrifa" -version = "0.20.0" +name = "siphasher" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abea4738067b1e628c6ce28b2c216c19e9ea95715cdb332680e821c3bec2ef23" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + +[[package]] +name = "skrifa" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1c44ad1f6c5bdd4eefed8326711b7dbda9ea45dfd36068c427d332aa382cbe" dependencies = [ "bytemuck", "read-fonts", @@ -5387,31 +5448,6 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" -[[package]] -name = "smithay-client-toolkit" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" -dependencies = [ - "bitflags 2.6.0", - "calloop 0.12.4", - "calloop-wayland-source 0.2.0", - "cursor-icon", - "libc", - "log", - "memmap2 0.9.5", - "rustix 0.38.37", - "thiserror", - "wayland-backend", - "wayland-client", - "wayland-csd-frame", - "wayland-cursor", - "wayland-protocols 0.31.2", - "wayland-protocols-wlr 0.2.0", - "wayland-scanner", - "xkeysym", -] - [[package]] name = "smithay-client-toolkit" version = "0.19.2" @@ -5420,21 +5456,21 @@ checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" dependencies = [ "bitflags 2.6.0", "bytemuck", - "calloop 0.13.0", - "calloop-wayland-source 0.3.0", + "calloop", + "calloop-wayland-source", "cursor-icon", "libc", "log", "memmap2 0.9.5", "pkg-config", - "rustix 0.38.37", + "rustix 0.38.38", "thiserror", "wayland-backend", "wayland-client", "wayland-csd-frame", "wayland-cursor", - "wayland-protocols 0.32.4", - "wayland-protocols-wlr 0.3.4", + "wayland-protocols", + "wayland-protocols-wlr", "wayland-scanner", "xkbcommon", "xkeysym", @@ -5447,7 +5483,7 @@ source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5#5a3007de dependencies = [ "libc", "raw-window-handle", - "smithay-client-toolkit 0.19.2", + "smithay-client-toolkit", "wayland-backend", ] @@ -5499,7 +5535,7 @@ dependencies = [ "objc", "raw-window-handle", "redox_syscall 0.4.1", - "rustix 0.38.37", + "rustix 0.38.38", "tiny-xlib", "wasm-bindgen", "wayland-backend", @@ -5575,19 +5611,19 @@ checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca" [[package]] name = "svgtypes" -version = "0.13.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70" +checksum = "794de53cc48eaabeed0ab6a3404a65f40b3e38c067e4435883a65d2aa4ca000e" dependencies = [ - "kurbo", - "siphasher", + "kurbo 0.11.1", + "siphasher 1.0.1", ] [[package]] name = "swash" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93cdc334a50fcc2aa3f04761af3b28196280a6aaadb1ef11215c478ae32615ac" +checksum = "cbd59f3f359ddd2c95af4758c18270eddd9c730dde98598023cdabff472c2ca2" dependencies = [ "skrifa", "yazi", @@ -5607,9 +5643,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" dependencies = [ "proc-macro2", "quote", @@ -5624,7 +5660,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -5671,9 +5707,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" dependencies = [ "filetime", "libc", @@ -5682,14 +5718,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand 2.1.1", "once_cell", - "rustix 0.38.37", + "rustix 0.38.38", "windows-sys 0.59.0", ] @@ -5704,22 +5740,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -5809,7 +5845,7 @@ checksum = "1d52f22673960ad13af14ff4025997312def1223bfa7c8e4949d099e6b3d5d1c" dependencies = [ "as-raw-xcb-connection", "ctor-lite", - "libloading 0.8.5", + "libloading", "pkg-config", "tracing", ] @@ -5841,9 +5877,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" dependencies = [ "backtrace", "bytes", @@ -5865,7 +5901,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -5897,7 +5933,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.21", + "toml_edit 0.22.22", ] [[package]] @@ -5922,15 +5958,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.21" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.18", + "winnow 0.6.20", ] [[package]] @@ -5952,7 +5988,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -5972,7 +6008,7 @@ dependencies = [ "chrono", "libc", "log", - "objc2 0.5.2", + "objc2", "objc2-foundation", "once_cell", "scopeguard", @@ -5994,9 +6030,9 @@ checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" [[package]] name = "ttf-parser" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" +checksum = "5902c5d130972a0000f60860bfbf46f7ca3db5391eddfedd1b8728bd9dc96c0e" [[package]] name = "two-face" @@ -6015,7 +6051,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f" dependencies = [ - "rustc-hash", + "rustc-hash 1.1.0", ] [[package]] @@ -6026,9 +6062,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" [[package]] name = "uds_windows" @@ -6062,24 +6098,15 @@ dependencies = [ [[package]] name = "unicase" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] +checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-bidi-mirroring" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-bidi-mirroring" @@ -6087,12 +6114,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" -[[package]] -name = "unicode-ccc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" - [[package]] name = "unicode-ccc" version = "0.2.0" @@ -6122,9 +6143,9 @@ dependencies = [ [[package]] name = "unicode-properties" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524" +checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" [[package]] name = "unicode-script" @@ -6181,64 +6202,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] -name = "usvg" -version = "0.37.0" +name = "ustr" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b0a51b72ab80ca511d126b77feeeb4fb1e972764653e61feac30adc161a756" +checksum = "18b19e258aa08450f93369cf56dd78063586adf19e92a75b338a800f799a0208" dependencies = [ - "base64 0.21.7", - "log", - "pico-args", - "usvg-parser", - "usvg-text-layout", - "usvg-tree", - "xmlwriter", + "ahash", + "byteorder", + "lazy_static", + "parking_lot 0.12.3", + "serde", ] [[package]] -name = "usvg-parser" -version = "0.37.0" +name = "usvg" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd4e3c291f45d152929a31f0f6c819245e2921bfd01e7bd91201a9af39a2bdc" +checksum = "b84ea542ae85c715f07b082438a4231c3760539d902e11d093847a0b22963032" dependencies = [ + "base64 0.22.1", "data-url", "flate2", + "fontdb 0.18.0", "imagesize", - "kurbo", + "kurbo 0.11.1", "log", - "roxmltree 0.19.0", + "pico-args", + "roxmltree", + "rustybuzz", "simplecss", - "siphasher", - "svgtypes", - "usvg-tree", -] - -[[package]] -name = "usvg-text-layout" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d383a3965de199d7f96d4e11a44dd859f46e86de7f3dca9a39bf82605da0a37c" -dependencies = [ - "fontdb", - "kurbo", - "log", - "rustybuzz 0.12.1", - "unicode-bidi", - "unicode-script", - "unicode-vo", - "usvg-tree", -] - -[[package]] -name = "usvg-tree" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee3d202ebdb97a6215604b8f5b4d6ef9024efd623cf2e373a6416ba976ec7d3" -dependencies = [ - "rctree", + "siphasher 1.0.1", "strict-num", "svgtypes", "tiny-skia-path", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "xmlwriter", ] [[package]] @@ -6261,9 +6261,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" [[package]] name = "uzers" @@ -6317,9 +6317,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", @@ -6328,24 +6328,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -6355,9 +6355,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6365,22 +6365,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasm-timer" @@ -6405,7 +6405,7 @@ checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.37", + "rustix 0.38.38", "scoped-tls", "smallvec", "wayland-sys", @@ -6413,12 +6413,12 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.6" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d" +checksum = "b66249d3fc69f76fd74c82cc319300faa554e9d865dab1f7cd66cc20db10b280" dependencies = [ "bitflags 2.6.0", - "rustix 0.38.37", + "rustix 0.38.38", "wayland-backend", "wayland-scanner", ] @@ -6436,32 +6436,20 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.31.6" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a94697e66e76c85923b0d28a0c251e8f0666f58fc47d316c0f4da6da75d37cb" +checksum = "32b08bc3aafdb0035e7fe0fdf17ba0c09c268732707dca4ae098f60cb28c9e4c" dependencies = [ - "rustix 0.38.37", + "rustix 0.38.38", "wayland-client", "xcursor", ] [[package]] name = "wayland-protocols" -version = "0.31.2" +version = "0.32.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols" -version = "0.32.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0" +checksum = "7cd0ade57c4e6e9a8952741325c30bf82f4246885dca8bf561898b86d0c1f58e" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -6471,40 +6459,27 @@ dependencies = [ [[package]] name = "wayland-protocols-plasma" -version = "0.2.0" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +checksum = "9b31cab548ee68c7eb155517f2212049dc151f7cd7910c2b66abfd31c3ee12bd" dependencies = [ "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.31.2", + "wayland-protocols", "wayland-scanner", ] [[package]] name = "wayland-protocols-wlr" -version = "0.2.0" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +checksum = "782e12f6cd923c3c316130d56205ebab53f55d6666b7faddfad36cecaeeb4022" dependencies = [ "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.31.2", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-wlr" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad87b5fd1b1d3ca2f792df8f686a2a11e3fe1077b71096f7a175ab699f89109" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-protocols 0.32.4", + "wayland-protocols", "wayland-scanner", ] @@ -6533,9 +6508,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -6543,9 +6518,9 @@ dependencies = [ [[package]] name = "web-time" -version = "0.2.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -6559,12 +6534,13 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d1c4ba43f80542cf63a0a6ed3134629ae73e8ab51e4b765a67f3aa062eb433" dependencies = [ "arrayvec 0.7.6", - "cfg-if", "cfg_aliases 0.1.1", + "document-features", "js-sys", "log", "naga", @@ -6583,14 +6559,15 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0348c840d1051b8e86c3bcd31206080c5e71e5933dabd79be1ce732b0b2f089a" dependencies = [ "arrayvec 0.7.6", "bit-vec", "bitflags 2.6.0", "cfg_aliases 0.1.1", - "codespan-reporting", + "document-features", "indexmap", "log", "naga", @@ -6598,18 +6575,18 @@ dependencies = [ "parking_lot 0.12.3", "profiling", "raw-window-handle", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "thiserror", - "web-sys", "wgpu-hal", "wgpu-types", ] [[package]] name = "wgpu-hal" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f" dependencies = [ "android_system_properties", "arrayvec 0.7.6", @@ -6629,10 +6606,11 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.5", + "libloading", "log", "metal", "naga", + "ndk-sys 0.5.0+25.2.9519653", "objc", "once_cell", "parking_lot 0.12.3", @@ -6640,7 +6618,7 @@ dependencies = [ "range-alloc", "raw-window-handle", "renderdoc-sys", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "thiserror", "wasm-bindgen", @@ -6651,8 +6629,9 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc9d91f0e2c4b51434dfa6db77846f2793149d8e73f800fa2e41f52b8eac3c5d" dependencies = [ "bitflags 2.6.0", "js-sys", @@ -6699,7 +6678,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "window_clipboard" version = "0.4.1" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "clipboard-win", "clipboard_macos", @@ -6711,17 +6690,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-implement 0.48.0", - "windows-interface 0.48.0", - "windows-targets 0.48.5", -] - [[package]] name = "windows" version = "0.52.0" @@ -6732,6 +6700,18 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +dependencies = [ + "windows-core 0.54.0", + "windows-implement 0.53.0", + "windows-interface 0.53.0", + "windows-targets 0.52.6", +] + [[package]] name = "windows" version = "0.56.0" @@ -6751,6 +6731,16 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-core" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + [[package]] name = "windows-core" version = "0.56.0" @@ -6765,13 +6755,13 @@ dependencies = [ [[package]] name = "windows-implement" -version = "0.48.0" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" +checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.85", ] [[package]] @@ -6782,18 +6772,18 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "windows-interface" -version = "0.48.0" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" +checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.85", ] [[package]] @@ -6804,7 +6794,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -7032,46 +7022,50 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" -version = "0.29.10" -source = "git+https://github.com/pop-os/winit.git?branch=winit-0.29#bdc66109acc85c912264c9e4b864520345bdb45f" +version = "0.30.5" +source = "git+https://github.com/pop-os/winit.git?tag=iced-xdg-surface-0.13#1cc02bdab141072eaabad639d74b032fd0fcc62e" dependencies = [ "ahash", "android-activity", "atomic-waker", "bitflags 2.6.0", + "block2", "bytemuck", - "calloop 0.12.4", - "cfg_aliases 0.1.1", + "calloop", + "cfg_aliases 0.2.1", + "concurrent-queue", "core-foundation", "core-graphics", "cursor-icon", - "icrate 0.0.4", + "dpi", "js-sys", "libc", - "log", "memmap2 0.9.5", "ndk", - "ndk-sys", - "objc2 0.4.1", - "once_cell", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "objc2-ui-kit", "orbclient", "percent-encoding", + "pin-project", "raw-window-handle", - "redox_syscall 0.3.5", - "rustix 0.38.37", + "redox_syscall 0.4.1", + "rustix 0.38.38", "sctk-adwaita", - "smithay-client-toolkit 0.18.1", + "smithay-client-toolkit", "smol_str", + "tracing", "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", "wayland-backend", "wayland-client", - "wayland-protocols 0.31.2", + "wayland-protocols", "wayland-protocols-plasma", "web-sys", "web-time", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "x11-dl", "x11rb", "xkbcommon-dl", @@ -7088,9 +7082,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] @@ -7127,9 +7121,9 @@ dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading 0.8.5", + "libloading", "once_cell", - "rustix 0.38.37", + "rustix 0.38.38", "x11rb-protocol", ] @@ -7147,7 +7141,7 @@ checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", "linux-raw-sys 0.4.14", - "rustix 0.38.37", + "rustix 0.38.38", ] [[package]] @@ -7230,12 +7224,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" -[[package]] -name = "xxhash-rust" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" - [[package]] name = "yaml-rust" version = "0.4.5" @@ -7245,6 +7233,12 @@ dependencies = [ "linked-hash-map", ] +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" + [[package]] name = "yazi" version = "0.1.6" @@ -7271,7 +7265,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "synstructure", ] @@ -7282,15 +7276,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" dependencies = [ "async-broadcast 0.5.1", - "async-executor", - "async-fs 1.6.0", - "async-io 1.13.0", - "async-lock 2.8.0", "async-process 1.8.1", "async-recursion", - "async-task", "async-trait", - "blocking", "byteorder", "derivative", "enumflags2", @@ -7325,7 +7313,7 @@ checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast 0.7.1", "async-executor", - "async-fs 2.1.2", + "async-fs", "async-io 2.3.4", "async-lock 3.4.0", "async-process 2.3.0", @@ -7379,7 +7367,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "zvariant_utils 2.1.0", ] @@ -7429,7 +7417,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -7449,7 +7437,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "synstructure", ] @@ -7470,7 +7458,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -7492,7 +7480,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -7625,7 +7613,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "zvariant_utils 2.1.0", ] @@ -7648,5 +7636,5 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index 72eded832bca..54f87b464600 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -20,40 +20,38 @@ rustPlatform.buildRustPackage rec { pname = "cosmic-edit"; - version = "1.0.0-alpha.2"; + version = "1.0.0-alpha.3"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-edit"; rev = "epoch-${version}"; - hash = "sha256-3goolnDRGQkQ3zN08WKzN6Dxt+Sh1lR+tFxeWjO3VKY="; + hash = "sha256-GCy/JyicPeCA7y9bfbVlyYiofRp0c82INPZi0zbnnxE="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "accesskit-0.12.2" = "sha256-1UwgRyUe0PQrZrpS7574oNLi13fg5HpgILtZGW6JNtQ="; + "accesskit-0.16.0" = "sha256-yeBzocXxuvHmuPGMRebbsYSKSvN+8sUsmaSKlQDpW4w="; "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; - "clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk="; - "cosmic-config-0.1.0" = "sha256-gXrMEoAN+7nYAEcs4w6wROhQTjMCxkGn+muJutktLyk="; - "cosmic-files-0.1.0" = "sha256-rBR6IPpMgOltyaRPPZ5V8tYH/xtQphgrPWci/kvlgEg="; + "clipboard_macos-0.1.0" = "sha256-tovB4fjPVVRY8LKn5albMzskFQ+1W5ul4jT5RXx9gKE="; + "cosmic-config-0.1.0" = "sha256-u/qzhRvP+HsfCfxl3aM/L4ZwmZ/Zorrlq5l9UemfoRg="; + "cosmic-files-0.1.0" = "sha256-XNUeDj5Dl8jXJRERP2F4Yx2BPV2b4bwzMNCbIH3FJdA="; "cosmic-syntax-theme-0.1.0" = "sha256-BNb9wrryD5FJImboD3TTdPRIfiBqPpItqwGdT1ZiNng="; "cosmic-text-0.12.1" = "sha256-u2Tw+XhpIKeFg8Wgru/sjGw6GUZ2m50ZDmRBJ1IM66w="; - "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4="; - "filetime-0.2.24" = "sha256-lU7dPotdnmyleS2B75SmDab7qJfEzmJnHPF18CN/Y98="; + "dpi-0.1.1" = "sha256-whi05/2vc3s5eAJTZ9TzVfGQ/EnfPr0S4PZZmbiYio0="; "fs_extra-1.3.0" = "sha256-ftg5oanoqhipPnbUsqnA4aZcyHqn9XsINJdrStIPLoE="; - "glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg="; + "iced_glyphon-0.6.0" = "sha256-u1vnsOjP8npQ57NNSikotuHxpi4Mp/rV9038vAgCsfQ="; "smithay-clipboard-0.8.0" = "sha256-4InFXm0ahrqFrtNLeqIuE3yeOpxKZJZx+Bc0yQDtv34="; "softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg="; "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI="; "trash-5.1.1" = "sha256-So8rQ8gLF5o79Az396/CQY/veNo4ticxYpYZPfMJyjQ="; - "winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4="; }; }; # COSMIC applications now uses vergen for the About page # Update the COMMIT_DATE to match when the commit was made - env.VERGEN_GIT_COMMIT_DATE = "2024-09-24"; + env.VERGEN_GIT_COMMIT_DATE = "2024-10-31"; env.VERGEN_GIT_SHA = src.rev; postPatch = '' From dc83bfd616a47a54921556a117561ebdef2fd1af Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Tue, 5 Nov 2024 00:29:13 +0000 Subject: [PATCH 317/617] cosmic-term: 1.0.0-alpha.2 -> 1.0.0-alpha.3 --- pkgs/by-name/co/cosmic-term/Cargo.lock | 1610 +++++++++++------------ pkgs/by-name/co/cosmic-term/package.nix | 18 +- 2 files changed, 807 insertions(+), 821 deletions(-) diff --git a/pkgs/by-name/co/cosmic-term/Cargo.lock b/pkgs/by-name/co/cosmic-term/Cargo.lock index b1b9d48cb57d..7a9a99439ae6 100644 --- a/pkgs/by-name/co/cosmic-term/Cargo.lock +++ b/pkgs/by-name/co/cosmic-term/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.28" +version = "0.2.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb" +checksum = "ec3672c180e71eeaaac3a541fbbc5f5ad4def8b747c595ad30d674e43049f7b0" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -20,43 +20,53 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] name = "accesskit" -version = "0.12.2" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.16.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" + +[[package]] +name = "accesskit_atspi_common" +version = "0.9.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" +dependencies = [ + "accesskit", + "accesskit_consumer", + "atspi-common", + "serde", + "thiserror", + "zvariant 3.15.2", +] [[package]] name = "accesskit_consumer" -version = "0.17.0" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.24.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", + "immutable-chunkmap", ] [[package]] name = "accesskit_macos" -version = "0.11.0" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.17.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", "accesskit_consumer", - "icrate 0.1.2", - "objc2 0.5.2", + "objc2", + "objc2-app-kit", + "objc2-foundation", "once_cell", ] [[package]] name = "accesskit_unix" -version = "0.7.1" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.12.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", - "accesskit_consumer", - "async-channel", - "async-executor", - "async-task", + "accesskit_atspi_common", "atspi", "futures-lite 1.13.0", - "futures-util", - "once_cell", "serde", "tokio", "tokio-stream", @@ -65,21 +75,20 @@ dependencies = [ [[package]] name = "accesskit_windows" -version = "0.16.0" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.22.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", "accesskit_consumer", - "once_cell", "paste", "static_assertions", - "windows 0.48.0", + "windows 0.54.0", ] [[package]] name = "accesskit_winit" -version = "0.18.1" -source = "git+https://github.com/wash2/accesskit.git?branch=winit-0.29#26f729169cd849970af02be62289606c63572d2d" +version = "0.22.0" +source = "git+https://github.com/wash2/accesskit?tag=iced-xdg-surface-0.13#956955342dadab7e588e21be726817fca39510f3" dependencies = [ "accesskit", "accesskit_macos", @@ -91,9 +100,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] @@ -186,9 +195,9 @@ checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" [[package]] name = "android-activity" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" dependencies = [ "android-properties", "bitflags 2.6.0", @@ -200,7 +209,7 @@ dependencies = [ "log", "ndk", "ndk-context", - "ndk-sys", + "ndk-sys 0.6.0+11769913", "num_enum", "thiserror", ] @@ -228,9 +237,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.15" +version = "0.6.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338" dependencies = [ "anstyle", "anstyle-parse", @@ -243,43 +252,43 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56" [[package]] name = "anstyle-parse" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.4" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8" [[package]] name = "apply" @@ -337,11 +346,11 @@ checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" [[package]] name = "ash" -version = "0.37.3+1.3.251" +version = "0.38.0+1.3.281" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" dependencies = [ - "libloading 0.7.4", + "libloading", ] [[package]] @@ -350,7 +359,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" dependencies = [ - "async-fs 2.1.2", + "async-fs", "async-net", "enumflags2", "futures-channel", @@ -365,9 +374,9 @@ dependencies = [ [[package]] name = "ashpd" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" +checksum = "4d43c03d9e36dd40cab48435be0b09646da362c278223ca535493877b2c1dee9" dependencies = [ "enumflags2", "futures-channel", @@ -427,18 +436,6 @@ dependencies = [ "slab", ] -[[package]] -name = "async-fs" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "blocking", - "futures-lite 1.13.0", -] - [[package]] name = "async-fs" version = "2.1.2" @@ -483,7 +480,7 @@ dependencies = [ "futures-lite 2.3.0", "parking", "polling 3.7.3", - "rustix 0.38.37", + "rustix 0.38.38", "slab", "tracing", "windows-sys 0.59.0", @@ -533,7 +530,7 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.37", + "rustix 0.38.38", "windows-sys 0.48.0", ] @@ -552,7 +549,7 @@ dependencies = [ "cfg-if", "event-listener 5.3.1", "futures-lite 2.3.0", - "rustix 0.38.37", + "rustix 0.38.38", "tracing", ] @@ -564,7 +561,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -579,7 +576,7 @@ dependencies = [ "cfg-if", "futures-core", "futures-io", - "rustix 0.38.37", + "rustix 0.38.38", "signal-hook-registry", "slab", "windows-sys 0.59.0", @@ -593,13 +590,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -613,7 +610,7 @@ name = "atomicwrites" version = "0.4.2" source = "git+https://github.com/jackpot51/rust-atomicwrites#043ab4859d53ffd3d55334685303d8df39c9f768" dependencies = [ - "rustix 0.38.37", + "rustix 0.38.38", "tempfile", "windows-sys 0.48.0", ] @@ -668,9 +665,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backtrace" @@ -710,18 +707,18 @@ dependencies = [ [[package]] name = "bit-set" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" dependencies = [ "bit-vec", ] [[package]] name = "bit-vec" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" [[package]] name = "bit_field" @@ -759,42 +756,13 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" -dependencies = [ - "objc-sys", -] - -[[package]] -name = "block2" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" -dependencies = [ - "block-sys", - "objc2 0.4.1", -] - -[[package]] -name = "block2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e58aa60e59d8dbfcc36138f5f18be5f24394d33b38b24f7fd0b1caa33095f22f" -dependencies = [ - "block-sys", - "objc2 0.5.2", -] - [[package]] name = "block2" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" dependencies = [ - "objc2 0.5.2", + "objc2", ] [[package]] @@ -834,22 +802,22 @@ checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06" [[package]] name = "bytemuck" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" +checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" +checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -860,9 +828,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "bzip2" @@ -885,20 +853,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "calloop" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" -dependencies = [ - "bitflags 2.6.0", - "log", - "polling 3.7.3", - "rustix 0.38.37", - "slab", - "thiserror", -] - [[package]] name = "calloop" version = "0.13.0" @@ -908,40 +862,28 @@ dependencies = [ "bitflags 2.6.0", "log", "polling 3.7.3", - "rustix 0.38.37", + "rustix 0.38.38", "slab", "thiserror", ] -[[package]] -name = "calloop-wayland-source" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" -dependencies = [ - "calloop 0.12.4", - "rustix 0.38.37", - "wayland-backend", - "wayland-client", -] - [[package]] name = "calloop-wayland-source" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ - "calloop 0.13.0", - "rustix 0.38.37", + "calloop", + "rustix 0.38.38", "wayland-backend", "wayland-client", ] [[package]] name = "cc" -version = "1.1.21" +version = "1.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" +checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" dependencies = [ "jobserver", "libc", @@ -1020,7 +962,7 @@ dependencies = [ [[package]] name = "clipboard_macos" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "objc", "objc-foundation", @@ -1030,7 +972,7 @@ dependencies = [ [[package]] name = "clipboard_wayland" version = "0.2.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "dnd", "mime 0.1.0", @@ -1040,7 +982,7 @@ dependencies = [ [[package]] name = "clipboard_x11" version = "0.4.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "thiserror", "x11rb", @@ -1094,9 +1036,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "com" @@ -1217,7 +1159,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1236,7 +1178,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "quote", "syn 1.0.109", @@ -1245,7 +1187,7 @@ dependencies = [ [[package]] name = "cosmic-files" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-files.git#774ccf955f59f24cf9493f9249d20788ad394d48" +source = "git+https://github.com/pop-os/cosmic-files.git#20f9292e7925da20086c7f1f3c8e3a8d03d63b99" dependencies = [ "chrono", "dirs", @@ -1269,15 +1211,14 @@ dependencies = [ "once_cell", "open", "paste", - "rayon", "recently-used-xbel", "regex", "rust-embed", "serde", "shlex", "slotmap", - "smol_str", "tar", + "tempfile", "tokio", "trash", "unix_permissions_ext", @@ -1314,7 +1255,6 @@ dependencies = [ "rust-embed", "serde", "shlex", - "smol_str", "tokio", "url", "vergen", @@ -1326,12 +1266,12 @@ version = "0.12.1" source = "git+https://github.com/pop-os/cosmic-text.git#4fe90bb6126c22f589b46768d7754d65ae300c5e" dependencies = [ "bitflags 2.6.0", - "fontdb", + "fontdb 0.16.2", "log", "rangemap", "rayon", - "rustc-hash", - "rustybuzz 0.14.1", + "rustc-hash 1.1.0", + "rustybuzz", "self_cell 1.0.4", "smol_str", "swash", @@ -1346,7 +1286,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "almost", "cosmic-config", @@ -1473,11 +1413,12 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" [[package]] name = "d3d12" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdbd1f579714e3c809ebd822c81ef148b1ceaeb3d535352afc73fd0c4c6a0017" dependencies = [ "bitflags 2.6.0", - "libloading 0.8.5", + "libloading", "winapi", ] @@ -1502,7 +1443,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1513,7 +1454,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1523,7 +1464,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core 0.9.10", @@ -1569,7 +1510,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1581,7 +1522,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1651,7 +1592,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1660,7 +1601,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.5", + "libloading", ] [[package]] @@ -1675,21 +1616,35 @@ dependencies = [ [[package]] name = "dnd" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "bitflags 2.6.0", "mime 0.1.0", "raw-window-handle", - "smithay-client-toolkit 0.19.2", + "smithay-client-toolkit", "smithay-clipboard", ] +[[package]] +name = "document-features" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +dependencies = [ + "litrs", +] + [[package]] name = "downcast-rs" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" +[[package]] +name = "dpi" +version = "0.1.1" +source = "git+https://github.com/pop-os/winit.git?tag=iced-xdg-surface-0.13#1cc02bdab141072eaabad639d74b032fd0fcc62e" + [[package]] name = "drm" version = "0.11.1" @@ -1700,7 +1655,7 @@ dependencies = [ "bytemuck", "drm-ffi", "drm-fourcc", - "rustix 0.38.37", + "rustix 0.38.38", ] [[package]] @@ -1710,7 +1665,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" dependencies = [ "drm-sys", - "rustix 0.38.37", + "rustix 0.38.38", ] [[package]] @@ -1741,17 +1696,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" -[[package]] -name = "enum-repr" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bad30c9c0fa1aaf1ae5010dab11f1117b15d35faf62cda4bbbc53b9987950f18" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "enumflags2" version = "0.7.10" @@ -1770,7 +1714,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -1927,30 +1871,31 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" -version = "0.3.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +checksum = "07c6f4c64c1d33a3111c4466f7365ebdcc37c5bd1ea0d62aae2e3d722aacbedb" dependencies = [ "simd-adler32", ] [[package]] name = "file-id" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6584280525fb2059cba3db2c04abf947a1a29a45ddae89f3870f8281704fafc9" +checksum = "6bc904b9bbefcadbd8e3a9fb0d464a9b979de6324c03b3c663e8994f46a5be36" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "filetime" -version = "0.2.24" -source = "git+https://github.com/jackpot51/filetime#186e19d3190ead16b05329400cb5b2350d8f44cf" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "libredox 0.1.3", + "libredox", "windows-sys 0.59.0", ] @@ -1965,9 +1910,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide 0.8.0", @@ -1978,9 +1923,6 @@ name = "float-cmp" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] [[package]] name = "float_next_after" @@ -2008,7 +1950,7 @@ dependencies = [ "fluent-syntax", "intl-memoizer", "intl_pluralrules", - "rustc-hash", + "rustc-hash 1.1.0", "self_cell 0.10.3", "smallvec", "unic-langid", @@ -2034,9 +1976,9 @@ dependencies = [ [[package]] name = "flume" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" dependencies = [ "spin", ] @@ -2049,9 +1991,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "font-types" -version = "0.6.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0189ccb084f77c5523e08288d418cbaa09c451a08515678a0aa265df9a8b60" +checksum = "dda6e36206148f69fc6ecb1bb6c0dedd7ee469f3db1d0dc2045beea28430ca43" dependencies = [ "bytemuck", ] @@ -2062,7 +2004,7 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" dependencies = [ - "roxmltree 0.20.0", + "roxmltree", ] [[package]] @@ -2079,6 +2021,20 @@ dependencies = [ "ttf-parser 0.20.0", ] +[[package]] +name = "fontdb" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e32eac81c1135c1df01d4e6d4233c47ba11f6a6d07f33e0bba09d18797077770" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2 0.9.5", + "slotmap", + "tinyvec", + "ttf-parser 0.21.1", +] + [[package]] name = "foreign-types" version = "0.5.0" @@ -2097,7 +2053,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -2173,9 +2129,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -2188,9 +2144,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -2198,15 +2154,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -2216,9 +2172,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" @@ -2250,32 +2206,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -2320,16 +2276,6 @@ dependencies = [ "wasi", ] -[[package]] -name = "gif" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" -dependencies = [ - "color_quant", - "weezl", -] - [[package]] name = "gif" version = "0.13.1" @@ -2342,9 +2288,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "gl_generator" @@ -2359,9 +2305,9 @@ dependencies = [ [[package]] name = "glam" -version = "0.24.2" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" +checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3" [[package]] name = "glob" @@ -2396,24 +2342,13 @@ dependencies = [ [[package]] name = "glutin_wgl_sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" dependencies = [ "gl_generator", ] -[[package]] -name = "glyphon" -version = "0.5.0" -source = "git+https://github.com/pop-os/glyphon.git?tag=v0.5.0#1b0646ff8f74da92d3be704dfc2257d7f4d7eed8" -dependencies = [ - "cosmic-text", - "etagere", - "lru", - "wgpu", -] - [[package]] name = "gpu-alloc" version = "0.6.0" @@ -2435,9 +2370,9 @@ dependencies = [ [[package]] name = "gpu-allocator" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" +checksum = "fdd4240fc91d3433d5e5b0fc5b67672d771850dc19bbee03c1381e19322803d7" dependencies = [ "log", "presser", @@ -2448,20 +2383,20 @@ dependencies = [ [[package]] name = "gpu-descriptor" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" dependencies = [ "bitflags 2.6.0", "gpu-descriptor-types", - "hashbrown", + "hashbrown 0.14.5", ] [[package]] name = "gpu-descriptor-types" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ "bitflags 2.6.0", ] @@ -2502,6 +2437,12 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + [[package]] name = "hassle-rs" version = "0.11.0" @@ -2511,7 +2452,7 @@ dependencies = [ "bitflags 2.6.0", "com", "libc", - "libloading 0.8.5", + "libloading", "thiserror", "widestring", "winapi", @@ -2635,21 +2576,21 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.77", + "syn 2.0.85", "unic-langid", ] [[package]] name = "i18n-embed-impl" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81093c4701672f59416582fe3145676126fd23ba5db910acad0793c1108aaa58" +checksum = "0f2cc0e0523d1fe6fc2c6f66e5038624ea8091b3e7748b5e8e0c84b1698db6c2" dependencies = [ "find-crate", "i18n-config", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -2677,15 +2618,14 @@ dependencies = [ [[package]] name = "iced" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "dnd", "iced_accessibility", "iced_core", "iced_futures", "iced_renderer", - "iced_sctk", "iced_widget", "iced_winit", "image", @@ -2697,57 +2637,70 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "accesskit", - "accesskit_unix", "accesskit_winit", ] [[package]] name = "iced_core" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "bitflags 2.6.0", + "bytes", "dnd", + "glam", "iced_accessibility", "log", "mime 0.1.0", "num-traits", + "once_cell", "palette", "raw-window-handle", + "rustc-hash 2.0.0", "serde", - "smithay-client-toolkit 0.19.2", "smol_str", "thiserror", "web-time", "window_clipboard", - "xxhash-rust", ] [[package]] name = "iced_futures" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "futures", "iced_core", "log", + "rustc-hash 2.0.0", "tokio", "wasm-bindgen-futures", "wasm-timer", ] +[[package]] +name = "iced_glyphon" +version = "0.6.0" +source = "git+https://github.com/pop-os/glyphon.git?tag=iced-0.14-dev#6ef9d12a20cfd0f7bdf38136a26ded9f7459ec8b" +dependencies = [ + "cosmic-text", + "etagere", + "lru", + "rustc-hash 2.0.0", + "wgpu", +] + [[package]] name = "iced_graphics" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "bitflags 2.6.0", "bytemuck", "cosmic-text", - "glam", "half", "iced_core", "iced_futures", @@ -2757,16 +2710,15 @@ dependencies = [ "lyon_path", "once_cell", "raw-window-handle", - "rustc-hash", + "rustc-hash 2.0.0", "thiserror", "unicode-segmentation", - "xxhash-rust", ] [[package]] name = "iced_renderer" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2777,96 +2729,61 @@ dependencies = [ [[package]] name = "iced_runtime" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ + "bytes", "dnd", "iced_accessibility", "iced_core", "iced_futures", - "smithay-client-toolkit 0.19.2", - "thiserror", - "window_clipboard", -] - -[[package]] -name = "iced_sctk" -version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" -dependencies = [ - "enum-repr", - "float-cmp", - "futures", - "iced_accessibility", - "iced_futures", - "iced_graphics", - "iced_runtime", - "iced_style", - "itertools", - "lazy_static", "raw-window-handle", - "smithay-client-toolkit 0.19.2", "thiserror", - "tracing", - "wayland-backend", - "wayland-protocols 0.32.4", "window_clipboard", - "xkbcommon", - "xkbcommon-dl", - "xkeysym", -] - -[[package]] -name = "iced_style" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" -dependencies = [ - "iced_core", - "once_cell", - "palette", ] [[package]] name = "iced_tiny_skia" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "bytemuck", "cosmic-text", "iced_graphics", - "kurbo", + "kurbo 0.10.4", "log", "resvg", - "rustc-hash", + "rustc-hash 2.0.0", "softbuffer", "tiny-skia", - "xxhash-rust", ] [[package]] name = "iced_wgpu" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "as-raw-xcb-connection", "bitflags 2.6.0", "bytemuck", "futures", "glam", - "glyphon", "guillotiere", + "iced_glyphon", "iced_graphics", "log", "lyon", "once_cell", "raw-window-handle", "resvg", - "rustix 0.38.37", - "smithay-client-toolkit 0.19.2", + "rustc-hash 2.0.0", + "rustix 0.38.38", + "smithay-client-toolkit", + "thiserror", "tiny-xlib", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.4", + "wayland-protocols", "wayland-sys", "wgpu", "x11rb", @@ -2874,16 +2791,17 @@ dependencies = [ [[package]] name = "iced_widget" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "dnd", "iced_accessibility", "iced_renderer", "iced_runtime", - "iced_style", "num-traits", + "once_cell", "ouroboros", + "rustc-hash 2.0.0", "thiserror", "unicode-segmentation", "window_clipboard", @@ -2891,44 +2809,25 @@ dependencies = [ [[package]] name = "iced_winit" -version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +version = "0.14.0-dev" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "dnd", "iced_accessibility", + "iced_futures", "iced_graphics", "iced_runtime", - "iced_style", "log", + "rustc-hash 2.0.0", "thiserror", "tracing", + "wasm-bindgen-futures", "web-sys", "winapi", "window_clipboard", "winit", ] -[[package]] -name = "icrate" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" -dependencies = [ - "block2 0.3.0", - "dispatch", - "objc2 0.4.1", -] - -[[package]] -name = "icrate" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb69199826926eb864697bddd27f73d9fddcffc004f5733131e15b465e30642" -dependencies = [ - "block2 0.4.0", - "objc2 0.5.2", -] - [[package]] name = "icu_collator" version = "1.5.0" @@ -3069,7 +2968,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -3114,7 +3013,7 @@ dependencies = [ "byteorder", "color_quant", "exr", - "gif 0.13.1", + "gif", "jpeg-decoder", "num-traits", "png", @@ -3129,13 +3028,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" [[package]] -name = "indexmap" -version = "2.5.0" +name = "immutable-chunkmap" +version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "12f97096f508d54f8f8ab8957862eee2ccd628847b6217af1a335e1c44dee578" +dependencies = [ + "arrayvec 0.7.6", +] + +[[package]] +name = "indexmap" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.0", ] [[package]] @@ -3308,9 +3216,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -3331,7 +3239,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.5", + "libloading", "pkg-config", ] @@ -3372,11 +3280,22 @@ dependencies = [ [[package]] name = "kurbo" -version = "0.9.5" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +checksum = "1618d4ebd923e97d67e7cd363d80aef35fe961005cbbbb3d2dad8bdd1bc63440" dependencies = [ "arrayvec 0.7.6", + "smallvec", +] + +[[package]] +name = "kurbo" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89234b2cc610a7dd927ebde6b41dd1a5d4214cffaef4cf1fb2195d592f92518f" +dependencies = [ + "arrayvec 0.7.6", + "smallvec", ] [[package]] @@ -3406,17 +3325,17 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.159" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#701638009df09a254b7d077ddc4d1076cd87a147" +source = "git+https://github.com/pop-os/libcosmic.git#d84447aaad96c84f1e59291f14468ba63fb79797" dependencies = [ "apply", - "ashpd 0.9.1", + "ashpd 0.9.2", "chrono", "cosmic-config", "cosmic-theme", @@ -3430,8 +3349,6 @@ dependencies = [ "iced_futures", "iced_renderer", "iced_runtime", - "iced_sctk", - "iced_style", "iced_tiny_skia", "iced_wgpu", "iced_widget", @@ -3447,19 +3364,10 @@ dependencies = [ "tracing", "unicode-segmentation", "url", + "ustr", "zbus 4.4.0", ] -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - [[package]] name = "libloading" version = "0.8.5" @@ -3472,20 +3380,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libredox" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" -dependencies = [ - "bitflags 2.6.0", - "libc", - "redox_syscall 0.4.1", -] +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "libredox" @@ -3495,7 +3392,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", - "redox_syscall 0.5.4", + "redox_syscall 0.5.7", ] [[package]] @@ -3522,6 +3419,12 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + [[package]] name = "locale_config" version = "0.3.0" @@ -3559,12 +3462,9 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" -dependencies = [ - "hashbrown", -] +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" [[package]] name = "lyon" @@ -3588,9 +3488,9 @@ dependencies = [ [[package]] name = "lyon_geom" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9" +checksum = "8af69edc087272df438b3ee436c4bb6d7c04aa8af665cfd398feae627dbd8570" dependencies = [ "arrayvec 0.7.6", "euclid", @@ -3599,9 +3499,9 @@ dependencies = [ [[package]] name = "lyon_path" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c08a606c7a59638d6c6aa18ac91a06aa9fb5f765a7efb27e6a4da58700740d7" +checksum = "8e0b8aec2f58586f6eef237985b9a9b7cb3a3aff4417c575075cf95bf925252e" dependencies = [ "lyon_geom", "num-traits", @@ -3681,9 +3581,9 @@ dependencies = [ [[package]] name = "metal" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" dependencies = [ "bitflags 2.6.0", "block", @@ -3697,7 +3597,7 @@ dependencies = [ [[package]] name = "mime" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "smithay-clipboard", ] @@ -3731,7 +3631,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", - "simd-adler32", ] [[package]] @@ -3741,6 +3640,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ "adler2", + "simd-adler32", ] [[package]] @@ -3784,18 +3684,19 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" [[package]] name = "naga" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bd5a652b6faf21496f2cfd88fc49989c8db0825d1f6746b1a71a6ede24a63ad" dependencies = [ "arrayvec 0.7.6", "bit-set", "bitflags 2.6.0", + "cfg_aliases 0.1.1", "codespan-reporting", "hexf-parse", "indexmap", "log", - "num-traits", - "rustc-hash", + "rustc-hash 1.1.0", "spirv", "termcolor", "thiserror", @@ -3804,14 +3705,14 @@ dependencies = [ [[package]] name = "ndk" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ "bitflags 2.6.0", "jni-sys", "log", - "ndk-sys", + "ndk-sys 0.6.0+11769913", "num_enum", "raw-window-handle", "thiserror", @@ -3832,6 +3733,15 @@ dependencies = [ "jni-sys", ] +[[package]] +name = "ndk-sys" +version = "0.6.0+11769913" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" +dependencies = [ + "jni-sys", +] + [[package]] name = "nix" version = "0.26.4" @@ -3899,9 +3809,9 @@ dependencies = [ [[package]] name = "notify-debouncer-full" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f5dab59c348b9b50cf7f261960a20e389feb2713636399cd9082cd4b536154" +checksum = "fb7fd166739789c9ff169e654dc1501373db9d80a4c3f972817c8a4d7cf8f34e" dependencies = [ "crossbeam-channel", "file-id", @@ -4019,7 +3929,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -4038,7 +3948,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", - "objc_exception", ] [[package]] @@ -4058,16 +3967,6 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" -[[package]] -name = "objc2" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" -dependencies = [ - "objc-sys", - "objc2-encode 3.0.0", -] - [[package]] name = "objc2" version = "0.5.2" @@ -4075,14 +3974,84 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ "objc-sys", - "objc2-encode 4.0.3", + "objc2-encode", ] [[package]] -name = "objc2-encode" -version = "3.0.0" +name = "objc2-app-kit" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.6.0", + "block2", + "libc", + "objc2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-cloud-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", +] + +[[package]] +name = "objc2-contacts" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-core-location" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" +dependencies = [ + "block2", + "objc2", + "objc2-contacts", + "objc2-foundation", +] [[package]] name = "objc2-encode" @@ -4097,18 +4066,102 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ "bitflags 2.6.0", - "block2 0.5.1", + "block2", + "dispatch", "libc", - "objc2 0.5.2", + "objc2", ] [[package]] -name = "objc_exception" -version = "0.1.2" +name = "objc2-link-presentation" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" dependencies = [ - "cc", + "block2", + "objc2", + "objc2-app-kit", + "objc2-foundation", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-symbols" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" +dependencies = [ + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-ui-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-cloud-kit", + "objc2-core-data", + "objc2-core-image", + "objc2-core-location", + "objc2-foundation", + "objc2-link-presentation", + "objc2-quartz-core", + "objc2-symbols", + "objc2-uniform-type-identifiers", + "objc2-user-notifications", +] + +[[package]] +name = "objc2-uniform-type-identifiers" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-user-notifications" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" +dependencies = [ + "bitflags 2.6.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", ] [[package]] @@ -4122,18 +4175,18 @@ dependencies = [ [[package]] name = "object" -version = "0.36.4" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "open" @@ -4154,11 +4207,11 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "orbclient" -version = "0.3.47" +version = "0.3.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" +checksum = "ba0b26cec2e24f08ed8bb31519a9333140a6599b867dac464bb150bdb796fd43" dependencies = [ - "libredox 0.0.2", + "libredox", ] [[package]] @@ -4168,7 +4221,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" dependencies = [ "dlv-list", - "hashbrown", + "hashbrown 0.14.5", ] [[package]] @@ -4183,9 +4236,9 @@ dependencies = [ [[package]] name = "ouroboros" -version = "0.17.2" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" +checksum = "944fa20996a25aded6b4795c6d63f10014a7a83f8be9828a11860b08c5fc4a67" dependencies = [ "aliasable", "ouroboros_macro", @@ -4194,24 +4247,25 @@ dependencies = [ [[package]] name = "ouroboros_macro" -version = "0.17.2" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" +checksum = "39b0deead1528fd0e5947a8546a9642a9777c25f6e1e26f34c97b204bbb465bd" dependencies = [ "heck", - "proc-macro-error", + "itertools", "proc-macro2", + "proc-macro2-diagnostics", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "owned_ttf_parser" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" +checksum = "22ec719bbf3b2a81c109a4e20b1f129b5566b7dce654bc3872f6a05abf82b2c4" dependencies = [ - "ttf-parser 0.24.1", + "ttf-parser 0.25.0", ] [[package]] @@ -4236,7 +4290,7 @@ dependencies = [ "by_address", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -4288,7 +4342,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.4", + "redox_syscall 0.5.7", "smallvec", "windows-targets 0.52.6", ] @@ -4301,9 +4355,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pathdiff" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" +checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361" [[package]] name = "pbkdf2" @@ -4351,7 +4405,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -4360,7 +4414,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -4370,10 +4424,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] -name = "pin-project-lite" -version = "0.2.14" +name = "pin-project" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.85", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -4400,15 +4474,15 @@ checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "png" -version = "0.17.13" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0" dependencies = [ "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.4", + "miniz_oxide 0.8.0", ] [[package]] @@ -4437,7 +4511,7 @@ dependencies = [ "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.37", + "rustix 0.38.38", "tracing", "windows-sys 0.59.0", ] @@ -4485,7 +4559,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.22.21", + "toml_edit 0.22.22", ] [[package]] @@ -4514,18 +4588,31 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] [[package]] -name = "profiling" -version = "1.0.15" +name = "proc-macro2-diagnostics" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.85", + "version_check", + "yansi", +] + +[[package]] +name = "profiling" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d" [[package]] name = "pure-rust-locales" @@ -4629,17 +4716,11 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "rctree" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" - [[package]] name = "read-fonts" -version = "0.20.0" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c141b9980e1150201b2a3a32879001c8f975fe313ec3df5471a9b5c79a880cd" +checksum = "4a04b892cb6f91951f144c33321843790c8574c825aafdb16d815fd7183b5229" dependencies = [ "bytemuck", "font-types", @@ -4670,15 +4751,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -4690,9 +4762,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] @@ -4704,15 +4776,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", - "libredox 0.1.3", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.10.6" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -4722,9 +4794,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -4733,9 +4805,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "renderdoc-sys" @@ -4745,15 +4817,14 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] name = "resvg" -version = "0.37.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cadccb3d99a9efb8e5e00c16fbb732cbe400db2ec7fc004697ee7d97d86cf1f4" +checksum = "944d052815156ac8fa77eaac055220e95ba0b01fa8887108ca710c03805d9051" dependencies = [ - "gif 0.12.0", + "gif", "jpeg-decoder", "log", "pico-args", - "png", "rgb", "svgtypes", "tiny-skia", @@ -4804,12 +4875,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "roxmltree" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" - [[package]] name = "roxmltree" version = "0.20.0" @@ -4836,7 +4901,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.77", + "syn 2.0.85", "walkdir", ] @@ -4872,6 +4937,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustix" version = "0.37.27" @@ -4888,9 +4959,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a" dependencies = [ "bitflags 2.6.0", "errno", @@ -4908,30 +4979,14 @@ checksum = "a25c3aad9fc1424eb82c88087789a7d938e1829724f3e4043163baf0d13cfc12" dependencies = [ "errno", "libc", - "rustix 0.38.37", + "rustix 0.38.38", ] [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - -[[package]] -name = "rustybuzz" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" -dependencies = [ - "bitflags 2.6.0", - "bytemuck", - "smallvec", - "ttf-parser 0.20.0", - "unicode-bidi-mirroring 0.1.0", - "unicode-ccc 0.1.2", - "unicode-properties", - "unicode-script", -] +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "rustybuzz" @@ -4944,8 +4999,8 @@ dependencies = [ "libm", "smallvec", "ttf-parser 0.21.1", - "unicode-bidi-mirroring 0.2.0", - "unicode-ccc 0.2.0", + "unicode-bidi-mirroring", + "unicode-ccc", "unicode-properties", "unicode-script", ] @@ -4979,14 +5034,14 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sctk-adwaita" -version = "0.8.3" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70b31447ca297092c5a9916fc3b955203157b37c19ca8edde4f52e9843e602c7" +checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec" dependencies = [ "ab_glyph", "log", "memmap2 0.9.5", - "smithay-client-toolkit 0.18.1", + "smithay-client-toolkit", "tiny-skia", ] @@ -5007,29 +5062,29 @@ checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "indexmap", "itoa", @@ -5046,7 +5101,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -5118,10 +5173,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] -name = "skrifa" -version = "0.20.0" +name = "siphasher" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abea4738067b1e628c6ce28b2c216c19e9ea95715cdb332680e821c3bec2ef23" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + +[[package]] +name = "skrifa" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1c44ad1f6c5bdd4eefed8326711b7dbda9ea45dfd36068c427d332aa382cbe" dependencies = [ "bytemuck", "read-fonts", @@ -5151,31 +5212,6 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" -[[package]] -name = "smithay-client-toolkit" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" -dependencies = [ - "bitflags 2.6.0", - "calloop 0.12.4", - "calloop-wayland-source 0.2.0", - "cursor-icon", - "libc", - "log", - "memmap2 0.9.5", - "rustix 0.38.37", - "thiserror", - "wayland-backend", - "wayland-client", - "wayland-csd-frame", - "wayland-cursor", - "wayland-protocols 0.31.2", - "wayland-protocols-wlr 0.2.0", - "wayland-scanner", - "xkeysym", -] - [[package]] name = "smithay-client-toolkit" version = "0.19.2" @@ -5184,21 +5220,21 @@ checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" dependencies = [ "bitflags 2.6.0", "bytemuck", - "calloop 0.13.0", - "calloop-wayland-source 0.3.0", + "calloop", + "calloop-wayland-source", "cursor-icon", "libc", "log", "memmap2 0.9.5", "pkg-config", - "rustix 0.38.37", + "rustix 0.38.38", "thiserror", "wayland-backend", "wayland-client", "wayland-csd-frame", "wayland-cursor", - "wayland-protocols 0.32.4", - "wayland-protocols-wlr 0.3.4", + "wayland-protocols", + "wayland-protocols-wlr", "wayland-scanner", "xkbcommon", "xkeysym", @@ -5211,7 +5247,7 @@ source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5#5a3007de dependencies = [ "libc", "raw-window-handle", - "smithay-client-toolkit 0.19.2", + "smithay-client-toolkit", "wayland-backend", ] @@ -5263,7 +5299,7 @@ dependencies = [ "objc", "raw-window-handle", "redox_syscall 0.4.1", - "rustix 0.38.37", + "rustix 0.38.38", "tiny-xlib", "wasm-bindgen", "wayland-backend", @@ -5339,19 +5375,19 @@ checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca" [[package]] name = "svgtypes" -version = "0.13.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e44e288cd960318917cbd540340968b90becc8bc81f171345d706e7a89d9d70" +checksum = "794de53cc48eaabeed0ab6a3404a65f40b3e38c067e4435883a65d2aa4ca000e" dependencies = [ - "kurbo", - "siphasher", + "kurbo 0.11.1", + "siphasher 1.0.1", ] [[package]] name = "swash" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93cdc334a50fcc2aa3f04761af3b28196280a6aaadb1ef11215c478ae32615ac" +checksum = "cbd59f3f359ddd2c95af4758c18270eddd9c730dde98598023cdabff472c2ca2" dependencies = [ "skrifa", "yazi", @@ -5371,9 +5407,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" dependencies = [ "proc-macro2", "quote", @@ -5388,7 +5424,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -5413,9 +5449,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" dependencies = [ "filetime", "libc", @@ -5424,14 +5460,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand 2.1.1", "once_cell", - "rustix 0.38.37", + "rustix 0.38.38", "windows-sys 0.59.0", ] @@ -5446,22 +5482,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -5551,7 +5587,7 @@ checksum = "1d52f22673960ad13af14ff4025997312def1223bfa7c8e4949d099e6b3d5d1c" dependencies = [ "as-raw-xcb-connection", "ctor-lite", - "libloading 0.8.5", + "libloading", "pkg-config", "tracing", ] @@ -5583,9 +5619,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" dependencies = [ "backtrace", "bytes", @@ -5607,7 +5643,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -5649,13 +5685,13 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.21" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap", "toml_datetime", - "winnow 0.6.18", + "winnow 0.6.20", ] [[package]] @@ -5677,7 +5713,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -5697,7 +5733,7 @@ dependencies = [ "chrono", "libc", "log", - "objc2 0.5.2", + "objc2", "objc2-foundation", "once_cell", "scopeguard", @@ -5719,9 +5755,9 @@ checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" [[package]] name = "ttf-parser" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" +checksum = "5902c5d130972a0000f60860bfbf46f7ca3db5391eddfedd1b8728bd9dc96c0e" [[package]] name = "type-map" @@ -5729,7 +5765,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f" dependencies = [ - "rustc-hash", + "rustc-hash 1.1.0", ] [[package]] @@ -5770,24 +5806,15 @@ dependencies = [ [[package]] name = "unicase" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] +checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-bidi-mirroring" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-bidi-mirroring" @@ -5795,12 +5822,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" -[[package]] -name = "unicode-ccc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" - [[package]] name = "unicode-ccc" version = "0.2.0" @@ -5830,9 +5851,9 @@ dependencies = [ [[package]] name = "unicode-properties" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524" +checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" [[package]] name = "unicode-script" @@ -5889,64 +5910,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] -name = "usvg" -version = "0.37.0" +name = "ustr" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b0a51b72ab80ca511d126b77feeeb4fb1e972764653e61feac30adc161a756" +checksum = "18b19e258aa08450f93369cf56dd78063586adf19e92a75b338a800f799a0208" dependencies = [ - "base64 0.21.7", - "log", - "pico-args", - "usvg-parser", - "usvg-text-layout", - "usvg-tree", - "xmlwriter", + "ahash", + "byteorder", + "lazy_static", + "parking_lot 0.12.3", + "serde", ] [[package]] -name = "usvg-parser" -version = "0.37.0" +name = "usvg" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd4e3c291f45d152929a31f0f6c819245e2921bfd01e7bd91201a9af39a2bdc" +checksum = "b84ea542ae85c715f07b082438a4231c3760539d902e11d093847a0b22963032" dependencies = [ + "base64 0.22.1", "data-url", "flate2", + "fontdb 0.18.0", "imagesize", - "kurbo", + "kurbo 0.11.1", "log", - "roxmltree 0.19.0", + "pico-args", + "roxmltree", + "rustybuzz", "simplecss", - "siphasher", - "svgtypes", - "usvg-tree", -] - -[[package]] -name = "usvg-text-layout" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d383a3965de199d7f96d4e11a44dd859f46e86de7f3dca9a39bf82605da0a37c" -dependencies = [ - "fontdb", - "kurbo", - "log", - "rustybuzz 0.12.1", - "unicode-bidi", - "unicode-script", - "unicode-vo", - "usvg-tree", -] - -[[package]] -name = "usvg-tree" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee3d202ebdb97a6215604b8f5b4d6ef9024efd623cf2e373a6416ba976ec7d3" -dependencies = [ - "rctree", + "siphasher 1.0.1", "strict-num", "svgtypes", "tiny-skia-path", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "xmlwriter", ] [[package]] @@ -5969,9 +5969,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" [[package]] name = "uzers" @@ -6049,9 +6049,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", @@ -6060,24 +6060,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -6087,9 +6087,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6097,22 +6097,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasm-timer" @@ -6137,7 +6137,7 @@ checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.37", + "rustix 0.38.38", "scoped-tls", "smallvec", "wayland-sys", @@ -6145,12 +6145,12 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.6" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d" +checksum = "b66249d3fc69f76fd74c82cc319300faa554e9d865dab1f7cd66cc20db10b280" dependencies = [ "bitflags 2.6.0", - "rustix 0.38.37", + "rustix 0.38.38", "wayland-backend", "wayland-scanner", ] @@ -6168,32 +6168,20 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.31.6" +version = "0.31.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a94697e66e76c85923b0d28a0c251e8f0666f58fc47d316c0f4da6da75d37cb" +checksum = "32b08bc3aafdb0035e7fe0fdf17ba0c09c268732707dca4ae098f60cb28c9e4c" dependencies = [ - "rustix 0.38.37", + "rustix 0.38.38", "wayland-client", "xcursor", ] [[package]] name = "wayland-protocols" -version = "0.31.2" +version = "0.32.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols" -version = "0.32.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0" +checksum = "7cd0ade57c4e6e9a8952741325c30bf82f4246885dca8bf561898b86d0c1f58e" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -6203,40 +6191,27 @@ dependencies = [ [[package]] name = "wayland-protocols-plasma" -version = "0.2.0" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +checksum = "9b31cab548ee68c7eb155517f2212049dc151f7cd7910c2b66abfd31c3ee12bd" dependencies = [ "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.31.2", + "wayland-protocols", "wayland-scanner", ] [[package]] name = "wayland-protocols-wlr" -version = "0.2.0" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +checksum = "782e12f6cd923c3c316130d56205ebab53f55d6666b7faddfad36cecaeeb4022" dependencies = [ "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.31.2", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-wlr" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad87b5fd1b1d3ca2f792df8f686a2a11e3fe1077b71096f7a175ab699f89109" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-protocols 0.32.4", + "wayland-protocols", "wayland-scanner", ] @@ -6265,9 +6240,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -6275,9 +6250,9 @@ dependencies = [ [[package]] name = "web-time" -version = "0.2.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -6291,12 +6266,13 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d1c4ba43f80542cf63a0a6ed3134629ae73e8ab51e4b765a67f3aa062eb433" dependencies = [ "arrayvec 0.7.6", - "cfg-if", "cfg_aliases 0.1.1", + "document-features", "js-sys", "log", "naga", @@ -6315,14 +6291,15 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0348c840d1051b8e86c3bcd31206080c5e71e5933dabd79be1ce732b0b2f089a" dependencies = [ "arrayvec 0.7.6", "bit-vec", "bitflags 2.6.0", "cfg_aliases 0.1.1", - "codespan-reporting", + "document-features", "indexmap", "log", "naga", @@ -6330,18 +6307,18 @@ dependencies = [ "parking_lot 0.12.3", "profiling", "raw-window-handle", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "thiserror", - "web-sys", "wgpu-hal", "wgpu-types", ] [[package]] name = "wgpu-hal" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f" dependencies = [ "android_system_properties", "arrayvec 0.7.6", @@ -6361,10 +6338,11 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.5", + "libloading", "log", "metal", "naga", + "ndk-sys 0.5.0+25.2.9519653", "objc", "once_cell", "parking_lot 0.12.3", @@ -6372,7 +6350,7 @@ dependencies = [ "range-alloc", "raw-window-handle", "renderdoc-sys", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "thiserror", "wasm-bindgen", @@ -6383,8 +6361,9 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.19.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc9d91f0e2c4b51434dfa6db77846f2793149d8e73f800fa2e41f52b8eac3c5d" dependencies = [ "bitflags 2.6.0", "js-sys", @@ -6431,7 +6410,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "window_clipboard" version = "0.4.1" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13#a83bf83784276aaa882ef13555295a2ad9edd265" dependencies = [ "clipboard-win", "clipboard_macos", @@ -6443,17 +6422,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-implement 0.48.0", - "windows-interface 0.48.0", - "windows-targets 0.48.5", -] - [[package]] name = "windows" version = "0.52.0" @@ -6464,6 +6432,18 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +dependencies = [ + "windows-core 0.54.0", + "windows-implement 0.53.0", + "windows-interface 0.53.0", + "windows-targets 0.52.6", +] + [[package]] name = "windows" version = "0.56.0" @@ -6483,6 +6463,16 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-core" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + [[package]] name = "windows-core" version = "0.56.0" @@ -6497,13 +6487,13 @@ dependencies = [ [[package]] name = "windows-implement" -version = "0.48.0" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" +checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.85", ] [[package]] @@ -6514,18 +6504,18 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] name = "windows-interface" -version = "0.48.0" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" +checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.85", ] [[package]] @@ -6536,7 +6526,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -6764,46 +6754,50 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" -version = "0.29.10" -source = "git+https://github.com/pop-os/winit.git?branch=winit-0.29#bdc66109acc85c912264c9e4b864520345bdb45f" +version = "0.30.5" +source = "git+https://github.com/pop-os/winit.git?tag=iced-xdg-surface-0.13#1cc02bdab141072eaabad639d74b032fd0fcc62e" dependencies = [ "ahash", "android-activity", "atomic-waker", "bitflags 2.6.0", + "block2", "bytemuck", - "calloop 0.12.4", - "cfg_aliases 0.1.1", + "calloop", + "cfg_aliases 0.2.1", + "concurrent-queue", "core-foundation", "core-graphics", "cursor-icon", - "icrate 0.0.4", + "dpi", "js-sys", "libc", - "log", "memmap2 0.9.5", "ndk", - "ndk-sys", - "objc2 0.4.1", - "once_cell", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "objc2-ui-kit", "orbclient", "percent-encoding", + "pin-project", "raw-window-handle", - "redox_syscall 0.3.5", - "rustix 0.38.37", + "redox_syscall 0.4.1", + "rustix 0.38.38", "sctk-adwaita", - "smithay-client-toolkit 0.18.1", + "smithay-client-toolkit", "smol_str", + "tracing", "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", "wayland-backend", "wayland-client", - "wayland-protocols 0.31.2", + "wayland-protocols", "wayland-protocols-plasma", "web-sys", "web-time", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "x11-dl", "x11rb", "xkbcommon-dl", @@ -6820,9 +6814,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] @@ -6859,9 +6853,9 @@ dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading 0.8.5", + "libloading", "once_cell", - "rustix 0.38.37", + "rustix 0.38.38", "x11rb-protocol", ] @@ -6879,7 +6873,7 @@ checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", "linux-raw-sys 0.4.14", - "rustix 0.38.37", + "rustix 0.38.38", ] [[package]] @@ -6963,10 +6957,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] -name = "xxhash-rust" -version = "0.8.12" +name = "yansi" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" [[package]] name = "yazi" @@ -6994,7 +6988,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "synstructure", ] @@ -7005,15 +6999,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" dependencies = [ "async-broadcast 0.5.1", - "async-executor", - "async-fs 1.6.0", - "async-io 1.13.0", - "async-lock 2.8.0", "async-process 1.8.1", "async-recursion", - "async-task", "async-trait", - "blocking", "byteorder", "derivative", "enumflags2", @@ -7048,7 +7036,7 @@ checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast 0.7.1", "async-executor", - "async-fs 2.1.2", + "async-fs", "async-io 2.3.4", "async-lock 3.4.0", "async-process 2.3.0", @@ -7102,7 +7090,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "zvariant_utils 2.1.0", ] @@ -7152,7 +7140,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -7172,7 +7160,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "synstructure", ] @@ -7193,7 +7181,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -7215,7 +7203,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] [[package]] @@ -7348,7 +7336,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", "zvariant_utils 2.1.0", ] @@ -7371,5 +7359,5 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.85", ] diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix index a68f25af43aa..cfe98f4288fd 100644 --- a/pkgs/by-name/co/cosmic-term/package.nix +++ b/pkgs/by-name/co/cosmic-term/package.nix @@ -18,34 +18,32 @@ rustPlatform.buildRustPackage rec { pname = "cosmic-term"; - version = "1.0.0-alpha.2"; + version = "1.0.0-alpha.3"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-term"; rev = "epoch-${version}"; - hash = "sha256-rMaHWtT5bhjdji3dAnfyCm7lMXDWjIBVh4ZUwApZphU="; + hash = "sha256-4++wCyRVIodWdlrvK2vMcHGoY4BctnrkopWC6dZvhMk="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "accesskit-0.12.2" = "sha256-1UwgRyUe0PQrZrpS7574oNLi13fg5HpgILtZGW6JNtQ="; + "accesskit-0.16.0" = "sha256-yeBzocXxuvHmuPGMRebbsYSKSvN+8sUsmaSKlQDpW4w="; "alacritty_terminal-0.24.1-dev" = "sha256-aVB1CNOLjNh6AtvdbomODNrk00Md8yz8QzldzvDo1LI="; "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; - "clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk="; - "cosmic-config-0.1.0" = "sha256-gXrMEoAN+7nYAEcs4w6wROhQTjMCxkGn+muJutktLyk="; - "cosmic-files-0.1.0" = "sha256-rBR6IPpMgOltyaRPPZ5V8tYH/xtQphgrPWci/kvlgEg="; + "clipboard_macos-0.1.0" = "sha256-tovB4fjPVVRY8LKn5albMzskFQ+1W5ul4jT5RXx9gKE="; + "cosmic-config-0.1.0" = "sha256-u/qzhRvP+HsfCfxl3aM/L4ZwmZ/Zorrlq5l9UemfoRg="; + "cosmic-files-0.1.0" = "sha256-XNUeDj5Dl8jXJRERP2F4Yx2BPV2b4bwzMNCbIH3FJdA="; "cosmic-text-0.12.1" = "sha256-u2Tw+XhpIKeFg8Wgru/sjGw6GUZ2m50ZDmRBJ1IM66w="; - "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4="; - "filetime-0.2.24" = "sha256-lU7dPotdnmyleS2B75SmDab7qJfEzmJnHPF18CN/Y98="; + "dpi-0.1.1" = "sha256-whi05/2vc3s5eAJTZ9TzVfGQ/EnfPr0S4PZZmbiYio0="; "fs_extra-1.3.0" = "sha256-ftg5oanoqhipPnbUsqnA4aZcyHqn9XsINJdrStIPLoE="; - "glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg="; + "iced_glyphon-0.6.0" = "sha256-u1vnsOjP8npQ57NNSikotuHxpi4Mp/rV9038vAgCsfQ="; "smithay-clipboard-0.8.0" = "sha256-4InFXm0ahrqFrtNLeqIuE3yeOpxKZJZx+Bc0yQDtv34="; "softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg="; "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI="; "trash-5.1.1" = "sha256-So8rQ8gLF5o79Az396/CQY/veNo4ticxYpYZPfMJyjQ="; - "winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4="; }; }; From bab7ef307cb11e2d2dc9b9ddf2d1de68f220ed45 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Tue, 10 Sep 2024 17:22:09 +0800 Subject: [PATCH 318/617] pythonImportsCheckHook: lint with ShellCheck --- .../python/hooks/python-imports-check-hook.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh index 2788a947fe95..c3c758d6a902 100644 --- a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh @@ -1,23 +1,28 @@ +# shellcheck shell=bash + # Setup hook for checking whether Python imports succeed echo "Sourcing python-imports-check-hook.sh" pythonImportsCheckPhase() { echo "Executing pythonImportsCheckPhase" - if [ -n "${pythonImportsCheck[*]-}" ]; then + if [[ -n "${pythonImportsCheck[*]-}" ]]; then echo "Check whether the following modules can be imported: ${pythonImportsCheck[*]}" # shellcheck disable=SC2154 pythonImportsCheckOutput="$out" - if [ -n "${python-}" ]; then + if [[ -n "${python-}" ]]; then echo "Using python specific output \$python for imports check" pythonImportsCheckOutput=$python fi export PYTHONPATH="$pythonImportsCheckOutput/@pythonSitePackages@:$PYTHONPATH" + # Python modules and namespaces names are Python identifiers, which must not contain spaces. + # See https://docs.python.org/3/reference/lexical_analysis.html + # shellcheck disable=SC2048,SC2086 (cd "$pythonImportsCheckOutput" && @pythonCheckInterpreter@ -c 'import sys; import importlib; list(map(lambda mod: importlib.import_module(mod), sys.argv[1:]))' ${pythonImportsCheck[*]}) fi } -if [ -z "${dontUsePythonImportsCheck-}" ]; then +if [[ -z "${dontUsePythonImportsCheck-}" ]]; then echo "Using pythonImportsCheckPhase" appendToVar preDistPhases pythonImportsCheckPhase fi From ccb418b69938ebdac9337baa9cdceeb43b3497cd Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Mon, 7 Oct 2024 07:42:31 +0800 Subject: [PATCH 319/617] pythonNamespacesHook: lint with ShellCheck --- .../python/hooks/python-namespaces-hook.sh | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh b/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh index 5c5b840e05c3..add56f5b6413 100644 --- a/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh @@ -1,20 +1,26 @@ # Clean up __init__.py's found in namespace directories +# shellcheck shell=bash + echo "Sourcing python-namespaces-hook" pythonNamespacesHook() { echo "Executing pythonNamespacesHook" - for namespace in ${pythonNamespaces[@]}; do + # Python namespaces names are Python identifiers, which must not contain spaces. + # See https://docs.python.org/3/reference/lexical_analysis.html + # shellcheck disable=SC2048 + for namespace in ${pythonNamespaces[*]-}; do echo "Enforcing PEP420 namespace: ${namespace}" # split namespace into segments. "azure.mgmt" -> "azure mgmt" - IFS='.' read -ra pathSegments <<<$namespace + IFS='.' read -ra pathSegments <<<"$namespace" + # shellcheck disable=SC2154 constructedPath=$out/@pythonSitePackages@ # Need to remove the __init__.py at each namespace level # E.g `azure/__init__.py` and `azure/mgmt/__init__.py` # The __pycache__ entry also needs to be removed - for pathSegment in ${pathSegments[@]}; do + for pathSegment in "${pathSegments[@]}"; do constructedPath=${constructedPath}/${pathSegment} pathToRemove=${constructedPath}/__init__.py pycachePath=${constructedPath}/__pycache__/ @@ -30,9 +36,9 @@ pythonNamespacesHook() { # event of a "meta-package" package, which will just install # other packages, but not produce anything in site-packages # besides meta information - if [ -d "${constructedPath}/../" -a -z ${dontRemovePth-} ]; then + if [[ -d "${constructedPath}/../" ]] && [[ -z "${dontRemovePth-}" ]]; then # .pth files are located in the parent directory of a module - @findutils@/bin/find ${constructedPath}/../ -name '*-nspkg.pth' -exec rm -v "{}" + + @findutils@/bin/find "${constructedPath}/../" -name '*-nspkg.pth' -exec rm -v "{}" + fi # remove __pycache__/ entry, can be interpreter specific. E.g. __init__.cpython-38.pyc @@ -46,6 +52,6 @@ pythonNamespacesHook() { echo "Finished executing pythonNamespacesHook" } -if [ -z "${dontUsePythonNamespacesHook-}" -a -n "${pythonNamespaces-}" ]; then +if [[ -z "${dontUsePythonNamespacesHook-}" ]] && [[ -n "${pythonNamespaces-}" ]]; then postFixupHooks+=(pythonNamespacesHook) fi From e4f2f9dd22db433d54c9c3e25fc6cee6c3471d09 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Mon, 7 Oct 2024 07:46:08 +0800 Subject: [PATCH 320/617] pythonOutputDistHook: lint with ShellCheck --- .../interpreters/python/hooks/python-output-dist-hook.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh b/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh index 8e4a15dc277f..be54b546cadb 100644 --- a/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh @@ -1,9 +1,12 @@ # Setup hook for storing dist folder (wheels/sdists) in a separate output +# shellcheck shell=bash + echo "Sourcing python-catch-conflicts-hook.sh" pythonOutputDistPhase() { echo "Executing pythonOutputDistPhase" if [[ -d dist ]]; then + # shellcheck disable=SC2154 mv "dist" "$dist" else cat >&2 < Date: Mon, 7 Oct 2024 07:58:17 +0800 Subject: [PATCH 321/617] pythonRelaxDepsHook: handle attributes `__structuredAttrs`-agnostically Make the interation across pythonRelaxDeps and pythonRemoveDeps work regardless of __structuredAttrs. --- .../interpreters/python/hooks/python-relax-deps-hook.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh b/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh index 7da5c0b0ac27..cccb49313469 100644 --- a/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh @@ -42,13 +42,13 @@ _pythonRelaxDeps() { local -r metadata_file="$1" - if [[ -z "${pythonRelaxDeps:-}" ]] || [[ "$pythonRelaxDeps" == 0 ]]; then + if [[ -z "${pythonRelaxDeps[*]-}" ]] || [[ "$pythonRelaxDeps" == 0 ]]; then return elif [[ "$pythonRelaxDeps" == 1 ]]; then sed -i "$metadata_file" -r \ -e 's/(Requires-Dist: [a-zA-Z0-9_.-]+\s*(\[[^]]+\])?)[^;]*(;.*)?/\1\3/' else - for dep in $pythonRelaxDeps; do + for dep in ${pythonRelaxDeps[*]}; do sed -i "$metadata_file" -r \ -e "s/(Requires-Dist: $dep\s*(\[[^]]+\])?)[^;]*(;.*)?/\1\3/i" done @@ -58,13 +58,13 @@ _pythonRelaxDeps() { _pythonRemoveDeps() { local -r metadata_file="$1" - if [[ -z "${pythonRemoveDeps:-}" ]] || [[ "$pythonRemoveDeps" == 0 ]]; then + if [[ -z "${pythonRemoveDeps[*]-}" ]] || [[ "$pythonRemoveDeps" == 0 ]]; then return elif [[ "$pythonRemoveDeps" == 1 ]]; then sed -i "$metadata_file" \ -e '/Requires-Dist:.*/d' else - for dep in $pythonRemoveDeps; do + for dep in ${pythonRemoveDeps[*]-}; do sed -i "$metadata_file" \ -e "/Requires-Dist: $dep/d" done From 29c08adae171f1c273a0a15c00068205a9965bf2 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Mon, 7 Oct 2024 08:07:09 +0800 Subject: [PATCH 322/617] pythonRelaxDepsHook: lint with ShellCheck Ignore SC2164 at this moment, as it will be gone when adding `set -e`. --- .../interpreters/python/hooks/python-relax-deps-hook.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh b/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh index cccb49313469..9b5bd6f37ca9 100644 --- a/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh @@ -48,6 +48,7 @@ _pythonRelaxDeps() { sed -i "$metadata_file" -r \ -e 's/(Requires-Dist: [a-zA-Z0-9_.-]+\s*(\[[^]]+\])?)[^;]*(;.*)?/\1\3/' else + # shellcheck disable=SC2048 for dep in ${pythonRelaxDeps[*]}; do sed -i "$metadata_file" -r \ -e "s/(Requires-Dist: $dep\s*(\[[^]]+\])?)[^;]*(;.*)?/\1\3/i" @@ -64,6 +65,7 @@ _pythonRemoveDeps() { sed -i "$metadata_file" \ -e '/Requires-Dist:.*/d' else + # shellcheck disable=SC2048 for dep in ${pythonRemoveDeps[*]-}; do sed -i "$metadata_file" \ -e "/Requires-Dist: $dep/d" @@ -86,11 +88,14 @@ pythonRelaxDepsHook() { rm -rf "$wheel" # Using no quotes on purpose since we need to expand the glob from `$metadata_file` + # shellcheck disable=SC2086 _pythonRelaxDeps $metadata_file + # shellcheck disable=SC2086 _pythonRemoveDeps $metadata_file if (("${NIX_DEBUG:-0}" >= 1)); then echo "pythonRelaxDepsHook: resulting METADATA for '$wheel':" + # shellcheck disable=SC2086 cat $metadata_file fi From 65293f424779e4df5d892e955dd03cf8d0ed84b0 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Mon, 7 Oct 2024 08:15:32 +0800 Subject: [PATCH 323/617] pythonRemoveTestDirHook: lint with ShellCheck --- .../python/hooks/python-remove-tests-dir-hook.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/hooks/python-remove-tests-dir-hook.sh b/pkgs/development/interpreters/python/hooks/python-remove-tests-dir-hook.sh index ad9e3c07cf24..43c991b74469 100644 --- a/pkgs/development/interpreters/python/hooks/python-remove-tests-dir-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-remove-tests-dir-hook.sh @@ -1,11 +1,14 @@ # Clean up top-level tests directory in site-package installation. +# shellcheck shell=bash + echo "Sourcing python-remove-tests-dir-hook" pythonRemoveTestsDir() { echo "Executing pythonRemoveTestsDir" - rm -rf $out/@pythonSitePackages@/tests - rm -rf $out/@pythonSitePackages@/test + # shellcheck disable=SC2154 + rm -rf "$out/@pythonSitePackages@/tests" + rm -rf "$out/@pythonSitePackages@/test" echo "Finished executing pythonRemoveTestsDir" } From e32457af0c9de65a4d3f57afd8b4c238da65d07a Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Mon, 28 Oct 2024 03:54:02 +0800 Subject: [PATCH 324/617] setuptoolsRustHook: lint with ShellCheck --- .../interpreters/python/hooks/setuptools-rust-hook.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/python/hooks/setuptools-rust-hook.sh b/pkgs/development/interpreters/python/hooks/setuptools-rust-hook.sh index 917c19ef9b31..5a0916f8acc4 100644 --- a/pkgs/development/interpreters/python/hooks/setuptools-rust-hook.sh +++ b/pkgs/development/interpreters/python/hooks/setuptools-rust-hook.sh @@ -1,3 +1,5 @@ +# shellcheck shell=bash + echo "Sourcing setuptools-rust-hook" setuptoolsRustSetup() { From 6597b74fea10a79f09ef3fbcf02620e238992845 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Tue, 29 Oct 2024 15:02:27 +0800 Subject: [PATCH 325/617] pypaBuildHook.tests: modernize --- .../interpreters/python/hooks/pypa-build-hook-test.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/python/hooks/pypa-build-hook-test.nix b/pkgs/development/interpreters/python/hooks/pypa-build-hook-test.nix index 4153c21ca4f9..f862429d3987 100644 --- a/pkgs/development/interpreters/python/hooks/pypa-build-hook-test.nix +++ b/pkgs/development/interpreters/python/hooks/pypa-build-hook-test.nix @@ -10,9 +10,9 @@ ''; # the source of the example project projectSource = runCommand "my-project-source" {} '' - mkdir -p $out/src + mkdir -p $out/src/my_project cp ${pyprojectToml} $out/pyproject.toml - touch $out/src/__init__.py + touch $out/src/my_project/__init__.py ''; in # this build must never triger conflicts @@ -20,11 +20,13 @@ pname = "dont-propagate-conflicting-deps"; version = "0.0.0"; src = projectSource; - format = "pyproject"; - propagatedBuildInputs = [ + pyproject = true; + dependencies = [ # At least one dependency of `build` should be included here to # keep the test meaningful (mkConflict pythonOnBuildForHost.pkgs.tomli) + ]; + build-system = [ # setuptools is also needed to build the example project pythonOnBuildForHost.pkgs.setuptools ]; From 75943b097172cdeae16c934471dafd28a9bf23aa Mon Sep 17 00:00:00 2001 From: Tyler Langlois Date: Mon, 4 Nov 2024 22:25:49 -0700 Subject: [PATCH 326/617] linuxPackages.isgx: mark as broken for kernels >= 6.4 --- pkgs/os-specific/linux/isgx/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/isgx/default.nix b/pkgs/os-specific/linux/isgx/default.nix index c49a0a7b913d..73a373c1f789 100644 --- a/pkgs/os-specific/linux/isgx/default.nix +++ b/pkgs/os-specific/linux/isgx/default.nix @@ -41,5 +41,9 @@ stdenv.mkDerivation rec { license = with licenses; [ bsd3 /* OR */ gpl2Only ]; maintainers = [ ]; platforms = [ "x86_64-linux" ]; + # This kernel module is now in mainline so newer kernels should + # use that rather than this out-of-tree version (officially + # deprecated by Intel) + broken = kernel.kernelAtLeast "6.4"; }; } From b048be052ccff215e125b9fbef825f296dcbe599 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 5 Nov 2024 08:11:12 +0100 Subject: [PATCH 327/617] Reapply "less: Fix withSecure regression" This reverts commit 6df0b10df6903be10245355ef35dd8435084bd95. This change was originally merged as PR #352298 but it got moved to staging here. --- pkgs/by-name/le/less/package.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/by-name/le/less/package.nix b/pkgs/by-name/le/less/package.nix index ba57f5460ccd..452944aa9a75 100644 --- a/pkgs/by-name/le/less/package.nix +++ b/pkgs/by-name/le/less/package.nix @@ -1,6 +1,8 @@ { lib, fetchurl, + fetchpatch, + autoreconfHook, ncurses, pcre2, stdenv, @@ -22,6 +24,23 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-KBn1VWTYbVQqu+yv2C/2HoGaPuyWf6o2zT5o8VlqRLg="; }; + patches = [ + (fetchpatch { + # Fix configure parameters --with-secure=no and --without-secure. + url = "https://github.com/gwsw/less/commit/8fff6c56bfc833528b31ebdaee871f65fbe342b1.patch"; + hash = "sha256-XV5XufivNWWLGeIpaP04YQPWcxIUKYYEINdT+eEx+WA="; + includes = [ + "configure.ac" + ]; + }) + ]; + + # Need `autoreconfHook` since we patch `configure.ac`. + # TODO: Remove the `configure.ac` patch and `autoreconfHook` next release + nativeBuildInputs = [ + autoreconfHook + ]; + buildInputs = [ ncurses pcre2 From 00a0b29d983df98bed781ae4f531ea6fc41d4d86 Mon Sep 17 00:00:00 2001 From: zi3m5f <113244000+zi3m5f@users.noreply.github.com> Date: Tue, 5 Nov 2024 09:39:30 +0100 Subject: [PATCH 328/617] lunatask: nixfmt --- pkgs/applications/misc/lunatask/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/lunatask/default.nix b/pkgs/applications/misc/lunatask/default.nix index 82b30866f842..712105afc579 100644 --- a/pkgs/applications/misc/lunatask/default.nix +++ b/pkgs/applications/misc/lunatask/default.nix @@ -1,4 +1,8 @@ -{ lib, appimageTools, fetchurl }: +{ + lib, + appimageTools, + fetchurl, +}: let version = "2.0.11"; From 9de71c61f5e87e35c0017a0dcc90a47977ecf452 Mon Sep 17 00:00:00 2001 From: zi3m5f <113244000+zi3m5f@users.noreply.github.com> Date: Tue, 5 Nov 2024 09:41:09 +0100 Subject: [PATCH 329/617] lunatask: move to pkgs/by-name --- .../lunatask/default.nix => by-name/lu/lunatask/package.nix} | 0 pkgs/{applications/misc => by-name/lu}/lunatask/update.py | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{applications/misc/lunatask/default.nix => by-name/lu/lunatask/package.nix} (100%) rename pkgs/{applications/misc => by-name/lu}/lunatask/update.py (100%) diff --git a/pkgs/applications/misc/lunatask/default.nix b/pkgs/by-name/lu/lunatask/package.nix similarity index 100% rename from pkgs/applications/misc/lunatask/default.nix rename to pkgs/by-name/lu/lunatask/package.nix diff --git a/pkgs/applications/misc/lunatask/update.py b/pkgs/by-name/lu/lunatask/update.py similarity index 100% rename from pkgs/applications/misc/lunatask/update.py rename to pkgs/by-name/lu/lunatask/update.py diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55968eed1355..237746d16f25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9113,8 +9113,6 @@ with pkgs; ltwheelconf = callPackage ../applications/misc/ltwheelconf { }; - lunatask = callPackage ../applications/misc/lunatask { }; - lvmsync = callPackage ../tools/backup/lvmsync { }; kapp = callPackage ../tools/networking/kapp { }; From 95e929663d5121d52ca2a631e11e3b385117bca9 Mon Sep 17 00:00:00 2001 From: zi3m5f <113244000+zi3m5f@users.noreply.github.com> Date: Tue, 5 Nov 2024 09:46:15 +0100 Subject: [PATCH 330/617] lunatask: 2.0.11 -> 2.0.12 --- pkgs/by-name/lu/lunatask/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/lunatask/package.nix b/pkgs/by-name/lu/lunatask/package.nix index 712105afc579..75640de9452b 100644 --- a/pkgs/by-name/lu/lunatask/package.nix +++ b/pkgs/by-name/lu/lunatask/package.nix @@ -5,12 +5,12 @@ }: let - version = "2.0.11"; + version = "2.0.12"; pname = "lunatask"; src = fetchurl { url = "https://lunatask.app/download/Lunatask-${version}.AppImage"; - sha256 = "sha256-aGU8WsC3jLg8xOF7HzW6oGxizBa3afiT+qS1oyi1r7o="; + sha256 = "sha256-z1c3ACIRF8+iIy4ihEWqRDzalHyN5AvOdBxQG9sCXVs="; }; appimageContents = appimageTools.extractType2 { From 674769e6790a3a8234e13454896baea27a82695b Mon Sep 17 00:00:00 2001 From: zi3m5f <113244000+zi3m5f@users.noreply.github.com> Date: Tue, 5 Nov 2024 11:10:29 +0100 Subject: [PATCH 331/617] lunatask: small improvements --- pkgs/by-name/lu/lunatask/package.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/lu/lunatask/package.nix b/pkgs/by-name/lu/lunatask/package.nix index 75640de9452b..6955e3b33633 100644 --- a/pkgs/by-name/lu/lunatask/package.nix +++ b/pkgs/by-name/lu/lunatask/package.nix @@ -10,27 +10,27 @@ let src = fetchurl { url = "https://lunatask.app/download/Lunatask-${version}.AppImage"; - sha256 = "sha256-z1c3ACIRF8+iIy4ihEWqRDzalHyN5AvOdBxQG9sCXVs="; + hash = "sha256-z1c3ACIRF8+iIy4ihEWqRDzalHyN5AvOdBxQG9sCXVs="; }; - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; in -appimageTools.wrapType2 rec { +appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop - install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + install -m 444 -D -t $out/share/applications ${appimageContents}/lunatask.desktop + install -m 444 -D -t $out/share/icons/hicolor/512x512/apps ${appimageContents}/lunatask.png + substituteInPlace $out/share/applications/lunatask.desktop \ + --replace-fail 'Exec=AppRun' 'Exec=lunatask' ''; passthru.updateScript = ./update.py; - meta = with lib; { + meta = { description = "All-in-one encrypted todo list, notebook, habit and mood tracker, pomodoro timer, and journaling app"; longDescription = '' Lunatask is an all-in-one encrypted todo list, notebook, habit and mood tracker, pomodoro timer, and journaling app. It remembers stuff for you and keeps track of your mental health. @@ -38,9 +38,9 @@ appimageTools.wrapType2 rec { homepage = "https://lunatask.app"; downloadPage = "https://lunatask.app/download"; changelog = "https://lunatask.app/releases/${version}"; - license = licenses.unfree; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ henkery ]; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ henkery ]; platforms = [ "x86_64-linux" ]; mainProgram = "lunatask"; }; From 7d1abc0fc5a6c07c1b8942f92c377a016be34174 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Tue, 5 Nov 2024 11:00:12 +0000 Subject: [PATCH 332/617] musescore: apple-sdk migration, removed portaudio override --- pkgs/applications/audio/musescore/default.nix | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 6f28bf98a1b1..100034b998e4 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -31,24 +31,10 @@ , qtnetworkauth , qttools , nixosTests -, darwin +, apple-sdk_11 }: -let - stdenv' = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; - # portaudio propagates Darwin frameworks. Rebuild it using the 11.0 stdenv - # from Qt and the 11.0 SDK frameworks. - portaudio' = if stdenv.hostPlatform.isDarwin then portaudio.override { - stdenv = stdenv'; - inherit (darwin.apple_sdk_11_0.frameworks) - AudioUnit - AudioToolbox - CoreAudio - CoreServices - Carbon - ; - } else portaudio; -in stdenv'.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "musescore"; version = "4.4.2"; @@ -129,7 +115,7 @@ in stdenv'.mkDerivation (finalAttrs: { libpulseaudio libsndfile libvorbis - portaudio' + portaudio portmidi flac libopusenc @@ -145,7 +131,7 @@ in stdenv'.mkDerivation (finalAttrs: { alsa-lib qtwayland ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Cocoa + apple-sdk_11 ]; postInstall = '' From 82cfe011c4aff66538c60aac5648ff05ab7bdd31 Mon Sep 17 00:00:00 2001 From: zi3m5f <113244000+zi3m5f@users.noreply.github.com> Date: Tue, 5 Nov 2024 12:04:05 +0100 Subject: [PATCH 333/617] lunatask: adopt https://github.com/NixOS/nixpkgs/pull/353792#issuecomment-2456863125 --- pkgs/by-name/lu/lunatask/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/lu/lunatask/package.nix b/pkgs/by-name/lu/lunatask/package.nix index 6955e3b33633..92277537961a 100644 --- a/pkgs/by-name/lu/lunatask/package.nix +++ b/pkgs/by-name/lu/lunatask/package.nix @@ -40,7 +40,7 @@ appimageTools.wrapType2 { changelog = "https://lunatask.app/releases/${version}"; license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ henkery ]; + maintainers = with lib.maintainers; [ zi3m5f ]; platforms = [ "x86_64-linux" ]; mainProgram = "lunatask"; }; From c8df66973b396186ced7e81f0dd3e475bf77d3b8 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 3 Nov 2024 12:11:35 -0500 Subject: [PATCH 334/617] xcbuild: look in system toolchain for binaries on `/usr/bin` Dropping `/usr/bin` from the search path of `xcrun` breaks running system binaries from dev shells. This approach looks them up while avoiding the recursive `xcrun` issue. --- pkgs/by-name/xc/xcbuild/package.nix | 4 +- .../Use-system-toolchain-for-usr-bin.patch | 80 +++++++++++++++++++ 2 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/xc/xcbuild/patches/Use-system-toolchain-for-usr-bin.patch diff --git a/pkgs/by-name/xc/xcbuild/package.nix b/pkgs/by-name/xc/xcbuild/package.nix index 7b574aa91994..8b8571d4a039 100644 --- a/pkgs/by-name/xc/xcbuild/package.nix +++ b/pkgs/by-name/xc/xcbuild/package.nix @@ -80,8 +80,8 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # Add missing header for `abort` ./patches/includes.patch - # Prevent xcrun from recursively invoking itself - ./patches/Avoid-fork-bomb-when-searching-system-paths.patch + # Prevent xcrun from recursively invoking itself but still find native toolchain binaries + ./patches/Use-system-toolchain-for-usr-bin.patch ]; prePatch = '' diff --git a/pkgs/by-name/xc/xcbuild/patches/Use-system-toolchain-for-usr-bin.patch b/pkgs/by-name/xc/xcbuild/patches/Use-system-toolchain-for-usr-bin.patch new file mode 100644 index 000000000000..9e8314235709 --- /dev/null +++ b/pkgs/by-name/xc/xcbuild/patches/Use-system-toolchain-for-usr-bin.patch @@ -0,0 +1,80 @@ +diff --git a/Libraries/xcsdk/Tools/xcrun.cpp b/Libraries/xcsdk/Tools/xcrun.cpp +index 9d6d4576d7..73aabc3d42 100644 +--- a/Libraries/xcsdk/Tools/xcrun.cpp ++++ b/Libraries/xcsdk/Tools/xcrun.cpp +@@ -23,10 +23,14 @@ + #include + #include + ++#include ++ + using libutil::DefaultFilesystem; + using libutil::Filesystem; + using libutil::FSUtil; + ++#define SYSTEM_DEVELOPER_DIR "/private/var/select/developer_dir" ++ + class Options { + private: + ext::optional _help; +@@ -398,6 +402,8 @@ + fprintf(stderr, "\n"); + } + ++ std::unordered_map environment = processContext->environmentVariables(); ++ + /* + * Collect search paths for the tool. + * Can be in toolchains, target (if one is provided), developer root, +@@ -408,10 +414,42 @@ + executablePaths.insert(executablePaths.end(), defaultExecutablePaths.begin(), defaultExecutablePaths.end()); + + /* ++ * Remove `/usr/bin` from the search paths to avoid infinite recursions from stubs that try to invoke `xcrun`. ++ */ ++ const auto originalSize = executablePaths.size(); ++ auto result = executablePaths.erase( ++ std::remove(executablePaths.begin(), executablePaths.end(), "/usr/bin"), ++ executablePaths.end() ++ ); ++ ++ /* + * Find the tool to execute. + */ + ext::optional executable = filesystem->findExecutable(*options.tool(), executablePaths); + if (!executable) { ++ /* ++ * However, check for the system developer dir and look there if the binaries can’t be found in the store. ++ * This is done only if a binary is not found in the store to ensure those always take priority. ++ * Fixes https://github.com/NixOS/nixpkgs/issues/353875. ++ */ ++ std::vector toolchainPaths = { }; ++ if (executablePaths.size() < originalSize && filesystem->exists(SYSTEM_DEVELOPER_DIR)) { ++ auto linkTarget = filesystem->readSymbolicLinkCanonical(SYSTEM_DEVELOPER_DIR); ++ if (linkTarget) { ++ auto usrBinPath = FSUtil::NormalizePath(*linkTarget + "/usr/bin"); ++ if (filesystem->exists(usrBinPath)) { ++ toolchainPaths.push_back(usrBinPath); ++ } ++ auto toolchainUsrBinPath = FSUtil::NormalizePath(*linkTarget + "/Toolchains/XcodeDefault.xctoolchain/usr/bin"); ++ if (filesystem->exists(toolchainUsrBinPath)) { ++ toolchainPaths.push_back(toolchainUsrBinPath); ++ } ++ } ++ } ++ executable = filesystem->findExecutable(*options.tool(), toolchainPaths); ++ } ++ ++ if (!executable) { + fprintf(stderr, "error: tool '%s' not found\n", options.tool()->c_str()); + return 1; + } +@@ -428,8 +466,6 @@ + } else { + /* Run is the default. */ + +- std::unordered_map environment = processContext->environmentVariables(); +- + if (target != nullptr) { + /* + * Update effective environment to include the target path. From 7ae8a1e519de8d316830a73f119c2e19234d7a58 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 3 Nov 2024 12:11:35 -0500 Subject: [PATCH 335/617] xcbuild: suppress warnings for unknown keys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Newer SDKs have keys that xcbuild doesn’t recognize. These warnings generate a lot of noise, especially when `xcrun` is used in an interactive session, so suppress them. --- pkgs/by-name/xc/xcbuild/package.nix | 2 + ...ork-bomb-when-searching-system-paths.patch | 47 ------------------- .../Suppress-unknown-key-warnings.patch | 26 ++++++++++ 3 files changed, 28 insertions(+), 47 deletions(-) delete mode 100644 pkgs/by-name/xc/xcbuild/patches/Avoid-fork-bomb-when-searching-system-paths.patch create mode 100644 pkgs/by-name/xc/xcbuild/patches/Suppress-unknown-key-warnings.patch diff --git a/pkgs/by-name/xc/xcbuild/package.nix b/pkgs/by-name/xc/xcbuild/package.nix index 8b8571d4a039..fc5e79830664 100644 --- a/pkgs/by-name/xc/xcbuild/package.nix +++ b/pkgs/by-name/xc/xcbuild/package.nix @@ -82,6 +82,8 @@ stdenv.mkDerivation (finalAttrs: { ./patches/includes.patch # Prevent xcrun from recursively invoking itself but still find native toolchain binaries ./patches/Use-system-toolchain-for-usr-bin.patch + # Suppress warnings due to newer SDKs with unknown keys + ./patches/Suppress-unknown-key-warnings.patch ]; prePatch = '' diff --git a/pkgs/by-name/xc/xcbuild/patches/Avoid-fork-bomb-when-searching-system-paths.patch b/pkgs/by-name/xc/xcbuild/patches/Avoid-fork-bomb-when-searching-system-paths.patch deleted file mode 100644 index bad8621e4b8c..000000000000 --- a/pkgs/by-name/xc/xcbuild/patches/Avoid-fork-bomb-when-searching-system-paths.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/Libraries/xcsdk/Tools/xcrun.cpp b/Libraries/xcsdk/Tools/xcrun.cpp -index 9d6d4576d7..7400267c2b 100644 ---- a/Libraries/xcsdk/Tools/xcrun.cpp -+++ b/Libraries/xcsdk/Tools/xcrun.cpp -@@ -23,6 +23,8 @@ - #include - #include - -+#include -+ - using libutil::DefaultFilesystem; - using libutil::Filesystem; - using libutil::FSUtil; -@@ -398,6 +400,8 @@ - fprintf(stderr, "\n"); - } - -+ std::unordered_map environment = processContext->environmentVariables(); -+ - /* - * Collect search paths for the tool. - * Can be in toolchains, target (if one is provided), developer root, -@@ -408,6 +412,15 @@ - executablePaths.insert(executablePaths.end(), defaultExecutablePaths.begin(), defaultExecutablePaths.end()); - - /* -+ * Don’t look for tools in `/usr/bin` because it can cause an infinite recursion when `xcrun` finds a shim -+ * that tries to invoke `xcrun` to run the tool. -+ */ -+ executablePaths.erase( -+ std::remove(executablePaths.begin(), executablePaths.end(), "/usr/bin"), -+ executablePaths.end() -+ ); -+ -+ /* - * Find the tool to execute. - */ - ext::optional executable = filesystem->findExecutable(*options.tool(), executablePaths); -@@ -428,8 +441,6 @@ - } else { - /* Run is the default. */ - -- std::unordered_map environment = processContext->environmentVariables(); -- - if (target != nullptr) { - /* - * Update effective environment to include the target path. diff --git a/pkgs/by-name/xc/xcbuild/patches/Suppress-unknown-key-warnings.patch b/pkgs/by-name/xc/xcbuild/patches/Suppress-unknown-key-warnings.patch new file mode 100644 index 000000000000..c101e9ca722e --- /dev/null +++ b/pkgs/by-name/xc/xcbuild/patches/Suppress-unknown-key-warnings.patch @@ -0,0 +1,26 @@ +diff --git a/Libraries/xcsdk/Sources/SDK/Product.cpp b/Libraries/xcsdk/Sources/SDK/Product.cpp +index f291d475c7..bc339f567c 100644 +--- a/Libraries/xcsdk/Sources/SDK/Product.cpp ++++ b/Libraries/xcsdk/Sources/SDK/Product.cpp +@@ -33,7 +33,7 @@ + auto PBV = unpack.cast ("ProductBuildVersion"); + auto PC = unpack.cast ("ProductCopyright"); + +- if (!unpack.complete(true)) { ++ if (!unpack.complete(false)) { + fprintf(stderr, "%s", unpack.errorText().c_str()); + } + +diff --git a/Libraries/xcsdk/Sources/SDK/Target.cpp b/Libraries/xcsdk/Sources/SDK/Target.cpp +index 523c1e4cbd..2197b1d6d1 100644 +--- a/Libraries/xcsdk/Sources/SDK/Target.cpp ++++ b/Libraries/xcsdk/Sources/SDK/Target.cpp +@@ -86,7 +86,7 @@ + /* Ignored: seems to be a typo. */ + (void)unpack.cast ("isBaseSDK"); + +- if (!unpack.complete(true)) { ++ if (!unpack.complete(false)) { + fprintf(stderr, "%s", unpack.errorText().c_str()); + } + From 89c904bd204c52f41f01a0b264b2e061d6253178 Mon Sep 17 00:00:00 2001 From: Dominic Date: Sun, 3 Nov 2024 20:22:21 +0100 Subject: [PATCH 336/617] librewolf: 131.0.3 -> 132.0.1 --- .../networking/browsers/librewolf/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 32941d8d58a2..ebb27eaba0c4 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "131.0.3-1", + "packageVersion": "132.0.1", "source": { - "rev": "131.0.3-1", - "sha256": "0ayl43nq3h9a3b4nl7sfmil43v0k3x1bmxl7c7ws8710dj2674rc" + "rev": "132.0.1", + "sha256": "hjtzX6jMJh1pnnO6WsLiOqwfpVYmCTZcEEXAmdBm180=" }, "firefox": { - "version": "131.0.3", - "sha512": "3aa96db839f7a45e34c43b5e7e3333e1100ca11545ad26a8e42987fbc72df5ae7ebebe7dfc8c4e856d2bb4676c0516914a07c001f6047799f314146a3329c0ce" + "version": "132.0", + "sha512": "JU/7oW1ubGHP+qgTH4Gpp4iA5XI7fueKw2JRon2C5v8IgjiuKJ0HRpujpRtbWWmgjs0fwC3LTZMyWgj6wc/JFg==" } } From 83f0e7c88157886d4c8d2d68e11e14e343d6c81b Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Tue, 29 Oct 2024 14:09:38 -0700 Subject: [PATCH 337/617] freebsd.mkimg: support openbsd partitions guids OpenBSD does not have a tool comparable to FreeBSD's `mkimg`, but we still need one to create OpenBSD install and VM images. FreeBSD's mkimg already does what we need except setting the correct partition ID, so add a new `openbsd-ufs` type. --- .../freebsd/patches/14.1/mkimg-openbsd.patch | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pkgs/os-specific/bsd/freebsd/patches/14.1/mkimg-openbsd.patch diff --git a/pkgs/os-specific/bsd/freebsd/patches/14.1/mkimg-openbsd.patch b/pkgs/os-specific/bsd/freebsd/patches/14.1/mkimg-openbsd.patch new file mode 100644 index 000000000000..02f1c904cd88 --- /dev/null +++ b/pkgs/os-specific/bsd/freebsd/patches/14.1/mkimg-openbsd.patch @@ -0,0 +1,44 @@ +diff --git a/usr.bin/mkimg/gpt.c b/usr.bin/mkimg/gpt.c +index ed3f008c394f..b4fb98682a4c 100644 +--- a/usr.bin/mkimg/gpt.c ++++ b/usr.bin/mkimg/gpt.c +@@ -50,6 +50,7 @@ static mkimg_uuid_t gpt_uuid_freebsd_zfs = GPT_ENT_TYPE_FREEBSD_ZFS; + static mkimg_uuid_t gpt_uuid_mbr = GPT_ENT_TYPE_MBR; + static mkimg_uuid_t gpt_uuid_ms_basic_data = GPT_ENT_TYPE_MS_BASIC_DATA; + static mkimg_uuid_t gpt_uuid_prep_boot = GPT_ENT_TYPE_PREP_BOOT; ++static mkimg_uuid_t gpt_uuid_openbsd_ufs = GPT_ENT_TYPE_OPENBSD_DATA; + + static struct mkimg_alias gpt_aliases[] = { + { ALIAS_EFI, ALIAS_PTR2TYPE(&gpt_uuid_efi) }, +@@ -63,6 +64,7 @@ static struct mkimg_alias gpt_aliases[] = { + { ALIAS_MBR, ALIAS_PTR2TYPE(&gpt_uuid_mbr) }, + { ALIAS_NTFS, ALIAS_PTR2TYPE(&gpt_uuid_ms_basic_data) }, + { ALIAS_PPCBOOT, ALIAS_PTR2TYPE(&gpt_uuid_prep_boot) }, ++ { ALIAS_OPENBSD_UFS, ALIAS_PTR2TYPE(&gpt_uuid_openbsd_ufs) }, + { ALIAS_NONE, 0 } /* Keep last! */ + }; + +diff --git a/usr.bin/mkimg/scheme.c b/usr.bin/mkimg/scheme.c +index 85ed94013e8d..00a3432c5328 100644 +--- a/usr.bin/mkimg/scheme.c ++++ b/usr.bin/mkimg/scheme.c +@@ -56,6 +56,7 @@ static struct { + { "mbr", ALIAS_MBR }, + { "ntfs", ALIAS_NTFS }, + { "prepboot", ALIAS_PPCBOOT }, ++ { "openbsd-ufs", ALIAS_OPENBSD_UFS }, + { NULL, ALIAS_NONE } /* Keep last! */ + }; + +diff --git a/usr.bin/mkimg/scheme.h b/usr.bin/mkimg/scheme.h +index 52614255595f..0c44f8653af2 100644 +--- a/usr.bin/mkimg/scheme.h ++++ b/usr.bin/mkimg/scheme.h +@@ -45,6 +45,7 @@ enum alias { + ALIAS_MBR, + ALIAS_NTFS, + ALIAS_PPCBOOT, ++ ALIAS_OPENBSD_UFS, + /* end */ + ALIAS_COUNT /* Keep last! */ + }; From 80d9fe945ba6b07d061b35ca4733ade583975937 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Tue, 5 Nov 2024 22:33:23 +0000 Subject: [PATCH 338/617] openbsd.stand: init This stand package builds all variants of OpenBSD's `stand` bootloader, including both UEFI and BIOS versions. This package will likely need changes if we ever support `aarch64-openbsd`, but that isn't even a target yet. Co-Authored-By: Audrey Dutcher --- pkgs/os-specific/bsd/openbsd/pkgs/stand.nix | 32 +++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/stand.nix diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/stand.nix b/pkgs/os-specific/bsd/openbsd/pkgs/stand.nix new file mode 100644 index 000000000000..4ded2fb4c3fe --- /dev/null +++ b/pkgs/os-specific/bsd/openbsd/pkgs/stand.nix @@ -0,0 +1,32 @@ +{ + mkDerivation, + stdenv, + pkgsBuildTarget, +}: + +mkDerivation { + path = "sys/arch/amd64/stand"; + extraPaths = [ "sys" ]; + + # gcc compat + postPatch = '' + find $BSDSRCDIR -name Makefile -print0 | xargs -0 sed -E -i -e 's/-nopie/-no-pie/g' + substituteInPlace $BSDSRCDIR/sys/arch/*/stand/boot/check-boot.pl --replace-fail /usr/bin/objdump objdump + substituteInPlace $BSDSRCDIR/sys/arch/*/stand/Makefile --replace-quiet " boot " " " --replace-quiet " fdboot " " " + ''; + + # expects to be able to use unprefixed programs + # needs gnu assembler + objdump + objcopy + # this is really not designed for cross... + preBuild = '' + mkdir $TMP/bin + export PATH=$TMP/bin:$PATH + ln -s ${stdenv.cc}/bin/${stdenv.cc.targetPrefix}size $TMP/bin/size + ln -s ${pkgsBuildTarget.binutils}/bin/${pkgsBuildTarget.binutils.targetPrefix}as $TMP/bin/as + ln -s ${pkgsBuildTarget.binutils}/bin/${pkgsBuildTarget.binutils.targetPrefix}objdump $TMP/bin/objdump + ln -s ${pkgsBuildTarget.binutils}/bin/${pkgsBuildTarget.binutils.targetPrefix}objcopy $TMP/bin/objcopy + ln -s ${pkgsBuildTarget.binutils}/bin/${pkgsBuildTarget.binutils.targetPrefix}objcopy $TMP/bin/ + + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-pointer-sign" + ''; +} From f8cc3fce40257bf564be705251ecf22e29f13769 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Tue, 5 Nov 2024 22:48:23 +0000 Subject: [PATCH 339/617] openbsd.makefs: init OpenBSD's makefs is used to create filesystem images for ramdisks or VM/install images. The build was fixed with a patch instead of adding to `compat` because `makefs` relies heavily on unintended and undocumted transitive header inclusions. Fixing with `compat` causes hard-to-debug header loops. Co-Authored-By: Audrey Dutcher --- .../bsd/openbsd/pkgs/makefs/compat.patch | 343 ++++++++++++++++++ .../bsd/openbsd/pkgs/makefs/package.nix | 17 + 2 files changed, 360 insertions(+) create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/makefs/compat.patch create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/makefs/package.nix diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/makefs/compat.patch b/pkgs/os-specific/bsd/openbsd/pkgs/makefs/compat.patch new file mode 100644 index 000000000000..6a84536e8c04 --- /dev/null +++ b/pkgs/os-specific/bsd/openbsd/pkgs/makefs/compat.patch @@ -0,0 +1,343 @@ +diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c +index 9fbcc5d0dbc..6b68508585a 100644 +--- a/usr.sbin/makefs/cd9660.c ++++ b/usr.sbin/makefs/cd9660.c +@@ -97,6 +97,7 @@ + */ + + #include ++#include + + #include + #include +diff --git a/usr.sbin/makefs/cd9660.h b/usr.sbin/makefs/cd9660.h +index f3b8d2238be..178ab84bf04 100644 +--- a/usr.sbin/makefs/cd9660.h ++++ b/usr.sbin/makefs/cd9660.h +@@ -37,7 +37,7 @@ + #define _MAKEFS_CD9660_H + + #include +-#include ++#include + + #include + #include +diff --git a/usr.sbin/makefs/cd9660/cd9660_conversion.c b/usr.sbin/makefs/cd9660/cd9660_conversion.c +index d010c4002cf..6722891d77d 100644 +--- a/usr.sbin/makefs/cd9660/cd9660_conversion.c ++++ b/usr.sbin/makefs/cd9660/cd9660_conversion.c +@@ -34,9 +34,9 @@ + */ + #include "cd9660.h" + +-#define bswap16 swap16 +-#define bswap32 swap32 +- ++#include ++#define bswap16 htons ++#define bswap32 htonl + + static char cd9660_compute_gm_offset(time_t); + +diff --git a/usr.sbin/makefs/cd9660/cd9660_strings.c b/usr.sbin/makefs/cd9660/cd9660_strings.c +index dd0622e0f10..acc9006848b 100644 +--- a/usr.sbin/makefs/cd9660/cd9660_strings.c ++++ b/usr.sbin/makefs/cd9660/cd9660_strings.c +@@ -34,6 +34,7 @@ + */ + + #include ++#include + + #include "makefs.h" + +diff --git a/usr.sbin/makefs/cd9660/iso.h b/usr.sbin/makefs/cd9660/iso.h +index 3ed58d1dedc..96e7b96b35a 100644 +--- a/usr.sbin/makefs/cd9660/iso.h ++++ b/usr.sbin/makefs/cd9660/iso.h +@@ -46,6 +46,8 @@ + #ifndef _ISOFS_CD9660_ISO_H_ + #define _ISOFS_CD9660_ISO_H_ + ++#include "compat.h" ++ + #define ISODCL(from, to) (to - from + 1) + + struct iso_volume_descriptor { +diff --git a/usr.sbin/makefs/compat.h b/usr.sbin/makefs/compat.h +new file mode 100644 +index 00000000000..8cc830662bd +--- /dev/null ++++ b/usr.sbin/makefs/compat.h +@@ -0,0 +1,71 @@ ++#pragma once ++#include ++#include ++#include ++#include ++#include ++ ++#define u_int8_t uint8_t ++#define u_int16_t uint16_t ++#define u_int32_t uint32_t ++#define u_int64_t uint64_t ++typedef unsigned char u_char; ++typedef unsigned short u_short; ++typedef unsigned int u_int; ++typedef unsigned long u_long; ++typedef uint64_t dev_t; ++typedef int64_t off_t; ++#define __unused ++#define __dead ++#define pledge(x, y) 0 ++#define unveil(x, y) 0 ++#define srandom_deterministic srandom ++#define MAXBSIZE (64 * 1024) ++ ++static inline void errc(int status, int code, const char *fmt, ...) { ++ // TODO ++ printf("You're outta here!\n"); ++ exit(status); ++} ++ ++static inline void warnc(int code, const char *fmt, ...) { ++ // TODO ++ printf("You're outta here!\n"); ++} ++ ++static inline int scan_scaled(char* number_w_scale, long long *result) { ++ int number, fraction = 0; ++ char scale[3]; ++ long long tresult; ++ if (sscanf(number_w_scale, "%d.%1d%2s", &number, &fraction, &scale[0]) == 3 || ++ sscanf(number_w_scale, "%d%2s", &number, &scale[0]) == 2) { ++ tresult = number * 10 + fraction; ++ switch (scale[0]) { ++ case 'E': ++ tresult *= 1024; ++ case 'P': ++ tresult *= 1024; ++ case 'T': ++ tresult *= 1024; ++ case 'G': ++ tresult *= 1024; ++ case 'M': ++ tresult *= 1024; ++ case 'K': ++ tresult *= 1024; ++ case 'B': ++ case ' ': ++ case '\0': ++ break; ++ default: ++ errno = EINVAL; ++ return -1; ++ } ++ tresult /= 10; ++ *result = tresult; ++ return 0; ++ } else { ++ errno = EINVAL; ++ return -1; ++ } ++} +diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c +index b055c62a598..c99cbfef5a7 100644 +--- a/usr.sbin/makefs/ffs.c ++++ b/usr.sbin/makefs/ffs.c +@@ -198,7 +198,7 @@ ffs_parse_opts(const char *option, fsinfo_t *fsopts) + if (strcmp(ffs_options[rv].name, "disklabel") == 0) { + struct disklabel *dp; + +- dp = getdiskbyname(buf); ++ dp = NULL; + if (dp == NULL) + errx(1, "unknown disk type: %s", buf); + +@@ -603,8 +603,8 @@ ffs_build_dinode1(struct ufs1_dinode *dinp, dirbuf_t *dbufp, fsnode *cur, + dinp->di_mode = cur->inode->st.st_mode; + dinp->di_nlink = cur->inode->nlink; + dinp->di_size = cur->inode->st.st_size; +- dinp->di_flags = cur->inode->st.st_flags; +- dinp->di_gen = cur->inode->st.st_gen; ++ dinp->di_flags = 0; ++ dinp->di_gen = 0; + dinp->di_uid = cur->inode->st.st_uid; + dinp->di_gid = cur->inode->st.st_gid; + +@@ -645,8 +645,8 @@ ffs_build_dinode2(struct ufs2_dinode *dinp, dirbuf_t *dbufp, fsnode *cur, + dinp->di_mode = cur->inode->st.st_mode; + dinp->di_nlink = cur->inode->nlink; + dinp->di_size = cur->inode->st.st_size; +- dinp->di_flags = cur->inode->st.st_flags; +- dinp->di_gen = cur->inode->st.st_gen; ++ dinp->di_flags = 0; ++ dinp->di_gen = 0; + dinp->di_uid = cur->inode->st.st_uid; + dinp->di_gid = cur->inode->st.st_gid; + +diff --git a/usr.sbin/makefs/ffs/buf.c b/usr.sbin/makefs/ffs/buf.c +index ce512c7d389..8130f7e9cbc 100644 +--- a/usr.sbin/makefs/ffs/buf.c ++++ b/usr.sbin/makefs/ffs/buf.c +@@ -47,6 +47,7 @@ + + #include "makefs.h" + #include "buf.h" ++#include "compat.h" + + TAILQ_HEAD(buftailhead,mkfsbuf) buftail; + +diff --git a/usr.sbin/makefs/include/machine/disklabel.h b/usr.sbin/makefs/include/machine/disklabel.h +new file mode 100644 +index 00000000000..7c5aa45c998 +--- /dev/null ++++ b/usr.sbin/makefs/include/machine/disklabel.h +@@ -0,0 +1,7 @@ ++#define LABELSECTOR 1 ++#define LABELOFFSET 0 ++#define MAXPARTITIONS 16 ++ ++static inline struct disklabel *getdiskbyname(const char *name) { ++ return (void*)0; ++} +diff --git a/usr.sbin/makefs/include/msdosfs/bootsect.h b/usr.sbin/makefs/include/msdosfs/bootsect.h +new file mode 100644 +index 00000000000..02e88ac2b9c +--- /dev/null ++++ b/usr.sbin/makefs/include/msdosfs/bootsect.h +@@ -0,0 +1 @@ ++#include +diff --git a/usr.sbin/makefs/include/msdosfs/bpb.h b/usr.sbin/makefs/include/msdosfs/bpb.h +new file mode 100644 +index 00000000000..08598cc217b +--- /dev/null ++++ b/usr.sbin/makefs/include/msdosfs/bpb.h +@@ -0,0 +1 @@ ++#include +diff --git a/usr.sbin/makefs/include/sys/disklabel.h b/usr.sbin/makefs/include/sys/disklabel.h +new file mode 100644 +index 00000000000..f382f87226c +--- /dev/null ++++ b/usr.sbin/makefs/include/sys/disklabel.h +@@ -0,0 +1 @@ ++#include +diff --git a/usr.sbin/makefs/include/sys/endian.h b/usr.sbin/makefs/include/sys/endian.h +new file mode 100644 +index 00000000000..e69de29bb2d +diff --git a/usr.sbin/makefs/include/sys/uuid.h b/usr.sbin/makefs/include/sys/uuid.h +new file mode 100644 +index 00000000000..7c2abace377 +--- /dev/null ++++ b/usr.sbin/makefs/include/sys/uuid.h +@@ -0,0 +1,2 @@ ++#include "compat.h" ++#include +diff --git a/usr.sbin/makefs/include/ufs/ffs/fs.h b/usr.sbin/makefs/include/ufs/ffs/fs.h +new file mode 100644 +index 00000000000..d7905d33c2a +--- /dev/null ++++ b/usr.sbin/makefs/include/ufs/ffs/fs.h +@@ -0,0 +1,2 @@ ++#include "compat.h" ++#include +diff --git a/usr.sbin/makefs/include/ufs/ufs/dinode.h b/usr.sbin/makefs/include/ufs/ufs/dinode.h +new file mode 100644 +index 00000000000..0d29007bdd1 +--- /dev/null ++++ b/usr.sbin/makefs/include/ufs/ufs/dinode.h +@@ -0,0 +1,2 @@ ++#include "compat.h" ++#include +diff --git a/usr.sbin/makefs/include/ufs/ufs/dir.h b/usr.sbin/makefs/include/ufs/ufs/dir.h +new file mode 100644 +index 00000000000..9ec3e81be3d +--- /dev/null ++++ b/usr.sbin/makefs/include/ufs/ufs/dir.h +@@ -0,0 +1 @@ ++#include +diff --git a/usr.sbin/makefs/include/util.h b/usr.sbin/makefs/include/util.h +new file mode 100644 +index 00000000000..e69de29bb2d +diff --git a/usr.sbin/makefs/makefs.c b/usr.sbin/makefs/makefs.c +index af39605d996..10d86fa10e2 100644 +--- a/usr.sbin/makefs/makefs.c ++++ b/usr.sbin/makefs/makefs.c +@@ -44,8 +44,10 @@ + #include + #include + #include ++#include + + #include "makefs.h" ++#include "compat.h" + + /* + * list of supported file systems and dispatch functions +diff --git a/usr.sbin/makefs/makefs.h b/usr.sbin/makefs/makefs.h +index 303ec7a2c46..6d72859532e 100644 +--- a/usr.sbin/makefs/makefs.h ++++ b/usr.sbin/makefs/makefs.h +@@ -41,6 +41,8 @@ + + #include + #include ++#include ++#include + + /* + * fsnode - +diff --git a/usr.sbin/makefs/msdos/denode.h b/usr.sbin/makefs/msdos/denode.h +index 48cdf968945..baf3dc3d807 100644 +--- a/usr.sbin/makefs/msdos/denode.h ++++ b/usr.sbin/makefs/msdos/denode.h +@@ -50,6 +50,8 @@ + #ifndef _MSDOSFS_DENODE_H_ + #define _MSDOSFS_DENODE_H_ + ++#include "compat.h" ++ + struct genfs_node { + }; + struct mkfsvnode; +diff --git a/usr.sbin/makefs/msdos/direntry.h b/usr.sbin/makefs/msdos/direntry.h +index 77f8d7dd657..9c3a19bae8c 100644 +--- a/usr.sbin/makefs/msdos/direntry.h ++++ b/usr.sbin/makefs/msdos/direntry.h +@@ -48,6 +48,8 @@ + * October 1992 + */ + ++#include "compat.h" ++ + /* + * Structure of a dos directory entry. + */ +diff --git a/usr.sbin/makefs/msdos/mkfs_msdos.c b/usr.sbin/makefs/msdos/mkfs_msdos.c +index c9aa0877b7a..e72f1680585 100644 +--- a/usr.sbin/makefs/msdos/mkfs_msdos.c ++++ b/usr.sbin/makefs/msdos/mkfs_msdos.c +@@ -596,7 +596,6 @@ mkfs_msdos(const char *fname, const char *dtype, const struct msdos_options *op) + tm = localtime(&now); + img = emalloc(bpb.bps); + dir = bpb.res + (bpb.spf ? bpb.spf : bpb.bspf) * bpb.nft; +- signal(SIGINFO, infohandler); + for (lsn = 0; lsn < dir + (o.fat_type == 32 ? bpb.spc : rds); lsn++) { + if (got_siginfo) { + fprintf(stderr,"%s: writing sector %u of %u (%u%%)\n", +diff --git a/usr.sbin/makefs/msdos/msdosfs_conv.c b/usr.sbin/makefs/msdos/msdosfs_conv.c +index 7b73c19bd6e..d38f035a87c 100644 +--- a/usr.sbin/makefs/msdos/msdosfs_conv.c ++++ b/usr.sbin/makefs/msdos/msdosfs_conv.c +@@ -52,8 +52,8 @@ + * System include files. + */ + #include +-#include +-#include ++#include // howmany ++#include "compat.h" + + /* + * MSDOSFS include files. diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/makefs/package.nix b/pkgs/os-specific/bsd/openbsd/pkgs/makefs/package.nix new file mode 100644 index 000000000000..dbbff2975a88 --- /dev/null +++ b/pkgs/os-specific/bsd/openbsd/pkgs/makefs/package.nix @@ -0,0 +1,17 @@ +{ mkDerivation, lib }: +mkDerivation { + path = "usr.sbin/makefs"; + extraPaths = [ + "sys/sys" + "sys/ufs" + "sys/msdosfs" + "sys/dev" + ]; + patches = [ ./compat.patch ]; + preBuild = '' + mkdir -p $BSDSRCDIR/usr.sbin/makefs/include + ln -s $BSDSRCDIR $BSDSRCDIR/usr.sbin/makefs/include/bsdroot + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$BSDSRCDIR/usr.sbin/makefs/include" + ''; + meta.platforms = lib.platforms.all; +} From 59424d21244d6ac485ddfa5999590640299dcffd Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 6 Nov 2024 00:06:49 +0100 Subject: [PATCH 340/617] palemoon-bin: 33.4.0.1 -> 33.4.1 --- pkgs/applications/networking/browsers/palemoon/bin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index 7f70a49e1a06..3733d0c5ccbc 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "33.4.0.1"; + version = "33.4.1"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -158,11 +158,11 @@ stdenv.mkDerivation (finalAttrs: { in { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-34x9L0L42KO7mUDaW41I71ln5xyHGAKBoAJ6HcDC//g="; + hash = "sha256-pjOzU8atFNzYujxxoVihn0Cvq4Xvh7U2auSznE29Wpc="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-TRIgfqKsJxueZ/Oazw7kTLjVyxdh+IUiR+XDaemow9A="; + hash = "sha256-ikgO0vVTySw3I6gdSu5k2e35xZ95bJY4f18Fjh+c0rA="; }; }; From fe5219cf42fdd3814cb3311a3e997aa42c48fbf1 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 6 Nov 2024 01:24:23 +0100 Subject: [PATCH 341/617] quickder: move to pkgs/by-name, reformat --- .../qu/quickder/package.nix} | 40 ++++++++++--------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 21 insertions(+), 21 deletions(-) rename pkgs/{development/libraries/quickder/default.nix => by-name/qu/quickder/package.nix} (72%) diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/by-name/qu/quickder/package.nix similarity index 72% rename from pkgs/development/libraries/quickder/default.nix rename to pkgs/by-name/qu/quickder/package.nix index c3de38398084..4e66ebf5f360 100644 --- a/pkgs/development/libraries/quickder/default.nix +++ b/pkgs/by-name/qu/quickder/package.nix @@ -1,14 +1,15 @@ -{ lib -, stdenv -, fetchFromGitLab -, python3 -, cmake -, doxygen -, graphviz -, quickmem -, arpa2common -, arpa2cm -, ensureNewerSourcesForZipFilesHook +{ + lib, + stdenv, + fetchFromGitLab, + python3, + cmake, + doxygen, + graphviz, + quickmem, + arpa2common, + arpa2cm, + ensureNewerSourcesForZipFilesHook, }: stdenv.mkDerivation rec { @@ -32,17 +33,18 @@ stdenv.mkDerivation rec { buildInputs = [ arpa2cm arpa2common - (python3.withPackages (ps: with ps; [ - asn1ate - colored - pyparsing - setuptools - six - ])) + (python3.withPackages ( + ps: with ps; [ + asn1ate + colored + pyparsing + setuptools + six + ] + )) quickmem ]; - postPatch = '' substituteInPlace setup.py --replace 'pyparsing==' 'pyparsing>=' ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8cc0cbc90f96..945ab085d9c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22489,8 +22489,6 @@ with pkgs; quesoglc = callPackage ../development/libraries/quesoglc { }; - quickder = callPackage ../development/libraries/quickder { }; - quickmem = callPackage ../development/libraries/quickmem { }; quicksynergy = callPackage ../applications/misc/quicksynergy { }; From a26b3a3bc27a3e05e9cf0e78f1038539ae1b95f3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 6 Nov 2024 01:27:17 +0100 Subject: [PATCH 342/617] quickder: pin pyparsing to 3.1.2 --- pkgs/by-name/qu/quickder/package.nix | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/qu/quickder/package.nix b/pkgs/by-name/qu/quickder/package.nix index 4e66ebf5f360..981fa635a30b 100644 --- a/pkgs/by-name/qu/quickder/package.nix +++ b/pkgs/by-name/qu/quickder/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchFromGitHub, fetchFromGitLab, python3, cmake, @@ -12,6 +13,26 @@ ensureNewerSourcesForZipFilesHook, }: +let + python = + let + packageOverrides = self: super: { + pyparsing = super.pyparsing.overridePythonAttrs (old: rec { + version = "3.1.2"; + src = fetchFromGitHub { + owner = "pyparsing"; + repo = "pyparsing"; + rev = "refs/tags/${version}"; + hash = "sha256-0B8DjO4kLgvt4sYsk8CZI+5icdKy73XE2tWeqVLqO5A="; + }; + }); + }; + in + python3.override { + inherit packageOverrides; + self = python; + }; +in stdenv.mkDerivation rec { pname = "quickder"; version = "1.7.1"; @@ -33,7 +54,7 @@ stdenv.mkDerivation rec { buildInputs = [ arpa2cm arpa2common - (python3.withPackages ( + (python.withPackages ( ps: with ps; [ asn1ate colored From 17cc7a6f16065d96d3352aea749154ee401b53e3 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 6 Nov 2024 00:52:44 +0000 Subject: [PATCH 343/617] darwin.libutil: use bootstrap SDK --- .../darwin/apple-source-releases/libutil/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix index c783b1edfe56..95f35054e026 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix @@ -21,7 +21,7 @@ mkAppleDerivation { ]; buildInputs = [ - apple-sdk_14 + (apple-sdk_14.override { enableBootstrap = true; }) copyfile ]; From 877e3454bb9ffa10287f068742d05159c14b4574 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 5 Nov 2024 17:13:16 +0000 Subject: [PATCH 344/617] apple-sdk: propagate the `darwin.libutil` library The SDK provides this without headers and apparently some things try to link to it. This should help increase compatibility with the native toolchain. --- pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix b/pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix index f4d80eed0b49..668ac586cb01 100644 --- a/pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix +++ b/pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix @@ -54,6 +54,8 @@ self: super: { libiconv darwin.libresolv darwin.libsbuf + # Shipped with the SDK only as a library with no headers + (lib.getLib darwin.libutil) # Required by some SDK headers cupsHeaders ] From ee802060b85f8e7d82af36de60a21320c9ec50a9 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 5 Nov 2024 23:08:57 +0000 Subject: [PATCH 345/617] neovim-unwrapped: drop `darwin.libutil` dependency --- pkgs/by-name/ne/neovim-unwrapped/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index 46d941a4e40b..fb185d85f646 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -6,7 +6,6 @@ cmake, gettext, msgpack-c, - darwin, libuv, lua, pkg-config, @@ -145,7 +144,6 @@ stdenv.mkDerivation ( tree-sitter unibilium ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ] ++ lib.optionals finalAttrs.finalPackage.doCheck [ glibcLocales procps From 22f2052ca1e7b7cfb4b090faa2d924c3e27e4742 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 5 Nov 2024 23:11:31 +0000 Subject: [PATCH 346/617] python{27,39,310,311,312,313,314}: drop Darwin `libutil` patch --- .../python/cpython/2.7/default.nix | 4 ---- .../python/cpython/3.11/darwin-libutil.patch | 13 ----------- .../python/cpython/3.7/darwin-libutil.patch | 23 ------------------- .../interpreters/python/cpython/default.nix | 5 ---- 4 files changed, 45 deletions(-) delete mode 100644 pkgs/development/interpreters/python/cpython/3.11/darwin-libutil.patch delete mode 100644 pkgs/development/interpreters/python/cpython/3.7/darwin-libutil.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 0d2ebd009731..7e926d682810 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -140,10 +140,6 @@ let ] ++ lib.optionals (x11Support && stdenv.hostPlatform.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Fix darwin build https://bugs.python.org/issue34027 - ../3.7/darwin-libutil.patch - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # Disable the use of ldconfig in ctypes.util.find_library (since diff --git a/pkgs/development/interpreters/python/cpython/3.11/darwin-libutil.patch b/pkgs/development/interpreters/python/cpython/3.11/darwin-libutil.patch deleted file mode 100644 index 92b846be0002..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.11/darwin-libutil.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 40229bce0f..3cc604930e 100644 ---- a/Modules/posixmodule.c -+++ b/Modules/posixmodule.c -@@ -7258,7 +7258,7 @@ os_sched_getaffinity_impl(PyObject *module, pid_t pid) - #ifdef HAVE_UTMP_H - #include - #endif /* HAVE_UTMP_H */ --#elif defined(HAVE_LIBUTIL_H) -+#elif defined(HAVE_LIBUTIL_H) && !defined(__APPLE__) - #include - #elif defined(HAVE_UTIL_H) - #include diff --git a/pkgs/development/interpreters/python/cpython/3.7/darwin-libutil.patch b/pkgs/development/interpreters/python/cpython/3.7/darwin-libutil.patch deleted file mode 100644 index 51e3cb6d7f11..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.7/darwin-libutil.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index c3682b4..16826c6 100644 ---- a/Modules/posixmodule.c -+++ b/Modules/posixmodule.c -@@ -5880,15 +5880,13 @@ error: - #if defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) || defined(HAVE_DEV_PTMX) - #ifdef HAVE_PTY_H - #include --#else -+#endif - #ifdef HAVE_LIBUTIL_H - #include --#else -+#endif - #ifdef HAVE_UTIL_H - #include --#endif /* HAVE_UTIL_H */ --#endif /* HAVE_LIBUTIL_H */ --#endif /* HAVE_PTY_H */ -+#endif - #ifdef HAVE_STROPTS_H - #include - #endif diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index f9da42de0b1c..20c7c0c145ef 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -271,11 +271,6 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { ] ++ optionals mimetypesSupport [ # Make the mimetypes module refer to the right file ./mimetypes.patch - ] ++ optionals (pythonAtLeast "3.7" && pythonOlder "3.11") [ - # Fix darwin build https://bugs.python.org/issue34027 - ./3.7/darwin-libutil.patch - ] ++ optionals (pythonAtLeast "3.11") [ - ./3.11/darwin-libutil.patch ] ++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.hostPlatform.isDarwin) [ # Stop checking for TCL/TK in global macOS locations ./3.9/darwin-tcl-tk.patch From 852523aa47a72a1c88f28d7779bdc898ddf9150f Mon Sep 17 00:00:00 2001 From: amesgen Date: Wed, 6 Nov 2024 01:52:08 +0100 Subject: [PATCH 347/617] nixos/keepassxc: work around OCR issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since https://github.com/NixOS/nixpkgs/pull/288208, the OCR got worse and can't seem to be able to read the text from title bars 😭. Setting the background color to white fixes the problem. https://ice-wm.org/manual/icewm-11.html https://ice-wm.org/man/icewm-prefoverride --- nixos/tests/keepassxc.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/tests/keepassxc.nix b/nixos/tests/keepassxc.nix index a4f452412cdf..70075ddab865 100644 --- a/nixos/tests/keepassxc.nix +++ b/nixos/tests/keepassxc.nix @@ -17,6 +17,11 @@ import ./make-test-python.nix ({ pkgs, ...} : services.xserver.enable = true; + # for better OCR + environment.etc."icewm/prefoverride".text = '' + ColorActiveTitleBar = "rgb:FF/FF/FF" + ''; + # Regression test for https://github.com/NixOS/nixpkgs/issues/163482 qt = { enable = true; From c8c430ecf9cfbf868ddcadc5a74ed236ec82181b Mon Sep 17 00:00:00 2001 From: amesgen Date: Wed, 6 Nov 2024 01:55:03 +0100 Subject: [PATCH 348/617] keepassxc: prevent deadlock with just one core See https://github.com/keepassxreboot/keepassxc/issues/10391 An alternative would be to set virtualisation.cores = 2; in the keepassxc nixos test. --- pkgs/applications/misc/keepassxc/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix index b5b246526063..e548e2ee6b7e 100644 --- a/pkgs/applications/misc/keepassxc/default.nix +++ b/pkgs/applications/misc/keepassxc/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , qttools @@ -61,6 +62,12 @@ stdenv.mkDerivation rec { patches = [ ./darwin.patch + + # https://github.com/keepassxreboot/keepassxc/issues/10391 + (fetchpatch { + url = "https://github.com/keepassxreboot/keepassxc/commit/6a9ed210792ac60d9ed35cc702500e5ebbb95622.patch"; + hash = "sha256-CyaVMfJ0O+5vgvmwI6rYbf0G7ryKFcLv3p4b/D6Pzw8="; + }) ]; cmakeFlags = [ From c712874d4ac0f5c30731b2a7acf0905d2da629f6 Mon Sep 17 00:00:00 2001 From: amesgen Date: Wed, 6 Nov 2024 01:56:08 +0100 Subject: [PATCH 349/617] nixos/keepassxc: adapt to new UI details There now is a "Refresh Hardware Keys" icon since 2.7.7, which we have to skip. I also needed to add more explicit handling of the intermediate file dialog to get the test to pass. --- nixos/tests/keepassxc.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/tests/keepassxc.nix b/nixos/tests/keepassxc.nix index 70075ddab865..b1f2dc2f4d46 100644 --- a/nixos/tests/keepassxc.nix +++ b/nixos/tests/keepassxc.nix @@ -67,10 +67,21 @@ import ./make-test-python.nix ({ pkgs, ...} : # Wait for the enter password screen to appear. machine.wait_for_text("/home/alice/foo.kdbx") - # Click on "Browse" button to select keyfile + # Click on "I have key file" button to open keyfile dialog machine.send_key("tab") + machine.send_key("tab") + machine.send_key("tab") + machine.send_key("ret") + + # Select keyfile + machine.wait_for_text("Select key file") machine.send_chars("/home/alice/foo.keyfile") machine.send_key("ret") + + # Open database + machine.wait_for_text("foo.kdbx \\[Locked] - KeePassXC") + machine.send_key("ret") + # Database is unlocked (doesn't have "[Locked]" in the title anymore) machine.wait_for_text("foo.kdbx - KeePassXC") ''; From 0e251673369a938d1797d40c7fe55997bedbd50d Mon Sep 17 00:00:00 2001 From: amesgen Date: Wed, 6 Nov 2024 01:58:59 +0100 Subject: [PATCH 350/617] nixos/keepassxc: stop using deprecated cli option Addresses The -k option will be deprecated. Please use the --set-key-file option instead. This isn't causing any problems _yet_, but it seems easy enough to fix it now already. --- nixos/tests/keepassxc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/keepassxc.nix b/nixos/tests/keepassxc.nix index b1f2dc2f4d46..d487d87fbacb 100644 --- a/nixos/tests/keepassxc.nix +++ b/nixos/tests/keepassxc.nix @@ -46,7 +46,7 @@ import ./make-test-python.nix ({ pkgs, ...} : machine.wait_for_x() with subtest("Can create database and entry with CLI"): - ${aliceDo "keepassxc-cli db-create -k foo.keyfile foo.kdbx"} + ${aliceDo "keepassxc-cli db-create --set-key-file foo.keyfile foo.kdbx"} ${aliceDo "keepassxc-cli add --no-password -k foo.keyfile foo.kdbx bar"} with subtest("Ensure KeePassXC starts"): From c55530f978aaa224bc6d64f2f134f7fdbbedc42e Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 6 Nov 2024 09:10:17 +0100 Subject: [PATCH 351/617] curl: 8.10.1 -> 8.11.0 Signed-off-by: Sefa Eyeoglu --- pkgs/tools/networking/curl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index e64f0007c1cb..399101a21435 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -49,14 +49,14 @@ assert !((lib.count (x: x) [ gnutlsSupport opensslSupport wolfsslSupport rustlsS stdenv.mkDerivation (finalAttrs: { pname = "curl"; - version = "8.10.1"; + version = "8.11.0"; src = fetchurl { urls = [ "https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.xz" "https://github.com/curl/curl/releases/download/curl-${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}/curl-${finalAttrs.version}.tar.xz" ]; - hash = "sha256-c6Sw6ZWWoJ+lkkpPt+S5lahf2g0YosAquc8TS+vOBO4="; + hash = "sha256-21nPDWccpuf1wsXsF3CEozp54EyX5xzxg6XN6iNQVOs="; }; # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion From f3ce0f26fed1b5052dd81fe248f565bf27f79907 Mon Sep 17 00:00:00 2001 From: Travis Athougies Date: Tue, 29 Oct 2024 08:44:41 -0700 Subject: [PATCH 352/617] linuxPackages_5_x.perf: fix build with Python 3.12 Python 3.12 removed the distutils library, but perf < 6.0 depends on it. This also disables the dmesg path patch for version 5.4 because it does not apply there. --- pkgs/os-specific/linux/kernel/perf/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index 0d639531e840..b1f1f4e203b2 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation { pname = "perf-linux"; inherit (kernel) version src; - patches = [ + patches = lib.optionals (lib.versionAtLeast kernel.version "5.10") [ # fix wrong path to dmesg ./fix-dmesg-path.diff ] ++ lib.optionals (lib.versions.majorMinor kernel.version == "6.10") [ @@ -143,7 +143,12 @@ stdenv.mkDerivation { ++ lib.optional withZstd zstd ++ lib.optional withLibcap libcap ++ lib.optional (lib.versionAtLeast kernel.version "5.8") libpfm - ++ lib.optional (lib.versionAtLeast kernel.version "6.0") python3.pkgs.setuptools; + ++ lib.optional (lib.versionAtLeast kernel.version "6.0") python3.pkgs.setuptools + # Python 3.12 no longer includes distutils, not needed for 6.0 and newer. + ++ lib.optional (!(lib.versionAtLeast kernel.version "6.0") && lib.versionAtLeast python3.version "3.12") [ + python3.pkgs.distutils + python3.pkgs.packaging + ]; env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=cpp" From 82dc05c26db339c935fe5bf604518e8cee36c10e Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 6 Nov 2024 17:07:39 +0800 Subject: [PATCH 353/617] hickory-dns: nixfmt --- pkgs/by-name/hi/hickory-dns/package.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/hi/hickory-dns/package.nix b/pkgs/by-name/hi/hickory-dns/package.nix index cf6226089097..3f7baed6e978 100644 --- a/pkgs/by-name/hi/hickory-dns/package.nix +++ b/pkgs/by-name/hi/hickory-dns/package.nix @@ -1,8 +1,9 @@ -{ lib -, fetchFromGitHub -, openssl -, pkg-config -, rustPlatform +{ + lib, + fetchFromGitHub, + openssl, + pkg-config, + rustPlatform, }: rustPlatform.buildRustPackage rec { @@ -28,7 +29,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://hickory-dns.org/"; maintainers = with maintainers; [ colinsane ]; platforms = platforms.linux; - license = with licenses; [ asl20 mit ]; + license = with licenses; [ + asl20 + mit + ]; mainProgram = "hickory-dns"; }; } From 319f3c98a7f9df80f42db2c4ab1ba38d5867b7f3 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 6 Nov 2024 17:08:24 +0800 Subject: [PATCH 354/617] hickory-dns: add passthru.updateScript --- pkgs/by-name/hi/hickory-dns/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/hi/hickory-dns/package.nix b/pkgs/by-name/hi/hickory-dns/package.nix index 3f7baed6e978..b7c331f78181 100644 --- a/pkgs/by-name/hi/hickory-dns/package.nix +++ b/pkgs/by-name/hi/hickory-dns/package.nix @@ -4,6 +4,7 @@ openssl, pkg-config, rustPlatform, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -24,12 +25,14 @@ rustPlatform.buildRustPackage rec { # tests expect internet connectivity to query real nameservers like 8.8.8.8 doCheck = false; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Rust based DNS client, server, and resolver"; homepage = "https://hickory-dns.org/"; - maintainers = with maintainers; [ colinsane ]; - platforms = platforms.linux; - license = with licenses; [ + maintainers = with lib.maintainers; [ colinsane ]; + platforms = lib.platforms.linux; + license = with lib.licenses; [ asl20 mit ]; From 28623f8163ac1e1ff8fa527bd7b9d1bce46b8b1c Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 6 Nov 2024 17:18:02 +0800 Subject: [PATCH 355/617] hickory-dns: 0.24.0 -> 0.25.0-alpha.2 --- pkgs/by-name/hi/hickory-dns/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/hi/hickory-dns/package.nix b/pkgs/by-name/hi/hickory-dns/package.nix index b7c331f78181..3c53faa42521 100644 --- a/pkgs/by-name/hi/hickory-dns/package.nix +++ b/pkgs/by-name/hi/hickory-dns/package.nix @@ -9,15 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "hickory-dns"; - version = "0.24.1"; + version = "0.25.0-alpha.2"; src = fetchFromGitHub { owner = "hickory-dns"; repo = "hickory-dns"; - rev = "v${version}"; - hash = "sha256-szq21RuRmkhAfHlzhGQYpwjiIRkavFCPETOt+6TxhP4="; + rev = "refs/tags/v${version}"; + hash = "sha256-bEVApMM6/I3nF1lyRhd+7YtZuSAwiozRkMorRLhLOBY="; }; - cargoHash = "sha256-LcMjHHEuDlhSfDXGIrSMXewraSxEgRw2g2DOoH4i5RU="; + + cargoHash = "sha256-Rq4l1iV70nlhBaJ02hc+dmNZ/Q7qrHoF0Kp0MTmu22A="; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; From e57af9455aaa65b52e98f78fa25bb1e2cc9664fe Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Wed, 6 Nov 2024 12:45:55 +0000 Subject: [PATCH 356/617] raycast: 1.84.12 -> 1.85.0 Changelog: https://www.raycast.com/changelog/1-85-0 --- pkgs/by-name/ra/raycast/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/raycast/package.nix b/pkgs/by-name/ra/raycast/package.nix index db37a3ca05f9..d0a726e2a406 100644 --- a/pkgs/by-name/ra/raycast/package.nix +++ b/pkgs/by-name/ra/raycast/package.nix @@ -11,12 +11,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.84.12"; + version = "1.85.0"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-32RLnGtSVDik86dfXr8wtVMhWvnGs0Bh1CiK/ZDeWxU="; + hash = "sha256-wx9Ps/7O4y21D7lK3UlL23Cbvl8lRDZ375lOHq67w0I="; }; dontPatch = true; From f45134918fddeac94b00e095878e296783caa0d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Nov 2024 19:09:31 +0000 Subject: [PATCH 357/617] python312Packages.xsdata: 24.9 -> 24.11 --- pkgs/development/python-modules/xsdata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix index 96c32ac9349a..e83779c85a80 100644 --- a/pkgs/development/python-modules/xsdata/default.nix +++ b/pkgs/development/python-modules/xsdata/default.nix @@ -19,16 +19,16 @@ buildPythonPackage rec { pname = "xsdata"; - version = "24.9"; + version = "24.11"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "tefra"; repo = "xsdata"; rev = "refs/tags/v${version}"; - hash = "sha256-wQSrdAS4E6AmpP+pKviFomLrcSHLROhTWHg/hYGTaeQ="; + hash = "sha256-hyNC9VcWkGnOYm6BpXgH3RzmHTqBVmQoADvcEvgF6yg="; }; patches = [ From 409f723e01cafc995b9d1f9adcb821c2c8f82491 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Wed, 6 Nov 2024 14:17:00 +0000 Subject: [PATCH 358/617] spotify: 1.2.45.454.gc16ec9f6 -> 1.2.48.405.gf2c48e6f --- pkgs/applications/audio/spotify/linux.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/spotify/linux.nix b/pkgs/applications/audio/spotify/linux.nix index 3383e47cb8fe..b295d6fa5083 100644 --- a/pkgs/applications/audio/spotify/linux.nix +++ b/pkgs/applications/audio/spotify/linux.nix @@ -14,14 +14,14 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.2.45.454.gc16ec9f6"; + version = "1.2.48.405.gf2c48e6f"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "79"; + rev = "80"; deps = [ alsa-lib @@ -88,7 +88,7 @@ stdenv.mkDerivation { src = fetchurl { name = "spotify-${version}-${rev}.snap"; url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - hash = "sha512-F1Npz/oKCsMKaQx2M5dm1dhWhaSlt8422tpRWnwuk2yjwLWrOYDY2uKYph8YFXfOdS3mV6u5yVlzgFdDqAFmCQ=="; + hash = "sha512-Ej9SEhZhssQiH1srcgUW5lQuUNg+htudV7mcnK6o0pW5PiBYZ6qOPEIZ/1tZzD9xkUJ8hCq08fJMB8NQ12KXMg=="; }; nativeBuildInputs = [ wrapGAppsHook3 makeShellWrapper squashfsTools ]; @@ -146,6 +146,7 @@ stdenv.mkDerivation { rpath="$out/share/spotify:$libdir" + chmod +w "$out/share/spotify/spotify" patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $rpath $out/share/spotify/spotify From 78fbb32923453c5b5f6bdb29a05e32c0ab9a680a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20Cl=C3=A9roux?= <73357644+gcleroux@users.noreply.github.com> Date: Wed, 6 Nov 2024 11:18:07 -0500 Subject: [PATCH 359/617] bazecor: 1.5.2 -> 1.5.3 https://github.com/Dygmalab/Bazecor/releases/tag/v1.5.3 --- pkgs/by-name/ba/bazecor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/bazecor/package.nix b/pkgs/by-name/ba/bazecor/package.nix index 343aa8da9163..8465b19b4b1f 100644 --- a/pkgs/by-name/ba/bazecor/package.nix +++ b/pkgs/by-name/ba/bazecor/package.nix @@ -6,12 +6,12 @@ }: let pname = "bazecor"; - version = "1.5.2"; + version = "1.5.3"; src = appimageTools.extract { inherit pname version; src = fetchurl { url = "https://github.com/Dygmalab/Bazecor/releases/download/v${version}/Bazecor-${version}-x64.AppImage"; - hash = "sha256-Eq66tuRP/+TPLNDQRox8/dMT/7fGGrxmUUML8wJ3v+M="; + hash = "sha256-96BHIOt9vA9sLpR8+XRKi8+h953VWMyAeE04A+4GR2Q="; }; # Workaround for https://github.com/Dygmalab/Bazecor/issues/370 From b00705196878fb0d05c66cdae25488765f4ed124 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Tue, 20 Feb 2024 21:09:42 +0800 Subject: [PATCH 360/617] zls: move to by-name --- .../tools/language-servers => by-name/zl}/zls/deps.nix | 0 .../zls/default.nix => by-name/zl/zls/package.nix} | 4 +--- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) rename pkgs/{development/tools/language-servers => by-name/zl}/zls/deps.nix (100%) rename pkgs/{development/tools/language-servers/zls/default.nix => by-name/zl/zls/package.nix} (94%) diff --git a/pkgs/development/tools/language-servers/zls/deps.nix b/pkgs/by-name/zl/zls/deps.nix similarity index 100% rename from pkgs/development/tools/language-servers/zls/deps.nix rename to pkgs/by-name/zl/zls/deps.nix diff --git a/pkgs/development/tools/language-servers/zls/default.nix b/pkgs/by-name/zl/zls/package.nix similarity index 94% rename from pkgs/development/tools/language-servers/zls/default.nix rename to pkgs/by-name/zl/zls/package.nix index 408bb69f64b6..b685a66a2b08 100644 --- a/pkgs/development/tools/language-servers/zls/default.nix +++ b/pkgs/by-name/zl/zls/package.nix @@ -21,9 +21,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dversion_data_path=${zig_0_13.src}/doc/langref.html.in" ]; - nativeBuildInputs = [ - zig_0_13.hook - ]; + nativeBuildInputs = [ zig_0_13.hook ]; postPatch = '' ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cec23a431dbe..4bc4773b4895 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16731,8 +16731,6 @@ with pkgs; vscode-langservers-extracted = callPackage ../development/tools/language-servers/vscode-langservers-extracted { }; - zls = callPackage ../development/tools/language-servers/zls { }; - ansible-later = callPackage ../tools/admin/ansible/later.nix { }; ansible-lint = callPackage ../tools/admin/ansible/lint.nix { }; From cee9a79a82a71cdd042b472b069ed1950ec11939 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 6 Nov 2024 18:58:59 +0000 Subject: [PATCH 361/617] mtm: drop `darwin.libutil` dependency --- pkgs/tools/misc/mtm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mtm/default.nix b/pkgs/tools/misc/mtm/default.nix index 97d2c72d52be..8ecbc087894b 100644 --- a/pkgs/tools/misc/mtm/default.nix +++ b/pkgs/tools/misc/mtm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, darwin }: +{ lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { pname = "mtm"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0gibrvah059z37jvn1qs4b6kvd4ivk2mfihmcpgx1vz6yg70zghv"; }; - buildInputs = [ ncurses ] ++ lib.optionals stdenv.isDarwin [ darwin.libutil ]; + buildInputs = [ ncurses ]; makeFlags = [ "DESTDIR=${placeholder "out"}" "MANDIR=${placeholder "out"}/share/man/man1" ]; From 6c32a119a5f768a8678c0b9a2ff6433f8b879e0c Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 6 Nov 2024 18:59:47 +0000 Subject: [PATCH 362/617] eternal-terminal: drop `darwin.libutil` dependency --- pkgs/tools/networking/eternal-terminal/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index c580d02a794f..3096ea67840f 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -32,8 +32,6 @@ stdenv.mkDerivation rec { openssl protobuf zlib - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libutil ]; preBuild = '' From c87f921f5066cc6d2bd4aa04688ab9ad2c47de09 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 6 Nov 2024 19:00:38 +0000 Subject: [PATCH 363/617] mg: drop `darwin.libutil` dependency --- pkgs/applications/editors/mg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index 70f5dd604296..2b69571a9109 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, buildPackages, darwin }: +{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, buildPackages }: stdenv.mkDerivation { pname = "mg"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin [ darwin.libutil ]; + buildInputs = [ ncurses ]; meta = with lib; { description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team"; From ec62a8ee9dd48f29e3982b14eba72e5f0a9b61f1 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 6 Nov 2024 19:04:10 +0000 Subject: [PATCH 364/617] chibi: drop `darwin.libutil` dependency --- pkgs/development/interpreters/chibi/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix index 09ffa3ca2128..9cdd21a6b955 100644 --- a/pkgs/development/interpreters/chibi/default.nix +++ b/pkgs/development/interpreters/chibi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, darwin }: +{ lib, stdenv, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { version = "0.11"; @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.libutil; - installPhase = '' make install PREFIX="$out" ''; From dd4d691d9b3bdf73b5f0587a70449f44bca4b5f6 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Wed, 6 Nov 2024 20:08:39 +0100 Subject: [PATCH 365/617] nixosTests.retroarch: format using nixfmt --- nixos/tests/retroarch.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/nixos/tests/retroarch.nix b/nixos/tests/retroarch.nix index 0e5f60aa8be2..330138e8b3b4 100644 --- a/nixos/tests/retroarch.nix +++ b/nixos/tests/retroarch.nix @@ -1,10 +1,14 @@ -import ./make-test-python.nix ({ pkgs, ... }: +import ./make-test-python.nix ( + { pkgs, ... }: { name = "retroarch"; - meta = with pkgs.lib; { maintainers = teams.libretro.members ++ [ maintainers.j0hax ]; }; + meta = with pkgs.lib; { + maintainers = teams.libretro.members ++ [ maintainers.j0hax ]; + }; - nodes.machine = { ... }: + nodes.machine = + { ... }: { imports = [ ./common/user-account.nix ]; @@ -23,11 +27,13 @@ import ./make-test-python.nix ({ pkgs, ... }: }; }; - testScript = { nodes, ... }: + testScript = + { nodes, ... }: let user = nodes.machine.config.users.users.alice; xdo = "${pkgs.xdotool}/bin/xdotool"; - in '' + in + '' with subtest("Wait for login"): start_all() machine.wait_for_file("/tmp/xauth_*") @@ -46,4 +52,5 @@ import ./make-test-python.nix ({ pkgs, ... }: ) machine.screenshot("screen") ''; - }) + } +) From 5d0cd804a5c0d935c7488597cf5de66a9a88c5ff Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Wed, 6 Nov 2024 20:09:10 +0100 Subject: [PATCH 366/617] nixosTests.retroarch: fix test by changing expected window title --- nixos/tests/retroarch.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/retroarch.nix b/nixos/tests/retroarch.nix index 330138e8b3b4..d13ed074b9c9 100644 --- a/nixos/tests/retroarch.nix +++ b/nixos/tests/retroarch.nix @@ -41,7 +41,7 @@ import ./make-test-python.nix ( with subtest("Check RetroArch started"): machine.wait_until_succeeds("pgrep retroarch") - machine.wait_for_window("^RetroArch ") + machine.wait_for_window("^RetroArch") with subtest("Check configuration created"): machine.wait_for_file("${user.home}/.config/retroarch/retroarch.cfg") From 3602fc321de115df5d441cb2d2bc3bec2a84ef04 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 6 Nov 2024 19:06:49 +0000 Subject: [PATCH 367/617] abduco: drop `darwin.libutil` dependency --- pkgs/tools/misc/abduco/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix index 1f454d40bc85..eef5fe0df344 100644 --- a/pkgs/tools/misc/abduco/default.nix +++ b/pkgs/tools/misc/abduco/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchzip, writeText, darwin, conf ? null }: +{ lib, stdenv, fetchpatch, fetchzip, writeText, conf ? null }: let rev = "8c32909a159aaa9484c82b71f05b7a73321eb491"; @@ -21,10 +21,6 @@ stdenv.mkDerivation { installFlags = [ "install-completion" ]; CFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE"; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libutil - ]; - patches = [ # https://github.com/martanne/abduco/pull/22 (fetchpatch { From 56878d144961c7b169703de1af35b132d95a2295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 7 Nov 2024 00:16:13 +0100 Subject: [PATCH 368/617] bruno: remove phantomjs --- pkgs/by-name/br/bruno/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 72d8c643b40c..19c05ce4b4ac 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -5,7 +5,6 @@ buildNpmPackage, nix-update-script, electron, - writeShellScriptBin, makeWrapper, copyDesktopItems, makeDesktopItem, @@ -37,7 +36,6 @@ buildNpmPackage rec { nativeBuildInputs = [ - (writeShellScriptBin "phantomjs" "echo 2.1.1") pkg-config ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ From f90a7c4dbd7e5769102a82cc85ba651553c5599d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 7 Nov 2024 00:20:32 +0100 Subject: [PATCH 369/617] bruno: 1.34.0 -> 1.34.2 --- pkgs/by-name/br/bruno/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 19c05ce4b4ac..5f0e15fc5db4 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -18,20 +18,20 @@ buildNpmPackage rec { pname = "bruno"; - version = "1.34.0"; + version = "1.34.2"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; rev = "v${version}"; - hash = "sha256-6UcByIiKBAIicH3dNF+6byuj/WsEb4Xi+iPvfjPsQkA="; + hash = "sha256-ydb80+FP2IsobvCZiIKzbErAJNakVoSoYrhddmPmYkc="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-z8d1paC5VQ/XsXJuQ6Z7PjSwC6abN6kRmG0sfI9aCqw="; + npmDepsHash = "sha256-ODE8GLIgdUEOiniki8jzkHfU5TKHWoIIbjGJjNzMZCI="; npmFlags = [ "--legacy-peer-deps" ]; nativeBuildInputs = From 7eb779860dafba203b048a56c0ee29ed5fb4303b Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Mon, 4 Nov 2024 10:13:20 -0800 Subject: [PATCH 370/617] llvmPackages_19.libclc: use unwrapped clang only The build requires an unwrapped clang due to passing in --arch flags. However, for c++ it doesn't pass in --arch and requires standard headers so which requires the wrapped compiler. --- pkgs/development/compilers/llvm/common/libclc.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/common/libclc.nix b/pkgs/development/compilers/llvm/common/libclc.nix index c24fc6e3b4c0..d20e6877019b 100644 --- a/pkgs/development/compilers/llvm/common/libclc.nix +++ b/pkgs/development/compilers/llvm/common/libclc.nix @@ -17,6 +17,14 @@ let spirv-llvm-translator = buildPackages.spirv-llvm-translator.override { inherit (buildLlvmTools) llvm; }; + + # The build requires an unwrapped clang but wrapped clang++ thus we need to + # split the unwrapped clang out to prevent the build from finding the + # unwrapped clang++ + clang-only = runCommand "clang-only" { } '' + mkdir -p "$out"/bin + ln -s "${lib.getExe' buildLlvmTools.clang.cc "clang"}" "$out"/bin + ''; in stdenv.mkDerivation rec { pname = "libclc"; @@ -78,7 +86,7 @@ stdenv.mkDerivation rec { python3 ] ++ lib.optional (lib.versionAtLeast release_version "19") [ - buildLlvmTools.clang.cc + clang-only buildLlvmTools.llvm spirv-llvm-translator ]; From 1ab5205fbbfa29497a53b71f2fdf8ba12e0fe641 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Tue, 5 Nov 2024 22:49:32 -0800 Subject: [PATCH 371/617] llvmPackages_19.bolt: upstream patch to fix darwin build https://github.com/llvm/llvm-project/commit/5909979869edca359bcbca74042c2939d900680e --- pkgs/development/compilers/llvm/common/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index eaba6f45edfe..fd818bb49a74 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -947,6 +947,10 @@ let url = "https://github.com/llvm/llvm-project/commit/abc2eae68290c453e1899a94eccc4ed5ea3b69c1.patch"; hash = "sha256-oxCxOjhi5BhNBEraWalEwa1rS3Mx9CuQgRVZ2hrbd7M="; }) + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5909979869edca359bcbca74042c2939d900680e.patch"; + hash = "sha256-l4rQHYbblEADBXaZIdqTG0sZzH4fEQvYiqhLYNZDMa8="; + }) ]; }; } From 3cd45d08ee502f9de7391f59d60fa13c106c5838 Mon Sep 17 00:00:00 2001 From: Reno Dakota <170618376+paparodeo@users.noreply.github.com> Date: Fri, 1 Nov 2024 03:42:29 +0000 Subject: [PATCH 372/617] llvmPackages_19: 19.1.1 -> 19.1.3 https://github.com/llvm/llvm-project/releases/tag/llvmorg-19.1.3 --- pkgs/development/compilers/llvm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 4d52e48d8775..24a028e77974 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -28,7 +28,7 @@ let "16.0.6".officialRelease.sha256 = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs="; "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; - "19.1.1".officialRelease.sha256 = "sha256-xTo44+vH1Bz49fEl4bIpU3eIgQtFuBTGbgU7mzeY33s="; + "19.1.3".officialRelease.sha256 = "sha256-NUx01eJNsYMlk+8mtlf10isIqhK8zBmqaOTjuFqMNRQ="; "20.0.0-git".gitRelease = { rev = "0e8555d4dbfdfeddc01dc2ecf9a9b6e804f7b645"; rev-version = "20.0.0-unstable-2024-10-07"; From 582038c3978b46a38f1b7e0735b9a13e5a78098d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 7 Nov 2024 00:57:32 +0100 Subject: [PATCH 373/617] bruno: remove `with lib;`, order meta attrs --- pkgs/by-name/br/bruno/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 5f0e15fc5db4..4ec73a84b490 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -158,19 +158,19 @@ buildNpmPackage rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Open-source IDE For exploring and testing APIs"; homepage = "https://www.usebruno.com"; - platforms = platforms.linux ++ platforms.darwin; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + mainProgram = "bruno"; + maintainers = with lib.maintainers; [ gepbird kashw2 lucasew mattpolzin - water-sucks redyf + water-sucks ]; - mainProgram = "bruno"; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } From cc0b65fb0495a005880312ddb901da8621b1aec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 7 Nov 2024 01:37:53 +0100 Subject: [PATCH 374/617] bruno: add back giflib removal patch --- pkgs/by-name/br/bruno/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 4ec73a84b490..623998e9fd61 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -78,6 +78,14 @@ buildNpmPackage rec { ELECTRON_SKIP_BINARY_DOWNLOAD = 1; + # remove giflib dependency + npmRebuildFlags = [ "--ignore-scripts" ]; + preBuild = '' + substituteInPlace node_modules/canvas/binding.gyp \ + --replace-fail "'with_gif%': ' Date: Wed, 6 Nov 2024 19:08:09 +0000 Subject: [PATCH 375/617] apbs: drop unnecessary Darwin dependencies --- pkgs/applications/science/chemistry/apbs/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/science/chemistry/apbs/default.nix b/pkgs/applications/science/chemistry/apbs/default.nix index 87cd5fed1373..bb8ba7afeff3 100644 --- a/pkgs/applications/science/chemistry/apbs/default.nix +++ b/pkgs/applications/science/chemistry/apbs/default.nix @@ -7,8 +7,6 @@ , suitesparse , python3 , libintl -, libiconv -, darwin }: let # this is a fork version of fetk (http://www.fetk.org/) @@ -87,8 +85,6 @@ stdenv.mkDerivation (finalAttrs: { python3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libintl - libiconv - darwin.libutil ]; cmakeFlags = [ From 1b080335df4b69cd23231aae445897759787faff Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 6 Nov 2024 19:08:58 +0000 Subject: [PATCH 376/617] uhdm: drop `darwin.libutil` dependency --- pkgs/applications/science/logic/uhdm/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/science/logic/uhdm/default.nix b/pkgs/applications/science/logic/uhdm/default.nix index eb078d482732..72b55ffbcd7a 100644 --- a/pkgs/applications/science/logic/uhdm/default.nix +++ b/pkgs/applications/science/logic/uhdm/default.nix @@ -5,7 +5,6 @@ , python3 , capnproto , gtest -, darwin }: stdenv.mkDerivation (finalAttrs: { @@ -29,8 +28,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ capnproto - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libutil ]; cmakeFlags = [ From 81a67492e9ee7e46028823f8b8fcc703373197c6 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 6 Nov 2024 19:09:34 +0000 Subject: [PATCH 377/617] surelog: drop `darwin.libutil` dependency --- pkgs/applications/science/logic/surelog/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/surelog/default.nix b/pkgs/applications/science/logic/surelog/default.nix index 595a3e168040..0d795611b95a 100644 --- a/pkgs/applications/science/logic/surelog/default.nix +++ b/pkgs/applications/science/logic/surelog/default.nix @@ -12,7 +12,6 @@ , antlr4 , capnproto , nlohmann_json -, darwin }: stdenv.mkDerivation (finalAttrs: { @@ -46,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { capnproto antlr4.runtime.cpp nlohmann_json - ] ++ lib.optional stdenv.isDarwin [ darwin.libutil ]; + ]; cmakeFlags = [ "-DSURELOG_USE_HOST_CAPNP=On" From d1e72625646d84fd1781ef818e5619ccfddcfafb Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 6 Nov 2024 19:10:31 +0000 Subject: [PATCH 378/617] pypy{27,39,310}: drop `darwin.libutil` dependency --- pkgs/development/interpreters/python/pypy/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index b850c79be87a..795bceede768 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, substituteAll, fetchurl , zlibSupport ? true, zlib -, bzip2, pkg-config, libffi, darwin +, bzip2, pkg-config, libffi , sqlite, openssl, ncurses, python, expat, tcl, tk, tclPackages, libX11 , gdbm, db, xz, python-setup-hook , optimizationLevel ? "jit", boehmgc @@ -63,8 +63,6 @@ in with passthru; stdenv.mkDerivation rec { zlib ] ++ lib.optionals (lib.any (l: l == optimizationLevel) [ "0" "1" "2" "3"]) [ boehmgc - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libutil ]; # Remove bootstrap python from closure From 7863b8cf18a5a895c85d3b22cc2e8b6007596380 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 6 Nov 2024 19:11:14 +0000 Subject: [PATCH 379/617] netbsd.install: drop `darwin.libutil` dependency --- pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix b/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix index b179544eaee3..84934b592171 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/install/package.nix @@ -11,7 +11,6 @@ groff, compatIfNeeded, fts, - darwin, stdenv, }: @@ -44,8 +43,7 @@ mkDerivation { # fts header is needed. glibc already has this header, but musl doesn't, # so make sure pkgsMusl.netbsd.install still builds in case you want to # remove it! - ++ [ fts ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ]; + ++ [ fts ]; installPhase = '' runHook preInstall From 6bcccb6a8d8c3d0072ac4e166abb52c73fbd3643 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 6 Nov 2024 19:13:18 +0000 Subject: [PATCH 380/617] fnc: drop `darwin.libutil` dependency --- pkgs/applications/version-management/fnc/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix index 293fb563af60..b0bae95ba9d1 100644 --- a/pkgs/applications/version-management/fnc/default.nix +++ b/pkgs/applications/version-management/fnc/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, stdenv, zlib, ncurses, libiconv, darwin }: +{ lib, fetchurl, stdenv, zlib, ncurses, libiconv }: stdenv.mkDerivation (finalAttrs: { pname = "fnc"; @@ -9,9 +9,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-npS+sOxF0S/9TuFjtEFlev0HpIOsaP6zmcfopPNUehk="; }; - buildInputs = [ libiconv ncurses zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.libutil - ]; + buildInputs = [ libiconv ncurses zlib ]; makeFlags = [ "PREFIX=$(out)" ]; From 5af01c33cd74f9d5fb4781025f9befd7a95ff451 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 6 Nov 2024 19:14:09 +0000 Subject: [PATCH 381/617] fnc: set minimum version for Darwin --- pkgs/applications/version-management/fnc/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix index b0bae95ba9d1..71682501b28f 100644 --- a/pkgs/applications/version-management/fnc/default.nix +++ b/pkgs/applications/version-management/fnc/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, stdenv, zlib, ncurses, libiconv }: +{ lib, fetchurl, stdenv, zlib, ncurses, libiconv, apple-sdk_11, darwinMinVersionHook }: stdenv.mkDerivation (finalAttrs: { pname = "fnc"; @@ -9,16 +9,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-npS+sOxF0S/9TuFjtEFlev0HpIOsaP6zmcfopPNUehk="; }; - buildInputs = [ libiconv ncurses zlib ]; + buildInputs = [ libiconv ncurses zlib apple-sdk_11 (darwinMinVersionHook "11.0") ]; makeFlags = [ "PREFIX=$(out)" ]; env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ # Needed with GCC 12 "-Wno-error=maybe-uninitialized" - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # error: 'strtonum' is only available on macOS 11.0 or newer - "-Wno-error=unguarded-availability-new" ]); preInstall = '' From 59da82bf02fa2adc654482e464b0aaf79d4d5d6b Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 6 Nov 2024 19:17:50 +0000 Subject: [PATCH 382/617] macvim: drop `darwin.libutil` dependency --- pkgs/applications/editors/vim/macvim.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 2005eef7b6fe..23aa24ff9b6d 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -139,7 +139,6 @@ stdenv.mkDerivation (finalAttrs: { # Xcode project or pass it as a flag to xcodebuild as well. postConfigure = '' substituteInPlace src/auto/config.mk \ - --replace "PERL_CFLAGS${"\t"}=" "PERL_CFLAGS${"\t"}= -I${darwin.libutil}/include" \ --replace " -L${stdenv.cc.libc}/lib" "" \ --replace " -L${darwin.libobjc}/lib" "" \ --replace " -L${darwin.libunwind}/lib" "" \ From 9bf6e33999fd2409b443f1a5ba85b36a880dcc15 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 6 Nov 2024 19:05:11 +0000 Subject: [PATCH 383/617] libuv: clarify `darwin.libutil` dependency --- pkgs/development/libraries/libuv/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 7f9aac48e725..181462dc39dd 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -87,7 +87,11 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ automake autoconf libtool pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ]; + # This is part of the Darwin bootstrap, so we don’t always get + # `libutil.dylib` automatically propagated through the SDK. + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + (lib.getLib darwin.libutil) + ]; preConfigure = '' LIBTOOLIZE=libtoolize ./autogen.sh From 3bccc23ed991c13e2f93e47d5e8d04a7d344915f Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 7 Nov 2024 02:15:23 +0100 Subject: [PATCH 384/617] evolution-data-server: restrict meta.platforms --- pkgs/by-name/ev/evolution-data-server/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix index c99f294e31d4..1bddb3481aab 100644 --- a/pkgs/by-name/ev/evolution-data-server/package.nix +++ b/pkgs/by-name/ev/evolution-data-server/package.nix @@ -179,6 +179,6 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.gnome.org/GNOME/evolution-data-server/-/blob/${version}/NEWS?ref_type=tags"; license = licenses.lgpl2Plus; maintainers = teams.gnome.members; - platforms = platforms.unix; + platforms = platforms.linux; # requires libuuid }; } From e8361acc3ac252ebb2f9c3e3d11fab4d5f54b9e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:13 -0300 Subject: [PATCH 385/617] lxqt.libdbusmenu-lxqt: 0.1.0 -> 0.2.0 --- pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix b/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix index 62504bb33b54..5c4ac79a2d82 100644 --- a/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix +++ b/pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libdbusmenu-lxqt"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-fwYvU62NCmJ6HNrOqHPWKDas7LE1XF3squ0CBEFkNkk="; + hash = "sha256-OF12t08hOuDsl80n4lXO3AFCf29f01eDpoRcbXmI4+I="; }; nativeBuildInputs = [ From 7ac4672737cdcf880076b2c6ce940129e817966b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:13 -0300 Subject: [PATCH 386/617] lxqt.liblxqt: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/liblxqt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index 430c33c03605..83ed1106ff40 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "liblxqt"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-ClAmREsPBb7i7T2aGgf0h3rk1ohUvWQvmSnrlprHzds="; + hash = "sha256-90t7jukm2vNfkgZ3326UDMXNzwJ+FIVEF3kNZ2SgNN8="; }; nativeBuildInputs = [ From 5f87c693d5b1649fbfaf46beecf1368cf869a0d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:13 -0300 Subject: [PATCH 387/617] lxqt.libfm-qt: 2.0.2 -> 2.1.0 --- pkgs/desktops/lxqt/libfm-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index 694c4452b45a..6bfd1bafb536 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -15,7 +15,7 @@ , qttools , wrapQtAppsHook , gitUpdater -, version ? "2.0.2" +, version ? "2.1.0" , qtx11extras ? null }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { rev = version; hash = { "1.4.0" = "sha256-QxPYSA7537K+/dRTxIYyg+Q/kj75rZOdzlUsmSdQcn4="; - "2.0.2" = "sha256-Ntj+yixGGGgL8ylRv2IJsWtapxE71JNl9cC9K0JToNU="; + "2.1.0" = "sha256-yH3lyOpmDWjA3bV6msjw7fShs1HnAFOmkGer2Z9N/Tg="; }."${version}"; }; From d5ca691506d58208f12a01f23f949d105a3caaae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:13 -0300 Subject: [PATCH 388/617] lxqt.libqtxdg: 4.0.1 -> 4.1.0 --- pkgs/desktops/lxqt/libqtxdg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index 5de096ee29e1..ebb4baa05ddd 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -7,7 +7,7 @@ , lxqt-build-tools , wrapQtAppsHook , gitUpdater -, version ? "4.0.1" +, version ? "4.1.0" }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { rev = version; hash = { "3.12.0" = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU="; - "4.0.1" = "sha256-h8uHIB0KuSHQVHI61h5BmpvpJHumloHMKN3GabH66EM="; + "4.1.0" = "sha256-Efn08a8MkR459Ww0WiEb5GXKgQzJwKupIdL2TySpivE="; }."${version}"; }; From d8096ebda60f3fdbd132e08bd38a99f5af1a31ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:14 -0300 Subject: [PATCH 389/617] lxqt.lximage-qt: 2.0.1 -> 2.1.0 --- pkgs/desktops/lxqt/lximage-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index 6d0248e3e594..4a6013f6eb1a 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "lximage-qt"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-I0DyC8i+OnHxHcpp/xPsKjr3UgvUHlVO8h9Tjhg7Pg8="; + hash = "sha256-08HEPTbZw4CCq3A9KxMKeT/X1notXwsV1sSSgtRFPO0="; }; nativeBuildInputs = [ From dcc8ea2e01e38f94ec48aeceb9e06aeff3784645 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:14 -0300 Subject: [PATCH 390/617] lxqt.libsysstat: 1.0.0 -> 1.1.0 --- pkgs/desktops/lxqt/libsysstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix index daaad022edf5..09b8450740ad 100644 --- a/pkgs/desktops/lxqt/libsysstat/default.nix +++ b/pkgs/desktops/lxqt/libsysstat/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "libsysstat"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-2rdhw67TPvy/QmyzbtStgiIuIgZ7ZSt07xjCvOywKF4="; + hash = "sha256-CwQz0vaBhMe32xBoSgFkxSwx3tnIHutp9Vs32FvTNVU="; }; nativeBuildInputs = [ From f85e90408df1f0a037740d5c9bc67cdbfb8a95b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:14 -0300 Subject: [PATCH 391/617] lxqt.lxqt-about: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-about/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix index 73b49561d886..eaf0d808df08 100644 --- a/pkgs/desktops/lxqt/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/lxqt-about/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "lxqt-about"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-Y0OF4W0quQEet/QvntwGwFqaqJDDUchWYRh+OWZDS8w="; + hash = "sha256-BjtU63SD6y4LnjAr8QGMqo/aYkcQ0Y+vg3lAOf97ZY8="; }; nativeBuildInputs = [ From 2c6e2101878bda9d01a411617886e8512698a710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:14 -0300 Subject: [PATCH 392/617] lxqt.lxqt-archiver: 1.0.0 -> 1.1.0 --- pkgs/desktops/lxqt/lxqt-archiver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix index 9cef42cdb629..0dabe275542c 100644 --- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "lxqt-archiver"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-archiver"; rev = version; - hash = "sha256-32Wq0Faphu0uSG0RdOqrDD/igrNaP6l1mtuV+HcsdcQ="; + hash = "sha256-a3NdU1OZI+BqtvpUhqhwylf5upFJxeg8B+1cPTAdDr4="; }; nativeBuildInputs = [ From c8c145fd036048a06a2e9eab03fd8688ea64a170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:14 -0300 Subject: [PATCH 393/617] lxqt.lxqt-admin: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-admin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix index e83b1788dc3a..b194f6e09f6a 100644 --- a/pkgs/desktops/lxqt/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "lxqt-admin"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-Ps+XiCA6OmnsYj0D+pxpvRxfIZfRGFBbZ0t/IPZjlv8="; + hash = "sha256-7RyPUv/M8mMoRO+SopFuru+bY9ZwnKz2BkiLz1cW/wg="; }; nativeBuildInputs = [ From 6360f16e7f31ef8a871f3412b59ebf13f20ca673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:14 -0300 Subject: [PATCH 394/617] lxqt.lxqt-config: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index 3eb1c3a1013f..a7a5d7df7191 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "lxqt-config"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-lFZTu6MqqWTjytYC7In/YJ38PYksZXduHvA/FRY4v0U="; + hash = "sha256-zAJD1p0iJUEN+pOW1nyVKrCBfew/uqVNqw9aCFq+JY4="; }; nativeBuildInputs = [ From 0755098f0b8ae72c144b6c9a83c8fb130c6c332c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:14 -0300 Subject: [PATCH 395/617] lxqt.lxqt-build-tools: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-build-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index 418738f5853b..7c1a96cfe784 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -9,7 +9,7 @@ , perl , wrapQtAppsHook , gitUpdater -, version ? "2.0.0" +, version ? "2.1.0" }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { rev = version; hash = { "0.13.0" = "sha256-4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA="; - "2.0.0" = "sha256-ZFvnIumP03Mp+4OHPe1yMVsSYhMmYUY1idJGCAy5IhA="; + "2.1.0" = "sha256-fZ5DbXnYm6oWDZdwiw2DpWFQMYd7VZ4oKkGIzQkaV94="; }."${version}"; }; From 1039653d0caad377b7a545bad491700011308e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:14 -0300 Subject: [PATCH 396/617] lxqt.lxqt-globalkeys: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-globalkeys/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index df6972bd80e1..8079df71267e 100644 --- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "lxqt-globalkeys"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-24alERAnzlU/ZwIlRy9B+58zjRnF9eXunWeEO/lDVxM="; + hash = "sha256-jQdr3epezQtBoyC2hyMBceiqarruZLasSMYa2gDraCI="; }; nativeBuildInputs = [ From a8199e83f62ba6689e73e5c2b3b8c2f24b171eee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:15 -0300 Subject: [PATCH 397/617] lxqt.lxqt-menu-data: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-menu-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix index 84b4882f3643..da2e76105939 100644 --- a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix +++ b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "lxqt-menu-data"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-CNY23xdFiDQKKJf9GccwDOuBWXwfc7WNI7vMv/zOM9U="; + hash = "sha256-Q9VPPGPyMueoFrTTdAMlIR+VnWVXu0J2uXhaOlJPTAs="; }; nativeBuildInputs = [ From 761b105f8f5bb8b2fc901776e31edc29a1603b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:15 -0300 Subject: [PATCH 398/617] lxqt.lxqt-notificationd: 2.0.1 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-notificationd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index 70cb087fcc15..a88f3317b3ea 100644 --- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "lxqt-notificationd"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-qmBHeXKBJD97Me2zNSn7bNr0UrObGmvj8Pn19GQGktI="; + hash = "sha256-Iu3U036ebh9lMxCn1gt29nCQxs7N2ZLQHfg9HP3FSm0="; }; nativeBuildInputs = [ From 0c871b1337685980a6f4da6554534263c4a611e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:15 -0300 Subject: [PATCH 399/617] lxqt.lxqt-openssh-askpass: 2.0.1 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index e3e8d52977f1..2a42933d5c49 100644 --- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "lxqt-openssh-askpass"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-poTOXVvVUdM6m1mHBgQGS+mVHu6O4iBKQRs0JwpU8X0="; + hash = "sha256-oFN4FpTBxOcXtykkkrJvaoxhvwEJKBp+eusrrSBIXIU="; }; nativeBuildInputs = [ From 514bd9d7401af2e744d1cee8d41a410d1d5fda3f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 7 Nov 2024 12:30:52 +1000 Subject: [PATCH 400/617] go_1_23: 1.23.2 -> 1.23.3 Changelog: https://go.dev/doc/devel/release#go1.23 --- pkgs/development/compilers/go/1.23.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index 229d19ff06e7..14a80eae8046 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.23.2"; + version = "1.23.3"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-NpMBYqk99BfZC9IsbhTa/0cFuqwrAkGO3aZxzfqc0H8="; + hash = "sha256-jWp3MySHVXxq+iQhExtQ+D20rjxXnDvHLmcO4faWhZk="; }; strictDeps = true; From f144fc5b96af309f1c50f540be0208568e33bf1f Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 7 Nov 2024 02:34:54 +0000 Subject: [PATCH 401/617] mpdecimal: use absolute library install names on Darwin Closes: #354088 --- pkgs/development/libraries/mpdecimal/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mpdecimal/default.nix b/pkgs/development/libraries/mpdecimal/default.nix index 1041100f9f8e..82643b197109 100644 --- a/pkgs/development/libraries/mpdecimal/default.nix +++ b/pkgs/development/libraries/mpdecimal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, updateAutotoolsGnuConfigScriptsHook }: +{ lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { pname = "mpdecimal"; @@ -10,10 +10,16 @@ stdenv.mkDerivation rec { hash = "sha256-lCRFwyRbInMP1Bpnp8XCMdEcsbmTa5wPdjNPt9C0Row="; }; - nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; + nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ]; + postPatch = '' + # Use absolute library install names on Darwin. + substituteInPlace configure.ac \ + --replace-fail '-install_name @rpath/' "-install_name $out/lib/" + ''; + postInstall = '' mkdir -p $cxx/lib mv $out/lib/*c++* $cxx/lib From 8477b05aac862a91ca181d6ead7d58cffff37e31 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Mon, 14 Oct 2024 21:38:15 -0700 Subject: [PATCH 402/617] gettext: fix compiling with clang --- .../development/libraries/gettext/default.nix | 11 +++- .../libraries/gettext/fix-getcwd-clang.patch | 63 +++++++++++++++++++ 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/gettext/fix-getcwd-clang.patch diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 0518a40c2930..2a69b5702172 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -19,7 +19,16 @@ stdenv.mkDerivation rec { # fix reproducibile output, in particular in the grub2 build # https://savannah.gnu.org/bugs/index.php?59658 ./0001-msginit-Do-not-use-POT-Creation-Date.patch - ]; + ] + # An accidental inclusion in https://marc.info/?l=glibc-alpha&m=150511271003225&w=2 + # resulted in a getcwd prototype to be added in when it isn't needed. + # Clang does not like this unless the "overridable" attribute was appied. + # Since we don't need to redeclare getcwd, we can just remove it. + # + # Issue: https://github.com/NixOS/nixpkgs/issues/348658 + # Fixed in https://github.com/autotools-mirror/gettext/commit/cb2c1486336462c8180f487221181ee798b0e73e + # Remove in 0.22.5 upgrade. + ++ lib.optional (stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin) ./fix-getcwd-clang.patch; outputs = [ "out" "man" "doc" "info" ]; diff --git a/pkgs/development/libraries/gettext/fix-getcwd-clang.patch b/pkgs/development/libraries/gettext/fix-getcwd-clang.patch new file mode 100644 index 000000000000..fb040b652681 --- /dev/null +++ b/pkgs/development/libraries/gettext/fix-getcwd-clang.patch @@ -0,0 +1,63 @@ +From cb2c1486336462c8180f487221181ee798b0e73e Mon Sep 17 00:00:00 2001 +From: Bruno Haible +Date: Thu, 9 Feb 2023 16:58:20 +0100 +Subject: [PATCH] Fix compilation errors with ISO C 23 compilers. + +* gettext-runtime/intl/dcigettext.c (getwd, getcwd): Assume a declaration in the +system header files. +* gettext-runtime/intl/gettextP.h (SWAP): Drop K&C compatibility. +--- + gettext-runtime/intl/dcigettext.c | 5 +---- + gettext-runtime/intl/gettextP.h | 7 +------ + 2 files changed, 2 insertions(+), 10 deletions(-) + +diff --git a/gettext-runtime/intl/dcigettext.c b/gettext-runtime/intl/dcigettext.c +index e7cb9b962..666a624b0 100644 +--- a/gettext-runtime/intl/dcigettext.c ++++ b/gettext-runtime/intl/dcigettext.c +@@ -1,5 +1,5 @@ + /* Implementation of the internal dcigettext function. +- Copyright (C) 1995-2021 Free Software Foundation, Inc. ++ Copyright (C) 1995-2023 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by +@@ -139,13 +139,10 @@ extern int errno; + # define tfind __tfind + #else + # if !defined HAVE_GETCWD +-char *getwd (); + # define getcwd(buf, max) getwd (buf) + # else + # if VMS + # define getcwd(buf, max) (getcwd) (buf, max, 0) +-# else +-char *getcwd (); + # endif + # endif + # ifndef HAVE_STPCPY +diff --git a/gettext-runtime/intl/gettextP.h b/gettext-runtime/intl/gettextP.h +index bb00555ee..536e8bd43 100644 +--- a/gettext-runtime/intl/gettextP.h ++++ b/gettext-runtime/intl/gettextP.h +@@ -1,5 +1,5 @@ + /* Header describing internals of libintl library. +- Copyright (C) 1995-2021 Free Software Foundation, Inc. ++ Copyright (C) 1995-2023 Free Software Foundation, Inc. + Written by Ulrich Drepper , 1995. + + This program is free software: you can redistribute it and/or modify +@@ -113,12 +113,7 @@ extern char *libintl_dcigettext (const char *__domainname, + # define SWAP(i) bswap_32 (i) + #else + static inline nls_uint32 +-# ifdef __cplusplus + SWAP (nls_uint32 i) +-# else +-SWAP (i) +- nls_uint32 i; +-# endif + { + return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24); + } + From d662bd1a9bf3eae3b85fcefd119373cdbb88d712 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Fri, 1 Nov 2024 23:41:21 -0700 Subject: [PATCH 403/617] manga-tui: 0.3.1 -> 0.4.0 --- .../0001-fix-remove-flaky-test.patch | 42 +++++++++++++++++++ pkgs/by-name/ma/manga-tui/package.nix | 16 +++++-- 2 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 pkgs/by-name/ma/manga-tui/0001-fix-remove-flaky-test.patch diff --git a/pkgs/by-name/ma/manga-tui/0001-fix-remove-flaky-test.patch b/pkgs/by-name/ma/manga-tui/0001-fix-remove-flaky-test.patch new file mode 100644 index 000000000000..78358ae23e69 --- /dev/null +++ b/pkgs/by-name/ma/manga-tui/0001-fix-remove-flaky-test.patch @@ -0,0 +1,42 @@ +From e84ddb20ca6b99ec2bf84bb3c3cfc3cdbbfd5ff2 Mon Sep 17 00:00:00 2001 +From: Youwen Wu +Date: Wed, 6 Nov 2024 02:11:30 -0800 +Subject: [PATCH] fix: remove flaky test + +--- + src/view/pages/manga.rs | 21 --------------------- + 1 file changed, 21 deletions(-) + +diff --git a/src/view/pages/manga.rs b/src/view/pages/manga.rs +index 119d9ea..7179a22 100644 +--- a/src/view/pages/manga.rs ++++ b/src/view/pages/manga.rs +@@ -1853,25 +1853,4 @@ mod test { + assert_eq!(manga_page.bookmark_state.phase, BookmarkPhase::SearchingFromApi); + assert_eq!(expected, result) + } +- +- #[tokio::test] +- async fn it_sends_event_chapter_bookmarked_failed_to_fetch() { +- let (tx, _) = unbounded_channel(); +- let mut manga_page = MangaPage::new(Manga::default(), None).with_global_sender(tx); +- +- flush_events(&mut manga_page); +- +- let api_client = TestApiClient::with_failing_response(); +- +- manga_page.fetch_chapter_bookmarked(ChapterBookmarked::default(), api_client); +- +- let expected = MangaPageEvents::FetchBookmarkFailed; +- +- let result = timeout(Duration::from_millis(250), manga_page.local_event_rx.recv()) +- .await +- .unwrap() +- .unwrap(); +- +- assert_eq!(expected, result); +- } + } +-- +2.46.1 + diff --git a/pkgs/by-name/ma/manga-tui/package.nix b/pkgs/by-name/ma/manga-tui/package.nix index 19a5e56ca4c7..ddcf42659eae 100644 --- a/pkgs/by-name/ma/manga-tui/package.nix +++ b/pkgs/by-name/ma/manga-tui/package.nix @@ -3,13 +3,14 @@ rustPlatform, fetchFromGitHub, pkg-config, + fetchpatch, openssl, sqlite, stdenv, darwin, }: let - version = "0.3.1"; + version = "0.4.0"; in rustPlatform.buildRustPackage { pname = "manga-tui"; @@ -19,10 +20,19 @@ rustPlatform.buildRustPackage { owner = "josueBarretogit"; repo = "manga-tui"; rev = "v${version}"; - hash = "sha256-672AuQWviwihnUS3G0xSn4IAMHy0fPE1VLDfu8wrPGg="; + hash = "sha256-Se0f5jfYBmvemrYRKduDr1yT3fB2wfQP1fDpa/qrYlI="; }; - cargoHash = "sha256-yf0hISz/jHtrO1clTSIKfxFiwI+W0Mu3mY+XW6+ynJU="; + patches = [ + # apply patches to fix failing tests + (fetchpatch { + url = "https://github.com/josueBarretogit/manga-tui/commit/131a5208e6a3d74a9ad852baab75334e4a1ebf34.patch"; + hash = "sha256-RIliZcaRVUOb33Cl+uBkMH4b34S1JpvnPGv+QCFQZ58="; + }) + ./0001-fix-remove-flaky-test.patch + ]; + + cargoHash = "sha256-IufJPCvUEWR5p4PrFlaiQPW9wyIFj/Pd/JHki69L6Es="; nativeBuildInputs = [ pkg-config ]; From 9615e31ef4eb6874f3d638b96e683b252177b26b Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Sun, 3 Nov 2024 00:08:47 -0700 Subject: [PATCH 404/617] manga-tui: add update script --- pkgs/by-name/ma/manga-tui/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ma/manga-tui/package.nix b/pkgs/by-name/ma/manga-tui/package.nix index ddcf42659eae..81fddfde4874 100644 --- a/pkgs/by-name/ma/manga-tui/package.nix +++ b/pkgs/by-name/ma/manga-tui/package.nix @@ -8,6 +8,7 @@ sqlite, stdenv, darwin, + nix-update-script, }: let version = "0.4.0"; @@ -60,4 +61,6 @@ rustPlatform.buildRustPackage { ]; mainProgram = "manga-tui"; }; + + passthru.updateScript = nix-update-script { }; } From 4536df568f671af73c5559b675b2a547ad6d73e9 Mon Sep 17 00:00:00 2001 From: Shogo Takata Date: Thu, 7 Nov 2024 01:24:02 +0900 Subject: [PATCH 405/617] circt: fix build failure on darwin Some additional fixes for darwin platforms since build was still failing after #348019. On x86_64-darwin: Some tests have been disabled because of an issue with rosetta on hydra. On aarch64-darwin: Timeout is increased so it won't fail on hydra. --- pkgs/by-name/ci/circt/package.nix | 46 ++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix index 180fc1d2fbe4..6042e95d5c34 100644 --- a/pkgs/by-name/ci/circt/package.nix +++ b/pkgs/by-name/ci/circt/package.nix @@ -48,25 +48,45 @@ stdenv.mkDerivation rec { "-DCIRCT_LLHD_SIM_ENABLED=OFF" ]; - # There are some tests depending on `clang-tools` to work. They are activated only when detected - # `clang-tidy` in PATH, However, we cannot simply put `clang-tools` in checkInputs to make these - # tests work. Because - # - # 1. The absolute paths of binaries used in tests are resolved in configure phase. - # 2. When stdenv = clangStdenv, the `clang-tidy` binary appears in PATH via `clang-unwrapped`, - # which is always placed before `${clang-tools}/bin` in PATH. `clang-tidy` provided in - # `clang-unwrapped` cause tests failing because it is not wrapped to resolve header search paths. - # https://github.com/NixOS/nixpkgs/issues/214945 discusses this issue. - # - # As a temporary fix, we disabled these tests when using clang stdenv # cannot use lib.optionalString as it creates an empty string, disabling all tests - LIT_FILTER_OUT = if stdenv.cc.isClang then "CIRCT :: Target/ExportSystemC/.*\.mlir" else null; + LIT_FILTER_OUT = + let + lit-filters = + # There are some tests depending on `clang-tools` to work. They are activated only when detected + # `clang-tidy` in PATH, However, we cannot simply put `clang-tools` in checkInputs to make these + # tests work. Because + # + # 1. The absolute paths of binaries used in tests are resolved in configure phase. + # 2. When stdenv = clangStdenv, the `clang-tidy` binary appears in PATH via `clang-unwrapped`, + # which is always placed before `${clang-tools}/bin` in PATH. `clang-tidy` provided in + # `clang-unwrapped` cause tests failing because it is not wrapped to resolve header search paths. + # https://github.com/NixOS/nixpkgs/issues/214945 discusses this issue. + # + # As a temporary fix, we disabled these tests when using clang stdenv + lib.optionals stdenv.cc.isClang [ "CIRCT :: Target/ExportSystemC/.*\.mlir" ] + # Disable some tests on x86_64-darwin + ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [ + # These test seem to pass on hydra (rosetta) but not on x86_64-darwin machines + "CIRCT :: Target/ExportSMTLIB/attributes.mlir" + "CIRCT :: Target/ExportSMTLIB/basic.mlir" + "CIRCT :: circt-bmc/comb-errors.mlir" + "CIRCT :: circt-bmc/seq-errors.mlir" + # This test was having issues with rosetta + "CIRCT :: Dialect/SMT/basic.mlir" + ]; + in + if lit-filters != [ ] then lib.strings.concatStringsSep "|" lit-filters else null; preConfigure = '' find ./test -name '*.mlir' -exec sed -i 's|/usr/bin/env|${coreutils}/bin/env|g' {} \; # circt uses git to check its version, but when cloned on nix it can't access git. # So this hard codes the version. - substituteInPlace cmake/modules/GenVersionFile.cmake --replace "unknown git version" "${src.rev}" + substituteInPlace cmake/modules/GenVersionFile.cmake \ + --replace-fail "unknown git version" "${src.rev}" + # Increase timeout on tests because some were failing on hydra. + # Using `replace-warn` so it doesn't break when upstream changes the timeout. + substituteInPlace integration_test/CMakeLists.txt \ + --replace-warn 'set(CIRCT_INTEGRATION_TIMEOUT 60)' 'set(CIRCT_INTEGRATION_TIMEOUT 300)' ''; doCheck = true; From cb37e29e3c52e3473770cadb1a241cb190b908e9 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 7 Nov 2024 07:02:24 +0000 Subject: [PATCH 406/617] expat: 2.6.3 -> 2.6.4 Changes: https://github.com/libexpat/libexpat/blob/R_2_6_4/expat/Changes --- pkgs/development/libraries/expat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 83284ff64fc5..7d49962cbdb7 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -17,7 +17,7 @@ # files. let - version = "2.6.3"; + version = "2.6.4"; tag = "R_${lib.replaceStrings ["."] ["_"] version}"; in stdenv.mkDerivation (finalAttrs: { @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = with finalAttrs; "https://github.com/libexpat/libexpat/releases/download/${tag}/${pname}-${version}.tar.xz"; - hash = "sha256-J02yVKaXm95arUBHY6cElWlA5GWEPyqb2e168i4sDvw="; + hash = "sha256-ppVina4EcFWzfVCg/0d20dRdCkyELPTM7hWEQfVf9+4="; }; strictDeps = true; From dc697d618e81a7667a759c1b8362c8e5179ffeb2 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 7 Nov 2024 10:13:15 +0300 Subject: [PATCH 407/617] mesa: 24.2.5 -> 24.2.6 Diff: https://gitlab.freedesktop.org/mesa/mesa/-/compare/mesa-24.2.5...mesa-24.2.6 Changelog: https://docs.mesa3d.org/relnotes/24.2.6.html --- pkgs/development/libraries/mesa/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix index b7c90f36db74..6c349d679871 100644 --- a/pkgs/development/libraries/mesa/common.nix +++ b/pkgs/development/libraries/mesa/common.nix @@ -5,14 +5,14 @@ # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa rec { pname = "mesa"; - version = "24.2.5"; + version = "24.2.6"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "mesa"; rev = "mesa-${version}"; - hash = "sha256-GghJVjR9NrlNLAd8c1lG8E6/WECqO+Ti3F6JRMgd2jQ="; + hash = "sha256-yoX2DvinzqrG+rekiqO/iG6F6Zn63WC+ZaathimxO1g="; }; meta = { From 2a61b919d2d3f397f6878eee8091a2459757cc1d Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 7 Nov 2024 07:26:53 +0000 Subject: [PATCH 408/617] darwin.copyfile: use a bootstrap SDK This is required to avoid an infinite recursion via `darwin.libutil` on `x86_64-darwin`. --- .../darwin/apple-source-releases/copyfile/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix b/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix index 29b41f60b054..3382128b0e91 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix @@ -91,7 +91,7 @@ mkAppleDerivation { env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include"; buildInputs = lib.optionals (lib.versionOlder (lib.getVersion apple-sdk) "10.13") [ - apple-sdk_10_13 + (apple-sdk_10_13.override { enableBootstrap = true; }) ]; meta.description = "Darwin file copying library"; From 387bdb9c5e5b712fa37525039e752fcdbf0d705b Mon Sep 17 00:00:00 2001 From: Vladimir Panteleev Date: Sun, 24 Dec 2023 13:33:39 +0000 Subject: [PATCH 409/617] libbytesize: fix Python bindings --- pkgs/by-name/li/libbytesize/package.nix | 12 ++++++++++-- pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libbytesize/package.nix b/pkgs/by-name/li/libbytesize/package.nix index bd395682cc14..5928f4c9a7ed 100644 --- a/pkgs/by-name/li/libbytesize/package.nix +++ b/pkgs/by-name/li/libbytesize/package.nix @@ -11,7 +11,7 @@ mpfr, pcre2, pkg-config, - python3, + python3Packages, stdenv, }: @@ -41,7 +41,8 @@ stdenv.mkDerivation (finalAttrs: { gtk-doc libxslt pkg-config - python3 + python3Packages.python + python3Packages.pythonImportsCheckHook ]; buildInputs = [ @@ -52,6 +53,13 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + postInstall = '' + substituteInPlace $out/${python3Packages.python.sitePackages}/bytesize/bytesize.py \ + --replace-fail 'CDLL("libbytesize.so.1")' "CDLL('$out/lib/libbytesize.so.1')" + ''; + + pythonImportsCheck = [ "bytesize" ]; + meta = { homepage = "https://github.com/storaged-project/libbytesize"; description = "Tiny library providing a C 'class' for working with arbitrary big sizes in bytes"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bb45317ec90d..dadaea76efec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1923,6 +1923,8 @@ self: super: with self; { bytecode = callPackage ../development/python-modules/bytecode { }; + bytesize = toPythonModule (pkgs.libbytesize.override { python3Packages = self; }); + bytewax = callPackage ../development/python-modules/bytewax { }; bz2file = callPackage ../development/python-modules/bz2file { }; From e09aa2ed43d789b3eabe0e51f045965b262136e7 Mon Sep 17 00:00:00 2001 From: Vladimir Panteleev Date: Mon, 25 Dec 2023 14:10:12 +0000 Subject: [PATCH 410/617] libblockdev: split out Python bindings Allow overriding Python without requiring that the entire dependency graph (e.g. udisks) to be built against that Python. --- pkgs/development/libraries/libblockdev/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index 7679aefe5b95..6e0f9858f730 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -40,12 +40,18 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-WCMedMkaMMhZbB3iJu3c+CTT3AvOjzOSYP45J+NQEDQ="; }; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" "devdoc" "python" ]; postPatch = '' patchShebangs scripts + substituteInPlace src/python/gi/overrides/Makefile.am \ + --replace-fail ''\'''${exec_prefix}' '@PYTHON_EXEC_PREFIX@' ''; + configureFlags = [ + "--with-python_prefix=${placeholder "python"}" + ]; + nativeBuildInputs = [ autoconf-archive autoreconfHook From 1813aaf111ab4db2b59b7b7fddf7bc5a2eb1e645 Mon Sep 17 00:00:00 2001 From: Vladimir Panteleev Date: Sun, 24 Dec 2023 15:01:41 +0000 Subject: [PATCH 411/617] blivet: init at 3.10.1 --- .../python-modules/blivet/default.nix | 109 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 111 insertions(+) create mode 100644 pkgs/development/python-modules/blivet/default.nix diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix new file mode 100644 index 000000000000..e3ca43c8cd22 --- /dev/null +++ b/pkgs/development/python-modules/blivet/default.nix @@ -0,0 +1,109 @@ +{ + lib, + pkgs, + python, + buildPythonPackage, + fetchFromGitHub, + pygobject3, + libblockdev, + bytesize, + pyudev, + dbus-python, + util-linux, + kmod, + libndctl, + nvme-cli, + dosfstools, + e2fsprogs, + hfsprogs, + xfsprogs, + f2fs-tools, + ntfs3g, + btrfs-progs, + reiserfsprogs, + mdadm, + lvm2, + gfs2-utils, + cryptsetup, + multipath-tools, + dracut, + stratisd, +}: + +let + libblockdevPython = (libblockdev.override { python3 = python; }).python; +in +buildPythonPackage rec { + pname = "blivet"; + version = "3.10.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "storaged-project"; + repo = "blivet"; + rev = "blivet-${version}"; + hash = "sha256-Ooc63mf03ZO7zxm8s/Tm8jSQg5LWyKnHAqbyvn1UHB8="; + }; + + postPatch = '' + find blivet -name '*.py' | while IFS= read -r i ; do + substituteInPlace "$i" \ + --replace \ + 'gi.require_version("BlockDev",' \ + 'import gi.repository + gi.require_version("GIRepository", "2.0") + from gi.repository import GIRepository + GIRepository.Repository.prepend_search_path("${libblockdev}/lib/girepository-1.0") + gi.require_version("BlockDev",' + done + ''; + + propagatedBuildInputs = [ + pygobject3 + libblockdevPython + bytesize + pyudev + dbus-python + util-linux + kmod + libndctl + nvme-cli + pkgs.systemd + dosfstools + e2fsprogs + hfsprogs + xfsprogs + f2fs-tools + ntfs3g + btrfs-progs + reiserfsprogs + mdadm + lvm2 + gfs2-utils + cryptsetup + multipath-tools + dracut + stratisd + ]; + + pythonImportsCheck = [ "blivet" ]; + + # Even unit tests require a system D-Bus. + # TODO: Write a NixOS VM test? + doCheck = false; + + # Fails with: TypeError: don't know how to make test from: + # + dontUseSetuptoolsCheck = true; + + meta = { + description = "Python module for system storage configuration"; + homepage = "https://github.com/storaged-project/blivet"; + license = [ + lib.licenses.gpl2Plus + lib.licenses.lgpl2Plus + ]; + maintainers = with lib.maintainers; [ cybershadow ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dadaea76efec..84ce5b5e84a8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1686,6 +1686,8 @@ self: super: with self; { blis = callPackage ../development/python-modules/blis { }; + blivet = callPackage ../development/python-modules/blivet { }; + blobfile = callPackage ../development/python-modules/blobfile { }; blockchain = callPackage ../development/python-modules/blockchain { }; From 052b26573d4584cab10a1731d564ebc33674f889 Mon Sep 17 00:00:00 2001 From: Vladimir Panteleev Date: Sun, 24 Dec 2023 17:07:20 +0000 Subject: [PATCH 412/617] blivet-gui: init at 2.5.0 --- pkgs/by-name/bl/blivet-gui/package.nix | 73 ++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 pkgs/by-name/bl/blivet-gui/package.nix diff --git a/pkgs/by-name/bl/blivet-gui/package.nix b/pkgs/by-name/bl/blivet-gui/package.nix new file mode 100644 index 000000000000..efe4fe2de785 --- /dev/null +++ b/pkgs/by-name/bl/blivet-gui/package.nix @@ -0,0 +1,73 @@ +# Notes for using this package outside of NixOS: +# 1. --pure cannot be used (as pkexec will be used from the path, +# and we can't use nixpkgs polkit due to lack of setuid bit) +# 2. You must prefix the blivet-gui command with "SHELL=/bin/bash" +# (otherwise your system polkit will reject the SHEL Lfrom nixpkgs). + +{ + lib, + python3, + fetchFromGitHub, + gtk3, + util-linux, + gobject-introspection, + adwaita-icon-theme, + hicolor-icon-theme, + wrapGAppsHook3, + pkexecPath ? "pkexec", + testers, + blivet-gui, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "blivet-gui"; + version = "2.5.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "storaged-project"; + repo = "blivet-gui"; + rev = version; + hash = "sha256-fKd2Vj8clZ6Q7bZipfN5umyMW2rBXMUnpAuDE70p67U="; + }; + + postPatch = '' + substituteInPlace blivetgui/gui_utils.py --replace-fail /usr/share $out/share + substituteInPlace blivet-gui --replace-fail "pkexec blivet-gui-daemon" "pkexec $out/bin/blivet-gui-daemon" + substituteInPlace blivet-gui --replace-fail "pkexec" "${pkexecPath}" + ''; + + nativeBuildInputs = [ + util-linux + gobject-introspection + wrapGAppsHook3 + ]; + + buildInputs = [ gtk3 ]; + + dependencies = [ + python3.pkgs.blivet + python3.pkgs.pyparted + python3.pkgs.pid + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + ''${gappsWrapperArgs[@]} + --prefix XDG_DATA_DIRS : ${adwaita-icon-theme}/share + ) + ''; + + passthru.tests.version = testers.testVersion { package = blivet-gui; }; + + meta = { + description = "GUI tool for storage configuration using blivet library"; + homepage = "https://fedoraproject.org/wiki/Blivet"; + license = lib.licenses.gpl2Plus; + mainProgram = "blivet-gui"; + maintainers = with lib.maintainers; [ cybershadow ]; + platforms = lib.platforms.linux; + }; +} From c73f4a500a40d89f94286b5f913c18684e5c1b51 Mon Sep 17 00:00:00 2001 From: Andrew Bruce Date: Thu, 7 Nov 2024 09:52:17 +0000 Subject: [PATCH 413/617] waagent: fix build Use latest Python to avoid https://github.com/NixOS/nixpkgs/issues/353830 Co-authored-by: Sarah Stoltze --- pkgs/by-name/wa/waagent/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/waagent/package.nix b/pkgs/by-name/wa/waagent/package.nix index 0f643690921f..8f5085ca9e03 100644 --- a/pkgs/by-name/wa/waagent/package.nix +++ b/pkgs/by-name/wa/waagent/package.nix @@ -2,13 +2,12 @@ coreutils, fetchFromGitHub, lib, - python39, + python3, bash, }: let - # the latest python version that waagent test against according to https://github.com/Azure/WALinuxAgent/blob/28345a55f9b21dae89472111635fd6e41809d958/.github/workflows/ci_pr.yml#L75 - python = python39; + python = python3; in python.pkgs.buildPythonApplication rec { From 047c4367c7b7128ff84736d52e2a4777af731027 Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Thu, 7 Nov 2024 12:48:40 +0100 Subject: [PATCH 414/617] museum: 0.9.46 -> 0.9.53 --- pkgs/by-name/mu/museum/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix index 0ef76ad53e83..c8fac5e81d1d 100644 --- a/pkgs/by-name/mu/museum/package.nix +++ b/pkgs/by-name/mu/museum/package.nix @@ -7,15 +7,15 @@ buildGoModule rec { - version = "photos-v0.9.46"; + version = "0.9.53"; pname = "museum"; src = fetchFromGitHub { owner = "ente-io"; repo = "ente"; sparseCheckout = [ "server" ]; - rev = version; - hash = "sha256-dJCZxQLnKb+mFG0iaYNrXyDSaslqKdPTXMK4KwvqBd8="; + rev = "photos-v${version}"; + hash = "sha256-aczWqK6Zymvl46fHN6QXT0f5V2lpC+8kpSbEoTiP+7k="; }; sourceRoot = "${src.name}/server"; From d72427d96597963908e042977e04cf3020bbc09f Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Thu, 7 Nov 2024 12:22:07 +0100 Subject: [PATCH 415/617] python312Packages.scikit-bio: add missing deps --- .../python-modules/scikit-bio/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index 37d1763b264c..afba3e93ddbd 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -2,9 +2,11 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, cython, oldest-supported-numpy, + requests, decorator, natsort, @@ -12,8 +14,10 @@ pandas, scipy, h5py, - hdmedians, biom-format, + statsmodels, + patsy, + python, pytestCheckHook, }: @@ -44,8 +48,9 @@ buildPythonPackage rec { pandas scipy h5py - hdmedians biom-format + statsmodels + patsy ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -53,6 +58,11 @@ buildPythonPackage rec { # only the $out dir contains the built cython extensions, so we run the tests inside there pytestFlagsArray = [ "${placeholder "out"}/${python.sitePackages}/skbio" ]; + disabledTestPaths = [ + # don't know why, but this segfaults + "${placeholder "out"}/${python.sitePackages}/skbio/metadata/tests/test_intersection.py" + ]; + pythonImportsCheck = [ "skbio" ]; meta = { From c0919f251d81032d3ad8200f5e39ddfe4d671309 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 7 Nov 2024 12:27:19 +0000 Subject: [PATCH 416/617] xfce.xfce4-weather-plugin: 0.11.2 -> 0.11.3 https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/compare/xfce4-weather-plugin-0.11.2...xfce4-weather-plugin-0.11.3 --- .../xfce/panel-plugins/xfce4-weather-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix index c76800fea4fc..db7614394cb6 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix @@ -23,11 +23,11 @@ in stdenv.mkDerivation rec { pname = "xfce4-weather-plugin"; - version = "0.11.2"; + version = "0.11.3"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ZdQK/3hjVQhYqfnStgVPJ8aaPn5xKZF4WYf5pzu6h2s="; + sha256 = "sha256-AC0f5jkG0vOgEvPLWMzv8d+8xGZ1njbHbTsD3QHA3Fc="; }; nativeBuildInputs = [ From df23cf4baea1105d92e5940b19a7f74fa609b0cf Mon Sep 17 00:00:00 2001 From: Shogo Takata Date: Thu, 7 Nov 2024 21:42:11 +0900 Subject: [PATCH 417/617] python3Packages.pulumi: flag broken --- pkgs/development/python-modules/pulumi/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pulumi/default.nix b/pkgs/development/python-modules/pulumi/default.nix index 7353649c5a56..1f835c0f9325 100644 --- a/pkgs/development/python-modules/pulumi/default.nix +++ b/pkgs/development/python-modules/pulumi/default.nix @@ -65,5 +65,7 @@ buildPythonPackage rec { homepage = "https://github.com/pulumi/pulumi"; license = licenses.asl20; maintainers = with maintainers; [ teto ]; + # https://github.com/pulumi/pulumi/issues/16828 + broken = versionAtLeast protobuf.version "5"; }; } From f2800a6eb3b8fe677e2ef22ea90791f1373d8984 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 2 Sep 2024 20:41:49 +0200 Subject: [PATCH 418/617] mim-solvers: init at 0.0.5 Co-authored-by: Arne Keller <2012gdwu+github@posteo.de> --- pkgs/by-name/mi/mim-solvers/package.nix | 68 +++++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 ++ 2 files changed, 73 insertions(+) create mode 100644 pkgs/by-name/mi/mim-solvers/package.nix diff --git a/pkgs/by-name/mi/mim-solvers/package.nix b/pkgs/by-name/mi/mim-solvers/package.nix new file mode 100644 index 000000000000..7bc0723a3044 --- /dev/null +++ b/pkgs/by-name/mi/mim-solvers/package.nix @@ -0,0 +1,68 @@ +{ + cmake, + crocoddyl, + fetchFromGitHub, + lib, + llvmPackages, + pkg-config, + proxsuite, + python3Packages, + pythonSupport ? false, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mim-solvers"; + version = "0.0.5"; + + src = fetchFromGitHub { + owner = "machines-in-motion"; + repo = "mim_solvers"; + rev = "v${finalAttrs.version}"; + hash = "sha256-XV8EJqCOTYqljZe2PQvnhIaPUOJ+bBjRIoshdeqZycA="; + }; + + # eigenpy is not used without python support + postPatch = lib.optionalString (!pythonSupport) '' + substituteInPlace CMakeLists.txt --replace-fail \ + "add_project_dependency(eigenpy 2.7.10 REQUIRED)" \ + "" + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ] ++ lib.optional pythonSupport python3Packages.pythonImportsCheckHook; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; + propagatedBuildInputs = + lib.optionals pythonSupport [ + python3Packages.crocoddyl + python3Packages.osqp + python3Packages.proxsuite + python3Packages.scipy + ] + ++ lib.optionals (!pythonSupport) [ + crocoddyl + proxsuite + ]; + + cmakeFlags = + [ + (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) + (lib.cmakeBool "BUILD_WITH_PROXSUITE" true) + ] + ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) ( + lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'test_solvers'" + ); + + doCheck = true; + pythonImportsCheck = [ "mim_solvers" ]; + + meta = { + description = "Numerical solvers used in the Machines in Motion Laboratory"; + homepage = "https://github.com/machines-in-motion/mim_solvers"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a9231aecd6e8..591502e44f47 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7870,6 +7870,11 @@ self: super: with self; { millheater = callPackage ../development/python-modules/millheater { }; + mim-solvers = toPythonModule (pkgs.mim-solvers.override { + python3Packages = self; + pythonSupport = true; + }); + minari = callPackage ../development/python-modules/minari { }; mindsdb-evaluator = callPackage ../development/python-modules/mindsdb-evaluator { }; From 00fe0bdb8508bf1a0b691c39120f3b3c474c97b5 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Thu, 7 Nov 2024 14:15:07 +0000 Subject: [PATCH 419/617] jitterentropy: switch to cmake build, darwin support --- .../libraries/jitterentropy/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix index 3e5656ba7874..34c98c50156f 100644 --- a/pkgs/development/libraries/jitterentropy/default.nix +++ b/pkgs/development/libraries/jitterentropy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, cmake, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "jitterentropy"; @@ -11,24 +11,18 @@ stdenv.mkDerivation rec { hash = "sha256-CPvgc/W5Z2OfbP9Lp2tQevUQZr+xlh6q5r5Fp2WUHhg="; }; + nativeBuildInputs = [ cmake ]; + outputs = [ "out" "dev" ]; - enableParallelBuilding = true; hardeningDisable = [ "fortify" ]; # avoid warnings - # prevent jitterentropy from builtin strip to allow controlling this from the derivation's - # settings. Also fixes a strange issue, where this strip may fail when cross-compiling. - installFlags = [ - "INSTALL_STRIP=install" - "PREFIX=${placeholder "out"}" - ]; - meta = with lib; { description = "Provides a noise source using the CPU execution timing jitter"; homepage = "https://github.com/smuellerDD/jitterentropy-library"; changelog = "https://github.com/smuellerDD/jitterentropy-library/raw/v${version}/CHANGES.md"; license = with licenses; [ bsd3 /* OR */ gpl2Only ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ johnazoidberg c0bw3b ]; }; } From 11e673bad0fa6ddfefe29ef5ce5dff85b7482c8c Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Thu, 7 Nov 2024 14:15:52 +0000 Subject: [PATCH 420/617] jitterentropy: with lib; cleanup --- pkgs/development/libraries/jitterentropy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix index 34c98c50156f..19bf10bdefc5 100644 --- a/pkgs/development/libraries/jitterentropy/default.nix +++ b/pkgs/development/libraries/jitterentropy/default.nix @@ -17,12 +17,12 @@ stdenv.mkDerivation rec { hardeningDisable = [ "fortify" ]; # avoid warnings - meta = with lib; { + meta = { description = "Provides a noise source using the CPU execution timing jitter"; homepage = "https://github.com/smuellerDD/jitterentropy-library"; changelog = "https://github.com/smuellerDD/jitterentropy-library/raw/v${version}/CHANGES.md"; - license = with licenses; [ bsd3 /* OR */ gpl2Only ]; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ johnazoidberg c0bw3b ]; + license = with lib.licenses; [ bsd3 /* OR */ gpl2Only ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ johnazoidberg c0bw3b ]; }; } From 15137429e65996cf3870ec58fc0c545f5b7d8f80 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Thu, 7 Nov 2024 14:16:11 +0000 Subject: [PATCH 421/617] jitterentropy: rfc format --- .../libraries/jitterentropy/default.nix | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix index 19bf10bdefc5..db1acb1728f9 100644 --- a/pkgs/development/libraries/jitterentropy/default.nix +++ b/pkgs/development/libraries/jitterentropy/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, cmake, fetchFromGitHub }: +{ + lib, + stdenv, + cmake, + fetchFromGitHub, +}: stdenv.mkDerivation rec { pname = "jitterentropy"; @@ -13,7 +18,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; hardeningDisable = [ "fortify" ]; # avoid warnings @@ -21,8 +29,14 @@ stdenv.mkDerivation rec { description = "Provides a noise source using the CPU execution timing jitter"; homepage = "https://github.com/smuellerDD/jitterentropy-library"; changelog = "https://github.com/smuellerDD/jitterentropy-library/raw/v${version}/CHANGES.md"; - license = with lib.licenses; [ bsd3 /* OR */ gpl2Only ]; + license = with lib.licenses; [ + bsd3 # OR + gpl2Only + ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; - maintainers = with lib.maintainers; [ johnazoidberg c0bw3b ]; + maintainers = with lib.maintainers; [ + johnazoidberg + c0bw3b + ]; }; } From 4f8ca62fd61107c03c67d31e34698d2a1c183436 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Thu, 7 Nov 2024 15:19:36 +0100 Subject: [PATCH 422/617] tyson: 0.1.1 -> 0.1.1-unstable-2024-04-10 --- pkgs/development/tools/misc/tyson/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/tyson/default.nix b/pkgs/development/tools/misc/tyson/default.nix index 2809c881c945..dab4642cb578 100644 --- a/pkgs/development/tools/misc/tyson/default.nix +++ b/pkgs/development/tools/misc/tyson/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "tyson"; - version = "0.1.1"; + version = "0.1.1-unstable-2024-04-10"; src = fetchFromGitHub { owner = "jetpack-io"; repo = "tyson"; - rev = "v${version}"; - hash = "sha256-c4ROLn+BSX7v/4C9/IeU6HiE2YvnqDuXXGp2iZhAVk4="; + rev = "d6b38819db9b260928b29f4d39bf4c72841c6a01"; + hash = "sha256-NoQJBEedV3NDNQ4PVvvjjsO7N+rq40LWKp962P+naEY="; }; - vendorHash = "sha256-NhDv7oH8LK/vebwjs55tsCCWVhbZZd15z5ewOF5z9+Y="; + vendorHash = "sha256-kJIfKgVaHuCYvvTZXyuZ/Hg8z1BlW4oW6+5s1inFizg="; nativeBuildInputs = [ installShellFiles From 01de376e2da9917721c18852cca47df3a85f2b21 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Thu, 7 Nov 2024 15:20:15 +0100 Subject: [PATCH 423/617] tyson: format using nixfmt --- pkgs/development/tools/misc/tyson/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/tyson/default.nix b/pkgs/development/tools/misc/tyson/default.nix index dab4642cb578..7140aaa55c5b 100644 --- a/pkgs/development/tools/misc/tyson/default.nix +++ b/pkgs/development/tools/misc/tyson/default.nix @@ -1,7 +1,8 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, }: buildGoModule rec { @@ -21,7 +22,10 @@ buildGoModule rec { installShellFiles ]; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + ]; postInstall = '' installShellCompletion --cmd tyson \ From 16956ab47c576c35ba3cccda421f8dee427d4223 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Thu, 7 Nov 2024 15:20:46 +0100 Subject: [PATCH 424/617] tyson: change homepage to new name --- pkgs/development/tools/misc/tyson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/tyson/default.nix b/pkgs/development/tools/misc/tyson/default.nix index 7140aaa55c5b..ace33ac47201 100644 --- a/pkgs/development/tools/misc/tyson/default.nix +++ b/pkgs/development/tools/misc/tyson/default.nix @@ -37,8 +37,8 @@ buildGoModule rec { meta = with lib; { description = "TypeScript as a configuration language"; mainProgram = "tyson"; - homepage = "https://github.com/jetpack-io/tyson"; - changelog = "https://github.com/jetpack-io/tyson/releases/tag/${src.rev}"; + homepage = "https://github.com/jetify-com/tyson"; + changelog = "https://github.com/jetify-com/tyson/releases/tag/${src.rev}"; license = licenses.asl20; maintainers = with maintainers; [ figsoda ]; }; From 8f9b78b0a4c4aadb426817950b676b5d27ab01c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 15:13:05 +0000 Subject: [PATCH 425/617] manicode: 1.0.94 -> 1.0.99 --- pkgs/by-name/ma/manicode/package-lock.json | 8 ++++---- pkgs/by-name/ma/manicode/package.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ma/manicode/package-lock.json b/pkgs/by-name/ma/manicode/package-lock.json index eae7228779ae..a0af8d82c4f5 100644 --- a/pkgs/by-name/ma/manicode/package-lock.json +++ b/pkgs/by-name/ma/manicode/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "manicode": "^1.0.94" + "manicode": "^1.0.99" } }, "node_modules/@types/diff": { @@ -355,9 +355,9 @@ "license": "MIT" }, "node_modules/manicode": { - "version": "1.0.94", - "resolved": "https://registry.npmjs.org/manicode/-/manicode-1.0.94.tgz", - "integrity": "sha512-61mCaweUCEpD6fvM898wOa0dReRDR1NaQwX3KKfml8OV2RYMXFb7ulo+rWVqQKzhRh/XYJyIUk0SEy4tNgMoFA==", + "version": "1.0.99", + "resolved": "https://registry.npmjs.org/manicode/-/manicode-1.0.99.tgz", + "integrity": "sha512-nPcFII4HyMUJJuCCVRqrt6o5ogyBcB6/SRFeUtyg2vUZyO26KMGD0v+2VHfc/L7IUSHoaAsd8OeNGWdkixg8tw==", "license": "MIT", "dependencies": { "@types/diff": "5.2.1", diff --git a/pkgs/by-name/ma/manicode/package.nix b/pkgs/by-name/ma/manicode/package.nix index 6bbb9c8de29c..fc2903f2685f 100644 --- a/pkgs/by-name/ma/manicode/package.nix +++ b/pkgs/by-name/ma/manicode/package.nix @@ -6,14 +6,14 @@ buildNpmPackage rec { pname = "manicode"; - version = "1.0.94"; + version = "1.0.99"; src = fetchzip { url = "https://registry.npmjs.org/manicode/-/manicode-${version}.tgz"; - hash = "sha256-mn3bxZashP4zgCO7pB9yqjZ7uLglTC+pa3ifxlIW4BY="; + hash = "sha256-LVTh8yOfP92zGSdxLpThC+U9E8cBjoL0+iMQOldNO8A="; }; - npmDepsHash = "sha256-PnySdTtlgZ9J0qIegwgiDoGuqa7/KyUxUpiZ8yepuZI="; + npmDepsHash = "sha256-MAm/FE8M6BBDZD5Fy2k6GcM5Qv35jNeUwHcemmbUj/A="; postPatch = '' cp ${./package-lock.json} package-lock.json From c387142f8cf2e2cdb2557e7adb82bb2b030c876b Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Mon, 4 Nov 2024 01:31:21 -0700 Subject: [PATCH 426/617] multivnc: init at 2.8.1 Co-authored-by: Aleksana --- pkgs/by-name/mu/multivnc/nixpkgs.patch | 65 ++++++++++++++++ pkgs/by-name/mu/multivnc/package.nix | 104 +++++++++++++++++++++++++ 2 files changed, 169 insertions(+) create mode 100644 pkgs/by-name/mu/multivnc/nixpkgs.patch create mode 100644 pkgs/by-name/mu/multivnc/package.nix diff --git a/pkgs/by-name/mu/multivnc/nixpkgs.patch b/pkgs/by-name/mu/multivnc/nixpkgs.patch new file mode 100644 index 000000000000..086d6423df53 --- /dev/null +++ b/pkgs/by-name/mu/multivnc/nixpkgs.patch @@ -0,0 +1,65 @@ +diff -ruZ source/CMakeLists.txt source2/CMakeLists.txt +--- source/CMakeLists.txt 1969-12-31 17:00:01.000000000 -0700 ++++ source2/CMakeLists.txt 2024-11-03 21:24:22.153712626 -0700 +@@ -12,9 +12,6 @@ + + set(WXSERVDISC_INSTALL OFF CACHE BOOL "Set to OFF to not include wxservdisc artifacts in install") + add_subdirectory(libwxservdisc/src) +-set(LIBVNCSERVER_INSTALL OFF CACHE BOOL "Set to OFF to not include libvncserver artifacts in install") +-set(WITH_EXAMPLES OFF CACHE BOOL "Set to OFF to not build libvncserver examples") +-add_subdirectory(libvncserver) + + add_subdirectory(src) + +diff -ruZ source/src/CMakeLists.txt source2/src/CMakeLists.txt +--- source/src/CMakeLists.txt 1969-12-31 17:00:01.000000000 -0700 ++++ source2/src/CMakeLists.txt 2024-11-03 21:51:56.015301604 -0700 +@@ -1,15 +1,17 @@ + # + # dependencies + # ++include(FindPkgConfig) + find_package(wxWidgets 3.0 REQUIRED core base net adv qa) ++find_package(LibVNCServer) ++pkg_search_module(GTK3 REQUIRED gtk+-3.0) + include(${wxWidgets_USE_FILE}) + include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/src/ + ${CMAKE_SOURCE_DIR}/libwxservdisc/src +- ${CMAKE_SOURCE_DIR}/libvncserver +- ${CMAKE_BINARY_DIR}/libvncserver ++ ${GTK3_INCXLUDE_DIRS} + ) + + +@@ -39,7 +41,7 @@ + + add_executable(${executable_name} MACOSX_BUNDLE ${multivnc_SRCS}) + +-target_link_libraries(${executable_name} MultiVNCgui ${wxWidgets_LIBRARIES} wxservdisc vncclient) ++target_link_libraries(${executable_name} MultiVNCgui ${wxWidgets_LIBRARIES} wxservdisc vncclient ${GTK3_LIBRARIES}) + + if(APPLE AND wxWidgets_VERSION_STRING LESS 3.1) + set_target_properties(${executable_name} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in) +@@ -47,7 +49,6 @@ + + + +- + + #original Makefile.am contents follow: + +diff -ruZ source/src/VNCConn.h source2/src/VNCConn.h +--- source/src/VNCConn.h 1969-12-31 17:00:01.000000000 -0700 ++++ source2/src/VNCConn.h 2024-11-03 21:28:06.620032553 -0700 +@@ -37,7 +37,7 @@ + #include + #endif + #include +-#include "rfb/rfbclient.h" ++#include + + + diff --git a/pkgs/by-name/mu/multivnc/package.nix b/pkgs/by-name/mu/multivnc/package.nix new file mode 100644 index 000000000000..a17e323628c1 --- /dev/null +++ b/pkgs/by-name/mu/multivnc/package.nix @@ -0,0 +1,104 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + wxGTK32, + gtk3, + zlib, + libjpeg, + libvncserver, + cmake, + pkg-config, + libsysprof-capture, + pcre2, + util-linux, + libselinux, + libsepol, + libthai, + libdatrie, + xorg, + lerc, + libxkbcommon, + libepoxy, + wrapGAppsHook3, +}: + +let + # libvncserver does not support multicast. since multivnc is mostly about multicast, it requires a special branch of libvncserver. + libvncserver-patched = libvncserver.overrideAttrs { + src = fetchFromGitHub { + owner = "LibVNC"; + repo = "libvncserver"; + rev = "ef3b57438564f2877148a23055f3f0ffce66df11"; + hash = "sha256-Cg96tsi6h1DX4VSsq1B8DTn0GxnBfoZK2nuxeT/+ca0="; + }; + patches = [ ]; + }; + +in +stdenv.mkDerivation { + pname = "MultiVNC"; + version = "2.8.1"; + + src = fetchFromGitHub { + owner = "bk138"; + repo = "multivnc"; + rev = "89225243412f43ba2903ffeda98af7fe1f8f4975"; + hash = "sha256-qdF6nUSGaTphoe6T3gTAJTSQwvu+v/g8xfYobFBmGsI="; + fetchSubmodules = true; + }; + + patches = [ + # remove part of vendored libraries that can be provided by Nixpkgs + ./nixpkgs.patch + + # silences a compiler warning + (fetchpatch { + url = "https://github.com/bk138/multivnc/commit/002ba7f6b5b88dac3da5c08f99be1f237dcde904.patch"; + hash = "sha256-Qnk7RrUaw9jsaNTbzYqsH0LU8ivT9xX2jfxrES82ArE="; + }) + ]; + + # remove submodules we don't need + # some submodules can be provided by nixpkgs + postPatch = '' + rm -rfv libvncserver libsshtunnel libjpeg-turbo libressl libssh2 + ''; + + buildInputs = [ + gtk3 + wxGTK32 + zlib + libjpeg + libvncserver-patched + + # transitive dependencies + libsysprof-capture + pcre2 + util-linux # mount + libselinux + libsepol + libthai + libdatrie + lerc + libxkbcommon + libepoxy + xorg.libXdmcp + xorg.libXtst + ]; + + nativeBuildInputs = [ + cmake + pkg-config + wrapGAppsHook3 + ]; + + meta = { + mainProgram = "multivnc"; + description = "Cross-platform Multicast-enabled VNC viewer based on LibVNCClient"; + homepage = "https://github.com/bk138/multivnc"; + maintainers = with lib.maintainers; [ rhelmot ]; + license = lib.licenses.gpl3Plus; + }; +} From e5cc451d6f84f35ecaa60457b70ff77c4218e0d4 Mon Sep 17 00:00:00 2001 From: lucasew Date: Thu, 7 Nov 2024 13:36:26 -0300 Subject: [PATCH 427/617] npm-lockfile-fix: 0.1.0 -> 0.1.1 Signed-off-by: lucasew --- pkgs/by-name/np/npm-lockfile-fix/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/np/npm-lockfile-fix/package.nix b/pkgs/by-name/np/npm-lockfile-fix/package.nix index 69c5d40756b7..db886f6821e3 100644 --- a/pkgs/by-name/np/npm-lockfile-fix/package.nix +++ b/pkgs/by-name/np/npm-lockfile-fix/package.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "npm-lockfile-fix"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "jeslie0"; repo = "npm-lockfile-fix"; rev = "v${version}"; - hash = "sha256-0EGPCPmCf6bxbso3aHCeJ1XBOpYp3jtMXv8LGdwrsbs="; + hash = "sha256-P93OowrVkkOfX5XKsRsg0c4dZLVn2ZOonJazPmHdD7g="; }; propagatedBuildInputs = [ From dc09b1cd37e52cf6f97afaa6192892e3006f2751 Mon Sep 17 00:00:00 2001 From: Andres Gongora Date: Thu, 7 Nov 2024 17:39:45 +0100 Subject: [PATCH 428/617] Fix bambu-studio build deps Signed-off-by: Andres Gongora --- pkgs/applications/misc/bambu-studio/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix index 82b6de9391b7..3e62298e6ee4 100644 --- a/pkgs/applications/misc/bambu-studio/default.nix +++ b/pkgs/applications/misc/bambu-studio/default.nix @@ -6,7 +6,7 @@ cmake, pkg-config, wrapGAppsHook3, - boost179, + boost180, cereal, cgal_5, curl, @@ -28,6 +28,7 @@ mesa, mpfr, nlopt, + slic3r, opencascade-occt_7_6, openvdb, opencv, @@ -72,7 +73,7 @@ stdenv.mkDerivation rec { buildInputs = [ binutils - boost179 + boost180 cereal cgal_5 curl From af0f979e328ddb2b18dd8dfd26afcf62c83d9937 Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Thu, 7 Nov 2024 17:46:29 +0100 Subject: [PATCH 429/617] diebahn: 2.7.0 -> 2.7.1 Diff: https://gitlab.com/schmiddi-on-mobile/railway/-/compare/2.7.0...2.7.1 Changelog: https://gitlab.com/schmiddi-on-mobile/railway/-/blob/2.7.1/CHANGELOG.md --- pkgs/applications/misc/diebahn/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/diebahn/default.nix b/pkgs/applications/misc/diebahn/default.nix index 0212547a75a6..22cc9374df3b 100644 --- a/pkgs/applications/misc/diebahn/default.nix +++ b/pkgs/applications/misc/diebahn/default.nix @@ -17,23 +17,24 @@ , pango , gettext , darwin +, blueprint-compiler }: stdenv.mkDerivation rec { pname = "diebahn"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitLab { owner = "schmiddi-on-mobile"; repo = "railway"; rev = version; - hash = "sha256-ps55DiAsetmdcItZKcfyYDD0q0w1Tkf/U48UR/zQx1g="; + hash = "sha256-SLZJiCkHUS2p7cNk3i3yO2c3tWR4T4ch+zJ1iYEkS6E="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${src}"; inherit src; - hash = "sha256-StJxWasUMj9kh9rLs4LFI3XaZ1Z5pvFBjEjtp79WZjg="; + hash = "sha256-XYlRm8yqQr9ZNV7jQeuR8kvqFNudUjJlzE6h9X0zq0Y="; }; nativeBuildInputs = [ @@ -45,6 +46,7 @@ stdenv.mkDerivation rec { rustPlatform.cargoSetupHook rustc wrapGAppsHook4 + blueprint-compiler ]; buildInputs = [ From c455166b5f3e62357fd0c40be2721dd78c36cfca Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 7 Nov 2024 17:18:33 +0000 Subject: [PATCH 430/617] python{27,39,310,311,312,313,314}: use a bootstrap SDK on Darwin Not sure why this is necessary now, since it should already be handled as part of the bootstrap. This might not be the right fix but it does fix eval. --- pkgs/development/interpreters/python/cpython/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 20c7c0c145ef..a7b34e3329d1 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -180,7 +180,7 @@ let darwin.apple_sdk.frameworks.Cocoa ] ++ optionals stdenv.hostPlatform.isDarwin [ # Work around for ld64 crashes on x86_64-darwin. Remove once 11.0 becomes the default. - apple-sdk_11 + (apple-sdk_11.override { enableBootstrap = true; }) ] ++ optionals stdenv.hostPlatform.isMinGW [ windows.dlfcn windows.mingw_w64_pthreads From 7979a96a21bb8bf4c69df0bd2e7764f176a04c15 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Thu, 7 Nov 2024 18:40:23 +0100 Subject: [PATCH 431/617] bruteforce-luks: format using nixfmt --- pkgs/tools/security/bruteforce-luks/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/bruteforce-luks/default.nix b/pkgs/tools/security/bruteforce-luks/default.nix index 56f827a09a4a..2a8b4b594b0d 100644 --- a/pkgs/tools/security/bruteforce-luks/default.nix +++ b/pkgs/tools/security/bruteforce-luks/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, cryptsetup }: +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + cryptsetup, +}: stdenv.mkDerivation rec { pname = "bruteforce-luks"; From 9fac7d8abe17be0775f0c5f07d80792a2118d7d4 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Thu, 7 Nov 2024 18:41:37 +0100 Subject: [PATCH 432/617] bruteforce-luks: clean up meta and fetch --- pkgs/tools/security/bruteforce-luks/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/bruteforce-luks/default.nix b/pkgs/tools/security/bruteforce-luks/default.nix index 2a8b4b594b0d..3e615dafe839 100644 --- a/pkgs/tools/security/bruteforce-luks/default.nix +++ b/pkgs/tools/security/bruteforce-luks/default.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { version = "1.4.1"; src = fetchFromGitHub { - sha256 = "sha256-t07YyfCjaXQs/OMekcPNBT8DeSRtq2+8tUpsPP2pG7o="; - rev = version; - repo = "bruteforce-luks"; owner = "glv2"; + repo = "bruteforce-luks"; + rev = version; + hash = "sha256-t07YyfCjaXQs/OMekcPNBT8DeSRtq2+8tUpsPP2pG7o="; }; nativeBuildInputs = [ autoreconfHook ]; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with lib; { - inherit (src.meta) homepage; + meta = { + homepage = "https://github.com/glv2/bruteforce-luks"; description = "Cracks passwords of LUKS encrypted volumes"; mainProgram = "bruteforce-luks"; longDescription = '' @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { knowing anything about it would take way too much time (unless the password is really short and/or weak). It can also use a dictionary. ''; - license = licenses.gpl3Plus; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; }; } From 5ee5afa44650d2cf643d60248012214c1d0c41cb Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Thu, 7 Nov 2024 18:44:04 +0100 Subject: [PATCH 433/617] bruteforce-luks: fix by disabling infinite test --- pkgs/tools/security/bruteforce-luks/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/security/bruteforce-luks/default.nix b/pkgs/tools/security/bruteforce-luks/default.nix index 3e615dafe839..018181123154 100644 --- a/pkgs/tools/security/bruteforce-luks/default.nix +++ b/pkgs/tools/security/bruteforce-luks/default.nix @@ -17,6 +17,12 @@ stdenv.mkDerivation rec { hash = "sha256-t07YyfCjaXQs/OMekcPNBT8DeSRtq2+8tUpsPP2pG7o="; }; + postPatch = '' + # the test hangs indefinetly when more than 3 threads are used, I haven't figured out why + substituteInPlace tests/Makefile.am \ + --replace-fail " crack-volume3.sh" "" + ''; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ cryptsetup ]; From e3c8447709bded9a26c4462508bfe2824ce2f817 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 17:56:42 +0000 Subject: [PATCH 434/617] python312Packages.httpx-socks: 0.9.1 -> 0.9.2 --- pkgs/development/python-modules/httpx-socks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix index 571451cdf5b1..4d46ed9b4588 100644 --- a/pkgs/development/python-modules/httpx-socks/default.nix +++ b/pkgs/development/python-modules/httpx-socks/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "httpx-socks"; - version = "0.9.1"; + version = "0.9.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "romis2012"; repo = "httpx-socks"; rev = "refs/tags/v${version}"; - hash = "sha256-9v5DfxEtM7jq+b8wR0M1klTSnSdFjQ4aDl8ZSZWxbFA="; + hash = "sha256-PUiciSuDCO4r49st6ye5xPLCyvYMKfZY+yHAkp5j3ZI="; }; build-system = [ setuptools ]; From ad625dd17211a42d6e19513e61bdf1382bb89602 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 7 Nov 2024 17:56:32 +0000 Subject: [PATCH 435/617] stdenv/darwin: fix SDK overlays for macOS SDK < 11 Quite impressive that this worked up until now. Co-authored-by: Lily Foster --- pkgs/stdenv/darwin/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 35ad94c41633..6f8ffaec92f1 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -1273,7 +1273,8 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check patch ; - "apple-sdk_${sdkMajorVersion}" = self.apple-sdk; + # TODO: Simplify when dropping support for macOS < 11. + "apple-sdk_${builtins.replaceStrings [ "." ] [ "_" ] sdkMajorVersion}" = self.apple-sdk; darwin = super.darwin.overrideScope ( _: _: From 8d4076fc119dc8a35f54bcfb487fbc6104c07a8c Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 7 Nov 2024 13:04:04 -0500 Subject: [PATCH 436/617] python312Packages.gdcm: unbreak --- pkgs/development/libraries/gdcm/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 50ad7bdd9fd6..befb715e2583 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -77,6 +77,8 @@ stdenv.mkDerivation rec { "TestSCUValidation" # errors because 3 classes not wrapped: "TestWrapPython" + # AttributeError: module 'gdcm' has no attribute 'UIDGenerator_SetRoot'; maybe a wrapping regression: + "TestUIDGeneratorPython" ] ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ "TestRescaler2" ]; From a963e63b6c2d638ae2c818c3917616ce2f8cf2a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 18:13:30 +0000 Subject: [PATCH 437/617] virter: 0.27.0 -> 0.28.0 --- pkgs/applications/virtualization/virter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/virter/default.nix b/pkgs/applications/virtualization/virter/default.nix index 18fd9ad2f35a..2b172cfe3d26 100644 --- a/pkgs/applications/virtualization/virter/default.nix +++ b/pkgs/applications/virtualization/virter/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "virter"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "LINBIT"; repo = "virter"; rev = "v${version}"; - hash = "sha256-sfO704nZnsSpSokJUwc3ucPBlKIi3cbZUG1dwbKDnFw="; + hash = "sha256-/AhC7eQE9ITvXcK228ZgcIOaSs0osjdFZI/0jHL7mqc="; }; - vendorHash = "sha256-NmA1rLWSX03zurGZWvXv61TSB9hecEfi7Hx9yi7QL/c="; + vendorHash = "sha256-v3rM45hijJKNxW43VhwcL3R2heZLA70RzqBXYeOYgRY="; ldflags = [ "-s" From 8b5639863029ab9d121377c7efb29eed832e32ac Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 7 Nov 2024 13:04:37 -0500 Subject: [PATCH 438/617] python312Packages.gdcm: add egg-info file --- pkgs/development/libraries/gdcm/default.nix | 9 ++++++++- pkgs/development/libraries/gdcm/python_gdcm.egg-info | 5 +++++ pkgs/development/python-modules/dicom2nifti/default.nix | 4 ---- 3 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/gdcm/python_gdcm.egg-info diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index befb715e2583..ca099da02354 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { "-DGDCM_USE_VTK=ON" ] ++ lib.optionals enablePython [ "-DGDCM_WRAP_PYTHON:BOOL=ON" - "-DGDCM_INSTALL_PYTHONMODULE_DIR=${placeholder "out"}/${python.sitePackages}" + "-DGDCM_INSTALL_PYTHONMODULE_DIR=${placeholder "out"}/${python.sitePackages}/python_gdcm" ]; nativeBuildInputs = [ @@ -66,6 +66,13 @@ stdenv.mkDerivation rec { libiconv ] ++ lib.optionals enablePython [ swig python ]; + postInstall = lib.optionalString enablePython '' + substitute \ + ${./python_gdcm.egg-info} \ + $out/${python.sitePackages}/python_gdcm-${version}.egg-info \ + --subst-var-by GDCM_VER "${version}" + ''; + disabledTests = [ # require networking: "TestEcho" diff --git a/pkgs/development/libraries/gdcm/python_gdcm.egg-info b/pkgs/development/libraries/gdcm/python_gdcm.egg-info new file mode 100644 index 000000000000..d0b2e21f091d --- /dev/null +++ b/pkgs/development/libraries/gdcm/python_gdcm.egg-info @@ -0,0 +1,5 @@ +Metadata-Version: 2.1 +Name: python-gdcm +Version: @GDCM_VER@ +Summary: C++ library for DICOM medical files wrapped for Python using SWIG +Platform: UNKNOWN diff --git a/pkgs/development/python-modules/dicom2nifti/default.nix b/pkgs/development/python-modules/dicom2nifti/default.nix index 0e12fe09c775..fae02acae762 100644 --- a/pkgs/development/python-modules/dicom2nifti/default.nix +++ b/pkgs/development/python-modules/dicom2nifti/default.nix @@ -37,11 +37,7 @@ buildPythonPackage rec { scipy ]; - # python-gdcm just builds the python interface provided by the "gdcm" package, so - # we should be able to replace "python-gdcm" with "gdcm" but this doesn't work - # (similar to https://github.com/NixOS/nixpkgs/issues/84774) postPatch = '' - substituteInPlace setup.py --replace-fail "python-gdcm" "" substituteInPlace tests/test_generic.py --replace-fail "from common" "from dicom2nifti.common" substituteInPlace tests/test_ge.py --replace-fail "import convert_generic" "import dicom2nifti.convert_generic as convert_generic" ''; From ea68825987be8cac5face99ff8caa8665019cb9a Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 6 Nov 2024 07:56:32 -0500 Subject: [PATCH 439/617] dmlive: use new darwin sdk pattern --- pkgs/applications/video/dmlive/default.nix | 6 +----- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/video/dmlive/default.nix b/pkgs/applications/video/dmlive/default.nix index 5127dba204fc..bd01e1bcc4d2 100644 --- a/pkgs/applications/video/dmlive/default.nix +++ b/pkgs/applications/video/dmlive/default.nix @@ -1,12 +1,9 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub , pkg-config , makeWrapper , openssl -, configd -, Security , mpv , ffmpeg , nodejs @@ -28,8 +25,7 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = true; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ configd Security ]; + buildInputs = [ openssl ]; postInstall = '' wrapProgram "$out/bin/dmlive" --prefix PATH : "${lib.makeBinPath [ mpv ffmpeg nodejs ]}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55b0e0397a14..d838013ae783 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23976,10 +23976,7 @@ with pkgs; dmarc-metrics-exporter = callPackage ../servers/monitoring/prometheus/dmarc-metrics-exporter { }; - dmlive = callPackage ../applications/video/dmlive { - inherit (darwin) configd; - inherit (darwin.apple_sdk.frameworks) Security; - }; + dmlive = callPackage ../applications/video/dmlive { }; do-agent = callPackage ../servers/monitoring/do-agent { }; From 7f271a2a68163fcb13af13662fb50a9d3be3f1a8 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 6 Nov 2024 07:57:28 -0500 Subject: [PATCH 440/617] dmlive: move to by-name --- .../video/dmlive/default.nix => by-name/dm/dmlive/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/video/dmlive/default.nix => by-name/dm/dmlive/package.nix} (100%) diff --git a/pkgs/applications/video/dmlive/default.nix b/pkgs/by-name/dm/dmlive/package.nix similarity index 100% rename from pkgs/applications/video/dmlive/default.nix rename to pkgs/by-name/dm/dmlive/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d838013ae783..a8a39f1fc0eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23976,8 +23976,6 @@ with pkgs; dmarc-metrics-exporter = callPackage ../servers/monitoring/prometheus/dmarc-metrics-exporter { }; - dmlive = callPackage ../applications/video/dmlive { }; - do-agent = callPackage ../servers/monitoring/do-agent { }; dodgy = with python3Packages; toPythonApplication dodgy; From aa3ca218252d482d3e0951192237bd5f1808f6e1 Mon Sep 17 00:00:00 2001 From: Massimo Gengarelli Date: Thu, 7 Nov 2024 10:47:00 +0100 Subject: [PATCH 441/617] proton-pass: fix missing tray icon The Tray Icon pixmaps are not part of the ASAR, it looks like Electron is expecting to find them into /assets. This commit should fix the issue of the Tray Icon not being visible on the DEs (issue #347830) --- pkgs/by-name/pr/proton-pass/package.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index 5545ab8a94f2..82ab6501009e 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -5,6 +5,7 @@ dpkg, makeWrapper, electron, + asar, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-pass"; @@ -21,21 +22,30 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ dpkg makeWrapper + asar ]; + # Rebuild the ASAR archive with the assets embedded + preInstall = '' + asar extract usr/lib/proton-pass/resources/app.asar tmp + cp -r usr/lib/proton-pass/resources/assets/ tmp/ + rm usr/lib/proton-pass/resources/app.asar + asar pack tmp/ usr/lib/proton-pass/resources/app.asar + rm -fr tmp + ''; + installPhase = '' runHook preInstall - mkdir -p $out + mkdir -p $out/share/proton-pass cp -r usr/share/ $out/ - cp -r usr/lib/proton-pass/resources/app.asar $out/share/ + cp -r usr/lib/proton-pass/resources/app.asar $out/share/proton-pass/ runHook postInstall ''; preFixup = '' makeWrapper ${lib.getExe electron} $out/bin/proton-pass \ - --add-flags $out/share/app.asar \ + --add-flags $out/share/proton-pass/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 ''; From 9b275ff032924928193d91a573021252bd0fa513 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 6 Nov 2024 07:58:17 -0500 Subject: [PATCH 442/617] dmlive: format with nixfmt --- pkgs/by-name/dm/dmlive/package.nix | 43 +++++++++++++++++++----------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/dm/dmlive/package.nix b/pkgs/by-name/dm/dmlive/package.nix index bd01e1bcc4d2..1f6714afff20 100644 --- a/pkgs/by-name/dm/dmlive/package.nix +++ b/pkgs/by-name/dm/dmlive/package.nix @@ -1,12 +1,13 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, makeWrapper -, openssl -, mpv -, ffmpeg -, nodejs +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + makeWrapper, + openssl, + mpv, + ffmpeg, + nodejs, }: rustPlatform.buildRustPackage rec { @@ -24,18 +25,30 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = true; - nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ openssl ]; + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + + buildInputs = [ + openssl + ]; postInstall = '' - wrapProgram "$out/bin/dmlive" --prefix PATH : "${lib.makeBinPath [ mpv ffmpeg nodejs ]}" + wrapProgram "$out/bin/dmlive" --prefix PATH : "${ + lib.makeBinPath [ + mpv + ffmpeg + nodejs + ] + }" ''; - meta = with lib; { + meta = { description = "Tool to play and record videos or live streams with danmaku"; homepage = "https://github.com/THMonster/dmlive"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "dmlive"; - maintainers = with maintainers; [ nickcao ]; + maintainers = with lib.maintainers; [ nickcao ]; }; } From fd5675dbe34cec9960abe161076398a6bcfd3f2a Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 7 Nov 2024 13:53:05 -0500 Subject: [PATCH 443/617] python312Packages.dicom2nifti: unbreak tests --- pkgs/development/python-modules/dicom2nifti/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dicom2nifti/default.nix b/pkgs/development/python-modules/dicom2nifti/default.nix index fae02acae762..a3b123f84302 100644 --- a/pkgs/development/python-modules/dicom2nifti/default.nix +++ b/pkgs/development/python-modules/dicom2nifti/default.nix @@ -8,6 +8,8 @@ nibabel, numpy, pydicom, + pylibjpeg, + pylibjpeg-libjpeg, scipy, setuptools, }: @@ -42,7 +44,11 @@ buildPythonPackage rec { substituteInPlace tests/test_ge.py --replace-fail "import convert_generic" "import dicom2nifti.convert_generic as convert_generic" ''; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pylibjpeg + pylibjpeg-libjpeg + ]; pythonImportsCheck = [ "dicom2nifti" ]; From 38835c82566164a08de5b95531a65ca4a261ec1b Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 7 Nov 2024 19:08:21 +0000 Subject: [PATCH 444/617] stdenv/darwin: add `darwin.{libutil,copyfile}` to SDK packages --- pkgs/stdenv/darwin/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 6f8ffaec92f1..cce15dff2b7b 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -349,9 +349,11 @@ let inherit (prevStage.darwin) Csu adv_cmds + copyfile libiconv libresolv libsbuf + libutil system_cmds ; }; From a061b02a6fc13985524e3fb5bf1da25b950d42ef Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 7 Nov 2024 19:07:30 +0000 Subject: [PATCH 445/617] Revert "python{27,39,310,311,312,313,314}: use a bootstrap SDK on Darwin" No longer necessary to mask an unwanted Python rebuild. This reverts commit c455166b5f3e62357fd0c40be2721dd78c36cfca. --- pkgs/development/interpreters/python/cpython/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index a7b34e3329d1..20c7c0c145ef 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -180,7 +180,7 @@ let darwin.apple_sdk.frameworks.Cocoa ] ++ optionals stdenv.hostPlatform.isDarwin [ # Work around for ld64 crashes on x86_64-darwin. Remove once 11.0 becomes the default. - (apple-sdk_11.override { enableBootstrap = true; }) + apple-sdk_11 ] ++ optionals stdenv.hostPlatform.isMinGW [ windows.dlfcn windows.mingw_w64_pthreads From 8f5e97899716c1dc9a12570f9feb4897001248c6 Mon Sep 17 00:00:00 2001 From: dvishal485 <26341736+dvishal485@users.noreply.github.com> Date: Fri, 8 Nov 2024 00:54:08 +0530 Subject: [PATCH 446/617] maintainers: add dvishal485 as maintainer Signed-off-by: dvishal485 <26341736+dvishal485@users.noreply.github.com> --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a844c0b45998..c9c5bbd8b0fe 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9405,6 +9405,12 @@ githubId = 36996706; name = "Philip Rying"; }; + imsick = { + email = "lent-lather-excuse@duck.com"; + github = "dvishal485"; + githubId = 26341736; + name = "Vishal Das"; + }; imuli = { email = "i@imu.li"; github = "imuli"; From a224f9267f98af7247be7eb9a2598914f1d3370d Mon Sep 17 00:00:00 2001 From: Andres Gongora Date: Thu, 7 Nov 2024 20:55:01 +0100 Subject: [PATCH 447/617] Remove slic3r Signed-off-by: Andres Gongora --- pkgs/applications/misc/bambu-studio/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix index 3e62298e6ee4..168c3ccf72f9 100644 --- a/pkgs/applications/misc/bambu-studio/default.nix +++ b/pkgs/applications/misc/bambu-studio/default.nix @@ -28,7 +28,6 @@ mesa, mpfr, nlopt, - slic3r, opencascade-occt_7_6, openvdb, opencv, From ae4fd669e4a5be2038fde3519dce1d79f450be0c Mon Sep 17 00:00:00 2001 From: rewine Date: Mon, 11 Mar 2024 00:34:35 +0800 Subject: [PATCH 448/617] qt6.wrapQtAppsHook: add `qtwayland` to `propagatedBuildInputs` qtwayland client side is the wayland platform plugin, provides a way to run Qt applications as Wayland clients without this, Qt applications only work on x11/xwayland Co-authored-by: Artturin --- pkgs/development/libraries/qt-6/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index d306c3e430da..036b4d6eea70 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -164,10 +164,11 @@ let qtwebview = callPackage ./modules/qtwebview.nix { }; wrapQtAppsHook = callPackage - ({ makeBinaryWrapper }: makeSetupHook + ({ makeBinaryWrapper, qtwayland }: makeSetupHook { name = "wrap-qt6-apps-hook"; propagatedBuildInputs = [ makeBinaryWrapper ]; + depsTargetTargetPropagated = lib.optionals stdenv.isLinux [ qtwayland.out ]; } ./hooks/wrap-qt-apps-hook.sh) { }; From b7cd0d3c885afc3e087ea54ed568baaee0bee7ce Mon Sep 17 00:00:00 2001 From: rewine Date: Mon, 11 Mar 2024 00:37:09 +0800 Subject: [PATCH 449/617] qt6.wrapQtAppsNoGuiHook: init Unlike wrapQtAppsHook, wrapQtAppsNoGuiHook does not propagate qtwayland, to reduce closure size for CLI or other non-GUI applications. Co-authored-by: eclairevoyant --- pkgs/development/libraries/qt-6/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 036b4d6eea70..34774144f876 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -172,6 +172,14 @@ let } ./hooks/wrap-qt-apps-hook.sh) { }; + wrapQtAppsNoGuiHook = callPackage + ({ makeBinaryWrapper }: makeSetupHook + { + name = "wrap-qt6-apps-no-gui-hook"; + propagatedBuildInputs = [ makeBinaryWrapper ]; + } ./hooks/wrap-qt-apps-hook.sh) + { }; + qmake = callPackage ({ qtbase }: makeSetupHook { From f542c493ada97abfc785a33bf2eb61b7516f2b52 Mon Sep 17 00:00:00 2001 From: rewine Date: Mon, 11 Mar 2024 01:18:59 +0800 Subject: [PATCH 450/617] qt6.qtwayland: set meta.{platforms,badPlatforms} --- pkgs/development/libraries/qt-6/default.nix | 2 +- pkgs/development/libraries/qt-6/modules/qtwayland.nix | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 34774144f876..b9d3c0e56ced 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -168,7 +168,7 @@ let { name = "wrap-qt6-apps-hook"; propagatedBuildInputs = [ makeBinaryWrapper ]; - depsTargetTargetPropagated = lib.optionals stdenv.isLinux [ qtwayland.out ]; + depsTargetTargetPropagated = lib.optionals (lib.meta.availableOn stdenv.targetPlatform qtwayland) [ qtwayland.out ]; } ./hooks/wrap-qt-apps-hook.sh) { }; diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix index 54346345e4e3..d3d55685f5fb 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -1,4 +1,5 @@ -{ qtModule +{ lib +, qtModule , qtbase , qtdeclarative , wayland @@ -22,4 +23,9 @@ qtModule { postPatch = '' cp ${wayland-scanner}/share/wayland/wayland.xml src/3rdparty/protocol/wayland/wayland.xml ''; + + meta = { + platforms = lib.platforms.unix; + badPlatforms = lib.platforms.darwin; + }; } From ff6a0848ca8066e21fd2a64167cf3a002ea39a13 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 5 Nov 2024 23:20:31 +0200 Subject: [PATCH 451/617] qt6.wrapQtAppsHook: Only propagate plugins,qml of `qtwayland` qt6.{wrapQtAppsHook,wrapQtAppsNoGuiHook}: propagate `qtbase` plugins https://www.github.com/NixOS/nixpkgs/pull/352419#discussion_r1823132984 --- pkgs/development/libraries/qt-6/default.nix | 24 ++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index b9d3c0e56ced..a4aa9124c3b9 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -7,6 +7,7 @@ , fetchpatch2 , makeSetupHook , makeWrapper +, runCommand , gst_all_1 , libglvnd , darwin @@ -37,6 +38,15 @@ let apple-sdk_15 (darwinMinVersionHook "12.0") ]; + + onlyPluginsAndQml = drv: let + drv' = drv.__spliced.targetTarget or drv; + inherit (self.qtbase) qtPluginPrefix qtQmlPrefix; + in (runCommand "${drv'.name}-only-plugins-qml" { } '' + mkdir -p $(dirname "$out/${qtPluginPrefix}") + test -d "${drv'}/${qtPluginPrefix}" && ln -s "${drv'}/${qtPluginPrefix}" "$out/${qtPluginPrefix}" || true + test -d "${drv'}/${qtQmlPrefix}" && ln -s "${drv'}/${qtQmlPrefix}" "$out/${qtQmlPrefix}" || true + ''); in { @@ -164,19 +174,27 @@ let qtwebview = callPackage ./modules/qtwebview.nix { }; wrapQtAppsHook = callPackage - ({ makeBinaryWrapper, qtwayland }: makeSetupHook + ({ makeBinaryWrapper, qtwayland, qtbase }: + makeSetupHook { name = "wrap-qt6-apps-hook"; propagatedBuildInputs = [ makeBinaryWrapper ]; - depsTargetTargetPropagated = lib.optionals (lib.meta.availableOn stdenv.targetPlatform qtwayland) [ qtwayland.out ]; + depsTargetTargetPropagated = [ + (onlyPluginsAndQml qtbase) + ] ++ lib.optionals (lib.meta.availableOn stdenv.targetPlatform qtwayland) [ + (onlyPluginsAndQml qtwayland) + ]; } ./hooks/wrap-qt-apps-hook.sh) { }; wrapQtAppsNoGuiHook = callPackage - ({ makeBinaryWrapper }: makeSetupHook + ({ makeBinaryWrapper, qtbase }: makeSetupHook { name = "wrap-qt6-apps-no-gui-hook"; propagatedBuildInputs = [ makeBinaryWrapper ]; + depsTargetTargetPropagated = [ + (onlyPluginsAndQml qtbase) + ]; } ./hooks/wrap-qt-apps-hook.sh) { }; From 9501a2053937d1783e69d29d968014ceb388df12 Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 20 Mar 2024 20:03:22 +0800 Subject: [PATCH 452/617] qtbase-setup-hook: add wrapQtAppsNoGuiHook to error message Co-authored-by: eclairevoyant --- pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh index 1ccfbd0cba38..4057a3c67eed 100644 --- a/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh @@ -75,9 +75,9 @@ else # Only set up Qt once. fi qtPreHook() { - # Check that wrapQtAppsHook is used, or it is explicitly disabled. + # Check that wrapQtAppsHook/wrapQtAppsNoGuiHook is used, or it is explicitly disabled. if [[ -z "$__nix_wrapQtAppsHook" && -z "$dontWrapQtApps" ]]; then - echo >&2 "Error: wrapQtAppsHook is not used, and dontWrapQtApps is not set." + echo >&2 "Error: neither wrapQtAppsHook nor wrapQtAppsNoGuiHook are used, and dontWrapQtApps is not set either." exit 1 fi } From a2d3be9d042eecca5eb45a40cf148c62613dcee9 Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 20 Mar 2024 20:20:19 +0800 Subject: [PATCH 453/617] deepin.dde-application-manager: use wrapQtAppsNoGuiHook to avoid propagating qtwayland Co-authored-by: eclairevoyant --- pkgs/desktops/deepin/core/dde-application-manager/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/deepin/core/dde-application-manager/default.nix b/pkgs/desktops/deepin/core/dde-application-manager/default.nix index 73b412d7e6da..d265cfdc6c06 100644 --- a/pkgs/desktops/deepin/core/dde-application-manager/default.nix +++ b/pkgs/desktops/deepin/core/dde-application-manager/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - qt6Packages.wrapQtAppsHook + qt6Packages.wrapQtAppsNoGuiHook ]; buildInputs = [ From 89fd77165500d7488a89a84a78a1b7b1507d8e3e Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 20 Mar 2024 20:21:41 +0800 Subject: [PATCH 454/617] pineapple-pictures: let wrapQtAppsHook propagate qtwayland --- pkgs/applications/graphics/pineapple-pictures/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix index 423ceaadc087..cb03e41704c5 100644 --- a/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/pkgs/applications/graphics/pineapple-pictures/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , qtsvg -, qtwayland , qttools , exiv2 , wrapQtAppsHook @@ -28,7 +27,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ qtsvg - qtwayland exiv2 ]; From 98774a34c85a160386f0b8419364b8eb4867fcba Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 20 Mar 2024 20:00:13 +0800 Subject: [PATCH 455/617] doc/qt: Mention propagates and wrapQtAppsNoGuiHook Co-authored-by: eclairevoyant Co-authored-by: Artturin --- doc/languages-frameworks/qt.section.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/languages-frameworks/qt.section.md b/doc/languages-frameworks/qt.section.md index dcec4b6fff42..6da0d7b501e9 100644 --- a/doc/languages-frameworks/qt.section.md +++ b/doc/languages-frameworks/qt.section.md @@ -25,12 +25,14 @@ stdenv.mkDerivation { The same goes for Qt 5 where libraries and tools are under `libsForQt5`. -Any Qt package should include `wrapQtAppsHook` in `nativeBuildInputs`, or explicitly set `dontWrapQtApps` to bypass generating the wrappers. +Any Qt package should include `wrapQtAppsHook` or `wrapQtAppsNoGuiHook` in `nativeBuildInputs`, or explicitly set `dontWrapQtApps` to bypass generating the wrappers. ::: {.note} -Qt 6 graphical applications should also include `qtwayland` in `buildInputs` on Linux (but not on platforms e.g. Darwin, where `qtwayland` is not available), to ensure the Wayland platform plugin is available. -This may become default in the future, see [NixOS/nixpkgs#269674](https://github.com/NixOS/nixpkgs/pull/269674). +`wrapQtAppsHook` propagates plugins and QML components from `qtwayland` to ensure the Wayland platform plugin is available, which is required for graphical applications to run under Wayland on non-Qt based desktops. On platforms that do not support `qtwayland` (e.g. Darwin), only plugins `qtbase` will be propagated. + +`wrapQtAppsNoGuiHook` does not propagate `qtwayland` reduce closure size for purely command-line applications. + ::: ## Packages supporting multiple Qt versions {#qt-versions} From c8aec3b28a36121fce3a8ee71c7c64535e7f45e5 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 7 Nov 2024 10:52:43 +0300 Subject: [PATCH 456/617] qt: editing pass on docs --- doc/languages-frameworks/qt.section.md | 4 ++-- pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/languages-frameworks/qt.section.md b/doc/languages-frameworks/qt.section.md index 6da0d7b501e9..9b3d1e054a62 100644 --- a/doc/languages-frameworks/qt.section.md +++ b/doc/languages-frameworks/qt.section.md @@ -29,9 +29,9 @@ Any Qt package should include `wrapQtAppsHook` or `wrapQtAppsNoGuiHook` in `nati ::: {.note} -`wrapQtAppsHook` propagates plugins and QML components from `qtwayland` to ensure the Wayland platform plugin is available, which is required for graphical applications to run under Wayland on non-Qt based desktops. On platforms that do not support `qtwayland` (e.g. Darwin), only plugins `qtbase` will be propagated. +`wrapQtAppsHook` propagates plugins and QML components from `qtwayland` on platforms that support it, to allow applications to act as native Wayland clients. It should be used for all graphical applications. -`wrapQtAppsNoGuiHook` does not propagate `qtwayland` reduce closure size for purely command-line applications. +`wrapQtAppsNoGuiHook` does not propagate `qtwayland` to reduce closure size for purely command-line applications. ::: diff --git a/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh index 4057a3c67eed..48beac0b04fa 100644 --- a/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh @@ -77,7 +77,10 @@ else # Only set up Qt once. qtPreHook() { # Check that wrapQtAppsHook/wrapQtAppsNoGuiHook is used, or it is explicitly disabled. if [[ -z "$__nix_wrapQtAppsHook" && -z "$dontWrapQtApps" ]]; then - echo >&2 "Error: neither wrapQtAppsHook nor wrapQtAppsNoGuiHook are used, and dontWrapQtApps is not set either." + echo >&2 "Error: this derivation depends on qtbase, but no wrapping behavior was specified." + echo >&2 " - If this is a graphical application, add wrapQtAppsHook to nativeBuildInputs" + echo >&2 " - If this is a CLI application, add wrapQtAppsNoGuiHook to nativeBuildInputs" + echo >&2 " - If this is a library or you need custom wrapping logic, set dontWrapQtApps = true" exit 1 fi } From 2513f704369baa42cdd1d8f53254894881b9be3e Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Thu, 7 Nov 2024 11:58:00 -0800 Subject: [PATCH 457/617] inshellisense: 0.0.1-rc.16 -> 0.0.1-rc.18 Diff: https://github.com/microsoft/inshellisense/compare/refs/tags/0.0.1-rc.16...0.0.1-rc.18 --- pkgs/by-name/in/inshellisense/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/inshellisense/package.nix b/pkgs/by-name/in/inshellisense/package.nix index 3b2a84ace0c5..115639aba3d3 100644 --- a/pkgs/by-name/in/inshellisense/package.nix +++ b/pkgs/by-name/in/inshellisense/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "inshellisense"; - version = "0.0.1-rc.16"; + version = "0.0.1-rc.18"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-jqLYN251ZvLOjYsSQJmvQ1TupO4jz3Q23aDpKX+Puvs="; + hash = "sha256-9cSygGQar2rD3lorehlNmUzd0ZnABNJSJwmoNH3MTmk="; }; - npmDepsHash = "sha256-rGUyA0RLnNZ6ocmHPXfBLJ6ZmeeTN9w+TJTtfTQQ24M="; + npmDepsHash = "sha256-/FSzeHPgVb5OB6mjP5GYAYBdTmk93xyWJI+NH7L61Do="; # Needed for dependency `@homebridge/node-pty-prebuilt-multiarch` # On Darwin systems the build fails with, From ba89dccdcda9842284e5b128ad01adc9f9dc1a1c Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Thu, 7 Nov 2024 21:24:52 +0100 Subject: [PATCH 458/617] python312Packages.notion-client: disable http test to fix build --- pkgs/development/python-modules/notion-client/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/notion-client/default.nix b/pkgs/development/python-modules/notion-client/default.nix index 6ec520c3ae47..ca931b8510d6 100644 --- a/pkgs/development/python-modules/notion-client/default.nix +++ b/pkgs/development/python-modules/notion-client/default.nix @@ -43,6 +43,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "notion_client" ]; + disabledTests = [ + "test_api_http_response_error" + ]; + meta = with lib; { description = "Python client for the official Notion API"; homepage = "https://github.com/ramnes/notion-sdk-py"; From e73925c767068c044ab877272b1da6dd5987cf3d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 20:26:02 +0000 Subject: [PATCH 459/617] mdbook-katex: 0.9.0 -> 0.9.1 --- pkgs/tools/text/mdbook-katex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook-katex/default.nix b/pkgs/tools/text/mdbook-katex/default.nix index 0c2c53825b7e..f87e3491a184 100644 --- a/pkgs/tools/text/mdbook-katex/default.nix +++ b/pkgs/tools/text/mdbook-katex/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.9.0"; + version = "0.9.1"; src = fetchCrate { inherit pname version; - hash = "sha256-OTMPf/ZlUtqKz8Lb0uFOhad33N6SaCIZ86I2ajZ19fU="; + hash = "sha256-F+yNfXBTAg9S6R85bGStumr1OXdWN3o95TxC0qgUeME="; }; - cargoHash = "sha256-U8uDcNkEyz7zAqCTthY5SVGshsJRKRaoBLOpBpQ9sho="; + cargoHash = "sha256-01lr6ZS+7MmgKmuP+xEX7j1x2qDofmzeevUqY/UqRUw="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; From 3e64289a9cd5dd4684e9b60d3a09341211828093 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 20:39:56 +0000 Subject: [PATCH 460/617] python312Packages.tatsu: 5.12.1 -> 5.12.2 --- pkgs/development/python-modules/tatsu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix index 5e601845b4cc..40de44127087 100644 --- a/pkgs/development/python-modules/tatsu/default.nix +++ b/pkgs/development/python-modules/tatsu/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "tatsu"; - version = "5.12.1"; + version = "5.12.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "neogeny"; repo = "TatSu"; rev = "refs/tags/v${version}"; - hash = "sha256-dY+hvNwYrkKko9A5yRT0EWYlvVu3OrhJMzk/8cjzuUo="; + hash = "sha256-FRNQz3JtsFw1nch+ffGMzZF1+gq7XifPok9qsUiRPs8="; }; nativeBuildInputs = [ setuptools ]; From 038b963062e5ee9d983584e5b570390272fbec4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 20:43:24 +0000 Subject: [PATCH 461/617] gh-poi: 0.10.1 -> 0.11.0 --- pkgs/by-name/gh/gh-poi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gh/gh-poi/package.nix b/pkgs/by-name/gh/gh-poi/package.nix index b1a72b88516b..f2fa0e9f5157 100644 --- a/pkgs/by-name/gh/gh-poi/package.nix +++ b/pkgs/by-name/gh/gh-poi/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gh-poi"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "seachicken"; repo = "gh-poi"; rev = "v${version}"; - hash = "sha256-ZQkXXaa4n88bJdgP2FSXtgBrUi39teO98SzZq+I5doM="; + hash = "sha256-xLeIqTGwizvBmOgwisqoCrFY4KdWoWrA0YYgPWtQT/M="; }; ldflags = [ "-s" "-w" ]; @@ -19,7 +19,7 @@ buildGoModule rec { vendorHash = "sha256-D/YZLwwGJWCekq9mpfCECzJyJ/xSlg7fC6leJh+e8i0="; # Skip checks because some of test suites require fixture. - # See: https://github.com/seachicken/gh-poi/blob/v0.10.1/.github/workflows/contract-test.yml#L28-L29 + # See: https://github.com/seachicken/gh-poi/blob/v0.11.0/.github/workflows/contract-test.yml#L28-L29 doCheck = false; meta = with lib; { From fe0ab212603200d18f1de4beeb4694aa44c84ad1 Mon Sep 17 00:00:00 2001 From: huantian Date: Thu, 7 Nov 2024 12:46:07 -0800 Subject: [PATCH 462/617] unityhub: 3.9.1 -> 3.10.0 --- pkgs/development/tools/unityhub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index c18c8b60f6d0..d7d2bd2c2a8c 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "unityhub"; - version = "3.9.1"; + version = "3.10.0"; src = fetchurl { url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/unityhub-amd64-${version}.deb"; - sha256 = "sha256-ZNsViLT0sFnHeV3FvJFPQbJ99mgpD2rH+bZOOGPgIhA="; + sha256 = "sha256-9dm6tVQ5nsDC8X2clrT4cAl8jg4wLwcihE4bnFgdU+A="; }; nativeBuildInputs = [ From 8639bd0a58b5f6405cfda4f3578f51adf664e386 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 2 Nov 2024 14:41:33 +0100 Subject: [PATCH 463/617] loguru: init at 2.1.0-unstable-2023-04-6 Using the unstable version including `cmake` support. --- pkgs/by-name/lo/loguru/package.nix | 49 ++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/lo/loguru/package.nix diff --git a/pkgs/by-name/lo/loguru/package.nix b/pkgs/by-name/lo/loguru/package.nix new file mode 100644 index 000000000000..84fe218859c7 --- /dev/null +++ b/pkgs/by-name/lo/loguru/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, +}: + +stdenv.mkDerivation { + pname = "loguru"; + version = "2.1.0-unstable-2023-04-06"; + + src = fetchFromGitHub { + owner = "emilk"; + repo = "loguru"; + rev = "4adaa185883e3c04da25913579c451d3c32cfac1"; + hash = "sha256-NpMKyjCC06bC5B3xqgDr2NgA9RsPEeiWr9GbHrHHzZ8="; + }; + + patches = [ + # See https://github.com/emilk/loguru/issues/249 + # The following patches are coming from a fork and fix builds on Darwin + # Hopefully they will be merged in the main repository soon. + (fetchpatch { + url = "https://github.com/virtuosonic/loguru/commit/e1ffdc4149083cc221d44b666a0f7e3ec4a87259.patch"; + hash = "sha256-fYdS8+qfgyj1J+T6H434jDGK/L+VYq+L22CQ7M/uiXE="; + }) + (fetchpatch { + url = "https://github.com/virtuosonic/loguru/commit/743777bea361642349d4673e6a0a55912849c14f.patch"; + hash = "sha256-3FhH7zdkzHuXSirSCr8A3uHg8UpSfEM02AkR0ZSG0Yw="; + }) + ]; + + cmakeFlags = [ + "-DLOGURU_WITH_STREAMS=1" + ]; + + nativeBuildInputs = [ + cmake + ]; + + meta = { + description = "Lightweight C++ logging library"; + homepage = "https://github.com/emilk/loguru"; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ drupol ]; + platforms = lib.platforms.all; + }; +} From 5d377ab649b49ec60fa47db16ad655834c8ce9e3 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 2 Nov 2024 20:21:48 +0100 Subject: [PATCH 464/617] python312Packages.mean-average-precision: init at 2024.01.05.0 --- .../mean-average-precision/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/mean-average-precision/default.nix diff --git a/pkgs/development/python-modules/mean-average-precision/default.nix b/pkgs/development/python-modules/mean-average-precision/default.nix new file mode 100644 index 000000000000..24a4d65aaf67 --- /dev/null +++ b/pkgs/development/python-modules/mean-average-precision/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + numpy, + pandas, +}: + +buildPythonPackage rec { + pname = "mean-average-precision"; + version = "2024.01.05.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bes-dev"; + repo = "mean_average_precision"; + rev = "refs/tags/${version}"; + hash = "sha256-qo160L+oJsHERVOV0qdiRIZPMjvSlUmMTrAzThfrQSs="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + numpy + pandas + ]; + + pythonImportsCheck = [ + "mean_average_precision" + ]; + + # No tests + doCheck = false; + + meta = { + description = "Mean Average Precision for Object Detection"; + homepage = "https://github.com/bes-dev/mean_average_precision"; + changelog = "https://github.com/bes-dev/mean_average_precision/blob/${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 453d627ff5ea..f5ff04fc456a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7855,6 +7855,8 @@ self: super: with self; { mdp = callPackage ../development/python-modules/mdp { }; + mean-average-precision = callPackage ../development/python-modules/mean-average-precision { }; + measurement = callPackage ../development/python-modules/measurement { }; meater-python = callPackage ../development/python-modules/meater-python { }; From e19c00073baf15a764573d20366532b563751021 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 2 Nov 2024 20:49:20 +0100 Subject: [PATCH 465/617] python312Packages.marko: init at 2.1.2 --- .../python-modules/marko/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/marko/default.nix diff --git a/pkgs/development/python-modules/marko/default.nix b/pkgs/development/python-modules/marko/default.nix new file mode 100644 index 000000000000..d5aaf83d76c0 --- /dev/null +++ b/pkgs/development/python-modules/marko/default.nix @@ -0,0 +1,55 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pdm-backend, + pygments, + objprint, + python-slugify, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "marko"; + version = "2.1.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "frostming"; + repo = "marko"; + rev = "refs/tags/v${version}"; + hash = "sha256-KqdBYmlVs00atXy7MSsriRBnL7w13io2oFZ0IyJ2Om4="; + }; + + build-system = [ + pdm-backend + ]; + + optional-dependencies = { + codehilite = [ + pygments + ]; + repr = [ + objprint + ]; + toc = [ + python-slugify + ]; + }; + + pythonImportsCheck = [ + "marko" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ optional-dependencies.toc ++ optional-dependencies.codehilite; + + meta = { + changelog = "https://github.com/frostming/marko/blob/${src.rev}/CHANGELOG.md"; + description = "Markdown parser with high extensibility"; + homepage = "https://github.com/frostming/marko"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f5ff04fc456a..8c3a6c28512f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7733,6 +7733,8 @@ self: super: with self; { markdownify = callPackage ../development/python-modules/markdownify { }; + marko = callPackage ../development/python-modules/marko { }; + markupsafe = callPackage ../development/python-modules/markupsafe { }; markuppy = callPackage ../development/python-modules/markuppy { }; From 254f162c32814a09f46273da145f8a65cdbe9b0e Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 2 Nov 2024 21:14:30 +0100 Subject: [PATCH 466/617] python312Packages.objprint: init at 0.2.3 --- .../python-modules/objprint/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/objprint/default.nix diff --git a/pkgs/development/python-modules/objprint/default.nix b/pkgs/development/python-modules/objprint/default.nix new file mode 100644 index 000000000000..23460fe5ffc9 --- /dev/null +++ b/pkgs/development/python-modules/objprint/default.nix @@ -0,0 +1,39 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "objprint"; + version = "0.2.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "gaogaotiantian"; + repo = "objprint"; + rev = version; + hash = "sha256-IGYjDdi3JzYk53ITVOhVnm9EDsa+4HXSVtVUE3wQWTo="; + }; + + build-system = [ + setuptools + ]; + + pythonImportsCheck = [ + "objprint" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Library that can print Python objects in human readable format"; + homepage = "https://github.com/gaogaotiantian/objprint"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8c3a6c28512f..167b7b1ecc5a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9289,6 +9289,8 @@ self: super: with self; { objexplore = callPackage ../development/python-modules/objexplore { }; + objprint = callPackage ../development/python-modules/objprint { }; + objsize = callPackage ../development/python-modules/objsize { }; objgraph = callPackage ../development/python-modules/objgraph { From 44fc6841e9b6e0246aec7ea7e746cc817098b431 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 2 Nov 2024 19:25:16 +0100 Subject: [PATCH 467/617] python312Packages.docling-parse: init at 2.0.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com> --- .../python-modules/docling-parse/default.nix | 81 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 + 2 files changed, 85 insertions(+) create mode 100644 pkgs/development/python-modules/docling-parse/default.nix diff --git a/pkgs/development/python-modules/docling-parse/default.nix b/pkgs/development/python-modules/docling-parse/default.nix new file mode 100644 index 000000000000..d03385c1a05b --- /dev/null +++ b/pkgs/development/python-modules/docling-parse/default.nix @@ -0,0 +1,81 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + cmake, + pkg-config, + cxxopts, + poetry-core, + pybind11, + tabulate, + zlib, + nlohmann_json, + utf8cpp, + libjpeg, + qpdf, + loguru-cpp, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "docling-parse"; + version = "2.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "DS4SD"; + repo = "docling-parse"; + rev = "refs/tags/v${version}"; + hash = "sha256-unXGmMp5xyRCqSoFmqcQAZOBzpE0EzgEEBIfZUHhRcQ="; + }; + + dontUseCmakeConfigure = true; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + build-system = [ + poetry-core + ]; + + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev utf8cpp}/include/utf8cpp"; + + buildInputs = [ + pybind11 + cxxopts + libjpeg + loguru-cpp + nlohmann_json + qpdf + utf8cpp + zlib + ]; + + env.USE_SYSTEM_DEPS = true; + + cmakeFlags = [ + "-DUSE_SYSTEM_DEPS=True" + ]; + + dependencies = [ + tabulate + ]; + + pythonImportsCheck = [ + "docling_parse" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/DS4SD/docling-parse/blob/${src.rev}/CHANGELOG.md"; + description = "Simple package to extract text with coordinates from programmatic PDFs"; + homepage = "https://github.com/DS4SD/docling-parse"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 167b7b1ecc5a..4de1d05da5d8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3688,6 +3688,10 @@ self: super: with self; { dockerspawner = callPackage ../development/python-modules/dockerspawner { }; + docling-parse = callPackage ../development/python-modules/docling-parse { + loguru-cpp = pkgs.loguru; + }; + docloud = callPackage ../development/python-modules/docloud { }; docstr-coverage = callPackage ../development/python-modules/docstr-coverage { }; From f170df776377926db5b038c919d7334285d84570 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 2 Nov 2024 22:03:25 +0100 Subject: [PATCH 468/617] python312Packages.docling-ibm-models: init at 2.0.3 --- .../docling-ibm-models/default.nix | 75 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 77 insertions(+) create mode 100644 pkgs/development/python-modules/docling-ibm-models/default.nix diff --git a/pkgs/development/python-modules/docling-ibm-models/default.nix b/pkgs/development/python-modules/docling-ibm-models/default.nix new file mode 100644 index 000000000000..dbd7b4e819ec --- /dev/null +++ b/pkgs/development/python-modules/docling-ibm-models/default.nix @@ -0,0 +1,75 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + huggingface-hub, + jsonlines, + lxml, + mean-average-precision, + numpy, + opencv-python-headless, + pillow, + torch, + torchvision, + tqdm, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "docling-ibm-models"; + version = "2.0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "DS4SD"; + repo = "docling-ibm-models"; + rev = "refs/tags/v${version}"; + hash = "sha256-vSEW1+mFTjUvjjUOoX3aGgT/y8iwP3JGIZaPh9RbX5I="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + huggingface-hub + jsonlines + lxml + mean-average-precision + numpy + opencv-python-headless + pillow + torch + torchvision + tqdm + ]; + + pythonRelaxDeps = [ + "lxml" + "mean_average_precision" + "torchvision" + ]; + + pythonImportsCheck = [ + "docling_ibm_models" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # Requires network access + "test_layoutpredictor" + "test_tf_predictor" + ]; + + meta = { + changelog = "https://github.com/DS4SD/docling-ibm-models/blob/${src.rev}/CHANGELOG.md"; + description = "Docling IBM models"; + homepage = "https://github.com/DS4SD/docling-ibm-models"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4de1d05da5d8..60307f99fac6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3688,6 +3688,8 @@ self: super: with self; { dockerspawner = callPackage ../development/python-modules/dockerspawner { }; + docling-ibm-models = callPackage ../development/python-modules/docling-ibm-models { }; + docling-parse = callPackage ../development/python-modules/docling-parse { loguru-cpp = pkgs.loguru; }; From 6487438e9980e0228ba1c90161a1c3122c0fb474 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 6 Nov 2024 22:58:47 +0100 Subject: [PATCH 469/617] python312Packages.docling-core: init at 2.3.1 --- .../python-modules/docling-core/default.nix | 59 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/docling-core/default.nix diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix new file mode 100644 index 000000000000..b790ca13ab86 --- /dev/null +++ b/pkgs/development/python-modules/docling-core/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + jsonref, + jsonschema, + pandas, + pillow, + pydantic, + tabulate, + jsondiff, + requests, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "docling-core"; + version = "2.3.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "DS4SD"; + repo = "docling-core"; + rev = "refs/tags/v${version}"; + hash = "sha256-yNsmMAeR1sbZsddpjMFWZy2UAbIWWiZmdW4/lwLvCbM="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + jsonref + jsonschema + pandas + pillow + pydantic + tabulate + ]; + + pythonImportsCheck = [ + "docling_core" + ]; + + nativeCheckInputs = [ + jsondiff + pytestCheckHook + requests + ]; + + meta = { + changelog = "https://github.com/DS4SD/docling-core/blob/${version}/CHANGELOG.md"; + description = "Python library to define and validate data types in Docling"; + homepage = "https://github.com/DS4SD/docling-core"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 60307f99fac6..7a36a3dcea9a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3688,6 +3688,8 @@ self: super: with self; { dockerspawner = callPackage ../development/python-modules/dockerspawner { }; + docling-core = callPackage ../development/python-modules/docling-core { }; + docling-ibm-models = callPackage ../development/python-modules/docling-ibm-models { }; docling-parse = callPackage ../development/python-modules/docling-parse { From 91d95405a817aa381fd2120b63be21b27e62111c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 2 Nov 2024 22:18:23 +0100 Subject: [PATCH 470/617] python312Packages.deepsearch-toolkit: init at 1.1.1 --- .../deepsearch-toolkit/default.nix | 93 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 95 insertions(+) create mode 100644 pkgs/development/python-modules/deepsearch-toolkit/default.nix diff --git a/pkgs/development/python-modules/deepsearch-toolkit/default.nix b/pkgs/development/python-modules/deepsearch-toolkit/default.nix new file mode 100644 index 000000000000..92a88b601507 --- /dev/null +++ b/pkgs/development/python-modules/deepsearch-toolkit/default.nix @@ -0,0 +1,93 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + certifi, + docling-core, + platformdirs, + pluggy, + pydantic, + pydantic-settings, + python-dateutil, + python-dotenv, + requests, + six, + tabulate, + tqdm, + typer, + urllib3, + anyio, + fastapi, + uvicorn, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "deepsearch-toolkit"; + version = "1.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "DS4SD"; + repo = "deepsearch-toolkit"; + rev = "refs/tags/v${version}"; + hash = "sha256-7XiI/VtXX4lRMreqUh6hJvdIULGvsCEdrd+zV5Jrne0="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + certifi + docling-core + platformdirs + pluggy + pydantic + pydantic-settings + python-dateutil + python-dotenv + requests + six + tabulate + tqdm + typer + urllib3 + ]; + + pythonRelaxDeps = [ + "urllib3" + ]; + + optional-dependencies = rec { + all = api; + api = [ + anyio + fastapi + uvicorn + ]; + }; + + pythonImportsCheck = [ + "deepsearch" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # Tests require the creation of a deepsearch profile + "test_project_listing" + "test_system_info" + ]; + + meta = { + changelog = "https://github.com/DS4SD/deepsearch-toolkit/blob/${src.rev}/CHANGELOG.md"; + description = "Interact with the Deep Search platform for new knowledge explorations and discoveries"; + homepage = "https://github.com/DS4SD/deepsearch-toolkit"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7a36a3dcea9a..3fb9c1d04ff2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3064,6 +3064,8 @@ self: super: with self; { deepmerge = callPackage ../development/python-modules/deepmerge { }; + deepsearch-toolkit = callPackage ../development/python-modules/deepsearch-toolkit { }; + deeptoolsintervals = callPackage ../development/python-modules/deeptoolsintervals { }; deepwave = callPackage ../development/python-modules/deepwave { }; From fdf46420405e0482b4775ff3451b3e639842cd8f Mon Sep 17 00:00:00 2001 From: seth Date: Thu, 7 Nov 2024 19:08:11 +0000 Subject: [PATCH 471/617] xwayland-satellite: 0.4-unstable-2024-09-15 -> 0.5 Changelog: https://github.com/Supreeeme/xwayland-satellite/releases/tag/v0.5 Diff: https://github.com/Supreeeme/xwayland-satellite/compare/b962a0f33b503aa39c9cf6919f488b664e5b79b4...v0.5 --- pkgs/by-name/xw/xwayland-satellite/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/xw/xwayland-satellite/package.nix b/pkgs/by-name/xw/xwayland-satellite/package.nix index 19194ffabd85..a04b4d54e5a3 100644 --- a/pkgs/by-name/xw/xwayland-satellite/package.nix +++ b/pkgs/by-name/xw/xwayland-satellite/package.nix @@ -3,23 +3,23 @@ fetchFromGitHub, libxcb, makeBinaryWrapper, + nix-update-script, pkg-config, rustPlatform, - unstableGitUpdater, xcb-util-cursor, xwayland, withSystemd ? true, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "xwayland-satellite"; - version = "0.4-unstable-2024-09-15"; + version = "0.5"; src = fetchFromGitHub { owner = "Supreeeme"; repo = "xwayland-satellite"; - rev = "b962a0f33b503aa39c9cf6919f488b664e5b79b4"; - hash = "sha256-OANPb73V/RQDqtpIcbzeJ93KuOHKFQv+1xXC44Ut7tY="; + rev = "refs/tags/v${version}"; + hash = "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s="; }; postPatch = '' @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage { --replace-fail '/usr/local/bin' "$out/bin" ''; - cargoHash = "sha256-1EtwGMoLfYK0VZj8jdQiweO/RHGBzyEoeMEI4pmqfu8="; + cargoHash = "sha256-KnkU+uLToD0cBNgPnRiR34XHIphQWoATjim1E/MVf48="; nativeBuildInputs = [ makeBinaryWrapper @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage { --prefix PATH : "${lib.makeBinPath [ xwayland ]}" ''; - passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; }; + passthru.updateScript = nix-update-script { }; meta = { description = "Xwayland outside your Wayland compositor"; From 56d1dce26b5cd8ced3f872c0f9623ef902c51b94 Mon Sep 17 00:00:00 2001 From: seth Date: Thu, 7 Nov 2024 16:05:37 -0500 Subject: [PATCH 472/617] xwayland-satellite: add meta.changelog --- pkgs/by-name/xw/xwayland-satellite/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/xw/xwayland-satellite/package.nix b/pkgs/by-name/xw/xwayland-satellite/package.nix index a04b4d54e5a3..c39830d8bf73 100644 --- a/pkgs/by-name/xw/xwayland-satellite/package.nix +++ b/pkgs/by-name/xw/xwayland-satellite/package.nix @@ -63,6 +63,7 @@ rustPlatform.buildRustPackage rec { Grants rootless Xwayland integration to any Wayland compositor implementing xdg_wm_base. ''; homepage = "https://github.com/Supreeeme/xwayland-satellite"; + changelog = "https://github.com/Supreeeme/xwayland-satellite/releases/tag/v${version}"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ if-loop69420 From 9d7ab9fcd4e1821a6579ca444821418bcfd465de Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Thu, 7 Nov 2024 22:07:33 +0100 Subject: [PATCH 473/617] python312Packages.ormar: mark as broken, does not work with SQLAlchemy 2.0.0 --- pkgs/development/python-modules/ormar/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix index bb65573eee64..6c2634bb56c1 100644 --- a/pkgs/development/python-modules/ormar/default.nix +++ b/pkgs/development/python-modules/ormar/default.nix @@ -145,5 +145,6 @@ buildPythonPackage rec { changelog = "https://github.com/collerek/ormar/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ andreasfelix ]; + broken = true; }; } From 9138d320efd33698ce1fccfacae731b88a91c3b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 7 Nov 2024 22:17:18 +0100 Subject: [PATCH 474/617] osu-lazer: add vulkan support --- pkgs/by-name/os/osu-lazer/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix index a2523df7853c..6bd569a4b33f 100644 --- a/pkgs/by-name/os/osu-lazer/package.nix +++ b/pkgs/by-name/os/osu-lazer/package.nix @@ -15,6 +15,7 @@ libglvnd, xorg, udev, + vulkan-loader, }: buildDotnetModule rec { @@ -57,6 +58,9 @@ buildDotnetModule rec { # [verbose]: SDL error log [debug]: Failed loading udev_device_get_action: /nix/store/*-osu-lazer-*/lib/osu-lazer/runtimes/linux-x64/native/libSDL2.so: undefined symbol: _udev_device_get_action # [verbose]: SDL error log [debug]: Failed loading libudev.so.1: libudev.so.1: cannot open shared object file: No such file or directory udev + + # needed for vulkan renderer, can fall back to opengl if omitted + vulkan-loader ]; executables = [ "osu!" ]; From 13d1089f5a9a9e35489d0e7d58ccf2e052e304a6 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 4 Nov 2024 09:07:35 -0600 Subject: [PATCH 475/617] jellyfin: 10.10.0 -> 10.10.1 --- pkgs/by-name/je/jellyfin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/je/jellyfin/package.nix b/pkgs/by-name/je/jellyfin/package.nix index 429d1311b226..c65949d634e3 100644 --- a/pkgs/by-name/je/jellyfin/package.nix +++ b/pkgs/by-name/je/jellyfin/package.nix @@ -13,13 +13,13 @@ buildDotnetModule rec { pname = "jellyfin"; - version = "10.10.0"; # ensure that jellyfin-web has matching version + version = "10.10.1"; # ensure that jellyfin-web has matching version src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin"; rev = "v${version}"; - hash = "sha256-XeMZEUorRrpS6GJ2qaXbyKUw0EaKCJF0PSoghUmOnrc="; + hash = "sha256-jDiJ1tnCR3cZvNmvZ47Vvoqow1sC+xciHsO546yoIKY="; }; propagatedBuildInputs = [ sqlite ]; From b6ea4f466c46a4b1b6e629a48730f263eabd0164 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 4 Nov 2024 09:10:17 -0600 Subject: [PATCH 476/617] jellyfin-web: 10.10.0 -> 10.10.1 --- pkgs/by-name/je/jellyfin-web/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix index 965a2903ce1a..b678ce2614cf 100644 --- a/pkgs/by-name/je/jellyfin-web/package.nix +++ b/pkgs/by-name/je/jellyfin-web/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, buildNpmPackage, - jellyfin, nix-update-script, pkg-config, xcbuild, @@ -14,13 +13,13 @@ }: buildNpmPackage rec { pname = "jellyfin-web"; - version = "10.10.0"; + version = "10.10.1"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-web"; rev = "v${version}"; - hash = "sha256-BuAvdDIvW2mQ+MzVBPGCFV73P6GxR/I3U24kCu+lXbc="; + hash = "sha256-+f+chR00eDCVZvAGNDB61c0htsVvqFK62oZorW3Qdsg="; }; postPatch = '' @@ -28,7 +27,7 @@ buildNpmPackage rec { --replace-fail "git describe --always --dirty" "echo ${src.rev}" \ ''; - npmDepsHash = "sha256-EAZm4UTc9+gW7uPiNEp2vLSKA2vOmLKKZ4/DrnGrvYQ="; + npmDepsHash = "sha256-kL57KmBHmBwJEhsUciPaj826qdoSQxZXxtFNGkddGZk="; preBuild = '' # using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart From 8285855799ac9d44c3da020c14a13dc2a6c2e457 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 5 Nov 2024 15:30:37 -0600 Subject: [PATCH 477/617] jellyfin-web: assert matching jellyfin version --- pkgs/by-name/je/jellyfin-web/package.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix index b678ce2614cf..6cfa106b603c 100644 --- a/pkgs/by-name/je/jellyfin-web/package.nix +++ b/pkgs/by-name/je/jellyfin-web/package.nix @@ -10,17 +10,20 @@ giflib, apple-sdk_11, darwinMinVersionHook, + jellyfin, }: buildNpmPackage rec { pname = "jellyfin-web"; version = "10.10.1"; - src = fetchFromGitHub { - owner = "jellyfin"; - repo = "jellyfin-web"; - rev = "v${version}"; - hash = "sha256-+f+chR00eDCVZvAGNDB61c0htsVvqFK62oZorW3Qdsg="; - }; + src = + assert version == jellyfin.version; + fetchFromGitHub { + owner = "jellyfin"; + repo = "jellyfin-web"; + rev = "v${version}"; + hash = "sha256-+f+chR00eDCVZvAGNDB61c0htsVvqFK62oZorW3Qdsg="; + }; postPatch = '' substituteInPlace webpack.common.js \ From 01310793c88c0ac7e9281a4ceed0cbe9a890fda1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 7 Nov 2024 22:41:21 +0100 Subject: [PATCH 478/617] bruno: postBuild -> buildPhase --- pkgs/by-name/br/bruno/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 623998e9fd61..07e8516e308d 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -86,8 +86,9 @@ buildNpmPackage rec { npm rebuild ''; - dontNpmBuild = true; - postBuild = '' + buildPhase = '' + runHook preBuild + npm run build --workspace=packages/bruno-common npm run build --workspace=packages/bruno-graphql-docs npm run build --workspace=packages/bruno-app @@ -127,6 +128,8 @@ buildNpmPackage rec { } popd + + runHook postBuild ''; npmPackFlags = [ "--ignore-scripts" ]; From 8c7e1de25589f813663a064c9aaf144f013e5522 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 21:43:22 +0000 Subject: [PATCH 479/617] python312Packages.teslajsonpy: 3.12.1 -> 3.12.2 --- pkgs/development/python-modules/teslajsonpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 2c293c5d7bd4..870e88e426fd 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "3.12.1"; + version = "3.12.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = "teslajsonpy"; rev = "refs/tags/v${version}"; - hash = "sha256-kUuvzjQBHWy3Si/Ha9M01ijv4QyQwK/g5gyhd7/lIdA="; + hash = "sha256-chUW7aa99KzYyn8qVDX4GK8eI8MoP8+TKRx9PI+0ZKE="; }; build-system = [ poetry-core ]; From 518bc9c5b3c0a7517a5145324dbac62b826b066b Mon Sep 17 00:00:00 2001 From: KX Date: Tue, 25 Jun 2024 14:43:29 +0200 Subject: [PATCH 480/617] nixos/promtail: configFile for passing path as config --- nixos/modules/services/logging/promtail.nix | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/logging/promtail.nix b/nixos/modules/services/logging/promtail.nix index 9eccd34cef23..178b9893525b 100644 --- a/nixos/modules/services/logging/promtail.nix +++ b/nixos/modules/services/logging/promtail.nix @@ -10,15 +10,29 @@ let allowPositionsFile = !lib.hasPrefix "/var/cache/promtail" positionsFile; positionsFile = cfg.configuration.positions.filename; + + configFile = if cfg.configFile != null + then cfg.configFile + else prettyJSON cfg.configuration; + in { options.services.promtail = with types; { enable = mkEnableOption "the Promtail ingresser"; - configuration = mkOption { type = (pkgs.formats.json {}).type; description = '' Specify the configuration for Promtail in Nix. + This option will be ignored if `services.promtail.configFile` is defined. + ''; + }; + + configFile = mkOption { + type = nullOr path; + default = null; + description = '' + Config file path for Promtail. + If this option is defined, the value of `services.promtail.configuration` will be ignored. ''; }; @@ -42,14 +56,14 @@ in { stopIfChanged = false; preStart = '' - ${lib.getExe pkgs.promtail} -config.file=${prettyJSON cfg.configuration} -check-syntax + ${lib.getExe pkgs.promtail} -config.file=${configFile} -check-syntax ''; serviceConfig = { Restart = "on-failure"; TimeoutStopSec = 10; - ExecStart = "${pkgs.promtail}/bin/promtail -config.file=${prettyJSON cfg.configuration} ${escapeShellArgs cfg.extraFlags}"; + ExecStart = "${pkgs.promtail}/bin/promtail -config.file=${configFile} ${escapeShellArgs cfg.extraFlags}"; ProtectSystem = "strict"; ProtectHome = true; From c4cfa34cd6ef34c0c0cd104f65c3be72cae50f56 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Thu, 7 Nov 2024 21:55:19 +0000 Subject: [PATCH 481/617] opencommit: init at 3.2.1 --- pkgs/by-name/op/opencommit/package.nix | 31 ++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/op/opencommit/package.nix diff --git a/pkgs/by-name/op/opencommit/package.nix b/pkgs/by-name/op/opencommit/package.nix new file mode 100644 index 000000000000..ae89601f8ce3 --- /dev/null +++ b/pkgs/by-name/op/opencommit/package.nix @@ -0,0 +1,31 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage rec { + pname = "opencommit"; + version = "3.2.1"; + + src = fetchFromGitHub { + owner = "di-sukharev"; + repo = "opencommit"; + rev = "v${version}"; + hash = "sha256-+uKb7qhQJEbuatPsewSGgVd5J6WtsrNO+hE59/KZIJI="; + }; + + npmDepsHash = "sha256-6tzV4iP7YzlbqOTgYf9XoTmIFPSBug0wYDelc6wcbCA="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "AI-powered commit message generator"; + homepage = "https://www.npmjs.com/package/opencommit"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.matteopacini ]; + mainProgram = "oco"; + }; + +} From bbd55bd6984d9480dfcbf4922abcee066420c7e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 22:10:01 +0000 Subject: [PATCH 482/617] python312Packages.pyngrok: 7.2.0 -> 7.2.1 --- pkgs/development/python-modules/pyngrok/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix index 7082611f6716..9e92fab07151 100644 --- a/pkgs/development/python-modules/pyngrok/default.nix +++ b/pkgs/development/python-modules/pyngrok/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyngrok"; - version = "7.2.0"; + version = "7.2.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-TkOvmy8hzu2NITeXAo/ogjAD8YW0l5Lk04MwI2XIFRU="; + hash = "sha256-UJIbCcsQzKmFeH8gvfxFVN4ovT7eCnSHBsCCooInm/E="; }; nativeBuildInputs = [ setuptools ]; From 647cac40fb1dd092a412f6f8ad7e9666ec63e362 Mon Sep 17 00:00:00 2001 From: John Chadwick Date: Thu, 7 Nov 2024 18:28:48 -0500 Subject: [PATCH 483/617] ghidra-bin: 10.4 -> 11.2.1 --- pkgs/tools/security/ghidra/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index 8f39076b4eec..0b12186a9f88 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -4,7 +4,7 @@ lib, makeWrapper, autoPatchelfHook, - openjdk17, + openjdk21, pam, makeDesktopItem, icoutils, @@ -28,12 +28,12 @@ let in stdenv.mkDerivation rec { pname = "ghidra"; - version = "10.4"; - versiondate = "20230928"; + version = "11.2.1"; + versiondate = "20241105"; src = fetchzip { url = "https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_${version}_build/ghidra_${version}_PUBLIC_${versiondate}.zip"; - hash = "sha256-IiAQ9OKmr8ZgqmGftuW0ITdG06fb9Lr30n2H9GArctk="; + hash = "sha256-w6FCAjF2ggFWH8eo7X8V6ZTbSptGkwRzoEMj9nGL5/M="; }; nativeBuildInputs = [ @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ln -s "${pkg_path}/support/analyzeHeadless" "$out/bin/ghidra-analyzeHeadless" wrapProgram "${pkg_path}/support/launch.sh" \ - --prefix PATH : ${lib.makeBinPath [ openjdk17 ]} + --prefix PATH : ${lib.makeBinPath [ openjdk21 ]} ''; meta = with lib; { From ff5fea0a29d6450493d528dc0b6c40454ee92476 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 7 Nov 2024 17:46:04 +0000 Subject: [PATCH 484/617] nixos/{demo,installer/virtualbox-demo}: drop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is no longer referenced anywhere and so will inevitably bitrot, and doesn’t do anything that isn’t simple to achieve with the module documentation. --- nixos/modules/installer/virtualbox-demo.nix | 61 --------------------- nixos/modules/profiles/demo.nix | 21 ------- 2 files changed, 82 deletions(-) delete mode 100644 nixos/modules/installer/virtualbox-demo.nix delete mode 100644 nixos/modules/profiles/demo.nix diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix deleted file mode 100644 index 289a8cf9e506..000000000000 --- a/nixos/modules/installer/virtualbox-demo.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib, ... }: - -with lib; - -{ - imports = - [ ../virtualisation/virtualbox-image.nix - ../installer/cd-dvd/channel.nix - ../profiles/demo.nix - ../profiles/clone-config.nix - ]; - - # FIXME: UUID detection is currently broken - boot.loader.grub.fsIdentifier = "provided"; - - # Allow mounting of shared folders. - users.users.demo.extraGroups = [ "vboxsf" ]; - - # Add some more video drivers to give X11 a shot at working in - # VMware and QEMU. - services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" "modesetting" ]; - - powerManagement.enable = false; - system.stateVersion = lib.mkDefault lib.trivial.release; - - installer.cloneConfigExtra = '' - # Let demo build as a trusted user. - # nix.settings.trusted-users = [ "demo" ]; - - # Mount a VirtualBox shared folder. - # This is configurable in the VirtualBox menu at - # Machine / Settings / Shared Folders. - # fileSystems."/mnt" = { - # fsType = "vboxsf"; - # device = "nameofdevicetomount"; - # options = [ "rw" ]; - # }; - - # By default, the NixOS VirtualBox demo image includes SDDM and Plasma. - # If you prefer another desktop manager or display manager, you may want - # to disable the default. - # services.xserver.desktopManager.plasma5.enable = lib.mkForce false; - # services.displayManager.sddm.enable = lib.mkForce false; - - # Enable GDM/GNOME by uncommenting above two lines and two lines below. - # services.xserver.displayManager.gdm.enable = true; - # services.xserver.desktopManager.gnome.enable = true; - - # Set your time zone. - # time.timeZone = "Europe/Amsterdam"; - - # List packages installed in system profile. To search, run: - # \$ nix search wget - # environment.systemPackages = with pkgs; [ - # wget vim - # ]; - - # Enable the OpenSSH daemon. - # services.openssh.enable = true; - ''; -} diff --git a/nixos/modules/profiles/demo.nix b/nixos/modules/profiles/demo.nix deleted file mode 100644 index 52ba40902e87..000000000000 --- a/nixos/modules/profiles/demo.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ ... }: - -{ - imports = [ ./graphical.nix ]; - - users.users.demo = - { isNormalUser = true; - description = "Demo user account"; - extraGroups = [ "wheel" ]; - password = "demo"; - uid = 1000; - }; - - services.displayManager = { - autoLogin = { - enable = true; - user = "demo"; - }; - sddm.autoLogin.relogin = true; - }; -} From b28c1ff248348ccaec5bf84025ae5c600b331b35 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 7 Nov 2024 17:47:47 +0000 Subject: [PATCH 485/617] nixos/doc/rl-2411: note VirtualBox demo appliance removal --- nixos/doc/manual/release-notes/rl-2411.section.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 73ccad6714df..d75a03e41ab9 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -218,6 +218,9 @@ - `androidenv.androidPkgs_9_0` has been removed. It is replaced with `androidenv.androidPkgs` for a more complete Android SDK, including support for Android 9 and later. +- The VirtualBox demo installer appliance has been removed. + Please use the standard installer ISOs instead. + - `grafana` has been updated to version 11.1. This version doesn't support setting `http_addr` to a hostname anymore, an IP address is expected. - `deno` has been updated to Deno 2, which has breaking changes. From 982d33269efef6f0c3f6ec0513a116a733164f01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 23:46:08 +0000 Subject: [PATCH 486/617] odpic: 5.3.0 -> 5.4.0 --- pkgs/development/libraries/odpic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix index 831c8a4e2afd..a1737adc69fa 100644 --- a/pkgs/development/libraries/odpic/default.nix +++ b/pkgs/development/libraries/odpic/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }: let - version = "5.3.0"; + version = "5.4.0"; libPath = lib.makeLibraryPath [ oracle-instantclient.lib ]; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { owner = "oracle"; repo = "odpi"; rev = "v${version}"; - sha256 = "sha256-Ez9B89I008YMu1s/8J0V4bydkooth+O5846Fmwl4FsA="; + sha256 = "sha256-MmzForjAgccze7VvNcN6vX4rfiy+W9eGQ2Qh49ah7Ps="; }; nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; From 95faddaab7292bd14f25231430125038b058c6ea Mon Sep 17 00:00:00 2001 From: John Chadwick Date: Thu, 7 Nov 2024 18:54:48 -0500 Subject: [PATCH 487/617] ghidra-bin: add aarch64 platforms --- pkgs/tools/security/ghidra/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index 0b12186a9f88..357d104c665e 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -78,7 +78,9 @@ stdenv.mkDerivation rec { homepage = "https://github.com/NationalSecurityAgency/ghidra"; platforms = [ "x86_64-linux" + "aarch64-linux" "x86_64-darwin" + "aarch64-darwin" ]; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; From 5c6a78d99366a9b8ccfd708aa4b141e20ddc0a2c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 23:59:00 +0000 Subject: [PATCH 488/617] python312Packages.binwalk: 2.4.2 -> 2.4.3 --- pkgs/development/python-modules/binwalk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index e9586af7cb28..c5b8160bf7ef 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "binwalk${lib.optionalString visualizationSupport "-full"}"; - version = "2.4.2"; + version = "2.4.3"; pyproject = true; src = fetchFromGitHub { owner = "OSPG"; repo = "binwalk"; rev = "refs/tags/v${version}"; - hash = "sha256-IFq/XotW3bbf3obWXRK6Nw1KQDqyFHb4tcA09Twg8SQ="; + hash = "sha256-kabibUMh5HyAJCXOyZo3QSNIVz8fER4Xivuv9E3CfEE="; }; build-system = [ setuptools ]; From afe438897f8c33ae7be9e0b81571afdac560d7a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Nov 2024 23:59:03 +0000 Subject: [PATCH 489/617] prometheus-consul-exporter: 0.12.1 -> 0.13.0 --- pkgs/servers/monitoring/prometheus/consul-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix index 4c6eaa48c1e1..5c386a898eda 100644 --- a/pkgs/servers/monitoring/prometheus/consul-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "consul_exporter"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "consul_exporter"; rev = "refs/tags/v${version}"; - hash = "sha256-cB3tpRa2sZBte5Rk7v9rvxvuRh2Ff3vPxmMYwhxxPSA="; + hash = "sha256-2X1nJIUwp7kqqz/D3x4bq6vHg1N8zC9AWCn02qsAyAQ="; }; - vendorHash = "sha256-naEbalwVRUFW2wRU3gxb/Zeu4oSnO6+bOZimxaySSyA="; + vendorHash = "sha256-z9+WrJDgjQYf4G90sdqY+SOGJa/r5Ie9GFVrihbaGGU="; ldflags = [ "-s" From 8bdc3c1d710d488f02a77b9eaa57f4bb99e655b2 Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Fri, 8 Nov 2024 00:32:38 +0000 Subject: [PATCH 490/617] vscode: 1.95.1 -> 1.95.2 --- pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 09da2fe3b631..a82c876216cc 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -31,21 +31,21 @@ let archive_fmt = if stdenv.hostPlatform.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1dysz5yajm9v8p8x19lmbhbfij5k99h9m39ifvn1908dhgyc5d36"; - x86_64-darwin = "175sxw1z6mzs5adcgy2902irp0yb666lgmrckbd3dr7rqfav9d36"; - aarch64-linux = "04pf8b42kh23pii9qahsdf3979icvqbhadr5m8x79y16hv1h2h8j"; - aarch64-darwin = "1766h2awzh8wjwzkc7r1ymsjyh4j7rfb7nj6bpigy2b2dyfp53w2"; - armv7l-linux = "1zmqrvqq07vkhmb9shbrh2jjkv3rpvi3pv0b1cg690jfixnsyk04"; + x86_64-linux = "1d99kbvbd17h02m85gd8dircb39jsbifdk61w1hsvhri6dbfah8f"; + x86_64-darwin = "1bay90s0asfms4cg4hng9f4bpjyg5d884ffjrqy6mdxwyqmjyzb1"; + aarch64-linux = "0g1v26qax14fghawjqb9xbkr8kwhzwh52qz30jg3pfsixw5q5kkx"; + aarch64-darwin = "0m7b6dnfwqal20iq6nwwzvd23l5alqgbc02ih2pjflzk794fj2mf"; + armv7l-linux = "04jbcqwpbp7d89van8dq5zilfcalxwbx62yzipdzsjlmfnxf65vy"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.95.1"; + version = "1.95.2"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "65edc4939843c90c34d61f4ce11704f09d3e5cb6"; + rev = "e8653663e8840adaf45af01eab5c627a5af81807"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -69,7 +69,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "05w76c50j85b7hc0q8gjzssy142ncbns0kmcyqydaqrzj8n41jd8"; + sha256 = "14vfylcx3gcx5vjdp861mjr98wq2f3242ysygpa3r5xnl8941wki"; }; stdenv = stdenvNoCC; }; From e4f13d475b86d5b4c2b4e91ba2fa1a65799af0c5 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Fri, 8 Nov 2024 00:32:43 +0000 Subject: [PATCH 491/617] alt-tab-macos: 6.73.0 -> 7.2.0 Changelog: https://github.com/lwouis/alt-tab-macos/releases/tag/v7.2.0 Diff: https://github.com/lwouis/alt-tab-macos/compare/v6.73.0...v7.2.0 --- pkgs/by-name/al/alt-tab-macos/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/alt-tab-macos/package.nix b/pkgs/by-name/al/alt-tab-macos/package.nix index 72dbd13b7dd1..a226fd9c5004 100644 --- a/pkgs/by-name/al/alt-tab-macos/package.nix +++ b/pkgs/by-name/al/alt-tab-macos/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "alt-tab-macos"; - version = "6.73.0"; + version = "7.2.0"; src = fetchurl { url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip"; - hash = "sha256-l/Nuyr5jYBR6LtScgM2LP0mq1NEMkRNVGWZDhiZkAa8="; + hash = "sha256-70ODYDPcE5UT6bVY3H2J7RvqB3sDpPoeOpkqhwVkxJ0="; }; sourceRoot = "."; From b496d7ea4e9a10144d0c9bd16055aed47a91278e Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 8 Nov 2024 02:11:14 +0100 Subject: [PATCH 492/617] sudo: 1.9.15p5 -> 1.9.16 --- pkgs/tools/security/sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 508cfafc69de..d238ef3166c6 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sudo"; # be sure to check if nixos/modules/security/sudo.nix needs updating when bumping # e.g. links to man pages, value constraints etc. - version = "1.9.15p5"; + version = "1.9.16"; __structuredAttrs = true; src = fetchurl { url = "https://www.sudo.ws/dist/sudo-${finalAttrs.version}.tar.gz"; - hash = "sha256-VY0QuaGZH7O5+n+nsH7EQFt677WzywsIcdvIHjqI5Vg="; + hash = "sha256-wNhNeX8GtzL8Vz0LeYroMSjCvDMFIFfwW1YOxry/oD0="; }; prePatch = '' From b99d3a4f8be2b53046b2b2c4a22c72236c0d4f2d Mon Sep 17 00:00:00 2001 From: ThinkChaos Date: Wed, 21 Aug 2024 17:46:30 -0400 Subject: [PATCH 493/617] nixos/apache: not "before" ACME certs using DNS validation Relax dependency with certs that are validated via DNS challenge since we know the HTTP server is not required for that validation. This allows marking the server's service as depending on the cert. --- .../web-servers/apache-httpd/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 46cb09959579..e64fbff00fd5 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -33,7 +33,9 @@ let certName = if hostOpts.useACMEHost != null then hostOpts.useACMEHost else hostOpts.hostName; }) (filter (hostOpts: hostOpts.enableACME || hostOpts.useACMEHost != null) vhosts); - dependentCertNames = unique (map (hostOpts: hostOpts.certName) acmeEnabledVhosts); + vhostCertNames = unique (map (hostOpts: hostOpts.certName) acmeEnabledVhosts); + dependentCertNames = filter (cert: certs.${cert}.dnsProvider == null) vhostCertNames; # those that might depend on the HTTP server + independentCertNames = filter (cert: certs.${cert}.dnsProvider != null) vhostCertNames; # those that don't depend on the HTTP server mkListenInfo = hostOpts: if hostOpts.listen != [] then @@ -644,7 +646,7 @@ in inherit (cfg) group user; cert = config.security.acme.certs.${name}; groups = config.users.groups; - }) dependentCertNames; + }) vhostCertNames; warnings = mapAttrsToList (name: hostOpts: '' @@ -747,8 +749,10 @@ in systemd.services.httpd = { description = "Apache HTTPD"; wantedBy = [ "multi-user.target" ]; - wants = concatLists (map (certName: [ "acme-finished-${certName}.target" ]) dependentCertNames); - after = [ "network.target" ] ++ map (certName: "acme-selfsigned-${certName}.service") dependentCertNames; + wants = concatLists (map (certName: [ "acme-finished-${certName}.target" ]) vhostCertNames); + after = [ "network.target" ] + ++ map (certName: "acme-selfsigned-${certName}.service") vhostCertNames + ++ map (certName: "acme-${certName}.service") independentCertNames; # avoid loading self-signed key w/ real cert, or vice-versa before = map (certName: "acme-${certName}.service") dependentCertNames; restartTriggers = [ cfg.configFile ]; @@ -789,8 +793,8 @@ in # which allows the acme-finished-$cert.target to signify the successful updating # of certs end-to-end. systemd.services.httpd-config-reload = let - sslServices = map (certName: "acme-${certName}.service") dependentCertNames; - sslTargets = map (certName: "acme-finished-${certName}.target") dependentCertNames; + sslServices = map (certName: "acme-${certName}.service") vhostCertNames; + sslTargets = map (certName: "acme-finished-${certName}.target") vhostCertNames; in mkIf (sslServices != []) { wantedBy = sslServices ++ [ "multi-user.target" ]; # Before the finished targets, after the renew services. @@ -801,7 +805,7 @@ in restartTriggers = [ cfg.configFile ]; # Block reloading if not all certs exist yet. # Happens when config changes add new vhosts/certs. - unitConfig.ConditionPathExists = map (certName: certs.${certName}.directory + "/fullchain.pem") dependentCertNames; + unitConfig.ConditionPathExists = map (certName: certs.${certName}.directory + "/fullchain.pem") vhostCertNames; serviceConfig = { Type = "oneshot"; TimeoutSec = 60; From 26d6294deb867f9690a60321290b9c07c7e8649b Mon Sep 17 00:00:00 2001 From: ThinkChaos Date: Wed, 21 Aug 2024 17:46:39 -0400 Subject: [PATCH 494/617] nixos/caddy: not "before" ACME certs using DNS validation Relax dependency with certs that are validated via DNS challenge since we know the HTTP server is not required for that validation. This allows marking the server's service as depending on the cert. --- .../services/web-servers/caddy/default.nix | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix index 496705beff7b..a221e578f769 100644 --- a/nixos/modules/services/web-servers/caddy/default.nix +++ b/nixos/modules/services/web-servers/caddy/default.nix @@ -5,8 +5,12 @@ with lib; let cfg = config.services.caddy; + certs = config.security.acme.certs; virtualHosts = attrValues cfg.virtualHosts; - acmeVHosts = filter (hostOpts: hostOpts.useACMEHost != null) virtualHosts; + acmeEnabledVhosts = filter (hostOpts: hostOpts.useACMEHost != null) virtualHosts; + vhostCertNames = unique (map (hostOpts: hostOpts.useACMEHost) acmeEnabledVhosts); + dependentCertNames = filter (cert: certs.${cert}.dnsProvider == null) vhostCertNames; # those that might depend on the HTTP server + independentCertNames = filter (cert: certs.${cert}.dnsProvider != null) vhostCertNames; # those that don't depend on the HTTP server mkVHostConf = hostOpts: let @@ -51,8 +55,6 @@ let configPath = "/etc/${etcConfigFile}"; - acmeHosts = unique (catAttrs "useACMEHost" acmeVHosts); - mkCertOwnershipAssertion = import ../../../security/acme/mk-cert-ownership-assertion.nix; in { @@ -332,7 +334,7 @@ in inherit (cfg) group user; cert = config.security.acme.certs.${name}; groups = config.users.groups; - }) acmeHosts; + }) vhostCertNames; services.caddy.globalConfig = '' ${optionalString (cfg.email != null) "email ${cfg.email}"} @@ -348,9 +350,10 @@ in systemd.packages = [ cfg.package ]; systemd.services.caddy = { - wants = map (hostOpts: "acme-finished-${hostOpts.useACMEHost}.target") acmeVHosts; - after = map (hostOpts: "acme-selfsigned-${hostOpts.useACMEHost}.service") acmeVHosts; - before = map (hostOpts: "acme-${hostOpts.useACMEHost}.service") acmeVHosts; + wants = map (certName: "acme-finished-${certName}.target") vhostCertNames; + after = map (certName: "acme-selfsigned-${certName}.service") vhostCertNames + ++ map (certName: "acme-${certName}.service") independentCertNames; # avoid loading self-signed key w/ real cert, or vice-versa + before = map (certName: "acme-${certName}.service") dependentCertNames; wantedBy = [ "multi-user.target" ]; startLimitIntervalSec = 14400; @@ -397,10 +400,10 @@ in security.acme.certs = let - certCfg = map (useACMEHost: nameValuePair useACMEHost { + certCfg = map (certName: nameValuePair certName { group = mkDefault cfg.group; reloadServices = [ "caddy.service" ]; - }) acmeHosts; + }) vhostCertNames; in listToAttrs certCfg; From 03122b43c8380bc8671640e5bbd1aa9fec938b5e Mon Sep 17 00:00:00 2001 From: ThinkChaos Date: Wed, 21 Aug 2024 17:46:49 -0400 Subject: [PATCH 495/617] nixos/nginx: not "before" ACME certs using DNS validation Relax dependency with certs that are validated via DNS challenge since we know the HTTP server is not required for that validation. This allows marking the server's service as depending on the cert. --- .../services/web-servers/nginx/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 1e43554b7818..848671c16f6f 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -7,7 +7,9 @@ let inherit (config.security.acme) certs; vhostsConfigs = mapAttrsToList (vhostName: vhostConfig: vhostConfig) virtualHosts; acmeEnabledVhosts = filter (vhostConfig: vhostConfig.enableACME || vhostConfig.useACMEHost != null) vhostsConfigs; - dependentCertNames = unique (map (hostOpts: hostOpts.certName) acmeEnabledVhosts); + vhostCertNames = unique (map (hostOpts: hostOpts.certName) acmeEnabledVhosts); + dependentCertNames = filter (cert: certs.${cert}.dnsProvider == null) vhostCertNames; # those that might depend on the HTTP server + independentCertNames = filter (cert: certs.${cert}.dnsProvider != null) vhostCertNames; # those that don't depend on the HTTP server virtualHosts = mapAttrs (vhostName: vhostConfig: let serverName = if vhostConfig.serverName != null @@ -1212,7 +1214,7 @@ in inherit (cfg) group user; cert = config.security.acme.certs.${name}; groups = config.users.groups; - }) dependentCertNames; + }) vhostCertNames; services.nginx.additionalModules = optional cfg.recommendedBrotliSettings pkgs.nginxModules.brotli ++ lib.optional cfg.recommendedZstdSettings pkgs.nginxModules.zstd; @@ -1236,8 +1238,10 @@ in systemd.services.nginx = { description = "Nginx Web Server"; wantedBy = [ "multi-user.target" ]; - wants = concatLists (map (certName: [ "acme-finished-${certName}.target" ]) dependentCertNames); - after = [ "network.target" ] ++ map (certName: "acme-selfsigned-${certName}.service") dependentCertNames; + wants = concatLists (map (certName: [ "acme-finished-${certName}.target" ]) vhostCertNames); + after = [ "network.target" ] + ++ map (certName: "acme-selfsigned-${certName}.service") vhostCertNames + ++ map (certName: "acme-${certName}.service") independentCertNames; # avoid loading self-signed key w/ real cert, or vice-versa # Nginx needs to be started in order to be able to request certificates # (it's hosting the acme challenge after all) # This fixes https://github.com/NixOS/nixpkgs/issues/81842 @@ -1316,8 +1320,8 @@ in # which allows the acme-finished-$cert.target to signify the successful updating # of certs end-to-end. systemd.services.nginx-config-reload = let - sslServices = map (certName: "acme-${certName}.service") dependentCertNames; - sslTargets = map (certName: "acme-finished-${certName}.target") dependentCertNames; + sslServices = map (certName: "acme-${certName}.service") vhostCertNames; + sslTargets = map (certName: "acme-finished-${certName}.target") vhostCertNames; in mkIf (cfg.enableReload || sslServices != []) { wants = optionals cfg.enableReload [ "nginx.service" ]; wantedBy = sslServices ++ [ "multi-user.target" ]; @@ -1329,7 +1333,7 @@ in restartTriggers = optionals cfg.enableReload [ configFile ]; # Block reloading if not all certs exist yet. # Happens when config changes add new vhosts/certs. - unitConfig.ConditionPathExists = optionals (sslServices != []) (map (certName: certs.${certName}.directory + "/fullchain.pem") dependentCertNames); + unitConfig.ConditionPathExists = optionals (sslServices != []) (map (certName: certs.${certName}.directory + "/fullchain.pem") vhostCertNames); serviceConfig = { Type = "oneshot"; TimeoutSec = 60; From 3c2e82337dd25cb7e07bf2eba0e622b97690470b Mon Sep 17 00:00:00 2001 From: ThinkChaos Date: Sat, 24 Aug 2024 19:18:07 -0400 Subject: [PATCH 496/617] nixos/web-servers: assert ACME cert access via service user and groups Allows giving access using SupplementaryGroups. --- .../acme/mk-cert-ownership-assertion.nix | 23 ++++++++++++++++--- .../web-servers/apache-httpd/default.nix | 6 ++--- .../services/web-servers/caddy/default.nix | 4 ++-- .../services/web-servers/nginx/default.nix | 6 ++--- 4 files changed, 28 insertions(+), 11 deletions(-) diff --git a/nixos/modules/security/acme/mk-cert-ownership-assertion.nix b/nixos/modules/security/acme/mk-cert-ownership-assertion.nix index b80d89aeb9fc..53a3fbaadd2e 100644 --- a/nixos/modules/security/acme/mk-cert-ownership-assertion.nix +++ b/nixos/modules/security/acme/mk-cert-ownership-assertion.nix @@ -1,4 +1,21 @@ -{ cert, group, groups, user }: { - assertion = cert.group == group || builtins.any (u: u == user) groups.${cert.group}.members; - message = "Group for certificate ${cert.domain} must be ${group}, or user ${user} must be a member of group ${cert.group}"; +lib: + +{ cert, groups, services }: +let + catSep = builtins.concatStringsSep; + + svcGroups = svc: + (lib.optional (svc.serviceConfig ? Group) svc.serviceConfig.Group) + ++ (svc.serviceConfig.SupplementaryGroups or [ ]); +in +{ + assertion = builtins.all (svc: + svc.serviceConfig.User or "root" == "root" + || builtins.elem svc.serviceConfig.User groups.${cert.group}.members + || builtins.elem cert.group (svcGroups svc) + ) services; + + message = "Certificate ${cert.domain} (group=${cert.group}) must be readable by service(s) ${ + catSep ", " (map (svc: "${svc.name} (user=${svc.serviceConfig.User} groups=${catSep " " (svcGroups svc)})") services) + }"; } diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index e64fbff00fd5..1ac86c1a5c1d 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -373,7 +373,7 @@ let echo "$options" >> $out ''; - mkCertOwnershipAssertion = import ../../../security/acme/mk-cert-ownership-assertion.nix; + mkCertOwnershipAssertion = import ../../../security/acme/mk-cert-ownership-assertion.nix lib; in @@ -643,9 +643,9 @@ in ''; } ] ++ map (name: mkCertOwnershipAssertion { - inherit (cfg) group user; cert = config.security.acme.certs.${name}; groups = config.users.groups; + services = [ config.systemd.services.httpd ] ++ lib.optional (vhostCertNames != []) config.systemd.services.httpd-config-reload; }) vhostCertNames; warnings = @@ -795,7 +795,7 @@ in systemd.services.httpd-config-reload = let sslServices = map (certName: "acme-${certName}.service") vhostCertNames; sslTargets = map (certName: "acme-finished-${certName}.target") vhostCertNames; - in mkIf (sslServices != []) { + in mkIf (vhostCertNames != []) { wantedBy = sslServices ++ [ "multi-user.target" ]; # Before the finished targets, after the renew services. # This service might be needed for HTTP-01 challenges, but we only want to confirm diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix index a221e578f769..8f8a4da35cc5 100644 --- a/nixos/modules/services/web-servers/caddy/default.nix +++ b/nixos/modules/services/web-servers/caddy/default.nix @@ -55,7 +55,7 @@ let configPath = "/etc/${etcConfigFile}"; - mkCertOwnershipAssertion = import ../../../security/acme/mk-cert-ownership-assertion.nix; + mkCertOwnershipAssertion = import ../../../security/acme/mk-cert-ownership-assertion.nix lib; in { imports = [ @@ -331,9 +331,9 @@ in message = "To specify an adapter other than 'caddyfile' please provide your own configuration via `services.caddy.configFile`"; } ] ++ map (name: mkCertOwnershipAssertion { - inherit (cfg) group user; cert = config.security.acme.certs.${name}; groups = config.users.groups; + services = [ config.systemd.services.caddy ]; }) vhostCertNames; services.caddy.globalConfig = '' diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 848671c16f6f..922df1ea03ab 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -473,7 +473,7 @@ let '') authDef) ); - mkCertOwnershipAssertion = import ../../../security/acme/mk-cert-ownership-assertion.nix; + mkCertOwnershipAssertion = import ../../../security/acme/mk-cert-ownership-assertion.nix lib; oldHTTP2 = (versionOlder cfg.package.version "1.25.1" && !(cfg.package.pname == "angie" || cfg.package.pname == "angieQuic")); in @@ -1211,9 +1211,9 @@ in ''; } ] ++ map (name: mkCertOwnershipAssertion { - inherit (cfg) group user; cert = config.security.acme.certs.${name}; groups = config.users.groups; + services = [ config.systemd.services.nginx ] ++ lib.optional (cfg.enableReload || vhostCertNames != []) config.systemd.services.nginx-config-reload; }) vhostCertNames; services.nginx.additionalModules = optional cfg.recommendedBrotliSettings pkgs.nginxModules.brotli @@ -1322,7 +1322,7 @@ in systemd.services.nginx-config-reload = let sslServices = map (certName: "acme-${certName}.service") vhostCertNames; sslTargets = map (certName: "acme-finished-${certName}.target") vhostCertNames; - in mkIf (cfg.enableReload || sslServices != []) { + in mkIf (cfg.enableReload || vhostCertNames != []) { wants = optionals cfg.enableReload [ "nginx.service" ]; wantedBy = sslServices ++ [ "multi-user.target" ]; # Before the finished targets, after the renew services. From 1bd7f1374dd10c59b7d0fcee91925d101ccd7e6d Mon Sep 17 00:00:00 2001 From: ThinkChaos Date: Thu, 7 Nov 2024 20:17:46 -0500 Subject: [PATCH 497/617] nixos/acme: use non deprecated CLI flag for `dnsPropagationCheck` --- nixos/modules/security/acme/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix index a9cb396f13fd..4af92d8779ef 100644 --- a/nixos/modules/security/acme/default.nix +++ b/nixos/modules/security/acme/default.nix @@ -217,7 +217,7 @@ let protocolOpts = if useDns then ( [ "--dns" data.dnsProvider ] - ++ lib.optionals (!data.dnsPropagationCheck) [ "--dns.disable-cp" ] + ++ lib.optionals (!data.dnsPropagationCheck) [ "--dns.propagation-disable-ans" ] ++ lib.optionals (data.dnsResolver != null) [ "--dns.resolvers" data.dnsResolver ] ) else if data.s3Bucket != null then [ "--http" "--http.s3-bucket" data.s3Bucket ] else if data.listenHTTP != null then [ "--http" "--http.port" data.listenHTTP ] From b432e86cafe1bc1ba2a1e471cd4eeaae22694fcf Mon Sep 17 00:00:00 2001 From: ThinkChaos Date: Thu, 7 Nov 2024 20:18:08 -0500 Subject: [PATCH 498/617] nixos/acme: remove unused binding in tests --- nixos/tests/common/acme/server/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nixos/tests/common/acme/server/default.nix b/nixos/tests/common/acme/server/default.nix index 457495cdb2c0..893c6924027f 100644 --- a/nixos/tests/common/acme/server/default.nix +++ b/nixos/tests/common/acme/server/default.nix @@ -54,11 +54,6 @@ let testCerts = import ./snakeoil-certs.nix; domain = testCerts.domain; - resolver = let - message = "You need to define a resolver for the acme test module."; - firstNS = lib.head config.networking.nameservers; - in if config.networking.nameservers == [] then throw message else firstNS; - pebbleConf.pebble = { listenAddress = "0.0.0.0:443"; managementListenAddress = "0.0.0.0:15000"; From 4bd5790369dbcff0957d8cda4e7ba2244e88d54b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Nov 2024 01:20:02 +0000 Subject: [PATCH 499/617] zfind: 0.4.5 -> 0.4.6 --- pkgs/by-name/zf/zfind/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zf/zfind/package.nix b/pkgs/by-name/zf/zfind/package.nix index 9e0030fe40cd..f0017eb84c8c 100644 --- a/pkgs/by-name/zf/zfind/package.nix +++ b/pkgs/by-name/zf/zfind/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "zfind"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = "laktak"; repo = "zfind"; rev = "v${version}"; - hash = "sha256-sRZAsmh193K5HX7oC1UdCQccNpSc5QHtec+UpvpntKU="; + hash = "sha256-bbeS2x9HzrsOE5h1y07LoEBm9dinMCHX9GJftj5Md9s="; }; vendorHash = "sha256-blq0/pRppdf2jcuhIqYeNhcazFNZOGeEjPTSLgHqhrU="; From c5450fcb4b7e0f3d980b54e477e20de8a41c7645 Mon Sep 17 00:00:00 2001 From: ThinkChaos Date: Sun, 3 Nov 2024 18:35:27 -0500 Subject: [PATCH 500/617] nixos/authelia: start after `network-online.target` --- nixos/modules/services/security/authelia.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/security/authelia.nix b/nixos/modules/services/security/authelia.nix index 1cc137341e11..bbd6bde5ebc1 100644 --- a/nixos/modules/services/security/authelia.nix +++ b/nixos/modules/services/security/authelia.nix @@ -308,7 +308,8 @@ in { description = "Authelia authentication and authorization server"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + after = [ "network-online.target" ]; # Checks SMTP notifier creds during startup + wants = [ "network-online.target" ]; environment = (lib.filterAttrs (_: v: v != null) { X_AUTHELIA_CONFIG_FILTERS = lib.mkIf (oidcJwksConfigFile != [ ]) "template"; From c167ff0416b3805dbc29f6f1f12593039f6d520f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Nov 2024 01:25:41 +0000 Subject: [PATCH 501/617] _1password-cli: 2.30.0 -> 2.30.3 --- pkgs/by-name/_1/_1password-cli/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/_1/_1password-cli/package.nix b/pkgs/by-name/_1/_1password-cli/package.nix index 085013667620..6bc67fb04d6a 100644 --- a/pkgs/by-name/_1/_1password-cli/package.nix +++ b/pkgs/by-name/_1/_1password-cli/package.nix @@ -23,13 +23,13 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.30.0"; + version = "2.30.3"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-KNduqspTzLEHmymSefLnnhIBcIQWx2tshvOc0NwDek0=" "zip"; - i686-linux = fetch "linux_386" "sha256-StdWtD3tz6bKqSem/GFqeRHzkbv4aP7d7dKKtgNhuY8=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-bzhRkpR3te1bcBEfP2BR6SECTC9sRFDshl7B+/278Kg=" "zip"; + aarch64-linux = fetch "linux_arm64" "sha256-dXhmRl48Uk4T4947Dwz6ZkaRkZlmcADXKt/m6d1VNe8=" "zip"; + i686-linux = fetch "linux_386" "sha256-+B4fZ41DBe9TnIHOntBQDAvTYOckVwK5B+wwsIU6fAI=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-MsBSjJi7hJbS1wU3lVeywRrhGAZkoqxRb4FTg8fFN00=" "zip"; aarch64-darwin = - fetch "apple_universal" "sha256-L1SZWQWjAJDZydlAttbWLS7igZNAvOmIyaUUdVbvEa8=" + fetch "apple_universal" "sha256-RVng7huZfRRR99TLKwmmun6woSiIhM5YnaEfWgdPJr4=" "pkg"; x86_64-darwin = aarch64-darwin; }; From 0b163fa12a3f6dab4ecdc202fabc6cf68b07bab8 Mon Sep 17 00:00:00 2001 From: Pedro Mendes Date: Thu, 7 Nov 2024 18:59:57 -0300 Subject: [PATCH 502/617] vimPlugins.one-small-step-for-vimkind: init at 2024-11-07 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 526678171d27..109fec6702f2 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -9930,6 +9930,18 @@ final: prev: meta.homepage = "https://github.com/Almo7aya/openingh.nvim/"; }; + one-small-step-for-vimkind = buildVimPlugin { + pname = "one-small-step-for-vimkind"; + version = "2024-10-15"; + src = fetchFromGitHub { + owner = "jbyuki"; + repo = "one-small-step-for-vimkind"; + rev = "ad065ad2c814249cfb9e344ce5b2b35d36fbc09f"; + sha256 = "sha256-KIxEjUutHkPRUubZQO3ZaFUm9Lm3mUJ6p6HB6hLuJEM="; + }; + meta.homepage = "https://github.com/jbyuki/one-small-step-for-vimkind/"; + }; + openscad-nvim = buildVimPlugin { pname = "openscad.nvim"; version = "2024-04-13"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 25e18fa88d7a..aad3a46ecaf6 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -447,6 +447,7 @@ https://github.com/Darazaki/indent-o-matic/,, https://github.com/Yggdroot/indentLine/,, https://github.com/ciaranm/inkpot/,, https://github.com/jbyuki/instant.nvim/,HEAD, +https://github.com/jbyuki/one-small-step-for-vimkind/,HEAD, https://github.com/pta2002/intellitab.nvim/,HEAD, https://github.com/parsonsmatt/intero-neovim/,, https://github.com/keith/investigate.vim/,, From fd10acfd9427c5d497afc732a1f61e6935650095 Mon Sep 17 00:00:00 2001 From: Bu Kun <65808665+pokon548@users.noreply.github.com> Date: Fri, 8 Nov 2024 10:46:44 +0800 Subject: [PATCH 503/617] wechat-uos: Remove libuosdevicea and license as they no longer needed in 4.0.0.21 --- pkgs/by-name/we/wechat-uos/libuosdevicea.c | 44 ----------- pkgs/by-name/we/wechat-uos/package.nix | 85 ---------------------- 2 files changed, 129 deletions(-) delete mode 100644 pkgs/by-name/we/wechat-uos/libuosdevicea.c diff --git a/pkgs/by-name/we/wechat-uos/libuosdevicea.c b/pkgs/by-name/we/wechat-uos/libuosdevicea.c deleted file mode 100644 index 0cdc0cecde7d..000000000000 --- a/pkgs/by-name/we/wechat-uos/libuosdevicea.c +++ /dev/null @@ -1,44 +0,0 @@ -// taken from https://aur.archlinux.org/cgit/aur.git/tree/libuosdevicea.c?h=wechat-universal - -/* - * licensestub - compat layer for libuosdevicea - * Copyright (C) 2024 Zephyr Lykos - * Copyright (C) 2024 Guoxin "7Ji" Pu - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ -#define _GNU_SOURCE - -#include - -#define declare_string_getter(suffix, constant) void uos_get_##suffix(char *const restrict out) { if (out) strcpy(out, constant); } - -declare_string_getter(mac, // MAC address with colon stripped - "000000000000") -declare_string_getter(hddsninfo, - "SN") -declare_string_getter(hwserial, // MD5 of hddsninfo - "92666505ce75444ee14be2ebc2f10a60") -declare_string_getter(mb_sn, // hardcoded - "E50022008800015957007202c59a1a8-3981-2020-0810-204909000000") -declare_string_getter(osver, - "UnionTech OS Desktop") -declare_string_getter(licensetoken, - "djEsdjEsMSwyLDk5QUFFN0FBQVdRQjk5OFhKS0FIU1QyOTQsMTAsOTI2NjY1MDVjZTc1NDQ0ZWUxNGJlMmViYzJmMTBhNjAsQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUE6ZjA3NjAwYzZkNmMyMDkyMDBkMzE5YzU2OThmNTc3MGRlYWY1NjAyZTY5MzUxZTczNjI2NjlhNzIyZTBkNTJiOTNhYzk0MmM3YTNkZTgxNjIxMmUwMDA1NTUwODg4N2NlMDQ4ODMyNTExY2JhNGFiMjdmYzlmZjMyYzFiNTYwNjMwZDI3ZDI2NmE5ZGIxZDQ0N2QxYjNlNTNlNTVlOTY1MmU5YTU4OGY0NWYzMTMwZDE0NDc4MTRhM2FmZjRlZGNmYmNkZjhjMmFiMDc5OWYwNGVmYmQ2NjdiNGYwYzEwNDhkYzExNjYwZWU1NTdlNTdmNzBlNjA1N2I0NThkMDgyOA==") - -int uos_is_active() { - return 0; -} diff --git a/pkgs/by-name/we/wechat-uos/package.nix b/pkgs/by-name/we/wechat-uos/package.nix index 63b47dde8500..6f156b279d1a 100644 --- a/pkgs/by-name/we/wechat-uos/package.nix +++ b/pkgs/by-name/we/wechat-uos/package.nix @@ -2,7 +2,6 @@ , stdenv , lib , fetchurl -, requireFile , dpkg , nss , nspr @@ -45,21 +44,6 @@ , libnotify , buildFHSEnv , writeShellScript -, /** - License for wechat-uos, packed in a gz archive named "license.tar.gz". - It should have the following files: - license.tar.gz - ├── etc - │ ├── lsb-release - │ └── os-release - └── var - ├── lib - │ └── uos-license - │ └── .license.json - └── uos - └── .license.key - */ - uosLicense ? null }: let # zerocallusedregs hardening breaks WeChat @@ -72,79 +56,16 @@ let name = "wechat-uos-env"; buildCommand = '' mkdir -p $out/etc - mkdir -p $out/lib/license mkdir -p $out/usr/bin mkdir -p $out/usr/share mkdir -p $out/opt mkdir -p $out/var ln -s ${wechat}/opt/* $out/opt/ - ln -s ${wechat}/usr/lib/wechat-uos/license/etc/os-release $out/etc/os-release - ln -s ${wechat}/usr/lib/wechat-uos/license/etc/lsb-release $out/etc/lsb-release - ln -s ${wechat}/usr/lib/wechat-uos/license/var/* $out/var/ - ln -s ${wechat}/usr/lib/wechat-uos/license/libuosdevicea.so $out/lib/license/ ''; preferLocalBuild = true; }; - uosLicenseUnzipped = stdenvNoCC.mkDerivation { - name = "uos-license-unzipped"; - src = - if uosLicense == null then - requireFile - { - name = "license.tar.gz"; - url = "https://www.uniontech.com"; - hash = "sha256-U3YAecGltY8vo9Xv/h7TUjlZCyiIQdgSIp705VstvWk="; - } else uosLicense; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -r * $out/ - - runHook postInstall - ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-pNftwtUZqBsKBSPQsEWlYLlb6h2Xd9j56ZRMi8I82ME="; - }; - - libuosdevicea = stdenv.mkDerivation rec { - name = "libuosdevicea"; - src = ./libuosdevicea.c; - - unpackPhase = '' - runHook preUnpack - - cp ${src} libuosdevicea.c - - runHook postUnpack - ''; - - buildPhase = '' - runHook preBuild - - $CC -shared -fPIC -o libuosdevicea.so libuosdevicea.c - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib - cp libuosdevicea.so $out/lib/ - - runHook postInstall - ''; - - meta = with lib; { - license = licenses.gpl2Plus; - }; - }; - wechat-uos-runtime = with xorg; [ # Make sure our glibc without hardening gets picked up first (lib.hiPrio glibcWithoutHardening) @@ -231,8 +152,6 @@ let }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); - inherit uosLicense; - nativeBuildInputs = [ dpkg ]; unpackPhase = '' @@ -250,10 +169,6 @@ let cp -r wechat-uos/* $out - mkdir -pv $out/usr/lib/wechat-uos/license - ln -s ${uosLicenseUnzipped}/* $out/usr/lib/wechat-uos/license/ - ln -s ${libuosdevicea}/lib/libuosdevicea.so $out/usr/lib/wechat-uos/license/ - runHook postInstall ''; From 872c73caa75e3dd4fb4c9214f4f161bedad998e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:15 -0300 Subject: [PATCH 504/617] lxqt.lxqt-panel: 2.0.1 -> 2.1.1 --- pkgs/desktops/lxqt/lxqt-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index 7d6da7e65f9f..100f1e537dfe 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "lxqt-panel"; - version = "2.0.1"; + version = "2.1.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-m+LUG7hnkIJj48HJIy6pMyv3YZ/RfuSXbdBKJ9mi764="; + hash = "sha256-IlT7qXWMKFkmHNjXJYivawd4HnOBzILtIE6XaM/ZvkM="; }; nativeBuildInputs = [ From d44fb5a6ded5cf068db29627e7b7db3925ec942c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:15 -0300 Subject: [PATCH 505/617] lxqt.lxqt-policykit: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-policykit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix index 9484a8e4b16d..3d7ca3ec68a7 100644 --- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "lxqt-policykit"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-oYKvQBilpD2RLhN1K6qgRNNAfohCOqmBrKcWy1fXZT8="; + hash = "sha256-wj9i09F9If5JZO6W358XcZ/rawt9Oj3QwDvLLRvS2Bc="; }; nativeBuildInputs = [ From 170195dfa890997b7c3f59f90fd3420735254dfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:15 -0300 Subject: [PATCH 506/617] lxqt.lxqt-powermanagement: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-powermanagement/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix index f9fae3718f6f..dd46c72fdd90 100644 --- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "lxqt-powermanagement"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-wtqVUXYQWIPhvHj7Ig9qR6sglCRQzcxG192DM3xq/mA="; + hash = "sha256-S60m8ixz6HnTZe0MTyvU0pXWWOS88KeXfDcQJ/I1Keo="; }; nativeBuildInputs = [ From b25ea955b1037c8fb8051400cafe543cc6b4198d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:15 -0300 Subject: [PATCH 507/617] lxqt.lxqt-qtplugin: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-qtplugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index a496274c73b3..687846ba2e25 100644 --- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -12,7 +12,7 @@ , qtsvg , qttools , wrapQtAppsHook -, version ? "2.0.0" +, version ? "2.1.0" }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { rev = version; hash = { "1.4.1" = "sha256-sp/LvQNfodMYQ4kNbBv4PTNfs38XjYLezuxRltZd4kc="; - "2.0.0" = "sha256-o5iD4VzsbN81lwDZJuFj8Ugg1RP752M4unu3J5/h8g8="; + "2.1.0" = "sha256-F171IgAhRXJ9sTt8VVDVO9hrmyHbCElsskdDmFr3HB0="; }."${version}"; }; From c9ba2c521e84a852eb5d069c47b03d63842307a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:16 -0300 Subject: [PATCH 508/617] lxqt.lxqt-session: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-session/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix index cdfd234a14d7..2519954c9dca 100644 --- a/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "lxqt-session"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-IgpGtIVTcSs0O3jEniIuyIAyKBSkwN/jpGL6yZg3AVo="; + hash = "sha256-t3odaG9znMohROutoEquJ7JYsvPQPjPxOik+WD8WGSA="; }; nativeBuildInputs = [ From c3ccb218d9da2883e3663ae04a4b681204f6e72f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:16 -0300 Subject: [PATCH 509/617] lxqt.lxqt-sudo: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix index f1fc740c7186..91fd56c211f7 100644 --- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "lxqt-sudo"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-kDcOHqHuAyHTQ7ccsCelPOBieXdRLloEvSMjq9PIa30="; + hash = "sha256-ohB0LsEnDDe3wygRgvP5mFQ2hu1c9xv2RilSdqOQBxA="; }; nativeBuildInputs = [ From 970b83abc39263a640627d09b1128aacb5737eb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:16 -0300 Subject: [PATCH 510/617] lxqt.lxqt-runner: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-runner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix index 0ea4ab9dce0f..fd2b586778a5 100644 --- a/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "lxqt-runner"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-r9rz6rJX60+1/+Wd5APobyZRioXzD1xveFIMToTvpXQ="; + hash = "sha256-NsAlaoWMvisRZ04KkrQzwi5B2eXnaHqg0HtYG4NKLcs="; }; nativeBuildInputs = [ From 79af93c68434b6bc6c8e1b5d924206fe95d968de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:16 -0300 Subject: [PATCH 511/617] lxqt.lxqt-themes: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/lxqt-themes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix index f4283c1927ea..50b814724c51 100644 --- a/pkgs/desktops/lxqt/lxqt-themes/default.nix +++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "lxqt-themes"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-bAdwC1YrXCT4eJUafTK6kcfQ/YnMbBLHyyWvsBLIisA="; + hash = "sha256-TUBcYQ7mWGVZKHNi4zQh8/ogSuMr20xIAoR+IGYQE0w="; }; nativeBuildInputs = [ From 7336b9ae243528881891b84441c244a23b31eb90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:16 -0300 Subject: [PATCH 512/617] lxqt.pavucontrol-qt: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/pavucontrol-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index 208d741a9a61..0244300f3ed2 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "pavucontrol-qt"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-dhFVVqJIX40oiHCcnG1166RsllXtfaO7MqM6ZNizjQQ="; + hash = "sha256-V3VYwDlTRd7q7EJhC4zHcX56AbUYJdfumqXaKlkLEfg="; }; nativeBuildInputs = [ From 5444f4c890af772d23c723b436c86a7e3c12802a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:16 -0300 Subject: [PATCH 513/617] lxqt.pcmanfm-qt: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/pcmanfm-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index 2b52e53755e5..e375c20791c7 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "pcmanfm-qt"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-PyCtcn+QHwX/iy85A3y7Phf8ogdSRrwtXrJYGxrjyLM="; + hash = "sha256-3LdoJLlGoUsv0MdbxIOZrzLaPnZ2hI6m+bLp4GNonng="; }; nativeBuildInputs = [ From 994308a44907790b586544c2d53434725fca7efb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:16 -0300 Subject: [PATCH 514/617] lxqt.qps: 2.9.0 -> 2.10.0 --- pkgs/desktops/lxqt/qps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix index a162c7f21d44..c3cb608538a5 100644 --- a/pkgs/desktops/lxqt/qps/default.nix +++ b/pkgs/desktops/lxqt/qps/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "qps"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-Jit1CdFZyhKOjNytTBH9T4NqqmhxoifXGgPUyVdzJ+4="; + hash = "sha256-FJw1J4c8oLBo7adl1uhCuS+o/ZhJAOyLmbjUgtdt0ss="; }; nativeBuildInputs = [ From 51089e06249cff2150b81018851b469c24e33665 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:17 -0300 Subject: [PATCH 515/617] lxqt.qterminal: 2.0.1 -> 2.1.0 --- pkgs/desktops/lxqt/qterminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index 0155fdf5322a..1ca75acdc36c 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "qterminal"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-KGghNa1tvxDFd9kEElCx9BoLfwnbeX5UvoksyPBfEjc="; + hash = "sha256-Nluw0waf+lqpbajsPv+HYhPD3y7XmgifSu2r7I/J4RI="; }; nativeBuildInputs = [ From 821a3045db4867c870bfbc6bbdb78bcb0c786bac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:17 -0300 Subject: [PATCH 516/617] lxqt.qtermwidget: 2.0.1 -> 2.1.0 --- pkgs/desktops/lxqt/qtermwidget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index 30fe20ebeefe..90b1a561bdf2 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -7,7 +7,7 @@ , lxqt-build-tools , wrapQtAppsHook , gitUpdater -, version ? "2.0.1" +, version ? "2.1.0" }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { rev = version; hash = { "1.4.0" = "sha256-wYUOqAiBjnupX1ITbFMw7sAk42V37yDz9SrjVhE4FgU="; - "2.0.1" = "sha256-dqKsYAtoJgtXYL/MI3/p3N5kzxC7JfyO4Jn6YMhaV78="; + "2.1.0" = "sha256-I8fVggCi9qN+Jpqb/EC5/DfwuhGF55trbPESZQWPZ5M="; }."${version}"; }; From 3911a6abecb8c935404cd0197a0a9ab7600e3df0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:17 -0300 Subject: [PATCH 517/617] lxqt.qtxdg-tools: 4.0.0 -> 4.1.0 --- pkgs/desktops/lxqt/qtxdg-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qtxdg-tools/default.nix b/pkgs/desktops/lxqt/qtxdg-tools/default.nix index 5243b6e6ef22..4e1b5b4144d8 100644 --- a/pkgs/desktops/lxqt/qtxdg-tools/default.nix +++ b/pkgs/desktops/lxqt/qtxdg-tools/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "qtxdg-tools"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-w9pFHG+q2oT33Lfg88MUzfWSyvHUgC0Fi2V8XcueJ/Q="; + hash = "sha256-I8HV7QwyyRssWB6AjC1GswjlXoYwPJHowE74zgqghX4="; }; nativeBuildInputs = [ From 32dd7af54d7c533dada0de3174d3a1df508f5995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:17 -0300 Subject: [PATCH 518/617] lxqt.screengrab: 2.8.0 -> 2.9.0 --- pkgs/desktops/lxqt/screengrab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index a7e65d746b60..fa132756edcf 100644 --- a/pkgs/desktops/lxqt/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "screengrab"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-PMe2NyIoc12n4l/oWPi3GL6pemuHyxL2HFBLTIyD690="; + hash = "sha256-V5ulRkckeSX2EsYmhmA9phVssDtix31M5oZXkOgF660="; }; nativeBuildInputs = [ From 5fff027e315bda2bac4398e66c5e3798669238be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 6 Nov 2024 23:22:17 -0300 Subject: [PATCH 519/617] lxqt.xdg-desktop-portal-lxqt: 1.0.2 -> 1.1.0 --- pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix index f88f32fb11fc..4e63d967ffbc 100644 --- a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix +++ b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-lxqt"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-zXZ0Un56uz1hKoPvZitJgQpJ7ko0LrSSFxl+agiqZ4A="; + hash = "sha256-uII6elLoREc/AO6NSe9QsT+jYARd2hgKSa84NCDza10="; }; nativeBuildInputs = [ From 081c63905b498cd0ca50565ae5ea6e44190096da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 7 Nov 2024 08:01:56 -0300 Subject: [PATCH 520/617] lxqt.lxqt-wayland-session: init at 0.1.0 --- pkgs/desktops/lxqt/default.nix | 2 + .../lxqt/lxqt-wayland-session/default.nix | 70 +++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 pkgs/desktops/lxqt/lxqt-wayland-session/default.nix diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 3efd526cb6bd..059a2531fbbe 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -29,6 +29,7 @@ let lxqt-session = callPackage ./lxqt-session {}; lxqt-sudo = callPackage ./lxqt-sudo {}; lxqt-themes = callPackage ./lxqt-themes {}; + lxqt-wayland-session = callPackage ./lxqt-wayland-session {}; pavucontrol-qt = callPackage ./pavucontrol-qt {}; qtermwidget = callPackage ./qtermwidget {}; @@ -114,6 +115,7 @@ let lxqt-session lxqt-sudo lxqt-themes + lxqt-wayland-session pavucontrol-qt ### CORE 2 diff --git a/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix new file mode 100644 index 000000000000..21f4ef2548d9 --- /dev/null +++ b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix @@ -0,0 +1,70 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + kwindowsystem, + liblxqt, + libqtxdg, + lxqt-build-tools, + pkg-config, + qtsvg, + qttools, + xdg-user-dirs, + xkeyboard_config, + gitUpdater, +}: + +stdenv.mkDerivation rec { + pname = "lxqt-wayland-session"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "lxqt"; + repo = "lxqt-wayland-session"; + rev = version; + hash = "sha256-5WdfwJ89HWlXL6y9Lpgs7H3mbN/wbf+9VbP9ERPasBM="; + }; + + nativeBuildInputs = [ + cmake + lxqt-build-tools + pkg-config + qttools + ]; + + buildInputs = [ + kwindowsystem + liblxqt + libqtxdg + qtsvg + xdg-user-dirs + ]; + + postPatch = '' + substituteInPlace startlxqtwayland.in \ + --replace-fail /usr/share/X11/xkb/rules ${xkeyboard_config}/share/X11/xkb/rules + + substituteInPlace configurations/{labwc/autostart,lxqt-hyprland.conf,lxqt-wayfire.ini} \ + --replace-fail /usr/share/lxqt/wallpapers $out/share/lxqt/wallpapers + ''; + + dontWrapQtApps = true; + + passthru.updateScript = gitUpdater { }; + + meta = { + homepage = "https://github.com/lxqt/lxqt-wayland-session"; + description = "Files needed for the LXQt Wayland Session"; + license = with lib.licenses; [ + bsd3 + cc-by-sa-40 + gpl2Only + gpl3Only + lgpl21Only + mit + ]; + platforms = lib.platforms.linux; + maintainers = lib.teams.lxqt.members; + }; +} From 21107d7bc10cc13e5a0af618fe30ff4a9ca32d97 Mon Sep 17 00:00:00 2001 From: Bu Kun <65808665+pokon548@users.noreply.github.com> Date: Fri, 8 Nov 2024 11:15:44 +0800 Subject: [PATCH 521/617] wechat-uos: 4.0.0.21 -> 4.0.0.23 --- pkgs/by-name/we/wechat-uos/sources.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/we/wechat-uos/sources.nix b/pkgs/by-name/we/wechat-uos/sources.nix index d0012bad068b..4bf6f508b8b8 100644 --- a/pkgs/by-name/we/wechat-uos/sources.nix +++ b/pkgs/by-name/we/wechat-uos/sources.nix @@ -1,11 +1,11 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2024-11-04 +# Last updated: 2024-11-08 { - version = "4.0.0.21"; - amd64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.0.21_amd64.deb"; - arm64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.0.21_arm64.deb"; - loongarch64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.0.21_loongarch64.deb"; - amd64_hash = "sha256-1tO8ARt2LuCwPz7rO25/9dTOIf9Rwqc9TdqiZTTojRk="; - arm64_hash = "sha256-Xl+bT/WXZ58rchvUBAMfcdqMxOIRxp5qyMRE/FvEC9I="; - loongarch64_hash = "sha256-b6j3y10HOdRvKoTTY9j2jGoM/W9XAjdIrQNZA9ddmUw="; + version = "4.0.0.23"; + amd64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.0.23_amd64.deb"; + arm64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.0.23_arm64.deb"; + loongarch64_url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.0.23_loongarch64.deb"; + amd64_hash = "sha256-Q3gmo83vJddj9p4prhBHm16LK6CAtW3ltd5j4FqPcgM="; + arm64_hash = "sha256-oIsPbEkw1+zXpzvXAVEdmykXjb5zulHATwnrnhsxkPc="; + loongarch64_hash = "sha256-grj9yGHZZag20l5s8IgcknvUvz0fBHkakgKsOe+rhmI="; } From f36ddf89a808d27c6c38e1423ebc9eb19dcd60a4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Nov 2024 04:29:33 +0100 Subject: [PATCH 522/617] python312Packages.django-oauth-toolkit: use pytest-cov-stub and only expose DJANGO_SETTINGS_MODULE for tests. --- .../python-modules/django-oauth-toolkit/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix index 41265d7e99c7..30007c812b3c 100644 --- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix +++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix @@ -12,6 +12,7 @@ # tests djangorestframework, + pytest-cov-stub, pytest-django, pytest-mock, pytestCheckHook, @@ -29,10 +30,6 @@ buildPythonPackage rec { hash = "sha256-Ya0KlX+vtLXN2Fgk0Gv7KemJCUTwkaH+4GQA1ByUlBY="; }; - postPatch = '' - sed -i '/cov/d' pyproject.toml - ''; - build-system = [ setuptools ]; dependencies = [ @@ -42,12 +39,15 @@ buildPythonPackage rec { requests ]; - DJANGO_SETTINGS_MODULE = "tests.settings"; + preCheck = '' + export DJANGO_SETTINGS_MODULE=tests.settings + ''; # xdist is disabled right now because it can cause race conditions on high core machines # https://github.com/jazzband/django-oauth-toolkit/issues/1300 nativeCheckInputs = [ djangorestframework + pytest-cov-stub pytest-django # pytest-xdist pytest-mock From 9aa30e6dd110a722bd0496e011043bf5c1af52e8 Mon Sep 17 00:00:00 2001 From: MilesCranmer Date: Mon, 4 Nov 2024 20:00:42 -0500 Subject: [PATCH 523/617] rip2: init at 0.9.0 Co-authored-by: Aleksana --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/by-name/ri/rip2/package.nix | 36 ++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/by-name/ri/rip2/package.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b14f78609e47..06da3c2474da 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14244,6 +14244,12 @@ githubId = 38543128; name = "Miles Breslin"; }; + milescranmer = { + email = "miles.cranmer@gmail.com"; + github = "MilesCranmer"; + githubId = 7593028; + name = "Miles Cranmer"; + }; milibopp = { email = "contact@ebopp.de"; github = "milibopp"; diff --git a/pkgs/by-name/ri/rip2/package.nix b/pkgs/by-name/ri/rip2/package.nix new file mode 100644 index 000000000000..eba6c5f81484 --- /dev/null +++ b/pkgs/by-name/ri/rip2/package.nix @@ -0,0 +1,36 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, +}: + +rustPlatform.buildRustPackage rec { + pname = "rip2"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "MilesCranmer"; + repo = "rip2"; + rev = "v${version}"; + hash = "sha256-9leLWfPilDQHzQRzTUjAFt9olTPEL4GcQgYFWZu3dug="; + }; + + cargoHash = "sha256-l6rbeiyIsr1csBcp+428TpQYSs9RvfJutGoL/wtSGR8="; + + # TODO: Unsure why this test fails, but not a major issue so + # skipping for now. + checkFlags = [ "--skip=test_filetypes::file_type_3___fifo__" ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/rip"; + + meta = { + description = "Safe and ergonomic alternative to rm"; + homepage = "https://github.com/MilesCranmer/rip2"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ milescranmer ]; + mainProgram = "rip"; + }; +} From 05ccba8ceef70e4e30c3952b69a9364f0c2c8a1b Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 8 Nov 2024 00:35:46 +0000 Subject: [PATCH 524/617] ninja_1_11: init at 1.11.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Swift 5.8 doesn’t reliably build with Ninja 1.12, and apparently neither do old versions of ROCm, due to a build scheduling change breaking builds with undeclared dependencies. Upstream Swift have pinned 1.11 for now. Reintroducing it isn’t a good long‐term solution, but seems like the easiest way to avoid shipping 24.11 with a broken Swift on Darwin. The patch for 32‐bit systems has not been restored, as Swift doesn’t support them anyway. --- pkgs/by-name/ni/ninja/package.nix | 25 ++++++++++++++++++------- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ni/ninja/package.nix b/pkgs/by-name/ni/ninja/package.nix index 23d279e362d7..744932e0c2ff 100644 --- a/pkgs/by-name/ni/ninja/package.nix +++ b/pkgs/by-name/ni/ninja/package.nix @@ -11,18 +11,29 @@ , buildPackages , buildDocs ? true , nix-update-script +, ninjaRelease ? "latest" }: stdenv.mkDerivation (finalAttrs: { pname = "ninja"; - version = "1.12.1"; + version = lib.removePrefix "v" finalAttrs.src.rev; - src = fetchFromGitHub { - owner = "ninja-build"; - repo = "ninja"; - rev = "v${finalAttrs.version}"; - hash = "sha256-RT5u+TDvWxG5EVQEYj931EZyrHUSAqK73OKDAascAwA="; - }; + src = { + # TODO: Remove Ninja 1.11 as soon as possible. + "1.11" = fetchFromGitHub { + owner = "ninja-build"; + repo = "ninja"; + rev = "v1.11.1"; + hash = "sha256-LvV/Fi2ARXBkfyA1paCRmLUwCh/rTyz+tGMg2/qEepI="; + }; + + latest = fetchFromGitHub { + owner = "ninja-build"; + repo = "ninja"; + rev = "v1.12.1"; + hash = "sha256-RT5u+TDvWxG5EVQEYj931EZyrHUSAqK73OKDAascAwA="; + }; + }.${ninjaRelease} or (throw "Unsupported Ninja release: ${ninjaRelease}"); depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b21dc2f649b8..f4d5db1f59cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30944,6 +30944,8 @@ with pkgs; node-problem-detector = callPackage ../applications/networking/cluster/node-problem-detector { }; + ninja_1_11 = callPackage ../by-name/ni/ninja/package.nix { ninjaRelease = "1.11"; }; + ninjas2 = callPackage ../applications/audio/ninjas2 { }; nootka = qt5.callPackage ../applications/audio/nootka { }; From 8dfed1b9a444dca8e41a1d0f90436664f902634e Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Fri, 8 Nov 2024 09:10:53 +0800 Subject: [PATCH 525/617] swift: Workaround Hydra darwin build problem Fail to build with ninja 1.12 when NIX_BUILD_CORES is low (Hydra or Github Actions): ``` ld: warning: directory not found for option '-L/nix/store/g9rbp9m6vs1xj4jl6b6vjb6bm8kgr107-SDKs/MacOSX10.15.sdk/usr/lib/swift' ... ld: warning: Could not find or use auto-linked library 'swiftCompatibility56' Undefined symbols for architecture arm64: "__swift_FORCE_LOAD_$_swiftCompatibility56", referenced from: __swift_FORCE_LOAD_$_swiftCompatibility56_$_Optimizer in libswiftCompilerModules-bootstrapping1.a(Optimizer.o) ... ``` Can reproduce using `nix --option cores 2 build -f . swiftPackages.swift-unwrapped`. Until we find out the exact cause, follow [swift upstream][1], pin ninja to version 1.11.1. [1]: https://github.com/swiftlang/swift/pull/72989 --- pkgs/development/compilers/swift/compiler/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix index 651c6faa566c..8e8cf798db4f 100644 --- a/pkgs/development/compilers/swift/compiler/default.nix +++ b/pkgs/development/compilers/swift/compiler/default.nix @@ -6,7 +6,7 @@ , coreutils , gnugrep , perl -, ninja +, ninja_1_11 , pkg-config , clang , bintools @@ -190,6 +190,14 @@ let ''; }; + # https://github.com/NixOS/nixpkgs/issues/327836 + # Fail to build with ninja 1.12 when NIX_BUILD_CORES is low (Hydra or Github Actions). + # Can reproduce using `nix --option cores 2 build -f . swiftPackages.swift-unwrapped`. + # Until we find out the exact cause, follow [swift upstream][1], pin ninja to version + # 1.11.1. + # [1]: https://github.com/swiftlang/swift/pull/72989 + ninja = ninja_1_11; + in stdenv.mkDerivation { pname = "swift"; inherit (sources) version; From 39cba6bde7a90b3460e1a344ff4ae44a9b3ca727 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Nov 2024 05:20:33 +0000 Subject: [PATCH 526/617] gnmic: 0.38.2 -> 0.39.0 --- pkgs/applications/networking/gnmic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/gnmic/default.nix b/pkgs/applications/networking/gnmic/default.nix index dfa28d8417d0..145f094aaaf8 100644 --- a/pkgs/applications/networking/gnmic/default.nix +++ b/pkgs/applications/networking/gnmic/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gnmic"; - version = "0.38.2"; + version = "0.39.0"; src = fetchFromGitHub { owner = "openconfig"; repo = pname; rev = "v${version}"; - hash = "sha256-TSRexhhYny1L7znhjqPLudIMUYhyMQUmLClyXzsZxcY="; + hash = "sha256-xS2TLYA/9Xb4UJ8yCpqDBQbHTE1p2OlBpp8R2BTXwyk="; }; - vendorHash = "sha256-pJz613QFdA+8HcV+U0aG+A+WDZtSZIgaLVqCnu4WQWo="; + vendorHash = "sha256-9A/ZcamCMUpNxG3taHrqI4JChjpSjSuwx0ZUyGAuGXo="; ldflags = [ "-s" "-w" From ef78c48d1abb83e58dd1180a923d3a0551109197 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Nov 2024 05:27:40 +0000 Subject: [PATCH 527/617] python312Packages.django-cachalot: 2.6.3 -> 2.7.0 --- pkgs/development/python-modules/django-cachalot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-cachalot/default.nix b/pkgs/development/python-modules/django-cachalot/default.nix index 95772d937b6c..44a680f4f3dc 100644 --- a/pkgs/development/python-modules/django-cachalot/default.nix +++ b/pkgs/development/python-modules/django-cachalot/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "django-cachalot"; - version = "2.6.3"; + version = "2.7.0"; format = "setuptools"; src = fetchFromGitHub { owner = "noripyt"; repo = "django-cachalot"; rev = "refs/tags/v${version}"; - hash = "sha256-q4w2goxdDqivGVZCRDGOvYARbzmx6P8Gnw9YlYn9Few="; + hash = "sha256-Fi5UvqH2bVb4v/GWDkEYIcBMBVos+35g4kcEnZTOQvw="; }; patches = [ From 3e0cfb6804eb33f075da91f3394b471f6e42a4eb Mon Sep 17 00:00:00 2001 From: ocfox Date: Fri, 8 Nov 2024 13:27:52 +0800 Subject: [PATCH 528/617] showmethekey: 1.14.0 -> 1.15.0 Diff: https://github.com/AlynxZhou/showmethekey/compare/refs/tags/v1.14.0...v1.15.0 Changelog: https://github.com/AlynxZhou/showmethekey/releases/tag/v1.15.0 --- pkgs/by-name/sh/showmethekey/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sh/showmethekey/package.nix b/pkgs/by-name/sh/showmethekey/package.nix index b9842ae0a66b..c7d390e971fe 100644 --- a/pkgs/by-name/sh/showmethekey/package.nix +++ b/pkgs/by-name/sh/showmethekey/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "showmethekey"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "AlynxZhou"; repo = "showmethekey"; rev = "refs/tags/v${version}"; - hash = "sha256-uBhciNkDBXrME8YRztlUdm3oV2y8YiA9Fhib9KLVeBY="; + hash = "sha256-zlLpQZbjEJjgCxlHGaiDFGRZ/6tz5fpKVLVqtjO4pHM="; }; nativeBuildInputs = [ From e134422465913332a5c9cb3ec9161650f7d459c8 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 8 Nov 2024 12:56:36 +0800 Subject: [PATCH 529/617] maintainers: remove expipiplus1 Another year, another exhausting undermoderated thread full of people arguing against being an inclusive community, tone policing and denying that discriminatory behaviour even exists. This clearly isn't getting any better and I'm embarrassed that I stayed around for this long. I can't continue to lend my name to such a project. --- maintainers/maintainer-list.nix | 8 -------- maintainers/team-list.nix | 1 - .../instant-messengers/signald/default.nix | 2 +- .../science/electronics/fped/default.nix | 2 +- .../science/electronics/picoscope/default.nix | 2 +- .../version-management/git-fame/default.nix | 2 +- pkgs/by-name/li/libgpiod_1/package.nix | 2 +- pkgs/by-name/mo/monado/package.nix | 2 +- pkgs/by-name/xr/xrgears/package.nix | 5 +---- pkgs/development/embedded/fpga/ecpdap/default.nix | 2 +- .../configuration-hackage2nix/main.yaml | 10 ---------- .../haskell-modules/hackage-packages.nix | 13 +------------ pkgs/development/libraries/libgpiod/default.nix | 2 +- pkgs/development/libraries/libsurvive/default.nix | 2 +- pkgs/development/libraries/pangolin/default.nix | 2 +- pkgs/development/libraries/swiftshader/default.nix | 2 +- .../tools/build-managers/qbs/default.nix | 2 +- pkgs/servers/mautrix-signal/default.nix | 1 - pkgs/servers/mx-puppet-discord/default.nix | 2 +- .../graphics/directx-shader-compiler/default.nix | 5 +---- .../graphics/vulkan-extension-layer/default.nix | 2 +- pkgs/tools/graphics/vulkan-tools-lunarg/default.nix | 2 +- pkgs/tools/misc/inav-blackbox-tools/default.nix | 2 +- pkgs/tools/misc/lighthouse-steamvr/default.nix | 5 +---- pkgs/tools/misc/opencorsairlink/default.nix | 2 +- 25 files changed, 21 insertions(+), 61 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a844c0b45998..96a3c478cd4b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6881,14 +6881,6 @@ githubId = 873530; name = "Alexey Levan"; }; - expipiplus1 = { - email = "nix@monoid.al"; - matrix = "@ellie:monoid.al"; - github = "expipiplus1"; - githubId = 857308; - name = "Ellie Hermaszewska"; - keys = [ { fingerprint = "FC1D 3E4F CBCA 80DF E870 6397 C811 6E3A 0C1C A76A"; } ]; - }; exploitoverload = { email = "nix@exploitoverload.com"; github = "exploitoverload"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 6542675bbc98..b4f555105051 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -449,7 +449,6 @@ with lib.maintainers; haskell = { members = [ cdepillabout - expipiplus1 maralorn ncfavier sternenseemann diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index 6131e64e9152..acadc87d9a3d 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -84,7 +84,7 @@ in stdenv.mkDerivation { binaryBytecode # deps ]; license = licenses.gpl3Plus; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/applications/science/electronics/fped/default.nix index e3984dba77d8..dbfeb69c6bfa 100644 --- a/pkgs/applications/science/electronics/fped/default.nix +++ b/pkgs/applications/science/electronics/fped/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { mainProgram = "fped"; homepage = "http://projects.qi-hardware.com/index.php/p/fped/"; license = licenses.gpl2; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/electronics/picoscope/default.nix b/pkgs/applications/science/electronics/picoscope/default.nix index 7fc737eb1d38..056a682d1c1c 100644 --- a/pkgs/applications/science/electronics/picoscope/default.nix +++ b/pkgs/applications/science/electronics/picoscope/default.nix @@ -17,7 +17,7 @@ let shared_meta = lib: { homepage = "https://www.picotech.com/downloads/linux"; - maintainers = with lib.maintainers; [ expipiplus1 wirew0rm ] ++ lib.teams.lumiguide.members; + maintainers = with lib.maintainers; [ wirew0rm ] ++ lib.teams.lumiguide.members; platforms = [ "x86_64-linux" ]; license = lib.licenses.unfree; }; diff --git a/pkgs/applications/version-management/git-fame/default.nix b/pkgs/applications/version-management/git-fame/default.nix index d69988eca012..54af934bde8b 100644 --- a/pkgs/applications/version-management/git-fame/default.nix +++ b/pkgs/applications/version-management/git-fame/default.nix @@ -15,7 +15,7 @@ bundlerEnv { ''; homepage = "http://oleander.io/git-fame-rb"; license = licenses.mit; - maintainers = with maintainers; [ expipiplus1 nicknovitski ]; + maintainers = with maintainers; [ nicknovitski ]; platforms = platforms.unix; mainProgram = "git-fame"; }; diff --git a/pkgs/by-name/li/libgpiod_1/package.nix b/pkgs/by-name/li/libgpiod_1/package.nix index 337229c25db7..94644afff3fe 100644 --- a/pkgs/by-name/li/libgpiod_1/package.nix +++ b/pkgs/by-name/li/libgpiod_1/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/"; license = licenses.lgpl2; - maintainers = [ maintainers.expipiplus1 ]; + maintainers = []; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/mo/monado/package.nix b/pkgs/by-name/mo/monado/package.nix index 84719a4fa8be..f65a83c3d601 100644 --- a/pkgs/by-name/mo/monado/package.nix +++ b/pkgs/by-name/mo/monado/package.nix @@ -155,7 +155,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Open source XR runtime"; homepage = "https://monado.freedesktop.org/"; license = licenses.boost; - maintainers = with maintainers; [ Scrumplex expipiplus1 prusnak ]; + maintainers = with maintainers; [ Scrumplex prusnak ]; platforms = platforms.linux; mainProgram = "monado-cli"; }; diff --git a/pkgs/by-name/xr/xrgears/package.nix b/pkgs/by-name/xr/xrgears/package.nix index 82a801a54be0..96737ae7972e 100644 --- a/pkgs/by-name/xr/xrgears/package.nix +++ b/pkgs/by-name/xr/xrgears/package.nix @@ -65,9 +65,6 @@ stdenv.mkDerivation { mainProgram = "xrgears"; platforms = platforms.linux; license = licenses.mit; - maintainers = with maintainers; [ - expipiplus1 - Scrumplex - ]; + maintainers = with maintainers; [ Scrumplex ]; }; } diff --git a/pkgs/development/embedded/fpga/ecpdap/default.nix b/pkgs/development/embedded/fpga/ecpdap/default.nix index 6d43f107563a..1dfc54e9c3c6 100644 --- a/pkgs/development/embedded/fpga/ecpdap/default.nix +++ b/pkgs/development/embedded/fpga/ecpdap/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/adamgreig/ecpdap"; license = licenses.asl20; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; }; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 53acd512a0ef..b1dc2492f8b9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -223,16 +223,6 @@ package-maintainers: - tlynx - xmonad - xmonad-contrib - expipiplus1: - - VulkanMemoryAllocator - - autoapply - - exact-real - - language-c - - orbits - - update-nix-fetchgit - - vector-sized - - vulkan - - vulkan-utils erictapen: - hakyll evenbrenden: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 67ba06fe891d..d51851b2c471 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -22317,7 +22317,6 @@ self: { badPlatforms = [ "i686-linux" "armv7l-linux" ] ++ lib.platforms.darwin; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "WAVE" = callPackage @@ -43471,7 +43470,6 @@ self: { description = "Template Haskell to automatically pass values to functions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "autodocodec" = callPackage @@ -103828,7 +103826,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Exact real arithmetic"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "exact-real-positional" = callPackage @@ -188180,7 +188177,6 @@ self: { testHaskellDepends = [ base directory filepath process ]; description = "Analysis and generation of C code"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "language-c-comments" = callPackage @@ -229065,7 +229061,6 @@ self: { ]; description = "Types and functions for Kepler orbits"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "orc" = callPackage @@ -323122,9 +323117,7 @@ self: { description = "A program to update fetchgit values in Nix expressions"; license = lib.licenses.bsd3; mainProgram = "update-nix-fetchgit"; - maintainers = [ - lib.maintainers.expipiplus1 lib.maintainers.sorki - ]; + maintainers = [ lib.maintainers.sorki ]; }) {}; "update-repos" = callPackage @@ -326556,7 +326549,6 @@ self: { ]; description = "Size tagged vectors"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "vector-sized_1_6_1" = callPackage @@ -326576,7 +326568,6 @@ self: { description = "Size tagged vectors"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "vector-space" = callPackage @@ -328393,7 +328384,6 @@ self: { badPlatforms = [ "i686-linux" "armv7l-linux" ] ++ lib.platforms.darwin; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {vulkan = null;}; "vulkan-api" = callPackage @@ -328427,7 +328417,6 @@ self: { description = "Utils for the vulkan package"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; "waargonaut" = callPackage diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index 1880b8310fce..e52a0f83ad3c 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { lgpl21Plus # libgpiod lgpl3Plus # C++ bindings ] ++ lib.optional enable-tools gpl2Plus; - maintainers = [ maintainers.expipiplus1 ]; + maintainers = []; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libsurvive/default.nix b/pkgs/development/libraries/libsurvive/default.nix index 53ebe6f18e41..4e5418de689a 100644 --- a/pkgs/development/libraries/libsurvive/default.nix +++ b/pkgs/development/libraries/libsurvive/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "Open Source Lighthouse Tracking System"; homepage = "https://github.com/cntools/libsurvive"; license = licenses.mit; - maintainers = with maintainers; [ expipiplus1 prusnak ]; + maintainers = with maintainers; [ prusnak ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 7b26f3f12fca..f15a7dfe4490 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/stevenlovegrove/Pangolin"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.expipiplus1 ]; + maintainers = []; platforms = lib.platforms.all; }; } diff --git a/pkgs/development/libraries/swiftshader/default.nix b/pkgs/development/libraries/swiftshader/default.nix index 624d239fa35c..3063ccc3a189 100644 --- a/pkgs/development/libraries/swiftshader/default.nix +++ b/pkgs/development/libraries/swiftshader/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { # Should be possible to support Darwin by changing the install phase with # 's/Linux/Darwin/' and 's/so/dylib/' or something similar. platforms = with platforms; linux; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; }; } diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index 092f8efe785c..9c642123ee4d 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Tool that helps simplify the build process for developing projects across multiple platforms"; homepage = "https://wiki.qt.io/Qbs"; license = licenses.lgpl3; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; platforms = platforms.linux; }; } diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index 143034ecddee..0b21bd539d1d 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -48,7 +48,6 @@ buildGoModule rec { description = "Matrix-Signal puppeting bridge"; license = licenses.agpl3Plus; maintainers = with maintainers; [ - expipiplus1 niklaskorz ma27 ]; diff --git a/pkgs/servers/mx-puppet-discord/default.nix b/pkgs/servers/mx-puppet-discord/default.nix index 254434a8ba3d..1d86bc472a36 100644 --- a/pkgs/servers/mx-puppet-discord/default.nix +++ b/pkgs/servers/mx-puppet-discord/default.nix @@ -44,7 +44,7 @@ in myNodePackages.package.override { description = "Discord puppeting bridge for matrix"; license = licenses.asl20; homepage = "https://gitlab.com/mx-puppet/discord/mx-puppet-discord"; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; diff --git a/pkgs/tools/graphics/directx-shader-compiler/default.nix b/pkgs/tools/graphics/directx-shader-compiler/default.nix index 11deeca44d06..bd5d00aa50d1 100644 --- a/pkgs/tools/graphics/directx-shader-compiler/default.nix +++ b/pkgs/tools/graphics/directx-shader-compiler/default.nix @@ -56,9 +56,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/microsoft/DirectXShaderCompiler"; platforms = with lib.platforms; linux ++ darwin; license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ - expipiplus1 - Flakebi - ]; + maintainers = with lib.maintainers; [ Flakebi ]; }; }) diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix index 268353985889..4b03e4e098f2 100644 --- a/pkgs/tools/graphics/vulkan-extension-layer/default.nix +++ b/pkgs/tools/graphics/vulkan-extension-layer/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/KhronosGroup/Vulkan-ExtensionLayer/"; platforms = platforms.linux; license = licenses.asl20; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; }; } diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index 1d031d20c1bb..08236ab39a2c 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -88,6 +88,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/LunarG/VulkanTools"; platforms = platforms.linux; license = licenses.asl20; - maintainers = [ maintainers.expipiplus1 ]; + maintainers = []; }; } diff --git a/pkgs/tools/misc/inav-blackbox-tools/default.nix b/pkgs/tools/misc/inav-blackbox-tools/default.nix index 228035108a81..4acfc4d4890e 100644 --- a/pkgs/tools/misc/inav-blackbox-tools/default.nix +++ b/pkgs/tools/misc/inav-blackbox-tools/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Tools for working with blackbox flight logs"; homepage = "https://github.com/inavflight/blackbox-tools"; license = licenses.gpl3Only; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = []; platforms = platforms.all; broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/inav-blackbox-tools.x86_64-darwin }; diff --git a/pkgs/tools/misc/lighthouse-steamvr/default.nix b/pkgs/tools/misc/lighthouse-steamvr/default.nix index 90590d01cfdc..9c9f7e97fa68 100644 --- a/pkgs/tools/misc/lighthouse-steamvr/default.nix +++ b/pkgs/tools/misc/lighthouse-steamvr/default.nix @@ -29,10 +29,7 @@ rustPlatform.buildRustPackage rec { description = "VR Lighthouse power state management"; homepage = "https://github.com/ShayBox/Lighthouse"; license = licenses.mit; - maintainers = with maintainers; [ - expipiplus1 - bddvlpr - ]; + maintainers = with maintainers; [ bddvlpr ]; mainProgram = "lighthouse"; }; } diff --git a/pkgs/tools/misc/opencorsairlink/default.nix b/pkgs/tools/misc/opencorsairlink/default.nix index c7e92770b7d6..e4e1791c8971 100644 --- a/pkgs/tools/misc/opencorsairlink/default.nix +++ b/pkgs/tools/misc/opencorsairlink/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/audiohacked/OpenCorsairLink"; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = [ lib.maintainers.expipiplus1 ]; + maintainers = []; mainProgram = "OpenCorsairLink.elf"; }; } From 59fd9013ac9d1188bc5b44e534da7fef59a40cea Mon Sep 17 00:00:00 2001 From: Yovko Lambrev Date: Fri, 8 Nov 2024 08:41:00 +0200 Subject: [PATCH 530/617] terraform-providers.ccloud: init at 1.6.6 (#354274) --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index cea5e5187367..e7616f511744 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -206,6 +206,15 @@ "spdx": "MIT", "vendorHash": "sha256-PFeWgDw1hkW/ekQfubRSYlaD4d4wJ4GOohOJ00QcEqQ=" }, + "ccloud": { + "hash": "sha256-bGyVfB9eenE6QZZw0bAxnve0KW0ZQ54slTaaWZXDBOc=", + "homepage": "https://registry.terraform.io/providers/sapcc/ccloud", + "owner": "sapcc", + "repo": "terraform-provider-ccloud", + "rev": "v1.6.6", + "spdx": "MPL-2.0", + "vendorHash": "sha256-uftDCqDU0HeDj7rjAevulsFCVFFQt3eg8vcFM9YJrow=" + }, "checkly": { "hash": "sha256-4J7pwtlAa920RXF6ZoSoi03qA15NBzUlXQCZRErI2Co=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", From 780f200e8fe823dac74e9e614131ea69865914c5 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 7 Nov 2024 23:02:52 +0300 Subject: [PATCH 531/617] kdePackages: Gear 24.08.2 -> 24.08.3 --- pkgs/kde/gear/akonadi-search/default.nix | 2 +- pkgs/kde/gear/angelfish/default.nix | 2 +- pkgs/kde/gear/kalzium/default.nix | 10 - pkgs/kde/gear/kdepim-addons/default.nix | 2 +- pkgs/kde/generated/sources/gear.json | 1500 +++++++++++----------- 5 files changed, 753 insertions(+), 763 deletions(-) diff --git a/pkgs/kde/gear/akonadi-search/default.nix b/pkgs/kde/gear/akonadi-search/default.nix index de9c6faa951f..04a79eae8e69 100644 --- a/pkgs/kde/gear/akonadi-search/default.nix +++ b/pkgs/kde/gear/akonadi-search/default.nix @@ -7,7 +7,7 @@ cargo, rustc, # provided as callPackage input to enable easier overrides through overlays - cargoHash ? "sha256-E+QaicYnFF79FDIhhvuEPQLikiLk5oKIjvLA132RUZo=", + cargoHash ? "sha256-9cwNQSw0ueWyyL/qgWXXqIRsi4Lk/DX48CIbvQFNgP8=", }: mkKdeDerivation rec { pname = "akonadi-search"; diff --git a/pkgs/kde/gear/angelfish/default.nix b/pkgs/kde/gear/angelfish/default.nix index f01906491453..b535a36e1786 100644 --- a/pkgs/kde/gear/angelfish/default.nix +++ b/pkgs/kde/gear/angelfish/default.nix @@ -8,7 +8,7 @@ cargo, rustc, # provided as callPackage input to enable easier overrides through overlays - cargoHash ? "sha256-B3M5tkmftR4nFbPAQqJDvvPidVGxq/8zH0KRgpBR92w=", + cargoHash ? "sha256-gE3wrRI8TaiA6LNqyrpEuw8ALnprGjzWQduCckG1Eo0=", qcoro, }: mkKdeDerivation rec { diff --git a/pkgs/kde/gear/kalzium/default.nix b/pkgs/kde/gear/kalzium/default.nix index 39327304ac3f..7cdcd1efec63 100644 --- a/pkgs/kde/gear/kalzium/default.nix +++ b/pkgs/kde/gear/kalzium/default.nix @@ -1,6 +1,5 @@ { mkKdeDerivation, - fetchpatch, pkg-config, ocaml, eigen, @@ -11,15 +10,6 @@ mkKdeDerivation { pname = "kalzium"; - patches = [ - # Fix build with Qt 6.8 - # FIXME: remove in next major update - (fetchpatch { - url = "https://invent.kde.org/education/kalzium/-/commit/557d9bc96636f413430d0789cbf775915fc0dc45.patch"; - hash = "sha256-KDCT/COqk7OTuF8pN7qrRrIPRU4PSGm+efpCDGbtZwA="; - }) - ]; - # FIXME: look into how to make it find libfacile extraNativeBuildInputs = [ pkg-config diff --git a/pkgs/kde/gear/kdepim-addons/default.nix b/pkgs/kde/gear/kdepim-addons/default.nix index 8684233a9d42..f45370fc1426 100644 --- a/pkgs/kde/gear/kdepim-addons/default.nix +++ b/pkgs/kde/gear/kdepim-addons/default.nix @@ -8,7 +8,7 @@ corrosion, alpaka, # provided as callPackage input to enable easier overrides through overlays - cargoHash ? "sha256-t7izRAYjuCYA0YMZaCnvwbVo2UvfTTvdlYUd69T6w/Q=", + cargoHash ? "sha256-2t4i7lTJxVNjsU5eO6svadZBIerSyXt6BMScpEl119s=", }: mkKdeDerivation rec { pname = "kdepim-addons"; diff --git a/pkgs/kde/generated/sources/gear.json b/pkgs/kde/generated/sources/gear.json index 918e347772f2..700c006d6347 100644 --- a/pkgs/kde/generated/sources/gear.json +++ b/pkgs/kde/generated/sources/gear.json @@ -1,1252 +1,1252 @@ { "accessibility-inspector": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/accessibility-inspector-24.08.2.tar.xz", - "hash": "sha256-fE4pQDnVgVZE/d0F1lndMyWtYCjeFWiv4RDlcE2mMTg=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/accessibility-inspector-24.08.3.tar.xz", + "hash": "sha256-ikrsuKExq9w1hXSvKSiJmagDpdcFvUdQ3kcLqNkHhj4=" }, "akonadi": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/akonadi-24.08.2.tar.xz", - "hash": "sha256-iy8RPrxZACC8FNNiu4xksbi7q+XnPKC6O2NkCZnB99M=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/akonadi-24.08.3.tar.xz", + "hash": "sha256-lT4cVrjHdWgm7h7sqJHqOhlGZ7QywfX2xOoAxqD8Rms=" }, "akonadi-calendar": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/akonadi-calendar-24.08.2.tar.xz", - "hash": "sha256-xq01HIIOQKxpp8X2f98qfVQfdmnT1Xh0ZF9vhfdOv54=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/akonadi-calendar-24.08.3.tar.xz", + "hash": "sha256-UBOhptQzKHFKhsr6ixWlO2TExwMBSTouiV90PH+HPhk=" }, "akonadi-calendar-tools": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/akonadi-calendar-tools-24.08.2.tar.xz", - "hash": "sha256-aGp+tN/XYu+zB6TI4eBmjfbILN04T7tggMbJvVn5tcM=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/akonadi-calendar-tools-24.08.3.tar.xz", + "hash": "sha256-/nPs2U96d0STaIaEPZasraeECRphKsGMY74UTFLaDr8=" }, "akonadiconsole": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/akonadiconsole-24.08.2.tar.xz", - "hash": "sha256-ryud7MGLezBVtE/v8zUgpD+gHA9WrfjjioYVjb7Nbzo=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/akonadiconsole-24.08.3.tar.xz", + "hash": "sha256-urufCBS9ZdlP4rNPx8gi8jjwldO6GsnmvFKHEm4o2jg=" }, "akonadi-contacts": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/akonadi-contacts-24.08.2.tar.xz", - "hash": "sha256-6hrY06Ttbw0wkbFYeGnHvSm0MJXSvac+gsBC4RrDf8g=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/akonadi-contacts-24.08.3.tar.xz", + "hash": "sha256-eoKrHa74XPjS0g82n5mwj4eP0blwYdDyEH05Ai8FMco=" }, "akonadi-import-wizard": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/akonadi-import-wizard-24.08.2.tar.xz", - "hash": "sha256-rXGYsdfYZjEFxQpseTHKANFxE2hZqFLfMFw9mNmZkgQ=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/akonadi-import-wizard-24.08.3.tar.xz", + "hash": "sha256-EB8UKYWqdqd9g/JR8+1gm+PuqCemnmybQdUNANwaOGs=" }, "akonadi-mime": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/akonadi-mime-24.08.2.tar.xz", - "hash": "sha256-+9Lgk4WmC/pAn9hPADR/rIv4uZxpAgdwa60F1RVPId0=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/akonadi-mime-24.08.3.tar.xz", + "hash": "sha256-S3hE3erZj/Pmhbg15J2+p2AGY4knmyF2DJwjn208ePo=" }, "akonadi-notes": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/akonadi-notes-24.08.2.tar.xz", - "hash": "sha256-LcMOIkvqDztYXLcdbMCZdB3pvtuObj8G16nO+jSeD94=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/akonadi-notes-24.08.3.tar.xz", + "hash": "sha256-eHd7hGiXTmYDGknBY/6QhAW2fg8LrOAwf5Hw9CRv794=" }, "akonadi-search": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/akonadi-search-24.08.2.tar.xz", - "hash": "sha256-l21oZSW5zVyCfTNc0clkOvoNCdjx3amuWu72fviSnFw=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/akonadi-search-24.08.3.tar.xz", + "hash": "sha256-Y5mKH/aV876BZ7/mwmGeEXZfiSJIJS4Fp7zwor3pYGg=" }, "akregator": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/akregator-24.08.2.tar.xz", - "hash": "sha256-ZHuaCPtYNAL7KQwjTpkhxjQDT7YBwVXHqOV13hb9Wzs=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/akregator-24.08.3.tar.xz", + "hash": "sha256-eOb4cCubMr+ti6FnUavcrECshtx3Gl9rfpeQZ51c8Bs=" }, "alligator": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/alligator-24.08.2.tar.xz", - "hash": "sha256-U5w2J6oadXXKgR1nIV/I7qDpdcpohkV3DJHLXa1XMSg=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/alligator-24.08.3.tar.xz", + "hash": "sha256-VD8XpKJgQjeUkICbJqk93b56kk9zPKzzkb2OsbXuirA=" }, "analitza": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/analitza-24.08.2.tar.xz", - "hash": "sha256-EWID/f0+sSTOnzoeF59olHe8ODhFF3IByj9shW0Sxjo=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/analitza-24.08.3.tar.xz", + "hash": "sha256-nwtwY+pfXXwhMdSm3MzTJ10xpJaLpusJIKcMp/yQ1o4=" }, "angelfish": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/angelfish-24.08.2.tar.xz", - "hash": "sha256-SCrngjUJodD7egcqcoEG2ID1Q4JRVirzOdpFSKZUlks=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/angelfish-24.08.3.tar.xz", + "hash": "sha256-jh20relCN9mA/ILlPdZNGduZYwHVzfGn9gELKtj+rfQ=" }, "arianna": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/arianna-24.08.2.tar.xz", - "hash": "sha256-4HpVzGm5ndDtrIasInezV2EhcutA+y/xHMCgeDqzxDc=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/arianna-24.08.3.tar.xz", + "hash": "sha256-d2vSAS0NZlR8VxDhChzXTUsq2rq9/Dd+arsQ8g2xG3w=" }, "ark": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/ark-24.08.2.tar.xz", - "hash": "sha256-f98HTZhbufjFHZ/Bh1gPkeA+pxiMjsU2C9Mb1dwVuDw=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/ark-24.08.3.tar.xz", + "hash": "sha256-PGoQD7uFErj4kXJidGWMUc4Q+TGNTBTbsjgKLGAvMhs=" }, "artikulate": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/artikulate-24.08.2.tar.xz", - "hash": "sha256-l8gqgXHrns7WouW9BbWPEq+YJOFzletUwzNjUXmiUF0=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/artikulate-24.08.3.tar.xz", + "hash": "sha256-F5y9OYkvXchRMwEJXXkKFvNceVal0lrYQUlj2UPdjdI=" }, "audex": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/audex-24.08.2.tar.xz", - "hash": "sha256-eUkqCevK4BH1M8hvqamqmsxcaH77QTh6u9nAT/gfaAM=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/audex-24.08.3.tar.xz", + "hash": "sha256-3WBag9yPArnelb0m3q7DPkYqhu29obwm1s9PW+xiZZg=" }, "audiocd-kio": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/audiocd-kio-24.08.2.tar.xz", - "hash": "sha256-o5DueitrPoJwWcmDafXqJFA0I7rsycQ7vQYsAKZ785M=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/audiocd-kio-24.08.3.tar.xz", + "hash": "sha256-PigOXpnXBT4S4eZfaMfuc4i0H4VWlwn4pXNk/4+4588=" }, "audiotube": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/audiotube-24.08.2.tar.xz", - "hash": "sha256-NX5Yr9/A7xMMSgeSVYYdtyrsVAI7eUugzQ9mUkVdA98=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/audiotube-24.08.3.tar.xz", + "hash": "sha256-1OciNBLW8+lYzfaLEBqaHTAwOMuTHVlOZmOvcjcFRwc=" }, "baloo-widgets": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/baloo-widgets-24.08.2.tar.xz", - "hash": "sha256-szeiC0aByC6N1yIxP1e1iqc34tmEIKzBUSQlek0CY/4=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/baloo-widgets-24.08.3.tar.xz", + "hash": "sha256-eKVurIpI9FypqfZF+3C1G0s99qdQDMhEP0h0vGvJCd4=" }, "blinken": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/blinken-24.08.2.tar.xz", - "hash": "sha256-QDcvZsQKqCl58hG6PCuy7qtSRWyPz5uq2JwzMDHRFPc=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/blinken-24.08.3.tar.xz", + "hash": "sha256-BItKlEQqZ8p2oEEtsPbPf5YoxNWvxDhdfmxoEJrvrrY=" }, "bomber": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/bomber-24.08.2.tar.xz", - "hash": "sha256-phawZVBYIG8//Db0mTxV1gWDtlR+ZMoeI4Iwtp0vXaw=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/bomber-24.08.3.tar.xz", + "hash": "sha256-2sEpSqH49Cq6ibXPDBenkQTfr7p/XJFyNWfJBiWDRb8=" }, "bovo": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/bovo-24.08.2.tar.xz", - "hash": "sha256-kbAk70v9uXxwY3I2hwSS1KxCXUjIH1uIanZexEbHx6s=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/bovo-24.08.3.tar.xz", + "hash": "sha256-4x6+Kc1NRWCncf8tb6NofXIge1BQv4Agzbsrq0bG7Oc=" }, "calendarsupport": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/calendarsupport-24.08.2.tar.xz", - "hash": "sha256-brRVDcxD9FnbHygjd1fklXSF3wgigRgrKJ7vwg0Ya7U=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/calendarsupport-24.08.3.tar.xz", + "hash": "sha256-KldhJSpAEx1asGhGf4C+7Z0Scvs4UoMJZijkNvqBsLQ=" }, "calindori": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/calindori-24.08.2.tar.xz", - "hash": "sha256-9SFNyfA+S58KYXUozOXkr89pDPAEG/wEtQGJHV2ugz4=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/calindori-24.08.3.tar.xz", + "hash": "sha256-fadB1lggM7SMS3tyRVGcgPko73CO6Xbbuu+3aWRJcqE=" }, "cantor": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/cantor-24.08.2.tar.xz", - "hash": "sha256-CAxztAXKLYVJctCMHNvHVU6Z89MU43rm+e8ySagCvHg=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/cantor-24.08.3.tar.xz", + "hash": "sha256-ViH2WmIHApxWlOH89IsfG/euazg3fqH/ESP51A9FyUw=" }, "cervisia": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/cervisia-24.08.2.tar.xz", - "hash": "sha256-qTpkcgLCIJwKXDuwILtoEzGjOJS85g3+U4fOim5yJ+s=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/cervisia-24.08.3.tar.xz", + "hash": "sha256-NvYFCNEGtVy2zwxgIPOAybSUH1pdBv0oXud2vNMRuWk=" }, "colord-kde": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/colord-kde-24.08.2.tar.xz", - "hash": "sha256-f3WouENrUiPzsnkdlH3sPweZcZWkLdQ79o0Eo+z3B20=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/colord-kde-24.08.3.tar.xz", + "hash": "sha256-roleXP3D53v4ikgsA0p3SNAKTOfXTVIsuUtovodqAtI=" }, "dolphin": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/dolphin-24.08.2.tar.xz", - "hash": "sha256-VRUWJwditxpTUC5CyuIhBmQuElPiJyBjKoBSUENBRbE=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/dolphin-24.08.3.tar.xz", + "hash": "sha256-lbvOh2AZ+wx8xspKX9jsH2JfcP1RH+iD3xJEalKFgG0=" }, "dolphin-plugins": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/dolphin-plugins-24.08.2.tar.xz", - "hash": "sha256-aX7Ggt6w6PfU/BTo645s+0w8CWHY10tZRdPHr9AE6A8=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/dolphin-plugins-24.08.3.tar.xz", + "hash": "sha256-pnJZMSt27y9G8drTxf5LPsFjIlF9sU3keGHWUZvl1jA=" }, "dragon": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/dragon-24.08.2.tar.xz", - "hash": "sha256-3h+fPtM0R13uiJ8qxaiImlNgjZq6nywJD4jdNQrx5IM=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/dragon-24.08.3.tar.xz", + "hash": "sha256-JK8QrQTxGzaPu7kKLuf8y6yJ8BZsVLS7C1WUDWy3a0w=" }, "elisa": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/elisa-24.08.2.tar.xz", - "hash": "sha256-+eTurdf9lIbjOPE8nyXF19j7S5Y3uCjW/VJUgWoHp8k=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/elisa-24.08.3.tar.xz", + "hash": "sha256-m2rr824F/FaCE/VDegQxqEpZX0uokYm7XgVB1R7M29c=" }, "eventviews": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/eventviews-24.08.2.tar.xz", - "hash": "sha256-lVH7Tkh0kNv1tdmKOd/6vUo2omFW1iR7Ubf2DQXbBV8=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/eventviews-24.08.3.tar.xz", + "hash": "sha256-2jKC6BGbQH6bBrJvlwZI2EJOxmVbVWX7TEpr86lCfgM=" }, "falkon": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/falkon-24.08.2.tar.xz", - "hash": "sha256-19zRYVzuYjJVyBhFip2V6sDyDvzj8AOe76z0Yg6u80s=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/falkon-24.08.3.tar.xz", + "hash": "sha256-xUQP2jxZ+lk/9u32FNCAsF1lOh9D6DwzP25hCQiMm5c=" }, "ffmpegthumbs": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/ffmpegthumbs-24.08.2.tar.xz", - "hash": "sha256-sGrM3S/wBZ1s+hgNLrjX3ZWbmuyU0RY0vQhmkKBqxqw=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/ffmpegthumbs-24.08.3.tar.xz", + "hash": "sha256-GUU2DGjmc4gotxMPDXtbZOoSnt1YG76/ZlKW5KnDysQ=" }, "filelight": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/filelight-24.08.2.tar.xz", - "hash": "sha256-XpBM30Vz+luFeOQVfaNIrUbnKBmSv71q9ZyUMOFrqU4=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/filelight-24.08.3.tar.xz", + "hash": "sha256-kQ6msPGxZHS2NSPhw5BhKqw1gYVwXjeTaWDcI0u/zzc=" }, "francis": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/francis-24.08.2.tar.xz", - "hash": "sha256-a4zH84wk4UwueXpiKZ1HCZlls45yBVeOMgaBjHkiroA=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/francis-24.08.3.tar.xz", + "hash": "sha256-Q2ZDZICCXOYZYS5JpacFRt6lDtHkEL5lFS4p3uFYuhk=" }, "ghostwriter": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/ghostwriter-24.08.2.tar.xz", - "hash": "sha256-g+f/Nefc4DoSCt+pmLYDAYI1CwJqn+YCjQqWKRjncuc=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/ghostwriter-24.08.3.tar.xz", + "hash": "sha256-5eT9LaBSXoLTVWpPu07BRvQCJ7V4Z6HN+U9ufTZVV6M=" }, "granatier": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/granatier-24.08.2.tar.xz", - "hash": "sha256-zOraxrRmB9j5Y4q+tXrC/0uvj51QxkP3dLwfKGhl/P4=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/granatier-24.08.3.tar.xz", + "hash": "sha256-VFqcc7EDIJtKSIBF7OKUhl+lvT9UiQzq+Z0X8rwyJMM=" }, "grantlee-editor": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/grantlee-editor-24.08.2.tar.xz", - "hash": "sha256-GYbjU2UGuF+Vt3fUxbG56cPlvCBjn9U9NAhW6VxRXi0=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/grantlee-editor-24.08.3.tar.xz", + "hash": "sha256-OViwMRwfldeyRR49TFh/lnGPPFmTlv1fA2SqFgtgPCU=" }, "grantleetheme": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/grantleetheme-24.08.2.tar.xz", - "hash": "sha256-wAYB40gpVIHgM+RCjrSLi0H5gV6mjC1hYOK79UqTW0M=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/grantleetheme-24.08.3.tar.xz", + "hash": "sha256-l5JrjXEIMlOIBhW1RS/iDxevpYvdfXMJv1O9LgRbhuo=" }, "gwenview": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/gwenview-24.08.2.tar.xz", - "hash": "sha256-HVfcSbA05E21rtbijL3CHo43c7DctN52jk8R0duk7DI=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/gwenview-24.08.3.tar.xz", + "hash": "sha256-maUeVyrawmm/ky/JCyiXN2zAXm0i9TmjPD4Qwoerd0Y=" }, "incidenceeditor": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/incidenceeditor-24.08.2.tar.xz", - "hash": "sha256-l/67wkrUq2j84rQYbfuFCPVevs5q5NNmQy1bnRdU8XM=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/incidenceeditor-24.08.3.tar.xz", + "hash": "sha256-wsIGNENhan5KCwXO21jnESniYKrPWypCGclQc34dy4I=" }, "isoimagewriter": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/isoimagewriter-24.08.2.tar.xz", - "hash": "sha256-djuTSkr6lMw3Sc7q9vh8mdWTyWnvC3K50moICfKa4Ik=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/isoimagewriter-24.08.3.tar.xz", + "hash": "sha256-kaYuI94hSJA11TsJ7CLQLoSvBnaMt/qC26gVoFBoAkI=" }, "itinerary": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/itinerary-24.08.2.tar.xz", - "hash": "sha256-MOhnRn6nnE7bTg34zdHhWj40bPF8qwEROotJfGa6NgQ=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/itinerary-24.08.3.tar.xz", + "hash": "sha256-Im8xyIfu09wQX1ApVmnBOsAY0bJ1h6ByKEccDUkTx18=" }, "juk": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/juk-24.08.2.tar.xz", - "hash": "sha256-RZB9GRHIOoVvS/uCBV/v5Q9P+4jpVnEP+gDMXlv9K/w=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/juk-24.08.3.tar.xz", + "hash": "sha256-NFq0AnJgBPJxdd2bbyK3IjTvvkfr6iN0FVBgbGzoLKo=" }, "k3b": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/k3b-24.08.2.tar.xz", - "hash": "sha256-rqgd0ZQsxoPHIulrM6x95YCZ/iTiI0SCcsFI9LiASm8=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/k3b-24.08.3.tar.xz", + "hash": "sha256-vJfDSvshOMofwlvV+nnnfRyi2+FFMyMXFZ7xr7yiwZ8=" }, "kaccounts-integration": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kaccounts-integration-24.08.2.tar.xz", - "hash": "sha256-Vs40NNILzIlnOCL3uUn1DzL8dTjuckL7l2KFVMksjxY=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kaccounts-integration-24.08.3.tar.xz", + "hash": "sha256-dq/JckZ3w0FajIa7+IDAj/rHhWLQ9fLGr9DOhyQv48Y=" }, "kaccounts-providers": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kaccounts-providers-24.08.2.tar.xz", - "hash": "sha256-FSgFjcyS+FTjHyf9bIaoLqXfNLw7erlC1p/wrH8A2EM=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kaccounts-providers-24.08.3.tar.xz", + "hash": "sha256-r2EhrEdggNeGqQu5XXDsyLN1Bpbc0hV/05sIlh4iEOQ=" }, "kaddressbook": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kaddressbook-24.08.2.tar.xz", - "hash": "sha256-Sb5L6wgDxqkrlGci+LHBqEJalxLOzEv9AyB6NRdCwU0=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kaddressbook-24.08.3.tar.xz", + "hash": "sha256-qUqRurguf6EViWXqcRx3i2Nw6Iu4yv5y1fhAky4T5Nc=" }, "kajongg": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kajongg-24.08.2.tar.xz", - "hash": "sha256-A3yvvln97eZBmjWRwgNdWjz0KXOLe9gctDIJZXu62Zs=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kajongg-24.08.3.tar.xz", + "hash": "sha256-G1xhRJ5KG7xWYSqgKPi0pzVPESNaCSW66tJOq1TDMuE=" }, "kalarm": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kalarm-24.08.2.tar.xz", - "hash": "sha256-oe6wl0PTtQVUSJRGYoAbtpNXO4CXjGBQzrspvVeZSgI=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kalarm-24.08.3.tar.xz", + "hash": "sha256-4hKVMnS6rK4hmFvjMt01HzcFEFAiPf4/s0S4VXtcD2M=" }, "kalgebra": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kalgebra-24.08.2.tar.xz", - "hash": "sha256-tWCwZESHZQci405yh08c7x8h7EEJ5LLyKUQOpvAxFQ8=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kalgebra-24.08.3.tar.xz", + "hash": "sha256-RA9YwyNIkGFOsEzIXEnMDEMVeKKAX8G+lNaGb9cBVdU=" }, "kalk": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kalk-24.08.2.tar.xz", - "hash": "sha256-ZlfBKmcXhHt4+w56D2agfT+ULwljU3TUwKSk4ADMWs8=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kalk-24.08.3.tar.xz", + "hash": "sha256-N6io/ll2RnAMCcN5OC8I8upudVITGBwBIMMFkYedLRg=" }, "kalm": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kalm-24.08.2.tar.xz", - "hash": "sha256-JquhkpaPF2xMyDJkHs+C1B5a7tZ5AGhfAM9VdtaTYso=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kalm-24.08.3.tar.xz", + "hash": "sha256-4cQ/8pPhH5Lkt3luSo+iqCwHtRSmAyR4VewMk7dZFRU=" }, "kalzium": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kalzium-24.08.2.tar.xz", - "hash": "sha256-m4yO8wMzwjqym7m849cyTPndGjavSB0ybSx7YySys1c=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kalzium-24.08.3.tar.xz", + "hash": "sha256-KAtY1MbdpzFjDtdtxKM+pCc35TTzKw2UtzqkrLcqxIM=" }, "kamera": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kamera-24.08.2.tar.xz", - "hash": "sha256-5OHPBtCyiyvZV1FKRXrn6kid6ZwTV20kBa32ouIHErU=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kamera-24.08.3.tar.xz", + "hash": "sha256-t5mSc4ifJ06xr/imng8eXzQsGuN7vUqYG9ie3FKYghw=" }, "kamoso": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kamoso-24.08.2.tar.xz", - "hash": "sha256-UuCqnIRSMlkyeAvnDf2uWeJTvSf+OsnjubGaMuAtl38=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kamoso-24.08.3.tar.xz", + "hash": "sha256-9/AwDp6OjfNFPeWm2eAJ1KZppwJVpjiY9cCaasCZa7A=" }, "kanagram": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kanagram-24.08.2.tar.xz", - "hash": "sha256-9hxsb6MJ1Tdy/n5RwtFfzqFT35pH3I6y2A2tiGEeuGI=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kanagram-24.08.3.tar.xz", + "hash": "sha256-l+YMa+ebiINqDyIU8o6Mobe3NBWoJE64BDgeFILYtPs=" }, "kapman": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kapman-24.08.2.tar.xz", - "hash": "sha256-cjhosHjMMQe+qFpdNBsC+ZarXI8dW3XPkIwmf9EG5U4=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kapman-24.08.3.tar.xz", + "hash": "sha256-bhejgqZQKMdjGpcTzK1iu4BW/1pQmo/Js8VdKOVG+Y8=" }, "kapptemplate": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kapptemplate-24.08.2.tar.xz", - "hash": "sha256-TSsO+Z7VkBHuurVDUBljNUYwwbT47AmZ8khs/lVy0Ho=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kapptemplate-24.08.3.tar.xz", + "hash": "sha256-QF5fj5/lMiR16oQz03Ou1ey0Mc7SU5s3qpbf5tu3j4g=" }, "kasts": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kasts-24.08.2.tar.xz", - "hash": "sha256-Vkbz8IkfSYR71Dfgd/4X4Nmb5S7NqedftLveCHicdOM=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kasts-24.08.3.tar.xz", + "hash": "sha256-GFOh83hyg24llvRA8FM6meLYytaTsa1fJSJm56as/HY=" }, "kate": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kate-24.08.2.tar.xz", - "hash": "sha256-2Ft1MYiV3KL0DpbuWOkemmAS81h+Itfz4P4Tvv+uymw=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kate-24.08.3.tar.xz", + "hash": "sha256-zLZWQ178H94K5MLZNACiwFZgvymeZBFxS5BCQixQ1PI=" }, "katomic": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/katomic-24.08.2.tar.xz", - "hash": "sha256-5oCtP652mvujZIB77D/KfyDZEGd9kCnx7MnWXTcmYE0=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/katomic-24.08.3.tar.xz", + "hash": "sha256-niVrZCF+R1fYxOVgSyAtBzmec6DVntgZtTCwlvXgEFE=" }, "kbackup": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kbackup-24.08.2.tar.xz", - "hash": "sha256-hxRC7eTkR+xRDb6ki1mDna2SFCEXdnXq1FClRbCvKCE=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kbackup-24.08.3.tar.xz", + "hash": "sha256-n/D5/rj/8tBaLel4t7qyS95sXaliG2SW6R1pMVLjL40=" }, "kblackbox": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kblackbox-24.08.2.tar.xz", - "hash": "sha256-X+KB7aM4lOpHCH+6YcP9o7RDHnP1qkd7SNkjstpUYr8=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kblackbox-24.08.3.tar.xz", + "hash": "sha256-wVCeOV4tKmSOfyyaYwKwLV8uQzb+NQ46ET7wQoK8Vlk=" }, "kblocks": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kblocks-24.08.2.tar.xz", - "hash": "sha256-pv6IWSnaJM3LL8V4ZuZOZnqRKkZQ9/rbUW1J6ns1KKw=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kblocks-24.08.3.tar.xz", + "hash": "sha256-nZJIP93dVkmBCv7hU325JwzFwBQgdGC/1L95G1huhhw=" }, "kbounce": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kbounce-24.08.2.tar.xz", - "hash": "sha256-EMvWygDfil41cUUm0qlEmIOokvdZ0msYL4PhN+pbIdE=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kbounce-24.08.3.tar.xz", + "hash": "sha256-yiXGShSBg/afGvzOdVG3Ore7ubIz4S9ESPY6o6qdKts=" }, "kbreakout": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kbreakout-24.08.2.tar.xz", - "hash": "sha256-0VJCGDbWOiQJiu/WqimEFeStSbj92KXc3HXfMC5vdG4=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kbreakout-24.08.3.tar.xz", + "hash": "sha256-0lWebRFeCM4sCqoVBMLZhuLNMwguC98skSaSjoEBX9A=" }, "kbruch": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kbruch-24.08.2.tar.xz", - "hash": "sha256-I9KH/azP7/qf47GUmMTbhRyZd8qqwVI5qoYQRA1AFlw=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kbruch-24.08.3.tar.xz", + "hash": "sha256-N0kAWFGoeBmQRxXmi+19vXFI0vIZn7bdizTBR6AvTYg=" }, "kcachegrind": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kcachegrind-24.08.2.tar.xz", - "hash": "sha256-h64CpqnNrtXPlSbtQFtZusxdaHFxX5HQwi0iLVyEdfQ=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kcachegrind-24.08.3.tar.xz", + "hash": "sha256-b1GmDkSFWxd8TXly47VgGBwHS6V1LqQnWWJOA/u/Lhs=" }, "kcalc": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kcalc-24.08.2.tar.xz", - "hash": "sha256-DyD/62b4XyqRv3RTaO/pQ8XjKsA8Rem34SSv4OSU/Uk=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kcalc-24.08.3.tar.xz", + "hash": "sha256-fsOZmdsy8uc3D2nhgOp9AkEMjhP6vFR1XAmOt0eLBCA=" }, "kcalutils": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kcalutils-24.08.2.tar.xz", - "hash": "sha256-/4Z0PJJoowu/mYYNG49luhb8QNkmLXWs8HAu+8VfZww=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kcalutils-24.08.3.tar.xz", + "hash": "sha256-dofOLjEh0cOZ7F2bPaIsiUzQdAy/ziMs4uKy0s5j2CA=" }, "kcharselect": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kcharselect-24.08.2.tar.xz", - "hash": "sha256-iZ6Vb+s8HmLTWixAIEM5k0FuKKcWAOfJfvYn9I5ss4o=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kcharselect-24.08.3.tar.xz", + "hash": "sha256-J1o3Pc6Dz54oGI5urQ2/he9yihZ8QYtCVQMJeH+7X5s=" }, "kclock": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kclock-24.08.2.tar.xz", - "hash": "sha256-vE/mn8oWtQcly5W0cRzBshz4xfAjv3TZ1/AltcaW9ig=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kclock-24.08.3.tar.xz", + "hash": "sha256-ZGdRhoYbINKhcbMFzNX9yaYRcc0lTbrZ4O2VP86OLJ8=" }, "kcolorchooser": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kcolorchooser-24.08.2.tar.xz", - "hash": "sha256-pjtX2K5XH49WvHZWjdarDFOCzYdkuA7+ie/OGUNJ08s=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kcolorchooser-24.08.3.tar.xz", + "hash": "sha256-l2O//RqSAUpueQdHEA4iEOghUZt+ugslZMObSf8WQTI=" }, "kcron": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kcron-24.08.2.tar.xz", - "hash": "sha256-hl1G8QYcVnpQ9VmrevH6/Sw/7bOsKJKTZwNVBv8K5tA=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kcron-24.08.3.tar.xz", + "hash": "sha256-XPQ6r17L90bVGawXKeE/WjDzh7eiYCjoQR05HVZxRds=" }, "kdebugsettings": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kdebugsettings-24.08.2.tar.xz", - "hash": "sha256-bu5AlIpmx9xrQii3TfrS7qfaPf4236Kj3GCwKANeyOg=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kdebugsettings-24.08.3.tar.xz", + "hash": "sha256-TvfMBjUONtubiwm1EuJVn35bPMSJsXFf9BIHsRwogcg=" }, "kdeconnect-kde": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kdeconnect-kde-24.08.2.tar.xz", - "hash": "sha256-1xeNlrRF72YJI/MFqQ/GrszK5AScyZo57mwXrAv1HGk=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kdeconnect-kde-24.08.3.tar.xz", + "hash": "sha256-EOBeib2qAikdi20H7Br5AECofsK8Ab+WpoyKEUNP/2g=" }, "kde-dev-scripts": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kde-dev-scripts-24.08.2.tar.xz", - "hash": "sha256-B0IgBO4xUkQ/z/LUncul58uavGKNbwLhZaSAHMROc7o=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kde-dev-scripts-24.08.3.tar.xz", + "hash": "sha256-VH/7Tp8HFTB1BcffHveFJvrFQ9/pJ89sY/VQLui859g=" }, "kde-dev-utils": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kde-dev-utils-24.08.2.tar.xz", - "hash": "sha256-MY5Gn1LAaoasGo8DRZhSJLUTZk0Ra/77k/TejdDdg8g=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kde-dev-utils-24.08.3.tar.xz", + "hash": "sha256-nWu753flast8jBKbKKkYWvV5vN+LeZ6v5amk/WA0M+Q=" }, "kdeedu-data": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kdeedu-data-24.08.2.tar.xz", - "hash": "sha256-XNf2MDYGKALxk147hXRMYSALKi3CL01JQD+czh+qj1o=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kdeedu-data-24.08.3.tar.xz", + "hash": "sha256-HOF+tOcHDT/6fPquzS2XscUr3zw5GH2ID3CPby/6oo8=" }, "kdegraphics-mobipocket": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kdegraphics-mobipocket-24.08.2.tar.xz", - "hash": "sha256-Vr/d8kznRVE9bfLClfEZ3mhwmB68z40GoQZoIu1/OZU=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kdegraphics-mobipocket-24.08.3.tar.xz", + "hash": "sha256-7k6VmqbZdTs+cVuY2pIlHaQWIeOH/gZTHwpvrQV/o0o=" }, "kdegraphics-thumbnailers": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kdegraphics-thumbnailers-24.08.2.tar.xz", - "hash": "sha256-1SBgDqNVa6IRH/TlzRWHSJpUy05t0aXmJriZwpKeGgs=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kdegraphics-thumbnailers-24.08.3.tar.xz", + "hash": "sha256-tadDr5G6LOp3zetVFLFnu6aV02isLyN4WOGgdXnHO1g=" }, "kde-inotify-survey": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kde-inotify-survey-24.08.2.tar.xz", - "hash": "sha256-w470km+siTY+Gn22H/Ofi/dzbtQJoFj+wOUt1rCEoLM=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kde-inotify-survey-24.08.3.tar.xz", + "hash": "sha256-t9lW4bD459WTOTGBJVse2cYOwvChyIsem2wFcPdQtTo=" }, "kdenetwork-filesharing": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kdenetwork-filesharing-24.08.2.tar.xz", - "hash": "sha256-elaWVNVNgwbH7GIA4JKxoD+LGnPPS3ylQ1RKx7jUTGU=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kdenetwork-filesharing-24.08.3.tar.xz", + "hash": "sha256-Tmkr7bYLRsOCCG4CEjJbhgZZPAefFnm4ui+dQ9xMXU4=" }, "kdenlive": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kdenlive-24.08.2.tar.xz", - "hash": "sha256-FVZonukudpc1tZG79ntBhnGBD+7tCepWXpyKAL2/j7c=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kdenlive-24.08.3.tar.xz", + "hash": "sha256-thtgxTu9Flf+gWuzwIlU97n3x2pi0Jn6vTzZGQo7s50=" }, "kdepim-addons": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kdepim-addons-24.08.2.tar.xz", - "hash": "sha256-zkUIDKMo/ysCDPjh17CSSg19xIMBEbyUgUHB4lavqRI=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kdepim-addons-24.08.3.tar.xz", + "hash": "sha256-DbIDPDxnN2bDJnORtSiSDH7PZr8gM6imnG60/KWxpUk=" }, "kdepim-runtime": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kdepim-runtime-24.08.2.tar.xz", - "hash": "sha256-JA4T/FBvA1csCMDyl/TPJtMTpGfhc8/kCLLSnsbu8Pk=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kdepim-runtime-24.08.3.tar.xz", + "hash": "sha256-bEGbV1+Hts9iul2gasKELoBagLmRi5KzfPu6Qob83m8=" }, "kdesdk-kio": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kdesdk-kio-24.08.2.tar.xz", - "hash": "sha256-072EF549k2FZ3t+psVaGvY0/8Y7V/mZg4PON9tDXI6E=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kdesdk-kio-24.08.3.tar.xz", + "hash": "sha256-T7MAV9eVkrjD5BdAMTUItt2YTv+7rrVoE7Oqr1TZUvc=" }, "kdesdk-thumbnailers": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kdesdk-thumbnailers-24.08.2.tar.xz", - "hash": "sha256-f8rNnHRu2fcwKBZ9jEIhvGc29HQB2ofzvoO1+G1kj9o=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kdesdk-thumbnailers-24.08.3.tar.xz", + "hash": "sha256-t+tEx/wnARSDaVmwWCBWh6VKM61+XOM6uQ+x+W0aLfM=" }, "kdevelop": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kdevelop-24.08.2.tar.xz", - "hash": "sha256-Pfw4jzWYoZPWlVVEb5F/RBgeAt6jgA/w5qC56AgdCgw=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kdevelop-24.08.3.tar.xz", + "hash": "sha256-oWkMlnLggGRRDk2cQiohS20RpUzqVlbinJRFcBr0z3E=" }, "kdev-php": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kdev-php-24.08.2.tar.xz", - "hash": "sha256-Yqu92NqkVMjq3DnDC+DdnT6hkD0BPfsoc8x8eL07dcU=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kdev-php-24.08.3.tar.xz", + "hash": "sha256-kicd/IWUD0N7UiLsVg3O1xZzXxQwLtFEo3Jg20BW6LY=" }, "kdev-python": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kdev-python-24.08.2.tar.xz", - "hash": "sha256-3i87y9312GpnLHgj50Ac83kmWHWGcQRkERdiDRoUk60=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kdev-python-24.08.3.tar.xz", + "hash": "sha256-BWRMMAML/VHLVB+APwWkIBTLXt+f9evCOFghGs4N3MI=" }, "kdf": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kdf-24.08.2.tar.xz", - "hash": "sha256-/H5SFpxijru+cdtu0PM5WmbLoPKQO4Y4IkWH9IoIYec=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kdf-24.08.3.tar.xz", + "hash": "sha256-tevZjeAKkeJpDhy6olihgi2EKQRvfCUuzPnnlwWGjso=" }, "kdialog": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kdialog-24.08.2.tar.xz", - "hash": "sha256-FtrMEHqOiqdTfptR3a3X2RtaxHYOVRexplrcmnP6fIA=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kdialog-24.08.3.tar.xz", + "hash": "sha256-eBoum0VlY/BtmiwNP+rFTxVra40NGAlKorehy0V5b8M=" }, "kdiamond": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kdiamond-24.08.2.tar.xz", - "hash": "sha256-ijJ/XtNhKu2HB0yidl7u0QWE/TiD9R/9zX4DDuob6qY=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kdiamond-24.08.3.tar.xz", + "hash": "sha256-RRYTTaF73OyHfZELiZt+vuQLqW2H5YY0lWrqlKa2aK8=" }, "keditbookmarks": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/keditbookmarks-24.08.2.tar.xz", - "hash": "sha256-0sgvXfWAHsbfE40QRg6U7Dg+79O1dZ7LY0QtkuQDwAU=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/keditbookmarks-24.08.3.tar.xz", + "hash": "sha256-BjRlRPmHer9sInI/Nv7RLlMEJWj6+5DUel5OjsgqwqE=" }, "keysmith": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/keysmith-24.08.2.tar.xz", - "hash": "sha256-TZCj+9bbc/YtMjiDE9HKIrFxM7UiS+3zGL2ZVMIeIVs=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/keysmith-24.08.3.tar.xz", + "hash": "sha256-aXsnHd2zRWfkv7iL3MxAd/+4VRzoELFyYxV4/ZBtp7k=" }, "kfind": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kfind-24.08.2.tar.xz", - "hash": "sha256-kgZyhADD7d4ho7w9sE9/cyVYj9atPHjeOxBeP6P1REU=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kfind-24.08.3.tar.xz", + "hash": "sha256-km7kNllo1XcAzXXComV2pCNYqBVI97ap81vT990JeUM=" }, "kfourinline": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kfourinline-24.08.2.tar.xz", - "hash": "sha256-9e1XGGOG4ZaKa/eVdpzJx4wPVuMAHJqmybHZjXqjTKI=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kfourinline-24.08.3.tar.xz", + "hash": "sha256-WUqlmEGwomWWJcxviWi1puzmcgwSGbNP6APfjhC0ZzQ=" }, "kgeography": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kgeography-24.08.2.tar.xz", - "hash": "sha256-8dx1e9iIDufFxOaelDVWry6FR1s7GGnNdOm6agS+pKI=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kgeography-24.08.3.tar.xz", + "hash": "sha256-zaGiscWjmQlobuybt4tM0icYTQJuhhd2dIca6GVRxjY=" }, "kget": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kget-24.08.2.tar.xz", - "hash": "sha256-aQw0IeOLNz6CVzCoMKiBOSwXGfB4zsEh1oYgqn7Sc4s=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kget-24.08.3.tar.xz", + "hash": "sha256-7IBCjXbtObp8YWRQUudHq6QRThVp7V1LW/HnaGZ32IA=" }, "kgoldrunner": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kgoldrunner-24.08.2.tar.xz", - "hash": "sha256-BZ0vTWG7jDVA2AwCHh//VWwT0+B75yDRZ61kbyE7rEY=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kgoldrunner-24.08.3.tar.xz", + "hash": "sha256-DORIMWh28mqh9ZtNqt57BCoRvIfqPSMK8fnD0K7g6G8=" }, "kgpg": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kgpg-24.08.2.tar.xz", - "hash": "sha256-CEtAQ/89tflnXDmSo2tp3bPGjp7G8HVT/Mz+40iY8ww=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kgpg-24.08.3.tar.xz", + "hash": "sha256-kLFLiBTDUYQ1yRmYrKF73ifBC/FMlOYhjhKruAuKaOo=" }, "kgraphviewer": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kgraphviewer-24.08.2.tar.xz", - "hash": "sha256-lMg+REm/0cFOVrEX/0NdF6C64Eg0VAU1kHnv3wps3JM=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kgraphviewer-24.08.3.tar.xz", + "hash": "sha256-IrgYex2hit2HCMgR02KQ/w0UQjgQe0tRjSUA7mPCdkc=" }, "khangman": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/khangman-24.08.2.tar.xz", - "hash": "sha256-m9bXQ3NbrENOON+Q9b6FbQRxg6SUx2tlxKiB70Puu+o=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/khangman-24.08.3.tar.xz", + "hash": "sha256-re3ADkcnULCkOX1bq99XhxkBCY+ZjQRlc6l17ZXu/IQ=" }, "khealthcertificate": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/khealthcertificate-24.08.2.tar.xz", - "hash": "sha256-g0Lr8zupMlyFLKyVPS9fB1Mo27E/BNy8507Xyfo7Z70=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/khealthcertificate-24.08.3.tar.xz", + "hash": "sha256-NuffNA4ZvaLEzy2cQw4DJh0E38E4wEKldB8Uvs1iI+c=" }, "khelpcenter": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/khelpcenter-24.08.2.tar.xz", - "hash": "sha256-ZYzPiHsHHWnl6y5k3poLMrJj/7Mf45zKlJvUXpvai4Q=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/khelpcenter-24.08.3.tar.xz", + "hash": "sha256-YLt1iVIVB81UMNaCyctcQQLOPYRIjZgJdeY2wu2+hsI=" }, "kidentitymanagement": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kidentitymanagement-24.08.2.tar.xz", - "hash": "sha256-UKbggnbv1eaNJYLB2j+Mjh3aTMRzrP9IRf7AJ9yj9xU=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kidentitymanagement-24.08.3.tar.xz", + "hash": "sha256-judaWpDrdARnSXBKbCTz/xSuQSiv6Qke24toq0hfg00=" }, "kig": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kig-24.08.2.tar.xz", - "hash": "sha256-oNpiWtSK8ipxfEdXQPRCE8mCLMJJKPUWQ7GvLKdbOqk=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kig-24.08.3.tar.xz", + "hash": "sha256-yO7QkHaqCy8eBxKpCI9KpNCQGPJ0MGwsV1QCS96jzzg=" }, "kigo": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kigo-24.08.2.tar.xz", - "hash": "sha256-kxzRX+w1jIC/g1bKoNaTDZI75B3SvNLab4MsM51uPa0=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kigo-24.08.3.tar.xz", + "hash": "sha256-P0bgPd6dp01kHHIs75/F153m26G+rGLloJPYQhH1R5k=" }, "killbots": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/killbots-24.08.2.tar.xz", - "hash": "sha256-k/nu5nE+ieaLElKi2xeLuMpzaZFDPLy/XMHUG9wEot0=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/killbots-24.08.3.tar.xz", + "hash": "sha256-OllWrbpBcE30BHXvvmD0L0czzju5b5YY/ZDEOsCbCzA=" }, "kimagemapeditor": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kimagemapeditor-24.08.2.tar.xz", - "hash": "sha256-r1twJIsYbBxa65hiX2wzJeMqHFKSoI2w8Z6pXExEjOg=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kimagemapeditor-24.08.3.tar.xz", + "hash": "sha256-8opYtviM5Ju0hIhcftLnZg6P1ZO6bJHB30YjDTN+F8Q=" }, "kimap": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kimap-24.08.2.tar.xz", - "hash": "sha256-q93DHzE4LiESTQ0EgRgoiTQ7c7kxjcEgQ+1euq+edTU=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kimap-24.08.3.tar.xz", + "hash": "sha256-8pGbTQl+Ez/9dKkm9vI7HMioDzaJDr4nDftkDZiNOH8=" }, "kio-admin": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kio-admin-24.08.2.tar.xz", - "hash": "sha256-9+BSkZmhYaaz0ynwN7AUhulZxe6De53rhdDHzx8YcmM=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kio-admin-24.08.3.tar.xz", + "hash": "sha256-DnG+/5CBX2++usNrNoVQ+6WR56am2lBG+uCb80HkNHI=" }, "kio-extras": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kio-extras-24.08.2.tar.xz", - "hash": "sha256-mab1SMeqwYAX6+K3OsmTJ/JYW0GCV7wcfgZc7YK9LMc=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kio-extras-24.08.3.tar.xz", + "hash": "sha256-9BdXF+Lypccwui9ycRPoEQw6KDxfZ2A9NpwqP1YaaKo=" }, "kio-gdrive": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kio-gdrive-24.08.2.tar.xz", - "hash": "sha256-0/qmsTsjiL729aiu2blyKg9q/oC6s8nmWwSnB0xL2v4=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kio-gdrive-24.08.3.tar.xz", + "hash": "sha256-+GMMjTjzBwc2lphXRTDe4mvnknQJ5aVv+jfVmzTt5e0=" }, "kio-zeroconf": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kio-zeroconf-24.08.2.tar.xz", - "hash": "sha256-Cv68ADR4ybvVUcSwk5kHx//w7epXkA0hqj1w+AO/6oU=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kio-zeroconf-24.08.3.tar.xz", + "hash": "sha256-zWKCD2yPwa1ZyHYSrPoHYsL/AuaZp+7JO37+IoKnoIQ=" }, "kirigami-gallery": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kirigami-gallery-24.08.2.tar.xz", - "hash": "sha256-iESLnXKQaz9qUgmeA7ZX0PIBBoEoFo1VDHM2w1uXX0w=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kirigami-gallery-24.08.3.tar.xz", + "hash": "sha256-USD7vpAZkhBduNXQ2rt2KX94YSKocA3BYEH34gzBfdg=" }, "kiriki": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kiriki-24.08.2.tar.xz", - "hash": "sha256-NROQyN1YPX6+bXhk0lJf778qGV7BTdqzi72pAqTw+5k=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kiriki-24.08.3.tar.xz", + "hash": "sha256-CjWYO7yDaQuNQVIzvJawTfTwLgQSIaKlaab6Ut5dR3c=" }, "kiten": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kiten-24.08.2.tar.xz", - "hash": "sha256-T2MDF8rJH7bTX3epmHMKK7+dKmhL5t7VU9mrqFpcEes=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kiten-24.08.3.tar.xz", + "hash": "sha256-QoMfFjzabHdT4j7vtt48Nt5m69jrMVAIrHFarEoeIyA=" }, "kitinerary": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kitinerary-24.08.2.tar.xz", - "hash": "sha256-bzyMInh90qk5OC4qQrcczczW8j/KTDHrIIDn2sWFJck=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kitinerary-24.08.3.tar.xz", + "hash": "sha256-8P9NEDyT4kdw2UQyr9Cs9FbvynDgDUdJ1zSl/5jP0Us=" }, "kjournald": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kjournald-24.08.2.tar.xz", - "hash": "sha256-+ynx9UmyxWBuM8Nvt3U7gITn5PmFNkfreddfujHZqlE=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kjournald-24.08.3.tar.xz", + "hash": "sha256-r3UIG9rrG8ODQBhi3o2wKYHnr03BlCyXdo9j/L/FDBs=" }, "kjumpingcube": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kjumpingcube-24.08.2.tar.xz", - "hash": "sha256-RCQ3DCAyCjCDZIyAogMXOFNQLr3JvnXvpjTatIugpOw=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kjumpingcube-24.08.3.tar.xz", + "hash": "sha256-o8SUexZqX7GUgsYQxCkd1hH08D8v4E8+rBXnw4IF2UU=" }, "kldap": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kldap-24.08.2.tar.xz", - "hash": "sha256-gjpCxxdpl9m4/b8xQJFs9KikON5322jH6hAx0Muk/us=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kldap-24.08.3.tar.xz", + "hash": "sha256-HgBc6Ber2HUosl5dd2N+N5L8LyLX2FzAS8C1lnoIJow=" }, "kleopatra": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kleopatra-24.08.2.tar.xz", - "hash": "sha256-hgPbehv8Rsi+1diYh9XbVEk923iUH9qgPBIa1pSyw5U=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kleopatra-24.08.3.tar.xz", + "hash": "sha256-Ts7GqwKG3ElXWoeI8jQEVPjs3/14AhQ3OdNqvhKZbxo=" }, "klettres": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/klettres-24.08.2.tar.xz", - "hash": "sha256-ZdHQfMFj0MAvw6aOSrizZZDYmQ3JoQoHsdIm35qZszE=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/klettres-24.08.3.tar.xz", + "hash": "sha256-+qQwJ0tYlczTxRO5niYFwKi8RQ/Qucy4lTFSl8YKHp4=" }, "klickety": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/klickety-24.08.2.tar.xz", - "hash": "sha256-Si36hCgOwRWeDXN0Q6xjhG4eDcYIX5/X+HbaeBM/vhY=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/klickety-24.08.3.tar.xz", + "hash": "sha256-ItY3y7IuzFBB9wj5VPBSbBTj6Y8ThoUVJya7T/5ZNAI=" }, "klines": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/klines-24.08.2.tar.xz", - "hash": "sha256-GMQLh5yv+QKWfHLgtpO7xnFUimOQXXK0RKprUqS539w=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/klines-24.08.3.tar.xz", + "hash": "sha256-IzREToGJzTBGogKzUVK37pp7vmeYm0o3bbwVN7KneOM=" }, "kmag": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kmag-24.08.2.tar.xz", - "hash": "sha256-FXPLvIrXR6LHHx8bu8we3pxsabkEnpelM/jK/HrN5HY=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kmag-24.08.3.tar.xz", + "hash": "sha256-ae5hNby9eNIm2V3t0dC4ZpWX2PlBTeg/zEFnNNaGnsY=" }, "kmahjongg": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kmahjongg-24.08.2.tar.xz", - "hash": "sha256-vKnxozJamIxLLu1KWUZjWEyUUXHTrfXzRDBdhObt62A=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kmahjongg-24.08.3.tar.xz", + "hash": "sha256-HZFcM41OvIMNhWXSq/NvIy8CNnL9yprHPBirVnX7hlk=" }, "kmail": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kmail-24.08.2.tar.xz", - "hash": "sha256-JpaEbLE9yDRdlkidTtGD3kkyj74jOloVVfS5CFHOY4k=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kmail-24.08.3.tar.xz", + "hash": "sha256-VmIar1YuS0U6qyYxgDdu4gqZZK1XSys8HTbkKGBBRio=" }, "kmail-account-wizard": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kmail-account-wizard-24.08.2.tar.xz", - "hash": "sha256-bvJ85SRmU3euCCqgx/Y3WJT2AaMhwXRej5qmgbp3pDk=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kmail-account-wizard-24.08.3.tar.xz", + "hash": "sha256-TpXWYUQ8m6SSgE2o0e9M4KRzPpxnEpnO6pN8VXZFhSE=" }, "kmailtransport": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kmailtransport-24.08.2.tar.xz", - "hash": "sha256-9f3gtgXNis+XADBqQGe0Bd86okDcyNBpRoX+icNknWM=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kmailtransport-24.08.3.tar.xz", + "hash": "sha256-uxr6At9Ed1Pu1EAmqpDDE9QkAWRK0QMsbJE3GpE2Lmk=" }, "kmbox": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kmbox-24.08.2.tar.xz", - "hash": "sha256-dN6qSzL+PAII8RUpgnnEwtI2+nV3QUnBskDLAx23bN0=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kmbox-24.08.3.tar.xz", + "hash": "sha256-Qq5ZGqMm+omcgNvXjrdAK6tlEco6R27X6cC/6B3jUSs=" }, "kmime": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kmime-24.08.2.tar.xz", - "hash": "sha256-Ahj+H6XvAxik6O9igR2qCu3vFeu+ANMarlNYW0VspmE=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kmime-24.08.3.tar.xz", + "hash": "sha256-F/IfPNOpT9Pgp0HlMgwU0vjbTFazkRHDL3sMNoFDfEc=" }, "kmines": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kmines-24.08.2.tar.xz", - "hash": "sha256-C6GK0MrBsXTOfiIum0ara4+nlPoUMYTq0KKTBKMm73Q=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kmines-24.08.3.tar.xz", + "hash": "sha256-eS44yUvBCp3FsgVbIGvYEfDVQXt/lVpOujeuJeacMbo=" }, "kmix": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kmix-24.08.2.tar.xz", - "hash": "sha256-gxQ0bqFj5AQIY5abO49MdL5PrH3WvJsNz70F3Po4i/w=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kmix-24.08.3.tar.xz", + "hash": "sha256-pnF22uXTALak2jdbWk8+Ke1iv6OAoQVaWslauk8x73E=" }, "kmousetool": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kmousetool-24.08.2.tar.xz", - "hash": "sha256-/Lr5RH/ua/ADYqbGg3I4ahGiT3Ln5co7mrtwOOXwme8=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kmousetool-24.08.3.tar.xz", + "hash": "sha256-3PZL9Zt1hMmIwLTYkbBF3TZbalRr1s+3GFoWID7tK5k=" }, "kmouth": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kmouth-24.08.2.tar.xz", - "hash": "sha256-SyIboErUr/O0YBzss62WSoAGcmfUWCwZXykMzLfC6k4=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kmouth-24.08.3.tar.xz", + "hash": "sha256-0r7g2MmVU/PWTQ7FSHC5zY3msBh5rSFg4LzQ0gi4lE0=" }, "kmplot": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kmplot-24.08.2.tar.xz", - "hash": "sha256-AhayVF52HOZFrhl86Iypm7W4d4ze01rduLMclM/TzQc=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kmplot-24.08.3.tar.xz", + "hash": "sha256-i4oJ1i78ChSG7ppNi4ZxHpFRczUHp+tfMyvlCwAW1Gk=" }, "knavalbattle": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/knavalbattle-24.08.2.tar.xz", - "hash": "sha256-RXAoyJACcl3bj1jh/osvt9t1bhJA3hu4/Kh61yuuATY=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/knavalbattle-24.08.3.tar.xz", + "hash": "sha256-f/5oHCZW0+RLUIKj3z3IsB3BgGIgJYGTrOYC1CuzvgQ=" }, "knetwalk": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/knetwalk-24.08.2.tar.xz", - "hash": "sha256-qwuShnEQX3YgnijPXSCa9IcA03osLAAMFx6yOrJrVyk=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/knetwalk-24.08.3.tar.xz", + "hash": "sha256-4Uc/eURmbg9Ljgz68s1gbZEcY0JPyKAmlv1yKRCL3D0=" }, "knights": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/knights-24.08.2.tar.xz", - "hash": "sha256-6AOkE+WULrSTBaISHl9+gjUylRreiqcgO+vtGqqki+U=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/knights-24.08.3.tar.xz", + "hash": "sha256-3t/8wMM4jlxVxM4lK4v5kPevpHXdqCG2gOXeiNHi24s=" }, "koko": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/koko-24.08.2.tar.xz", - "hash": "sha256-9LgcWc2vby6MGsJn6ULUWT695MdQqHFHvZoRQpZtkIo=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/koko-24.08.3.tar.xz", + "hash": "sha256-f6pseD1xVRQBBATmYY/1STCWjlIh+cQ6LS//VpQn4Kw=" }, "kolf": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kolf-24.08.2.tar.xz", - "hash": "sha256-7QdOexrxPgWsA2J6cLuPEDpUUByXdXvmri5vZjiEHbo=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kolf-24.08.3.tar.xz", + "hash": "sha256-XSnLSa+iZw+qSzeLJXRPVUf2koY3j5Cumu4cl9sU9dQ=" }, "kollision": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kollision-24.08.2.tar.xz", - "hash": "sha256-QQLAUw38CcYaoQwECPpu94pdAcWW1lYNw1gDf+3TvTM=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kollision-24.08.3.tar.xz", + "hash": "sha256-JZK0jQGkD0gXLCJJgBUaMjy5ChHBeQzddxwHMsZLCro=" }, "kolourpaint": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kolourpaint-24.08.2.tar.xz", - "hash": "sha256-lCdxvhNMCHGWcBVmLeiLSHcGzXU6b86l/+2VPRL50JU=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kolourpaint-24.08.3.tar.xz", + "hash": "sha256-Ds/4+T4Qa+z5LGU/FV0GMWfBuhRvkuypPLKhuTa68Vs=" }, "kompare": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kompare-24.08.2.tar.xz", - "hash": "sha256-c3szGmxqba/pKyNYSrX8mTAL91aK8a7zRJNnbeWqk4Q=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kompare-24.08.3.tar.xz", + "hash": "sha256-X5dnD25FOdVSGreQEUd039R+BF5FqJ83f77dz8WcKC4=" }, "kongress": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kongress-24.08.2.tar.xz", - "hash": "sha256-0Dzz9OXJwvb6xneFLYKA2YYontUejC0wkJ7EbWUEjPw=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kongress-24.08.3.tar.xz", + "hash": "sha256-R/RF5/kaML9vXHaCD864w1SQYrT9/8KldenmsLFdY+I=" }, "konqueror": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/konqueror-24.08.2.tar.xz", - "hash": "sha256-N6LnTlpBiMTkqTlPeTu7cO5LcBiQ6gssP/A6JAo+Bzg=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/konqueror-24.08.3.tar.xz", + "hash": "sha256-jeov+AcIMKUNrv07hIgs77QRU6ieJRB/4sYh+NYpBdA=" }, "konquest": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/konquest-24.08.2.tar.xz", - "hash": "sha256-KZHlAGcCsjReJa9LY/ESSx2O1eunERRQRo2OuBEBd24=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/konquest-24.08.3.tar.xz", + "hash": "sha256-/w4x/0J3j+DlhBZtkTottUgecW2Q7ziiU4oZevbJh40=" }, "konsole": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/konsole-24.08.2.tar.xz", - "hash": "sha256-rnLKTi2RI7m62pnS07ATmP9QgrVJs4V5z5qpTCv/1xk=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/konsole-24.08.3.tar.xz", + "hash": "sha256-aHSYp+uAUFSf2aW8lCEvHMfzO4H+5Aa2Sh72t8ZQWNo=" }, "kontact": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kontact-24.08.2.tar.xz", - "hash": "sha256-Orw/nc1SbPn96oWc5dfcvIrrEtMvMwQP5INVO8Y5NlA=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kontact-24.08.3.tar.xz", + "hash": "sha256-CiJXCHUnRWgbx7pdbH5pTdFkwBVCr9HQVzt7IMewWIY=" }, "kontactinterface": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kontactinterface-24.08.2.tar.xz", - "hash": "sha256-mq2qHgFLoYSCMY6uZ1WcpTwVztY4yFumTNfoW6YZaVc=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kontactinterface-24.08.3.tar.xz", + "hash": "sha256-urEcK9nw9wCOLwRM6FY7Pffs6hBmoGBZD/AmdsC1AiU=" }, "kontrast": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kontrast-24.08.2.tar.xz", - "hash": "sha256-7WCx4in6SisFEcToonoZR5tpJ09psY93ggkize0LUQQ=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kontrast-24.08.3.tar.xz", + "hash": "sha256-wz1UlXbSMPn0ohKL+KJWf8A2bqjgQye6YbqUYsJM+cE=" }, "konversation": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/konversation-24.08.2.tar.xz", - "hash": "sha256-rCLjp9t+iDT3zQrY45hKuErK2IoE/kOz4WyR50NSbK4=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/konversation-24.08.3.tar.xz", + "hash": "sha256-dfWmSJDP6JUhTf77CHBa+US2PqmBbGKDke8TygR8s1s=" }, "kopeninghours": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kopeninghours-24.08.2.tar.xz", - "hash": "sha256-Phl+XVjCNZiJgttT1Mm/1BfdbUS+l/2KeRhgfaOOyqY=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kopeninghours-24.08.3.tar.xz", + "hash": "sha256-hHiA1K6Yh+CrUCypypNKYCWeO0aF3lDUpysAie2crrQ=" }, "korganizer": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/korganizer-24.08.2.tar.xz", - "hash": "sha256-44SVgn/vjYNkyNT+cFQyBo+Dy5gcv2mGu32BA/c3rjs=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/korganizer-24.08.3.tar.xz", + "hash": "sha256-q+pQKP7oiNP046e44sLDG2eGdgCLsU/BDuaJBJjWn2A=" }, "kosmindoormap": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kosmindoormap-24.08.2.tar.xz", - "hash": "sha256-xnbTm2PDgZkjsCcjryRYSBUI8R4LKl21hO5mDJmWRcY=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kosmindoormap-24.08.3.tar.xz", + "hash": "sha256-N+hZzMUl8PWCj32MneAqNDkoUzrCC0h5XosXkZFKcvk=" }, "kpat": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kpat-24.08.2.tar.xz", - "hash": "sha256-LZ2oYxXkJLSEBA4ZEUO+CpNupDhUPQeNlud9xSg6BPI=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kpat-24.08.3.tar.xz", + "hash": "sha256-fg9eCn0O+OnWxhY0yDDxnwfUHRJTAw4B1a5gEngojBs=" }, "kpimtextedit": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kpimtextedit-24.08.2.tar.xz", - "hash": "sha256-VVtlkHcxQcTYRdbzoCq7Qjh+rUywD+L+wM4XhbanfIU=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kpimtextedit-24.08.3.tar.xz", + "hash": "sha256-fSTukD/dIj69KBegeiGuewKkT3AJO4D6NCHn+rbBD5Q=" }, "kpkpass": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kpkpass-24.08.2.tar.xz", - "hash": "sha256-PwlaqwtPewP6hKSlnKq0UbVF6aPswi3E/ujttZcAy7s=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kpkpass-24.08.3.tar.xz", + "hash": "sha256-us4qnRHXEtWlufHmHBOzOuRQop23MN6AdZfkzOxD6kg=" }, "kpmcore": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kpmcore-24.08.2.tar.xz", - "hash": "sha256-gdMPMyKssuuHUemAr2yLE/w5lGg/T5AuWIImtwpFZ5U=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kpmcore-24.08.3.tar.xz", + "hash": "sha256-OioQrUeXa1lu+KVhKXu0OfC5AnGU1EwRNeg/os8+wiU=" }, "kpublictransport": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kpublictransport-24.08.2.tar.xz", - "hash": "sha256-qkSjVdz7kC70RIDFSUDfdH3uj3+zYwHa+88F7DCiNOE=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kpublictransport-24.08.3.tar.xz", + "hash": "sha256-Y1i418bcGQCO6eWF05PbjxQcbV93z8GPPTDnpNa8ZP0=" }, "kqtquickcharts": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kqtquickcharts-24.08.2.tar.xz", - "hash": "sha256-seLcgMf+J/5VUIxkIaua85DcbjxKvwMVFqGm5GMMzP4=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kqtquickcharts-24.08.3.tar.xz", + "hash": "sha256-Q9hZNNgHAsmvpLM3KPPwqjPTC4shwfybgZwZ31gYd/s=" }, "krdc": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/krdc-24.08.2.tar.xz", - "hash": "sha256-D71VooCV08hGSc/b4S3YaN3swjIF9pjtA+gkWFyLxgs=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/krdc-24.08.3.tar.xz", + "hash": "sha256-LwSkCENHAq7knK+cAZPDRxoEnzQbDoo2p3Pn7ZOBCvA=" }, "krecorder": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/krecorder-24.08.2.tar.xz", - "hash": "sha256-6lW1IeWyhnbcASri5Zmodmi7PRIEpm1jIKGeK3cqk5o=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/krecorder-24.08.3.tar.xz", + "hash": "sha256-U2l3kWk7wvpzgbJ6KnBgoLkPcksFKznWy0S5lTz+03g=" }, "kreversi": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kreversi-24.08.2.tar.xz", - "hash": "sha256-CumrjLymqw2bBYRwBpVFDSmKa7azg5XklJ6BDaWojOE=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kreversi-24.08.3.tar.xz", + "hash": "sha256-hDbTC/prjMrOAgrTTuWL9quJ9t0+QTe9KV3T3RBVf3A=" }, "krfb": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/krfb-24.08.2.tar.xz", - "hash": "sha256-wlCw4RbGk1f3sZQVqsN9eOIogLqffZhbB2doFSNeoS0=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/krfb-24.08.3.tar.xz", + "hash": "sha256-S2IThzVr22wwZAXjDivUhZoXDHgZOasKEg+yBuKajH4=" }, "kross-interpreters": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kross-interpreters-24.08.2.tar.xz", - "hash": "sha256-k0PPK0U8xZdXgOkMobBOx6fwScCZVMjc2Samu7CTc3Y=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kross-interpreters-24.08.3.tar.xz", + "hash": "sha256-GRA08Sav8dWi8DgUMSgeXD7lKICyiY5rlP4PtaoSsPI=" }, "kruler": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kruler-24.08.2.tar.xz", - "hash": "sha256-E742B4bxaTk7R1akC6HxXklEvi/HxKS7T4dEM+VI5lU=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kruler-24.08.3.tar.xz", + "hash": "sha256-BcaIHNn96y797CXKDjDywRNel3U95gt3mQZ+yETs1cY=" }, "ksanecore": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/ksanecore-24.08.2.tar.xz", - "hash": "sha256-+RwD6UWjRgdwZYFLJjeNmTjho5wiyIGFo2YmoFI6R00=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/ksanecore-24.08.3.tar.xz", + "hash": "sha256-ebJB7naKv2aHIeLczJRFBBoolxYgivqngylArlj+7/o=" }, "kshisen": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kshisen-24.08.2.tar.xz", - "hash": "sha256-i+eVjXDXrXmS9iz2zptphVZKSytg0RfpZWpM9LMNdUo=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kshisen-24.08.3.tar.xz", + "hash": "sha256-+91uYtsfwGCkBe0Vk8nhFEm/TjNwtbNe/Cc/AoARJUY=" }, "ksirk": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/ksirk-24.08.2.tar.xz", - "hash": "sha256-t6StiVIRpvRJcx4U9P1SsNR5ZkhYvQpYrEM8pPKOSdU=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/ksirk-24.08.3.tar.xz", + "hash": "sha256-RJsgK3QzWbzkxYn6sNpLF5EtrBLNygp/hdXK5sDwKKY=" }, "ksmtp": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/ksmtp-24.08.2.tar.xz", - "hash": "sha256-qKzU8s5G23niiUG/8AqO0Mv1Mv8hT0ltFyEnYrBNuGM=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/ksmtp-24.08.3.tar.xz", + "hash": "sha256-VpdWxuAAwSzWqeBHW7PcBbIuu4KteeqVpfB425YOQbU=" }, "ksnakeduel": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/ksnakeduel-24.08.2.tar.xz", - "hash": "sha256-biJ1mBjUPOf/h67GpwoQniChBBV6/HTYukoJNASQ0CQ=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/ksnakeduel-24.08.3.tar.xz", + "hash": "sha256-9Ho1I7EpUvUj5MLjEroh3bGt5UbK/i8IsgAKZlnX3ts=" }, "kspaceduel": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kspaceduel-24.08.2.tar.xz", - "hash": "sha256-uF+cjbpgTOEhN5FefkXQjN7K6e2iAd9r2RqKOlb0+G8=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kspaceduel-24.08.3.tar.xz", + "hash": "sha256-WTQVrzvHqe8WDHouOMPcWVNT9b3DNy+3CAXhgaHaj08=" }, "ksquares": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/ksquares-24.08.2.tar.xz", - "hash": "sha256-whGNtx+TENOcwrQwVm7UC9z0wwF14zEs/bOS0JmWsWk=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/ksquares-24.08.3.tar.xz", + "hash": "sha256-Nfkh8DFgTl1z+6MycQB3e+85Rzq+DdKh/y0PqHSNLog=" }, "ksudoku": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/ksudoku-24.08.2.tar.xz", - "hash": "sha256-Xoq3Sz9ONmLZcwHoGZwwsIeXNhu5VyEah0tcdvcUkZQ=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/ksudoku-24.08.3.tar.xz", + "hash": "sha256-AjEMlxORG9KQrpa9FfZKr+G2F0hhpiC1H/hwUw5qlik=" }, "ksystemlog": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/ksystemlog-24.08.2.tar.xz", - "hash": "sha256-d7jmKc2cwJ/lg+mbuv/q/rN9jtobLGy0CCqUJ/qmqW4=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/ksystemlog-24.08.3.tar.xz", + "hash": "sha256-PlhOgGUOVExZQerMWH2w8YP+IaGIKsKg7n2J2cm7WfI=" }, "kteatime": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kteatime-24.08.2.tar.xz", - "hash": "sha256-c3HLUioLNkBHw+L0UFQpJ7fbM78hmGvjKhNuocyO39s=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kteatime-24.08.3.tar.xz", + "hash": "sha256-xcHNEXMKmLtU6T0GmWimngFtzkRfWb8yK2FUGIUDjCE=" }, "ktimer": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/ktimer-24.08.2.tar.xz", - "hash": "sha256-y2Y7K86Np7pf2teDp2DKo5RtFtYZ1Ad16Za7D+0UKHY=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/ktimer-24.08.3.tar.xz", + "hash": "sha256-8t4QOabmVfH5l3jClvCB1e8wdMorqpEZbL22paKpIPU=" }, "ktnef": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/ktnef-24.08.2.tar.xz", - "hash": "sha256-OI4PkxQTQplH5W380a1CnuI/2E3XkiI+uKSLHBKxhyg=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/ktnef-24.08.3.tar.xz", + "hash": "sha256-BgEjZXvjmr9X7yYpdLTpce5J3c5Qi44846J+PvyAyFg=" }, "ktorrent": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/ktorrent-24.08.2.tar.xz", - "hash": "sha256-DCxxzPYJQ6AQF/a6ADYeYNlgjHrfHUTx6WesFlkW1uI=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/ktorrent-24.08.3.tar.xz", + "hash": "sha256-NwW5vb1dpR2ooNAGuaem2wMub3Bh4icJwRRqpdF8rUA=" }, "ktouch": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/ktouch-24.08.2.tar.xz", - "hash": "sha256-vH63wPQAH8UIrikFUCAeWBZoSx6JI+So8FcHkboVhbA=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/ktouch-24.08.3.tar.xz", + "hash": "sha256-/6hbLejUVLQfyKntkgMuHEVoSZCHLKlYYZulNB4SfuA=" }, "ktrip": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/ktrip-24.08.2.tar.xz", - "hash": "sha256-PinHfz/LMzs7KyF60K6igLWFQkCTBABrhUtK2rY3oSI=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/ktrip-24.08.3.tar.xz", + "hash": "sha256-t/hrYOMwqSxIBCPxJYfarw0/tqPKU6HFa7VGioMhVLY=" }, "ktuberling": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/ktuberling-24.08.2.tar.xz", - "hash": "sha256-YfpiOs/HC3GhfPTrC53vCT1+Jf2b4yLGzL4/NX3jtEg=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/ktuberling-24.08.3.tar.xz", + "hash": "sha256-jiqTClaZmCccVR1TUg68Kyf7piJm43Sm1z175Eql0/U=" }, "kturtle": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kturtle-24.08.2.tar.xz", - "hash": "sha256-YgUCpPW9+QsN6fw2he48KP688UVsIrU4Xx+0bII4rak=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kturtle-24.08.3.tar.xz", + "hash": "sha256-Atg243ethCjZFJpfVJbwxsIt3zYvkicxMOSfS4Zkdbk=" }, "kubrick": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kubrick-24.08.2.tar.xz", - "hash": "sha256-WL2MdJ6rB+JQtDeMUc9SJmN1B5AZ82e8mRQc57KG/94=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kubrick-24.08.3.tar.xz", + "hash": "sha256-JSCj+3ss0ZbrFk1i4RPxcK7CJdtIaAkaD9XLWPaDVBw=" }, "kwalletmanager": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kwalletmanager-24.08.2.tar.xz", - "hash": "sha256-+hxNM3xo1jVzJ3YLiZ/VSjHCYGPNdWhoqyuMyZgrgLI=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kwalletmanager-24.08.3.tar.xz", + "hash": "sha256-rr0MDZMnZhd0oTfxpXX0uJXv8AhfPIOyH7EAi3uxpL8=" }, "kwave": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kwave-24.08.2.tar.xz", - "hash": "sha256-AQQGXKXm8AQgt737Dr2S9SiQfC6WwpB60GkEAyij3P0=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kwave-24.08.3.tar.xz", + "hash": "sha256-ij0Ys8OkBFHGC0mJuqsWIgK/qoQuACZeqzABPekZCIU=" }, "kweather": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kweather-24.08.2.tar.xz", - "hash": "sha256-9osHF6CnBwC9oHwGhxH2gYHElKqkvmFUfXgadWby52U=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kweather-24.08.3.tar.xz", + "hash": "sha256-N6CgnUlTz0wnnRcQ7K5zdiFm2O1UuLuAHMF3BJe1vU0=" }, "kweathercore": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kweathercore-24.08.2.tar.xz", - "hash": "sha256-PjkMyYg1lSNgxkFvve7tdbhzzC2/wMtf3CxyuTtn+xg=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kweathercore-24.08.3.tar.xz", + "hash": "sha256-nIBnOFXLf6Z7VVJ1P/uAOWcqNmIPt5BpDEC7HAb9Pf0=" }, "kwordquiz": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/kwordquiz-24.08.2.tar.xz", - "hash": "sha256-6M7KqBCTNjmfo11lraebVG7x/8du8lFdhWKDXSENh34=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/kwordquiz-24.08.3.tar.xz", + "hash": "sha256-4vsCwjjW9nt6z8jT3E5+vUZEvmqeMMh6nsPLRTogqho=" }, "libgravatar": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/libgravatar-24.08.2.tar.xz", - "hash": "sha256-W3UVMlJaKfK6VvlXWWxEYqEW6yBYwgCagCYNSo9pXdk=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/libgravatar-24.08.3.tar.xz", + "hash": "sha256-FjahE3Sx7zC69Xdku/cahT6CBTgMQU2SbuWp8GqcieM=" }, "libkcddb": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/libkcddb-24.08.2.tar.xz", - "hash": "sha256-qdZTAB5hG0dk5PqVnxCnMyDkdeIyshvtxle9zwJF9H0=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/libkcddb-24.08.3.tar.xz", + "hash": "sha256-xCddlKTLhkzeUGEBe1I6IgypU6Y2updVvWNdne+UGxk=" }, "libkcompactdisc": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/libkcompactdisc-24.08.2.tar.xz", - "hash": "sha256-r1CI6BCuv/i+/8WAAVlzXgAybSCEKTFzH4GeQAAnw7Q=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/libkcompactdisc-24.08.3.tar.xz", + "hash": "sha256-jVRIC/JWigt5nGYxRZv20RE+IVPB1WSu/z5G/SwIQUU=" }, "libkdcraw": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/libkdcraw-24.08.2.tar.xz", - "hash": "sha256-TI/jV/L6+5V+UyDWGlWp10ZmWj7q/CTaKFGA63H7re4=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/libkdcraw-24.08.3.tar.xz", + "hash": "sha256-8QbAgaNtwTlcNs6VBBG3YOvZFWsAK8eOEnHuHmItAFU=" }, "libkdegames": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/libkdegames-24.08.2.tar.xz", - "hash": "sha256-6n2S2qcRm40ww7xeggCZKtILdgkuWJZQHLh4JhdHgEI=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/libkdegames-24.08.3.tar.xz", + "hash": "sha256-a8suDGc3+bipRunQuXQWT7BbQWVjK7WXQ/sZ4E2/lO4=" }, "libkdepim": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/libkdepim-24.08.2.tar.xz", - "hash": "sha256-5Gkrx28BiKP9QJ6q4Rl8bqdi5TISSEHfa4smnxsi1F0=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/libkdepim-24.08.3.tar.xz", + "hash": "sha256-D4M0bjeTTt9ci+Jdr4Lj9pKh67KRL3B9LlXYl3dg/QU=" }, "libkeduvocdocument": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/libkeduvocdocument-24.08.2.tar.xz", - "hash": "sha256-v9e0aKUwlCHIiXCPQ1aDhf3M3vHWUt4VZm/q9Z9ZcqE=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/libkeduvocdocument-24.08.3.tar.xz", + "hash": "sha256-2b/U5/Z7FZNSpebBL+7yuR6uRESVFUMvtyw0WjfE8cQ=" }, "libkexiv2": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/libkexiv2-24.08.2.tar.xz", - "hash": "sha256-4pJGU23AryjEZwhkFhTsf54hdOAjPq038z6ZqroJgJM=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/libkexiv2-24.08.3.tar.xz", + "hash": "sha256-nzhlQRr7WUrS2p8pB+USQnf2Yr4/TGFL1NXMw2z7iQY=" }, "libkgapi": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/libkgapi-24.08.2.tar.xz", - "hash": "sha256-2XV586ne5xpt3Ta1JaZ6DTs04QbLi8GF3ubNGs0wYxc=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/libkgapi-24.08.3.tar.xz", + "hash": "sha256-txNb+l/g3qQ5H4EtSqGNCK3BFgZ0YWjwq7weUPq6TEc=" }, "libkleo": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/libkleo-24.08.2.tar.xz", - "hash": "sha256-Q72tjs6nGpRK7LEB5wANuPtqDFCK/Y6FawRYhyML9g4=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/libkleo-24.08.3.tar.xz", + "hash": "sha256-vnCyeQu3+MRuHiil0oAC+5Z/EC9Bavvuc4gS28T9f+o=" }, "libkmahjongg": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/libkmahjongg-24.08.2.tar.xz", - "hash": "sha256-oGOgduXkAcL6X0aXS8HGrAXrysEoeyp15TSAiclkrho=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/libkmahjongg-24.08.3.tar.xz", + "hash": "sha256-9bcW9cvNpNzhYdkP2al95JF++XJUBLIOJi3hs4+Xb7c=" }, "libkomparediff2": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/libkomparediff2-24.08.2.tar.xz", - "hash": "sha256-8dyhIR5u2EIS9l1u5PukZ3DGThlasPAF1u5EHdCy5ow=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/libkomparediff2-24.08.3.tar.xz", + "hash": "sha256-7ZCY7HfVbh7o4ogUwo9tA0rz8XI+q1sn3+cVJmnpemc=" }, "libksane": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/libksane-24.08.2.tar.xz", - "hash": "sha256-6vNORJEOqdRvEUmw6393YkIsw5Vn4qArlm72GLlFMJE=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/libksane-24.08.3.tar.xz", + "hash": "sha256-Z4VepFisnTeSXwn1gWyIE6HbBPScEIA7wSZbnVZt4a8=" }, "libksieve": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/libksieve-24.08.2.tar.xz", - "hash": "sha256-yapayByDfwMBjI1cNXu3+RSlAATyEG08XaZVeaUOHPA=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/libksieve-24.08.3.tar.xz", + "hash": "sha256-e6J0yy3amx2+U5tLSrddChQCZ1R9gRT3sPVjxUfTrpk=" }, "libktorrent": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/libktorrent-24.08.2.tar.xz", - "hash": "sha256-gh1IFw8hfnBV7Rh806Qz3w4DhAANEfRI/Dxujv7p6Rc=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/libktorrent-24.08.3.tar.xz", + "hash": "sha256-WCQyh+eKhqISr0AMw8/E3tGgg3ouu/aJjutntbsC1Pw=" }, "lokalize": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/lokalize-24.08.2.tar.xz", - "hash": "sha256-8iGuejWWdFSjniG4ICaOZmnNACDYTQPgNiYeEsVs/6o=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/lokalize-24.08.3.tar.xz", + "hash": "sha256-5Lh1/0pUlLV8CzjkHEDxkSwOiBh9ikDoOKEYd0ZNltI=" }, "lskat": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/lskat-24.08.2.tar.xz", - "hash": "sha256-/JlSqKoouA8D1jBrFKtQXSVYUPT5VjzQLrr9+ge7haM=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/lskat-24.08.3.tar.xz", + "hash": "sha256-LowGxV6auDlei7Tz4ZRlVkf5/+ZV4xZZOGJ9QSd+xVQ=" }, "mailcommon": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/mailcommon-24.08.2.tar.xz", - "hash": "sha256-dSHonywH6C+qG16XmU2y9q0uxqiMdRPnGC1ZfhvH0Xc=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/mailcommon-24.08.3.tar.xz", + "hash": "sha256-2Dp3eMKniqgGGAZRhrBOLkEYU6WX73EM2s7LMHCpZwo=" }, "mailimporter": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/mailimporter-24.08.2.tar.xz", - "hash": "sha256-dE63EAkJJOt5r/vyhar1jjS4F+FXArMttrkwQ8HVeGg=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/mailimporter-24.08.3.tar.xz", + "hash": "sha256-yBswt2RNMVpmfRWPb1GekUSo+zNT9HTldvQdOVZDWM0=" }, "marble": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/marble-24.08.2.tar.xz", - "hash": "sha256-dUGw5kDEuUHrhoMDkHkBjQGAzHIlj5/h1Wusmy9oJzs=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/marble-24.08.3.tar.xz", + "hash": "sha256-xTwfqnQeG0JFlMICH6TtxiBSjoYs7/KAyzyVLRryA3E=" }, "markdownpart": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/markdownpart-24.08.2.tar.xz", - "hash": "sha256-FbM0H3I/lp7tYcFODuxXpdeoqTGskBiwbRGDMRv1ujA=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/markdownpart-24.08.3.tar.xz", + "hash": "sha256-/ieShY/VIHxv5w9b30sOvDAAH49ysIBm1htmjSMWs0c=" }, "massif-visualizer": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/massif-visualizer-24.08.2.tar.xz", - "hash": "sha256-SkUWECEUN4zfqIdDxjLiBpYgnDdwg3MwqUUnVxpTRME=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/massif-visualizer-24.08.3.tar.xz", + "hash": "sha256-Bb+axo5XxJy9OfSAMoamfTiem7oU9suH7vpT7BO2cts=" }, "mbox-importer": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/mbox-importer-24.08.2.tar.xz", - "hash": "sha256-W+dq6hLl6Xc2KUy+rj3JxMD5QmOqy8/I7NOvglcsj4Y=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/mbox-importer-24.08.3.tar.xz", + "hash": "sha256-sf/6sawemXbXdfkZrJmeTC3L3uRniHAPzD8uVJw7c8Y=" }, "merkuro": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/merkuro-24.08.2.tar.xz", - "hash": "sha256-7zv3e0rFT192IuQ9JGhegl15Hxx2ek4QbdatKm+R8BQ=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/merkuro-24.08.3.tar.xz", + "hash": "sha256-IFe0hLbClA9UMKTGz6+RzfJ/e7Hfd4B/BBQ6lDMflyI=" }, "messagelib": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/messagelib-24.08.2.tar.xz", - "hash": "sha256-9yfAX/+3QKCjtRZ0RmoTfCOtYC08oT090HB4B5tLQUk=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/messagelib-24.08.3.tar.xz", + "hash": "sha256-5nzoHyJ8n61MQYGGO1Zi8tGHyIQq2OXYLFHu6ycv290=" }, "mimetreeparser": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/mimetreeparser-24.08.2.tar.xz", - "hash": "sha256-MRJOsi0CL6mCH/tRA+TZpKjrO9Cvx+wQKwdk/+OOYXo=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/mimetreeparser-24.08.3.tar.xz", + "hash": "sha256-enTQiEyI0+0N2rD2qzNwn4qDTJHXoZ1Btmwj46lPI4Q=" }, "minuet": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/minuet-24.08.2.tar.xz", - "hash": "sha256-OkMJAuinU2FNI+Vzv4AG7Yneq7ArGJGoWge7hOxtsHA=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/minuet-24.08.3.tar.xz", + "hash": "sha256-b88vWb5tkHniaKcKlpceuZHMrCkQDfz9l+cPpBqgX6A=" }, "neochat": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/neochat-24.08.2.tar.xz", - "hash": "sha256-hz8I817xBVsXZHCYorpaOSTcD7g1BEHTgMNZjYITwbw=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/neochat-24.08.3.tar.xz", + "hash": "sha256-8omI9o6/QFsMRIq5+OTdrOgZ4I6G+tnWshSbuY59Dwk=" }, "okular": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/okular-24.08.2.tar.xz", - "hash": "sha256-QInHfVvmCu29RdoNS6MZ45CbFaZAzVHTYbAdla0zyPs=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/okular-24.08.3.tar.xz", + "hash": "sha256-s5irMwLt1UDFbd2CbzHYOiRumlPIalLgMzR6uUf+3Js=" }, "palapeli": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/palapeli-24.08.2.tar.xz", - "hash": "sha256-JFhZ1nkH91hFuq7nA7DlafceA+bH9gGV9WphdZoLoy0=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/palapeli-24.08.3.tar.xz", + "hash": "sha256-2jllu4rBF9ldlHQ0lY1b9AkkfD7JFrdH2mhWmO1exfk=" }, "parley": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/parley-24.08.2.tar.xz", - "hash": "sha256-nblLobCcIkhdbAS5pc1IRCZZFQEVMtLkx0EdkmTOxPw=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/parley-24.08.3.tar.xz", + "hash": "sha256-M2UVyaZ8h2xMSIcf5i3IDSYbJS9tvhp4ixJ8mIsJ1i0=" }, "partitionmanager": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/partitionmanager-24.08.2.tar.xz", - "hash": "sha256-oimr4ialV3dXjDgnZ37CIYxpxaYxpxQ28mid5g9tTqo=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/partitionmanager-24.08.3.tar.xz", + "hash": "sha256-ej2bp6wWA6TEAkJw3mQOCansrnYVnrynD2QCumB9+c0=" }, "picmi": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/picmi-24.08.2.tar.xz", - "hash": "sha256-JY7O2o/YZkuP1vQqXG3r2PUReukVAAESU2+cxolG1gI=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/picmi-24.08.3.tar.xz", + "hash": "sha256-Ow5JOxfZE7+32AR7s0WIBWgWr/2s7fVwqn0P9VruWsA=" }, "pimcommon": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/pimcommon-24.08.2.tar.xz", - "hash": "sha256-NVux0isn6x+3tqbOz45daOKIpSrKSnr9NPcj+Q+UI6Y=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/pimcommon-24.08.3.tar.xz", + "hash": "sha256-zMJHB39dS1NPS6viAhtoLoxXGdV0M06Fn9pEAFcvOy0=" }, "pim-data-exporter": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/pim-data-exporter-24.08.2.tar.xz", - "hash": "sha256-Oj5tie3p0AplOKylrJNSZjjK4fLripWL5gq5xQ0hNDY=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/pim-data-exporter-24.08.3.tar.xz", + "hash": "sha256-K6h8ZA7xNtT4J4GVL8AXvuUM4ZGcWUpmWcTxLMr6GXc=" }, "pim-sieve-editor": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/pim-sieve-editor-24.08.2.tar.xz", - "hash": "sha256-g98WYyHHcj0SI71ibImFnDZciZ6NZRhDtXDOL4VrjxA=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/pim-sieve-editor-24.08.3.tar.xz", + "hash": "sha256-ANFvMOzfcw+EowDW3HkPVvr5AaxlkSgsOJvcBwfdbrc=" }, "plasmatube": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/plasmatube-24.08.2.tar.xz", - "hash": "sha256-b2yaWcQv7t8+TQJ2qtqjwqm68yqGJp/2pOx1sww3kyw=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/plasmatube-24.08.3.tar.xz", + "hash": "sha256-4BvTTMUVixK6qmZSVthQVo7mnVVWpDul47l4OloqvDw=" }, "poxml": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/poxml-24.08.2.tar.xz", - "hash": "sha256-4IVUj6HmzPiM3daefE5oATT1/qiLTrh45FRiqFg6JXw=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/poxml-24.08.3.tar.xz", + "hash": "sha256-2AucL394qkNnngQHGc94vQWCPFMV1pp2GtknA5dWBvY=" }, "qmlkonsole": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/qmlkonsole-24.08.2.tar.xz", - "hash": "sha256-M873T020YW8TsL/oxd5tgjonV14mNo1rMK3iPLZQi3I=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/qmlkonsole-24.08.3.tar.xz", + "hash": "sha256-teDdQaSF1nKQjq/2LKHOff4xEvohjf/6z1+K72TcgCo=" }, "rocs": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/rocs-24.08.2.tar.xz", - "hash": "sha256-0QAwFhLg0/4+0k2u4oxr0Te0C8sq+cdSZCpghH3FGFI=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/rocs-24.08.3.tar.xz", + "hash": "sha256-JWW8s5KIXPCeQCyKPLsz7jKGVIVynIbABPFfcDsDwtE=" }, "signon-kwallet-extension": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/signon-kwallet-extension-24.08.2.tar.xz", - "hash": "sha256-1Y2CnbVI8myXtBwgqGR3dwDvRMRCSms0EALIRZCYD/w=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/signon-kwallet-extension-24.08.3.tar.xz", + "hash": "sha256-saRfaA3oClP876twfbrt11DDwfxjjZm9nGplwRoL/I4=" }, "skanlite": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/skanlite-24.08.2.tar.xz", - "hash": "sha256-fNuWQRIYc5UkG3EbU1EPm2DaPeexO6qT8g1XnqLXMaY=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/skanlite-24.08.3.tar.xz", + "hash": "sha256-DnJ1elBP5zrdtBZXMrjJ3Uek2GsW8BPr6xOeWcKKxeM=" }, "skanpage": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/skanpage-24.08.2.tar.xz", - "hash": "sha256-dJ1e2txwGYLstcGHg9L/E9cuplKdnZ6OO8EnE6uwKxk=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/skanpage-24.08.3.tar.xz", + "hash": "sha256-J3Rqaw69+ZeHtNsutHb4IgH/deYC6cJPqcdwLX0/Dyo=" }, "skladnik": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/skladnik-24.08.2.tar.xz", - "hash": "sha256-daL1m8awJK7puBf4/oLSZup4Drs64eYEGI+VgPVP1b4=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/skladnik-24.08.3.tar.xz", + "hash": "sha256-yX6LSDsAkxPUGl6f+TvCNAEYKi7aBrGS+bwRIRgKDu4=" }, "spectacle": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/spectacle-24.08.2.tar.xz", - "hash": "sha256-P5D4z+M1mtlPW7ACWpJRgFoJLFiSzSqJGWXCGgmEy98=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/spectacle-24.08.3.tar.xz", + "hash": "sha256-RHq0YqB+zVg8q4ec5xGPv8RjWzcKAPEOFJeLH5umbfs=" }, "step": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/step-24.08.2.tar.xz", - "hash": "sha256-6f9AC8kvbJViWIwIB2FQVTMLI2RlzHpEDu1ZbCK/csI=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/step-24.08.3.tar.xz", + "hash": "sha256-Eawo5Sfrhm3lFc3+NXFg7No1OCozkS+VJHkdKEhxZEg=" }, "svgpart": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/svgpart-24.08.2.tar.xz", - "hash": "sha256-ymFR/KYkDFL0MbzJj/5OFkku/uGI16IxLwbbZcC1xhg=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/svgpart-24.08.3.tar.xz", + "hash": "sha256-GknQkQ/g7Hf7vuLGQTpdBnrryKPbp1dHxiCHwpNgkd0=" }, "sweeper": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/sweeper-24.08.2.tar.xz", - "hash": "sha256-LSwg7d9nhp58JaWA5PXYgQLexfVT/3B5MF4fANhEVDU=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/sweeper-24.08.3.tar.xz", + "hash": "sha256-pemnfrmYazZV6LZZFOZlfbZgMvIO0vmdgNPFQjrbCB8=" }, "telly-skout": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/telly-skout-24.08.2.tar.xz", - "hash": "sha256-y5577kur5lqL/hEXFWnf4qOfBj8SdGUU2XNWrSfGVsY=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/telly-skout-24.08.3.tar.xz", + "hash": "sha256-oKtz34mLc93/GIq3yfhgMsnzpCsJ9MEYwXrCi7JeYio=" }, "tokodon": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/tokodon-24.08.2.tar.xz", - "hash": "sha256-uEHi9gc1YsGohLJAfT2FpiyoQYvcvLk6Fpt/Pabx2SI=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/tokodon-24.08.3.tar.xz", + "hash": "sha256-4lBf0eCcEZAPQj+bkg5Ap4qPBy9TGSRZynz5EEDZh7g=" }, "umbrello": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/umbrello-24.08.2.tar.xz", - "hash": "sha256-HlolgPVSawdxb4spDZTaOT2BiPD+OqCHYySvtn3TPEU=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/umbrello-24.08.3.tar.xz", + "hash": "sha256-FtaGosz6yX8RmE3+c6PELXbqFiHMJavCJYIBeEs/nE8=" }, "yakuake": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/yakuake-24.08.2.tar.xz", - "hash": "sha256-+wij2zZISxXD0u+ydpRrmr9FqX1X62dqGBcjLUZB8ac=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/yakuake-24.08.3.tar.xz", + "hash": "sha256-pIevCty4BZJsptHDF6nscOPzq0tFUYshvLGgXdz5uRQ=" }, "zanshin": { - "version": "24.08.2", - "url": "mirror://kde/stable/release-service/24.08.2/src/zanshin-24.08.2.tar.xz", - "hash": "sha256-duajViqesjC1O1EZ27/IfSLAPJ2bpiNU2qlvx/lfPqs=" + "version": "24.08.3", + "url": "mirror://kde/stable/release-service/24.08.3/src/zanshin-24.08.3.tar.xz", + "hash": "sha256-g9Iv4sC+mP7f4bpJ7lDwgFlkDJOjSUwSVlYJDbyv5to=" } } \ No newline at end of file From 858aedb920a658deffa89b0128b5fb0e73cad922 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Nov 2024 07:21:39 +0000 Subject: [PATCH 532/617] sbom-utility: 0.16.0 -> 0.17.0 --- pkgs/by-name/sb/sbom-utility/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sb/sbom-utility/package.nix b/pkgs/by-name/sb/sbom-utility/package.nix index 0b3b9ffba21f..7e745b811b90 100644 --- a/pkgs/by-name/sb/sbom-utility/package.nix +++ b/pkgs/by-name/sb/sbom-utility/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "sbom-utility"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "CycloneDX"; repo = "sbom-utility"; rev = "refs/tags/v${version}"; - hash = "sha256-EqK2TGlv2RGfvR95lzYz3EHJkfq4q4Ty5H2zFdd9cME="; + hash = "sha256-LiHCA5q9IJ67jZ2JUcbCFVCYnT36nyq9QzgH9PMr9kM="; }; - vendorHash = "sha256-qh8kIwgrlmHkocM5ZoGnOY7ISJlct/TV7dAxvXlPw68="; + vendorHash = "sha256-vyYSir5u6d5nv+2ScrHpasQGER4VFSoLb1FDUDIrtDM="; preCheck = '' cd test From 90aec31ff5024d3746f2c42994f46c29b97e1692 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Nov 2024 08:28:14 +0000 Subject: [PATCH 533/617] python312Packages.aws-lambda-builders: 1.50.0 -> 1.51.0 --- .../python-modules/aws-lambda-builders/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index 97257d6108ff..c95866a9b584 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.50.0"; + version = "1.51.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "refs/tags/v${version}"; - hash = "sha256-GXpyO+Qd6NP5yxWn1kw34x+P5uyR0rcNlzwivT6eHdE="; + hash = "sha256-9EmhOehkXf6aUu6GLhzE0nkfyx+8ovv+Hr7w7DszXTg="; }; postPatch = '' From 09a6d41fdc5f666d33d3e49790953a93d34d86c0 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 8 Nov 2024 16:38:54 +0800 Subject: [PATCH 534/617] ivpn: nixfmt --- pkgs/tools/networking/ivpn/default.nix | 178 ++++++++++++++----------- 1 file changed, 98 insertions(+), 80 deletions(-) diff --git a/pkgs/tools/networking/ivpn/default.nix b/pkgs/tools/networking/ivpn/default.nix index cdc3035e57a6..818f66ae02db 100644 --- a/pkgs/tools/networking/ivpn/default.nix +++ b/pkgs/tools/networking/ivpn/default.nix @@ -1,92 +1,110 @@ -{ buildGoModule -, fetchFromGitHub -, lib -, wirelesstools -, makeWrapper -, wireguard-tools -, openvpn -, obfs4 -, iproute2 -, dnscrypt-proxy -, iptables -, gawk -, util-linux +{ + buildGoModule, + fetchFromGitHub, + lib, + wirelesstools, + makeWrapper, + wireguard-tools, + openvpn, + obfs4, + iproute2, + dnscrypt-proxy, + iptables, + gawk, + util-linux, }: -builtins.mapAttrs (pname: attrs: buildGoModule (attrs // rec { - inherit pname; - version = "3.10.15"; +builtins.mapAttrs + ( + pname: attrs: + buildGoModule ( + attrs + // rec { + inherit pname; + version = "3.10.15"; - src = fetchFromGitHub { - owner = "ivpn"; - repo = "desktop-app"; - rev = "v${version}"; - hash = "sha256-3yVRVM98tVjot3gIkUb/CDwmwKdOOBjBjzGL6htDtpk="; - }; + src = fetchFromGitHub { + owner = "ivpn"; + repo = "desktop-app"; + rev = "v${version}"; + hash = "sha256-3yVRVM98tVjot3gIkUb/CDwmwKdOOBjBjzGL6htDtpk="; + }; - ldflags = [ - "-s" - "-w" - "-X github.com/ivpn/desktop-app/daemon/version._version=${version}" - "-X github.com/ivpn/desktop-app/daemon/version._time=1970-01-01" - ]; + ldflags = [ + "-s" + "-w" + "-X github.com/ivpn/desktop-app/daemon/version._version=${version}" + "-X github.com/ivpn/desktop-app/daemon/version._time=1970-01-01" + ]; - postInstall = '' - mv $out/bin/{${attrs.modRoot},${pname}} - ''; + postInstall = '' + mv $out/bin/{${attrs.modRoot},${pname}} + ''; - meta = with lib; { - description = "Official IVPN Desktop app"; - homepage = "https://www.ivpn.net/apps"; - changelog = "https://github.com/ivpn/desktop-app/releases/tag/v${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ urandom ataraxiasjel ]; - mainProgram = "ivpn"; - }; -})) { - ivpn = { - modRoot = "cli"; - vendorHash = "sha256-T49AE3SUmdP3Tu9Sp5C/QryKDto/NzEqRuUQ3+aJFL0="; - }; - ivpn-service = { - modRoot = "daemon"; - vendorHash = "sha256-9Rk6ruMpyWtQe+90kw4F8OLq7/JcDSrG6ufkfcrS4W8="; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ wirelesstools ]; + meta = with lib; { + description = "Official IVPN Desktop app"; + homepage = "https://www.ivpn.net/apps"; + changelog = "https://github.com/ivpn/desktop-app/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ + urandom + ataraxiasjel + ]; + mainProgram = "ivpn"; + }; + } + ) + ) + { + ivpn = { + modRoot = "cli"; + vendorHash = "sha256-T49AE3SUmdP3Tu9Sp5C/QryKDto/NzEqRuUQ3+aJFL0="; + }; + ivpn-service = { + modRoot = "daemon"; + vendorHash = "sha256-9Rk6ruMpyWtQe+90kw4F8OLq7/JcDSrG6ufkfcrS4W8="; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ wirelesstools ]; - patches = [ ./permissions.patch ]; - postPatch = '' - substituteInPlace daemon/service/platform/platform_linux.go \ - --replace 'openVpnBinaryPath = "/usr/sbin/openvpn"' \ - 'openVpnBinaryPath = "${openvpn}/bin/openvpn"' \ - --replace 'routeCommand = "/sbin/ip route"' \ - 'routeCommand = "${iproute2}/bin/ip route"' + patches = [ ./permissions.patch ]; + postPatch = '' + substituteInPlace daemon/service/platform/platform_linux.go \ + --replace 'openVpnBinaryPath = "/usr/sbin/openvpn"' \ + 'openVpnBinaryPath = "${openvpn}/bin/openvpn"' \ + --replace 'routeCommand = "/sbin/ip route"' \ + 'routeCommand = "${iproute2}/bin/ip route"' - substituteInPlace daemon/netinfo/netinfo_linux.go \ - --replace 'retErr := shell.ExecAndProcessOutput(log, outParse, "", "/sbin/ip", "route")' \ - 'retErr := shell.ExecAndProcessOutput(log, outParse, "", "${iproute2}/bin/ip", "route")' + substituteInPlace daemon/netinfo/netinfo_linux.go \ + --replace 'retErr := shell.ExecAndProcessOutput(log, outParse, "", "/sbin/ip", "route")' \ + 'retErr := shell.ExecAndProcessOutput(log, outParse, "", "${iproute2}/bin/ip", "route")' - substituteInPlace daemon/service/platform/platform_linux_release.go \ - --replace 'installDir := "/opt/ivpn"' "installDir := \"$out\"" \ - --replace 'obfsproxyStartScript = path.Join(installDir, "obfsproxy/obfs4proxy")' \ - 'obfsproxyStartScript = "${lib.getExe obfs4}"' \ - --replace 'wgBinaryPath = path.Join(installDir, "wireguard-tools/wg-quick")' \ - 'wgBinaryPath = "${wireguard-tools}/bin/wg-quick"' \ - --replace 'wgToolBinaryPath = path.Join(installDir, "wireguard-tools/wg")' \ - 'wgToolBinaryPath = "${wireguard-tools}/bin/wg"' \ - --replace 'dnscryptproxyBinPath = path.Join(installDir, "dnscrypt-proxy/dnscrypt-proxy")' \ - 'dnscryptproxyBinPath = "${dnscrypt-proxy}/bin/dnscrypt-proxy"' - ''; + substituteInPlace daemon/service/platform/platform_linux_release.go \ + --replace 'installDir := "/opt/ivpn"' "installDir := \"$out\"" \ + --replace 'obfsproxyStartScript = path.Join(installDir, "obfsproxy/obfs4proxy")' \ + 'obfsproxyStartScript = "${lib.getExe obfs4}"' \ + --replace 'wgBinaryPath = path.Join(installDir, "wireguard-tools/wg-quick")' \ + 'wgBinaryPath = "${wireguard-tools}/bin/wg-quick"' \ + --replace 'wgToolBinaryPath = path.Join(installDir, "wireguard-tools/wg")' \ + 'wgToolBinaryPath = "${wireguard-tools}/bin/wg"' \ + --replace 'dnscryptproxyBinPath = path.Join(installDir, "dnscrypt-proxy/dnscrypt-proxy")' \ + 'dnscryptproxyBinPath = "${dnscrypt-proxy}/bin/dnscrypt-proxy"' + ''; - postFixup = '' - mkdir -p $out/etc - cp -r $src/daemon/References/Linux/etc/* $out/etc/ - cp -r $src/daemon/References/common/etc/* $out/etc/ + postFixup = '' + mkdir -p $out/etc + cp -r $src/daemon/References/Linux/etc/* $out/etc/ + cp -r $src/daemon/References/common/etc/* $out/etc/ - patchShebangs --build $out/etc/firewall.sh $out/etc/splittun.sh $out/etc/client.down $out/etc/client.up + patchShebangs --build $out/etc/firewall.sh $out/etc/splittun.sh $out/etc/client.down $out/etc/client.up - wrapProgram "$out/bin/ivpn-service" \ - --suffix PATH : ${lib.makeBinPath [ iptables gawk util-linux ]} - ''; - }; -} + wrapProgram "$out/bin/ivpn-service" \ + --suffix PATH : ${ + lib.makeBinPath [ + iptables + gawk + util-linux + ] + } + ''; + }; + } From 1cd27faa565d7d890d67e8e04922063c939d1c2f Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 8 Nov 2024 16:53:39 +0800 Subject: [PATCH 535/617] ivpn: 3.10.15 -> 3.14.29 --- pkgs/tools/networking/ivpn/default.nix | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/networking/ivpn/default.nix b/pkgs/tools/networking/ivpn/default.nix index 818f66ae02db..f505ae838a9b 100644 --- a/pkgs/tools/networking/ivpn/default.nix +++ b/pkgs/tools/networking/ivpn/default.nix @@ -21,15 +21,21 @@ builtins.mapAttrs attrs // rec { inherit pname; - version = "3.10.15"; + version = "3.14.29"; + + buildInputs = [ + wirelesstools + ]; src = fetchFromGitHub { owner = "ivpn"; repo = "desktop-app"; - rev = "v${version}"; - hash = "sha256-3yVRVM98tVjot3gIkUb/CDwmwKdOOBjBjzGL6htDtpk="; + rev = "refs/tags/v${version}"; + hash = "sha256-8JScty/sGyxzC2ojRpatHpCqEXZw9ksMortIhZnukoU="; }; + proxyVendor = true; # .c file + ldflags = [ "-s" "-w" @@ -41,12 +47,12 @@ builtins.mapAttrs mv $out/bin/{${attrs.modRoot},${pname}} ''; - meta = with lib; { + meta = { description = "Official IVPN Desktop app"; homepage = "https://www.ivpn.net/apps"; changelog = "https://github.com/ivpn/desktop-app/releases/tag/v${version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ urandom ataraxiasjel ]; @@ -58,13 +64,12 @@ builtins.mapAttrs { ivpn = { modRoot = "cli"; - vendorHash = "sha256-T49AE3SUmdP3Tu9Sp5C/QryKDto/NzEqRuUQ3+aJFL0="; + vendorHash = "sha256-STbkFchrmxwWnSgEJ7RGKN3jGaCC0npL80YjlwUcs1g="; }; ivpn-service = { modRoot = "daemon"; - vendorHash = "sha256-9Rk6ruMpyWtQe+90kw4F8OLq7/JcDSrG6ufkfcrS4W8="; + vendorHash = "sha256-REIY3XPyMA2Loxo1mKzJMJwZrf9dQMOtnQOUEgN5LP8="; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ wirelesstools ]; patches = [ ./permissions.patch ]; postPatch = '' From 8f8d0c7219d37255d0d5fb71897fe2a7369dcef9 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Fri, 8 Nov 2024 10:03:26 +0100 Subject: [PATCH 536/617] python312Packages.notion-client: add comment to why test is disabled --- pkgs/development/python-modules/notion-client/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/notion-client/default.nix b/pkgs/development/python-modules/notion-client/default.nix index ca931b8510d6..12500e9fe854 100644 --- a/pkgs/development/python-modules/notion-client/default.nix +++ b/pkgs/development/python-modules/notion-client/default.nix @@ -44,6 +44,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "notion_client" ]; disabledTests = [ + # requires network access "test_api_http_response_error" ]; From ee8834d34cb9d6cb9c5ed68ec834ec1de390efd4 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 8 Nov 2024 10:17:22 +0100 Subject: [PATCH 537/617] maintainers: add email of katexochen Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- maintainers/maintainer-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 96a3c478cd4b..47caf394f329 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11244,6 +11244,7 @@ name = "katanallama"; }; katexochen = { + email = "katexochen0@gmail.com"; github = "katexochen"; githubId = 49727155; matrix = "@katexochen:matrix.org"; From efab9a3e06f5af88fda6c619941218206b68eb73 Mon Sep 17 00:00:00 2001 From: Eveeifyeve <88671402+Eveeifyeve@users.noreply.github.com> Date: Fri, 8 Nov 2024 20:19:42 +1100 Subject: [PATCH 538/617] skeditor: add desktopitem, mainProgram (#352836) Co-authored-by: Masum Reza <50095635+JohnRTitor@users.noreply.github.com> --- pkgs/by-name/sk/skeditor/package.nix | 34 ++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/pkgs/by-name/sk/skeditor/package.nix b/pkgs/by-name/sk/skeditor/package.nix index 57ffd6d6b01e..337122b218e7 100644 --- a/pkgs/by-name/sk/skeditor/package.nix +++ b/pkgs/by-name/sk/skeditor/package.nix @@ -3,6 +3,9 @@ buildDotnetModule, fetchFromGitHub, dotnetCorePackages, + makeDesktopItem, + copyDesktopItems, + iconConvTools, }: buildDotnetModule rec { pname = "skeditor"; @@ -22,6 +25,36 @@ buildDotnetModule rec { dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0; + nativeBuildInputs = [ + iconConvTools + copyDesktopItems + ]; + + postInstall = '' + icoFileToHiColorTheme SkEditor/Assets/SkEditor.ico skeditor $out + ''; + + desktopItems = [ + (makeDesktopItem { + name = pname; + desktopName = "SkEditor"; + exec = meta.mainProgram; + icon = "SkEditor"; + startupWMClass = "SkEditor"; + genericName = "Skript Editor"; + keywords = [ + "skeditor" + "SkEditor" + ]; + categories = [ + "Utility" + "TextEditor" + "Development" + "IDE" + ]; + }) + ]; + passthru.updateScript = ./update.sh; meta = { @@ -29,6 +62,7 @@ buildDotnetModule rec { homepage = "https://github.com/SkEditorTeam/SkEditor"; changelog = "https://github.com/SkEditorTeam/SkEditor/releases/tag/v${version}"; license = lib.licenses.mit; + mainProgram = "SkEditor"; maintainers = with lib.maintainers; [ eveeifyeve ]; }; } From 220c6d0879f9bdf9c54901ec43809717119c7f2d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 8 Nov 2024 10:27:11 +0100 Subject: [PATCH 539/617] Revert "biopython: fix eval" This reverts commit 74ae5abbf1bccee90e13997fa68a2664a6a48bcd. --- pkgs/development/python-modules/biopython/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index 2a3d3d0b86e3..900c3f019f28 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "biopython"; repo = "biopython"; - rev = "refs/tags/biopython-${lib.replaceStrings [ "." ] [ "" ] version}"; + rev = "refs/tags/biopython-${lib.replaceChars [ "." ] [ "" ] version}"; hash = "sha256-zXUB/AkWc/cY9M02WheSvXjT/nwM+lGXfXgCcWfu0G4="; }; From 95aa3d12c670528f16d01262cad53a2c199c8814 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 8 Nov 2024 10:27:23 +0100 Subject: [PATCH 540/617] Revert "python3Packages.biopython: 1.83 -> 1.84" This reverts commit a30bd9c1992ddce61e9ecb4add359011fd30f669. --- .../biopython/close_parser_on_time.patch | 18 ++++++++++++++++++ .../python-modules/biopython/default.nix | 18 +++++++++++------- 2 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/python-modules/biopython/close_parser_on_time.patch diff --git a/pkgs/development/python-modules/biopython/close_parser_on_time.patch b/pkgs/development/python-modules/biopython/close_parser_on_time.patch new file mode 100644 index 000000000000..05d22e22ed9e --- /dev/null +++ b/pkgs/development/python-modules/biopython/close_parser_on_time.patch @@ -0,0 +1,18 @@ +diff --git a/Bio/SeqIO/SeqXmlIO.py b/Bio/SeqIO/SeqXmlIO.py +index 8fe75ebb728..6758317d05f 100644 +--- a/Bio/SeqIO/SeqXmlIO.py ++++ b/Bio/SeqIO/SeqXmlIO.py +@@ -498,11 +498,12 @@ def iterate(self, handle): + if not text: + break + parser.feed(text) ++ # Closing the parser ensures that all XML data fed into it are processed ++ parser.close() + # We have reached the end of the XML file; + # send out the remaining records + yield from records + records.clear() +- parser.close() + + + class SeqXmlWriter(SequenceWriter): diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index 900c3f019f28..051f66845dec 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitHub, + fetchPypi, pythonOlder, setuptools, numpy, @@ -9,18 +9,22 @@ buildPythonPackage rec { pname = "biopython"; - version = "1.84"; + version = "1.83"; pyproject = true; disabled = pythonOlder "3.9"; - src = fetchFromGitHub { - owner = "biopython"; - repo = "biopython"; - rev = "refs/tags/biopython-${lib.replaceChars [ "." ] [ "" ] version}"; - hash = "sha256-zXUB/AkWc/cY9M02WheSvXjT/nwM+lGXfXgCcWfu0G4="; + src = fetchPypi { + inherit pname version; + hash = "sha256-eOa/t43mMDQDev01/nfLbgqeW2Jwa+z3in2SKxbtg/c="; }; + patches = [ + # cherry-picked from https://github.com/biopython/biopython/commit/3f9bda7ef44f533dadbaa0de29ac21929bc0b2f1 + # fixes SeqXMLIO parser to process all data. remove on next update + ./close_parser_on_time.patch + ]; + build-system = [ setuptools ]; dependencies = [ numpy ]; From b5394df77e04dd7d3a5139ec203e2b087bd377ee Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Fri, 8 Nov 2024 07:13:58 +0100 Subject: [PATCH 541/617] gh: 2.60.0 -> 2.61.0 --- pkgs/applications/version-management/gh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index 83781ea1cfcf..dbfbf72ccd5e 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "gh"; - version = "2.60.0"; + version = "2.61.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-Tvyf58f/9bOUiUAG6R9nhOerZh5Yt3LyKx88oF3s0jI="; + hash = "sha256-zzcptg2hTQDRWFbC99q/Qy+Nk2vrhekYc5dMr3fjFD0="; }; - vendorHash = "sha256-nwGmYFWyAr34F4rmqFC3cK+fbUq6LRaqXhekx4Ab5sE="; + vendorHash = "sha256-b8HO4mevQcfX/VpJv1ZefXWAeXyhsy6074fvVNoH/8Y="; nativeBuildInputs = [ installShellFiles ]; From ef75306d61a5a99bfa758e943afd3aee45aba812 Mon Sep 17 00:00:00 2001 From: Will Bush Date: Fri, 8 Nov 2024 03:35:34 -0600 Subject: [PATCH 542/617] maintainers: update willbush Remove GPG keys. --- maintainers/maintainer-list.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f419fa734a09..463da12cada2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -23408,7 +23408,6 @@ github = "willbush"; githubId = 2023546; name = "Will Bush"; - keys = [ { fingerprint = "4441 422E 61E4 C8F3 EBFE 5E33 3823 864B 54B1 3BDA"; } ]; }; willcohen = { github = "willcohen"; From 28335ee34d500fc48fe7b8ee69e016525d6062e1 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 8 Nov 2024 12:43:07 +0300 Subject: [PATCH 543/617] python312Packages.pyside6: 6.8.0 -> 6.8.0.2, cherry-pick patch Patch fixes building Falkon and probably more things that use PySide.QtWebEngine. --- .../python-modules/pyside6/default.nix | 10 +++++++- .../pyside6/fix-installing-docs.patch | 25 +++++++++++++++++++ .../python-modules/shiboken6/default.nix | 8 +++--- 3 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/python-modules/pyside6/fix-installing-docs.patch diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix index 9464034178b2..652e84d9a366 100644 --- a/pkgs/development/python-modules/pyside6/default.nix +++ b/pkgs/development/python-modules/pyside6/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, cmake, cups, ninja, @@ -57,7 +58,14 @@ stdenv.mkDerivation (finalAttrs: { inherit (shiboken6) version src; - sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/pyside6"; + sourceRoot = "pyside-setup-everywhere-src-6.8.0/sources/pyside6"; + + patches = [ + # Manual backport of https://code.qt.io/cgit/pyside/pyside-setup.git/patch/?id=cacc9c5803a6dec820dd46211a836453183c8dab + # to fit our structure. + # FIXME: remove for 6.8.1 + ./fix-installing-docs.patch + ]; # cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS # reside in the same directory as QtCore.framework, which is not true for Nix. diff --git a/pkgs/development/python-modules/pyside6/fix-installing-docs.patch b/pkgs/development/python-modules/pyside6/fix-installing-docs.patch new file mode 100644 index 000000000000..4d8178f153e6 --- /dev/null +++ b/pkgs/development/python-modules/pyside6/fix-installing-docs.patch @@ -0,0 +1,25 @@ +--- a/cmake/Macros/PySideModules.cmake ++++ b/cmake/Macros/PySideModules.cmake +@@ -176,6 +176,14 @@ macro(create_pyside_module) + set(${module_NAME}_glue_dependency ${${module_NAME}_glue}) + endif() + ++ # Install module doc files. ++ set(${module_NAME}_doc "${CMAKE_CURRENT_SOURCE_DIR}/../doc/${lower_module_name}.rst") ++ set(${module_name}_doc_dependency "") ++ if(EXISTS ${${module_NAME}_doc}) ++ install(FILES ${${module_NAME}_doc} DESTINATION share/PySide6${pyside6_SUFFIX}/doc) ++ set(${module_NAME}_doc_dependency ${${module_NAME}_doc}) ++ endif() ++ + # Install standalone glue files into typesystems subfolder, so that the resolved relative + # paths remain correct. + if (module_GLUE_SOURCES) +@@ -245,6 +253,7 @@ macro(create_pyside_module) + DEPENDS ${total_type_system_files} + ${module_GLUE_SOURCES} + ${${module_NAME}_glue_dependency} ++ ${${module_NAME}_doc_dependency} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMENT "Running generator for ${module_NAME}...") + \ No newline at end of file diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix index f49739d57c37..911f68900789 100644 --- a/pkgs/development/python-modules/shiboken6/default.nix +++ b/pkgs/development/python-modules/shiboken6/default.nix @@ -13,16 +13,16 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "shiboken6"; - version = "6.8"; + version = "6.8.0.2"; src = fetchurl { # https://download.qt.io/official_releases/QtForPython/shiboken6/ # FIXME: inconsistent version numbers in directory name and tarball? - url = "mirror://qt/official_releases/QtForPython/shiboken6/PySide6-${finalAttrs.version}.0-src/pyside-setup-everywhere-src-${finalAttrs.version}.tar.xz"; - hash = "sha256-XAWtOufnJ51tudyUpG6woF/Qk1NzCfdDnDhnG9clUZA="; + url = "mirror://qt/official_releases/QtForPython/shiboken6/PySide6-6.8.0.2-src/pyside-setup-everywhere-src-6.8.0.tar.xz"; + hash = "sha256-Ghohmo8yfjQNJYJ1+tOp8mG48EvFcEF0fnPdatJStOE="; }; - sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/shiboken6"; + sourceRoot = "pyside-setup-everywhere-src-6.8.0/sources/shiboken6"; patches = [ ./fix-include-qt-headers.patch ]; From 13d4678f73f10d199be768d05df55fb68ca94731 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Mon, 4 Nov 2024 17:26:36 +0100 Subject: [PATCH 544/617] mautrix-signal: fix build with goolm enabled When building with goolm support, libstdc++ must be linked, as libsignal-ffi depends on it being linked. When building with (deprecated) libolm, it's pulled in transitively, it seems -- and it that case, this is effectively a no-op. Signed-off-by: Christoph Heiss --- pkgs/servers/mautrix-signal/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index 0b21bd539d1d..2d657d23aeb5 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, fetchpatch, @@ -32,13 +33,19 @@ buildGoModule rec { }) ]; - buildInputs = (lib.optional (!withGoolm) olm) ++ [ - # must match the version used in https://github.com/mautrix/signal/tree/main/pkg/libsignalgo - # see https://github.com/mautrix/signal/issues/401 - libsignal-ffi - ]; + buildInputs = + (lib.optional (!withGoolm) olm) + ++ (lib.optional withGoolm stdenv.cc.cc.lib) + ++ [ + # must match the version used in https://github.com/mautrix/signal/tree/main/pkg/libsignalgo + # see https://github.com/mautrix/signal/issues/401 + libsignal-ffi + ]; + tags = lib.optional withGoolm "goolm"; + CGO_LDFLAGS = lib.optional withGoolm [ "-lstdc++" ]; + vendorHash = "sha256-bKQKO5RqgMrWq7NyNF1rj2CLp5SeBP80HWxF8MWnZ1U="; doCheck = false; From 9e1572824162b02e4fff522cf894d9134c6f4c54 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Tue, 5 Nov 2024 00:24:44 +0100 Subject: [PATCH 545/617] mautrix-signal: enable checks Signed-off-by: Christoph Heiss --- pkgs/servers/mautrix-signal/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index 2d657d23aeb5..e9cd4501d7b6 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -48,7 +48,20 @@ buildGoModule rec { vendorHash = "sha256-bKQKO5RqgMrWq7NyNF1rj2CLp5SeBP80HWxF8MWnZ1U="; - doCheck = false; + doCheck = true; + preCheck = + '' + # Needed by the tests to be able to find libstdc++ + export LD_LIBRARY_PATH="${stdenv.cc.cc.lib}/lib:$LD_LIBRARY_PATH" + '' + + (lib.optionalString (!withGoolm) '' + # When using libolm, the tests need explicit linking to libstdc++ + export CGO_LDFLAGS="-lstdc++" + ''); + + postCheck = '' + unset LD_LIBRARY_PATH + ''; meta = with lib; { homepage = "https://github.com/mautrix/signal"; From 218ad1bf6ab44b5553165f4c524460bded982e9e Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Tue, 5 Nov 2024 13:37:07 +0100 Subject: [PATCH 546/617] mautrix-signal: add version test Signed-off-by: Christoph Heiss --- pkgs/servers/mautrix-signal/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index e9cd4501d7b6..60ce7a9cc13e 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -6,6 +6,7 @@ fetchpatch, olm, libsignal-ffi, + versionCheckHook, # This option enables the use of an experimental pure-Go implementation of # the Olm protocol instead of libolm for end-to-end encryption. Using goolm # is not recommended by the mautrix developers, but they are interested in @@ -63,6 +64,10 @@ buildGoModule rec { unset LD_LIBRARY_PATH ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = [ "--version" ]; + meta = with lib; { homepage = "https://github.com/mautrix/signal"; description = "Matrix-Signal puppeting bridge"; From 14a23934aa5832ac0a07245784a519cf836fd533 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Nov 2024 10:22:07 +0000 Subject: [PATCH 547/617] cargo-leptos: 0.2.20 -> 0.2.21 --- pkgs/development/tools/rust/cargo-leptos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-leptos/default.nix b/pkgs/development/tools/rust/cargo-leptos/default.nix index 5a14ac34252d..9bf841fe3ffa 100644 --- a/pkgs/development/tools/rust/cargo-leptos/default.nix +++ b/pkgs/development/tools/rust/cargo-leptos/default.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage rec { pname = "cargo-leptos"; - version = "0.2.20"; + version = "0.2.21"; src = fetchFromGitHub { owner = "leptos-rs"; repo = pname; rev = "v${version}"; - hash = "sha256-45zus+mNOiWWbuF50XpMwc1B6Uoy5E1kUQmtdGVc46g="; + hash = "sha256-Oe65m9io7ihymUjylaWHQM/x7r0y/xXqD313H3oyjN8="; }; - cargoHash = "sha256-54CRNSDWdqD582Vv6d8snYEJrpkQ2Cvp8sjgQ6BcvHY="; + cargoHash = "sha256-wZNtEr6IAy+OABpTm93rOhKAP1NEEYUvokjaVdoaSG4="; buildInputs = optionals isDarwin [ SystemConfiguration From e90f96d2fa4e183911adfbed8907b066be4b0672 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 8 Nov 2024 11:49:46 +0100 Subject: [PATCH 548/617] python312Packages.bx-python: add missing dep, unbreak --- pkgs/development/python-modules/bx-python/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix index 89ab2699c89e..4267e09fd538 100644 --- a/pkgs/development/python-modules/bx-python/default.nix +++ b/pkgs/development/python-modules/bx-python/default.nix @@ -3,6 +3,7 @@ fetchFromGitHub, buildPythonPackage, numpy, + pyparsing, cython, zlib, python-lzo, @@ -37,7 +38,10 @@ buildPythonPackage rec { buildInputs = [ zlib ]; - dependencies = [ numpy ]; + dependencies = [ + numpy + pyparsing + ]; nativeCheckInputs = [ python-lzo From 2fde3fa48202a63fb91912b0be686c702e3a09bf Mon Sep 17 00:00:00 2001 From: John Garcia Date: Fri, 8 Nov 2024 08:46:45 +0000 Subject: [PATCH 549/617] apx-gui: 1.0.3 -> 1.0.4 Changelog: https://github.com/Vanilla-OS/apx-gui/releases/tag/v1.0.4 --- pkgs/by-name/ap/apx-gui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ap/apx-gui/package.nix b/pkgs/by-name/ap/apx-gui/package.nix index 0034181cc9da..7c877dfd687d 100644 --- a/pkgs/by-name/ap/apx-gui/package.nix +++ b/pkgs/by-name/ap/apx-gui/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "apx-gui"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "Vanilla-OS"; repo = "apx-gui"; rev = "v${finalAttrs.version}"; - hash = "sha256-UgDBDk4ChgWFUoz5BAXbn0b4Bngs9/hTmcu1Y4FXLU0="; + hash = "sha256-nZMbVXeWEgfBsVgX2iESRzDgu0tjiqC1dTCaTlW0iWA="; }; strictDeps = true; @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config - (python3.withPackages (ps: [ ps.pygobject3 ps.requests ])) + (python3.withPackages (ps: [ ps.pygobject3 ps.pyyaml ps.requests ])) wrapGAppsHook4 ]; From 7b094e2b2b6b3a06d05117d74f8b17a4c820c1d7 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 8 Nov 2024 12:44:45 +0100 Subject: [PATCH 550/617] python312Packages.cx-freeze: unbreak --- pkgs/development/python-modules/cx-freeze/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cx-freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix index 00b0eee17544..ea2d9d1b0ca6 100644 --- a/pkgs/development/python-modules/cx-freeze/default.nix +++ b/pkgs/development/python-modules/cx-freeze/default.nix @@ -29,8 +29,7 @@ buildPythonPackage rec { sed -i /patchelf/d pyproject.toml # Build system requirements substituteInPlace pyproject.toml \ - --replace-fail "setuptools>=65.6.3,<71" "setuptools" \ - --replace-fail "wheel>=0.42.0,<=0.43.0" "wheel" + --replace-fail "setuptools>=70.1,<75" "setuptools" ''; build-system = [ From 3ce4ab2b90c623db95ed2a1635f159bd7e019c99 Mon Sep 17 00:00:00 2001 From: John Garcia Date: Fri, 8 Nov 2024 11:45:58 +0000 Subject: [PATCH 551/617] apx-gui: format with nixfmt --- pkgs/by-name/ap/apx-gui/package.nix | 56 +++++++++++++++++------------ 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/ap/apx-gui/package.nix b/pkgs/by-name/ap/apx-gui/package.nix index 7c877dfd687d..36494e074b14 100644 --- a/pkgs/by-name/ap/apx-gui/package.nix +++ b/pkgs/by-name/ap/apx-gui/package.nix @@ -1,18 +1,19 @@ -{ lib -, stdenv -, fetchFromGitHub -, appstream-glib -, desktop-file-utils -, gobject-introspection -, libadwaita -, meson -, ninja -, pkg-config -, python3 -, wrapGAppsHook4 -, apx -, gnome-console -, vte-gtk4 +{ + lib, + stdenv, + fetchFromGitHub, + appstream-glib, + desktop-file-utils, + gobject-introspection, + libadwaita, + meson, + ninja, + pkg-config, + python3, + wrapGAppsHook4, + apx, + gnome-console, + vte-gtk4, }: stdenv.mkDerivation (finalAttrs: { @@ -20,9 +21,9 @@ stdenv.mkDerivation (finalAttrs: { version = "1.0.4"; src = fetchFromGitHub { - owner = "Vanilla-OS"; - repo = "apx-gui"; - rev = "v${finalAttrs.version}"; + owner = "Vanilla-OS"; + repo = "apx-gui"; + rev = "v${finalAttrs.version}"; hash = "sha256-nZMbVXeWEgfBsVgX2iESRzDgu0tjiqC1dTCaTlW0iWA="; }; @@ -35,7 +36,11 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config - (python3.withPackages (ps: [ ps.pygobject3 ps.pyyaml ps.requests ])) + (python3.withPackages (ps: [ + ps.pygobject3 + ps.pyyaml + ps.requests + ])) wrapGAppsHook4 ]; @@ -46,15 +51,20 @@ stdenv.mkDerivation (finalAttrs: { preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${lib.makeBinPath [ apx gnome-console ]}" + --prefix PATH : "${ + lib.makeBinPath [ + apx + gnome-console + ] + }" ) ''; meta = { description = "GUI frontend for Apx in GTK 4 and Libadwaita"; - homepage = "https://github.com/Vanilla-OS/apx-gui"; - license = lib.licenses.gpl3Only; - platforms = lib.platforms.linux; + homepage = "https://github.com/Vanilla-OS/apx-gui"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ chewblacka ]; mainProgram = "apx-gui"; }; From 64fa24d5ee4859b829b619c2d839ffe7e91b42d1 Mon Sep 17 00:00:00 2001 From: Bojun Ren Date: Fri, 8 Nov 2024 20:00:52 +0800 Subject: [PATCH 552/617] xmake: 2.9.5 -> 2.9.6 --- .../tools/build-managers/xmake/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/build-managers/xmake/default.nix b/pkgs/development/tools/build-managers/xmake/default.nix index 073ca4ac017f..537509a83b31 100644 --- a/pkgs/development/tools/build-managers/xmake/default.nix +++ b/pkgs/development/tools/build-managers/xmake/default.nix @@ -4,25 +4,22 @@ fetchurl, fetchpatch, CoreServices, + nix-update-script, }: stdenv.mkDerivation rec { pname = "xmake"; - version = "2.9.5"; + version = "2.9.6"; src = fetchurl { url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz"; - hash = "sha256-A/61eH4i+rjdQEGew9hKvTWrzZ+KGyTEiMfrVx1nJMg="; + hash = "sha256-R/bvywD5DJigLDlflztNVb3TqP5FJnbc5XtVwFV1loY="; }; - patches = [ - (fetchpatch { - name = "xmake-fix-configure-compatibility.patch"; - url = "https://github.com/xmake-io/xmake/commit/2a1220727a367e753b92131577ab0c2fd974bff8.patch"; - hash = "sha256-xknlyydHvdwqTl975VQogKozT8nAp5+gPZQuRl1yXKE="; - }) - ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin CoreServices; + passthru = { + updateScript = nix-update-script { }; + }; + meta = with lib; { description = "Cross-platform build utility based on Lua"; homepage = "https://xmake.io"; From 1369cae5fe1a706530a515381a73223cf0a77932 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 8 Nov 2024 13:20:38 +0100 Subject: [PATCH 553/617] python311Packages.ahocorasick-rs: unbreak, add missing deps --- pkgs/development/python-modules/ahocorasick-rs/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/ahocorasick-rs/default.nix b/pkgs/development/python-modules/ahocorasick-rs/default.nix index 63c849e3537b..2f81eb4ccc4d 100644 --- a/pkgs/development/python-modules/ahocorasick-rs/default.nix +++ b/pkgs/development/python-modules/ahocorasick-rs/default.nix @@ -1,11 +1,13 @@ { lib, buildPythonPackage, + pythonOlder, fetchPypi, rustPlatform, pytestCheckHook, pyahocorasick, hypothesis, + typing-extensions, pytest-benchmark, }: @@ -32,6 +34,8 @@ buildPythonPackage rec { cargoSetupHook ]; + dependencies = lib.optionals (pythonOlder "3.12") [ typing-extensions ]; + nativeCheckInputs = [ pytest-benchmark pytestCheckHook From b8e58677b552cbe71617bbdfbf50ea4743eb5e15 Mon Sep 17 00:00:00 2001 From: arminius-smh Date: Fri, 8 Nov 2024 13:22:05 +0100 Subject: [PATCH 554/617] pwvucontrol: 0.4.5 -> 0.4.7 --- pkgs/applications/audio/pwvucontrol/Cargo.lock | 2 +- pkgs/applications/audio/pwvucontrol/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/pwvucontrol/Cargo.lock b/pkgs/applications/audio/pwvucontrol/Cargo.lock index d3df103deeca..9047b639e3ce 100644 --- a/pkgs/applications/audio/pwvucontrol/Cargo.lock +++ b/pkgs/applications/audio/pwvucontrol/Cargo.lock @@ -880,7 +880,7 @@ dependencies = [ [[package]] name = "pwvucontrol" -version = "0.4.5" +version = "0.4.7" dependencies = [ "anyhow", "futures", diff --git a/pkgs/applications/audio/pwvucontrol/default.nix b/pkgs/applications/audio/pwvucontrol/default.nix index 2726f1bedcab..203315886168 100644 --- a/pkgs/applications/audio/pwvucontrol/default.nix +++ b/pkgs/applications/audio/pwvucontrol/default.nix @@ -34,13 +34,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "pwvucontrol"; - version = "0.4.5"; + version = "0.4.7"; src = fetchFromGitHub { owner = "saivert"; repo = "pwvucontrol"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-s4sop1qmqPVOGX7erRfClUUcixNhi+wUY5MXSmv+zVk="; + hash = "sha256-v8xANTbaIPIAPoukP8rcVzM6NHNpS2Ej/nfdmg3Vgvg="; }; cargoDeps = rustPlatform.importCargoLock { From 9ef4d05b491d709c56172ede6d18d388b09e6ac9 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 8 Nov 2024 13:28:43 +0100 Subject: [PATCH 555/617] python312Packages.gguf: add missing dep, unbreak --- pkgs/development/python-modules/gguf/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/gguf/default.nix b/pkgs/development/python-modules/gguf/default.nix index 4040dbd16ac7..c3cb68d64fc0 100644 --- a/pkgs/development/python-modules/gguf/default.nix +++ b/pkgs/development/python-modules/gguf/default.nix @@ -6,6 +6,7 @@ poetry-core, pythonOlder, tqdm, + pyyaml, }: buildPythonPackage rec { pname = "gguf"; @@ -23,6 +24,7 @@ buildPythonPackage rec { numpy poetry-core tqdm + pyyaml ]; meta = with lib; { From c2933f4ca4a2b7e1e1a9976d3227ef52a4bc57d4 Mon Sep 17 00:00:00 2001 From: Tracy Wadleigh Date: Mon, 16 Sep 2024 09:27:06 -0700 Subject: [PATCH 556/617] Enable cdio_paranoia in mpd. --- pkgs/servers/mpd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 57178da7297f..829df9c427ba 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -2,7 +2,7 @@ # Darwin inputs , AudioToolbox, AudioUnit # Inputs -, curl, libmms, libnfs, liburing, samba +, curl, libcdio, libcdio-paranoia, libmms, libnfs, liburing, samba # Archive support , bzip2, zziplib # Codecs @@ -37,6 +37,7 @@ let udisks = [ dbus ]; webdav = [ curl expat ]; # Input plugins + cdio_paranoia = [ libcdio libcdio-paranoia ]; curl = [ curl ]; io_uring = [ liburing ]; mms = [ libmms ]; From 4036a4042f8a7459b0744dcff9ce01e660cf8642 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 8 Nov 2024 13:52:53 +0100 Subject: [PATCH 557/617] python311Packages.pypiserver: add missing deps, unbreak --- pkgs/development/python-modules/pypiserver/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pypiserver/default.nix b/pkgs/development/python-modules/pypiserver/default.nix index 419a3e07c123..6202ae3156cf 100644 --- a/pkgs/development/python-modules/pypiserver/default.nix +++ b/pkgs/development/python-modules/pypiserver/default.nix @@ -13,6 +13,8 @@ watchdog, webtest, wheel, + build, + importlib-resources, }: buildPythonPackage rec { @@ -38,7 +40,7 @@ buildPythonPackage rec { dependencies = [ distutils pip - ]; + ] ++ lib.optionals (pythonOlder "3.12") [ importlib-resources ]; optional-dependencies = { passlib = [ passlib ]; @@ -51,6 +53,7 @@ buildPythonPackage rec { setuptools twine webtest + build ] ++ lib.flatten (builtins.attrValues optional-dependencies); __darwinAllowLocalNetworking = true; From f3b32bf6edc3474283980c9b9857f905f90ddb7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 8 Nov 2024 13:44:02 +0100 Subject: [PATCH 558/617] nixos-anywhere: 1.4.0 -> 1.5.0 Diff: https://github.com/nix-community/nixos-anywhere/compare/1.4.0...1.5.0 --- pkgs/by-name/ni/nixos-anywhere/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixos-anywhere/package.nix b/pkgs/by-name/ni/nixos-anywhere/package.nix index ee41d4ff3e59..a4247f5ccb00 100644 --- a/pkgs/by-name/ni/nixos-anywhere/package.nix +++ b/pkgs/by-name/ni/nixos-anywhere/package.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nixos-anywhere"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixos-anywhere"; rev = finalAttrs.version; - hash = "sha256-ssx6Y665uoOO3PX6Mp9NAF8sqoGb7Ezfw+bTY69aGlE="; + hash = "sha256-LrCxIU6laEf4JD1QtOBNr+PASY6CbNPpUrjLIUizt+Y="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' From 201990c787c8082dd4042b2b4a9b271b40ba6717 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Nov 2024 13:01:41 +0000 Subject: [PATCH 559/617] leetgo: 1.4.9 -> 1.4.10 --- pkgs/by-name/le/leetgo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/le/leetgo/package.nix b/pkgs/by-name/le/leetgo/package.nix index b4fcfd9aad0a..df8c7f291b5f 100644 --- a/pkgs/by-name/le/leetgo/package.nix +++ b/pkgs/by-name/le/leetgo/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "leetgo"; - version = "1.4.9"; + version = "1.4.10"; src = fetchFromGitHub { owner = "j178"; repo = "leetgo"; rev = "v${version}"; - hash = "sha256-FlQYTNz1Fh0igwnufjVXN4bsUYBB1kls19D+/v7Ztps="; + hash = "sha256-0cBhJfxzzZ5IrVVYNWVoKK9c1baj5U2CvDO52wdsjcs="; }; - vendorHash = "sha256-DdAe9yyusA6Ac8ioKqLiM5lcOt9Xy7F77gMG6yBTl7Q="; + vendorHash = "sha256-1/U+sPauV3kYvQKTGSuX9FvvEFNsksTPXtfZH0a/o0s="; nativeBuildInputs = [ installShellFiles ]; From 546749a274a33333214c7b342302d919986c1b16 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 8 Nov 2024 14:18:23 +0100 Subject: [PATCH 560/617] python312Packages.linode-api: add missing dep, unbreak --- pkgs/development/python-modules/linode-api/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix index 10d4f9aba790..e98a78f9bc1d 100644 --- a/pkgs/development/python-modules/linode-api/default.nix +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -6,6 +6,7 @@ setuptools, requests, polling, + deprecated, pytestCheckHook, mock, httpretty, @@ -31,6 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests polling + deprecated ]; nativeCheckInputs = [ From 2addaab35a947de5b9fba37cbdffce5662f5a69a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Nov 2024 13:19:21 +0000 Subject: [PATCH 561/617] media-downloader: 5.1.0 -> 5.2.0 --- pkgs/by-name/me/media-downloader/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/media-downloader/package.nix b/pkgs/by-name/me/media-downloader/package.nix index 4da1bfba070b..8a02682a7f42 100644 --- a/pkgs/by-name/me/media-downloader/package.nix +++ b/pkgs/by-name/me/media-downloader/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "media-downloader"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "media-downloader"; rev = finalAttrs.version; - hash = "sha256-uN7u6/XRDpJFaZiMOYzLvTC7f0MIlKUGh6ter6aPzbI="; + hash = "sha256-DytzYnvO8LEDYWzySzoWCAwXw0VKzjlCrjvcCjm0ilE="; }; nativeBuildInputs = [ From 61e6b1f52dc8fd44119e2c80c1521ac8aefee78c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 8 Nov 2024 13:51:56 +0100 Subject: [PATCH 562/617] nixos-facter: 0.1.1 -> 0.2.0 Diff: https://github.com/numtide/nixos-facter/compare/v0.1.1...v0.2.0 --- pkgs/by-name/ni/nixos-facter/package.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ni/nixos-facter/package.nix b/pkgs/by-name/ni/nixos-facter/package.nix index 4d0bb4abb382..c9d2f1d5171e 100644 --- a/pkgs/by-name/ni/nixos-facter/package.nix +++ b/pkgs/by-name/ni/nixos-facter/package.nix @@ -9,6 +9,7 @@ util-linux, pciutils, stdenv, + systemdMinimal, }: let # We are waiting on some changes to be merged upstream: https://github.com/openSUSE/hwinfo/pulls @@ -16,23 +17,23 @@ let src = fetchFromGitHub { owner = "numtide"; repo = "hwinfo"; - rev = "a559f34934098d54096ed2078e750a8245ae4044"; - hash = "sha256-3abkWPr98qXXQ17r1Z43gh2M5hl/DHjW2hfeWl+GSAs="; + rev = "c2259845d10694c099fb306a8cfc5a403e71c708"; + hash = "sha256-RGIoJkYiNMRHwUclzdRMELxCgBU9Pfvaghvt3op0zM0="; }; }; in buildGoModule rec { pname = "nixos-facter"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "numtide"; repo = "nixos-facter"; rev = "v${version}"; - hash = "sha256-vlPmvCrgX64dcf//BPtQszBt7dkq35JpgQg+/LW0AqM="; + hash = "sha256-Rird32KB+V1xGBZvrEaPDPOhl5YMClIljOLcFO/0vOU="; }; - vendorHash = "sha256-5leiTNp3FJmgFd0SKhu18hxYZ2G9SuQPhZJjki2SDVs="; + vendorHash = "sha256-qDzd+aq08PN9kl1YkvNLGvWaFVh7xFXJhGdx/ELwYGY="; CGO_ENABLED = 1; @@ -50,6 +51,7 @@ buildGoModule rec { libusb1 util-linux pciutils + systemdMinimal ]; ldflags = [ From 2074ec37fecad2b9e2cfe56e6507223f73a302d7 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 8 Nov 2024 14:25:09 +0100 Subject: [PATCH 563/617] python312Packages.chispa: add missing dep, unbreak --- pkgs/development/python-modules/chispa/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chispa/default.nix b/pkgs/development/python-modules/chispa/default.nix index c8ac9dcb5bb2..27369e9d76c7 100644 --- a/pkgs/development/python-modules/chispa/default.nix +++ b/pkgs/development/python-modules/chispa/default.nix @@ -5,6 +5,7 @@ poetry-core, pythonOlder, setuptools, + prettytable, }: buildPythonPackage rec { @@ -21,9 +22,12 @@ buildPythonPackage rec { hash = "sha256-WPtn8YGlj67MEy2onxoU5SctQ7NcvTImaU0VgMoz2B4="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ setuptools ]; + dependencies = [ + setuptools + prettytable + ]; # Tests require a spark installation doCheck = false; From 58c6071308f2c77624ef7c6c8259277fd4c04acd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 7 Nov 2024 22:59:06 +0100 Subject: [PATCH 564/617] meshcentral: 1.1.32 -> 1.1.33 ChangeLog: https://github.com/Ylianst/MeshCentral/releases/tag/1.1.33 --- pkgs/tools/admin/meshcentral/default.nix | 21 +- pkgs/tools/admin/meshcentral/package.json | 26 +- pkgs/tools/admin/meshcentral/yarn.lock | 1672 ++++++++++----------- 3 files changed, 851 insertions(+), 868 deletions(-) diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix index 0af400ca4e2c..529ce3f51282 100644 --- a/pkgs/tools/admin/meshcentral/default.nix +++ b/pkgs/tools/admin/meshcentral/default.nix @@ -1,5 +1,6 @@ { lib , fetchzip +, fetchpatch , fetchYarnDeps , yarn2nix-moretea , nodejs_18 @@ -7,21 +8,31 @@ }: yarn2nix-moretea.mkYarnPackage { - version = "1.1.32"; + version = "1.1.33"; src = fetchzip { - url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.32.tgz"; - sha256 = "1faf1f4rkk3164fhh3bp6h4sbkgaq1x8swdsvnhwy0fqckzkcwms"; + url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.33.tgz"; + sha256 = "0s362iwnwmfpz5gbjnvjwccchx03hl53v6yqyyy34vy4f1mxvyim"; }; - patches = [ ./fix-js-include-paths.patch ]; + patches = [ + ./fix-js-include-paths.patch + + # With this change, meshcentral fails to detect installed dependencies + # and tries to install those at runtime. Hence, reverting. + (fetchpatch { + hash = "sha256-MtFnU1FI7wNBiTGmW67Yn4oszviODcAJOL1PIi78+ic="; + url = "https://github.com/Ylianst/MeshCentral/commit/cfe9345b53fcd660985d7ce7b82278182b40f41e.patch"; + revert = true; + }) + ]; packageJSON = ./package.json; yarnLock = ./yarn.lock; offlineCache = fetchYarnDeps { yarnLock = ./yarn.lock; - hash = "sha256-e+qzA0u4OywlcHpxLnoZQc2h35M65/GKu8mYs6+1I5c="; + hash = "sha256-W1MMZRDoeBJ3nGzXFVPGsrAtk4FlQGTUhFpPCdpdHPI="; }; # Tarball has CRLF line endings. This makes patching difficult, so let's convert them. diff --git a/pkgs/tools/admin/meshcentral/package.json b/pkgs/tools/admin/meshcentral/package.json index 1ad815be5330..c90d522c1971 100644 --- a/pkgs/tools/admin/meshcentral/package.json +++ b/pkgs/tools/admin/meshcentral/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "1.1.32", + "version": "1.1.33", "keywords": [ "Remote Device Management", "Remote Device Monitoring", @@ -42,16 +42,16 @@ "body-parser": "1.20.3", "cbor": "5.2.0", "compression": "1.7.4", - "cookie-session": "2.0.0", - "express": "4.21.0", + "cookie-session": "2.1.0", + "express": "4.21.1", "express-handlebars": "7.1.3", "express-ws": "5.0.2", "ipcheck": "0.1.0", "minimist": "1.2.8", "multiparty": "4.2.3", "node-forge": "1.3.1", - "ua-parser-js": "1.0.37", - "ws": "8.17.1", + "ua-parser-js": "1.0.39", + "ws": "8.18.0", "yauzl": "2.10.0" }, "engines": { @@ -70,14 +70,14 @@ "passport-github2": "*", "passport-azure-oauth2": "*", "jwt-simple": "*", - "openid-client": "*", + "openid-client": "5.7.0", "passport-saml": "*", "archiver": "7.0.1", "body-parser": "1.20.3", "cbor": "5.2.0", "compression": "1.7.4", - "cookie-session": "2.0.0", - "express": "4.21.0", + "cookie-session": "2.1.0", + "express": "4.21.1", "express-handlebars": "7.1.3", "express-ws": "5.0.2", "ipcheck": "0.1.0", @@ -85,16 +85,16 @@ "multiparty": "4.2.3", "@yetzt/nedb": "*", "node-forge": "1.3.1", - "ua-parser-js": "1.0.37", - "ws": "8.17.1", + "ua-parser-js": "1.0.39", + "ws": "8.18.0", "yauzl": "2.10.0", "node-windows": "0.1.14", "loadavg-windows": "1.1.1", "node-sspi": "0.2.10", "ldapauth-fork": "5.0.5", - "ssh2": "1.15.0", + "ssh2": "1.16.0", "svg-captcha": "1.4.0", - "image-size": "1.0.2", + "image-size": "1.1.1", "acme-client": "4.2.5", "aedes": "0.39.0", "mysql2": "3.6.2", @@ -110,7 +110,7 @@ "semver": "7.5.4", "https-proxy-agent": "7.0.2", "mongojs": "3.1.0", - "nodemailer": "6.9.8", + "nodemailer": "6.9.15", "@sendgrid/mail": "*", "jsdom": "22.1.0", "esprima": "4.0.1", diff --git a/pkgs/tools/admin/meshcentral/yarn.lock b/pkgs/tools/admin/meshcentral/yarn.lock index 2a7306f602af..c100dd4a110e 100644 --- a/pkgs/tools/admin/meshcentral/yarn.lock +++ b/pkgs/tools/admin/meshcentral/yarn.lock @@ -48,443 +48,454 @@ "@smithy/util-utf8" "^2.0.0" tslib "^2.6.2" -"@aws-sdk/client-cognito-identity@3.658.1": - version "3.658.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.658.1.tgz#87f800883330c43d41426602dbe9b5149375743e" - integrity sha512-MCYLKmNy0FlNT9TvXfOxj0jh+ZQq+G9qEy/VZqu3JsQSgiFvFRdzgzcbQ9gQx7fZrDC/TPdABOTh483zI4cu9g== +"@aws-sdk/client-cognito-identity@3.687.0": + version "3.687.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.687.0.tgz#286e7eb3908dabb075fb8c0a4b21b424f2e5e2ef" + integrity sha512-jcQTioloSed+Jc3snjrgpWejkOm8t3Zt+jWrApw3ejN8qBtpFCH43M7q/CSDVZ9RS1IjX+KRWoBFnrDOnbuw0Q== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/client-sso-oidc" "3.658.1" - "@aws-sdk/client-sts" "3.658.1" - "@aws-sdk/core" "3.658.1" - "@aws-sdk/credential-provider-node" "3.658.1" - "@aws-sdk/middleware-host-header" "3.654.0" - "@aws-sdk/middleware-logger" "3.654.0" - "@aws-sdk/middleware-recursion-detection" "3.654.0" - "@aws-sdk/middleware-user-agent" "3.654.0" - "@aws-sdk/region-config-resolver" "3.654.0" - "@aws-sdk/types" "3.654.0" - "@aws-sdk/util-endpoints" "3.654.0" - "@aws-sdk/util-user-agent-browser" "3.654.0" - "@aws-sdk/util-user-agent-node" "3.654.0" - "@smithy/config-resolver" "^3.0.8" - "@smithy/core" "^2.4.6" - "@smithy/fetch-http-handler" "^3.2.8" - "@smithy/hash-node" "^3.0.6" - "@smithy/invalid-dependency" "^3.0.6" - "@smithy/middleware-content-length" "^3.0.8" - "@smithy/middleware-endpoint" "^3.1.3" - "@smithy/middleware-retry" "^3.0.21" - "@smithy/middleware-serde" "^3.0.6" - "@smithy/middleware-stack" "^3.0.6" - "@smithy/node-config-provider" "^3.1.7" - "@smithy/node-http-handler" "^3.2.3" - "@smithy/protocol-http" "^4.1.3" - "@smithy/smithy-client" "^3.3.5" - "@smithy/types" "^3.4.2" - "@smithy/url-parser" "^3.0.6" + "@aws-sdk/client-sso-oidc" "3.687.0" + "@aws-sdk/client-sts" "3.687.0" + "@aws-sdk/core" "3.686.0" + "@aws-sdk/credential-provider-node" "3.687.0" + "@aws-sdk/middleware-host-header" "3.686.0" + "@aws-sdk/middleware-logger" "3.686.0" + "@aws-sdk/middleware-recursion-detection" "3.686.0" + "@aws-sdk/middleware-user-agent" "3.687.0" + "@aws-sdk/region-config-resolver" "3.686.0" + "@aws-sdk/types" "3.686.0" + "@aws-sdk/util-endpoints" "3.686.0" + "@aws-sdk/util-user-agent-browser" "3.686.0" + "@aws-sdk/util-user-agent-node" "3.687.0" + "@smithy/config-resolver" "^3.0.10" + "@smithy/core" "^2.5.1" + "@smithy/fetch-http-handler" "^4.0.0" + "@smithy/hash-node" "^3.0.8" + "@smithy/invalid-dependency" "^3.0.8" + "@smithy/middleware-content-length" "^3.0.10" + "@smithy/middleware-endpoint" "^3.2.1" + "@smithy/middleware-retry" "^3.0.25" + "@smithy/middleware-serde" "^3.0.8" + "@smithy/middleware-stack" "^3.0.8" + "@smithy/node-config-provider" "^3.1.9" + "@smithy/node-http-handler" "^3.2.5" + "@smithy/protocol-http" "^4.1.5" + "@smithy/smithy-client" "^3.4.2" + "@smithy/types" "^3.6.0" + "@smithy/url-parser" "^3.0.8" "@smithy/util-base64" "^3.0.0" "@smithy/util-body-length-browser" "^3.0.0" "@smithy/util-body-length-node" "^3.0.0" - "@smithy/util-defaults-mode-browser" "^3.0.21" - "@smithy/util-defaults-mode-node" "^3.0.21" - "@smithy/util-endpoints" "^2.1.2" - "@smithy/util-middleware" "^3.0.6" - "@smithy/util-retry" "^3.0.6" + "@smithy/util-defaults-mode-browser" "^3.0.25" + "@smithy/util-defaults-mode-node" "^3.0.25" + "@smithy/util-endpoints" "^2.1.4" + "@smithy/util-middleware" "^3.0.8" + "@smithy/util-retry" "^3.0.8" "@smithy/util-utf8" "^3.0.0" tslib "^2.6.2" -"@aws-sdk/client-sso-oidc@3.658.1": - version "3.658.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.658.1.tgz#67286348374146e80a0345064d101175730012ed" - integrity sha512-RGcZAI3qEA05JszPKwa0cAyp8rnS1nUvs0Sqw4hqLNQ1kD7b7V6CPjRXe7EFQqCOMvM4kGqx0+cEEVTOmBsFLw== +"@aws-sdk/client-sso-oidc@3.687.0": + version "3.687.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.687.0.tgz#a327cc65b7bb2cbda305c4467bfae452b5d27927" + integrity sha512-Rdd8kLeTeh+L5ZuG4WQnWgYgdv7NorytKdZsGjiag1D8Wv3PcJvPqqWdgnI0Og717BSXVoaTYaN34FyqFYSx6Q== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.658.1" - "@aws-sdk/credential-provider-node" "3.658.1" - "@aws-sdk/middleware-host-header" "3.654.0" - "@aws-sdk/middleware-logger" "3.654.0" - "@aws-sdk/middleware-recursion-detection" "3.654.0" - "@aws-sdk/middleware-user-agent" "3.654.0" - "@aws-sdk/region-config-resolver" "3.654.0" - "@aws-sdk/types" "3.654.0" - "@aws-sdk/util-endpoints" "3.654.0" - "@aws-sdk/util-user-agent-browser" "3.654.0" - "@aws-sdk/util-user-agent-node" "3.654.0" - "@smithy/config-resolver" "^3.0.8" - "@smithy/core" "^2.4.6" - "@smithy/fetch-http-handler" "^3.2.8" - "@smithy/hash-node" "^3.0.6" - "@smithy/invalid-dependency" "^3.0.6" - "@smithy/middleware-content-length" "^3.0.8" - "@smithy/middleware-endpoint" "^3.1.3" - "@smithy/middleware-retry" "^3.0.21" - "@smithy/middleware-serde" "^3.0.6" - "@smithy/middleware-stack" "^3.0.6" - "@smithy/node-config-provider" "^3.1.7" - "@smithy/node-http-handler" "^3.2.3" - "@smithy/protocol-http" "^4.1.3" - "@smithy/smithy-client" "^3.3.5" - "@smithy/types" "^3.4.2" - "@smithy/url-parser" "^3.0.6" + "@aws-sdk/core" "3.686.0" + "@aws-sdk/credential-provider-node" "3.687.0" + "@aws-sdk/middleware-host-header" "3.686.0" + "@aws-sdk/middleware-logger" "3.686.0" + "@aws-sdk/middleware-recursion-detection" "3.686.0" + "@aws-sdk/middleware-user-agent" "3.687.0" + "@aws-sdk/region-config-resolver" "3.686.0" + "@aws-sdk/types" "3.686.0" + "@aws-sdk/util-endpoints" "3.686.0" + "@aws-sdk/util-user-agent-browser" "3.686.0" + "@aws-sdk/util-user-agent-node" "3.687.0" + "@smithy/config-resolver" "^3.0.10" + "@smithy/core" "^2.5.1" + "@smithy/fetch-http-handler" "^4.0.0" + "@smithy/hash-node" "^3.0.8" + "@smithy/invalid-dependency" "^3.0.8" + "@smithy/middleware-content-length" "^3.0.10" + "@smithy/middleware-endpoint" "^3.2.1" + "@smithy/middleware-retry" "^3.0.25" + "@smithy/middleware-serde" "^3.0.8" + "@smithy/middleware-stack" "^3.0.8" + "@smithy/node-config-provider" "^3.1.9" + "@smithy/node-http-handler" "^3.2.5" + "@smithy/protocol-http" "^4.1.5" + "@smithy/smithy-client" "^3.4.2" + "@smithy/types" "^3.6.0" + "@smithy/url-parser" "^3.0.8" "@smithy/util-base64" "^3.0.0" "@smithy/util-body-length-browser" "^3.0.0" "@smithy/util-body-length-node" "^3.0.0" - "@smithy/util-defaults-mode-browser" "^3.0.21" - "@smithy/util-defaults-mode-node" "^3.0.21" - "@smithy/util-endpoints" "^2.1.2" - "@smithy/util-middleware" "^3.0.6" - "@smithy/util-retry" "^3.0.6" + "@smithy/util-defaults-mode-browser" "^3.0.25" + "@smithy/util-defaults-mode-node" "^3.0.25" + "@smithy/util-endpoints" "^2.1.4" + "@smithy/util-middleware" "^3.0.8" + "@smithy/util-retry" "^3.0.8" "@smithy/util-utf8" "^3.0.0" tslib "^2.6.2" -"@aws-sdk/client-sso@3.658.1": - version "3.658.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.658.1.tgz#f0e660148ab2786f1028a738285742fb97f888bf" - integrity sha512-lOuaBtqPTYGn6xpXlQF4LsNDsQ8Ij2kOdnk+i69Kp6yS76TYvtUuukyLL5kx8zE1c8WbYtxj9y8VNw9/6uKl7Q== +"@aws-sdk/client-sso@3.687.0": + version "3.687.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.687.0.tgz#4c71b818e718f632aa3dd4047961bededa23e4a7" + integrity sha512-dfj0y9fQyX4kFill/ZG0BqBTLQILKlL7+O5M4F9xlsh2WNuV2St6WtcOg14Y1j5UODPJiJs//pO+mD1lihT5Kw== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/core" "3.658.1" - "@aws-sdk/middleware-host-header" "3.654.0" - "@aws-sdk/middleware-logger" "3.654.0" - "@aws-sdk/middleware-recursion-detection" "3.654.0" - "@aws-sdk/middleware-user-agent" "3.654.0" - "@aws-sdk/region-config-resolver" "3.654.0" - "@aws-sdk/types" "3.654.0" - "@aws-sdk/util-endpoints" "3.654.0" - "@aws-sdk/util-user-agent-browser" "3.654.0" - "@aws-sdk/util-user-agent-node" "3.654.0" - "@smithy/config-resolver" "^3.0.8" - "@smithy/core" "^2.4.6" - "@smithy/fetch-http-handler" "^3.2.8" - "@smithy/hash-node" "^3.0.6" - "@smithy/invalid-dependency" "^3.0.6" - "@smithy/middleware-content-length" "^3.0.8" - "@smithy/middleware-endpoint" "^3.1.3" - "@smithy/middleware-retry" "^3.0.21" - "@smithy/middleware-serde" "^3.0.6" - "@smithy/middleware-stack" "^3.0.6" - "@smithy/node-config-provider" "^3.1.7" - "@smithy/node-http-handler" "^3.2.3" - "@smithy/protocol-http" "^4.1.3" - "@smithy/smithy-client" "^3.3.5" - "@smithy/types" "^3.4.2" - "@smithy/url-parser" "^3.0.6" + "@aws-sdk/core" "3.686.0" + "@aws-sdk/middleware-host-header" "3.686.0" + "@aws-sdk/middleware-logger" "3.686.0" + "@aws-sdk/middleware-recursion-detection" "3.686.0" + "@aws-sdk/middleware-user-agent" "3.687.0" + "@aws-sdk/region-config-resolver" "3.686.0" + "@aws-sdk/types" "3.686.0" + "@aws-sdk/util-endpoints" "3.686.0" + "@aws-sdk/util-user-agent-browser" "3.686.0" + "@aws-sdk/util-user-agent-node" "3.687.0" + "@smithy/config-resolver" "^3.0.10" + "@smithy/core" "^2.5.1" + "@smithy/fetch-http-handler" "^4.0.0" + "@smithy/hash-node" "^3.0.8" + "@smithy/invalid-dependency" "^3.0.8" + "@smithy/middleware-content-length" "^3.0.10" + "@smithy/middleware-endpoint" "^3.2.1" + "@smithy/middleware-retry" "^3.0.25" + "@smithy/middleware-serde" "^3.0.8" + "@smithy/middleware-stack" "^3.0.8" + "@smithy/node-config-provider" "^3.1.9" + "@smithy/node-http-handler" "^3.2.5" + "@smithy/protocol-http" "^4.1.5" + "@smithy/smithy-client" "^3.4.2" + "@smithy/types" "^3.6.0" + "@smithy/url-parser" "^3.0.8" "@smithy/util-base64" "^3.0.0" "@smithy/util-body-length-browser" "^3.0.0" "@smithy/util-body-length-node" "^3.0.0" - "@smithy/util-defaults-mode-browser" "^3.0.21" - "@smithy/util-defaults-mode-node" "^3.0.21" - "@smithy/util-endpoints" "^2.1.2" - "@smithy/util-middleware" "^3.0.6" - "@smithy/util-retry" "^3.0.6" + "@smithy/util-defaults-mode-browser" "^3.0.25" + "@smithy/util-defaults-mode-node" "^3.0.25" + "@smithy/util-endpoints" "^2.1.4" + "@smithy/util-middleware" "^3.0.8" + "@smithy/util-retry" "^3.0.8" "@smithy/util-utf8" "^3.0.0" tslib "^2.6.2" -"@aws-sdk/client-sts@3.658.1": - version "3.658.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.658.1.tgz#5e6af00f5b87f3d79a2b848241b832af20ce42ab" - integrity sha512-yw9hc5blTnbT1V6mR7Cx9HGc9KQpcLQ1QXj8rntiJi6tIYu3aFNVEyy81JHL7NsuBSeQulJTvHO3y6r3O0sfRg== +"@aws-sdk/client-sts@3.687.0": + version "3.687.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.687.0.tgz#fcb837080b225c5820f08326e98db54e48606fb1" + integrity sha512-SQjDH8O4XCTtouuCVYggB0cCCrIaTzUZIkgJUpOsIEJBLlTbNOb/BZqUShAQw2o9vxr2rCeOGjAQOYPysW/Pmg== dependencies: "@aws-crypto/sha256-browser" "5.2.0" "@aws-crypto/sha256-js" "5.2.0" - "@aws-sdk/client-sso-oidc" "3.658.1" - "@aws-sdk/core" "3.658.1" - "@aws-sdk/credential-provider-node" "3.658.1" - "@aws-sdk/middleware-host-header" "3.654.0" - "@aws-sdk/middleware-logger" "3.654.0" - "@aws-sdk/middleware-recursion-detection" "3.654.0" - "@aws-sdk/middleware-user-agent" "3.654.0" - "@aws-sdk/region-config-resolver" "3.654.0" - "@aws-sdk/types" "3.654.0" - "@aws-sdk/util-endpoints" "3.654.0" - "@aws-sdk/util-user-agent-browser" "3.654.0" - "@aws-sdk/util-user-agent-node" "3.654.0" - "@smithy/config-resolver" "^3.0.8" - "@smithy/core" "^2.4.6" - "@smithy/fetch-http-handler" "^3.2.8" - "@smithy/hash-node" "^3.0.6" - "@smithy/invalid-dependency" "^3.0.6" - "@smithy/middleware-content-length" "^3.0.8" - "@smithy/middleware-endpoint" "^3.1.3" - "@smithy/middleware-retry" "^3.0.21" - "@smithy/middleware-serde" "^3.0.6" - "@smithy/middleware-stack" "^3.0.6" - "@smithy/node-config-provider" "^3.1.7" - "@smithy/node-http-handler" "^3.2.3" - "@smithy/protocol-http" "^4.1.3" - "@smithy/smithy-client" "^3.3.5" - "@smithy/types" "^3.4.2" - "@smithy/url-parser" "^3.0.6" + "@aws-sdk/client-sso-oidc" "3.687.0" + "@aws-sdk/core" "3.686.0" + "@aws-sdk/credential-provider-node" "3.687.0" + "@aws-sdk/middleware-host-header" "3.686.0" + "@aws-sdk/middleware-logger" "3.686.0" + "@aws-sdk/middleware-recursion-detection" "3.686.0" + "@aws-sdk/middleware-user-agent" "3.687.0" + "@aws-sdk/region-config-resolver" "3.686.0" + "@aws-sdk/types" "3.686.0" + "@aws-sdk/util-endpoints" "3.686.0" + "@aws-sdk/util-user-agent-browser" "3.686.0" + "@aws-sdk/util-user-agent-node" "3.687.0" + "@smithy/config-resolver" "^3.0.10" + "@smithy/core" "^2.5.1" + "@smithy/fetch-http-handler" "^4.0.0" + "@smithy/hash-node" "^3.0.8" + "@smithy/invalid-dependency" "^3.0.8" + "@smithy/middleware-content-length" "^3.0.10" + "@smithy/middleware-endpoint" "^3.2.1" + "@smithy/middleware-retry" "^3.0.25" + "@smithy/middleware-serde" "^3.0.8" + "@smithy/middleware-stack" "^3.0.8" + "@smithy/node-config-provider" "^3.1.9" + "@smithy/node-http-handler" "^3.2.5" + "@smithy/protocol-http" "^4.1.5" + "@smithy/smithy-client" "^3.4.2" + "@smithy/types" "^3.6.0" + "@smithy/url-parser" "^3.0.8" "@smithy/util-base64" "^3.0.0" "@smithy/util-body-length-browser" "^3.0.0" "@smithy/util-body-length-node" "^3.0.0" - "@smithy/util-defaults-mode-browser" "^3.0.21" - "@smithy/util-defaults-mode-node" "^3.0.21" - "@smithy/util-endpoints" "^2.1.2" - "@smithy/util-middleware" "^3.0.6" - "@smithy/util-retry" "^3.0.6" + "@smithy/util-defaults-mode-browser" "^3.0.25" + "@smithy/util-defaults-mode-node" "^3.0.25" + "@smithy/util-endpoints" "^2.1.4" + "@smithy/util-middleware" "^3.0.8" + "@smithy/util-retry" "^3.0.8" "@smithy/util-utf8" "^3.0.0" tslib "^2.6.2" -"@aws-sdk/core@3.658.1": - version "3.658.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.658.1.tgz#7b211f75a6048eba88ff33169047b4dc57fdc520" - integrity sha512-vJVMoMcSKXK2gBRSu9Ywwv6wQ7tXH8VL1fqB1uVxgCqBZ3IHfqNn4zvpMPWrwgO2/3wv7XFyikGQ5ypPTCw4jA== +"@aws-sdk/core@3.686.0": + version "3.686.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.686.0.tgz#106a3733c250094db15ba765386db4643f5613b6" + integrity sha512-Xt3DV4DnAT3v2WURwzTxWQK34Ew+iiLzoUoguvLaZrVMFOqMMrwVjP+sizqIaHp1j7rGmFcN5I8saXnsDLuQLA== dependencies: - "@smithy/core" "^2.4.6" - "@smithy/node-config-provider" "^3.1.7" - "@smithy/property-provider" "^3.1.6" - "@smithy/protocol-http" "^4.1.3" - "@smithy/signature-v4" "^4.1.4" - "@smithy/smithy-client" "^3.3.5" - "@smithy/types" "^3.4.2" - "@smithy/util-middleware" "^3.0.6" + "@aws-sdk/types" "3.686.0" + "@smithy/core" "^2.5.1" + "@smithy/node-config-provider" "^3.1.9" + "@smithy/property-provider" "^3.1.7" + "@smithy/protocol-http" "^4.1.5" + "@smithy/signature-v4" "^4.2.0" + "@smithy/smithy-client" "^3.4.2" + "@smithy/types" "^3.6.0" + "@smithy/util-middleware" "^3.0.8" fast-xml-parser "4.4.1" tslib "^2.6.2" -"@aws-sdk/credential-provider-cognito-identity@3.658.1": - version "3.658.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.658.1.tgz#deb61eb4d9b0a1aeb5c0118fe740de90618f3323" - integrity sha512-JY4rZ4e2emL7PNHCU7F/BQV8PpQGEBZLkEoPD55RO4CitaIhlVZRpUCGLih+0Hw4MOnTUqJdfQBM+qZk6G+Now== +"@aws-sdk/credential-provider-cognito-identity@3.687.0": + version "3.687.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.687.0.tgz#84fdebedd2392a0a1c8bde884805c2c18677629c" + integrity sha512-hJq9ytoj2q/Jonc7mox/b0HT+j4NeMRuU184DkXRJbvIvwwB+oMt12221kThLezMhwIYfXEteZ7GEId7Hn8Y8g== dependencies: - "@aws-sdk/client-cognito-identity" "3.658.1" - "@aws-sdk/types" "3.654.0" - "@smithy/property-provider" "^3.1.6" - "@smithy/types" "^3.4.2" + "@aws-sdk/client-cognito-identity" "3.687.0" + "@aws-sdk/types" "3.686.0" + "@smithy/property-provider" "^3.1.7" + "@smithy/types" "^3.6.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-env@3.654.0": - version "3.654.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.654.0.tgz#5773a9d969ede7e30059472b26c9e39b3992cc0a" - integrity sha512-kogsx3Ql81JouHS7DkheCDU9MYAvK0AokxjcshDveGmf7BbgbWCA8Fnb9wjQyNDaOXNvkZu8Z8rgkX91z324/w== +"@aws-sdk/credential-provider-env@3.686.0": + version "3.686.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.686.0.tgz#71ce2df0be065dacddd873d1be7426bc8c6038ec" + integrity sha512-osD7lPO8OREkgxPiTWmA1i6XEmOth1uW9HWWj/+A2YGCj1G/t2sHu931w4Qj9NWHYZtbTTXQYVRg+TErALV7nQ== dependencies: - "@aws-sdk/types" "3.654.0" - "@smithy/property-provider" "^3.1.6" - "@smithy/types" "^3.4.2" + "@aws-sdk/core" "3.686.0" + "@aws-sdk/types" "3.686.0" + "@smithy/property-provider" "^3.1.7" + "@smithy/types" "^3.6.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-http@3.658.1": - version "3.658.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.658.1.tgz#35fa80fa8440e9fd5baf061bfd18862cbcabd3bd" - integrity sha512-4ubkJjEVCZflxkZnV1JDQv8P2pburxk1LrEp55telfJRzXrnowzBKwuV2ED0QMNC448g2B3VCaffS+Ct7c4IWQ== +"@aws-sdk/credential-provider-http@3.686.0": + version "3.686.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.686.0.tgz#fe84ea67fea6bb61effc0f10b99a0c3e9378d6c3" + integrity sha512-xyGAD/f3vR/wssUiZrNFWQWXZvI4zRm2wpHhoHA1cC2fbRMNFYtFn365yw6dU7l00ZLcdFB1H119AYIUZS7xbw== dependencies: - "@aws-sdk/types" "3.654.0" - "@smithy/fetch-http-handler" "^3.2.8" - "@smithy/node-http-handler" "^3.2.3" - "@smithy/property-provider" "^3.1.6" - "@smithy/protocol-http" "^4.1.3" - "@smithy/smithy-client" "^3.3.5" - "@smithy/types" "^3.4.2" - "@smithy/util-stream" "^3.1.8" + "@aws-sdk/core" "3.686.0" + "@aws-sdk/types" "3.686.0" + "@smithy/fetch-http-handler" "^4.0.0" + "@smithy/node-http-handler" "^3.2.5" + "@smithy/property-provider" "^3.1.7" + "@smithy/protocol-http" "^4.1.5" + "@smithy/smithy-client" "^3.4.2" + "@smithy/types" "^3.6.0" + "@smithy/util-stream" "^3.2.1" tslib "^2.6.2" -"@aws-sdk/credential-provider-ini@3.658.1": - version "3.658.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.658.1.tgz#a451b8fc5d057b9c8473d452f4b8bcd221cdd201" - integrity sha512-2uwOamQg5ppwfegwen1ddPu5HM3/IBSnaGlaKLFhltkdtZ0jiqTZWUtX2V+4Q+buLnT0hQvLS/frQ+7QUam+0Q== +"@aws-sdk/credential-provider-ini@3.687.0": + version "3.687.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.687.0.tgz#adb7f3fe381767ad1a4aee352162630f7b5f54de" + integrity sha512-6d5ZJeZch+ZosJccksN0PuXv7OSnYEmanGCnbhUqmUSz9uaVX6knZZfHCZJRgNcfSqg9QC0zsFA/51W5HCUqSQ== dependencies: - "@aws-sdk/credential-provider-env" "3.654.0" - "@aws-sdk/credential-provider-http" "3.658.1" - "@aws-sdk/credential-provider-process" "3.654.0" - "@aws-sdk/credential-provider-sso" "3.658.1" - "@aws-sdk/credential-provider-web-identity" "3.654.0" - "@aws-sdk/types" "3.654.0" - "@smithy/credential-provider-imds" "^3.2.3" - "@smithy/property-provider" "^3.1.6" - "@smithy/shared-ini-file-loader" "^3.1.7" - "@smithy/types" "^3.4.2" + "@aws-sdk/core" "3.686.0" + "@aws-sdk/credential-provider-env" "3.686.0" + "@aws-sdk/credential-provider-http" "3.686.0" + "@aws-sdk/credential-provider-process" "3.686.0" + "@aws-sdk/credential-provider-sso" "3.687.0" + "@aws-sdk/credential-provider-web-identity" "3.686.0" + "@aws-sdk/types" "3.686.0" + "@smithy/credential-provider-imds" "^3.2.4" + "@smithy/property-provider" "^3.1.7" + "@smithy/shared-ini-file-loader" "^3.1.8" + "@smithy/types" "^3.6.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-node@3.658.1": - version "3.658.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.658.1.tgz#ad7209177f8c1c43d767e5c342960a2d19ee124e" - integrity sha512-XwxW6N+uPXPYAuyq+GfOEdfL/MZGAlCSfB5gEWtLBFmFbikhmEuqfWtI6CD60OwudCUOh6argd21BsJf8o1SJA== +"@aws-sdk/credential-provider-node@3.687.0": + version "3.687.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.687.0.tgz#46bd8014bb68913ad285aed01e6920083a42d056" + integrity sha512-Pqld8Nx11NYaBUrVk3bYiGGpLCxkz8iTONlpQWoVWFhSOzlO7zloNOaYbD2XgFjjqhjlKzE91drs/f41uGeCTA== dependencies: - "@aws-sdk/credential-provider-env" "3.654.0" - "@aws-sdk/credential-provider-http" "3.658.1" - "@aws-sdk/credential-provider-ini" "3.658.1" - "@aws-sdk/credential-provider-process" "3.654.0" - "@aws-sdk/credential-provider-sso" "3.658.1" - "@aws-sdk/credential-provider-web-identity" "3.654.0" - "@aws-sdk/types" "3.654.0" - "@smithy/credential-provider-imds" "^3.2.3" - "@smithy/property-provider" "^3.1.6" - "@smithy/shared-ini-file-loader" "^3.1.7" - "@smithy/types" "^3.4.2" + "@aws-sdk/credential-provider-env" "3.686.0" + "@aws-sdk/credential-provider-http" "3.686.0" + "@aws-sdk/credential-provider-ini" "3.687.0" + "@aws-sdk/credential-provider-process" "3.686.0" + "@aws-sdk/credential-provider-sso" "3.687.0" + "@aws-sdk/credential-provider-web-identity" "3.686.0" + "@aws-sdk/types" "3.686.0" + "@smithy/credential-provider-imds" "^3.2.4" + "@smithy/property-provider" "^3.1.7" + "@smithy/shared-ini-file-loader" "^3.1.8" + "@smithy/types" "^3.6.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-process@3.654.0": - version "3.654.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.654.0.tgz#2c526d0d059eddfe4176933fadbbf8bd59480642" - integrity sha512-PmQoo8sZ9Q2Ow8OMzK++Z9lI7MsRUG7sNq3E72DVA215dhtTICTDQwGlXH2AAmIp7n+G9LLRds+4wo2ehG4mkg== +"@aws-sdk/credential-provider-process@3.686.0": + version "3.686.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.686.0.tgz#7b02591d9b81fb16288618ce23d3244496c1b538" + integrity sha512-sXqaAgyzMOc+dm4CnzAR5Q6S9OWVHyZjLfW6IQkmGjqeQXmZl24c4E82+w64C+CTkJrFLzH1VNOYp1Hy5gE6Qw== dependencies: - "@aws-sdk/types" "3.654.0" - "@smithy/property-provider" "^3.1.6" - "@smithy/shared-ini-file-loader" "^3.1.7" - "@smithy/types" "^3.4.2" + "@aws-sdk/core" "3.686.0" + "@aws-sdk/types" "3.686.0" + "@smithy/property-provider" "^3.1.7" + "@smithy/shared-ini-file-loader" "^3.1.8" + "@smithy/types" "^3.6.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-sso@3.658.1": - version "3.658.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.658.1.tgz#62db3f09f08a33b5fb4827a8a8f1a640373b39b7" - integrity sha512-YOagVEsZEk9DmgJEBg+4MBXrPcw/tYas0VQ5OVBqC5XHNbi2OBGJqgmjVPesuu393E7W0VQxtJFDS00O1ewQgA== +"@aws-sdk/credential-provider-sso@3.687.0": + version "3.687.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.687.0.tgz#2e5704bdaa3c420c2a00a1316cdbdf57d78ae649" + integrity sha512-N1YCoE7DovIRF2ReyRrA4PZzF0WNi4ObPwdQQkVxhvSm7PwjbWxrfq7rpYB+6YB1Uq3QPzgVwUFONE36rdpxUQ== dependencies: - "@aws-sdk/client-sso" "3.658.1" - "@aws-sdk/token-providers" "3.654.0" - "@aws-sdk/types" "3.654.0" - "@smithy/property-provider" "^3.1.6" - "@smithy/shared-ini-file-loader" "^3.1.7" - "@smithy/types" "^3.4.2" + "@aws-sdk/client-sso" "3.687.0" + "@aws-sdk/core" "3.686.0" + "@aws-sdk/token-providers" "3.686.0" + "@aws-sdk/types" "3.686.0" + "@smithy/property-provider" "^3.1.7" + "@smithy/shared-ini-file-loader" "^3.1.8" + "@smithy/types" "^3.6.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-web-identity@3.654.0": - version "3.654.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.654.0.tgz#67dc0463d20f801c8577276e2066f9151b2d5eb1" - integrity sha512-6a2g9gMtZToqSu+CusjNK5zvbLJahQ9di7buO3iXgbizXpLXU1rnawCpWxwslMpT5fLgMSKDnKDrr6wdEk7jSw== +"@aws-sdk/credential-provider-web-identity@3.686.0": + version "3.686.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.686.0.tgz#228be45b2f840ebf227d96ee5e326c1efa3c25a9" + integrity sha512-40UqCpPxyHCXDP7CGd9JIOZDgDZf+u1OyLaGBpjQJlz1HYuEsIWnnbTe29Yg3Ah/Zc3g4NBWcUdlGVotlnpnDg== dependencies: - "@aws-sdk/types" "3.654.0" - "@smithy/property-provider" "^3.1.6" - "@smithy/types" "^3.4.2" + "@aws-sdk/core" "3.686.0" + "@aws-sdk/types" "3.686.0" + "@smithy/property-provider" "^3.1.7" + "@smithy/types" "^3.6.0" tslib "^2.6.2" "@aws-sdk/credential-providers@^3.186.0": - version "3.658.1" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.658.1.tgz#fea93637acaab5a0b56b5b3fcfd036ab9f94afb7" - integrity sha512-lfXA6kZS6GHyi/67EbfrKdLoqHR6j7G35eFwaqxyNkfMhNBpAF0eZK3SYiwnzdR9+Wb/enTFawYiFbG5R+dQzA== + version "3.687.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.687.0.tgz#a5d6217529c683bdbb564fd8346a0c12cf751380" + integrity sha512-3aKlmKaOplpanOycmoigbTrQsqtxpzhpfquCey51aHf9GYp2yYyYF1YOgkXpE3qm3w6eiEN1asjJ2gqoECUuPA== dependencies: - "@aws-sdk/client-cognito-identity" "3.658.1" - "@aws-sdk/client-sso" "3.658.1" - "@aws-sdk/client-sts" "3.658.1" - "@aws-sdk/credential-provider-cognito-identity" "3.658.1" - "@aws-sdk/credential-provider-env" "3.654.0" - "@aws-sdk/credential-provider-http" "3.658.1" - "@aws-sdk/credential-provider-ini" "3.658.1" - "@aws-sdk/credential-provider-node" "3.658.1" - "@aws-sdk/credential-provider-process" "3.654.0" - "@aws-sdk/credential-provider-sso" "3.658.1" - "@aws-sdk/credential-provider-web-identity" "3.654.0" - "@aws-sdk/types" "3.654.0" - "@smithy/credential-provider-imds" "^3.2.3" - "@smithy/property-provider" "^3.1.6" - "@smithy/types" "^3.4.2" + "@aws-sdk/client-cognito-identity" "3.687.0" + "@aws-sdk/client-sso" "3.687.0" + "@aws-sdk/client-sts" "3.687.0" + "@aws-sdk/core" "3.686.0" + "@aws-sdk/credential-provider-cognito-identity" "3.687.0" + "@aws-sdk/credential-provider-env" "3.686.0" + "@aws-sdk/credential-provider-http" "3.686.0" + "@aws-sdk/credential-provider-ini" "3.687.0" + "@aws-sdk/credential-provider-node" "3.687.0" + "@aws-sdk/credential-provider-process" "3.686.0" + "@aws-sdk/credential-provider-sso" "3.687.0" + "@aws-sdk/credential-provider-web-identity" "3.686.0" + "@aws-sdk/types" "3.686.0" + "@smithy/credential-provider-imds" "^3.2.4" + "@smithy/property-provider" "^3.1.7" + "@smithy/types" "^3.6.0" tslib "^2.6.2" -"@aws-sdk/middleware-host-header@3.654.0": - version "3.654.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.654.0.tgz#8b02dcc28467d5b48c32cec22fd6e10ffd2a0549" - integrity sha512-rxGgVHWKp8U2ubMv+t+vlIk7QYUaRCHaVpmUlJv0Wv6Q0KeO9a42T9FxHphjOTlCGQOLcjCreL9CF8Qhtb4mdQ== +"@aws-sdk/middleware-host-header@3.686.0": + version "3.686.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.686.0.tgz#16f0be33fc738968a4e10ff77cb8a04e2b2c2359" + integrity sha512-+Yc6rO02z+yhFbHmRZGvEw1vmzf/ifS9a4aBjJGeVVU+ZxaUvnk+IUZWrj4YQopUQ+bSujmMUzJLXSkbDq7yuw== dependencies: - "@aws-sdk/types" "3.654.0" - "@smithy/protocol-http" "^4.1.3" - "@smithy/types" "^3.4.2" + "@aws-sdk/types" "3.686.0" + "@smithy/protocol-http" "^4.1.5" + "@smithy/types" "^3.6.0" tslib "^2.6.2" -"@aws-sdk/middleware-logger@3.654.0": - version "3.654.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.654.0.tgz#510495302fb134e1ef2163205f8eaedd46ffe05f" - integrity sha512-OQYb+nWlmASyXfRb989pwkJ9EVUMP1CrKn2eyTk3usl20JZmKo2Vjis6I0tLUkMSxMhnBJJlQKyWkRpD/u1FVg== +"@aws-sdk/middleware-logger@3.686.0": + version "3.686.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.686.0.tgz#4e094e42e10bf17d43b9c9afc3fc594f4aa72e02" + integrity sha512-cX43ODfA2+SPdX7VRxu6gXk4t4bdVJ9pkktbfnkE5t27OlwNfvSGGhnHrQL8xTOFeyQ+3T+oowf26gf1OI+vIg== dependencies: - "@aws-sdk/types" "3.654.0" - "@smithy/types" "^3.4.2" + "@aws-sdk/types" "3.686.0" + "@smithy/types" "^3.6.0" tslib "^2.6.2" -"@aws-sdk/middleware-recursion-detection@3.654.0": - version "3.654.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.654.0.tgz#4ade897efb6cbbfd72dd62a66999f28fd1552f9a" - integrity sha512-gKSomgltKVmsT8sC6W7CrADZ4GHwX9epk3GcH6QhebVO3LA9LRbkL3TwOPUXakxxOLLUTYdOZLIOtFf7iH00lg== +"@aws-sdk/middleware-recursion-detection@3.686.0": + version "3.686.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.686.0.tgz#aba097d2dcc9d3b9d4523d7ae03ac3b387617db1" + integrity sha512-jF9hQ162xLgp9zZ/3w5RUNhmwVnXDBlABEUX8jCgzaFpaa742qR/KKtjjZQ6jMbQnP+8fOCSXFAVNMU+s6v81w== dependencies: - "@aws-sdk/types" "3.654.0" - "@smithy/protocol-http" "^4.1.3" - "@smithy/types" "^3.4.2" + "@aws-sdk/types" "3.686.0" + "@smithy/protocol-http" "^4.1.5" + "@smithy/types" "^3.6.0" tslib "^2.6.2" -"@aws-sdk/middleware-user-agent@3.654.0": - version "3.654.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.654.0.tgz#5fa56514b97ced923fefe2653429d7b2bfb102bb" - integrity sha512-liCcqPAyRsr53cy2tYu4qeH4MMN0eh9g6k56XzI5xd4SghXH5YWh4qOYAlQ8T66ZV4nPMtD8GLtLXGzsH8moFg== +"@aws-sdk/middleware-user-agent@3.687.0": + version "3.687.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.687.0.tgz#a5feb5466d2926cd1ef5dd6f4778b33ce160ca7f" + integrity sha512-nUgsKiEinyA50CaDXojAkOasAU3Apdg7Qox6IjNUC4ZjgOu7QWsCDB5N28AYMUt06cNYeYQdfMX1aEzG85a1Mg== dependencies: - "@aws-sdk/types" "3.654.0" - "@aws-sdk/util-endpoints" "3.654.0" - "@smithy/protocol-http" "^4.1.3" - "@smithy/types" "^3.4.2" + "@aws-sdk/core" "3.686.0" + "@aws-sdk/types" "3.686.0" + "@aws-sdk/util-endpoints" "3.686.0" + "@smithy/core" "^2.5.1" + "@smithy/protocol-http" "^4.1.5" + "@smithy/types" "^3.6.0" tslib "^2.6.2" -"@aws-sdk/region-config-resolver@3.654.0": - version "3.654.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.654.0.tgz#f98e25a6669fde3d747db23eb589732384e213ef" - integrity sha512-ydGOrXJxj3x0sJhsXyTmvJVLAE0xxuTWFJihTl67RtaO7VRNtd82I3P3bwoMMaDn5WpmV5mPo8fEUDRlBm3fPg== +"@aws-sdk/region-config-resolver@3.686.0": + version "3.686.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.686.0.tgz#3ef61e2cd95eb0ae80ecd5eef284744eb0a76d7c" + integrity sha512-6zXD3bSD8tcsMAVVwO1gO7rI1uy2fCD3czgawuPGPopeLiPpo6/3FoUWCQzk2nvEhj7p9Z4BbjwZGSlRkVrXTw== dependencies: - "@aws-sdk/types" "3.654.0" - "@smithy/node-config-provider" "^3.1.7" - "@smithy/types" "^3.4.2" + "@aws-sdk/types" "3.686.0" + "@smithy/node-config-provider" "^3.1.9" + "@smithy/types" "^3.6.0" "@smithy/util-config-provider" "^3.0.0" - "@smithy/util-middleware" "^3.0.6" + "@smithy/util-middleware" "^3.0.8" tslib "^2.6.2" -"@aws-sdk/token-providers@3.654.0": - version "3.654.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.654.0.tgz#1aba36d510d471ccac43f90b59e2a354399ed069" - integrity sha512-D8GeJYmvbfWkQDtTB4owmIobSMexZel0fOoetwvgCQ/7L8VPph3Q2bn1TRRIXvH7wdt6DcDxA3tKMHPBkT3GlA== +"@aws-sdk/token-providers@3.686.0": + version "3.686.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.686.0.tgz#c7733a0a079adc9404bd9d8fc4ff52edef0a123a" + integrity sha512-9oL4kTCSePFmyKPskibeiOXV6qavPZ63/kXM9Wh9V6dTSvBtLeNnMxqGvENGKJcTdIgtoqyqA6ET9u0PJ5IRIg== dependencies: - "@aws-sdk/types" "3.654.0" - "@smithy/property-provider" "^3.1.6" - "@smithy/shared-ini-file-loader" "^3.1.7" - "@smithy/types" "^3.4.2" + "@aws-sdk/types" "3.686.0" + "@smithy/property-provider" "^3.1.7" + "@smithy/shared-ini-file-loader" "^3.1.8" + "@smithy/types" "^3.6.0" tslib "^2.6.2" -"@aws-sdk/types@3.654.0", "@aws-sdk/types@^3.222.0": - version "3.654.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.654.0.tgz#d368dda5e8aff9e7b6575985bb425bbbaf67aa97" - integrity sha512-VWvbED3SV+10QJIcmU/PKjsKilsTV16d1I7/on4bvD/jo1qGeMXqLDBSen3ks/tuvXZF/mFc7ZW/W2DiLVtO7A== +"@aws-sdk/types@3.686.0", "@aws-sdk/types@^3.222.0": + version "3.686.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.686.0.tgz#01aa5307c727de9e69969c538f99ae8b53f1074f" + integrity sha512-xFnrb3wxOoJcW2Xrh63ZgFo5buIu9DF7bOHnwoUxHdNpUXicUh0AHw85TjXxyxIAd0d1psY/DU7QHoNI3OswgQ== dependencies: - "@smithy/types" "^3.4.2" + "@smithy/types" "^3.6.0" tslib "^2.6.2" -"@aws-sdk/util-endpoints@3.654.0": - version "3.654.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.654.0.tgz#ae8ac05c8afe73cf1428942c3a6d0ab8765f3911" - integrity sha512-i902fcBknHs0Irgdpi62+QMvzxE+bczvILXigYrlHL4+PiEnlMVpni5L5W1qCkNZXf8AaMrSBuR1NZAGp6UOUw== +"@aws-sdk/util-endpoints@3.686.0": + version "3.686.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.686.0.tgz#c9a621961b8efda6d82ab3523d673acb0629d6d0" + integrity sha512-7msZE2oYl+6QYeeRBjlDgxQUhq/XRky3cXE0FqLFs2muLS7XSuQEXkpOXB3R782ygAP6JX0kmBxPTLurRTikZg== dependencies: - "@aws-sdk/types" "3.654.0" - "@smithy/types" "^3.4.2" - "@smithy/util-endpoints" "^2.1.2" + "@aws-sdk/types" "3.686.0" + "@smithy/types" "^3.6.0" + "@smithy/util-endpoints" "^2.1.4" tslib "^2.6.2" "@aws-sdk/util-locate-window@^3.0.0": - version "3.568.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-3.568.0.tgz#2acc4b2236af0d7494f7e517401ba6b3c4af11ff" - integrity sha512-3nh4TINkXYr+H41QaPelCceEB2FXP3fxp93YZXB/kqJvX0U9j0N0Uk45gvsjmEPzG8XxkPEeLIfT2I1M7A6Lig== + version "3.679.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-3.679.0.tgz#8d5898624691e12ccbad839e103562002bbec85e" + integrity sha512-zKTd48/ZWrCplkXpYDABI74rQlbR0DNHs8nH95htfSLj9/mWRSwaGptoxwcihaq/77vi/fl2X3y0a1Bo8bt7RA== dependencies: tslib "^2.6.2" -"@aws-sdk/util-user-agent-browser@3.654.0": - version "3.654.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.654.0.tgz#caa5e5d6d502aad1fe5a436cffbabfff1ec3b92c" - integrity sha512-ykYAJqvnxLt7wfrqya28wuH3/7NdrwzfiFd7NqEVQf7dXVxL5RPEpD7DxjcyQo3DsHvvdUvGZVaQhozycn1pzA== +"@aws-sdk/util-user-agent-browser@3.686.0": + version "3.686.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.686.0.tgz#953ef68c1b54e02f9de742310f47c33452f088bc" + integrity sha512-YiQXeGYZegF1b7B2GOR61orhgv79qmI0z7+Agm3NXLO6hGfVV3kFUJbXnjtH1BgWo5hbZYW7HQ2omGb3dnb6Lg== dependencies: - "@aws-sdk/types" "3.654.0" - "@smithy/types" "^3.4.2" + "@aws-sdk/types" "3.686.0" + "@smithy/types" "^3.6.0" bowser "^2.11.0" tslib "^2.6.2" -"@aws-sdk/util-user-agent-node@3.654.0": - version "3.654.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.654.0.tgz#d4b88fa9f3fce2fd70118d2c01abd941d30cffa7" - integrity sha512-a0ojjdBN6pqv6gB4H/QPPSfhs7mFtlVwnmKCM/QrTaFzN0U810PJ1BST3lBx5sa23I5jWHGaoFY+5q65C3clLQ== +"@aws-sdk/util-user-agent-node@3.687.0": + version "3.687.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.687.0.tgz#6bdc45c2ef776a86614b002867aef37fc6f45b41" + integrity sha512-idkP6ojSTZ4ek1pJ8wIN7r9U3KR5dn0IkJn3KQBXQ58LWjkRqLtft2vxzdsktWwhPKjjmIKl1S0kbvqLawf8XQ== dependencies: - "@aws-sdk/types" "3.654.0" - "@smithy/node-config-provider" "^3.1.7" - "@smithy/types" "^3.4.2" + "@aws-sdk/middleware-user-agent" "3.687.0" + "@aws-sdk/types" "3.686.0" + "@smithy/node-config-provider" "^3.1.9" + "@smithy/types" "^3.6.0" tslib "^2.6.2" "@babel/cli@^7.16.0": - version "7.25.6" - resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.25.6.tgz#bc35561adc78ade43ac9c09a690768493ab9ed95" - integrity sha512-Z+Doemr4VtvSD2SNHTrkiFZ1LX+JI6tyRXAAOb4N9khIuPyoEPmTPJarPm8ljJV1D6bnMQjyHMWTT9NeKbQuXA== + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.25.9.tgz#51036166fd0e9cfb26eee1b9ddc264a0d6d5f843" + integrity sha512-I+02IfrTiSanpxJBlZQYb18qCxB6c2Ih371cVpfgIrPQrjAYkf45XxomTJOG8JBWX5GY35/+TmhCMdJ4ZPkL8Q== dependencies: "@jridgewell/trace-mapping" "^0.3.25" commander "^6.2.0" @@ -497,173 +508,156 @@ "@nicolo-ribaudo/chokidar-2" "2.1.8-no-fsevents.3" chokidar "^3.6.0" -"@babel/code-frame@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465" - integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA== +"@babel/code-frame@^7.25.9", "@babel/code-frame@^7.26.0": + version "7.26.2" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85" + integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ== dependencies: - "@babel/highlight" "^7.24.7" + "@babel/helper-validator-identifier" "^7.25.9" + js-tokens "^4.0.0" picocolors "^1.0.0" -"@babel/compat-data@^7.25.2": - version "7.25.4" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.25.4.tgz#7d2a80ce229890edcf4cc259d4d696cb4dae2fcb" - integrity sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ== +"@babel/compat-data@^7.25.9": + version "7.26.2" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.26.2.tgz#278b6b13664557de95b8f35b90d96785850bb56e" + integrity sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg== "@babel/core@^7.16.5": - version "7.25.2" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.25.2.tgz#ed8eec275118d7613e77a352894cd12ded8eba77" - integrity sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA== + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.26.0.tgz#d78b6023cc8f3114ccf049eb219613f74a747b40" + integrity sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg== dependencies: "@ampproject/remapping" "^2.2.0" - "@babel/code-frame" "^7.24.7" - "@babel/generator" "^7.25.0" - "@babel/helper-compilation-targets" "^7.25.2" - "@babel/helper-module-transforms" "^7.25.2" - "@babel/helpers" "^7.25.0" - "@babel/parser" "^7.25.0" - "@babel/template" "^7.25.0" - "@babel/traverse" "^7.25.2" - "@babel/types" "^7.25.2" + "@babel/code-frame" "^7.26.0" + "@babel/generator" "^7.26.0" + "@babel/helper-compilation-targets" "^7.25.9" + "@babel/helper-module-transforms" "^7.26.0" + "@babel/helpers" "^7.26.0" + "@babel/parser" "^7.26.0" + "@babel/template" "^7.25.9" + "@babel/traverse" "^7.25.9" + "@babel/types" "^7.26.0" convert-source-map "^2.0.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.3" semver "^6.3.1" -"@babel/generator@^7.25.0", "@babel/generator@^7.25.6", "@babel/generator@^7.4.0": - version "7.25.6" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.25.6.tgz#0df1ad8cb32fe4d2b01d8bf437f153d19342a87c" - integrity sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw== +"@babel/generator@^7.25.9", "@babel/generator@^7.26.0", "@babel/generator@^7.4.0": + version "7.26.2" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.26.2.tgz#87b75813bec87916210e5e01939a4c823d6bb74f" + integrity sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw== dependencies: - "@babel/types" "^7.25.6" + "@babel/parser" "^7.26.2" + "@babel/types" "^7.26.0" "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.25" - jsesc "^2.5.1" + jsesc "^3.0.2" -"@babel/helper-annotate-as-pure@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz#5373c7bc8366b12a033b4be1ac13a206c6656aab" - integrity sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg== +"@babel/helper-annotate-as-pure@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz#d8eac4d2dc0d7b6e11fa6e535332e0d3184f06b4" + integrity sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g== dependencies: - "@babel/types" "^7.24.7" + "@babel/types" "^7.25.9" -"@babel/helper-compilation-targets@^7.25.2": - version "7.25.2" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz#e1d9410a90974a3a5a66e84ff55ef62e3c02d06c" - integrity sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw== +"@babel/helper-compilation-targets@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz#55af025ce365be3cdc0c1c1e56c6af617ce88875" + integrity sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ== dependencies: - "@babel/compat-data" "^7.25.2" - "@babel/helper-validator-option" "^7.24.8" - browserslist "^4.23.1" + "@babel/compat-data" "^7.25.9" + "@babel/helper-validator-option" "^7.25.9" + browserslist "^4.24.0" lru-cache "^5.1.1" semver "^6.3.1" -"@babel/helper-module-imports@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b" - integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA== +"@babel/helper-module-imports@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz#e7f8d20602ebdbf9ebbea0a0751fb0f2a4141715" + integrity sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw== dependencies: - "@babel/traverse" "^7.24.7" - "@babel/types" "^7.24.7" + "@babel/traverse" "^7.25.9" + "@babel/types" "^7.25.9" -"@babel/helper-module-transforms@^7.25.2": - version "7.25.2" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz#ee713c29768100f2776edf04d4eb23b8d27a66e6" - integrity sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ== +"@babel/helper-module-transforms@^7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz#8ce54ec9d592695e58d84cd884b7b5c6a2fdeeae" + integrity sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw== dependencies: - "@babel/helper-module-imports" "^7.24.7" - "@babel/helper-simple-access" "^7.24.7" - "@babel/helper-validator-identifier" "^7.24.7" - "@babel/traverse" "^7.25.2" + "@babel/helper-module-imports" "^7.25.9" + "@babel/helper-validator-identifier" "^7.25.9" + "@babel/traverse" "^7.25.9" -"@babel/helper-plugin-utils@^7.24.7", "@babel/helper-plugin-utils@^7.24.8": - version "7.24.8" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz#94ee67e8ec0e5d44ea7baeb51e571bd26af07878" - integrity sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg== +"@babel/helper-plugin-utils@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz#9cbdd63a9443a2c92a725cca7ebca12cc8dd9f46" + integrity sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw== -"@babel/helper-simple-access@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz#bcade8da3aec8ed16b9c4953b74e506b51b5edb3" - integrity sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg== +"@babel/helper-string-parser@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c" + integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA== + +"@babel/helper-validator-identifier@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7" + integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ== + +"@babel/helper-validator-option@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz#86e45bd8a49ab7e03f276577f96179653d41da72" + integrity sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw== + +"@babel/helpers@^7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.26.0.tgz#30e621f1eba5aa45fe6f4868d2e9154d884119a4" + integrity sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw== dependencies: - "@babel/traverse" "^7.24.7" - "@babel/types" "^7.24.7" - -"@babel/helper-string-parser@^7.24.8": - version "7.24.8" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz#5b3329c9a58803d5df425e5785865881a81ca48d" - integrity sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ== - -"@babel/helper-validator-identifier@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db" - integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w== - -"@babel/helper-validator-option@^7.24.8": - version "7.24.8" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz#3725cdeea8b480e86d34df15304806a06975e33d" - integrity sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q== - -"@babel/helpers@^7.25.0": - version "7.25.6" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.25.6.tgz#57ee60141829ba2e102f30711ffe3afab357cc60" - integrity sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q== - dependencies: - "@babel/template" "^7.25.0" - "@babel/types" "^7.25.6" - -"@babel/highlight@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d" - integrity sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw== - dependencies: - "@babel/helper-validator-identifier" "^7.24.7" - chalk "^2.4.2" - js-tokens "^4.0.0" - picocolors "^1.0.0" + "@babel/template" "^7.25.9" + "@babel/types" "^7.26.0" "@babel/node@^7.16.5": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.25.0.tgz#ea4511520a20f16b8d18df2c2db90d443929ac6d" - integrity sha512-fgdlIcf1vLeZ6gUHcl799Wbk6no5tnkGi6t1gpAb1a97ZB+KCRp8Sgb7acGTjnFhOzqzcsbJ4+wzewqb6JM0tA== + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.26.0.tgz#4b126f4eb56a05a97990a650fae0a24ad9b0c583" + integrity sha512-5ASMjh42hbnqyCOK68Q5chh1jKAqn91IswFTN+niwt4FLABhEWCT1tEuuo6mlNQ4WG/oFQLvJ71PaHAKtWtJyA== dependencies: - "@babel/register" "^7.24.6" + "@babel/register" "^7.25.9" commander "^6.2.0" core-js "^3.30.2" node-environment-flags "^1.0.5" regenerator-runtime "^0.14.0" v8flags "^3.1.1" -"@babel/parser@^7.25.0", "@babel/parser@^7.25.6", "@babel/parser@^7.4.3": - version "7.25.6" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.6.tgz#85660c5ef388cbbf6e3d2a694ee97a38f18afe2f" - integrity sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q== +"@babel/parser@^7.25.9", "@babel/parser@^7.26.0", "@babel/parser@^7.26.2", "@babel/parser@^7.4.3": + version "7.26.2" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.2.tgz#fd7b6f487cfea09889557ef5d4eeb9ff9a5abd11" + integrity sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ== dependencies: - "@babel/types" "^7.25.6" + "@babel/types" "^7.26.0" -"@babel/plugin-syntax-jsx@^7.24.7": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz#39a1fa4a7e3d3d7f34e2acc6be585b718d30e02d" - integrity sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ== +"@babel/plugin-syntax-jsx@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz#a34313a178ea56f1951599b929c1ceacee719290" + integrity sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.25.9" "@babel/plugin-transform-react-jsx@^7.16.5": - version "7.25.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.2.tgz#e37e8ebfa77e9f0b16ba07fadcb6adb47412227a" - integrity sha512-KQsqEAVBpU82NM/B/N9j9WOdphom1SZH3R+2V7INrQUH+V9EBFwZsEJl8eBIVeQE62FxJCc70jzEZwqU7RcVqA== + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.9.tgz#06367940d8325b36edff5e2b9cbe782947ca4166" + integrity sha512-s5XwpQYCqGerXl+Pu6VDL3x0j2d82eiV77UJ8a2mDHAW7j9SWRqQ2y1fNo1Z74CdcYipl5Z41zvjj4Nfzq36rw== dependencies: - "@babel/helper-annotate-as-pure" "^7.24.7" - "@babel/helper-module-imports" "^7.24.7" - "@babel/helper-plugin-utils" "^7.24.8" - "@babel/plugin-syntax-jsx" "^7.24.7" - "@babel/types" "^7.25.2" + "@babel/helper-annotate-as-pure" "^7.25.9" + "@babel/helper-module-imports" "^7.25.9" + "@babel/helper-plugin-utils" "^7.25.9" + "@babel/plugin-syntax-jsx" "^7.25.9" + "@babel/types" "^7.25.9" -"@babel/register@^7.24.6": - version "7.24.6" - resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.24.6.tgz#59e21dcc79e1d04eed5377633b0f88029a6bef9e" - integrity sha512-WSuFCc2wCqMeXkz/i3yfAAsxwWflEgbVkZzivgAmXl/MxrXeoYFZOOPllbC8R8WTF7u61wSRQtDVZ1879cdu6w== +"@babel/register@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.25.9.tgz#1c465acf7dc983d70ccc318eb5b887ecb04f021b" + integrity sha512-8D43jXtGsYmEeDvm4MWHYUpWf8iiXgWYx3fW7E7Wb7Oe6FWqJPl5K6TuFW0dOwNZzEE5rjlaSJYH9JjrUKJszA== dependencies: clone-deep "^4.0.1" find-cache-dir "^2.0.0" @@ -671,36 +665,35 @@ pirates "^4.0.6" source-map-support "^0.5.16" -"@babel/template@^7.25.0", "@babel/template@^7.4.0": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.0.tgz#e733dc3134b4fede528c15bc95e89cb98c52592a" - integrity sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q== +"@babel/template@^7.25.9", "@babel/template@^7.4.0": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.9.tgz#ecb62d81a8a6f5dc5fe8abfc3901fc52ddf15016" + integrity sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg== dependencies: - "@babel/code-frame" "^7.24.7" - "@babel/parser" "^7.25.0" - "@babel/types" "^7.25.0" + "@babel/code-frame" "^7.25.9" + "@babel/parser" "^7.25.9" + "@babel/types" "^7.25.9" -"@babel/traverse@^7.24.7", "@babel/traverse@^7.25.2", "@babel/traverse@^7.4.3": - version "7.25.6" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.6.tgz#04fad980e444f182ecf1520504941940a90fea41" - integrity sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ== +"@babel/traverse@^7.25.9", "@babel/traverse@^7.4.3": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.9.tgz#a50f8fe49e7f69f53de5bea7e413cd35c5e13c84" + integrity sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw== dependencies: - "@babel/code-frame" "^7.24.7" - "@babel/generator" "^7.25.6" - "@babel/parser" "^7.25.6" - "@babel/template" "^7.25.0" - "@babel/types" "^7.25.6" + "@babel/code-frame" "^7.25.9" + "@babel/generator" "^7.25.9" + "@babel/parser" "^7.25.9" + "@babel/template" "^7.25.9" + "@babel/types" "^7.25.9" debug "^4.3.1" globals "^11.1.0" -"@babel/types@^7.24.7", "@babel/types@^7.25.0", "@babel/types@^7.25.2", "@babel/types@^7.25.6", "@babel/types@^7.4.0": - version "7.25.6" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.6.tgz#893942ddb858f32ae7a004ec9d3a76b3463ef8e6" - integrity sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw== +"@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.4.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.0.tgz#deabd08d6b753bc8e0f198f8709fb575e31774ff" + integrity sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA== dependencies: - "@babel/helper-string-parser" "^7.24.8" - "@babel/helper-validator-identifier" "^7.24.7" - to-fast-properties "^2.0.0" + "@babel/helper-string-parser" "^7.25.9" + "@babel/helper-validator-identifier" "^7.25.9" "@colors/colors@1.6.0", "@colors/colors@^1.6.0": version "1.6.0" @@ -929,9 +922,9 @@ safe-buffer "^5.0.1" "@sapphire/async-queue@^1.5.0": - version "1.5.3" - resolved "https://registry.yarnpkg.com/@sapphire/async-queue/-/async-queue-1.5.3.tgz#03cd2a2f3665068f314736bdc56eee2025352422" - integrity sha512-x7zadcfJGxFka1Q3f8gCts1F0xMwCKbZweM85xECGI0hBTeIZJGGCrHgLggihBoprlQ/hBmDR5LKfIPqnmHM3w== + version "1.5.4" + resolved "https://registry.yarnpkg.com/@sapphire/async-queue/-/async-queue-1.5.4.tgz#213e2a7a2df6313b9df791c04d8f5c32ebd3c413" + integrity sha512-id65RxAx34DCk8KAVTPWwcephJSkStiS9M15F87+zvK2gK47wf7yeRIo8WiuKeXQS6bsyo/uQ/t0QW1cLmSb+A== "@sapphire/shapeshift@^4.0.0": version "4.0.0" @@ -942,17 +935,17 @@ lodash "^4.17.21" "@sapphire/snowflake@^3.2.2", "@sapphire/snowflake@^3.4.2": - version "3.5.3" - resolved "https://registry.yarnpkg.com/@sapphire/snowflake/-/snowflake-3.5.3.tgz#0c102aa2ec5b34f806e9bc8625fc6a5e1d0a0c6a" - integrity sha512-jjmJywLAFoWeBi1W7994zZyiNWPIiqRRNAmSERxyg93xRGzNYvGjlZ0gR6x0F4gPRi2+0O6S71kOZYyr3cxaIQ== + version "3.5.4" + resolved "https://registry.yarnpkg.com/@sapphire/snowflake/-/snowflake-3.5.4.tgz#b7fa8c8889cdb298f66a263b476016c4b668ce12" + integrity sha512-YeQY5xNMj3zbwEIZYzyM/7heSjjDbje7B2jfbnoyUsBPMNL4+TO+Zd1pp8v0OzCLNpPaYIZdwcvEScKXthhsPA== -"@sendgrid/client@^8.1.3": - version "8.1.3" - resolved "https://registry.yarnpkg.com/@sendgrid/client/-/client-8.1.3.tgz#51fd4a318627c4b615ff98e35609e98486a3bd6f" - integrity sha512-mRwTticRZIdUTsnyzvlK6dMu3jni9ci9J+dW/6fMMFpGRAJdCJlivFVYQvqk8kRS3RnFzS7sf6BSmhLl1ldDhA== +"@sendgrid/client@^8.1.4": + version "8.1.4" + resolved "https://registry.yarnpkg.com/@sendgrid/client/-/client-8.1.4.tgz#4db39e49d8ed732169d73b5d5c94d2b11907970d" + integrity sha512-VxZoQ82MpxmjSXLR3ZAE2OWxvQIW2k2G24UeRPr/SYX8HqWLV/8UBN15T2WmjjnEb5XSmFImTJOKDzzSeKr9YQ== dependencies: "@sendgrid/helpers" "^8.0.0" - axios "^1.6.8" + axios "^1.7.4" "@sendgrid/helpers@^8.0.0": version "8.0.0" @@ -962,11 +955,11 @@ deepmerge "^4.2.2" "@sendgrid/mail@*": - version "8.1.3" - resolved "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-8.1.3.tgz#d371cbddcd2e8ca9469a68d1ed0c6b3a5c365e5e" - integrity sha512-Wg5iKSUOER83/cfY6rbPa+o3ChnYzWwv1OcsR8gCV8SKi+sUPIMroildimlnb72DBkQxcbylxng1W7f0RIX7MQ== + version "8.1.4" + resolved "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-8.1.4.tgz#0ba72906685eae1a1ef990cca31e962f1ece6928" + integrity sha512-MUpIZykD9ARie8LElYCqbcBhGGMaA/E6I7fEcG7Hc2An26QJyLtwOaKQ3taGp8xO8BICPJrSKuYV4bDeAJKFGQ== dependencies: - "@sendgrid/client" "^8.1.3" + "@sendgrid/client" "^8.1.4" "@sendgrid/helpers" "^8.0.0" "@sideway/address@^4.1.5": @@ -986,79 +979,77 @@ resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df" integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ== -"@smithy/abort-controller@^3.1.5": - version "3.1.5" - resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-3.1.5.tgz#ca7a86a3c6b20fabe59667143f58d9e198616d14" - integrity sha512-DhNPnqTqPoG8aZ5dWkFOgsuY+i0GQ3CI6hMmvCoduNsnU9gUZWZBwGfDQsTTB7NvFPkom1df7jMIJWU90kuXXg== +"@smithy/abort-controller@^3.1.6": + version "3.1.6" + resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-3.1.6.tgz#d9de97b85ca277df6ffb9ee7cd83d5da793ee6de" + integrity sha512-0XuhuHQlEqbNQZp7QxxrFTdVWdwxch4vjxYgfInF91hZFkPxf9QDrdQka0KfxFMPqLNzSw0b95uGTrLliQUavQ== dependencies: - "@smithy/types" "^3.5.0" + "@smithy/types" "^3.6.0" tslib "^2.6.2" -"@smithy/config-resolver@^3.0.8", "@smithy/config-resolver@^3.0.9": - version "3.0.9" - resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-3.0.9.tgz#dcf4b7747ca481866f9bfac21469ebe2031a599e" - integrity sha512-5d9oBf40qC7n2xUoHmntKLdqsyTMMo/r49+eqSIjJ73eDfEtljAxEhzIQ3bkgXJtR3xiv7YzMT/3FF3ORkjWdg== +"@smithy/config-resolver@^3.0.10": + version "3.0.10" + resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-3.0.10.tgz#d9529d9893e5fae1f14cb1ffd55517feb6d7e50f" + integrity sha512-Uh0Sz9gdUuz538nvkPiyv1DZRX9+D15EKDtnQP5rYVAzM/dnYk3P8cg73jcxyOitPgT3mE3OVj7ky7sibzHWkw== dependencies: - "@smithy/node-config-provider" "^3.1.8" - "@smithy/types" "^3.5.0" + "@smithy/node-config-provider" "^3.1.9" + "@smithy/types" "^3.6.0" "@smithy/util-config-provider" "^3.0.0" - "@smithy/util-middleware" "^3.0.7" + "@smithy/util-middleware" "^3.0.8" tslib "^2.6.2" -"@smithy/core@^2.4.6": - version "2.4.7" - resolved "https://registry.yarnpkg.com/@smithy/core/-/core-2.4.7.tgz#c4dc9ab3ba5f4b36addf967ca5fce036ce3b767d" - integrity sha512-goqMjX+IoVEnHZjYuzu8xwoZjoteMiLXsPHuXPBkWsGwu0o9c3nTjqkUlP1Ez/V8E501aOU7CJ3INk8mQcW2gw== +"@smithy/core@^2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@smithy/core/-/core-2.5.1.tgz#7f635b76778afca845bcb401d36f22fa37712f15" + integrity sha512-DujtuDA7BGEKExJ05W5OdxCoyekcKT3Rhg1ZGeiUWaz2BJIWXjZmsG/DIP4W48GHno7AQwRsaCb8NcBgH3QZpg== dependencies: - "@smithy/middleware-endpoint" "^3.1.4" - "@smithy/middleware-retry" "^3.0.22" - "@smithy/middleware-serde" "^3.0.7" - "@smithy/protocol-http" "^4.1.4" - "@smithy/smithy-client" "^3.3.6" - "@smithy/types" "^3.5.0" + "@smithy/middleware-serde" "^3.0.8" + "@smithy/protocol-http" "^4.1.5" + "@smithy/types" "^3.6.0" "@smithy/util-body-length-browser" "^3.0.0" - "@smithy/util-middleware" "^3.0.7" + "@smithy/util-middleware" "^3.0.8" + "@smithy/util-stream" "^3.2.1" "@smithy/util-utf8" "^3.0.0" tslib "^2.6.2" -"@smithy/credential-provider-imds@^3.2.3", "@smithy/credential-provider-imds@^3.2.4": - version "3.2.4" - resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.4.tgz#e1a2bfc8a0066f673756ad8735247cf284b9735c" - integrity sha512-S9bb0EIokfYEuar4kEbLta+ivlKCWOCFsLZuilkNy9i0uEUEHSi47IFLPaxqqCl+0ftKmcOTHayY5nQhAuq7+w== +"@smithy/credential-provider-imds@^3.2.4", "@smithy/credential-provider-imds@^3.2.5": + version "3.2.5" + resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.5.tgz#dbfd849a4a7ebd68519cd9fc35f78d091e126d0a" + integrity sha512-4FTQGAsuwqTzVMmiRVTn0RR9GrbRfkP0wfu/tXWVHd2LgNpTY0uglQpIScXK4NaEyXbB3JmZt8gfVqO50lP8wg== dependencies: - "@smithy/node-config-provider" "^3.1.8" - "@smithy/property-provider" "^3.1.7" - "@smithy/types" "^3.5.0" - "@smithy/url-parser" "^3.0.7" + "@smithy/node-config-provider" "^3.1.9" + "@smithy/property-provider" "^3.1.8" + "@smithy/types" "^3.6.0" + "@smithy/url-parser" "^3.0.8" tslib "^2.6.2" -"@smithy/fetch-http-handler@^3.2.8", "@smithy/fetch-http-handler@^3.2.9": - version "3.2.9" - resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.9.tgz#8d5199c162a37caa37a8b6848eefa9ca58221a0b" - integrity sha512-hYNVQOqhFQ6vOpenifFME546f0GfJn2OiQ3M0FDmuUu8V/Uiwy2wej7ZXxFBNqdx0R5DZAqWM1l6VRhGz8oE6A== +"@smithy/fetch-http-handler@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-4.0.0.tgz#3763cb5178745ed630ed5bc3beb6328abdc31f36" + integrity sha512-MLb1f5tbBO2X6K4lMEKJvxeLooyg7guq48C2zKr4qM7F2Gpkz4dc+hdSgu77pCJ76jVqFBjZczHYAs6dp15N+g== dependencies: - "@smithy/protocol-http" "^4.1.4" - "@smithy/querystring-builder" "^3.0.7" - "@smithy/types" "^3.5.0" + "@smithy/protocol-http" "^4.1.5" + "@smithy/querystring-builder" "^3.0.8" + "@smithy/types" "^3.6.0" "@smithy/util-base64" "^3.0.0" tslib "^2.6.2" -"@smithy/hash-node@^3.0.6": - version "3.0.7" - resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-3.0.7.tgz#03b5a382fb588b8c2bac11b4fe7300aaf1661c88" - integrity sha512-SAGHN+QkrwcHFjfWzs/czX94ZEjPJ0CrWJS3M43WswDXVEuP4AVy9gJ3+AF6JQHZD13bojmuf/Ap/ItDeZ+Qfw== +"@smithy/hash-node@^3.0.8": + version "3.0.8" + resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-3.0.8.tgz#f451cc342f74830466b0b39bf985dc3022634065" + integrity sha512-tlNQYbfpWXHimHqrvgo14DrMAgUBua/cNoz9fMYcDmYej7MAmUcjav/QKQbFc3NrcPxeJ7QClER4tWZmfwoPng== dependencies: - "@smithy/types" "^3.5.0" + "@smithy/types" "^3.6.0" "@smithy/util-buffer-from" "^3.0.0" "@smithy/util-utf8" "^3.0.0" tslib "^2.6.2" -"@smithy/invalid-dependency@^3.0.6": - version "3.0.7" - resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-3.0.7.tgz#b36f258d94498f3c72ab6020091a66fc7cc16eda" - integrity sha512-Bq00GsAhHeYSuZX8Kpu4sbI9agH2BNYnqUmmbTGWOhki9NVsWn2jFr896vvoTMH8KAjNX/ErC/8t5QHuEXG+IA== +"@smithy/invalid-dependency@^3.0.8": + version "3.0.8" + resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-3.0.8.tgz#4d381a4c24832371ade79e904a72c173c9851e5f" + integrity sha512-7Qynk6NWtTQhnGTTZwks++nJhQ1O54Mzi7fz4PqZOiYXb4Z1Flpb2yRvdALoggTS8xjtohWUM+RygOtB30YL3Q== dependencies: - "@smithy/types" "^3.5.0" + "@smithy/types" "^3.6.0" tslib "^2.6.2" "@smithy/is-array-buffer@^2.2.0": @@ -1075,168 +1066,170 @@ dependencies: tslib "^2.6.2" -"@smithy/middleware-content-length@^3.0.8": - version "3.0.9" - resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-3.0.9.tgz#fb613d1a6b8c91e828d11c0d7a0a8576dba89b8b" - integrity sha512-t97PidoGElF9hTtLCrof32wfWMqC5g2SEJNxaVH3NjlatuNGsdxXRYO/t+RPnxA15RpYiS0f+zG7FuE2DeGgjA== +"@smithy/middleware-content-length@^3.0.10": + version "3.0.10" + resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-3.0.10.tgz#738266f6d81436d7e3a86bea931bc64e04ae7dbf" + integrity sha512-T4dIdCs1d/+/qMpwhJ1DzOhxCZjZHbHazEPJWdB4GDi2HjIZllVzeBEcdJUN0fomV8DURsgOyrbEUzg3vzTaOg== dependencies: - "@smithy/protocol-http" "^4.1.4" - "@smithy/types" "^3.5.0" + "@smithy/protocol-http" "^4.1.5" + "@smithy/types" "^3.6.0" tslib "^2.6.2" -"@smithy/middleware-endpoint@^3.1.3", "@smithy/middleware-endpoint@^3.1.4": - version "3.1.4" - resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-3.1.4.tgz#222c9fa49c8af6ebf8bea8ab220d92d9b8c90d3d" - integrity sha512-/ChcVHekAyzUbyPRI8CzPPLj6y8QRAfJngWcLMgsWxKVzw/RzBV69mSOzJYDD3pRwushA1+5tHtPF8fjmzBnrQ== +"@smithy/middleware-endpoint@^3.2.1": + version "3.2.1" + resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-3.2.1.tgz#b9ee42d29d8f3a266883d293c4d6a586f7b60979" + integrity sha512-wWO3xYmFm6WRW8VsEJ5oU6h7aosFXfszlz3Dj176pTij6o21oZnzkCLzShfmRaaCHDkBXWBdO0c4sQAvLFP6zA== dependencies: - "@smithy/middleware-serde" "^3.0.7" - "@smithy/node-config-provider" "^3.1.8" - "@smithy/shared-ini-file-loader" "^3.1.8" - "@smithy/types" "^3.5.0" - "@smithy/url-parser" "^3.0.7" - "@smithy/util-middleware" "^3.0.7" + "@smithy/core" "^2.5.1" + "@smithy/middleware-serde" "^3.0.8" + "@smithy/node-config-provider" "^3.1.9" + "@smithy/shared-ini-file-loader" "^3.1.9" + "@smithy/types" "^3.6.0" + "@smithy/url-parser" "^3.0.8" + "@smithy/util-middleware" "^3.0.8" tslib "^2.6.2" -"@smithy/middleware-retry@^3.0.21", "@smithy/middleware-retry@^3.0.22": - version "3.0.22" - resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-3.0.22.tgz#578ceafd72fd655cde35c35b462a8aad26fd07e2" - integrity sha512-svEN7O2Tf7BoaBkPzX/8AE2Bv7p16d9/ulFAD1Gmn5g19iMqNk1WIkMxAY7SpB9/tVtUwKx0NaIsBRl88gumZA== +"@smithy/middleware-retry@^3.0.25": + version "3.0.25" + resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-3.0.25.tgz#a6b1081fc1a0991ffe1d15e567e76198af01f37c" + integrity sha512-m1F70cPaMBML4HiTgCw5I+jFNtjgz5z5UdGnUbG37vw6kh4UvizFYjqJGHvicfgKMkDL6mXwyPp5mhZg02g5sg== dependencies: - "@smithy/node-config-provider" "^3.1.8" - "@smithy/protocol-http" "^4.1.4" - "@smithy/service-error-classification" "^3.0.7" - "@smithy/smithy-client" "^3.3.6" - "@smithy/types" "^3.5.0" - "@smithy/util-middleware" "^3.0.7" - "@smithy/util-retry" "^3.0.7" + "@smithy/node-config-provider" "^3.1.9" + "@smithy/protocol-http" "^4.1.5" + "@smithy/service-error-classification" "^3.0.8" + "@smithy/smithy-client" "^3.4.2" + "@smithy/types" "^3.6.0" + "@smithy/util-middleware" "^3.0.8" + "@smithy/util-retry" "^3.0.8" tslib "^2.6.2" uuid "^9.0.1" -"@smithy/middleware-serde@^3.0.6", "@smithy/middleware-serde@^3.0.7": - version "3.0.7" - resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-3.0.7.tgz#03f0dda75edffc4cc90ea422349cbfb82368efa7" - integrity sha512-VytaagsQqtH2OugzVTq4qvjkLNbWehHfGcGr0JLJmlDRrNCeZoWkWsSOw1nhS/4hyUUWF/TLGGml4X/OnEep5g== +"@smithy/middleware-serde@^3.0.8": + version "3.0.8" + resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-3.0.8.tgz#a46d10dba3c395be0d28610d55c89ff8c07c0cd3" + integrity sha512-Xg2jK9Wc/1g/MBMP/EUn2DLspN8LNt+GMe7cgF+Ty3vl+Zvu+VeZU5nmhveU+H8pxyTsjrAkci8NqY6OuvZnjA== dependencies: - "@smithy/types" "^3.5.0" + "@smithy/types" "^3.6.0" tslib "^2.6.2" -"@smithy/middleware-stack@^3.0.6", "@smithy/middleware-stack@^3.0.7": - version "3.0.7" - resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-3.0.7.tgz#813fa7b47895ce0d085eac89c056d21b1e46e771" - integrity sha512-EyTbMCdqS1DoeQsO4gI7z2Gzq1MoRFAeS8GkFYIwbedB7Lp5zlLHJdg+56tllIIG5Hnf9ZWX48YKSHlsKvugGA== +"@smithy/middleware-stack@^3.0.8": + version "3.0.8" + resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-3.0.8.tgz#f1c7d9c7fe8280c6081141c88f4a76875da1fc43" + integrity sha512-d7ZuwvYgp1+3682Nx0MD3D/HtkmZd49N3JUndYWQXfRZrYEnCWYc8BHcNmVsPAp9gKvlurdg/mubE6b/rPS9MA== dependencies: - "@smithy/types" "^3.5.0" + "@smithy/types" "^3.6.0" tslib "^2.6.2" -"@smithy/node-config-provider@^3.1.7", "@smithy/node-config-provider@^3.1.8": +"@smithy/node-config-provider@^3.1.9": + version "3.1.9" + resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-3.1.9.tgz#d27ba8e4753f1941c24ed0af824dbc6c492f510a" + integrity sha512-qRHoah49QJ71eemjuS/WhUXB+mpNtwHRWQr77J/m40ewBVVwvo52kYAmb7iuaECgGTTcYxHS4Wmewfwy++ueew== + dependencies: + "@smithy/property-provider" "^3.1.8" + "@smithy/shared-ini-file-loader" "^3.1.9" + "@smithy/types" "^3.6.0" + tslib "^2.6.2" + +"@smithy/node-http-handler@^3.2.5": + version "3.2.5" + resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-3.2.5.tgz#ad9d9ba1528bf0d4a655135e978ecc14b3df26a2" + integrity sha512-PkOwPNeKdvX/jCpn0A8n9/TyoxjGZB8WVoJmm9YzsnAgggTj4CrjpRHlTQw7dlLZ320n1mY1y+nTRUDViKi/3w== + dependencies: + "@smithy/abort-controller" "^3.1.6" + "@smithy/protocol-http" "^4.1.5" + "@smithy/querystring-builder" "^3.0.8" + "@smithy/types" "^3.6.0" + tslib "^2.6.2" + +"@smithy/property-provider@^3.1.7", "@smithy/property-provider@^3.1.8": version "3.1.8" - resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-3.1.8.tgz#2c1092040b4062eae0f7c9e121cc00ac6a77efee" - integrity sha512-E0rU0DglpeJn5ge64mk8wTGEXcQwmpUTY5Zr7IzTpDLmHKiIamINERNZYrPQjg58Ck236sEKSwRSHA4CwshU6Q== + resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-3.1.8.tgz#b1c5a3949effbb9772785ad7ddc5b4b235b10fbe" + integrity sha512-ukNUyo6rHmusG64lmkjFeXemwYuKge1BJ8CtpVKmrxQxc6rhUX0vebcptFA9MmrGsnLhwnnqeH83VTU9hwOpjA== dependencies: - "@smithy/property-provider" "^3.1.7" - "@smithy/shared-ini-file-loader" "^3.1.8" - "@smithy/types" "^3.5.0" + "@smithy/types" "^3.6.0" tslib "^2.6.2" -"@smithy/node-http-handler@^3.2.3", "@smithy/node-http-handler@^3.2.4": - version "3.2.4" - resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-3.2.4.tgz#3c57c40d082c3bacac1e49955bd1240e8ccc40b2" - integrity sha512-49reY3+JgLMFNm7uTAKBWiKCA6XSvkNp9FqhVmusm2jpVnHORYFeFZ704LShtqWfjZW/nhX+7Iexyb6zQfXYIQ== +"@smithy/protocol-http@^4.1.5": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-4.1.5.tgz#a1f397440f299b6a5abeed6866957fecb1bf5013" + integrity sha512-hsjtwpIemmCkm3ZV5fd/T0bPIugW1gJXwZ/hpuVubt2hEUApIoUTrf6qIdh9MAWlw0vjMrA1ztJLAwtNaZogvg== dependencies: - "@smithy/abort-controller" "^3.1.5" - "@smithy/protocol-http" "^4.1.4" - "@smithy/querystring-builder" "^3.0.7" - "@smithy/types" "^3.5.0" + "@smithy/types" "^3.6.0" tslib "^2.6.2" -"@smithy/property-provider@^3.1.6", "@smithy/property-provider@^3.1.7": - version "3.1.7" - resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-3.1.7.tgz#8a304a4b9110a067a93c784e4c11e175f82da379" - integrity sha512-QfzLi1GPMisY7bAM5hOUqBdGYnY5S2JAlr201pghksrQv139f8iiiMalXtjczIP5f6owxFn3MINLNUNvUkgtPw== +"@smithy/querystring-builder@^3.0.8": + version "3.0.8" + resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-3.0.8.tgz#0d845be53aa624771c518d1412881236ce12ed4f" + integrity sha512-btYxGVqFUARbUrN6VhL9c3dnSviIwBYD9Rz1jHuN1hgh28Fpv2xjU1HeCeDJX68xctz7r4l1PBnFhGg1WBBPuA== dependencies: - "@smithy/types" "^3.5.0" - tslib "^2.6.2" - -"@smithy/protocol-http@^4.1.3", "@smithy/protocol-http@^4.1.4": - version "4.1.4" - resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-4.1.4.tgz#6940d652b1825bda2422163ec9baab552669a338" - integrity sha512-MlWK8eqj0JlpZBnWmjQLqmFp71Ug00P+m72/1xQB3YByXD4zZ+y9N4hYrR0EDmrUCZIkyATWHOXFgtavwGDTzQ== - dependencies: - "@smithy/types" "^3.5.0" - tslib "^2.6.2" - -"@smithy/querystring-builder@^3.0.7": - version "3.0.7" - resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-3.0.7.tgz#8c443c65f4249ff1637088db1166d18411d41555" - integrity sha512-65RXGZZ20rzqqxTsChdqSpbhA6tdt5IFNgG6o7e1lnPVLCe6TNWQq4rTl4N87hTDD8mV4IxJJnvyE7brbnRkQw== - dependencies: - "@smithy/types" "^3.5.0" + "@smithy/types" "^3.6.0" "@smithy/util-uri-escape" "^3.0.0" tslib "^2.6.2" -"@smithy/querystring-parser@^3.0.7": - version "3.0.7" - resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-3.0.7.tgz#936206d1e6da9d862384dae730b4bad042d6a948" - integrity sha512-Fouw4KJVWqqUVIu1gZW8BH2HakwLz6dvdrAhXeXfeymOBrZw+hcqaWs+cS1AZPVp4nlbeIujYrKA921ZW2WMPA== +"@smithy/querystring-parser@^3.0.8": + version "3.0.8" + resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-3.0.8.tgz#057a8e2d301eea8eac7071923100ba38a824d7df" + integrity sha512-BtEk3FG7Ks64GAbt+JnKqwuobJNX8VmFLBsKIwWr1D60T426fGrV2L3YS5siOcUhhp6/Y6yhBw1PSPxA5p7qGg== dependencies: - "@smithy/types" "^3.5.0" + "@smithy/types" "^3.6.0" tslib "^2.6.2" -"@smithy/service-error-classification@^3.0.7": - version "3.0.7" - resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-3.0.7.tgz#5bab4ad802d30bd3fa52b8134f6c171582358226" - integrity sha512-91PRkTfiBf9hxkIchhRKJfl1rsplRDyBnmyFca3y0Z3x/q0JJN480S83LBd8R6sBCkm2bBbqw2FHp0Mbh+ecSA== +"@smithy/service-error-classification@^3.0.8": + version "3.0.8" + resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-3.0.8.tgz#265ad2573b972f6c7bdd1ad6c5155a88aeeea1c4" + integrity sha512-uEC/kCCFto83bz5ZzapcrgGqHOh/0r69sZ2ZuHlgoD5kYgXJEThCoTuw/y1Ub3cE7aaKdznb+jD9xRPIfIwD7g== dependencies: - "@smithy/types" "^3.5.0" + "@smithy/types" "^3.6.0" -"@smithy/shared-ini-file-loader@^3.1.7", "@smithy/shared-ini-file-loader@^3.1.8": - version "3.1.8" - resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.8.tgz#7a0bf5f20cfe8e0c4a36d8dcab8194d0d2ee958e" - integrity sha512-0NHdQiSkeGl0ICQKcJQ2lCOKH23Nb0EaAa7RDRId6ZqwXkw4LJyIyZ0t3iusD4bnKYDPLGy2/5e2rfUhrt0Acw== +"@smithy/shared-ini-file-loader@^3.1.8", "@smithy/shared-ini-file-loader@^3.1.9": + version "3.1.9" + resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.9.tgz#1b77852b5bb176445e1d80333fa3f739313a4928" + integrity sha512-/+OsJRNtoRbtsX0UpSgWVxFZLsJHo/4sTr+kBg/J78sr7iC+tHeOvOJrS5hCpVQ6sWBbhWLp1UNiuMyZhE6pmA== dependencies: - "@smithy/types" "^3.5.0" + "@smithy/types" "^3.6.0" tslib "^2.6.2" -"@smithy/signature-v4@^4.1.4": - version "4.2.0" - resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-4.2.0.tgz#291f5a0e756cc251377e1e8af2a1f494e6173029" - integrity sha512-LafbclHNKnsorMgUkKm7Tk7oJ7xizsZ1VwqhGKqoCIrXh4fqDDp73fK99HOEEgcsQbtemmeY/BPv0vTVYYUNEQ== +"@smithy/signature-v4@^4.2.0": + version "4.2.1" + resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-4.2.1.tgz#a918fd7d99af9f60aa07617506fa54be408126ee" + integrity sha512-NsV1jF4EvmO5wqmaSzlnTVetemBS3FZHdyc5CExbDljcyJCEEkJr8ANu2JvtNbVg/9MvKAWV44kTrGS+Pi4INg== dependencies: "@smithy/is-array-buffer" "^3.0.0" - "@smithy/protocol-http" "^4.1.4" - "@smithy/types" "^3.5.0" + "@smithy/protocol-http" "^4.1.5" + "@smithy/types" "^3.6.0" "@smithy/util-hex-encoding" "^3.0.0" - "@smithy/util-middleware" "^3.0.7" + "@smithy/util-middleware" "^3.0.8" "@smithy/util-uri-escape" "^3.0.0" "@smithy/util-utf8" "^3.0.0" tslib "^2.6.2" -"@smithy/smithy-client@^3.3.5", "@smithy/smithy-client@^3.3.6": - version "3.3.6" - resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-3.3.6.tgz#882fcc4b5db35c284c7a7c6116b27be324c41202" - integrity sha512-qdH+mvDHgq1ss6mocyIl2/VjlWXew7pGwZQydwYJczEc22HZyX3k8yVPV9aZsbYbssHPvMDRA5rfBDrjQUbIIw== +"@smithy/smithy-client@^3.4.2": + version "3.4.2" + resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-3.4.2.tgz#a6e3ed98330ce170cf482e765bd0c21e0fde8ae4" + integrity sha512-dxw1BDxJiY9/zI3cBqfVrInij6ShjpV4fmGHesGZZUiP9OSE/EVfdwdRz0PgvkEvrZHpsj2htRaHJfftE8giBA== dependencies: - "@smithy/middleware-endpoint" "^3.1.4" - "@smithy/middleware-stack" "^3.0.7" - "@smithy/protocol-http" "^4.1.4" - "@smithy/types" "^3.5.0" - "@smithy/util-stream" "^3.1.9" + "@smithy/core" "^2.5.1" + "@smithy/middleware-endpoint" "^3.2.1" + "@smithy/middleware-stack" "^3.0.8" + "@smithy/protocol-http" "^4.1.5" + "@smithy/types" "^3.6.0" + "@smithy/util-stream" "^3.2.1" tslib "^2.6.2" -"@smithy/types@^3.4.2", "@smithy/types@^3.5.0": - version "3.5.0" - resolved "https://registry.yarnpkg.com/@smithy/types/-/types-3.5.0.tgz#9589e154c50d9c5d00feb7d818112ef8fc285d6e" - integrity sha512-QN0twHNfe8mNJdH9unwsCK13GURU7oEAZqkBI+rsvpv1jrmserO+WnLE7jidR9W/1dxwZ0u/CB01mV2Gms/K2Q== +"@smithy/types@^3.6.0": + version "3.6.0" + resolved "https://registry.yarnpkg.com/@smithy/types/-/types-3.6.0.tgz#03a52bfd62ee4b7b2a1842c8ae3ada7a0a5ff3a4" + integrity sha512-8VXK/KzOHefoC65yRgCn5vG1cysPJjHnOVt9d0ybFQSmJgQj152vMn4EkYhGuaOmnnZvCPav/KnYyE6/KsNZ2w== dependencies: tslib "^2.6.2" -"@smithy/url-parser@^3.0.6", "@smithy/url-parser@^3.0.7": - version "3.0.7" - resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-3.0.7.tgz#9d7d7e4e38514bf75ade6e8a30d2300f3db17d1b" - integrity sha512-70UbSSR8J97c1rHZOWhl+VKiZDqHWxs/iW8ZHrHp5fCCPLSBE7GcUlUvKSle3Ca+J9LLbYCj/A79BxztBvAfpA== +"@smithy/url-parser@^3.0.8": + version "3.0.8" + resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-3.0.8.tgz#8057d91d55ba8df97d74576e000f927b42da9e18" + integrity sha512-4FdOhwpTW7jtSFWm7SpfLGKIBC9ZaTKG5nBF0wK24aoQKQyDIKUw3+KFWCQ9maMzrgTJIuOvOnsV2lLGW5XjTg== dependencies: - "@smithy/querystring-parser" "^3.0.7" - "@smithy/types" "^3.5.0" + "@smithy/querystring-parser" "^3.0.8" + "@smithy/types" "^3.6.0" tslib "^2.6.2" "@smithy/util-base64@^3.0.0": @@ -1285,37 +1278,37 @@ dependencies: tslib "^2.6.2" -"@smithy/util-defaults-mode-browser@^3.0.21": - version "3.0.22" - resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.22.tgz#e9141ed58109d572337a621d96131526aaf4f42f" - integrity sha512-WKzUxNsOun5ETwEOrvooXeI1mZ8tjDTOcN4oruELWHhEYDgQYWwxZupURVyovcv+h5DyQT/DzK5nm4ZoR/Tw5Q== +"@smithy/util-defaults-mode-browser@^3.0.25": + version "3.0.25" + resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.25.tgz#ef9b84272d1db23503ff155f9075a4543ab6dab7" + integrity sha512-fRw7zymjIDt6XxIsLwfJfYUfbGoO9CmCJk6rjJ/X5cd20+d2Is7xjU5Kt/AiDt6hX8DAf5dztmfP5O82gR9emA== dependencies: - "@smithy/property-provider" "^3.1.7" - "@smithy/smithy-client" "^3.3.6" - "@smithy/types" "^3.5.0" + "@smithy/property-provider" "^3.1.8" + "@smithy/smithy-client" "^3.4.2" + "@smithy/types" "^3.6.0" bowser "^2.11.0" tslib "^2.6.2" -"@smithy/util-defaults-mode-node@^3.0.21": - version "3.0.22" - resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.22.tgz#fc51f37aaa5ec03edec0da890a1ca1e3e3cdc70b" - integrity sha512-hUsciOmAq8fsGwqg4+pJfNRmrhfqMH4Y9UeGcgeUl88kPAoYANFATJqCND+O4nUvwp5TzsYwGpqpcBKyA8LUUg== +"@smithy/util-defaults-mode-node@^3.0.25": + version "3.0.25" + resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.25.tgz#c16fe3995c8e90ae318e336178392173aebe1e37" + integrity sha512-H3BSZdBDiVZGzt8TG51Pd2FvFO0PAx/A0mJ0EH8a13KJ6iUCdYnw/Dk/MdC1kTd0eUuUGisDFaxXVXo4HHFL1g== dependencies: - "@smithy/config-resolver" "^3.0.9" - "@smithy/credential-provider-imds" "^3.2.4" - "@smithy/node-config-provider" "^3.1.8" - "@smithy/property-provider" "^3.1.7" - "@smithy/smithy-client" "^3.3.6" - "@smithy/types" "^3.5.0" + "@smithy/config-resolver" "^3.0.10" + "@smithy/credential-provider-imds" "^3.2.5" + "@smithy/node-config-provider" "^3.1.9" + "@smithy/property-provider" "^3.1.8" + "@smithy/smithy-client" "^3.4.2" + "@smithy/types" "^3.6.0" tslib "^2.6.2" -"@smithy/util-endpoints@^2.1.2": - version "2.1.3" - resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-2.1.3.tgz#7498151e9dc714bdd0c6339314dd2350fa4d250a" - integrity sha512-34eACeKov6jZdHqS5hxBMJ4KyWKztTMulhuQ2UdOoP6vVxMLrOKUqIXAwJe/wiWMhXhydLW664B02CNpQBQ4Aw== +"@smithy/util-endpoints@^2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-2.1.4.tgz#a29134c2b1982442c5fc3be18d9b22796e8eb964" + integrity sha512-kPt8j4emm7rdMWQyL0F89o92q10gvCUa6sBkBtDJ7nV2+P7wpXczzOfoDJ49CKXe5CCqb8dc1W+ZdLlrKzSAnQ== dependencies: - "@smithy/node-config-provider" "^3.1.8" - "@smithy/types" "^3.5.0" + "@smithy/node-config-provider" "^3.1.9" + "@smithy/types" "^3.6.0" tslib "^2.6.2" "@smithy/util-hex-encoding@^3.0.0": @@ -1325,31 +1318,31 @@ dependencies: tslib "^2.6.2" -"@smithy/util-middleware@^3.0.6", "@smithy/util-middleware@^3.0.7": - version "3.0.7" - resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-3.0.7.tgz#770d09749b6d170a1641384a2e961487447446fa" - integrity sha512-OVA6fv/3o7TMJTpTgOi1H5OTwnuUa8hzRzhSFDtZyNxi6OZ70L/FHattSmhE212I7b6WSOJAAmbYnvcjTHOJCA== +"@smithy/util-middleware@^3.0.8": + version "3.0.8" + resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-3.0.8.tgz#372bc7a2845408ad69da039d277fc23c2734d0c6" + integrity sha512-p7iYAPaQjoeM+AKABpYWeDdtwQNxasr4aXQEA/OmbOaug9V0odRVDy3Wx4ci8soljE/JXQo+abV0qZpW8NX0yA== dependencies: - "@smithy/types" "^3.5.0" + "@smithy/types" "^3.6.0" tslib "^2.6.2" -"@smithy/util-retry@^3.0.6", "@smithy/util-retry@^3.0.7": - version "3.0.7" - resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-3.0.7.tgz#694e0667574ffe9772f620b35d3c7286aced35e9" - integrity sha512-nh1ZO1vTeo2YX1plFPSe/OXaHkLAHza5jpokNiiKX2M5YpNUv6RxGJZhpfmiR4jSvVHCjIDmILjrxKmP+/Ghug== +"@smithy/util-retry@^3.0.8": + version "3.0.8" + resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-3.0.8.tgz#9c607c175a4d8a87b5d8ebaf308f6b849e4dc4d0" + integrity sha512-TCEhLnY581YJ+g1x0hapPz13JFqzmh/pMWL2KEFASC51qCfw3+Y47MrTmea4bUE5vsdxQ4F6/KFbUeSz22Q1ow== dependencies: - "@smithy/service-error-classification" "^3.0.7" - "@smithy/types" "^3.5.0" + "@smithy/service-error-classification" "^3.0.8" + "@smithy/types" "^3.6.0" tslib "^2.6.2" -"@smithy/util-stream@^3.1.8", "@smithy/util-stream@^3.1.9": - version "3.1.9" - resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-3.1.9.tgz#d39656eae27696bdc5a3ec7c2f6b89c32dccd1ca" - integrity sha512-7YAR0Ub3MwTMjDfjnup4qa6W8gygZMxikBhFMPESi6ASsl/rZJhwLpF/0k9TuezScCojsM0FryGdz4LZtjKPPQ== +"@smithy/util-stream@^3.2.1": + version "3.2.1" + resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-3.2.1.tgz#f3055dc4c8caba8af4e47191ea7e773d0e5a429d" + integrity sha512-R3ufuzJRxSJbE58K9AEnL/uSZyVdHzud9wLS8tIbXclxKzoe09CRohj2xV8wpx5tj7ZbiJaKYcutMm1eYgz/0A== dependencies: - "@smithy/fetch-http-handler" "^3.2.9" - "@smithy/node-http-handler" "^3.2.4" - "@smithy/types" "^3.5.0" + "@smithy/fetch-http-handler" "^4.0.0" + "@smithy/node-http-handler" "^3.2.5" + "@smithy/types" "^3.6.0" "@smithy/util-base64" "^3.0.0" "@smithy/util-buffer-from" "^3.0.0" "@smithy/util-hex-encoding" "^3.0.0" @@ -1407,11 +1400,11 @@ "@types/node" "*" "@types/node@*": - version "22.7.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-22.7.4.tgz#e35d6f48dca3255ce44256ddc05dee1c23353fcc" - integrity sha512-y+NPi1rFzDs1NdQHHToqeiX2TIS79SWEAw9GYhkkx8bD0ChpfqC+n2j5OXOCpzfojBEBt6DnEnnG9MY0zk1XLg== + version "22.9.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.9.0.tgz#b7f16e5c3384788542c72dc3d561a7ceae2c0365" + integrity sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ== dependencies: - undici-types "~6.19.2" + undici-types "~6.19.8" "@types/node@^14.14.14": version "14.18.63" @@ -1442,9 +1435,9 @@ "@types/webidl-conversions" "*" "@types/ws@^8.5.3": - version "8.5.12" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.12.tgz#619475fe98f35ccca2a2f6c137702d85ec247b7e" - integrity sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ== + version "8.5.13" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.13.tgz#6414c280875e2691d0d1e080b05addbf5cb91e20" + integrity sha512-osM/gWBTPKgHV8XkTunnegTRIsvF6owmf5w+JtAfOw472dptdm0dlGv4xCt6GwQRcC2XVOvvRE/0bAoQcL2QkA== dependencies: "@types/node" "*" @@ -2067,7 +2060,7 @@ ansi-styles@^2.2.1: resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA== -ansi-styles@^3.2.0, ansi-styles@^3.2.1: +ansi-styles@^3.2.0: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== @@ -2311,7 +2304,7 @@ axios@^0.27.2: follow-redirects "^1.14.9" form-data "^4.0.0" -axios@^1.6.8: +axios@^1.7.4: version "1.7.7" resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.7.tgz#2f554296f9892a72ac8d8e4c5b79c14a91d0a47f" integrity sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q== @@ -2529,15 +2522,15 @@ browser-or-node@^2.1.1: resolved "https://registry.yarnpkg.com/browser-or-node/-/browser-or-node-2.1.1.tgz#738790b3a86a8fc020193fa581273fbe65eaea0f" integrity sha512-8CVjaLJGuSKMVTxJ2DpBl5XnlNDiT4cQFeuCJJrvJmts9YrTZDizTX7PjC2s6W4x+MBGZeEY6dGMrF04/6Hgqg== -browserslist@^4.23.1: - version "4.24.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.0.tgz#a1325fe4bc80b64fda169629fc01b3d6cecd38d4" - integrity sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A== +browserslist@^4.24.0: + version "4.24.2" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.2.tgz#f5845bc91069dbd55ee89faf9822e1d885d16580" + integrity sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg== dependencies: - caniuse-lite "^1.0.30001663" - electron-to-chromium "^1.5.28" + caniuse-lite "^1.0.30001669" + electron-to-chromium "^1.5.41" node-releases "^2.0.18" - update-browserslist-db "^1.1.0" + update-browserslist-db "^1.1.1" bson@^1.1.4: version "1.1.6" @@ -2695,10 +2688,10 @@ camelcase@^5.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -caniuse-lite@^1.0.30001663: - version "1.0.30001664" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001664.tgz#d588d75c9682d3301956b05a3749652a80677df4" - integrity sha512-AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g== +caniuse-lite@^1.0.30001669: + version "1.0.30001678" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001678.tgz#b930b04cd0b295136405634aa32ad540d7eeb71e" + integrity sha512-RR+4U/05gNtps58PEBDZcPWTgEO2MBeoPZ96aQcjmfkBWRIDfN451fW2qyDA9/+HohLLIL5GqiMwA+IB1pWarw== caseless@~0.12.0: version "0.12.0" @@ -2724,15 +2717,6 @@ chalk@^1.0.0, chalk@^1.1.1: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - charenc@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667" @@ -2977,12 +2961,12 @@ cookie-jar@~0.3.0: resolved "https://registry.yarnpkg.com/cookie-jar/-/cookie-jar-0.3.0.tgz#bc9a27d4e2b97e186cd57c9e2063cb99fa68cccc" integrity sha512-dX1400pzPULr+ZovkIsDEqe7XH8xCAYGT5Dege4Eot44Qs2mS2iJmnh45TxTO5MIsCfrV/JGZVloLhm46AHxNw== -cookie-session@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/cookie-session/-/cookie-session-2.0.0.tgz#d07aa27822f43619e4342df1342268c849833089" - integrity sha512-hKvgoThbw00zQOleSlUr2qpvuNweoqBtxrmx0UFosx6AGi9lYtLoA+RbsvknrEX8Pr6MDbdWAb2j6SnMn+lPsg== +cookie-session@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cookie-session/-/cookie-session-2.1.0.tgz#ae30b566b2f9f2d8ca2c4936513e6bf181830558" + integrity sha512-u73BDmR8QLGcs+Lprs0cfbcAPKl2HnPcjpwRXT41sEV4DRJ2+W0vJEEZkG31ofkx+HZflA70siRIjiTdIodmOQ== dependencies: - cookies "0.8.0" + cookies "0.9.1" debug "3.2.7" on-headers "~1.0.2" safe-buffer "5.2.1" @@ -2992,15 +2976,15 @@ cookie-signature@1.0.6: resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ== -cookie@0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051" - integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw== +cookie@0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.1.tgz#2f73c42142d5d5cf71310a74fc4ae61670e5dbc9" + integrity sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w== -cookies@0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.8.0.tgz#1293ce4b391740a8406e3c9870e828c4b54f3f90" - integrity sha512-8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow== +cookies@0.9.1: + version "0.9.1" + resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.9.1.tgz#3ffed6f60bb4fb5f146feeedba50acc418af67e3" + integrity sha512-TG2hpqe4ELx54QER/S3HQ9SRVnQnGBtKUz5bLQWtYAQ+o6GpgMs6sYUvaiJjVxb+UXwhRhAEP3m7LbsIZ77Hmw== dependencies: depd "~2.0.0" keygrip "~1.1.0" @@ -3011,9 +2995,9 @@ core-js@^2.4.0: integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== core-js@^3.30.2: - version "3.38.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.38.1.tgz#aa375b79a286a670388a1a363363d53677c0383e" - integrity sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw== + version "3.39.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.39.0.tgz#57f7647f4d2d030c32a72ea23a0555b2eaa30f83" + integrity sha512-raM0ew0/jJUqkJ0E6e8UDtl+y/7ktFivgWvqw8dNSQeNWoSDLvQ1H/RN3aPXB9tBd4/FhyR4RDPGhsNIMsAn7g== core-util-is@1.0.2: version "1.0.2" @@ -3036,7 +3020,7 @@ cp-file@^6.2.0: pify "^4.0.1" safe-buffer "^5.0.1" -cpu-features@~0.0.9: +cpu-features@~0.0.10: version "0.0.10" resolved "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.10.tgz#9aae536db2710c7254d7ed67cb3cbc7d29ad79c5" integrity sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA== @@ -3089,9 +3073,9 @@ cross-spawn@^4: which "^1.2.9" cross-spawn@^7.0.0: - version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + version "7.0.5" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.5.tgz#910aac880ff5243da96b728bc6521a5f6c2f2f82" + integrity sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug== dependencies: path-key "^3.1.0" shebang-command "^2.0.0" @@ -3294,9 +3278,9 @@ discord-api-types@0.37.97: integrity sha512-No1BXPcVkyVD4ZVmbNgDKaBoqgeQ+FJpzZ8wqHkfmBnTZig1FcH3iPPersiK1TUIAzgClh2IvOuVUYfcWLQAOA== discord-api-types@^0.37.12, discord-api-types@^0.37.41: - version "0.37.101" - resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.101.tgz#1512a26e35b700b9dfb903a5747741a097f9c8bb" - integrity sha512-2wizd94t7G3A8U5Phr3AiuL4gSvhqistDwWnlk1VLTit8BI1jWUncFqFQNdPbHqS3661+Nx/iEyIwtVjPuBP3w== + version "0.37.104" + resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.104.tgz#d6a0f0477f27c98a42b19208bfc0da30e72facd5" + integrity sha512-kIX9RXGekag1Yd/R/douqBTRyt5GY5mCoxntKLuyqfYpKQ1fl8XpHNFIMtnoDSD343TJWsah49XylrsNFfTu0Q== discord.js@14.6.0: version "14.6.0" @@ -3383,10 +3367,10 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -electron-to-chromium@^1.5.28: - version "1.5.30" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.30.tgz#5b264b489cfe0c3dd71097c164d795444834e7c7" - integrity sha512-sXI35EBN4lYxzc/pIGorlymYNzDBOqkSlVRe6MkgBsW/hW1tpC/HDJ2fjG7XnjakzfLEuvdmux0Mjs6jHq4UOA== +electron-to-chromium@^1.5.41: + version "1.5.53" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.53.tgz#bbae15eb887d00e511e175eba5a7db7902377838" + integrity sha512-7F6qFMWzBArEFK4PLE+c+nWzhS1kIoNkQvGnNDogofxQAym+roQ0GUIdw6C/4YdJ6JKGp19c2a/DLcfKTi4wRQ== emoji-regex@^7.0.1: version "7.0.3" @@ -3437,7 +3421,7 @@ entities@^2.0.0: resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== -entities@^4.4.0: +entities@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== @@ -3664,17 +3648,17 @@ express-ws@5.0.2: dependencies: ws "^7.4.6" -express@4.21.0: - version "4.21.0" - resolved "https://registry.yarnpkg.com/express/-/express-4.21.0.tgz#d57cb706d49623d4ac27833f1cbc466b668eb915" - integrity sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng== +express@4.21.1: + version "4.21.1" + resolved "https://registry.yarnpkg.com/express/-/express-4.21.1.tgz#9dae5dda832f16b4eec941a4e44aa89ec481b281" + integrity sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ== dependencies: accepts "~1.3.8" array-flatten "1.1.1" body-parser "1.20.3" content-disposition "0.5.4" content-type "~1.0.4" - cookie "0.6.0" + cookie "0.7.1" cookie-signature "1.0.6" debug "2.6.9" depd "2.0.0" @@ -3902,9 +3886,9 @@ forever-agent@~0.6.1: integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw== form-data@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" - integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + version "4.0.1" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.1.tgz#ba1076daaaa5bfd7e99c1a6cb02aa0a5cff90d48" + integrity sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw== dependencies: asynckit "^0.4.0" combined-stream "^1.0.8" @@ -4130,9 +4114,9 @@ globalthis@^1.0.3: gopd "^1.0.1" google-auth-library@^9.0.0, google-auth-library@^9.7.0: - version "9.14.1" - resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-9.14.1.tgz#4c6f535f474b01847ea1a60ef1d56dbd6a0aad2f" - integrity sha512-Rj+PMjoNFGFTmtItH7gHfbHpGVSb3vmnGK3nwNBqxQF9NoBpttSZI/rc0WiM63ma2uGDQtYEkMHkK9U6937NiA== + version "9.14.2" + resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-9.14.2.tgz#92a53ba32b3a9ff9ced8ed34129edb5a7fa7fb52" + integrity sha512-R+FRIfk1GBo3RdlRYWPdwk8nmtVUOn6+BkDomAC46KoU8kzXzE1HLmOasSCbWUByMMAGkknVF0G5kQ69Vj7dlA== dependencies: base64-js "^1.3.0" ecdsa-sig-formatter "^1.0.11" @@ -4493,10 +4477,10 @@ ieee754@^1.1.13, ieee754@^1.2.1: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== -image-size@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.0.2.tgz#d778b6d0ab75b2737c1556dd631652eb963bc486" - integrity sha512-xfOoWjceHntRb3qFCrh5ZFORYH8XCdYpASltMhZ/Q0KZiOwjdE/Yl2QCiWdwD+lygV5bMCvauzgu5PxBX/Yerg== +image-size@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.1.1.tgz#ddd67d4dc340e52ac29ce5f546a09f4e29e840ac" + integrity sha512-541xKlUw6jr/6gGuk92F+mYM5zaFAc5ahphvkqvNe2bQ6gVBkd6bfrmVJ2t4KDAfikAYZyIqTnktX3i6/aQDrQ== dependencies: queue "6.0.2" @@ -4986,10 +4970,10 @@ jsdom@22.1.0: ws "^8.13.0" xml-name-validator "^4.0.0" -jsesc@^2.5.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" - integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== +jsesc@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.0.2.tgz#bb8b09a6597ba426425f2e4a07245c3d00b9343e" + integrity sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g== json-bigint@^1.0.0: version "1.0.0" @@ -5729,21 +5713,26 @@ named-placeholders@^1.1.3: dependencies: lru-cache "^7.14.1" -nan@^2.13.2, nan@^2.18.0, nan@^2.19.0: - version "2.20.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.20.0.tgz#08c5ea813dd54ed16e5bd6505bf42af4f7838ca3" - integrity sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw== +nan@^2.13.2, nan@^2.19.0, nan@^2.20.0: + version "2.22.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.22.0.tgz#31bc433fc33213c97bad36404bb68063de604de3" + integrity sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw== nanoid@^2.1.0: version "2.1.11" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280" integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA== -negotiator@0.6.3, negotiator@^0.6.2: +negotiator@0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== +negotiator@^0.6.2: + version "0.6.4" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.4.tgz#777948e2452651c570b712dd01c23e262713fff7" + integrity sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w== + neo-async@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" @@ -5880,10 +5869,10 @@ node-xcs@0.1.7: "@xmpp/client" "^0.9.2" "@xmpp/debug" "^0.9.2" -nodemailer@6.9.8: - version "6.9.8" - resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.9.8.tgz#29601e80440f2af7aa62b32758fdac7c6b784143" - integrity sha512-cfrYUk16e67Ks051i4CntM9kshRYei1/o/Gi8K1d+R34OIs21xdFnW7Pt7EucmVKA0LKtqUGNcjMZ7ehjl49mQ== +nodemailer@6.9.15: + version "6.9.15" + resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.9.15.tgz#57b79dc522be27e0e47ac16cc860aa0673e62e04" + integrity sha512-AHf04ySLC6CIfuRtRiEYtGEXgRfa6INgWGluDhnxTZhHSKvrBu7lc1VVchQ0d8nPc4cFaZoPq8vkyNoZr0TpGQ== nofilter@^1.0.4: version "1.0.4" @@ -6072,7 +6061,7 @@ onetime@^1.0.0: resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789" integrity sha512-GZ+g4jayMqzCRMgB2sol7GiCLjKfS1PINkjmx8spcKce1LiVqcbQreXwqs2YAFXC6R03VIG28ZS31t8M866v6A== -openid-client@*: +openid-client@5.7.0: version "5.7.0" resolved "https://registry.yarnpkg.com/openid-client/-/openid-client-5.7.0.tgz#61dbea7251f561e82342278063ce37c5c05347f2" integrity sha512-4GCCGZt1i2kTHpwvaC/sCpTpQqDnBzDzuJcJMbH+y1Q5qI8U8RBvoSh28svarXszZHR5BAMXbJPX1PGPRE3VOA== @@ -6207,11 +6196,11 @@ parse-passwd@^1.0.0: integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q== parse5@^7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32" - integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw== + version "7.2.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.2.1.tgz#8928f55915e6125f430cc44309765bf17556a33a" + integrity sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ== dependencies: - entities "^4.4.0" + entities "^4.5.0" parseurl@~1.3.3: version "1.3.3" @@ -6379,9 +6368,9 @@ pause@0.0.1: integrity sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg== peek-readable@^5.1.3: - version "5.2.0" - resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-5.2.0.tgz#7458f18126217c154938c32a185f5d05f3df3710" - integrity sha512-U94a+eXHzct7vAd19GH3UQ2dH4Satbng0MyYTMaQatL0pvYYL5CTPR25HBhKtecl+4bfu1/i3vC6k0hydO5Vcw== + version "5.3.1" + resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-5.3.1.tgz#9cc2c275cceda9f3d07a988f4f664c2080387dff" + integrity sha512-GVlENSDW6KHaXcd9zkZltB7tCLosKB/4Hg0fqBJkAoBgYG2Tn1xtMgXtSUuMU9AK/gCm/tTdT8mgAeF4YNeeqw== pend@~1.2.0: version "1.2.0" @@ -6443,9 +6432,9 @@ pg@8.7.1: pgpass "1.x" pg@^8.4.0: - version "8.13.0" - resolved "https://registry.yarnpkg.com/pg/-/pg-8.13.0.tgz#e3d245342eb0158112553fcc1890a60720ae2a3d" - integrity sha512-34wkUTh3SxTClfoHB3pQ7bIMvw9dpFU1audQQeZG837fmHfHpr14n/AELVDoOYVDW2h5RDWU78tFjkD+erSBsw== + version "8.13.1" + resolved "https://registry.yarnpkg.com/pg/-/pg-8.13.1.tgz#6498d8b0a87ff76c2df7a32160309d3168c0c080" + integrity sha512-OUir1A0rPNZlX//c7ksiu7crsGZTKSOXJPgtNiHGIlC9H0lO+NC6ZDYksSgBYY/thSWhnSRBv8w1lieNNGATNQ== dependencies: pg-connection-string "^2.7.0" pg-pool "^3.7.0" @@ -6473,9 +6462,9 @@ pgtools@0.3.2: yargs "^5.0.0" picocolors@^1.0.0, picocolors@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.0.tgz#5358b76a78cde483ba5cef6a9dc9671440b27d59" - integrity sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw== + version "1.1.1" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" + integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA== picomatch@^2.0.4, picomatch@^2.2.1: version "2.3.1" @@ -6643,9 +6632,11 @@ pseudomap@^1.0.2: integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ== psl@^1.1.28, psl@^1.1.33: - version "1.9.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" - integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== + version "1.10.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.10.0.tgz#1450f7e16f922c3beeb7bd9db3f312635018fa15" + integrity sha512-KSKHEbjAnpUuAUserOq0FxGXCUrzC3WniuSJhvdbs102rL55266ZcHBqLWOsG30spQMlPdpy7icATiAQehg/iA== + dependencies: + punycode "^2.3.1" pump@^3.0.0: version "3.0.2" @@ -6655,7 +6646,7 @@ pump@^3.0.0: end-of-stream "^1.1.0" once "^1.3.1" -punycode@^2.1.0, punycode@^2.1.1, punycode@^2.3.0: +punycode@^2.1.0, punycode@^2.1.1, punycode@^2.3.0, punycode@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== @@ -6854,14 +6845,14 @@ regenerator-runtime@^0.14.0: integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw== regexp.prototype.flags@^1.5.2: - version "1.5.2" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334" - integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw== + version "1.5.3" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz#b3ae40b1d2499b8350ab2c3fe6ef3845d3a96f42" + integrity sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ== dependencies: - call-bind "^1.0.6" + call-bind "^1.0.7" define-properties "^1.2.1" es-errors "^1.3.0" - set-function-name "^2.0.1" + set-function-name "^2.0.2" relateurl@^0.2.7: version "0.2.7" @@ -7187,7 +7178,7 @@ set-function-length@^1.2.1: gopd "^1.0.1" has-property-descriptors "^1.0.2" -set-function-name@^2.0.1: +set-function-name@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985" integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ== @@ -7401,16 +7392,16 @@ sqlstring@^2.3.2: resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.3.tgz#2ddc21f03bce2c387ed60680e739922c65751d0c" integrity sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg== -ssh2@1.15.0: - version "1.15.0" - resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.15.0.tgz#2f998455036a7f89e0df5847efb5421748d9871b" - integrity sha512-C0PHgX4h6lBxYx7hcXwu3QWdh4tg6tZZsTfXcdvc5caW/EMxaB4H9dWsl7qk+F7LAW762hp8VbXOX7x4xUYvEw== +ssh2@1.16.0: + version "1.16.0" + resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.16.0.tgz#79221d40cbf4d03d07fe881149de0a9de928c9f0" + integrity sha512-r1X4KsBGedJqo7h8F5c4Ybpcr5RjyP+aWIG007uBPRjmdQWfEiVLzSK71Zji1B9sKxwaCvD8y8cwSkYrlLiRRg== dependencies: asn1 "^0.2.6" bcrypt-pbkdf "^1.0.2" optionalDependencies: - cpu-features "~0.0.9" - nan "^2.18.0" + cpu-features "~0.0.10" + nan "^2.20.0" sshpk@^1.14.1, sshpk@^1.7.0: version "1.18.0" @@ -7460,9 +7451,9 @@ stream-chain@^2.2.5: integrity sha512-1TJmBx6aSWqZ4tx7aTpBDXK0/e2hhcNSTV8+CbFJtDjbb+I1mZ8lHit0Grw9GRT+6JbIrrDd8esncgBi8aBXGA== stream-json@^1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/stream-json/-/stream-json-1.8.0.tgz#53f486b2e3b4496c506131f8d7260ba42def151c" - integrity sha512-HZfXngYHUAr1exT4fxlbc1IOce1RYxp2ldeaf97LYCOPSoOqY/1Psp7iGvpb+6JIOgkra9zDYnPX01hGAHzEPw== + version "1.9.0" + resolved "https://registry.yarnpkg.com/stream-json/-/stream-json-1.9.0.tgz#caae36fd9fff99662f504dce859bc855d5668282" + integrity sha512-TqnfW7hRTKje7UobBzXZJ2qOEDJvdcSVgVIK/fopC03xINFuFqQs8RVjyDT4ry7TmOo2ueAXwpXXXG4tNgtvoQ== dependencies: stream-chain "^2.2.5" @@ -7641,13 +7632,6 @@ supports-color@^2.0.0: resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g== -supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.0" - supports-color@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" @@ -7743,11 +7727,9 @@ test-exclude@^5.2.3: require-main-filename "^2.0.0" text-decoder@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/text-decoder/-/text-decoder-1.2.0.tgz#85f19d4d5088e0b45cd841bdfaeac458dbffeefc" - integrity sha512-n1yg1mOj9DNpk3NeZOx7T6jchTbyJS3i3cucbNN6FcdPriMZx7NsgrGpWWdWZZGxD7ES1XB+3uoqHMgOKaN+fg== - dependencies: - b4a "^1.6.4" + version "1.2.1" + resolved "https://registry.yarnpkg.com/text-decoder/-/text-decoder-1.2.1.tgz#e173f5121d97bfa3ff8723429ad5ba92e1ead67e" + integrity sha512-x9v3H/lTKIJKQQe7RPQkLfKAnc9lUTkWDypIQgTzPJAq+5/GCDHonmshfvlsNSj58yyshbIJJDLmU15qNERrXQ== text-hex@1.0.x: version "1.0.0" @@ -7789,11 +7771,6 @@ tiny-inflate@^1.0.2: resolved "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.3.tgz#122715494913a1805166aaf7c93467933eea26c4" integrity sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw== -to-fast-properties@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== - to-mongodb-core@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/to-mongodb-core/-/to-mongodb-core-2.0.0.tgz#3596ec7613ac9ad3b98a89dcb9aefba569cd27eb" @@ -7872,9 +7849,9 @@ ts-mixer@^6.0.4: integrity sha512-ufKpbmrugz5Aou4wcr5Wc1UUFWOLhq+Fm6qa6P0w0K5Qw2yhaUoiWszhCVuNQyNwrlGiscHOmqYoAox1PtvgjA== tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0, tslib@^2.6.2, tslib@^2.6.3: - version "2.7.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01" - integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA== + version "2.8.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f" + integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w== tsscmp@1.0.6: version "1.0.6" @@ -7986,10 +7963,10 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" -ua-parser-js@1.0.37: - version "1.0.37" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.37.tgz#b5dc7b163a5c1f0c510b08446aed4da92c46373f" - integrity sha512-bhTyI94tZofjo+Dn8SN6Zv8nBDvyXTymAdM3LDI/0IboIUwTu1rEhW7v2TfiVsoYWgkQ4kOVqnI8APUFbIQIFQ== +ua-parser-js@1.0.39: + version "1.0.39" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.39.tgz#bfc07f361549bf249bd8f4589a4cccec18fd2018" + integrity sha512-k24RCVWlEcjkdOxYmVJgeD/0a1TiSpqLg+ZalVGV9lsnr4yqu0w7tX/x2xX6G4zpkgQnRf89lxuZ1wsbjXM8lw== uglify-js@^3.1.4, uglify-js@^3.5.1: version "3.19.3" @@ -8023,7 +8000,7 @@ underscore@^1.13.1: resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.7.tgz#970e33963af9a7dda228f17ebe8399e5fbe63a10" integrity sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g== -undici-types@~6.19.2: +undici-types@~6.19.8: version "6.19.8" resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02" integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw== @@ -8064,7 +8041,7 @@ unpipe@1.0.0, unpipe@~1.0.0: resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== -update-browserslist-db@^1.1.0: +update-browserslist-db@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz#80846fba1d79e82547fb661f8d141e0945755fe5" integrity sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A== @@ -8394,9 +8371,9 @@ winston-transport@^4.7.0: triple-beam "^1.3.0" winston@^3.3.3: - version "3.14.2" - resolved "https://registry.yarnpkg.com/winston/-/winston-3.14.2.tgz#94ce5fd26d374f563c969d12f0cd9c641065adab" - integrity sha512-CO8cdpBB2yqzEf8v895L+GNKYJiEq8eKlHU38af3snQBQ+sdAIUepjMSguOIJC7ICbzm0ZI+Af2If4vIJrtmOg== + version "3.16.0" + resolved "https://registry.yarnpkg.com/winston/-/winston-3.16.0.tgz#d11caabada87b7d4b59aba9a94b882121b773f9b" + integrity sha512-xz7+cyGN5M+4CmmD4Npq1/4T+UZaz7HaeTlAruFUTjk79CNMq+P6H30vlE4z0qfqJ01VHYQwd7OZo03nYm/+lg== dependencies: "@colors/colors" "^1.6.0" "@dabh/diagnostics" "^2.0.2" @@ -8478,21 +8455,16 @@ write-file-atomic@^2.4.2: imurmurhash "^0.1.4" signal-exit "^3.0.2" -ws@8.17.1: - version "8.17.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b" - integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ== +ws@8.18.0, ws@^8.13.0, ws@^8.4.0, ws@^8.9.0: + version "8.18.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc" + integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw== ws@^7.0.0, ws@^7.4.6: version "7.5.10" resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9" integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ== -ws@^8.13.0, ws@^8.4.0, ws@^8.9.0: - version "8.18.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc" - integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw== - xml-crypto@^2.1.3: version "2.1.5" resolved "https://registry.yarnpkg.com/xml-crypto/-/xml-crypto-2.1.5.tgz#e201ee51dca18dd9ae158ac101b6e995c983dca8" From 39278a04ce2db56f61b02b9ebb3ea49d31930f2f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 8 Nov 2024 21:36:30 +0800 Subject: [PATCH 565/617] nemo-emblems: Disable nixpkgs-update The tags are sometimes nemo-emblems-${version} and sometimes ${version}, in most cases I guess will just discover and do these updates manually. --- pkgs/by-name/ne/nemo-emblems/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ne/nemo-emblems/package.nix b/pkgs/by-name/ne/nemo-emblems/package.nix index a0bff1d11f66..6f87281ed08c 100644 --- a/pkgs/by-name/ne/nemo-emblems/package.nix +++ b/pkgs/by-name/ne/nemo-emblems/package.nix @@ -8,6 +8,7 @@ python3.pkgs.buildPythonApplication rec { pname = "nemo-emblems"; version = "6.2.1"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "linuxmint"; repo = "nemo-extensions"; From da7e2263a5909381476e77592505e13fec30cd74 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 8 Nov 2024 16:39:45 +0300 Subject: [PATCH 566/617] home-assistant-chip-core: fix native dependencies These get lost when chip-wheels is compressed, and need to be recovered in chip-core to be picked up properly by refscan. --- .../python-modules/home-assistant-chip-core/default.nix | 2 +- .../python-modules/home-assistant-chip-wheels/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 a46676b443be..229f6867d38c 100644 --- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { deprecation mobly pygobject3 - ]; + ] ++ home-assistant-chip-wheels.propagatedBuildInputs; pythonNamespaces = [ "chip" diff --git a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix index b7eca194d13c..caec0be06cbf 100644 --- a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { yapf ]; - buildInputs = [ + propagatedBuildInputs = [ openssl glib libnl From bbf0e1231e5246858e47df0384528e7395d0b12e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Fri, 8 Nov 2024 14:19:30 +0100 Subject: [PATCH 567/617] dbeaver-bin: fix build on darwin, fixes #354475 --- pkgs/by-name/db/dbeaver-bin/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index ece1216d445c..7ec12cce9527 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -56,7 +56,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontBuild = true; prePatch = '' - substituteInPlace dbeaver.ini \ + substituteInPlace ${lib.optionalString stdenvNoCC.hostPlatform.isDarwin "Contents/Eclipse/"}dbeaver.ini \ --replace-fail '-Xmx1024m' '-Xmx${override_xmx}' ''; From 4904e3f5df2beecca432591d7ff96c83e767c6b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Fri, 8 Nov 2024 14:46:38 +0100 Subject: [PATCH 568/617] dbeaver-bin: fix on case-sensitive fs --- pkgs/by-name/db/dbeaver-bin/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index 7ec12cce9527..c9cc55579986 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -41,7 +41,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { inherit hash; }; - sourceRoot = lib.optional stdenvNoCC.hostPlatform.isDarwin "dbeaver.app"; + sourceRoot = lib.optional stdenvNoCC.hostPlatform.isDarwin "DBeaver.app"; nativeBuildInputs = [ makeWrapper ] From b2a003ef8321ff2461b65824babd6355ab8befa3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Nov 2024 14:08:37 +0000 Subject: [PATCH 569/617] tparse: 0.15.0 -> 0.16.0 --- pkgs/by-name/tp/tparse/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tp/tparse/package.nix b/pkgs/by-name/tp/tparse/package.nix index 58e65af868d2..5441a1413cc8 100644 --- a/pkgs/by-name/tp/tparse/package.nix +++ b/pkgs/by-name/tp/tparse/package.nix @@ -5,7 +5,7 @@ }: let pname = "tparse"; - version = "0.15.0"; + version = "0.16.0"; in buildGoModule { inherit pname version; @@ -14,10 +14,10 @@ buildGoModule { owner = "mfridman"; repo = pname; rev = "v${version}"; - hash = "sha256-CxoVu3WH2I/1wT5o/RGIrGFrGCQOC4vcUKMiH/Gv3aY="; + hash = "sha256-fljSjch09kQCpnZerI/h4SRCyxUydfFZGyOXsxmgYOk="; }; - vendorHash = "sha256-soIti6o8BUnarPf5/bcMJKdEG0oRpDLMkQM6RlbZQ5I="; + vendorHash = "sha256-gGmPQ8YaTk7xG5B8UPK7vOui5YFeEnkuGrAsf0eylXQ="; ldflags = [ "-s" From 17926cc5211bf2afc987b2e87a497d50271e20b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Nov 2024 14:14:48 +0000 Subject: [PATCH 570/617] fastp: 0.23.4 -> 0.24.0 --- pkgs/applications/science/biology/fastp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/fastp/default.nix b/pkgs/applications/science/biology/fastp/default.nix index 0495da0e3c3d..91f6c9d22047 100644 --- a/pkgs/applications/science/biology/fastp/default.nix +++ b/pkgs/applications/science/biology/fastp/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "fastp"; - version = "0.23.4"; + version = "0.24.0"; src = fetchFromGitHub { owner = "OpenGene"; repo = "fastp"; rev = "v${version}"; - sha256 = "sha256-hkCo8CiZNJuVcL9Eg/R7YzM7/FEcGEnovV325oWa7y8="; + sha256 = "sha256-Jl2Os/6yLWXTDv6irInYlUHpz6QTw8CEMVGFXblAay0="; }; buildInputs = [ zlib libdeflate isa-l ]; From a431e9d6b93f96139ddc3b2c617da33911237404 Mon Sep 17 00:00:00 2001 From: Malte Janz Date: Fri, 8 Nov 2024 14:38:57 +0100 Subject: [PATCH 571/617] ludtwig: 0.8.3 -> 0.9.0 --- pkgs/by-name/lu/ludtwig/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lu/ludtwig/package.nix b/pkgs/by-name/lu/ludtwig/package.nix index 18145c63a676..f4ab5b57ee6e 100644 --- a/pkgs/by-name/lu/ludtwig/package.nix +++ b/pkgs/by-name/lu/ludtwig/package.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "ludtwig"; - version = "0.8.3"; + version = "0.9.0"; src = fetchFromGitHub { owner = "MalteJanz"; repo = pname; rev = "v${version}"; - hash = "sha256-nkyi6X9W92yLaSPCg3zk0z/Pwue6dGK09iCDmWliFeg="; + hash = "sha256-J5UTVXUExVApA8VVTyhkO2JhpVCK45li9VBN+oM9TBI="; }; checkType = "debug"; - cargoHash = "sha256-CZOdxrQ/50xznc8cfvi+6QFmMpPOS1st+yVPtAkZ3/A="; + cargoHash = "sha256-czofgV5a9aQoLn4JaBUbytY/aHfgJv3Q8RU2j+fbXo8="; meta = with lib; { description = "Linter / Formatter for Twig template files which respects HTML and your time"; From c89cc9e33f0d0dd95ac29046fda7b9f7770fda91 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 8 Nov 2024 18:49:31 +0400 Subject: [PATCH 572/617] =?UTF-8?q?flashmq:=201.17.2=20=E2=86=92=201.17.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/fl/flashmq/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flashmq/package.nix b/pkgs/by-name/fl/flashmq/package.nix index dabcb321bb54..f405ef99e9a5 100644 --- a/pkgs/by-name/fl/flashmq/package.nix +++ b/pkgs/by-name/fl/flashmq/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flashmq"; - version = "1.17.2"; + version = "1.17.3"; src = fetchFromGitHub { owner = "halfgaar"; repo = "FlashMQ"; rev = "v${version}"; - hash = "sha256-9PZ0niX7VQzoJ6JE50NOU2es8PyBt7ECENvr2lDpb7Y="; + hash = "sha256-AL3jkmz+LLg8apyMkemQugFrZpn5f1sJEskjEiZ5/PQ="; }; nativeBuildInputs = [ cmake installShellFiles ]; From 1315f481277b79f088304618af0bb4c14aa20777 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Fri, 8 Nov 2024 23:16:58 +0800 Subject: [PATCH 573/617] maintainers: update aucub --- maintainers/maintainer-list.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d1051926aacb..c79d20570703 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2140,7 +2140,6 @@ }; aucub = { name = "aucub"; - email = "dr56ekgbb@mozmail.com"; github = "aucub"; githubId = 78630225; }; From 453c0a8441ec3155ea0de1734db9728b18a938ec Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 8 Nov 2024 19:30:18 +0400 Subject: [PATCH 574/617] =?UTF-8?q?agate:=203.3.9=20=E2=86=92=203.3.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/ag/agate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ag/agate/package.nix b/pkgs/by-name/ag/agate/package.nix index 53f44b3ef7fd..e49028e8969d 100644 --- a/pkgs/by-name/ag/agate/package.nix +++ b/pkgs/by-name/ag/agate/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "agate"; - version = "3.3.9"; + version = "3.3.10"; src = fetchFromGitHub { owner = "mbrubeck"; repo = "agate"; rev = "v${version}"; - hash = "sha256-u+v9RydB6OIsq2zOSmTDuejneb2uNFhRXsVNlGcPABs="; + hash = "sha256-uuMOe5yi0DSD7mTPnI0m/lpkv6Lb669vndwPE01oSUU="; }; - cargoHash = "sha256-oNI+UsxDdHSQGtl6vhxNWSiYVc8TV/vG8UoQX2w4ZoM="; + cargoHash = "sha256-6iEpOUhpWClgfAry8xIHJUPaAVKdPVaq3cTrSql9roo="; nativeBuildInputs = [ pkg-config ]; From 43b7e27aaacec251b66247e8caf4a55a75cb0219 Mon Sep 17 00:00:00 2001 From: Robin Krahl Date: Fri, 8 Nov 2024 16:58:14 +0100 Subject: [PATCH 575/617] python3Packages.hidapi: Remove libusb dependency Since version v0.14.0.post2, hidapi defaults to the hidraw backend so libusb is no longer required. See also: https://github.com/NixOS/nixpkgs/pull/329704 --- pkgs/development/python-modules/hidapi/default.nix | 13 +------------ pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index 976961d2164b..5c1fdda9484f 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -5,7 +5,6 @@ fetchPypi, xcbuild, cython_0, - libusb1, udev, darwin, }: @@ -23,10 +22,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; propagatedBuildInputs = - lib.optionals stdenv.hostPlatform.isLinux [ - libusb1 - udev - ] + lib.optionals stdenv.hostPlatform.isLinux [ udev ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ @@ -36,13 +32,6 @@ buildPythonPackage rec { ] ); - # Fix the USB backend library lookup - postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' - libusb=${libusb1.dev}/include/libusb-1.0 - test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } - sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py - ''; - pythonImportsCheck = [ "hid" ]; meta = with lib; { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6582ff759efb..f4d6dea86887 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5756,7 +5756,7 @@ self: super: with self; { }; hidapi = callPackage ../development/python-modules/hidapi { - inherit (pkgs) udev libusb1; + inherit (pkgs) udev; }; hid-parser = callPackage ../development/python-modules/hid-parser { }; From d4ab921f9417c3d74782094359ffb41f19028948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 8 Nov 2024 17:28:08 +0100 Subject: [PATCH 576/617] dnscontrol: 4.14.2 -> 4.14.3 Diff: https://github.com/StackExchange/dnscontrol/compare/v4.14.2...v4.14.3 Changelog: https://github.com/StackExchange/dnscontrol/releases/tag/v4.14.3 --- pkgs/applications/networking/dnscontrol/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index afd5f0232ebc..d865e1adaee0 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "4.14.2"; + version = "4.14.3"; src = fetchFromGitHub { owner = "StackExchange"; repo = "dnscontrol"; rev = "v${version}"; - hash = "sha256-Sdm/3Svg37NW710whH58YtFULKWXU5+87LmErfjRm3Y="; + hash = "sha256-FDxNJ6pOigasulxtAAnvHfWHQ3Ji459IQScA4dld9KQ="; }; - vendorHash = "sha256-yyj5uP1v49mieLnNvCDG6n4+jC/+zRvdtfjaTYsAhhA="; + vendorHash = "sha256-aqS5esDroGg83NJygX8tW8P0U4YCkll98KmAfya6lKM="; nativeBuildInputs = [ installShellFiles ]; From 9479182a74ac9ad1b0fc494e44aa035016b10fd0 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sat, 9 Nov 2024 00:42:01 +0800 Subject: [PATCH 577/617] python312Packages.stumpy: fix build --- .../python-modules/stumpy/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix index 5b6b4c31c913..03d5e87e8e4c 100644 --- a/pkgs/development/python-modules/stumpy/default.nix +++ b/pkgs/development/python-modules/stumpy/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, + setuptools-scm, numpy, scipy, numba, @@ -15,7 +17,7 @@ buildPythonPackage rec { pname = "stumpy"; version = "1.13.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +28,12 @@ buildPythonPackage rec { hash = "sha256-S+Rb6pHphXfbqz4VMnN1p7ZrlWB/g7XCdy/T5/Q8VD8="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ numpy scipy numba @@ -47,10 +54,11 @@ buildPythonPackage rec { "tests/test_core.py" ]; - meta = with lib; { + meta = { description = "Library that can be used for a variety of time series data mining tasks"; + changelog = "https://github.com/TDAmeritrade/stumpy/blob/${src.rev}/CHANGELOG.md"; homepage = "https://github.com/TDAmeritrade/stumpy"; - license = licenses.bsd3; + license = lib.licenses.bsd3; maintainers = [ ]; }; } From bbcae0310621af4fbc418a67593fb4bd20252490 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Nov 2024 17:17:11 +0000 Subject: [PATCH 578/617] gtk4-layer-shell: 1.0.3 -> 1.0.4 --- pkgs/development/libraries/gtk4-layer-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk4-layer-shell/default.nix b/pkgs/development/libraries/gtk4-layer-shell/default.nix index 14df22925dc0..132868b01e54 100644 --- a/pkgs/development/libraries/gtk4-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk4-layer-shell/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtk4-layer-shell"; - version = "1.0.3"; + version = "1.0.4"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "wmww"; repo = "gtk4-layer-shell"; rev = "v${finalAttrs.version}"; - hash = "sha256-oGtU1H1waA8ZAjaLMdb+x0KIIwgjhdn38ra/eFVWfFI="; + hash = "sha256-0Ya3NVTSO/urU8H+h6SVZBkcvdnqwr06rNWyBtwhQ8E="; }; strictDeps = true; From e6e2bff288c6cc2a5b2bd724a5c1fefb71af6870 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Nov 2024 17:24:07 +0000 Subject: [PATCH 579/617] myks: 4.2.3 -> 4.2.4 --- pkgs/by-name/my/myks/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 58e111777542..3860b0a2dc3b 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "myks"; - version = "4.2.3"; + version = "4.2.4"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; rev = "refs/tags/v${version}"; - hash = "sha256-sf+X+qafR0kpJTNIYoLr8q6stm+DgiD/yhVRyBRPA/s="; + hash = "sha256-RgVlr+POF5IUei/Rf5mHrjkw0wE5BjU3xwm1Ai1Pemw="; }; - vendorHash = "sha256-aWXU2UG4/U8g4dgspjyIfTT2J++WoJlLHAo6K3CSLxc="; + vendorHash = "sha256-CE5sT7zXN4ZhIIODOUwqrD0GOvnSVvkMcgLbBmJocKo="; subPackages = "."; From 2d78ec7c67dc535e061967de9b0f32f4d967fa0c Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sat, 9 Nov 2024 01:27:03 +0800 Subject: [PATCH 580/617] python312Packages.simplemma: fix build --- .../python-modules/simplemma/default.nix | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/simplemma/default.nix b/pkgs/development/python-modules/simplemma/default.nix index fc1502fa02a8..191fbb5df796 100644 --- a/pkgs/development/python-modules/simplemma/default.nix +++ b/pkgs/development/python-modules/simplemma/default.nix @@ -1,18 +1,19 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, - + setuptools, + marisa-trie, + platformdirs, + pytest, + pytest-cov-stub, pytestCheckHook, }: buildPythonPackage rec { pname = "simplemma"; version = "1.1.1"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; + pyproject = true; src = fetchFromGitHub { owner = "adbar"; @@ -21,14 +22,28 @@ buildPythonPackage rec { hash = "sha256-X0mqFPdCo0/sTexv4bi4bND7LFHOJvlOPH6tB39ybZY="; }; - nativeCheckInputs = [ pytestCheckHook ]; + build-system = [ + setuptools + ]; + + optional-dependencies = { + marisa-trie = [ + marisa-trie + platformdirs + ]; + }; + + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "simplemma" ]; - meta = with lib; { + meta = { description = "Simple multilingual lemmatizer for Python, especially useful for speed and efficiency"; homepage = "https://github.com/adbar/simplemma"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; } From fe6d94b8f99e1180d9ec14166d948c3b64482dc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 8 Nov 2024 18:36:29 +0100 Subject: [PATCH 581/617] Revert "haskellPackages: update stackage and hackage" --- doc/languages-frameworks/haskell.section.md | 4 +- pkgs/applications/editors/yi/wrapper.nix | 28 - pkgs/by-name/oa/oama/package.nix | 9 +- pkgs/data/misc/hackage/pin.json | 8 +- pkgs/development/compilers/ghc/head.nix | 6 +- .../haskell-modules/configuration-common.nix | 76 +- .../haskell-modules/configuration-darwin.nix | 4 - .../configuration-ghc-9.10.x.nix | 4 +- .../configuration-ghc-9.8.x.nix | 11 +- .../configuration-hackage2nix/broken.yaml | 14 +- .../configuration-hackage2nix/main.yaml | 7 +- .../configuration-hackage2nix/stackage.yaml | 79 +- .../transitive-broken.yaml | 29 +- .../haskell-modules/configuration-nix.nix | 37 +- .../haskell-modules/hackage-packages.nix | 2787 +++++++---------- .../password-3.0.4.0-scrypt-conditional.patch | 21 - .../tools/haskell/hadrian/make-hadrian.nix | 3 - pkgs/tools/networking/mailctl/default.nix | 97 + pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 - pkgs/top-level/release-haskell.nix | 7 +- 21 files changed, 1319 insertions(+), 1916 deletions(-) delete mode 100644 pkgs/applications/editors/yi/wrapper.nix delete mode 100644 pkgs/development/haskell-modules/patches/password-3.0.4.0-scrypt-conditional.patch create mode 100644 pkgs/tools/networking/mailctl/default.nix diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index d01991784977..feeb6f38673d 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -57,8 +57,8 @@ Available compilers are collected under `haskell.compiler`. Each of those compiler versions has a corresponding attribute set `packages` built with it. However, the non-standard package sets are not tested regularly and, as a result, contain fewer working packages. The corresponding package set for GHC -9.4.5 is `haskell.packages.ghc945`. In fact `haskellPackages` (at the time of writing) is just an alias -for `haskell.packages.ghc966`: +9.4.5 is `haskell.packages.ghc945`. In fact `haskellPackages` is just an alias +for `haskell.packages.ghc964`: Every package set also re-exposes the GHC used to build its packages as `haskell.packages.*.ghc`. diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix deleted file mode 100644 index 98b1697e9e70..000000000000 --- a/pkgs/applications/editors/yi/wrapper.nix +++ /dev/null @@ -1,28 +0,0 @@ -# To use this for hacking of your Yi config file, drop into a shell -# with env attribute. -{ - lib, - stdenv, - makeWrapper, - haskellPackages, - extraPackages ? (s: [ ]), -}: -let - yiEnv = haskellPackages.ghcWithPackages (self: [ self.yi ] ++ extraPackages self); -in -stdenv.mkDerivation { - pname = "yi-custom"; - dontUnpack = true; - nativeBuildInputs = [ makeWrapper ]; - - buildCommand = '' - mkdir -p $out/bin - makeWrapper ${haskellPackages.yi}/bin/yi $out/bin/yi \ - --set NIX_GHC ${yiEnv}/bin/ghc - ''; - - # For hacking purposes - passthru.env = yiEnv; - - inherit (haskellPackages.yi) meta version; -} diff --git a/pkgs/by-name/oa/oama/package.nix b/pkgs/by-name/oa/oama/package.nix index 1f87b3bffe43..e938805bac86 100644 --- a/pkgs/by-name/oa/oama/package.nix +++ b/pkgs/by-name/oa/oama/package.nix @@ -15,7 +15,14 @@ let passthru.updateScript = ./update.sh; }; - raw-pkg = haskellPackages.callPackage ./generated-package.nix { }; + raw-pkg = (haskellPackages.callPackage ./generated-package.nix { }).overrideScope ( + final: prev: { + # Dependency twain requires an older version of http2, and we cannot mix + # versions of transitive dependencies. + http2 = final.http2_3_0_3; + warp = final.warp_3_3_30; + } + ); in lib.pipe raw-pkg [ (overrideCabal overrides) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index dcff9e8cb404..557a787a0965 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "0b0765b206e909965c9a65d28e87ebc9aae4d8af", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0b0765b206e909965c9a65d28e87ebc9aae4d8af.tar.gz", - "sha256": "1rh4jmbj2v4n1lf8cv8qkj5rx10gjib2cmfsdxaf2d3n0c4cr4bn", - "msg": "Update from Hackage at 2024-10-25T11:10:52Z" + "commit": "750067bc36e810a96c066c8800438e0ce9ced327", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/750067bc36e810a96c066c8800438e0ce9ced327.tar.gz", + "sha256": "1bfr8r14rkisjp1f3iln12h4f5n66k8wkk09jvk7adal4grlpjny", + "msg": "Update from Hackage at 2024-10-05T14:46:54Z" } diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 10554c4cb48a..8830b8d179b2 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,5 +1,5 @@ import ./common-hadrian.nix { - version = "9.13.20241031"; - rev = "0b11cdc022ce33d089db95b2b2e7c1f4bb326d37"; - sha256 = "0kqnpcgv49ricbr950lffs8gx7jrcg6anzc0qvwy5pb518w0d37i"; + version = "9.11.20240423"; + rev = "dddc9dff0547733a10e7f505612ab9df3a7c21b6"; + sha256 = "0993sdmzzyymllck8mcpa1zgrjqjfxcvk1ykvfc18bvbs4145cm9"; } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bd174babd549..030b8a4d4379 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -22,16 +22,20 @@ self: super: { # enable list-transformer, jailbreaking is necessary until next release >0.13.0: https://github.com/ivanperez-keera/dunai/issues/427 dunai = doJailbreak (addBuildDepend self.list-transformer (enableCabalFlag "list-transformer" super.dunai)); - # Make sure that Cabal_* can be built as-is - Cabal_3_10_3_0 = doDistribute (super.Cabal_3_10_3_0.override { + # Make sure that Cabal 3.10.* can be built as-is + Cabal_3_10_3_0 = doDistribute (super.Cabal_3_10_3_0.override ({ Cabal-syntax = self.Cabal-syntax_3_10_3_0; - }); - Cabal_3_12_1_0 = doDistribute (super.Cabal_3_12_1_0.override { + } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { + # Use process core package when possible + process = self.process_1_6_24_0; + })); + + Cabal_3_12_1_0 = doDistribute (super.Cabal_3_12_1_0.override ({ Cabal-syntax = self.Cabal-syntax_3_12_1_0; - }); - Cabal_3_14_0_0 = doDistribute (super.Cabal_3_14_0_0.override { - Cabal-syntax = self.Cabal-syntax_3_14_0_0; - }); + } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { + # Use process core package when possible + process = self.process_1_6_24_0; + })); # hackage-security == 0.6.2.6 has a wider support range in theory, but it only # makes sense to use the non Stackage version if we want to use Cabal* >= 3.12 @@ -362,6 +366,15 @@ self: super: { ] super.threadscope); + # http2 also overridden in all-packages.nix for mailctl. + # twain is currently only used by mailctl, so the .overrideScope shouldn't + # negatively affect any other packages, at least currently... + # https://github.com/alexmingoia/twain/issues/5 + twain = super.twain.overrideScope (self: _: { + http2 = self.http2_3_0_3; + warp = self.warp_3_3_30; + }); + # The latest release on hackage has an upper bound on containers which # breaks the build, though it works with the version of containers present # and the upper bound doesn't exist in code anymore: @@ -1257,7 +1270,6 @@ self: super: { stack = super.stack.overrideScope (lself: lsuper: { # stack-3.1.1 requires the latest versions of these libraries pantry = lself.pantry_0_10_0; - static-bytes = lself.static-bytes_0_1_1; # for pantry_0_10_0 tar = lself.tar_0_6_3_0; # Upstream stack-3.1.1 is compiled with hpack-0.37.0, and we make sure to @@ -1990,6 +2002,14 @@ self: super: { # Test suite fails, upstream not reachable for simple fix (not responsive on github) vivid-osc = dontCheck super.vivid-osc; vivid-supercollider = dontCheck super.vivid-supercollider; + vivid = overrideCabal (drv: assert drv.version == "0.5.2.0"; { + # 2024-10-18: Some library dependency must have stopped + # re-exporting 'void', so now it needs an extra import line. + # Fixed in 0.5.2.1. + postPatch = '' + sed -i '/) where/a import Control.Monad (void)' Vivid/GlobalState.hs + ''; + }) super.vivid; # Test suite does not compile. feed = dontCheck super.feed; @@ -2256,6 +2276,44 @@ self: super: { # Too strict bound on hspec (<2.11) utf8-light = doJailbreak super.utf8-light; + large-hashable = lib.pipe (super.large-hashable.override { + # https://github.com/factisresearch/large-hashable/commit/5ec9d2c7233fc4445303564047c992b693e1155c + utf8-light = null; + }) [ + # 2022-03-21: use version from git which supports GHC 9.{0,2} and aeson 2.0 + (assert super.large-hashable.version == "0.1.0.4"; overrideSrc { + version = "unstable-2022-06-10"; + src = pkgs.fetchFromGitHub { + owner = "factisresearch"; + repo = "large-hashable"; + rev = "4d149c828c185bcf05556d1660f79ff1aec7eaa1"; + sha256 = "141349qcw3m93jw95jcha9rsg2y8sn5ca5j59cv8xmci38k2nam0"; + }; + }) + # Provide newly added dependencies + (overrideCabal (drv: { + libraryHaskellDepends = drv.libraryHaskellDepends or [] ++ [ + self.cryptonite + self.memory + ]; + testHaskellDepends = drv.testHaskellDepends or [] ++ [ + self.inspection-testing + ]; + })) + # https://github.com/factisresearch/large-hashable/issues/24 + (overrideCabal (drv: { + testFlags = drv.testFlags or [] ++ [ + "-n" "^Data.LargeHashable.Tests.Inspection:genericSumGetsOptimized$" + ]; + })) + # https://github.com/factisresearch/large-hashable/issues/25 + # Currently broken with text >= 2.0 + (overrideCabal (lib.optionalAttrs (lib.versionAtLeast self.ghc.version "9.4") { + broken = true; + hydraPlatforms = []; + })) + ]; + # BSON defaults to requiring network instead of network-bsd which is # required nowadays: https://github.com/mongodb-haskell/bson/issues/26 bson = appendConfigureFlag "-f-_old_network" (super.bson.override { diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 1c432ce3c937..e931a60ada41 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -331,10 +331,6 @@ self: super: ({ # Tests fail on macOS https://github.com/mrkkrp/zip/issues/112 zip = dontCheck super.zip; - snap = super.snap.overrideAttrs (drv: { - __darwinAllowLocalNetworking = true; - }); - warp = super.warp.overrideAttrs (drv: { __darwinAllowLocalNetworking = true; }); diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix index 6d0cd255ef9c..dcb91d08add0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix @@ -69,7 +69,7 @@ self: super: { integer-conversion = doDistribute self.integer-conversion_0_1_1; ghc-lib-parser = doDistribute self.ghc-lib-parser_9_10_1_20240511; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_10_0_0; - http2 = self.http2_5_3_4; + http2 = super.http2_5_3_4; lens = doDistribute self.lens_5_3_2; lukko = doDistribute self.lukko_0_1_2; network-control = super.network-control_0_1_3; @@ -84,7 +84,6 @@ self: super: { time-manager = super.time-manager_0_1_0; th-abstraction = doDistribute self.th-abstraction_0_7_0_0; uuid-types = doDistribute self.uuid-types_1_0_6; - warp = pkgs.haskell.lib.dontCheck super.warp_3_4_3; # test suite assumes it can freely call curl # A given major version of ghc-exactprint only supports one version of GHC. ghc-exactprint = doDistribute self.ghc-exactprint_1_9_0_0; @@ -127,6 +126,7 @@ self: super: { primitive-unlifted = dontCheck super.primitive-unlifted; # doesn't compile with primitive ==0.9.* bsb-http-chunked = pkgs.haskell.lib.dontCheck super.bsb-http-chunked; # https://github.com/sjakobi/bsb-http-chunked/issues/45 hinotify = pkgs.haskell.lib.dontCheck super.hinotify; # https://github.com/kolmodin/hinotify/issues/38 + warp = pkgs.haskell.lib.dontCheck super.warp_3_4_2; # test suite assumes it can freely call curl haskell-language-server = disableCabalFlag "retrie" (disableCabalFlag "hlint" (disableCabalFlag "stylishhaskel" (super.haskell-language-server.override {stylish-haskell = null;retrie = null;apply-refact=null;hlint = null;}))); diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index 91b24ebf9429..fb7115d6bbd2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -4,7 +4,7 @@ with haskellLib; let inherit (pkgs.stdenv.hostPlatform) isDarwin; - inherit (pkgs) lib; + in self: super: { @@ -54,9 +54,9 @@ self: super: { # Version upgrades # th-abstraction = doDistribute self.th-abstraction_0_7_0_0; - ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_3_20241022; + ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_2_20240223; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2; - ghc-lib = doDistribute self.ghc-lib_9_8_3_20241022; + ghc-lib = doDistribute self.ghc-lib_9_8_2_20240223; megaparsec = doDistribute self.megaparsec_9_6_1; # aeson 2.2.3.0 seemingly unnecessesarily bumped the lower bound on hashable # https://github.com/haskell/aeson/commit/1a666febd0775d8e88d315ece1b97cd20602fb5f @@ -147,8 +147,3 @@ self: super: { }) super.reflex; } -// lib.optionalAttrs (lib.versionAtLeast super.ghc.version "9.8.3") { - # Breakage related to GHC 9.8.3 / deepseq 1.5.1.0 - # https://github.com/typeable/generic-arbitrary/issues/18 - generic-arbitrary = dontCheck super.generic-arbitrary; -} diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index a34c5110db85..6d8bc6ad3b76 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -84,7 +84,6 @@ broken-packages: - aeson-flat # failure in job https://hydra.nixos.org/build/233220787 at 2023-09-02 - aeson-flatten # failure in job https://hydra.nixos.org/build/233242954 at 2023-09-02 - aeson-flowtyped # failure in job https://hydra.nixos.org/build/233245878 at 2023-09-02 - - aeson-generic-default # failure in job https://hydra.nixos.org/build/276370826 at 2024-11-06 - aeson-generics-typescript # failure in job https://hydra.nixos.org/build/245703304 at 2024-01-07 - aeson-injector # failure in job https://hydra.nixos.org/build/233200351 at 2023-09-02 - aeson-json-ast # failure in job https://hydra.nixos.org/build/233249406 at 2023-09-02 @@ -2160,7 +2159,6 @@ broken-packages: - graph-matchings # failure in job https://hydra.nixos.org/build/233245821 at 2023-09-02 - graphmod-plugin # failure in job https://hydra.nixos.org/build/233192543 at 2023-09-02 - graphql-api # failure in job https://hydra.nixos.org/build/233254333 at 2023-09-02 - - graphql-spice # failure in job https://hydra.nixos.org/build/276376899 at 2024-11-06 - graphql-utils # failure in job https://hydra.nixos.org/build/233221340 at 2023-09-02 - graphql-w-persistent # failure in job https://hydra.nixos.org/build/233228956 at 2023-09-02 - graph-rewriting # failure in job https://hydra.nixos.org/build/233191278 at 2023-09-02 @@ -2911,7 +2909,6 @@ broken-packages: - hssqlppp # failure in job https://hydra.nixos.org/build/233216888 at 2023-09-02 - HsSVN # failure in job https://hydra.nixos.org/build/233213151 at 2023-09-02 - hs-tags # failure in job https://hydra.nixos.org/build/233258358 at 2023-09-02 - - hs-tango # failure in job https://hydra.nixos.org/build/276377558 at 2024-11-06 - hstatsd # failure in job https://hydra.nixos.org/build/233232363 at 2023-09-02 - hstats # failure in job https://hydra.nixos.org/build/233239963 at 2023-09-02 - hs-term-emulator # failure in job https://hydra.nixos.org/build/233252262 at 2023-09-02 @@ -3071,7 +3068,6 @@ broken-packages: - ieee-utils # failure in job https://hydra.nixos.org/build/233224430 at 2023-09-02 - iexcloud # failure in job https://hydra.nixos.org/build/233224874 at 2023-09-02 - ifcxt # failure in job https://hydra.nixos.org/build/233196911 at 2023-09-02 - - if-instance # failure in job https://hydra.nixos.org/build/276378643 at 2024-11-06 - IFS # failure in job https://hydra.nixos.org/build/233246865 at 2023-09-02 - ige # failure in job https://hydra.nixos.org/build/233224389 at 2023-09-02 - ig # failure in job https://hydra.nixos.org/build/233203872 at 2023-09-02 @@ -3811,7 +3807,6 @@ broken-packages: - microbase # failure in job https://hydra.nixos.org/build/233204368 at 2023-09-02 - microformats2-parser # failure in job https://hydra.nixos.org/build/233238485 at 2023-09-02 - microgroove # failure in job https://hydra.nixos.org/build/233196933 at 2023-09-02 - - MicroHs # failure in job https://hydra.nixos.org/build/276379260 at 2024-11-06 - microlens-each # failure in job https://hydra.nixos.org/build/233253621 at 2023-09-02 - microlens-process # failure in job https://hydra.nixos.org/build/233190805 at 2023-09-02 - microlens-pro # failure in job https://hydra.nixos.org/build/252733422 at 2024-03-16 @@ -4232,7 +4227,6 @@ broken-packages: - oi # failure in job https://hydra.nixos.org/build/233190838 at 2023-09-02 - okapi # failure in job https://hydra.nixos.org/build/233193822 at 2023-09-02 - old-version # failure in job https://hydra.nixos.org/build/233198538 at 2023-09-02 - - ollama-haskell # failure in job https://hydra.nixos.org/build/276371507 at 2024-11-06 - om-actor # failure in job https://hydra.nixos.org/build/233231027 at 2023-09-02 - omaketex # failure in job https://hydra.nixos.org/build/233202599 at 2023-09-02 - ombra # failure in job https://hydra.nixos.org/build/233192387 at 2023-09-02 @@ -4737,8 +4731,6 @@ broken-packages: - powermate # failure in job https://hydra.nixos.org/build/233224977 at 2023-09-02 - powerpc # failure in job https://hydra.nixos.org/build/233217983 at 2023-09-02 - powerqueue-levelmem # failure in job https://hydra.nixos.org/build/233232882 at 2023-09-02 - - ppad-sha256 # failure in job https://hydra.nixos.org/build/276377736 at 2024-11-06 - - ppad-sha512 # failure in job https://hydra.nixos.org/build/276375868 at 2024-11-06 - pprecord # failure in job https://hydra.nixos.org/build/233198838 at 2023-09-02 - PPrinter # failure in job https://hydra.nixos.org/build/233253160 at 2023-09-02 - pqc # failure in job https://hydra.nixos.org/build/233217425 at 2023-09-02 @@ -6295,7 +6287,6 @@ broken-packages: - type-indexed-queues # failure in job https://hydra.nixos.org/build/233197833 at 2023-09-02 - type-interpreter # failure in job https://hydra.nixos.org/build/233192182 at 2023-09-02 - type-int # failure in job https://hydra.nixos.org/build/233245978 at 2023-09-02 - - typelet # failure in job https://hydra.nixos.org/build/276367145 at 2024-11-06 - type-level-bst # failure in job https://hydra.nixos.org/build/233202030 at 2023-09-02 - type-level-natural-number-induction # failure in job https://hydra.nixos.org/build/233259499 at 2023-09-02 - type-level-natural-number-operations # failure in job https://hydra.nixos.org/build/233198314 at 2023-09-02 @@ -6848,10 +6839,7 @@ broken-packages: - yhccore # failure in job https://hydra.nixos.org/build/233199669 at 2023-09-02 - yhseq # failure in job https://hydra.nixos.org/build/233191724 at 2023-09-02 - yices # failure in job https://hydra.nixos.org/build/233242137 at 2023-09-02 - - yi-contrib # failure in job https://hydra.nixos.org/build/276370855 at 2024-11-06 - - yi-monokai # failure in job https://hydra.nixos.org/build/276375617 at 2024-11-06 - - yi-solarized # failure in job https://hydra.nixos.org/build/276380211 at 2024-11-06 - - yi-spolsky # failure in job https://hydra.nixos.org/build/276371008 at 2024-11-06 + - yi-language # failure in job https://hydra.nixos.org/build/233217570 at 2023-09-02 - yoctoparsec # failure in job https://hydra.nixos.org/build/233192019 at 2023-09-02 - yoda # failure in job https://hydra.nixos.org/build/233200530 at 2023-09-02 - Yogurt # failure in job https://hydra.nixos.org/build/233212103 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index b1dc2492f8b9..667a79adb859 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -36,8 +36,7 @@ default-package-overrides: - hnix-store-remote < 0.7 # 2024-09-12: match xmonad 0.17.* from Stackage LTS - xmonad-contrib < 0.18.1 - # 2024-11-01: no release version of http2/3 supports http-semantics >= 0.3.0 at the moment - - http-semantics < 0.3.0 + extra-packages: - Cabal == 3.2.* # Used for packages needing newer Cabal on ghc 8.6 and 8.8 @@ -73,6 +72,7 @@ extra-packages: - hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-megaparsec == 2.2.0 # 2023-11-18: Latest version compatible with ghc 9.0, needed for HLS - hspec-meta < 2.8 # 2022-12-07: Needed for elmPackages.elm / hspec-discover + - http2 < 3.3 # 2023-08-24: Needed for twain - immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20 - language-docker == 11.0.0 # required by hadolint 2.12.0, 2022-11-16 - language-javascript == 0.7.0.0 # required by purescript @@ -89,6 +89,7 @@ extra-packages: - primitive-unlifted == 0.1.3.1 # 2024-03-16: Needed for hls on ghc 9.2 - stylish-haskell == 0.14.4.0 # 2022-09-19: needed for hls on ghc 9.2 - text == 2.0.2 # 2023-09-14: Needed for elm (which is currently on ghc-8.10) + - warp < 3.3.31 # 2024-03-20: for twain, which requires http2 3.0.3 - weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7 - weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2 - weeder == 2.4.* # 2023-02-02: preserve for GHC 9.2.* @@ -820,6 +821,8 @@ supported-platforms: midi-alsa: [ platforms.linux ] # alsa-core only supported on linux midisurface: [ platforms.linux ] # alsa-core only supported on linux OrderedBits: [ platforms.x86 ] # lacks implementations for non-x86: https://github.com/choener/OrderedBits/blob/401cbbe933b1635aa33e8e9b29a4a570b0a8f044/lib/Data/Bits/Ordered.hs#L316 + password: [ platforms.x86 ] # uses scrypt, which requries x86 + password-instances: [ platforms.x86 ] # uses scrypt, which requries x86 reactivity: [ platforms.windows ] reflex-libtelnet: [ platforms.linux ] # pkgs.libtelnet only supports linux scat: [ platforms.x86 ] # uses scrypt, which requries x86 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 5bde9a49a237..235261802442 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 22.39 +# Stackage LTS 22.36 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -397,7 +397,7 @@ default-package-overrides: - atom-conduit ==0.9.0.1 - atomic-counter ==0.1.2.1 - atomic-primops ==0.8.8 - - atomic-write ==0.2.1.0 + - atomic-write ==0.2.0.7 - attoparsec ==0.14.4 - attoparsec-aeson ==2.1.0.0 - attoparsec-base64 ==0.0.0 @@ -454,7 +454,7 @@ default-package-overrides: - bcp47 ==0.2.0.6 - bcp47-orphans ==0.1.0.6 - bcrypt ==0.0.11 - - beam-core ==0.10.3.0 + - beam-core ==0.10.1.0 - bech32 ==1.1.7 - bech32-th ==1.1.7 - benchpress ==0.2.2.23 @@ -508,8 +508,6 @@ default-package-overrides: - blaze-textual ==0.2.3.1 - bloodhound ==0.21.0.0 - bloomfilter ==2.0.1.2 - - bluefin ==0.0.9.0 - - bluefin-internal ==0.0.9.0 - bm ==0.2.0.0 - bmp ==1.2.6.4 - bnb-staking-csvs ==0.2.2.0 @@ -529,7 +527,7 @@ default-package-overrides: - bounded-qsem ==0.1.0.2 - bounded-queue ==1.0.0 - boundingboxes ==0.2.3 - - box ==0.9.3.2 + - box ==0.9.3.1 - boxes ==0.1.5 - breakpoint ==0.1.4.0 - brick ==2.1.1 @@ -554,7 +552,7 @@ default-package-overrides: - bv-sized ==1.0.5 - byteable ==0.1.1 - bytebuild ==0.3.16.2 - - byte-count-reader ==0.10.1.12 + - byte-count-reader ==0.10.1.11 - bytedump ==1.0 - bytehash ==0.1.1.0 - byte-order ==0.1.3.1 @@ -579,7 +577,7 @@ default-package-overrides: - cabal2spec ==2.7.1 - cabal-appimage ==0.4.0.5 - cabal-clean ==0.2.20230609 - - cabal-debian ==5.2.4 + - cabal-debian ==5.2.3 - cabal-doctest ==1.0.10 - cabal-file ==0.1.1 - cabal-plan ==0.7.3.0 @@ -685,9 +683,9 @@ default-package-overrides: - comfort-fftw ==0.0.0.1 - comfort-glpk ==0.1 - comfort-graph ==0.0.4 - - commonmark ==0.2.6.1 + - commonmark ==0.2.6 - commonmark-extensions ==0.2.5.5 - - commonmark-pandoc ==0.2.2.2 + - commonmark-pandoc ==0.2.2.1 - commutative ==0.0.2 - commutative-semigroups ==0.1.1.0 - comonad ==5.0.8 @@ -826,14 +824,14 @@ default-package-overrides: - data-bword ==0.1.0.2 - data-checked ==0.3 - data-clist ==0.2 - - data-default ==0.7.1.2 - - data-default-class ==0.1.2.2 - - data-default-instances-base ==0.1.0.3 + - data-default ==0.7.1.1 + - data-default-class ==0.1.2.0 + - data-default-instances-base ==0.1.0.1 - data-default-instances-bytestring ==0.0.1 - data-default-instances-case-insensitive ==0.0.1 - data-default-instances-containers ==0.0.1 - - data-default-instances-dlist ==0.0.1.2 - - data-default-instances-old-locale ==0.0.1.2 + - data-default-instances-dlist ==0.0.1 + - data-default-instances-old-locale ==0.0.1 - data-default-instances-unordered-containers ==0.0.1 - data-default-instances-vector ==0.0.1 - data-diverse ==4.7.1.0 @@ -1059,7 +1057,7 @@ default-package-overrides: - extrapolate ==0.4.6 - fail ==4.9.0.0 - FailT ==0.1.2.0 - - fakedata ==1.0.5 + - fakedata ==1.0.3 - fakedata-parser ==0.1.0.0 - fakedata-quickcheck ==0.2.0 - fakefs ==0.3.0.2 @@ -1068,7 +1066,7 @@ default-package-overrides: - falsify ==0.2.0 - fasta ==0.10.4.2 - fast-digits ==0.3.2.0 - - fast-logger ==3.2.4 + - fast-logger ==3.2.3 - fast-math ==1.0.2 - fast-myers-diff ==0.0.1 - fb ==2.1.1.1 @@ -1076,11 +1074,12 @@ default-package-overrides: - fclabels ==2.0.5.1 - fdo-notify ==0.3.1 - feature-flags ==0.1.0.1 - - fedora-releases ==0.1.0 + - fedora-dists ==2.1.1 + - fedora-haskell-tools ==1.1 - FenwickTree ==0.1.2.1 - fft ==0.1.8.7 - fftw-ffi ==0.1 - - fgl ==5.8.3.0 + - fgl ==5.8.2.0 - fgl-arbitrary ==0.2.0.6 - fields-json ==0.4.0.0 - file-embed ==0.0.16.0 @@ -1133,7 +1132,7 @@ default-package-overrides: - ForestStructures ==0.0.1.1 - forkable-monad ==0.2.0.3 - forma ==1.2.0 - - formatn ==0.3.1.0 + - formatn ==0.3.0.1 - format-numbers ==0.1.0.1 - formatting ==7.2.0 - foundation ==0.0.30 @@ -1171,7 +1170,7 @@ default-package-overrides: - generically ==0.1.1 - generic-arbitrary ==1.0.1 - generic-constraints ==1.1.1.1 - - generic-data ==1.1.0.1 + - generic-data ==1.1.0.0 - generic-data-surgery ==0.3.0.0 - generic-deriving ==1.14.5 - generic-functor ==1.1.0.0 @@ -1297,7 +1296,7 @@ default-package-overrides: - GLUT ==2.7.0.16 - gmail-simple ==0.1.0.6 - gnuplot ==0.5.7 - - goldplate ==0.2.2.1 + - goldplate ==0.2.1.1 - google-isbn ==1.0.3 - gopher-proxy ==0.1.1.3 - gpolyline ==0.1.0.1 @@ -1344,7 +1343,7 @@ default-package-overrides: - hashing ==0.1.1.0 - hashmap ==1.3.3 - hashtables ==1.3.1 - - haskell-gi ==0.26.12 + - haskell-gi ==0.26.11 - haskell-gi-base ==0.26.8 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.1.1 @@ -1477,7 +1476,7 @@ default-package-overrides: - hslua-classes ==2.3.1 - hslua-cli ==1.4.3 - hslua-core ==2.3.2 - - hslua-list ==1.1.4 + - hslua-list ==1.1.3 - hslua-marshalling ==2.3.1 - hslua-module-doclayout ==1.1.1.2 - hslua-module-path ==1.1.1 @@ -1732,7 +1731,7 @@ default-package-overrides: - LambdaHack ==0.11.0.1 - lame ==0.2.2 - language-avro ==0.1.4.0 - - language-c ==0.9.4 + - language-c ==0.9.3 - language-c99 ==0.2.0 - language-c99-simple ==0.3.0 - language-c99-util ==0.2.0 @@ -1782,7 +1781,7 @@ default-package-overrides: - liboath-hs ==0.0.1.2 - libyaml ==0.1.4 - libyaml-clib ==0.2.5 - - lifted-async ==0.10.2.6 + - lifted-async ==0.10.2.5 - lifted-base ==0.2.3.12 - lift-generics ==0.2.1 - lift-type ==0.1.2.0 @@ -1854,7 +1853,7 @@ default-package-overrides: - markdown-unlit ==0.6.0 - markov-chain ==0.0.3.4 - markov-chain-usage-model ==0.0.0 - - markup-parse ==0.1.1.1 + - markup-parse ==0.1.1 - mason ==0.2.6 - massiv ==1.0.4.0 - massiv-io ==1.0.0.1 @@ -1873,7 +1872,7 @@ default-package-overrides: - matrix-static ==0.3 - maximal-cliques ==0.1.1 - mbox-utility ==0.0.3.1 - - mcmc ==0.8.3.1 + - mcmc ==0.8.2.0 - mcmc-types ==1.0.3 - median-stream ==0.7.0.0 - med-module ==0.1.3 @@ -2154,7 +2153,7 @@ default-package-overrides: - pandoc-cli ==3.1.11.1 - pandoc-dhall-decoder ==0.1.0.1 - pandoc-lua-engine ==0.2.1.2 - - pandoc-lua-marshal ==0.2.9 + - pandoc-lua-marshal ==0.2.8 - pandoc-plot ==1.8.0 - pandoc-server ==0.1.0.5 - pandoc-throw ==0.1.0.0 @@ -2318,7 +2317,7 @@ default-package-overrides: - primes ==0.2.1.0 - primitive ==0.8.0.0 - primitive-addr ==0.1.0.3 - - primitive-extras ==0.10.2.1 + - primitive-extras ==0.10.2 - primitive-offset ==0.2.0.1 - primitive-serial ==0.1 - primitive-unaligned ==0.1.1.2 @@ -2363,8 +2362,8 @@ default-package-overrides: - PyF ==0.11.3.0 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.1.0 - - qrcode-core ==0.9.10 - - qrcode-juicypixels ==0.8.6 + - qrcode-core ==0.9.9 + - qrcode-juicypixels ==0.8.5 - quaalude ==0.0.0.1 - quadratic-irrational ==0.1.1 - QuasiText ==0.1.2.6 @@ -2465,7 +2464,7 @@ default-package-overrides: - relational-record ==0.2.2.0 - relational-schemas ==0.1.8.1 - reliable-io ==0.0.2 - - relude ==1.2.2.0 + - relude ==1.2.1.0 - renderable ==0.2.0.1 - replace-attoparsec ==1.5.0.0 - replace-megaparsec ==1.5.0.1 @@ -2607,7 +2606,7 @@ default-package-overrides: - servant-rate-limit ==0.2.0.0 - servant-rawm ==1.0.0.0 - servant-server ==0.20.2 - - servant-static-th ==1.0.0.1 + - servant-static-th ==1.0.0.0 - servant-subscriber ==0.7.0.0 - servant-swagger ==1.2.1 - servant-swagger-ui ==0.3.5.5.0.0 @@ -2636,8 +2635,8 @@ default-package-overrides: - shared-memory ==0.2.0.1 - shell-conduit ==5.0.0 - shell-escape ==0.2.0 - - shellify ==0.11.0.3 - - shellmet ==0.0.5.0 + - shellify ==0.11.0.1 + - shellmet ==0.0.4.1 - shelltestrunner ==1.10 - shell-utility ==0.1 - shellwords ==0.1.3.1 @@ -2763,7 +2762,7 @@ default-package-overrides: - Stream ==0.4.7.2 - streaming ==0.2.4.0 - streaming-attoparsec ==1.0.0.1 - - streaming-bytestring ==0.3.3 + - streaming-bytestring ==0.3.2 - streaming-commons ==0.2.2.6 - streaming-wai ==0.1.1 - streamly ==0.10.1 @@ -3095,9 +3094,9 @@ default-package-overrides: - universe-instances-extended ==1.1.3 - universe-reverse-instances ==1.1.1 - universe-some ==1.2.1 - - universum ==1.8.2.2 + - universum ==1.8.2.1 - unix-bytestring ==0.4.0.2 - - unix-compat ==0.7.3 + - unix-compat ==0.7.2 - unix-time ==0.4.15 - unjson ==0.15.4 - unliftio ==0.2.25.0 @@ -3283,7 +3282,7 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.11.2 - yaml-unscrambler ==0.1.0.19 - - Yampa ==0.14.11 + - Yampa ==0.14.10 - yarn-lock ==0.6.5 - yeshql-core ==4.2.0.0 - yesod ==1.6.2.1 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 7d3699af9eb5..9fef480d2c11 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -802,7 +802,7 @@ dont-distribute-packages: - chart-cli - chart-svg - chart-svg-various - - chart-svg_0_7_0_0 + - chart-svg_0_6_1_0 - chart-unit - chassis - chatty @@ -1866,7 +1866,6 @@ dont-distribute-packages: - hark - harmony - haroonga-httpd - - harpie-numhask - has-th - hasbolt - hascat @@ -2014,6 +2013,7 @@ dont-distribute-packages: - hedgehog-gen-json - hedis-pile - heftia + - heftia-effects - heist-aeson - helic - helics @@ -2498,7 +2498,6 @@ dont-distribute-packages: - language-python-colour - language-qux - language-spelling - - large-anon - lat - latex-formulae-hakyll - latex-formulae-pandoc @@ -3029,7 +3028,6 @@ dont-distribute-packages: - perdure - perf - perf-analysis - - perf_0_13_0_0 - perfecthash - periodic-client - periodic-client-exe @@ -3164,8 +3162,6 @@ dont-distribute-packages: - potoki-hasql - potoki-zlib - powerqueue-sqs - - ppad-hmac-drbg - - ppad-secp256k1 - pqueue-mtl - practice-room - pred-set @@ -3294,7 +3290,6 @@ dont-distribute-packages: - rasa-ext-vim - rascal - raw-feldspar - - rawlock - rawr - razom-text-util - rbr @@ -3384,7 +3379,6 @@ dont-distribute-packages: - reserve - resin - resource-pool-catchio - - resource-registry - resource-simple - respond - rest-client @@ -4295,6 +4289,25 @@ dont-distribute-packages: - yesod-routes-typescript - yesod-session-redis - yesod-worker + - yi + - yi-contrib + - yi-core + - yi-dynamic-configuration + - yi-emacs-colours + - yi-frontend-pango + - yi-frontend-vty + - yi-fuzzy-open + - yi-ireader + - yi-keymap-cua + - yi-keymap-emacs + - yi-keymap-vim + - yi-misc-modes + - yi-mode-haskell + - yi-mode-javascript + - yi-monokai + - yi-snippet + - yi-solarized + - yi-spolsky - yjftp - yjftp-libs - yoko diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 3480076bb178..28fd6880eb6c 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -113,35 +113,6 @@ self: super: builtins.intersectAttrs super { '' + drv.preCheck or ""; }) super.agda2lagda; - # - Disable scrypt support since the library used only works on x86 due to SSE2: - # https://github.com/informatikr/scrypt/issues/8 - # - Use crypton as the encryption backend. That override becomes obsolete with - # 3.1.* since cabal2nix picks crypton by default then. - password = - let - scryptSupported = pkgs.stdenv.hostPlatform.isx86; - in - - lib.pipe - (super.password.override ({ - cryptonite = self.crypton; - } // lib.optionalAttrs (!scryptSupported) { - scrypt = null; - })) - ([ - (enableCabalFlag "crypton") - (disableCabalFlag "cryptonite") - # https://github.com/cdepillabout/password/pull/84 - (appendPatch ./patches/password-3.0.4.0-scrypt-conditional.patch) - (overrideCabal (drv: { - # patch doesn't apply otherwise because of revisions - prePatch = drv.prePatch or "" + '' - ${pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal - ''; - })) - ] ++ lib.optionals (!scryptSupported) [ - (disableCabalFlag "scrypt") - ]); audacity = enableCabalFlag "buildExamples" (overrideCabal (drv: { executableHaskellDepends = [self.optparse-applicative self.soxlib]; @@ -185,11 +156,6 @@ self: super: builtins.intersectAttrs super { ''; }) super.nvvm; - # Doesn't declare LLVM dependency, needs llvm-config - llvm-codegen = addBuildTools [ - pkgs.llvmPackages_17.llvm.dev # for native llvm-config - ] super.llvm-codegen; - # hledger* overrides inherit ( let @@ -415,6 +381,7 @@ self: super: builtins.intersectAttrs super { # The curl executable is required for withApplication tests. warp = addTestToolDepend pkgs.curl super.warp; + warp_3_3_30 = addTestToolDepend pkgs.curl super.warp_3_3_30; safe-exceptions = overrideCabal (drv: { # Fix strictDeps build error "could not execute: hspec-discover" @@ -1447,7 +1414,7 @@ self: super: builtins.intersectAttrs super { mpiImpl = pkgs.mpi.pname; disableUnused = with builtins; map disableCabalFlag (filter (n: n != mpiImpl) validMpi); in lib.pipe - (super.mpi-hs_0_7_3_1.override { ompi = pkgs.mpi; }) + (super.mpi-hs_0_7_3_0.override { ompi = pkgs.mpi; }) ( [ (addTestToolDepends [ pkgs.openssh pkgs.mpiCheckPhaseHook ]) ] ++ disableUnused ++ lib.optional (builtins.elem mpiImpl validMpi) (enableCabalFlag mpiImpl) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d51851b2c471..6e73461e51e5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3379,8 +3379,6 @@ self: { pname = "ChasingBottoms"; version = "1.3.1.15"; sha256 = "0if8h6xq10y1xa90cwmx2jkxjn9628rzs8y6fsjmpjdcvcyr5wnj"; - revision = "1"; - editedCabalFile = "1h3c5dhaqkpmc7cvivigadfkjkjjriahzcpdw8qg62fl44gbkmh2"; libraryHaskellDepends = [ base containers mtl QuickCheck random syb ]; @@ -5887,8 +5885,8 @@ self: { pname = "Euterpea"; version = "2.0.7"; sha256 = "0kxdilxzg0dgz1684csbyfv4cifh9d92ac6pwp6dnrcwwpwskiw8"; - revision = "2"; - editedCabalFile = "05z8vn26yr8hl2dh23g80fpxj8s90hdaajjfnpblrkzhczz7317s"; + revision = "1"; + editedCabalFile = "1fdkjivbrp9q5vwiprjhpnpl9bir1qdiybc2hm52i016x3rx51d8"; libraryHaskellDepends = [ array arrows base bytestring containers deepseq ghc-prim HCodecs heap PortMidi random stm @@ -10785,8 +10783,8 @@ self: { ({ mkDerivation, array, base, containers, random }: mkDerivation { pname = "HaskellForMaths"; - version = "0.4.10"; - sha256 = "0ydaw5xwck2l9xzlqrdf3qv7p5s6dqd131q3mx6g0wpqpkjjic4q"; + version = "0.4.9"; + sha256 = "1jgim9g0jbv6k31aalq0yps843jmfx74k53lnd1p79kgad7670rz"; libraryHaskellDepends = [ array base containers random ]; description = "Combinatorics, group theory, commutative algebra, non-commutative algebra"; license = lib.licenses.bsd3; @@ -11803,8 +11801,8 @@ self: { }: mkDerivation { pname = "I1M"; - version = "0.2.2"; - sha256 = "1p8rv0rhjyjjic03zzjp7qw1j3p5nz4if5ib9w1l0frlrybqb1s8"; + version = "0.1.0"; + sha256 = "0a5bh9hlsn6hmdqinc47hxlav1isv9jh2i4x3zfyfp4y4xrp2h93"; libraryHaskellDepends = [ array base QuickCheck ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Code for the Haskell course taught at the University of Seville"; @@ -11935,8 +11933,8 @@ self: { }: mkDerivation { pname = "IPv6DB"; - version = "0.3.3.4"; - sha256 = "1mkf2fqlg2n9q3l3p8rxdcmb7k281lz37x6hiry1wvxbn92d4pja"; + version = "0.3.3.3"; + sha256 = "1f376a5zc0q20s2jp4z00hxj9h0ngp7k2bgx53g328hf3qyq676z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -14367,8 +14365,8 @@ self: { }: mkDerivation { pname = "MicroHs"; - version = "0.10.3.0"; - sha256 = "11zhgmkzkxxjhnf0jnzk50hsm60zxil5mqa6m1yq6wmg2h1g0vkf"; + version = "0.9.18.0"; + sha256 = "1w1aazbsl80xk6kxmkcii6y33i42hw64bhjwcn62grh5xb220hag"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -14377,9 +14375,7 @@ self: { ]; description = "A small compiler for Haskell"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; mainProgram = "mhs"; - broken = true; }) {}; "MicrosoftTranslator" = callPackage @@ -14678,22 +14674,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "MonadRandom_0_6_1" = callPackage - ({ mkDerivation, base, mtl, primitive, random, transformers - , transformers-compat - }: - mkDerivation { - pname = "MonadRandom"; - version = "0.6.1"; - sha256 = "09v56xbp4l0qpv8l18289p4xmjjh56q07crj9h5801fiji8zz4w8"; - libraryHaskellDepends = [ - base mtl primitive random transformers transformers-compat - ]; - description = "Random-number generation monad"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "MonadRandomLazy" = callPackage ({ mkDerivation, base, MonadRandom, mtl, random }: mkDerivation { @@ -15278,8 +15258,6 @@ self: { pname = "NanoID"; version = "3.4.0.2"; sha256 = "1dddc7aakhrj65kdspj8ashfdfl894ybqf7iwy94l344ikldfkaj"; - revision = "1"; - editedCabalFile = "0kdr24dw1z1vj0a63bqsdz55ps4lksf4c5fw7l19bn51f71lpqrf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -18092,24 +18070,14 @@ self: { }) {}; "RandomDotOrg" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, http-client - , http-client-tls, http-media, servant, servant-client - , servant-client-core, servant-jsonrpc, servant-jsonrpc-client - , text, time, unordered-containers, uuid-types - }: + ({ mkDerivation, base, HTTP-Simple, network }: mkDerivation { pname = "RandomDotOrg"; - version = "1.0"; - sha256 = "10a4vh3n308i628v58s6wb5yn3vhpb4d989bmd4vvyv39xv92sj6"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base binary bytestring http-client http-client-tls http-media - servant servant-client servant-client-core servant-jsonrpc - servant-jsonrpc-client text time unordered-containers uuid-types - ]; - description = "Haskell bindings to the RANDOM.ORG Core API"; - license = lib.licenses.bsd3; + version = "0.2.1"; + sha256 = "0rfarn424wsvvwvi7b1qzvzc63dxfqmlyrfd0hdcvmgkq5h2iy4c"; + libraryHaskellDepends = [ base HTTP-Simple network ]; + description = "Interface to random.org"; + license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20362,8 +20330,6 @@ self: { pname = "Spintax"; version = "0.3.6.1"; sha256 = "066pks24c4501i86hgll3bygqkgyag7n2src19k0x9gc05p130wr"; - revision = "1"; - editedCabalFile = "1946q9361nzsp4aa6jxv36g96nhgb7isv3wpcrnvvk4r2w0jvlmp"; libraryHaskellDepends = [ attoparsec base extra mtl mwc-random text ]; @@ -20950,29 +20916,6 @@ self: { broken = true; }) {}; - "THSH" = callPackage - ({ mkDerivation, base, extra, filepath, ghc, parsec, process, PyF - , split, template-haskell, temporary, text, transformers - }: - mkDerivation { - pname = "THSH"; - version = "0.0.0.5"; - sha256 = "0hfc3f68w5n55k5gnlf6ip76j3b7yvirb81k373w8vq4rgqf447s"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base filepath ghc parsec process PyF template-haskell temporary - text transformers - ]; - executableHaskellDepends = [ - base extra filepath ghc process PyF split template-haskell - ]; - testHaskellDepends = [ base ghc PyF template-haskell ]; - description = "A \"noDSL\" approach to mixing shell scripting with Haskell programs using Template Haskell"; - license = lib.licenses.mit; - mainProgram = "thsh"; - }) {}; - "TLT" = callPackage ({ mkDerivation, ansi-terminal, base, free, mtl, resourcet , STMonadTrans, transformers @@ -23415,8 +23358,8 @@ self: { }: mkDerivation { pname = "Yampa"; - version = "0.14.11"; - sha256 = "1pz1s0vb2h62zggbj6y6c3qhx7008758zq9gds347qv1hwg82jn9"; + version = "0.14.10"; + sha256 = "1la2v70pzjmvw4j0v5sacb6vxclby86jx68jq6czzxyrl8ydijzc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -26068,15 +26011,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "aern2-mp_0_2_16_1" = callPackage + "aern2-mp_0_2_16_0" = callPackage ({ mkDerivation, base, cdar-mBound, collect-errors, deepseq, hspec , integer-logarithms, mixed-types-num, QuickCheck, reflection , regex-tdfa, template-haskell }: mkDerivation { pname = "aern2-mp"; - version = "0.2.16.1"; - sha256 = "0y0043ckrg1cx1kpf18jk9nmav2h3bp1w4ywwnbwq2abqf3kmd1p"; + version = "0.2.16.0"; + sha256 = "1q9rc53zj49yfn5ap8khx8gvgphw7dr86agi77xaj1d0d97x35pi"; libraryHaskellDepends = [ base cdar-mBound collect-errors deepseq hspec integer-logarithms mixed-types-num QuickCheck reflection regex-tdfa template-haskell @@ -26110,14 +26053,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "aern2-real_0_2_16_1" = callPackage + "aern2-real_0_2_16_0" = callPackage ({ mkDerivation, aern2-mp, base, collect-errors, hspec , integer-logarithms, mixed-types-num, QuickCheck }: mkDerivation { pname = "aern2-real"; - version = "0.2.16.1"; - sha256 = "00g504rqvr3z5a8asnhr6c9xrhd6wjqzcscgik1qj2wvxfls32f6"; + version = "0.2.16.0"; + sha256 = "14rdjkqpmk4f7135ssn03b7bqbakixx0hrrx742dc379pjq57k7d"; libraryHaskellDepends = [ aern2-mp base collect-errors hspec integer-logarithms mixed-types-num QuickCheck @@ -26675,24 +26618,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "aeson-generic-default" = callPackage - ({ mkDerivation, aeson, base, data-default, tasty, tasty-hunit - , text - }: - mkDerivation { - pname = "aeson-generic-default"; - version = "0.1.1.0"; - sha256 = "0al9xd9mdxffvpx0mb3rll68gmizwknh3g6ixfnvxx62anb47w2p"; - libraryHaskellDepends = [ aeson base data-default text ]; - testHaskellDepends = [ - aeson base data-default tasty tasty-hunit text - ]; - description = "Type-level default fields for aeson Generic FromJSON parser"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - "aeson-generics-typescript" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, hspec, process, QuickCheck, random, split @@ -27461,8 +27386,8 @@ self: { }: mkDerivation { pname = "aftovolio"; - version = "0.4.0.0"; - sha256 = "0gf86va0x7ni169w4swcr1m5qf115i925pckbw342m7md3k8a6rv"; + version = "0.2.1.0"; + sha256 = "18z69rzzzfkf4mivjzz9g5h4l1c7lc8s1dnsa6d1xwafhbc2mp2h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36443,7 +36368,7 @@ self: { mainProgram = "amqp-builder"; }) {}; - "amqp_0_24_0" = callPackage + "amqp_0_23_0" = callPackage ({ mkDerivation, base, binary, bytestring, clock, containers , crypton-connection, data-binary-ieee754, data-default-class , hspec, hspec-expectations, monad-control, network, network-uri @@ -36451,8 +36376,8 @@ self: { }: mkDerivation { pname = "amqp"; - version = "0.24.0"; - sha256 = "0swrh5dh9hwp8m15x4hiplm89ls19bpmir44wnffzgz7v8rxh1mx"; + version = "0.23.0"; + sha256 = "0cp0hg4fmqxhzah67hgbwrrm2m7pn64y88chqk5vjhfa19km2np8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37112,14 +37037,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "annotated-exception_0_3_0_2" = callPackage + "annotated-exception_0_3_0_1" = callPackage ({ mkDerivation, base, containers, hspec, hspec-discover , safe-exceptions, text, unliftio-core }: mkDerivation { pname = "annotated-exception"; - version = "0.3.0.2"; - sha256 = "1xsyq28hkf7ngkq9v5ga958d2fqbmshc9gl8lzms6vknr64gaqr7"; + version = "0.3.0.1"; + sha256 = "09lgqzx5g7wnfpj9a8zn10s8v919psxrzzg50vllryaqxxkfmj4a"; libraryHaskellDepends = [ base containers safe-exceptions text unliftio-core ]; @@ -37334,8 +37259,8 @@ self: { pname = "ansigraph"; version = "0.3.0.5"; sha256 = "03ks75ik0jyfz55iz3gcccxgg73v1dw2nn0myl40c2rc31mwz39f"; - revision = "2"; - editedCabalFile = "0kq3dijahr4yxp13v3v5d5v0v3zswkxh8idx5hyv0yp9d1czqars"; + revision = "1"; + editedCabalFile = "047pnpd9sviia1wxx9czidz2in6jq7jgbln7l6dy2j157vyqi93k"; libraryHaskellDepends = [ ansi-terminal base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Terminal-based graphing via ANSI and Unicode"; @@ -39694,8 +39619,10 @@ self: { }: mkDerivation { pname = "arch-web"; - version = "0.3.1"; - sha256 = "1z8zfl0dskp7i0h5kgrw1nh94sxrmmfdpaykdjqiingn9dqnsmqm"; + version = "0.2"; + sha256 = "0axyb62pjgh1l60qx6z8mppiq5gam3g6c9wfbrww8wl7f2kamwrp"; + revision = "1"; + editedCabalFile = "1msmx8w3m2aypigramyiwqz77vzx8r6ssyp0p35ndb03mzmrry3p"; libraryHaskellDepends = [ aeson base deriving-aeson exceptions http-client http-client-tls http-types lens mtl servant servant-client servant-client-core text @@ -42346,6 +42273,24 @@ self: { }) {}; "atomic-write" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, hspec + , temporary, text, unix-compat + }: + mkDerivation { + pname = "atomic-write"; + version = "0.2.0.7"; + sha256 = "03cn3ii74h0w3g4h78xsx9v2sn58r3qsr2dbdwq340xwhiwcgxdm"; + libraryHaskellDepends = [ + base bytestring directory filepath temporary text unix-compat + ]; + testHaskellDepends = [ + base bytestring filepath hspec temporary text unix-compat + ]; + description = "Atomically write to a file"; + license = lib.licenses.mit; + }) {}; + + "atomic-write_0_2_1_0" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, hspec , hspec-discover, temporary, text, unix-compat }: @@ -42362,6 +42307,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Atomically write to a file"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "atomo" = callPackage @@ -46470,8 +46416,8 @@ self: { pname = "base16"; version = "1.0"; sha256 = "1plwc4yrkvd5j6y09fjvyzhr05mzhzwz6z41fyb60y0bj5j66dl6"; - revision = "2"; - editedCabalFile = "1dcb8m73xj2dfb8xbz731l91nm2jz532v971rsfm0kkid5ap9bvl"; + revision = "1"; + editedCabalFile = "00r0j3l3af912b33mlsr5a48rr0l31gh34cmj8jf247c4a332rlk"; libraryHaskellDepends = [ base bytestring deepseq primitive text text-short ]; @@ -47770,8 +47716,10 @@ self: { }: mkDerivation { pname = "beam-core"; - version = "0.10.3.0"; - sha256 = "1q3f95xjyinr6g9yxq1w32agp9n6q152b6mfpmabpv0l74c9mmhm"; + version = "0.10.1.0"; + sha256 = "0h1kr653wd00m5pypj4ia8d1ni6m2qrzqqqh19hnd8wz1n0pfd1h"; + revision = "1"; + editedCabalFile = "0sjc2zyy9f5r3qg4yxl1dq0c4ybvqvgh64vy078507sl8jxxl7v7"; libraryHaskellDepends = [ aeson base bytestring containers dlist free ghc-prim hashable microlens mtl network-uri scientific tagged text time vector @@ -47792,8 +47740,10 @@ self: { }: mkDerivation { pname = "beam-migrate"; - version = "0.5.3.1"; - sha256 = "0qx1nh5vvncgr4ixnraaahwp879v8wgn2lhixgzndk6zrs3y4a21"; + version = "0.5.2.1"; + sha256 = "16gl39cpj7gvb82i41h18606n6k40hi8lfyyw1x0dq73xs2ldfyc"; + revision = "2"; + editedCabalFile = "0788nzixn3fnm57vw5s69rwc3qmw0rr1d46lqwzxdsxqzcywq644"; libraryHaskellDepends = [ aeson base beam-core bytestring containers deepseq dependent-map dependent-sum free ghc-prim hashable haskell-src-exts microlens mtl @@ -47845,13 +47795,15 @@ self: { , bytestring, case-insensitive, conduit, free, hashable , haskell-src-exts, hedgehog, lifted-base, monad-control, mtl , network-uri, postgresql-libpq, postgresql-simple, scientific - , tagged, tasty, tasty-hunit, testcontainers, text, time + , tagged, tasty, tasty-hunit, text, time, tmp-postgres , transformers-base, unordered-containers, uuid, uuid-types, vector }: mkDerivation { pname = "beam-postgres"; - version = "0.5.4.1"; - sha256 = "0rxf275y89xh8if2w2my75fgy34vzc85lv4viyirgd0y26n9d0kc"; + version = "0.5.3.1"; + sha256 = "19gagw9r2wfy398calkcnilsgl89sjpy8vj9bdswg390mw15m41n"; + revision = "2"; + editedCabalFile = "11f3jxljrfa4rva21r561w7vxafv63wmmsa9cq8bydcp3gzlgr4p"; libraryHaskellDepends = [ aeson attoparsec base beam-core beam-migrate bytestring case-insensitive conduit free hashable haskell-src-exts lifted-base @@ -47861,7 +47813,7 @@ self: { ]; testHaskellDepends = [ aeson base beam-core beam-migrate bytestring hedgehog - postgresql-simple tasty tasty-hunit testcontainers text uuid vector + postgresql-simple tasty tasty-hunit text tmp-postgres uuid vector ]; description = "Connection layer between beam and postgres"; license = lib.licenses.mit; @@ -47948,8 +47900,8 @@ self: { }: mkDerivation { pname = "bearriver"; - version = "0.14.11"; - sha256 = "13f9x9kavnkbg29mrp2zddvx5vqdyp6ias5a822hmlzqfzp5c1hy"; + version = "0.14.10"; + sha256 = "0fyjrwb3f7sqs1bbiga98h6bylgvmqfpqg59p07lhv4hrrgmx8ff"; libraryHaskellDepends = [ base deepseq dunai mtl random simple-affine-space transformers ]; @@ -53338,10 +53290,8 @@ self: { ({ mkDerivation, bluefin-internal }: mkDerivation { pname = "bluefin"; - version = "0.0.9.0"; - sha256 = "11balgaw73fi3bqnajhs570nfy5lcjzhxdkms2jbxsd80l6n1zx1"; - revision = "1"; - editedCabalFile = "0xll6fdlhr9h9kswn6kdbdk3wbd1z87wsrgr4g3bqsj29bdjqvb7"; + version = "0.0.8.0"; + sha256 = "16gzb82lrxhw4s1b1gmq03k094lfpczsls8csv02l77bkipjmfh8"; libraryHaskellDepends = [ bluefin-internal ]; description = "The Bluefin effect system"; license = lib.licenses.mit; @@ -53372,8 +53322,10 @@ self: { }: mkDerivation { pname = "bluefin-internal"; - version = "0.0.9.0"; - sha256 = "06y5vq24jrm5l3lf2sq43qnc0i8zazrf9g28spmgzjlsqcv84g4d"; + version = "0.0.8.0"; + sha256 = "1knhqll525qn74zbyqxn6k8d1zbb974h1qh92qpc7r3bqp5v576p"; + revision = "1"; + editedCabalFile = "1j27hka5sm5vld2mgvw238c4bg6ys7mzfjskdmdvbxs5yn6ywqpr"; libraryHaskellDepends = [ async base monad-control transformers transformers-base unliftio-core @@ -54726,19 +54678,18 @@ self: { "box" = callPackage ({ mkDerivation, async, base, bytestring, containers, contravariant - , dlist, doctest-parallel, exceptions, kan-extensions, mtl - , profunctors, semigroupoids, stm, text, time + , dlist, exceptions, kan-extensions, mtl, profunctors + , semigroupoids, stm, text, time }: mkDerivation { pname = "box"; - version = "0.9.3.2"; - sha256 = "0x2h5d6jgmv4nwsl955xb89q0f1fclsg5hjn7fyyja3z8w9qnf39"; + version = "0.9.3.1"; + sha256 = "09mqz1ifq9sbq2h5wqy0lfvlc3v9m2nsw2f7gdss93qx8bz5cxmy"; libraryHaskellDepends = [ async base bytestring containers contravariant dlist exceptions kan-extensions mtl profunctors semigroupoids stm text time ]; - testHaskellDepends = [ base doctest-parallel ]; - description = "A profunctor effect system?"; + description = "A profunctor effect system"; license = lib.licenses.bsd3; }) {}; @@ -54756,14 +54707,13 @@ self: { }) {}; "box-socket" = callPackage - ({ mkDerivation, async, base, box, bytestring, doctest-parallel - , network-simple, optparse-applicative, profunctors, text - , websockets + ({ mkDerivation, async, base, box, bytestring, network-simple + , optparse-applicative, profunctors, text, websockets }: mkDerivation { pname = "box-socket"; - version = "0.5.2.0"; - sha256 = "13a8dclvf7m5j0a9gvmla8pr78qqrqnbqz8nc8js2yzp215p5qip"; + version = "0.5.1.0"; + sha256 = "0bm3csgz72fv41pilbwn0f2dx9gplin7qxi5i8mrwflaix156sy5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54771,7 +54721,6 @@ self: { websockets ]; executableHaskellDepends = [ base optparse-applicative ]; - testHaskellDepends = [ base doctest-parallel ]; description = "Box websockets"; license = lib.licenses.bsd3; mainProgram = "box-socket"; @@ -54937,16 +54886,14 @@ self: { "brassica" = callPackage ({ mkDerivation, aeson, attoparsec-aeson, base, bytestring, conduit , conduit-extra, containers, criterion, deepseq, fast-myers-diff - , file-embed, megaparsec, mtl, optparse-applicative, pandoc - , pandoc-types, parallel, parser-combinators, split, tasty - , tasty-golden, text, transformers, utf8-string, vector + , file-embed, megaparsec, mtl, optparse-applicative, parallel + , parser-combinators, split, tasty, tasty-golden, text + , transformers, utf8-string, vector }: mkDerivation { pname = "brassica"; - version = "1.0.0"; - sha256 = "04nrfc448m0kz73rwnvb6c0h9mhh55vjxxls6ddyq80avypsgb57"; - revision = "1"; - editedCabalFile = "1vqakf9jh6hrbicbrpwsv3fjqwi0mngnvrwg58xaaqhb4h18kzj4"; + version = "0.3.0"; + sha256 = "10ydb5w79y1jqa34mzrdl7s8ns29w1vxplv55ik51mkayclfgx3n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54958,8 +54905,8 @@ self: { deepseq optparse-applicative parallel text ]; testHaskellDepends = [ - base bytestring conduit pandoc pandoc-types tasty tasty-golden text - transformers utf8-string + base bytestring conduit tasty tasty-golden text transformers + utf8-string ]; benchmarkHaskellDepends = [ base criterion file-embed parallel text @@ -55172,8 +55119,8 @@ self: { ({ mkDerivation, base, brick, containers, microlens, vector }: mkDerivation { pname = "brick-list-skip"; - version = "0.1.1.14"; - sha256 = "1gyc59y2ch2w5chiyx1d1s6rd71cvgvccmdfkbyzvcm8sywaqnnr"; + version = "0.1.1.13"; + sha256 = "1n5mp9ikqmlckqywbvb1ry24j927qim3bw8bkw84w72yhlrxsmfc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers microlens vector ]; @@ -55227,8 +55174,8 @@ self: { }: mkDerivation { pname = "brick-tabular-list"; - version = "2.2.0.12"; - sha256 = "0ss1rakdpv82pbyf9cnfd3sysap2ggjc7cpz4vh46w55ivy3ba3n"; + version = "2.2.0.11"; + sha256 = "0vikqrrhb94m6xg0k67j626gahx4iiwwywimlsqh96lvs5l07y9l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56998,8 +56945,8 @@ self: { }: mkDerivation { pname = "byte-count-reader"; - version = "0.10.1.12"; - sha256 = "0bzks15c2s2xiv95v7fyzsndyiinp9ar8ajcalxs68zpwmbpzk3h"; + version = "0.10.1.11"; + sha256 = "1mi0560rcajp9q83y6vsw7ld1n429jdsmswassnyhh1z4hs6ihv7"; libraryHaskellDepends = [ base extra parsec parsec-numbers text ]; testHaskellDepends = [ base extra hspec parsec parsec-numbers text @@ -58606,8 +58553,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "5.2.4"; - sha256 = "02pwpdzq8lk9yk6d4zpw62v1yd3ccn3r88gz3l0z51mk17ifym44"; + version = "5.2.3"; + sha256 = "0gj6w5r07bmij41flx7rw4ad0qjl2fmbxp9jrdkl8k33b045lfc7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58777,15 +58724,14 @@ self: { "cabal-fix" = callPackage ({ mkDerivation, algebraic-graphs, base, bytestring, Cabal-syntax - , containers, directory, doctest-parallel, dotparse, filepath - , flatparse, optics-extra, optparse-applicative, pretty - , pretty-simple, string-interpolate, tar, text, these, tree-diff - , vector + , containers, directory, dotparse, filepath, flatparse + , optics-extra, optparse-applicative, pretty, pretty-simple + , string-interpolate, tar, text, these, tree-diff, vector }: mkDerivation { pname = "cabal-fix"; - version = "0.1.0.0"; - sha256 = "09q9nzxybkrqg96ys45jpq37ar5dgdvxc3yacfngk3kzxcw3ykms"; + version = "0.0.0.2"; + sha256 = "050003nvqc0x44jik7x5gsljqsrandpsl77xkqbhrh3xglw8cydb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58797,7 +58743,6 @@ self: { base bytestring directory filepath optparse-applicative pretty-simple text tree-diff ]; - testHaskellDepends = [ base doctest-parallel ]; description = "Fix for cabal files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -60181,22 +60126,21 @@ self: { , conduit-concurrent-map, conduit-extra, conduit-zstd, containers , crypton, deepseq, dhall, directory, ed25519, either, exceptions , extra, filepath, fsnotify, generic-lens, hercules-ci-cnix-store - , here, hnix-store-core, hnix-store-nar, hspec, hspec-discover - , http-client, http-client-tls, http-conduit, http-types, immortal - , inline-c-cpp, katip, lukko, lzma-conduit, megaparsec, memory - , microlens, netrc, network, nix, nix-narinfo, optparse-applicative - , pretty-terminal, prettyprinter, process, protolude, resourcet - , retry, safe-exceptions, servant, servant-auth - , servant-auth-client, servant-client, servant-client-core - , servant-conduit, stm, stm-chans, stm-conduit, systemd, temporary - , text, time, transformers, unix, unliftio, unliftio-core - , unordered-containers, uri-bytestring, uuid, vector, versions - , websockets, wuss + , here, hnix-store-core, hspec, hspec-discover, http-client + , http-client-tls, http-conduit, http-types, immortal, inline-c-cpp + , katip, lukko, lzma-conduit, megaparsec, memory, microlens, netrc + , network, nix, nix-narinfo, optparse-applicative, pretty-terminal + , prettyprinter, process, protolude, resourcet, retry + , safe-exceptions, servant, servant-auth, servant-auth-client + , servant-client, servant-client-core, servant-conduit, stm + , stm-chans, stm-conduit, systemd, temporary, text, time + , transformers, unix, unliftio, unliftio-core, unordered-containers + , uri-bytestring, uuid, vector, versions, websockets, wuss }: mkDerivation { pname = "cachix"; - version = "1.7.5"; - sha256 = "0f9lp7drhiadn8blcf1m4hxmv3zj1ah9n0w6s9v5ad1zp1lgcd0y"; + version = "1.7.4"; + sha256 = "1bz80b9cfhib2j0bkxsxwvp8zzf1bfvzpwin1fb8lfw9nm9mz915"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60205,15 +60149,15 @@ self: { concurrent-extra conduit conduit-concurrent-map conduit-extra conduit-zstd containers crypton deepseq dhall directory ed25519 either exceptions extra filepath fsnotify generic-lens - hercules-ci-cnix-store here hnix-store-core hnix-store-nar - http-client http-client-tls http-conduit http-types immortal - inline-c-cpp katip lukko lzma-conduit megaparsec memory microlens - netrc network nix-narinfo optparse-applicative pretty-terminal - prettyprinter process protolude resourcet retry safe-exceptions - servant servant-auth servant-auth-client servant-client - servant-conduit stm stm-chans stm-conduit systemd temporary text - time transformers unix unliftio unliftio-core unordered-containers - uri-bytestring uuid vector versions websockets wuss + hercules-ci-cnix-store here hnix-store-core http-client + http-client-tls http-conduit http-types immortal inline-c-cpp katip + lukko lzma-conduit megaparsec memory microlens netrc network + nix-narinfo optparse-applicative pretty-terminal prettyprinter + process protolude resourcet retry safe-exceptions servant + servant-auth servant-auth-client servant-client servant-conduit stm + stm-chans stm-conduit systemd temporary text time transformers unix + unliftio unliftio-core unordered-containers uri-bytestring uuid + vector versions websockets wuss ]; libraryPkgconfigDepends = [ nix ]; executableHaskellDepends = [ @@ -60222,8 +60166,8 @@ self: { ]; testHaskellDepends = [ aeson async base bytestring cachix-api containers dhall directory - extra hercules-ci-cnix-store here hspec protolude retry - servant-auth-client servant-client-core stm temporary time versions + extra here hspec protolude retry servant-auth-client + servant-client-core stm temporary time versions ]; testToolDepends = [ hspec-discover ]; description = "Command-line client for Nix binary cache hosting https://cachix.org"; @@ -60232,18 +60176,18 @@ self: { }) {inherit (pkgs) nix;}; "cachix-api" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, conduit, crypton - , deriving-aeson, exceptions, hspec, hspec-discover, http-media - , jose, memory, nix-narinfo, protolude, resourcet, safe-exceptions - , servant, servant-auth, stm-chans, swagger2, text, time - , unordered-containers, uuid, websockets + ({ mkDerivation, aeson, async, base, bytestring, conduit + , cryptonite, deriving-aeson, exceptions, hspec, hspec-discover + , http-media, jose, memory, nix-narinfo, protolude, resourcet + , safe-exceptions, servant, servant-auth, stm-chans, swagger2, text + , time, unordered-containers, uuid, websockets }: mkDerivation { pname = "cachix-api"; - version = "1.7.5"; - sha256 = "03iq1kwy2jnbpf2c2v0hs9s44sd2w92srrrcb61jm00ws7qnh5sw"; + version = "1.7.4"; + sha256 = "0f19mxmas71mwj487jizwfmlfpp5c5jwhjk5j8w4kz3xc434irqy"; libraryHaskellDepends = [ - aeson async base bytestring conduit crypton deriving-aeson + aeson async base bytestring conduit cryptonite deriving-aeson exceptions http-media jose memory nix-narinfo protolude resourcet safe-exceptions servant servant-auth stm-chans swagger2 text time unordered-containers uuid websockets @@ -60577,8 +60521,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.12.1.0"; - sha256 = "0ccwrnymkd96ca85n097iw9x5pnirc3ccmalyl1w507c56ph3jb4"; + version = "0.12.0.0"; + sha256 = "00vdj70n5s05xx7yq4d28nbp9vncrdc4a9k3502xslkh6kj7zva2"; libraryHaskellDepends = [ aeson aeson-optics async base bytestring calamity-commands colour concurrent-extra containers crypton-connection crypton-x509-system @@ -64300,20 +64244,20 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "chart-svg_0_7_0_0" = callPackage - ({ mkDerivation, base, bytestring, Color, containers, cubicbezier - , doctest-parallel, flatparse, formatn, harpie, markup-parse, mtl - , numhask, numhask-space, optics-core, random, string-interpolate - , text, time + "chart-svg_0_6_1_0" = callPackage + ({ mkDerivation, adjunctions, attoparsec, base, bytestring, Color + , containers, cubicbezier, doctest-parallel, flatparse, foldl + , formatn, markup-parse, mtl, numhask, numhask-array, numhask-space + , optics-core, random, string-interpolate, text, time }: mkDerivation { pname = "chart-svg"; - version = "0.7.0.0"; - sha256 = "1v1dhvn4rgv191byvr5dvaxifd48hskpqvv3kzpsq40ii7hqyj4m"; + version = "0.6.1.0"; + sha256 = "05z9raqqjnq0wvlknkl2z2g20hxal6nnz7g8p0fqplggv52f53vd"; libraryHaskellDepends = [ - base bytestring Color containers cubicbezier flatparse formatn - harpie markup-parse mtl numhask numhask-space optics-core random - string-interpolate text time + adjunctions attoparsec base bytestring Color containers cubicbezier + flatparse foldl formatn markup-parse mtl numhask numhask-array + numhask-space optics-core random string-interpolate text time ]; testHaskellDepends = [ base doctest-parallel ]; description = "Charting library targetting SVGs"; @@ -64837,8 +64781,8 @@ self: { }: mkDerivation { pname = "chessIO"; - version = "0.9.4.0"; - sha256 = "1dbbhpvpnrlx3a4a66q0732fdvb132xax0p5fh41xfhjfxxspzf2"; + version = "0.9.3.1"; + sha256 = "1jq8x1mjjy89mfdrksdaiyqyhn7wvxnl3is36kacyck58l0sc738"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66165,8 +66109,6 @@ self: { pname = "citeproc"; version = "0.8.1.1"; sha256 = "0hgkxgd1wmyrryv2ahavia6r5z9331i9557mnblq922lkdi0bs2g"; - revision = "1"; - editedCabalFile = "091gm0cbjsqvad3fhd2fx4bgsylv3gfakq3fhki3z40aywri8992"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70905,21 +70847,6 @@ self: { license = "unknown"; }) {}; - "comma-and" = callPackage - ({ mkDerivation, base, data-default-class, hspec, hspec-discover - , QuickCheck - }: - mkDerivation { - pname = "comma-and"; - version = "0.1.0.0"; - sha256 = "13z5z7c2xgljxk9lr786wbmayyqng3pp16pkhv6ch9p0a0adwwkc"; - libraryHaskellDepends = [ base data-default-class ]; - testHaskellDepends = [ base data-default-class hspec QuickCheck ]; - testToolDepends = [ hspec-discover ]; - description = "Join text together with commas, and \"and\""; - license = lib.licenses.bsd3; - }) {}; - "command" = callPackage ({ mkDerivation, base, deepseq, process }: mkDerivation { @@ -71025,6 +70952,28 @@ self: { }) {}; "commonmark" = callPackage + ({ mkDerivation, base, bytestring, containers, parsec, tasty + , tasty-bench, tasty-hunit, tasty-quickcheck, text, transformers + , unicode-data, unicode-transforms + }: + mkDerivation { + pname = "commonmark"; + version = "0.2.6"; + sha256 = "0k0wkvlqbcv7iml9pa56pic4z417qydck22r4kbw51zixkj6rrp7"; + libraryHaskellDepends = [ + base bytestring containers parsec text transformers unicode-data + unicode-transforms + ]; + testHaskellDepends = [ + base parsec tasty tasty-hunit tasty-quickcheck text + unicode-transforms + ]; + benchmarkHaskellDepends = [ base tasty-bench text ]; + description = "Pure Haskell commonmark parser"; + license = lib.licenses.bsd3; + }) {}; + + "commonmark_0_2_6_1" = callPackage ({ mkDerivation, base, bytestring, containers, parsec, tasty , tasty-bench, tasty-hunit, tasty-quickcheck, text, transformers , unicode-data, unicode-transforms @@ -71044,6 +70993,7 @@ self: { benchmarkHaskellDepends = [ base tasty-bench text ]; description = "Pure Haskell commonmark parser"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "commonmark-cli" = callPackage @@ -71089,6 +71039,21 @@ self: { }) {}; "commonmark-pandoc" = callPackage + ({ mkDerivation, base, commonmark, commonmark-extensions + , pandoc-types, text + }: + mkDerivation { + pname = "commonmark-pandoc"; + version = "0.2.2.1"; + sha256 = "1kbs165li9fcizzivlb9ajsh9livc7vq8s903g5n829fpwayp431"; + libraryHaskellDepends = [ + base commonmark commonmark-extensions pandoc-types text + ]; + description = "Bridge between commonmark and pandoc AST"; + license = lib.licenses.bsd3; + }) {}; + + "commonmark-pandoc_0_2_2_2" = callPackage ({ mkDerivation, base, commonmark, commonmark-extensions , pandoc-types, text }: @@ -71101,6 +71066,7 @@ self: { ]; description = "Bridge between commonmark and pandoc AST"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "commonmark-simple" = callPackage @@ -74206,8 +74172,8 @@ self: { pname = "config-value"; version = "0.8.3"; sha256 = "0pkcwxg91wali7986k03d7q940hb078hlsxfknqhkp2spr3d1f3w"; - revision = "8"; - editedCabalFile = "1sfj9c77y7j5y5l7vsix4v94hmi5lajm1v5lgvwvcl7y063h0p2r"; + revision = "7"; + editedCabalFile = "0bzrsy2qlz6ylml38q905rcw2lg0khz6iqr67hhcihbgwgazrrsj"; libraryHaskellDepends = [ array base containers pretty text ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base text ]; @@ -75864,20 +75830,6 @@ self: { license = lib.licenses.publicDomain; }) {}; - "control-monad-omega_0_3_3" = callPackage - ({ mkDerivation, base, tasty, tasty-bench, tasty-quickcheck }: - mkDerivation { - pname = "control-monad-omega"; - version = "0.3.3"; - sha256 = "0f90q6mxxb8szqvw93pypbbf4nicj1w5n9sqs4434b6cp55665z6"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base tasty tasty-quickcheck ]; - benchmarkHaskellDepends = [ base tasty-bench ]; - description = "A breadth-first list monad"; - license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; - }) {}; - "control-monad-queue" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -79792,15 +79744,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "crypton_1_0_1" = callPackage + "crypton_1_0_0" = callPackage ({ mkDerivation, base, basement, bytestring, deepseq, gauge , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit , tasty-kat, tasty-quickcheck }: mkDerivation { pname = "crypton"; - version = "1.0.1"; - sha256 = "19674xqf6zp17g4qwlz1m3dzdsl05s1frb2drxb77iccfhabnhli"; + version = "1.0.0"; + sha256 = "1q1kv37hv8cl6hykvssbd4hsd0zj8a562q42jr2gwk59lnwklhcx"; libraryHaskellDepends = [ base basement bytestring deepseq ghc-prim integer-gmp memory ]; @@ -80450,8 +80402,8 @@ self: { }: mkDerivation { pname = "csv-conduit"; - version = "1.0.1.0"; - sha256 = "0qlw5hhsrfpw972ryp3mr895q77d6p1g2q1z7jl7hf1xz7ba0c1r"; + version = "1.0.0.1"; + sha256 = "16falqdvm94dr4fjb9dndax1vj50amf1ns95x0hribww0vp85w8c"; libraryHaskellDepends = [ array attoparsec base blaze-builder bytestring conduit conduit-extra containers data-default exceptions ordered-containers @@ -81454,7 +81406,7 @@ self: { hydraPlatforms = lib.platforms.none; mainProgram = "cut-the-crap"; broken = true; - }) {inherit (pkgs) pocketsphinx; sphinxbase = null;}; + }) {pocketsphinx = null; sphinxbase = null;}; "cutter" = callPackage ({ mkDerivation, base, bytestring, explicit-exception, spreadsheet @@ -82808,42 +82760,28 @@ self: { }) {}; "data-default" = callPackage - ({ mkDerivation, base, containers, data-default-class + ({ mkDerivation, base, data-default-class , data-default-instances-containers, data-default-instances-dlist - , data-default-instances-old-locale, mtl, old-locale + , data-default-instances-old-locale }: mkDerivation { pname = "data-default"; - version = "0.7.1.2"; - sha256 = "0kzq84bflmfhzc7650wykjamwq8zsxm9q2c1s7nfbgig5xyizkjc"; + version = "0.7.1.1"; + sha256 = "04d5n8ybmcxba9qb6h389w9zfq1lvj81b82jh6maqp6pkhkmvydh"; libraryHaskellDepends = [ base data-default-class data-default-instances-containers data-default-instances-dlist data-default-instances-old-locale ]; - testHaskellDepends = [ base containers mtl old-locale ]; description = "A class for types with a default value"; license = lib.licenses.bsd3; }) {}; - "data-default_0_8_0_0" = callPackage - ({ mkDerivation, base, containers, mtl }: - mkDerivation { - pname = "data-default"; - version = "0.8.0.0"; - sha256 = "0cfxfbgsxxla1hr59rnm1cljb6i18rbp8yq7f0bfwvwpi4q0xwi3"; - libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ base containers mtl ]; - description = "A class for types with a default value"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "data-default-class" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "data-default-class"; - version = "0.1.2.2"; - sha256 = "1qxfyxdddl0rzigp81p36i1dgddw2yhqskyz8ngkcy6zbq0w407l"; + version = "0.1.2.0"; + sha256 = "0miyjz8d4jyvqf2vp60lyfbnflx6cj2k8apmm9ly1hq0y0iv80ag"; libraryHaskellDepends = [ base ]; description = "A class for types with a default value"; license = lib.licenses.bsd3; @@ -82901,8 +82839,8 @@ self: { ({ mkDerivation, base, data-default-class }: mkDerivation { pname = "data-default-instances-base"; - version = "0.1.0.3"; - sha256 = "1cslj2bywl4w58f6wr4knk7zj6v8v7rykjxq9ddy8vzbydns1bn8"; + version = "0.1.0.1"; + sha256 = "0ym1sw3ssdzzifxxhh76qlv8kkmb2iclc158incv1dklyr9y8kw4"; libraryHaskellDepends = [ base data-default-class ]; description = "Default instances for types in base"; license = lib.licenses.bsd3; @@ -82945,24 +82883,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "data-default-instances-containers_0_1_0_3" = callPackage - ({ mkDerivation, base, containers, data-default-class }: - mkDerivation { - pname = "data-default-instances-containers"; - version = "0.1.0.3"; - sha256 = "0awk655khqc1cqfc2kcxkcxqpa90l882cz89f2gip6v31vyzmpdr"; - libraryHaskellDepends = [ base containers data-default-class ]; - description = "Default instances for types in containers"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "data-default-instances-dlist" = callPackage ({ mkDerivation, base, data-default-class, dlist }: mkDerivation { pname = "data-default-instances-dlist"; - version = "0.0.1.2"; - sha256 = "02wy7rq6d5z2hpxdw6vwnb1bri5bz9yrw5hnc1i7l0x5q68g3gg0"; + version = "0.0.1"; + sha256 = "0narkdqiprhgayjiawrr4390h4rq4pl2pb6mvixbv2phrc8kfs3x"; libraryHaskellDepends = [ base data-default-class dlist ]; description = "Default instances for types in dlist"; license = lib.licenses.bsd3; @@ -82985,8 +82911,8 @@ self: { ({ mkDerivation, base, data-default-class, old-locale }: mkDerivation { pname = "data-default-instances-old-locale"; - version = "0.0.1.2"; - sha256 = "0vxqr7hmp1vxjv08lmrf15x4p6s7l44qz1c834a8dds807zri03h"; + version = "0.0.1"; + sha256 = "00h81i5phib741yj517p8mbnc48myvfj8axzsw44k34m48lv1lv0"; libraryHaskellDepends = [ base data-default-class old-locale ]; description = "Default instances for types in old-locale"; license = lib.licenses.bsd3; @@ -83136,10 +83062,8 @@ self: { }: mkDerivation { pname = "data-effects"; - version = "0.2.0.0"; - sha256 = "1fmag3frj414q3anp8711l53diy603rz6sh6pl3p9bliwk8npwfs"; - revision = "1"; - editedCabalFile = "13j27hw73a8kzjf6hvz8pyj8xfv6j9bzp8y2ahd8w6ycv7kdcl10"; + version = "0.1.2.0"; + sha256 = "1gx04k8rsk2qcq74ya44w0249vfb8n3qqwc3bj95askm4nr7nfl6"; libraryHaskellDepends = [ base data-default data-effects-core data-effects-th lens text these time @@ -83157,8 +83081,8 @@ self: { }: mkDerivation { pname = "data-effects-core"; - version = "0.2.0.0"; - sha256 = "1cxagw2h0987k3s1h3wbhqsydjk0yvz4nda5d6yvz2w3jlm1fnqg"; + version = "0.1.0.0"; + sha256 = "1sz3wnna9h6211lc9pbvgf6wjr6csqzpl2q2jz8z3s4hky0m32jg"; libraryHaskellDepends = [ base compdata mtl ]; testHaskellDepends = [ base tasty tasty-hunit ]; testToolDepends = [ tasty-discover ]; @@ -83176,10 +83100,8 @@ self: { }: mkDerivation { pname = "data-effects-th"; - version = "0.2.0.0"; - sha256 = "0b6hwhh7hc7b81xsm1khrjda737gjwg0q48c8v9ai48q5nsnb646"; - revision = "1"; - editedCabalFile = "1bi4rhb6wl5n5myp1jc5rv3s483jspqfa53dkv7xsq6chvfqhf7h"; + version = "0.1.2.0"; + sha256 = "05jzplb3vxxhy8ham7v8w3n943fng3fk8v1pa09vbv68k3r1p14w"; libraryHaskellDepends = [ base containers data-default data-effects-core either extra formatting infinite-list lens mtl template-haskell text @@ -83190,7 +83112,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Template Haskell utilities for the data-effects library"; - license = "MPL-2.0 AND BSD-3-Clause"; + license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; }) {}; @@ -85227,17 +85149,17 @@ self: { license = lib.licenses.asl20; }) {}; - "dbus_1_3_8" = callPackage + "dbus_1_3_7" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, containers - , deepseq, directory, exceptions, extra, filepath, lens, network - , parsec, process, QuickCheck, random, resourcet, split, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, temporary, text - , th-lift, transformers, unix, vector, xml-conduit, xml-types + , criterion, deepseq, directory, exceptions, extra, filepath, lens + , network, parsec, process, QuickCheck, random, resourcet, split + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, temporary + , text, th-lift, transformers, unix, vector, xml-conduit, xml-types }: mkDerivation { pname = "dbus"; - version = "1.3.8"; - sha256 = "1vw6268w3gs7lzi3p0g1vhi930cwwb2l38w6mnv1yzsm26v6np4s"; + version = "1.3.7"; + sha256 = "0yjsgabcihy8gzzckh5ipy5bwspw3pg3ghj3in6mzlkyqj1hx964"; libraryHaskellDepends = [ base bytestring cereal conduit containers deepseq exceptions filepath lens network parsec random split template-haskell text @@ -85248,6 +85170,7 @@ self: { parsec process QuickCheck random resourcet tasty tasty-hunit tasty-quickcheck temporary text transformers unix vector ]; + benchmarkHaskellDepends = [ base criterion ]; doCheck = false; description = "A client library for the D-Bus IPC system"; license = lib.licenses.asl20; @@ -87255,8 +87178,6 @@ self: { pname = "dependent-monoidal-map"; version = "0.1.1.4"; sha256 = "1cgk0dlag557krddaivbqkc3qp4crsspa53wkqx5mpgv6jaiq7dg"; - revision = "1"; - editedCabalFile = "0qm6b15ljxdpnyihz6ip932spbgz0kgkgqpif961599l35l1ajg9"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum dependent-sum-aeson-orphans @@ -87300,8 +87221,8 @@ self: { pname = "dependent-sum-aeson-orphans"; version = "0.3.1.1"; sha256 = "0d2255gxsamp19hl23m076ds2j08ny95swrk9r3njjfjrwkd4zbq"; - revision = "2"; - editedCabalFile = "1w50zxcngacgaq534dza7p1h37nkshmh9nhcaxlwkia2mr26fiv5"; + revision = "1"; + editedCabalFile = "023f0h3pifgjrv8qr7cka86iykpzw1c4vcx1kjsi8m9brl78hh1h"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum some @@ -87585,8 +87506,8 @@ self: { ({ mkDerivation, base, hspec, template-haskell, th-abstraction }: mkDerivation { pname = "derive-has-field"; - version = "0.0.1.4"; - sha256 = "19mbgv53sc4j200affnsig9g9qz9cn7xp7v3qc1l4cc93pgyf3m9"; + version = "0.0.1.2"; + sha256 = "03w0qvs7adgwc676gk0q36bm9s7f7b709siy4dh0y27qblcjb6a4"; libraryHaskellDepends = [ base template-haskell th-abstraction ]; testHaskellDepends = [ base hspec template-haskell th-abstraction @@ -88004,8 +87925,8 @@ self: { }: mkDerivation { pname = "desktop-portal"; - version = "0.6.0.2"; - sha256 = "04z1d3gqcd0qvrvfhiv51sdhra5m39dq5jvp8hsrw2k32mkdixn9"; + version = "0.6.0.0"; + sha256 = "18cgwz8cgsj1vjhk4rgv4lakqbnrrb5pspkpg5lnkc9kq7953d1g"; libraryHaskellDepends = [ base binary bytestring containers data-default-class dbus directory filepath modern-uri network random text unix @@ -89256,8 +89177,8 @@ self: { pname = "diagrams-builder"; version = "0.8.0.6"; sha256 = "17yi5dmcxx4sgk3wha386zbv9h69pwq72j8i21vmfh35brxhs9f4"; - revision = "2"; - editedCabalFile = "1mkxn0r6wmxyvdhwly1a6j0z4j234mfv7aimirwl7jmcv55lwbs4"; + revision = "1"; + editedCabalFile = "1w9bjc6zizp779rk4frfmffzlv4vq4sljdcvql9ma5qy679phiyr"; configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; isLibrary = true; isExecutable = true; @@ -90583,8 +90504,6 @@ self: { pname = "dimensional"; version = "1.5"; sha256 = "16d50vlln11hq894y8qxrg4cricz1459dg14z0wc1fzfiydxb6ns"; - revision = "1"; - editedCabalFile = "1149vwz3ywi2kkblsl8ayhca4ibwn76zdc5g6l18j8b03hvf3yzg"; libraryHaskellDepends = [ base deepseq exact-pi ieee754 numtype-dk vector ]; @@ -90605,8 +90524,6 @@ self: { pname = "dimensional"; version = "1.6"; sha256 = "05ikvdpl9j94alyf3r9fwfwn354z4gifbhp1fasspmd9s0bhi7wl"; - revision = "1"; - editedCabalFile = "0g51fw0k86jr0nlvriiprw5zpjqkifxc16s18h1h240y2v0cbgq0"; libraryHaskellDepends = [ base deepseq exact-pi ieee754 numtype-dk vector ]; @@ -90982,13 +90899,13 @@ self: { broken = true; }) {}; - "directory_1_3_9_0" = callPackage - ({ mkDerivation, base, file-io, filepath, time, unix }: + "directory_1_3_8_5" = callPackage + ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.9.0"; - sha256 = "1k34iqdkh9d5vjd7wihhjjc6388hfbh7sjwp3msziibz2534i8i0"; - libraryHaskellDepends = [ base file-io filepath time unix ]; + version = "1.3.8.5"; + sha256 = "0s57dq5l02b9z3h17slw3yg73mzdx15pzj02xg91avpwvmafsr78"; + libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; license = lib.licenses.bsd3; @@ -91554,8 +91471,8 @@ self: { pname = "discrimination"; version = "0.5"; sha256 = "1qq7fs1dsfqgf4969gksqcp3swcx0wbzdh66a89fv78k6y94g0pc"; - revision = "4"; - editedCabalFile = "1m4sv7mdqdm5xx5khbyq0il3dn5isg575vgn1akb283l2jkz4v1g"; + revision = "3"; + editedCabalFile = "1i3mkza18y2dxj03zn9419rh7jgpkg1kq97blhjrcw5174p9p3c6"; libraryHaskellDepends = [ array base containers contravariant deepseq ghc-bignum ghc-prim hashable primitive promises transformers @@ -93578,7 +93495,7 @@ self: { mainProgram = "doctest"; }) {}; - "doctest_0_23_0" = callPackage + "doctest_0_22_10" = callPackage ({ mkDerivation, base, code-page, containers, deepseq, directory , exceptions, filepath, ghc, ghc-paths, hspec, hspec-core , hspec-discover, HUnit, mockery, process, QuickCheck, silently @@ -93586,8 +93503,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.23.0"; - sha256 = "1jh38pj6rbsli4ba6jvnrg9dm2di18i7g9706nnfm0xc9ckhfs90"; + version = "0.22.10"; + sha256 = "0ylckg8mzfkv25a3yymfv8yal05ypr1qrx99qv4xakzpn8149m46"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94494,20 +94411,18 @@ self: { "dotparse" = callPackage ({ mkDerivation, algebraic-graphs, base, bytestring, chart-svg - , containers, doctest-parallel, flatparse, numhask-space - , optics-core, process-extras, string-interpolate, template-haskell - , text, these + , containers, flatparse, numhask-space, optics-core, process-extras + , string-interpolate, template-haskell, text, these }: mkDerivation { pname = "dotparse"; - version = "0.1.1.0"; - sha256 = "14829jdzb3vc3485y7hbri77giv2sbg8x4cyrc0pwk5cj8xb0yzf"; + version = "0.1.0.0"; + sha256 = "06knlrrb2ma57d5rnv2xdqp7avdbcbnd5m6pk45953lmhz217ls6"; libraryHaskellDepends = [ algebraic-graphs base bytestring chart-svg containers flatparse numhask-space optics-core process-extras string-interpolate template-haskell text these ]; - testHaskellDepends = [ base doctest-parallel ]; description = "dot language parsing and printing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -95511,8 +95426,6 @@ self: { pname = "dsp"; version = "0.2.5.2"; sha256 = "0inar9c0n4x0li9c7krr17qv7zc49162wchhyn6ix7adni8j92z0"; - revision = "1"; - editedCabalFile = "06lrjxcsyviifpw398za544r5wqfjlx3h206g1lmjmcqj0ph1n5q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers random ]; @@ -95684,8 +95597,8 @@ self: { pname = "dual-game"; version = "0.1.0.1"; sha256 = "1w69d7d2xbpi82n41gq08qdmldh834ka7qwvy159vsac556wwcfg"; - revision = "9"; - editedCabalFile = "140svi4r35rji7br3bcrcb7rgwkbzvrsc2nx1xml17sf8d3clj4r"; + revision = "8"; + editedCabalFile = "1c4m2nwmnrjs8rinfa9p9vynmdr56i5ggydgnjs3d8szpbbbbrml"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -95902,8 +95815,8 @@ self: { }: mkDerivation { pname = "dunai"; - version = "0.13.2"; - sha256 = "0x12hx51p5vfgscys40p8a9nnfj8d5rf5ynp436jzry6pzi0i6ab"; + version = "0.13.1"; + sha256 = "1hamj3yv6v0rdr06889iidhzpz6jbskq3bc5gbf45gzvq7bvcds7"; libraryHaskellDepends = [ base MonadRandom simple-affine-space transformers transformers-base ]; @@ -95934,8 +95847,8 @@ self: { ({ mkDerivation, base, dunai, normaldistribution, QuickCheck }: mkDerivation { pname = "dunai-test"; - version = "0.13.2"; - sha256 = "0z9rgirz7las2qrvagiiihgz03ds7dgbbmwk32mkz4paz339lkbg"; + version = "0.13.1"; + sha256 = "0hm5c9n890cxnw0pp62vqlw7yqmrzy2xb0inhbzcjm49i5gacfdq"; libraryHaskellDepends = [ base dunai normaldistribution QuickCheck ]; @@ -97875,32 +97788,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "effectful_2_5_0_0" = callPackage - ({ mkDerivation, async, base, bytestring, containers, directory - , effectful-core, exceptions, lifted-base, primitive, process - , safe-exceptions, stm, strict-mutable-base, tasty, tasty-bench - , tasty-hunit, text, time, unix, unliftio - }: - mkDerivation { - pname = "effectful"; - version = "2.5.0.0"; - sha256 = "1fv228n3cvbqhbvdrnix2wqr96zzvgav1dp5rkynpm12jjwknqkp"; - libraryHaskellDepends = [ - async base bytestring directory effectful-core process stm - strict-mutable-base time unliftio - ]; - testHaskellDepends = [ - base containers effectful-core exceptions lifted-base primitive - safe-exceptions strict-mutable-base tasty tasty-hunit unliftio - ]; - benchmarkHaskellDepends = [ - async base tasty-bench text unix unliftio - ]; - description = "An easy to use, performant extensible effects library"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "effectful-core" = callPackage ({ mkDerivation, base, containers, exceptions, monad-control , primitive, transformers-base, unliftio-core @@ -97917,24 +97804,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "effectful-core_2_5_0_0" = callPackage - ({ mkDerivation, base, containers, deepseq, exceptions - , monad-control, primitive, strict-mutable-base, transformers-base - , unliftio-core - }: - mkDerivation { - pname = "effectful-core"; - version = "2.5.0.0"; - sha256 = "1fjk92pwpxapjkq8zzv36j071nq1g9lys78jwg8f4q68g3f7rlzr"; - libraryHaskellDepends = [ - base containers deepseq exceptions monad-control primitive - strict-mutable-base transformers-base unliftio-core - ]; - description = "An easy to use, performant extensible effects library"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "effectful-plugin" = callPackage ({ mkDerivation, base, containers, effectful-core, ghc }: mkDerivation { @@ -97947,19 +97816,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "effectful-plugin_1_1_0_4" = callPackage - ({ mkDerivation, base, containers, effectful-core, ghc }: - mkDerivation { - pname = "effectful-plugin"; - version = "1.1.0.4"; - sha256 = "0c401ni8ajig5da4dgkk2xbajbkzghrjll8ccfh7pbbiknf7si7j"; - libraryHaskellDepends = [ base containers effectful-core ghc ]; - testHaskellDepends = [ base effectful-core ]; - description = "A GHC plugin for improving disambiguation of effects"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "effectful-st" = callPackage ({ mkDerivation, base, effectful-core, primitive }: mkDerivation { @@ -97992,14 +97848,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "effectful-th_1_0_0_3" = callPackage + "effectful-th_1_0_0_2" = callPackage ({ mkDerivation, base, containers, effectful-core, exceptions , template-haskell, th-abstraction }: mkDerivation { pname = "effectful-th"; - version = "1.0.0.3"; - sha256 = "0dzjy054n4zcrnnnj50yxxqicv50mfmzhgcqzhz4n6ap8v88ykiv"; + version = "1.0.0.2"; + sha256 = "14zj43wc3lz7aac0qcyzkxw2fbpgvp8b7wgk035ipcj7cfl25bhk"; libraryHaskellDepends = [ base containers effectful-core exceptions template-haskell th-abstraction @@ -98975,8 +98831,6 @@ self: { pname = "eliminators"; version = "0.9.5"; sha256 = "17pl2mg9bpagzkw50mydls883bj4mm7glmgnm59r57prky9h55gs"; - revision = "1"; - editedCabalFile = "0dzyskd0av2rdq9bk0y0d2605a65p9xailbbchvmaqjvqf4cqvpm"; libraryHaskellDepends = [ base extra singleton-nats singletons-base template-haskell text th-abstraction th-desugar @@ -102181,35 +102035,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "esqueleto_3_5_13_0" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring - , conduit, containers, exceptions, hspec, hspec-core, monad-logger - , mtl, mysql, mysql-simple, persistent, persistent-mysql - , persistent-postgresql, persistent-sqlite, postgresql-simple - , QuickCheck, resourcet, tagged, template-haskell, text, time - , transformers, unliftio, unordered-containers - }: - mkDerivation { - pname = "esqueleto"; - version = "3.5.13.0"; - sha256 = "01sp5g61kk6k3fzzdb9sx4sf8iqhncv5sg3hiw8hjp7xv6wc7341"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-html bytestring conduit containers - monad-logger persistent resourcet tagged template-haskell text time - transformers unliftio unordered-containers - ]; - testHaskellDepends = [ - aeson attoparsec base blaze-html bytestring conduit containers - exceptions hspec hspec-core monad-logger mtl mysql mysql-simple - persistent persistent-mysql persistent-postgresql persistent-sqlite - postgresql-simple QuickCheck resourcet tagged template-haskell text - time transformers unliftio unordered-containers - ]; - description = "Type-safe EDSL for SQL queries on persistent backends"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "esqueleto-compat" = callPackage ({ mkDerivation, base, conduit, esqueleto, hspec, persistent , resourcet, transformers @@ -104748,8 +104573,8 @@ self: { pname = "expiring-cache-map"; version = "0.0.6.1"; sha256 = "1fb47hsn06ybn2yzw7r6pjkmvvfpbdx7wjhbpxcywilbjyac4fqf"; - revision = "2"; - editedCabalFile = "1lg38r5i6wdi39561g6kpdcdkhr34idkvh8n128gc7dz2a9irycl"; + revision = "1"; + editedCabalFile = "1k5wqilafxp3ksqb7qy90cwipk0db568f15amn3mnf9krc1qjabg"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -105495,8 +105320,8 @@ self: { }: mkDerivation { pname = "extism-pdk"; - version = "1.2.0.0"; - sha256 = "1ph4c2l22mhdn8053shsh2spq5wdgvi7zw279ay9ffhhwkyan654"; + version = "1.1.0.0"; + sha256 = "0bnhi02f3m9shsn1x2vn7rpjaii72sb6lrsw9njzk743ap23d1kr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105518,8 +105343,6 @@ self: { pname = "extra"; version = "1.7.16"; sha256 = "0w3wwwnf96ax70lrb0fkfich7b23kvk112j9rzr72b0bqd1ns315"; - revision = "1"; - editedCabalFile = "0xb2xd6qw664rz0d1pa7g4cd58ixqfhpxh7q6gz9lhc10afqw62g"; libraryHaskellDepends = [ base clock directory filepath process time unix ]; @@ -105530,25 +105353,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "extra_1_8" = callPackage - ({ mkDerivation, base, clock, directory, filepath, process - , QuickCheck, quickcheck-instances, time, unix - }: - mkDerivation { - pname = "extra"; - version = "1.8"; - sha256 = "18c9ad7wjf6q4yp0sagxhwyjpm9frw9kk27ih2x0nmjhmrgcx91g"; - libraryHaskellDepends = [ - base clock directory filepath process time unix - ]; - testHaskellDepends = [ - base directory filepath QuickCheck quickcheck-instances unix - ]; - description = "Extra functions I use"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "extra-data-yj" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -105928,8 +105732,6 @@ self: { pname = "failure"; version = "0.2.0.3"; sha256 = "0jimc2x46zq7wnmzfbnqi67jl8yhbvr0fa65ljlc9p3fns9mca3p"; - revision = "1"; - editedCabalFile = "0lnvh6slp057kl0sjn14iab8y3cpic60lhbmn9502zryp7by23ky"; libraryHaskellDepends = [ base transformers ]; description = "A simple type class for success/failure computations. (deprecated)"; license = lib.licenses.bsd3; @@ -106026,8 +105828,8 @@ self: { }: mkDerivation { pname = "fakedata"; - version = "1.0.5"; - sha256 = "179j2r6ws6ngmwsswkmpas4ij5jywlvhk0rhbk8rn3vxc3yj7gnr"; + version = "1.0.3"; + sha256 = "12sldxpn14zx5zwblw28k593rdqz50d246rz8j3zj41ljmnbwj4i"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson attoparsec base bytestring containers directory exceptions @@ -106389,8 +106191,8 @@ self: { }: mkDerivation { pname = "fast-logger"; - version = "3.2.4"; - sha256 = "1fxh94qk24c7mki0049zc0h5g0cyn78fp54bgxczqcba6lqknx9r"; + version = "3.2.3"; + sha256 = "0af4228rnv2g3fgw00vx85fh0ngi092bx54awx1cd1jjkmpdyn73"; libraryHaskellDepends = [ array auto-update base bytestring directory easy-file filepath stm text unix-compat unix-time @@ -108348,6 +108150,23 @@ self: { }) {}; "fgl" = callPackage + ({ mkDerivation, array, base, containers, deepseq, hspec + , microbench, QuickCheck, transformers + }: + mkDerivation { + pname = "fgl"; + version = "5.8.2.0"; + sha256 = "1dn3x3rmdlglg1kbvx7vndkm66lvvyd23awwd0qzplzi43vhrks4"; + libraryHaskellDepends = [ + array base containers deepseq transformers + ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + benchmarkHaskellDepends = [ base deepseq microbench ]; + description = "Martin Erwig's Functional Graph Library"; + license = lib.licenses.bsd3; + }) {}; + + "fgl_5_8_3_0" = callPackage ({ mkDerivation, array, base, containers, deepseq, hspec , microbench, QuickCheck, transformers }: @@ -108362,6 +108181,7 @@ self: { benchmarkHaskellDepends = [ base deepseq microbench ]; description = "Martin Erwig's Functional Graph Library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "fgl-arbitrary" = callPackage @@ -112571,15 +112391,12 @@ self: { }) {}; "formatn" = callPackage - ({ mkDerivation, base, containers, doctest-parallel, QuickCheck - , text - }: + ({ mkDerivation, base, containers, QuickCheck, text }: mkDerivation { pname = "formatn"; - version = "0.3.1.0"; - sha256 = "0xh78ckdsih2p984qr170f6l4yfz5fnq7xni6gjzapcilfxzvky9"; - libraryHaskellDepends = [ base containers text ]; - testHaskellDepends = [ base doctest-parallel QuickCheck ]; + version = "0.3.0.1"; + sha256 = "1w1isqk9mxrzl0sfj10kqfr2z8wkxvx5dmacig4k415cbaf4dqs3"; + libraryHaskellDepends = [ base containers QuickCheck text ]; description = "Formatting of doubles"; license = lib.licenses.bsd3; }) {}; @@ -113508,15 +113325,14 @@ self: { , monad-validate, MonadRandom, mtl, nonempty-containers, openapi3 , path-pieces, persistent, persistent-postgresql, postgresql-simple , primitive, QuickCheck, resource-pool, resourcet, scientist - , semigroupoids, servant-server, template-haskell, text, time - , transformers, transformers-base, typed-process, unliftio - , unordered-containers, vector, wai, wai-extra, yaml, yesod-core - , yesod-test + , semigroupoids, template-haskell, text, time, transformers + , transformers-base, typed-process, unliftio, unordered-containers + , vector, wai, wai-extra, yaml, yesod-core, yesod-test }: mkDerivation { pname = "freckle-app"; - version = "1.20.3.0"; - sha256 = "0if5ijphbin6ff0krfhy7bpjambw4zf8ccg459caiff3qc97rlcy"; + version = "1.20.2.1"; + sha256 = "09j74p9mxhxz689c9i46474d23hp5p1xmfz2l4pbfh8wfg91bb5a"; libraryHaskellDepends = [ aeson annotated-exception autodocodec autodocodec-openapi3 base bcp47 Blammo Blammo-wai bugsnag bytestring case-insensitive cassava @@ -113530,16 +113346,15 @@ self: { monad-validate MonadRandom mtl nonempty-containers openapi3 path-pieces persistent persistent-postgresql postgresql-simple primitive QuickCheck resource-pool resourcet scientist - semigroupoids servant-server template-haskell text time - transformers transformers-base typed-process unliftio - unordered-containers vector wai wai-extra yaml yesod-core - yesod-test + semigroupoids template-haskell text time transformers + transformers-base typed-process unliftio unordered-containers + vector wai wai-extra yaml yesod-core yesod-test ]; testHaskellDepends = [ aeson annotated-exception async base Blammo bugsnag bytestring cassava conduit hs-opentelemetry-api hspec http-types HUnit - monad-validate nonempty-containers path-pieces persistent - postgresql-simple QuickCheck servant-server vector wai wai-extra + monad-validate nonempty-containers postgresql-simple QuickCheck + vector wai wai-extra ]; description = "Haskell application toolkit used at Freckle"; license = lib.licenses.mit; @@ -113748,8 +113563,8 @@ self: { }: mkDerivation { pname = "free-alacarte"; - version = "1.0.0.8"; - sha256 = "1il7ihn81g2341bx07pjjmjzyrxl3n9n70bg6qdxdgjs0w9b6b78"; + version = "1.0.0.7"; + sha256 = "033h3ghq7ibq74har4mv4njpwl6c6gndibq1qhlgx3x82ymxkgpk"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers hspec QuickCheck relude tasty tasty-hspec text time @@ -116236,8 +116051,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.25.23"; - sha256 = "1yd1j5qv4rfijjxv48m0qq7y9r0qn31zliafgbmqs2i9ik5gg6sz"; + version = "0.25.22"; + sha256 = "12x8n953l5j3msh95vbf94yh5yfw9x80grms2r59i3k6vg32bx01"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116309,8 +116124,8 @@ self: { }: mkDerivation { pname = "futhark-server"; - version = "1.2.3.0"; - sha256 = "12gih73pvy54k4fs7s690b40cfhrvgzahhw3n571pi73ia86mljb"; + version = "1.2.2.1"; + sha256 = "0g8n1gkl4y2a65z1idx58b1ls2g4jf0pwjhnc3w5wffq9mpwliaq"; libraryHaskellDepends = [ base binary bytestring directory futhark-data mtl process temporary text @@ -118220,16 +118035,19 @@ self: { }) {}; "generic-data" = callPackage - ({ mkDerivation, ap-normalize, base, base-orphans, deepseq - , generic-lens, ghc-boot-th, one-liner, show-combinators, tasty - , tasty-bench, tasty-hunit + ({ mkDerivation, ap-normalize, base, base-orphans, contravariant + , deepseq, generic-lens, ghc-boot-th, one-liner, show-combinators + , tasty, tasty-bench, tasty-hunit }: mkDerivation { pname = "generic-data"; - version = "1.1.0.1"; - sha256 = "0cbng88jsx5f34jrhj2c83jg9r0d7q4xj6vb2as97mgrdmy054nk"; + version = "1.1.0.0"; + sha256 = "1jxwkc475v0h1i5g5zyjq0x66fqvixdc99a7m8w3cpxkk56vqb5i"; + revision = "2"; + editedCabalFile = "187qabhjmymg18i7424s90f7nwx17hlpcr5i53ximwyd9z6i9ify"; libraryHaskellDepends = [ - ap-normalize base base-orphans ghc-boot-th show-combinators + ap-normalize base base-orphans contravariant ghc-boot-th + show-combinators ]; testHaskellDepends = [ base generic-lens one-liner show-combinators tasty tasty-hunit @@ -121271,7 +121089,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib_9_8_3_20241022" = callPackage + "ghc-lib_9_8_2_20240223" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser , ghc-prim, happy, hpc, parsec, pretty, process, rts @@ -121279,10 +121097,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.8.3.20241022"; - sha256 = "0irdlkkb139spmggjam2n4ydcwkb1r8vsv29g5w9rxqd5rd66w1b"; - revision = "1"; - editedCabalFile = "0r1a022nf2kk9vk5ca7crx74fzi0vcd8r5c5ldarcvqjfhgayfvi"; + version = "9.8.2.20240223"; + sha256 = "12lmk3ipd1pyiwzmnb0zgbw86yy7mhsy530dnackwidg3ww07nia"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -121305,8 +121121,6 @@ self: { pname = "ghc-lib"; version = "9.10.1.20240511"; sha256 = "1z8xpzkwp2abb8azhjsnmq0cyyvvc3xqm5dgs7vmrfj3yq72j6ys"; - revision = "1"; - editedCabalFile = "0zzp85lr6lps0w1ld535sc73nz4dmrk48rwvngzdwzb460lnqsiv"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -121360,17 +121174,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib-parser_9_8_3_20241022" = callPackage + "ghc-lib-parser_9_8_2_20240223" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.8.3.20241022"; - sha256 = "0gnd9dvjbis9vdgjk671x9ys6b0af7399mim8gpi6dpa1nczgc7b"; - revision = "2"; - editedCabalFile = "0qbqx6qg8hab2il9idmxjfwhk7s86ffp24836irc85aazmpvzsxv"; + version = "9.8.2.20240223"; + sha256 = "05k5grbh3s0ywm8y6cp9hqfj4bbq0nh1bx1ysgfv88df5hgg47r9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -121392,8 +121204,6 @@ self: { pname = "ghc-lib-parser"; version = "9.10.1.20240511"; sha256 = "0fgissqfbgx5ra6gvfywxn76q16v5i97riaxqs1l9pa3zrfdzl9p"; - revision = "1"; - editedCabalFile = "0lsjzmdyqbganrq492vwwkx5j05p34vwn4bjkrd5zjww17fazfcj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -122188,8 +121998,8 @@ self: { ({ mkDerivation, base, containers, ghc, transformers }: mkDerivation { pname = "ghc-tcplugin-api"; - version = "0.12.0.0"; - sha256 = "0gl5zhfvvkqa36ccl5hxjrw6pgpl1giwa1ysq4kbw41df8cwcxxl"; + version = "0.11.0.0"; + sha256 = "0k0hr9l3w3xf60var20by5xp0wqfcwv8x4lfcag94f9bn60cnvra"; libraryHaskellDepends = [ base containers ghc transformers ]; description = "An API for type-checker plugins"; license = lib.licenses.bsd3; @@ -125601,8 +125411,8 @@ self: { pname = "github"; version = "0.29"; sha256 = "1hki9lvf5vcq980ky98vwc7rh86rgf3z8pvqfgpb6jinc7jylcpx"; - revision = "6"; - editedCabalFile = "0ylwq4jzsng513pi98b3hxnn9lbjvjv5sgq1r7kfbd8nxgdcrbmw"; + revision = "5"; + editedCabalFile = "094n02zbpvy3fpc1rss88ja7gq40ds8dp990bwsw73wrpgip67zg"; libraryHaskellDepends = [ aeson base base-compat base16-bytestring binary binary-instances bytestring containers cryptohash-sha1 deepseq deepseq-generics @@ -130185,6 +129995,30 @@ self: { }) {}; "goldplate" = callPackage + ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring, Diff + , directory, filepath, Glob, optparse-applicative, process + , regex-pcre-builtin, text, unordered-containers + }: + mkDerivation { + pname = "goldplate"; + version = "0.2.1.1"; + sha256 = "1cisak5ng6v0iq24djyg4jp87diay02m0k2saac49saxmk29jsr6"; + revision = "6"; + editedCabalFile = "1572x5xh8qja14qfv4whlj7zl7gwp5cyhmzdnbi44fnv4hr27l9d"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson aeson-pretty async base bytestring Diff directory filepath + Glob optparse-applicative process regex-pcre-builtin text + unordered-containers + ]; + testHaskellDepends = [ base process ]; + description = "A lightweight golden test runner"; + license = lib.licenses.asl20; + mainProgram = "goldplate"; + }) {}; + + "goldplate_0_2_2_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring, Diff , directory, filepath, Glob, optparse-applicative, process , regex-pcre-builtin, text, unordered-containers @@ -130204,6 +130038,7 @@ self: { testHaskellDepends = [ aeson base bytestring process ]; description = "A lightweight golden test runner"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; mainProgram = "goldplate"; }) {}; @@ -131967,8 +131802,8 @@ self: { }: mkDerivation { pname = "graphql-spice"; - version = "1.0.4.0"; - sha256 = "182kjz5zky5z1wdg92823hhyprc13yfai0jlg6lx1cih83rwz3h5"; + version = "1.0.3.0"; + sha256 = "1jzrhbpxswi4znalwswjh43pwcysw7nzj6d1xa446xc3w8azs3ic"; libraryHaskellDepends = [ aeson base conduit containers exceptions graphql hspec-expectations megaparsec scientific template-haskell text time transformers @@ -131980,8 +131815,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "GraphQL with batteries"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "graphql-utils" = callPackage @@ -134255,10 +134088,8 @@ self: { }: mkDerivation { pname = "h-raylib"; - version = "5.5.2.0"; - sha256 = "19y2vgy0s4mw47ip3jb78n2gjab2qyp6vyn5fra293srsp25qn5j"; - revision = "4"; - editedCabalFile = "17jcpz9vywj1kjg5llxb2qn0zx3cny4mh8xr478bd6l2m93ywm3b"; + version = "5.5.0.0"; + sha256 = "063sjmk48nrp27qajipcc2br0nfxa6206gybdpxngbs66vz4kgc1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -136655,8 +136486,8 @@ self: { pname = "hakyll"; version = "4.16.2.2"; sha256 = "0hnqf4xxgf1qgk262qvq0b0mx51jfv67y2kn6ca8jsp43dxy9941"; - revision = "3"; - editedCabalFile = "15q1wkjisjgvjn3mq6bj1rfrdsa50r0c37c4g75g905g7zrbmk51"; + revision = "2"; + editedCabalFile = "15457i7cjr2khv3ipis013cm11hinxr5r0s32bgmmbbdqi1g1y2s"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -136682,47 +136513,6 @@ self: { maintainers = [ lib.maintainers.erictapen ]; }) {inherit (pkgs) util-linux;}; - "hakyll_4_16_3_0" = callPackage - ({ mkDerivation, aeson, base, binary, blaze-html, blaze-markup - , bytestring, containers, data-default, deepseq, directory - , file-embed, filepath, fsnotify, hashable, http-conduit - , http-types, lrucache, mtl, network-uri, optparse-applicative - , pandoc, parsec, process, QuickCheck, random, regex-tdfa - , resourcet, scientific, tagsoup, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, template-haskell, text, time - , time-locale-compat, unordered-containers, util-linux, vector, wai - , wai-app-static, warp, yaml - }: - mkDerivation { - pname = "hakyll"; - version = "4.16.3.0"; - sha256 = "1m6kr9ph3ja3y2b6j1i2rk349v8ikqwjjj1z0my6p5ld77abz8qk"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base binary blaze-html blaze-markup bytestring containers - data-default deepseq directory file-embed filepath fsnotify - hashable http-conduit http-types lrucache mtl network-uri - optparse-applicative pandoc parsec process random regex-tdfa - resourcet scientific tagsoup template-haskell text time - time-locale-compat unordered-containers vector wai wai-app-static - warp yaml - ]; - executableHaskellDepends = [ base directory filepath ]; - testHaskellDepends = [ - aeson base bytestring containers filepath pandoc QuickCheck tagsoup - tasty tasty-golden tasty-hunit tasty-quickcheck text - unordered-containers yaml - ]; - testToolDepends = [ util-linux ]; - description = "A static website compiler library"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "hakyll-init"; - maintainers = [ lib.maintainers.erictapen ]; - }) {inherit (pkgs) util-linux;}; - "hakyll-R" = callPackage ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process }: @@ -138876,13 +138666,13 @@ self: { mainProgram = "happy"; }) {}; - "happy_2_1_1" = callPackage + "happy_2_0_2" = callPackage ({ mkDerivation, array, base, containers, happy-lib, mtl, process }: mkDerivation { pname = "happy"; - version = "2.1.1"; - sha256 = "05vnv5dila8scra69vqn7gpxwn667nhsv9jx79pnx30444d8p8px"; + version = "2.0.2"; + sha256 = "0gp8fwn0k4vdz4g3s00jrh0n4g1arvpp6ps4f5xljqd1x1sjxxgp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers happy-lib mtl ]; @@ -138950,8 +138740,8 @@ self: { ({ mkDerivation, array, base, containers, mtl, transformers }: mkDerivation { pname = "happy-lib"; - version = "2.1.1"; - sha256 = "04sq8kzcgp6iv117s8z0469lg5g0qhc1s3grszksv781w71ljpp7"; + version = "2.0.2"; + sha256 = "0ki1yn2m7fadsj1vjfskc2py7s6sgkhhzbs4l3ykbmgxkskvza29"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base containers mtl transformers ]; doHaddock = false; @@ -139289,8 +139079,8 @@ self: { }: mkDerivation { pname = "harpie"; - version = "0.1.1.0"; - sha256 = "18f49jjkf3zf20bmd9rfan768wlkaggikr1r6px354mfkfs8nb36"; + version = "0.1.0.0"; + sha256 = "11jdq7d1zx17qa2i1nvg6iysm56plikwk5bkq32xjbjq28yb0jhs"; libraryHaskellDepends = [ adjunctions base distributive first-class-families prettyprinter QuickCheck quickcheck-instances random vector vector-algorithms @@ -139302,23 +139092,6 @@ self: { broken = true; }) {}; - "harpie-numhask" = callPackage - ({ mkDerivation, adjunctions, base, doctest-parallel - , first-class-families, harpie, numhask, prettyprinter - }: - mkDerivation { - pname = "harpie-numhask"; - version = "0.1.0.1"; - sha256 = "1688gkwabg3ijnqq65j3nwrwdx2r6qb38dpchkm6wckycpy7i8f2"; - libraryHaskellDepends = [ - adjunctions base first-class-families harpie numhask - ]; - testHaskellDepends = [ base doctest-parallel prettyprinter ]; - description = "numhask shim for harpie"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "harpy" = callPackage ({ mkDerivation, array, base, containers, disassembler, mtl, parsec , pretty, template-haskell @@ -139725,8 +139498,8 @@ self: { }: mkDerivation { pname = "hash-cons"; - version = "0.2.0.0"; - sha256 = "0dyg0xx8bxmh97p58bd8znlxjbld54af7q6blrsmaqqfvv4amxhn"; + version = "0.1.0.0"; + sha256 = "04rdgc8lyf2byvjx5p3g06vcwjc6g0bh9qgk08c304p4q6rrijv4"; libraryHaskellDepends = [ base hashable ]; testHaskellDepends = [ async base hashable tasty tasty-hunit tasty-quickcheck @@ -141154,6 +140927,28 @@ self: { }) {}; "haskell-gi" = callPackage + ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal + , cabal-doctest, containers, directory, doctest, filepath, glib + , gobject-introspection, haskell-gi-base, mtl, pretty-show, process + , regex-tdfa, safe, text, transformers, xdg-basedir, xml-conduit + }: + mkDerivation { + pname = "haskell-gi"; + version = "0.26.11"; + sha256 = "0raf97k9w0794i1viv0xqcpwp6ahpqdja11a4d5qk80r811rc5iw"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + ansi-terminal attoparsec base bytestring Cabal containers directory + filepath haskell-gi-base mtl pretty-show process regex-tdfa safe + text transformers xdg-basedir xml-conduit + ]; + libraryPkgconfigDepends = [ glib gobject-introspection ]; + testHaskellDepends = [ base doctest process ]; + description = "Generate Haskell bindings for GObject Introspection capable libraries"; + license = lib.licenses.lgpl21Only; + }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; + + "haskell-gi_0_26_12" = callPackage ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal , cabal-doctest, containers, directory, doctest, filepath, glib , gobject-introspection, haskell-gi-base, mtl, pretty-show, process @@ -141173,6 +140968,7 @@ self: { testHaskellDepends = [ base doctest process ]; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = lib.licenses.lgpl21Only; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; "haskell-gi-base" = callPackage @@ -143716,8 +143512,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "1.5.13"; - sha256 = "1bkwv3f494kqz9a7mmry831mfp3dkhz1zv209lgnl5k8kgf6a22z"; + version = "1.5.12"; + sha256 = "19v7bwy3c3xwvsgxnch8p68fw67h0yy89sppjwhbndk2f5avshgq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144647,8 +144443,8 @@ self: { }: mkDerivation { pname = "haspara"; - version = "0.0.0.10"; - sha256 = "0b80519m7g2iww89wj1vs6hz9sfkv8iv904si9wl83f0adh7r99w"; + version = "0.0.0.8"; + sha256 = "1yvzzkv0hbki5a5rp6md2kllrslafb26lkz4i9hfydllxqgrm0is"; libraryHaskellDepends = [ aeson base containers data-default exceptions hashable megaparsec mtl refined safe-decimal scientific template-haskell text time @@ -145505,8 +145301,8 @@ self: { }: mkDerivation { pname = "hasqlator-mysql"; - version = "0.2.1"; - sha256 = "02hkkv2f0zck15dfmdrfr6vw9ma4xifv4jmz5crkyvmr68jw6n4d"; + version = "0.2.0"; + sha256 = "1dl72axgr6jaz9m243krys9x2svsrc7rnanc4pfvjx9w5648j3mq"; libraryHaskellDepends = [ aeson base binary bytestring containers dlist io-streams megaparsec mtl mysql-haskell optics-core pretty-simple prettyprinter @@ -148347,15 +148143,19 @@ self: { }) {}; "heftia" = callPackage - ({ mkDerivation, base, data-effects, freer-simple, mtl, tasty - , tasty-discover, tasty-hunit, unliftio + ({ mkDerivation, base, constraints, data-effects, extensible, free + , kan-extensions, membership, mtl, singletons-base, singletons-th + , tasty, tasty-discover, tasty-hunit, transformers + , transformers-base, unliftio }: mkDerivation { pname = "heftia"; - version = "0.4.0.0"; - sha256 = "19p1l14cg6iqf5bk7pvllpd8z4qhzbpfvfzkvr3rgl7zsz7f28ih"; + version = "0.3.1.0"; + sha256 = "09kvmpfkb88mgh3vvx78dn719ipifknav2b602l65ah7bwwn962n"; libraryHaskellDepends = [ - base data-effects freer-simple mtl unliftio + base constraints data-effects extensible free kan-extensions + membership mtl singletons-base singletons-th transformers + transformers-base unliftio ]; testHaskellDepends = [ base tasty tasty-hunit ]; testToolDepends = [ tasty-discover ]; @@ -148365,41 +148165,34 @@ self: { }) {}; "heftia-effects" = callPackage - ({ mkDerivation, base, containers, data-effects, eff, effectful - , eveff, extra, freer-simple, fused-effects, ghc-typelits-knownnat - , heftia, hspec, logict, mpeff, mtl, polysemy, tasty, tasty-bench - , tasty-discover, tasty-hspec, text, time, unbounded-delays - , unliftio + ({ mkDerivation, base, containers, data-effects, extensible, extra + , free, ghc-typelits-knownnat, heftia, hspec, mtl, tasty + , tasty-discover, tasty-hspec, text, time, transformers + , unbounded-delays, unliftio }: mkDerivation { pname = "heftia-effects"; - version = "0.4.0.1"; - sha256 = "05zsgfx2kmhgga4zczz2d9k45f1dkk12qvx5cwf2cx9kx44zi0ba"; + version = "0.3.1.0"; + sha256 = "1kdhhzw3kcpkjl5f4li6w3kygppj57bpscgdcxygy34cflgy4pdc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers data-effects ghc-typelits-knownnat heftia time - unbounded-delays unliftio + base containers data-effects extensible extra free + ghc-typelits-knownnat heftia mtl time transformers unbounded-delays + unliftio ]; executableHaskellDepends = [ - base containers data-effects extra ghc-typelits-knownnat heftia - text time unbounded-delays unliftio + base data-effects extra ghc-typelits-knownnat heftia text time ]; testHaskellDepends = [ - base containers data-effects ghc-typelits-knownnat heftia hspec - tasty tasty-hspec time unbounded-delays unliftio + base data-effects ghc-typelits-knownnat heftia hspec tasty + tasty-hspec unliftio ]; testToolDepends = [ tasty-discover ]; - benchmarkHaskellDepends = [ - base containers data-effects eff effectful eveff freer-simple - fused-effects ghc-typelits-knownnat heftia logict mpeff mtl - polysemy tasty-bench time unbounded-delays unliftio - ]; description = "higher-order effects done right"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; - broken = true; - }) {eff = null;}; + }) {}; "hegg" = callPackage ({ mkDerivation, base, containers, deepseq, tasty, tasty-bench @@ -148611,8 +148404,6 @@ self: { pname = "helf"; version = "1.0.20240318"; sha256 = "0rmjfbai6k6kzynzm5skz4ska0awb012m4ykqhh47sd28vs9spk1"; - revision = "1"; - editedCabalFile = "151jk61357vydckahj0rhphph0yn8qm243p3rzvqi27w65969lyy"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -151181,25 +150972,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "hi-file-parser_0_1_7_0" = callPackage - ({ mkDerivation, base, binary, bytestring, hspec, mtl, rio, text - , vector - }: - mkDerivation { - pname = "hi-file-parser"; - version = "0.1.7.0"; - sha256 = "1rss6j85kj33jfp14qlafqlcbld6ibhhki2rjkdsz8ilchq32hqq"; - libraryHaskellDepends = [ - base binary bytestring mtl rio text vector - ]; - testHaskellDepends = [ - base binary bytestring hspec mtl rio text vector - ]; - description = "Parser for GHC's hi files"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "hi3status" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, dbus, dyre , network, prefix-units, process, regex-pcre-builtin, text, time @@ -151354,8 +151126,8 @@ self: { pname = "hie-bios"; version = "0.14.0"; sha256 = "1caszgj3x3l13q6w26snx49yqyzjfgiik4403gl3mfalkrgbvk2g"; - revision = "2"; - editedCabalFile = "0an5jy6hqa7v7r4s2lgzcb5sl7jlx5slncf73s4vyplx7qskjcah"; + revision = "1"; + editedCabalFile = "1g9gagj12jpazrq9zwq8vwv5saf23gqjgcvzcg81q7s4bn115l72"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155800,8 +155572,8 @@ self: { }: mkDerivation { pname = "hmp3-ng"; - version = "2.15.0"; - sha256 = "12h06yzp3jiswfy95bryppc352wfkn666c17bd4g00v7k3qnda6p"; + version = "2.14.3"; + sha256 = "02bcxzpmjm6kqcvx7036055chbyfyhi6pl4xrrxwwmkp85fh0apb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -156151,8 +155923,8 @@ self: { }: mkDerivation { pname = "hnix-store-nar"; - version = "0.1.1.0"; - sha256 = "16g03bvgdmpmzvq1acsayfq4b9xh7cgf41xn9bqjl0w72var67qp"; + version = "0.1.0.0"; + sha256 = "1kr8hmycb29sv646a3f3lpl0zzng9dg3nix7n0yfrfapycqd04cg"; libraryHaskellDepends = [ algebraic-graphs base bytestring case-insensitive cereal containers directory filepath lifted-base monad-control mtl text unix @@ -158420,26 +158192,6 @@ self: { mainProgram = "hp2pretty"; }) {}; - "hp2pretty_0_10_1" = callPackage - ({ mkDerivation, array, attoparsec, base, containers, filepath - , floatshow, mtl, optparse-applicative, semigroups, text - }: - mkDerivation { - pname = "hp2pretty"; - version = "0.10.1"; - sha256 = "1wx3vxrx8qp85wfhpvv5vjxd45hmgy8m807m62b32ydxpw8mm89k"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - array attoparsec base containers filepath floatshow mtl - optparse-applicative semigroups text - ]; - description = "generate pretty graphs from heap profiles"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "hp2pretty"; - }) {}; - "hpack" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, crypton, deepseq, directory, filepath, Glob, hspec @@ -160804,8 +160556,8 @@ self: { pname = "hs-php-session"; version = "0.0.9.3"; sha256 = "1xwdikiqy2dxyzr6wx51wy51vifsvshblx7kkhfqd7izjf87ww8f"; - revision = "2"; - editedCabalFile = "00c8grlybwb22r5rqw82lmplgr3njkpij8ns1rx0caz2g6xr91xb"; + revision = "1"; + editedCabalFile = "1dj1r73v31bd2091pqvrg7vdc3lgjh373ynxn49dlhqmyw45kiw8"; libraryHaskellDepends = [ base bytestring ]; description = "PHP session and values serialization"; license = lib.licenses.bsd3; @@ -161085,21 +160837,6 @@ self: { broken = true; }) {}; - "hs-tango" = callPackage - ({ mkDerivation, base, derive-storable, tango, text, unliftio }: - mkDerivation { - pname = "hs-tango"; - version = "1.0.0"; - sha256 = "0ah4xp3vrarq8kpvgwk78hck8bj9w0fk3d6m5vi28cy8dq62qb5c"; - libraryHaskellDepends = [ base derive-storable text unliftio ]; - libraryPkgconfigDepends = [ tango ]; - benchmarkHaskellDepends = [ base text ]; - description = "Bindings to the Tango Controls system"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {inherit (pkgs) tango;}; - "hs-term-emulator" = callPackage ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring , containers, criterion, hspec, hspec-discover, lens, text, vector @@ -161658,8 +161395,8 @@ self: { pname = "hsc2hs"; version = "0.68.10"; sha256 = "0xpgbi6pssnizazz54583c50cz4axq3h78g03q4sfb7yi3bk8kkg"; - revision = "3"; - editedCabalFile = "0ndpgzmq2h2kv7xr9iaf957jnnykbjpd6vlii0n2rkahfckjaqr7"; + revision = "2"; + editedCabalFile = "099303623kck9pv6x0q2dzvwb3w39v5dazn3wryafcnwc1n8prv0"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -163314,6 +163051,18 @@ self: { }) {}; "hslua-list" = callPackage + ({ mkDerivation, base, bytestring, hslua-core, tasty, tasty-lua }: + mkDerivation { + pname = "hslua-list"; + version = "1.1.3"; + sha256 = "1ipmf3rpc3ndc23zjmyjmy9lx0q53pm6bjwsgidbqxi4rxsbddqw"; + libraryHaskellDepends = [ base bytestring hslua-core ]; + testHaskellDepends = [ base hslua-core tasty tasty-lua ]; + description = "Opinionated, but extensible Lua list type"; + license = lib.licenses.mit; + }) {}; + + "hslua-list_1_1_4" = callPackage ({ mkDerivation, base, bytestring, hslua-core, tasty, tasty-lua }: mkDerivation { pname = "hslua-list"; @@ -163323,6 +163072,7 @@ self: { testHaskellDepends = [ base hslua-core tasty tasty-lua ]; description = "Opinionated, but extensible Lua list type"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "hslua-marshalling" = callPackage @@ -165458,8 +165208,10 @@ self: { }: mkDerivation { pname = "hstar"; - version = "0.1.0.7"; - sha256 = "00y5napbsbxdi3yjl9sj23zncqmxhnvdjppc2pwzj53xynpa4x94"; + version = "0.1.0.6"; + sha256 = "0fcb37yi81059r2nqmq1809q5mdx8q2fyvs7b9fsj3j2fqmgnai6"; + revision = "2"; + editedCabalFile = "0ncj58a8rkwkwlcv50q5i6c9szss0kp0gbx8z38ycx1fhniig5qv"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -167802,24 +167554,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "http-semantics_0_3_0" = callPackage - ({ mkDerivation, array, base, bytestring, case-insensitive - , http-types, network, network-byte-order, time-manager - , utf8-string - }: - mkDerivation { - pname = "http-semantics"; - version = "0.3.0"; - sha256 = "0kviffsmvggzpbwxnqxshjq3w3yz5v367l5fywq9zcmzrc5ykklw"; - libraryHaskellDepends = [ - array base bytestring case-insensitive http-types network - network-byte-order time-manager utf8-string - ]; - description = "HTTP senmatics libarry"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "http-server" = callPackage ({ mkDerivation, base, HTTP, mime, network, network-uri, text, unix , url, utf8-string @@ -167973,6 +167707,41 @@ self: { broken = true; }) {}; + "http2_3_0_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, async, base + , base16-bytestring, bytestring, case-insensitive, containers + , cryptonite, directory, filepath, gauge, Glob, heaps, hspec + , hspec-discover, http-types, mwc-random, network + , network-byte-order, network-run, psqueues, stm, text + , time-manager, typed-process, unix-time, unordered-containers + , vector + }: + mkDerivation { + pname = "http2"; + version = "3.0.3"; + sha256 = "1kv99i3pnnx31xndlkaczrpd2j5mvzbqlfz1kaw6cwlwkdnl5bhv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array async base bytestring case-insensitive containers http-types + network network-byte-order psqueues stm time-manager unix-time + ]; + testHaskellDepends = [ + aeson aeson-pretty async base base16-bytestring bytestring + cryptonite directory filepath Glob hspec http-types network + network-byte-order network-run text typed-process + unordered-containers vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers gauge heaps + mwc-random network-byte-order psqueues stm + ]; + description = "HTTP/2 library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "http2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, base , base16-bytestring, bytestring, case-insensitive, containers @@ -168158,19 +167927,19 @@ self: { "http2-tls" = callPackage ({ mkDerivation, base, bytestring, crypton-x509-store , crypton-x509-validation, data-default-class, http2, network - , network-control, network-run, recv, time-manager, tls + , network-control, network-run, recv, time-manager, tls, unliftio , utf8-string }: mkDerivation { pname = "http2-tls"; - version = "0.4.3"; - sha256 = "0pfjybiqiqafpbm9cr8dx4b2914l0n62xd36aw5jm8d9x8xsqdzy"; + version = "0.4.2"; + sha256 = "0fqdad7lrw7m942xl3k0yipm2qr48j3qd14a9a6m87dv2rypsqg4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring crypton-x509-store crypton-x509-validation data-default-class http2 network network-control network-run recv - time-manager tls utf8-string + time-manager tls unliftio utf8-string ]; description = "Library for HTTP/2 over TLS"; license = lib.licenses.bsd3; @@ -169834,8 +169603,8 @@ self: { }: mkDerivation { pname = "hw-kafka-avro"; - version = "6.0.2"; - sha256 = "13lrmpglh31srd74a1ch68g723x08wns9sapmlckm1bzs6jj7s06"; + version = "6.0.1"; + sha256 = "1910yzn569x9iicd8c8ykkq3p5vz3py6d4j0pvwqy1h07xp528sk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -170025,27 +169794,27 @@ self: { "hw-polysemy" = callPackage ({ mkDerivation, aeson, aeson-pretty, amazonka-s3, async, base , binary, bytestring, contravariant, Diff, directory, exceptions - , filepath, generic-lens, ghc-prim, http-conduit, hw-prelude, lens - , mtl, network, polysemy, polysemy-log, polysemy-plugin - , polysemy-time, prettyprinter, process, resourcet, stm, tasty - , tasty-discover, tasty-hedgehog, temporary, testcontainers, text - , time, transformers, ulid, unliftio, yaml + , filepath, generic-lens, ghc-prim, http-conduit, lens, mtl + , network, polysemy, polysemy-log, polysemy-plugin, polysemy-time + , prettyprinter, process, resourcet, stm, tasty, tasty-discover + , tasty-hedgehog, temporary, testcontainers, text, time + , transformers, ulid, unliftio, yaml }: mkDerivation { pname = "hw-polysemy"; - version = "0.3.0.0"; - sha256 = "16cgg0z13f46hqp0abbv70pk6mw1lhckf2kf0hz994mjbprxrp2a"; + version = "0.2.14.11"; + sha256 = "1a71d98arml7qbq1374b4shkxv366f5w0agg4k6c89605h2zmfwl"; libraryHaskellDepends = [ aeson aeson-pretty async base binary bytestring contravariant Diff directory exceptions filepath generic-lens ghc-prim http-conduit - hw-prelude lens mtl network polysemy polysemy-log polysemy-plugin + lens mtl network polysemy polysemy-log polysemy-plugin polysemy-time prettyprinter process resourcet stm temporary testcontainers text time transformers ulid unliftio yaml ]; testHaskellDepends = [ - amazonka-s3 base filepath generic-lens hw-prelude lens polysemy - polysemy-log polysemy-plugin tasty tasty-discover tasty-hedgehog - testcontainers text + amazonka-s3 base filepath generic-lens lens polysemy polysemy-log + polysemy-plugin tasty tasty-discover tasty-hedgehog testcontainers + text ]; testToolDepends = [ tasty-discover ]; doHaddock = false; @@ -170054,22 +169823,6 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "hw-prelude" = callPackage - ({ mkDerivation, async, base, bytestring, contravariant, directory - , filepath, network, process, resourcet, text, unliftio - }: - mkDerivation { - pname = "hw-prelude"; - version = "0.0.0.1"; - sha256 = "13zi55k9by4ysf0r48a7bhh6sb5qri39rqv5c33d4a9aw4jp5jyj"; - libraryHaskellDepends = [ - async base bytestring contravariant directory filepath network - process resourcet text unliftio - ]; - description = "Opinionated prelude library"; - license = lib.licenses.asl20; - }) {}; - "hw-prim" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, directory , doctest, doctest-discover, exceptions, ghc-prim, hedgehog, hspec @@ -171993,8 +171746,6 @@ self: { pname = "iCalendar"; version = "0.4.1.0"; sha256 = "1nh2gdmm1kd8dlflxwzdqg9xdylqblb7xhnhpl143j1wfcnd1cn4"; - revision = "1"; - editedCabalFile = "037il8bdhxbbpq5p7lpvjyvlrnx24km9lib9kz6q70p8m8mi43xn"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive containers data-default mime mtl network-uri old-locale parsec text time @@ -172717,8 +172468,6 @@ self: { doHaddock = false; description = "Branch on whether a constraint is satisfied"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ifcxt" = callPackage @@ -174238,16 +173987,14 @@ self: { license = "BSD-2-Clause-Patent"; }) {}; - "incipit-base_0_6_1_0" = callPackage + "incipit-base_0_6_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, data-default, stm , text }: mkDerivation { pname = "incipit-base"; - version = "0.6.1.0"; - sha256 = "1vlvwhgn4wfb6gaw1rld1qa1b54dvsymri0mf9x737faah0arhpy"; - revision = "1"; - editedCabalFile = "0gg499hfbi7fs7pffh00md4wdz2bcpm3wg2cqrb3kyr16y6nri1j"; + version = "0.6.0.0"; + sha256 = "15mmnixl4ny32h5aflqcq8kv37zhddhqwixa53mkz6ksrrdkpsxc"; libraryHaskellDepends = [ base bytestring containers data-default stm text ]; @@ -174269,12 +174016,12 @@ self: { license = "BSD-2-Clause-Patent"; }) {}; - "incipit-core_0_6_1_0" = callPackage + "incipit-core_0_6_0_0" = callPackage ({ mkDerivation, base, incipit-base, polysemy }: mkDerivation { pname = "incipit-core"; - version = "0.6.1.0"; - sha256 = "19m4pvrv6fyxj7ilns3ipfjhibmhgcrjz376djadbqb8fzxba2xb"; + version = "0.6.0.0"; + sha256 = "103fxzx6riyx5scfw340gj5dldxia7zw1i0xk5bkfbn1p5fw3sf4"; libraryHaskellDepends = [ base incipit-base polysemy ]; description = "A Prelude for Polysemy"; license = "BSD-2-Clause-Patent"; @@ -175676,8 +175423,8 @@ self: { pname = "inspection-testing"; version = "0.5.0.3"; sha256 = "1kh6lrcdyfnj0c8fqrllb21hfmnlsrllw6jkkg4hya0f9lqf4mgi"; - revision = "3"; - editedCabalFile = "1b66i5h8vbj3d3dn99wy6sffppfz8iywpwwdivxnxvn645crywa8"; + revision = "2"; + editedCabalFile = "01qs82sldkjvyjkdf2r96g4n480d2dwrncrlzl6k49b4py9hfdll"; libraryHaskellDepends = [ base containers ghc mtl template-haskell transformers ]; @@ -177285,18 +177032,6 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "io-embed" = callPackage - ({ mkDerivation, base, bytestring, hspec, template-haskell }: - mkDerivation { - pname = "io-embed"; - version = "0.1.0.1"; - sha256 = "0k50rkvak2647w43k083ib1yr845hmlh9wppgjg0fdyvqzxk45vb"; - libraryHaskellDepends = [ base bytestring hspec template-haskell ]; - testHaskellDepends = [ base bytestring hspec template-haskell ]; - description = "Use Template Haskell to embed the result of an IO computation"; - license = lib.licenses.bsd3; - }) {}; - "io-machine" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -177882,27 +177617,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "iproute_1_7_15" = callPackage - ({ mkDerivation, appar, base, byteorder, bytestring, containers - , hspec, hspec-discover, network, QuickCheck, safe - }: - mkDerivation { - pname = "iproute"; - version = "1.7.15"; - sha256 = "19abgdk9pk6n8qmvfcpqp282dgbn1mxmg5fsla4xryg6w2kk38qq"; - libraryHaskellDepends = [ - appar base byteorder bytestring containers network - ]; - testHaskellDepends = [ - appar base byteorder bytestring containers hspec network QuickCheck - safe - ]; - testToolDepends = [ hspec-discover ]; - description = "IP Routing Table"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "iptables-helpers" = callPackage ({ mkDerivation, base, containers, mtl, parsec, QuickCheck, safe , syb, utf8-string @@ -179577,10 +179291,8 @@ self: { }: mkDerivation { pname = "jacinda"; - version = "3.2.0.0"; - sha256 = "0vm55xalnlj7kkpc0n2hdzs5i5rizbig4bi2r77h1b5d9yz0iwjw"; - revision = "2"; - editedCabalFile = "0qf5zi8k7vlkli1d51mhhc9lbh39xd4gvrhcpar792npdi8jwx1c"; + version = "3.1.1.1"; + sha256 = "0jbssi0xq7y153avnd7c9qwnlnaiqdn7kznipi9c03rhax3yxdl1"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -181270,17 +180982,6 @@ self: { ]; }) {}; - "jsaddle-wasm" = callPackage - ({ mkDerivation, base, jsaddle }: - mkDerivation { - pname = "jsaddle-wasm"; - version = "0.0.0.0"; - sha256 = "03n1541sajbms1pkad6jajxfddx6xm5py4b7j1v77kafxi61dlxw"; - libraryHaskellDepends = [ base jsaddle ]; - description = "Run JSaddle @JSM@ with the GHC WASM backend"; - license = lib.licenses.cc0; - }) {}; - "jsaddle-webkit2gtk" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, gi-gio , gi-glib, gi-gtk, gi-javascriptcore, gi-webkit2, haskell-gi-base @@ -182725,8 +182426,8 @@ self: { }: mkDerivation { pname = "jsonrpc-tinyclient"; - version = "1.0.1.0"; - sha256 = "1rhfhyjzfazwvzw7xf3f5xccnd7p4wx9n9avbbrjwj2bzvlfn9b8"; + version = "1.0.0.0"; + sha256 = "02xhijk3rk4c9yqh1ghs8gvi1r7fwbxba0h21nb23545wflg0bz9"; libraryHaskellDepends = [ aeson base bytestring exceptions http-client http-client-tls mtl random text websockets @@ -185271,20 +184972,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "keycode_0_2_3" = callPackage - ({ mkDerivation, base, containers, ghc-prim, template-haskell }: - mkDerivation { - pname = "keycode"; - version = "0.2.3"; - sha256 = "1zq02yd7ldbyk7zpgq9bj37y52ckzyyrad2yi48amh7dzym1sbj2"; - libraryHaskellDepends = [ - base containers ghc-prim template-haskell - ]; - description = "Maps web browser keycodes to their corresponding keyboard keys"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "keyed" = callPackage ({ mkDerivation, base, containers, vector }: mkDerivation { @@ -188167,8 +187854,8 @@ self: { }: mkDerivation { pname = "language-c"; - version = "0.9.4"; - sha256 = "0cv2hqg4miajspwndn15s37nkra27bffqm4vv2gkk79nr86k9v31"; + version = "0.9.3"; + sha256 = "0lz2djw7zs8wnp23amqqxdyin3jgbjfh2dr2sr1v0kqpqav3yw81"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath mtl pretty process @@ -189631,7 +189318,6 @@ self: { ]; description = "Scalable anonymous records"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "large-anon-testsuite-fourmolu-preprocessor"; }) {}; @@ -189658,32 +189344,30 @@ self: { "large-hashable" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, byteable, bytes - , bytestring, cereal, containers, cpphs, criterion, cryptohash - , cryptonite, deepseq, hashable, HTF, inspection-testing, memory - , QuickCheck, safecopy, scientific, strict, template-haskell, text - , time, transformers, unordered-containers, vector, void + , bytestring, cereal, containers, cryptohash, deepseq, hashable + , HTF, QuickCheck, safecopy, scientific, strict, template-haskell + , text, time, transformers, unordered-containers, utf8-light + , vector, void }: mkDerivation { pname = "large-hashable"; - version = "0.1.1.0"; - sha256 = "0i7xk128c1hp1bw50n4wpbdyd6paqbl6vmnknyymkaaga07g5ba0"; + version = "0.1.0.4"; + sha256 = "13k2k8rqbk40whzn4hpa92ypws2c1gh5fb4zh0diy5m0kxfk9hz9"; + revision = "1"; + editedCabalFile = "1xfl265ryvrjra2nsjvlcmwgilbnxhp8pwxy54wi1ada645nwgbr"; libraryHaskellDepends = [ - aeson base base16-bytestring bytes bytestring containers cryptonite - memory scientific strict template-haskell text time transformers - unordered-containers vector void + aeson base base16-bytestring bytes bytestring containers scientific + strict template-haskell text time transformers unordered-containers + utf8-light vector void ]; - libraryToolDepends = [ cpphs ]; testHaskellDepends = [ - aeson base bytes bytestring containers hashable HTF - inspection-testing QuickCheck scientific strict text time - unordered-containers vector + aeson base bytes bytestring containers hashable HTF QuickCheck + scientific strict text time unordered-containers vector ]; - testToolDepends = [ cpphs ]; benchmarkHaskellDepends = [ - base base16-bytestring byteable bytes bytestring cereal criterion - cryptohash deepseq safecopy text transformers + base base16-bytestring byteable bytes bytestring cereal cryptohash + deepseq safecopy text transformers ]; - benchmarkToolDepends = [ cpphs ]; description = "Efficiently hash (large) Haskell values"; license = lib.licenses.bsd3; badPlatforms = [ "aarch64-linux" ]; @@ -189691,22 +189375,22 @@ self: { }) {}; "large-records" = callPackage - ({ mkDerivation, base, containers, generic-deriving, ghc, ghc-prim + ({ mkDerivation, base, containers, generic-deriving, ghc , large-generics, mtl, newtype, primitive, record-dot-preprocessor , record-hasfield, syb, tasty, tasty-hunit, template-haskell , transformers }: mkDerivation { pname = "large-records"; - version = "0.4.2"; - sha256 = "1z61v8vi3ax2pjw0d4k3vznbiziwflgraralrkxv12s3s3kq0pm5"; + version = "0.4.1"; + sha256 = "0z0k8r4im1rzykwgk8wgyy8zv1wcb06fmikgir09bxhymg0fzpw8"; libraryHaskellDepends = [ base containers ghc large-generics mtl primitive record-dot-preprocessor record-hasfield syb template-haskell transformers ]; testHaskellDepends = [ - base generic-deriving ghc-prim large-generics mtl newtype + base generic-deriving large-generics mtl newtype record-dot-preprocessor record-hasfield tasty tasty-hunit template-haskell transformers ]; @@ -190013,8 +189697,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "4.3.0"; - sha256 = "0prsix4w6x3413pix2971nlwd1pnz6s8w91wq12wcbvyv6lvlb03"; + version = "4.2.0"; + sha256 = "1ip40njah6i25v7wzkd5vpw9gs43dinb1x8ri8mhdn430h30mr05"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring clock containers cryptohash exceptions extra generic-lens hashtables http-client @@ -193345,8 +193029,8 @@ self: { ({ mkDerivation, base, libsodium }: mkDerivation { pname = "libsodium-bindings"; - version = "0.0.2.0"; - sha256 = "12zg8ckvv8qhdmw6pdwfyif23y6iw5hgwcyhb4hlhfk8q7qv2av3"; + version = "0.0.1.1"; + sha256 = "0gfksw47rl13a3mhyzawhxrcp9ia6g85m5v59pp85jci0bgs7bda"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ libsodium ]; description = "FFI bindings to libsodium"; @@ -193810,27 +193494,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "lift-generics_0_3" = callPackage - ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover - , mtl, template-haskell, th-compat, th-lift-instances - }: - mkDerivation { - pname = "lift-generics"; - version = "0.3"; - sha256 = "1walsrpschxg2bqw925z6cr24cznrcq04bb37azvwdcfrbl19r7a"; - libraryHaskellDepends = [ - base ghc-prim template-haskell th-compat - ]; - testHaskellDepends = [ - base containers hspec mtl template-haskell th-compat - th-lift-instances - ]; - testToolDepends = [ hspec-discover ]; - description = "GHC.Generics-based Language.Haskell.TH.Syntax.lift implementation"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "lift-read-show" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -193855,6 +193518,29 @@ self: { }) {}; "lifted-async" = callPackage + ({ mkDerivation, async, base, constraints, deepseq, HUnit + , lifted-base, monad-control, mtl, tasty, tasty-bench + , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base + }: + mkDerivation { + pname = "lifted-async"; + version = "0.10.2.5"; + sha256 = "1lhyjv32plqs0r2gi7ca8b527z5qas7xgjkh680lqwi0l81xd80n"; + revision = "1"; + editedCabalFile = "18z12n6v3n810qp7hxanixwhznphpw69jz9ahwxfknww51dj2jx0"; + libraryHaskellDepends = [ + async base constraints lifted-base monad-control transformers-base + ]; + testHaskellDepends = [ + async base HUnit lifted-base monad-control mtl tasty + tasty-expected-failure tasty-hunit tasty-th + ]; + benchmarkHaskellDepends = [ async base deepseq tasty-bench ]; + description = "Run lifted IO operations asynchronously and wait for their results"; + license = lib.licenses.bsd3; + }) {}; + + "lifted-async_0_10_2_6" = callPackage ({ mkDerivation, async, base, constraints, deepseq, HUnit , lifted-base, monad-control, mtl, tasty, tasty-bench , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base @@ -193873,6 +193559,7 @@ self: { benchmarkHaskellDepends = [ async base deepseq tasty-bench ]; description = "Run lifted IO operations asynchronously and wait for their results"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "lifted-base" = callPackage @@ -196600,28 +196287,6 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "llvm-codegen" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, dlist - , ghc-prim, hspec, hspec-hedgehog, mmorph, mtl, neat-interpolation - , text, text-builder-linear - }: - mkDerivation { - pname = "llvm-codegen"; - version = "0.1.0.0"; - sha256 = "1iqrfkyhqdw7mvpl86jrccl6iqmdp64mmzmhlc4bp59cbxifb0zz"; - setupHaskellDepends = [ base Cabal containers ]; - libraryHaskellDepends = [ - base bytestring containers dlist ghc-prim mmorph mtl text - text-builder-linear - ]; - testHaskellDepends = [ - base bytestring containers dlist ghc-prim hspec hspec-hedgehog - mmorph mtl neat-interpolation text text-builder-linear - ]; - description = "A DSL for LLVM IR code generation based on llvm-hs"; - license = lib.licenses.bsd3; - }) {}; - "llvm-data-interop" = callPackage ({ mkDerivation, array, base, bytestring, c2hs, containers , data-default, deepseq, dwarf, hashable, hashtables @@ -199042,8 +198707,6 @@ self: { pname = "lrucache"; version = "1.2.0.1"; sha256 = "11avhnjnb89rvn2s41jhh5r40zgp7r6kb5c0hcfiibpabqvv46pw"; - revision = "1"; - editedCabalFile = "0v2wc5k2knvv5knbarzspmbzf657r52jyjm9kf6r4ylsmi9cbq0k"; libraryHaskellDepends = [ base containers contravariant ]; description = "a simple, pure LRU cache"; license = lib.licenses.bsd3; @@ -202657,21 +202320,25 @@ self: { }) {}; "markup-parse" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq - , doctest-parallel, flatparse, string-interpolate, tasty - , tasty-golden, these, tree-diff + ({ mkDerivation, base, bytestring, containers, deepseq, flatparse + , html-parse, optparse-applicative, perf, string-interpolate, tasty + , tasty-golden, text, these, tree-diff }: mkDerivation { pname = "markup-parse"; - version = "0.1.1.1"; - sha256 = "0k9ga485l7nvhny0kqjb6s4q407a1mnfpcsy90892qgj42dkkdb4"; + version = "0.1.1"; + sha256 = "1ybmppxd4hpqjr2lnb1x9jk96fkd8snq6l2p0fzpr7q6bq09wx0a"; + revision = "1"; + editedCabalFile = "1p9hba5fcfbv9qm4aqg9hn5bamw6slyr1sxz5pzg3hnj1c8npzl6"; libraryHaskellDepends = [ base bytestring containers deepseq flatparse string-interpolate tasty tasty-golden these tree-diff ]; testHaskellDepends = [ - base bytestring doctest-parallel string-interpolate tasty - tasty-golden tree-diff + base bytestring string-interpolate tasty tasty-golden tree-diff + ]; + benchmarkHaskellDepends = [ + base bytestring flatparse html-parse optparse-applicative perf text ]; description = "A markup parser"; license = lib.licenses.bsd3; @@ -204160,8 +203827,8 @@ self: { }: mkDerivation { pname = "mcmc"; - version = "0.8.3.1"; - sha256 = "1x0r4ph3vc5aamd1pbpbx39l8cih0nmm7pl3ywkl8hmbgzmmkami"; + version = "0.8.2.0"; + sha256 = "0ms2v86wam1gl5ibhs8pl8rqxxbp2zlr3pv7vfbbp6vgjw2i4x7h"; libraryHaskellDepends = [ ad aeson async base bytestring circular containers covariance directory dirichlet hmatrix log-domain math-functions microlens @@ -204177,6 +203844,33 @@ self: { maintainers = [ lib.maintainers.dschrempf ]; }) {}; + "mcmc_0_8_3_0" = callPackage + ({ mkDerivation, ad, aeson, async, base, bytestring, circular + , containers, covariance, criterion, directory, dirichlet + , fixed-vector, hmatrix, hspec, log-domain, math-functions + , microlens, mwc-random, parallel, primitive, random, splitmix + , statistics, time, transformers, vector, zlib + }: + mkDerivation { + pname = "mcmc"; + version = "0.8.3.0"; + sha256 = "1p4j59wzzbrn5xy64pcg42g2qicski3j16prpm082sags0pv3i7r"; + libraryHaskellDepends = [ + ad aeson async base bytestring circular containers covariance + directory dirichlet hmatrix log-domain math-functions microlens + mwc-random parallel primitive random splitmix statistics time + transformers vector zlib + ]; + testHaskellDepends = [ base hspec random statistics ]; + benchmarkHaskellDepends = [ + aeson base criterion fixed-vector math-functions random vector + ]; + description = "Sample from a posterior using Markov chain Monte Carlo"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.dschrempf ]; + }) {}; + "mcmc-samplers" = callPackage ({ mkDerivation, base, containers, hakaru, hmatrix, mwc-random , primitive, statistics @@ -204351,16 +204045,16 @@ self: { "mealy" = callPackage ({ mkDerivation, adjunctions, base, containers, doctest-parallel - , harpie, harpie-numhask, mwc-probability, numhask, primitive - , profunctors, tdigest, text, vector, vector-algorithms + , mwc-probability, numhask, numhask-array, primitive, profunctors + , tdigest, text, vector, vector-algorithms }: mkDerivation { pname = "mealy"; - version = "0.5.0.0"; - sha256 = "0cijjmi3wqi7z3vbhm0ya8va9397rlkr3wkri6kf94qqr1vimgxy"; + version = "0.4.5.0"; + sha256 = "1lyqskr9pddhdm0i8ncykz9gvbjxhfac3y49cvm6vziy3wmxd6ji"; libraryHaskellDepends = [ - adjunctions base containers harpie harpie-numhask mwc-probability - numhask primitive profunctors tdigest text vector vector-algorithms + adjunctions base containers mwc-probability numhask numhask-array + primitive profunctors tdigest text vector vector-algorithms ]; testHaskellDepends = [ base doctest-parallel ]; description = "Mealy machines for processing time-series and ordered data"; @@ -207751,17 +207445,17 @@ self: { ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , case-insensitive, directory, file-embed-lzma, filepath , http-api-data, http-types, insert-ordered-containers, lens - , minion, openapi3, template-haskell, text + , minion, minion-wai-extra, openapi3, template-haskell, text }: mkDerivation { pname = "minion-openapi3"; - version = "0.1.0.1"; - sha256 = "1vc1cmmf1sspdfcbxk1d1807rggiridyhvvsh27j0z34n3p9whih"; + version = "0.1.0.0"; + sha256 = "03rqqx8dy6sk8ryp2a0ykw67rxj531sw12vzpnz8f17vw90x5npp"; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring case-insensitive directory file-embed-lzma filepath http-api-data http-types - insert-ordered-containers lens minion openapi3 template-haskell - text + insert-ordered-containers lens minion minion-wai-extra openapi3 + template-haskell text ]; description = "Minion openapi3 support"; license = lib.licenses.mit; @@ -208351,19 +208045,17 @@ self: { "mit-3qvpPyAi6mH" = callPackage ({ mkDerivation, base, base64, containers, directory, ki - , optparse-applicative, parsec, process, stm, text, text-ansi - , text-builder-linear, unconditional-jump, unix + , optparse-applicative, parsec, process, stm, text, text-ansi, unix }: mkDerivation { pname = "mit-3qvpPyAi6mH"; - version = "12"; - sha256 = "0lvn4fal9my2gngcic6kx5xq3sdsl63xm9b6bnsy23ww10zkxdp3"; + version = "11"; + sha256 = "0p5v2spwd8rz5h5zclbr7wq5m4qvsihvp91p52d2vd3jdd6xaszx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base64 containers directory ki optparse-applicative parsec - process stm text text-ansi text-builder-linear unconditional-jump - unix + process stm text text-ansi unix ]; executableHaskellDepends = [ base ]; description = "A git wrapper with a streamlined UX"; @@ -209000,19 +208692,18 @@ self: { "mmzk-typeid" = callPackage ({ mkDerivation, aeson, array, base, binary, bytestring, containers - , entropy, hashable, hint, hspec, random, text, time, uuid - , uuid-types + , entropy, hashable, hspec, random, text, time, uuid, uuid-types }: mkDerivation { pname = "mmzk-typeid"; - version = "0.7.0.1"; - sha256 = "1c2mybdgnn9nzvk2php5i3xid3cm1ws7zrcsg4ngy2a60057pwbz"; + version = "0.7.0.0"; + sha256 = "139wn08imnasz40v8hlcjm4fmkxwq9lr0xbcl1kqnxqph8yfmmwa"; libraryHaskellDepends = [ aeson array base binary bytestring entropy hashable random text time uuid uuid-types ]; testHaskellDepends = [ - aeson array base binary bytestring containers entropy hashable hint + aeson array base binary bytestring containers entropy hashable hspec random text time uuid uuid-types ]; description = "A TypeID and UUIDv7 implementation for Haskell"; @@ -213538,12 +213229,12 @@ self: { maintainers = [ lib.maintainers.sheepforce ]; }) {inherit (pkgs) mpich;}; - "mpi-hs_0_7_3_1" = callPackage + "mpi-hs_0_7_3_0" = callPackage ({ mkDerivation, base, bytestring, c2hs, monad-loops, ompi }: mkDerivation { pname = "mpi-hs"; - version = "0.7.3.1"; - sha256 = "1f4jdk5wysi54skz2jpzh83v5xi4gqa0q3r89l1adlz4m5i90l70"; + version = "0.7.3.0"; + sha256 = "1q6jb3sm8jspw9zas5iggvzr6w0zmcbr2qqw4q4j96hrfpjgj798"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring monad-loops ]; @@ -221762,8 +221453,6 @@ self: { pname = "nix-derivation"; version = "1.1.3"; sha256 = "11drhg3zjhwbvdw25k0icvbkcpqilx0m9qw60k7snfaz1iadfkdb"; - revision = "1"; - editedCabalFile = "1w84h665dls927g1zwzyfp91jyk97dy0ccii8m07y1prp007ccxa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -222019,8 +221708,8 @@ self: { }: mkDerivation { pname = "nix-tree"; - version = "0.5.0"; - sha256 = "0gjmmnkizqb5pzzr13a1bzs0smch353nvhwplcp04kwcdgm22axd"; + version = "0.4.1"; + sha256 = "1w8fg872fw40r346vkkqffahplmyly792ygcbqq0czapwhl0wbvv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -223622,27 +223311,23 @@ self: { }) {}; "nri-redis" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, conduit - , containers, cryptohash-sha1, haskell-src-meta, hedis, megaparsec - , modern-uri, nri-env-parser, nri-observability, nri-prelude - , pcre-light, resourcet, safe-exceptions, template-haskell, text - , unordered-containers, uuid + ({ mkDerivation, aeson, async, base, bytestring, conduit, hedis + , nri-env-parser, nri-observability, nri-prelude, resourcet + , safe-exceptions, text, unordered-containers, uuid }: mkDerivation { pname = "nri-redis"; - version = "0.2.0.2"; - sha256 = "0hp8sbf7pvnplzg13n42xfp169japknm3z0szzspg2khi5fgwk86"; + version = "0.1.0.4"; + sha256 = "1ws5j8r4ny8dhw2bf2zqvq42ab9h44ly562cjrl6ha5mlk78mvpq"; libraryHaskellDepends = [ - aeson async base bytestring conduit containers cryptohash-sha1 - haskell-src-meta hedis megaparsec modern-uri nri-env-parser - nri-observability nri-prelude pcre-light resourcet safe-exceptions - template-haskell text unordered-containers uuid + aeson async base bytestring conduit hedis nri-env-parser + nri-observability nri-prelude resourcet safe-exceptions text + unordered-containers uuid ]; testHaskellDepends = [ - aeson async base bytestring conduit containers cryptohash-sha1 - haskell-src-meta hedis megaparsec modern-uri nri-env-parser - nri-observability nri-prelude pcre-light resourcet safe-exceptions - template-haskell text unordered-containers uuid + aeson async base bytestring conduit hedis nri-env-parser + nri-observability nri-prelude resourcet safe-exceptions text + unordered-containers uuid ]; description = "An intuitive hedis wrapper library"; license = lib.licenses.bsd3; @@ -224333,14 +224018,13 @@ self: { license = lib.licenses.bsd3; }) {}; - "numhask_0_12_1_0" = callPackage - ({ mkDerivation, base, doctest-parallel, QuickCheck }: + "numhask_0_12_0_3" = callPackage + ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "numhask"; - version = "0.12.1.0"; - sha256 = "1709f96j4jk81cqadb2lngr35j7jv7rixjx1i7qcccqr80dxhbq6"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest-parallel QuickCheck ]; + version = "0.12.0.3"; + sha256 = "0rxh2avhfb2m5ss8b70k7dv3scla9ki7a8d73hnqlcfp7vjwm9qk"; + libraryHaskellDepends = [ base QuickCheck ]; description = "A numeric class hierarchy"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -225968,24 +225652,6 @@ self: { broken = true; }) {}; - "ollama-haskell" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-client, http-types - , silently, tasty, tasty-hunit, text, time - }: - mkDerivation { - pname = "ollama-haskell"; - version = "0.1.0.2"; - sha256 = "12m9ar8fyfxj2bd2q6qgslmyh85fxzqvh09mgvxskdb14yxzil1c"; - libraryHaskellDepends = [ - aeson base bytestring http-client http-types text time - ]; - testHaskellDepends = [ base silently tasty tasty-hunit text ]; - description = "Ollama Haskell library"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - "olwrapper" = callPackage ({ mkDerivation, base, bytestring, fay, fay-jquery, fay-text, lens , mtl, snap, snap-core, snap-loader-dynamic, snap-loader-static @@ -226498,8 +226164,6 @@ self: { pname = "one-time-password"; version = "3.0.0.0"; sha256 = "0yark6agy421mk7zblzy4vpccbd1i53gpiysa0a7s9sh0szy4bql"; - revision = "3"; - editedCabalFile = "0dbck4bw97w1ci6yjgvgzzgbpr9xlnc8kghndigipxxy77sx5nqg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -227890,8 +227554,8 @@ self: { }: mkDerivation { pname = "opentelemetry-plugin"; - version = "1.1.1"; - sha256 = "1sp6bzy0is704x18522b2kmbbsw3nbfz9x69rvidmpz0x52cpwbg"; + version = "1.1.0"; + sha256 = "1lkfgkpbw340nh09dw53y4jv19plb6y19sbyb0fqpnf5g3zchmx0"; libraryHaskellDepends = [ base bytestring containers ghc hs-opentelemetry-api hs-opentelemetry-propagator-w3c hs-opentelemetry-sdk mwc-random stm @@ -228482,8 +228146,8 @@ self: { }: mkDerivation { pname = "opt-env-conf"; - version = "0.6.0.2"; - sha256 = "1mwj5x3s40w7rgl6s87l29q47qv26nzrpilr1qfm0xinvrnq6bj2"; + version = "0.5.1.0"; + sha256 = "024qqi8gfha21ch54dja0rrmcqalmxn6qgxypzvmqzxdmv1fcwjh"; libraryHaskellDepends = [ aeson autodocodec autodocodec-nix autodocodec-schema autodocodec-yaml base containers hashable mtl path path-io @@ -231189,39 +230853,39 @@ self: { ]; }) {}; - "pandoc_3_5" = callPackage + "pandoc_3_4" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions - , commonmark-pandoc, containers, crypton, crypton-connection + , commonmark-pandoc, containers, crypton-connection , crypton-x509-system, data-default, deepseq, Diff, directory, djot , doclayout, doctemplates, emojis, exceptions, file-embed, filepath , Glob, gridtables, haddock-library, http-client, http-client-tls , http-types, ipynb, jira-wiki-markup, JuicyPixels, mime-types, mtl , network, network-uri, pandoc-types, parsec, pretty, pretty-show - , process, random, safe, scientific, skylighting, skylighting-core - , split, syb, tagsoup, tasty, tasty-bench, tasty-golden - , tasty-hunit, tasty-quickcheck, temporary, texmath, text - , text-conversions, time, tls, typst, unicode-collation + , process, random, safe, scientific, SHA, skylighting + , skylighting-core, split, syb, tagsoup, tasty, tasty-bench + , tasty-golden, tasty-hunit, tasty-quickcheck, temporary, texmath + , text, text-conversions, time, tls, typst, unicode-collation , unicode-transforms, unix, vector, xml, xml-conduit, xml-types , yaml, zip-archive, zlib }: mkDerivation { pname = "pandoc"; - version = "3.5"; - sha256 = "0p23nfdx8xb60g2xplpfh3084i04gi3hy88s8864i8mq5i5ajpql"; + version = "3.4"; + sha256 = "0kwq6xpycd5sv5h6mbiv08imnzzsgchvyxx5hzscha4kkk2hr0nw"; configureFlags = [ "-f-trypandoc" ]; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty array attoparsec base base64-bytestring binary blaze-html blaze-markup bytestring case-insensitive citeproc commonmark commonmark-extensions commonmark-pandoc containers - crypton crypton-connection crypton-x509-system data-default deepseq + crypton-connection crypton-x509-system data-default deepseq directory djot doclayout doctemplates emojis exceptions file-embed filepath Glob gridtables haddock-library http-client http-client-tls http-types ipynb jira-wiki-markup JuicyPixels mime-types mtl network network-uri pandoc-types parsec pretty - pretty-show process random safe scientific skylighting + pretty-show process random safe scientific SHA skylighting skylighting-core split syb tagsoup temporary texmath text text-conversions time tls typst unicode-collation unicode-transforms unix vector xml xml-conduit xml-types yaml @@ -231331,14 +230995,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "pandoc-cli_3_5" = callPackage + "pandoc-cli_3_4" = callPackage ({ mkDerivation, base, hslua-cli, pandoc, pandoc-lua-engine , pandoc-server, safe, temporary, text, wai-extra, warp }: mkDerivation { pname = "pandoc-cli"; - version = "3.5"; - sha256 = "0q6zhwgzipfcy36fsdnq5mkqq25kirscvfb347n3drmc2lnw5lmr"; + version = "3.4"; + sha256 = "0qrgjx1q7g80lx98580q3w4pddmh2qqpxkmg005hmdmp6hqvd30s"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -231378,10 +231042,10 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.18.0"; - sha256 = "01kj17rf53kshfw7dd1875xi6s43b84hr7dvbfbhsb1c10pvdwac"; - revision = "1"; - editedCabalFile = "014brzc3r46b93hi4wzlyx9qf9qcf1js5qvpwk5rvzqpvazjglkj"; + version = "0.3.17.1"; + sha256 = "0md7i54rnvgn0yll7mwhi124nak0pfmpga34vnd996r6fgmnq5fb"; + revision = "3"; + editedCabalFile = "14zqqrv5mgd8kdnis2k97ydcbi2rr77cq09z918lwcfcx7dxsl6w"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -231719,25 +231383,25 @@ self: { license = lib.licenses.gpl2Plus; }) {}; - "pandoc-lua-engine_0_3_3" = callPackage + "pandoc-lua-engine_0_3_2" = callPackage ({ mkDerivation, aeson, base, bytestring, citeproc, containers - , crypton, data-default, directory, doclayout, doctemplates - , exceptions, filepath, hslua, hslua-module-doclayout - , hslua-module-path, hslua-module-system, hslua-module-text - , hslua-module-version, hslua-module-zip, hslua-repl, lpeg, mtl - , pandoc, pandoc-lua-marshal, pandoc-types, parsec, tasty + , data-default, directory, doclayout, doctemplates, exceptions + , filepath, hslua, hslua-module-doclayout, hslua-module-path + , hslua-module-system, hslua-module-text, hslua-module-version + , hslua-module-zip, hslua-repl, lpeg, mtl, pandoc + , pandoc-lua-marshal, pandoc-types, parsec, SHA, tasty , tasty-golden, tasty-hunit, tasty-lua, text }: mkDerivation { pname = "pandoc-lua-engine"; - version = "0.3.3"; - sha256 = "0jzddmg2qnbdv83hrfmxhfibp8p1mm9j32vxm89kg6fbx688n5hw"; + version = "0.3.2"; + sha256 = "0lh533m3xvr8c29mazdb09b7w7ivrlscc5dxzmrfnkwkr0friw8c"; libraryHaskellDepends = [ - aeson base bytestring citeproc containers crypton data-default - doclayout doctemplates exceptions hslua hslua-module-doclayout + aeson base bytestring citeproc containers data-default doclayout + doctemplates exceptions hslua hslua-module-doclayout hslua-module-path hslua-module-system hslua-module-text hslua-module-version hslua-module-zip hslua-repl lpeg mtl pandoc - pandoc-lua-marshal pandoc-types parsec text + pandoc-lua-marshal pandoc-types parsec SHA text ]; testHaskellDepends = [ base bytestring data-default directory exceptions filepath hslua @@ -231749,6 +231413,28 @@ self: { }) {}; "pandoc-lua-marshal" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, exceptions + , hslua, hslua-list, hslua-marshalling, pandoc-types, QuickCheck + , safe, tasty, tasty-hunit, tasty-lua, tasty-quickcheck, text + }: + mkDerivation { + pname = "pandoc-lua-marshal"; + version = "0.2.8"; + sha256 = "0z58mn895hhgkl9lww2zxc0zrpqdnf6m8bpvxfdsh8az0sxgsgba"; + libraryHaskellDepends = [ + aeson base bytestring containers exceptions hslua hslua-list + hslua-marshalling pandoc-types safe text + ]; + testHaskellDepends = [ + aeson base bytestring containers exceptions hslua hslua-list + hslua-marshalling pandoc-types QuickCheck safe tasty tasty-hunit + tasty-lua tasty-quickcheck text + ]; + description = "Use pandoc types in Lua"; + license = lib.licenses.mit; + }) {}; + + "pandoc-lua-marshal_0_2_9" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, exceptions , hslua, hslua-list, hslua-marshalling, pandoc-types, QuickCheck , safe, tasty, tasty-hunit, tasty-lua, tasty-quickcheck, text @@ -231768,6 +231454,7 @@ self: { ]; description = "Use pandoc types in Lua"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "pandoc-markdown-ghci-filter" = callPackage @@ -231992,7 +231679,7 @@ self: { license = lib.licenses.gpl2Plus; }) {}; - "pandoc-server_0_1_0_9" = callPackage + "pandoc-server_0_1_0_8" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, data-default, doctemplates, pandoc, pandoc-types , servant-server, skylighting, text, unicode-collation, wai @@ -232000,8 +231687,8 @@ self: { }: mkDerivation { pname = "pandoc-server"; - version = "0.1.0.9"; - sha256 = "1bdfd0lq0vdrr8rvjxin6j011jg4kn210zzpz2lixvc8wfcw66w8"; + version = "0.1.0.8"; + sha256 = "1ffsbi1ik0lx06xj1ffr2zpn4a9wn8lsawyhak77nqaih93336a5"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring containers data-default doctemplates pandoc pandoc-types servant-server skylighting text @@ -232441,8 +232128,8 @@ self: { pname = "pantry"; version = "0.10.0"; sha256 = "1f0ck7j82km4sy1ia2iqv9aqkdr3p2h8sarbksrsx2dq68552xym"; - revision = "2"; - editedCabalFile = "1v2d03rzrj0gmilx2qa1c0y1srzjh96xq02sd7qarc2kjw4rjgyi"; + revision = "1"; + editedCabalFile = "1kz5glyqd86g8jg9n7cvgmamw0kw4fq2wsf7fd5hgjf4fhbs2scd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -234431,32 +234118,7 @@ self: { ]; description = "Hashing and checking of passwords"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.cdepillabout ]; - }) {}; - - "password_3_1_0_0" = callPackage - ({ mkDerivation, base, base-compat, base64, bytestring, Cabal - , cabal-doctest, crypton, doctest, memory, password-types - , QuickCheck, quickcheck-instances, scrypt, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text - }: - mkDerivation { - pname = "password"; - version = "3.1.0.0"; - sha256 = "0rmcmp9bwa4nqma1pphjga2bmd5axw3579v6i1sh5yih1cfqzi2q"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base base64 bytestring crypton memory password-types - template-haskell text - ]; - testHaskellDepends = [ - base base-compat base64 bytestring crypton doctest memory - password-types QuickCheck quickcheck-instances scrypt tasty - tasty-hunit tasty-quickcheck template-haskell text - ]; - description = "Hashing and checking of passwords"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; + platforms = lib.platforms.x86; maintainers = [ lib.maintainers.cdepillabout ]; }) {}; @@ -234481,6 +234143,7 @@ self: { ]; description = "typeclass instances for password package"; license = lib.licenses.bsd3; + platforms = lib.platforms.x86; maintainers = [ lib.maintainers.cdepillabout ]; }) {}; @@ -236430,31 +236093,6 @@ self: { mainProgram = "perf-explore"; }) {}; - "perf_0_13_0_0" = callPackage - ({ mkDerivation, base, clock, containers, deepseq, formatn, mtl - , numhask-space, optparse-applicative, recursion-schemes, text - , vector - }: - mkDerivation { - pname = "perf"; - version = "0.13.0.0"; - sha256 = "0xqwg42cl9f1s9niyc2r9py75w26bp7rlax04ifjjbbq5y9aw2gb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base clock containers deepseq formatn mtl numhask-space - optparse-applicative recursion-schemes text vector - ]; - executableHaskellDepends = [ - base clock containers deepseq formatn mtl optparse-applicative text - ]; - benchmarkHaskellDepends = [ base ]; - description = "Performance methods and monad"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "perf-explore"; - }) {}; - "perf-analysis" = callPackage ({ mkDerivation, base, containers, deepseq, optparse-generic, perf , protolude, readme-lhs, scientific, tdigest, text, text-format @@ -237965,8 +237603,8 @@ self: { pname = "pg-entity"; version = "0.0.4.4"; sha256 = "0xbsys4h6p84m3vh076v5cjrmf2v9yl8d44zaknfxbjc8ssfbmh2"; - revision = "5"; - editedCabalFile = "1dawp5f6pha1z96bkx34whpqik20azx6aizcv8xrmj0ai6vvkhik"; + revision = "2"; + editedCabalFile = "19firm055d3j9gw8cf6qb6n2jy5jgs287mcgmskbcj78fs1a9g62"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -242604,8 +242242,6 @@ self: { pname = "pointfree"; version = "1.1.1.12"; sha256 = "0mrrdmslcdk2ld8g78i00jwidn765w3l7la0qdlawc2lc17w2ili"; - revision = "1"; - editedCabalFile = "1nl2rbkg4dl5ljg77fazg88xs496hx1q7vj3b9wiqvf96g9j2lyf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -246756,90 +246392,6 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ppad-hmac-drbg" = callPackage - ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring - , criterion, ppad-sha256, ppad-sha512, primitive, tasty - , tasty-hunit - }: - mkDerivation { - pname = "ppad-hmac-drbg"; - version = "0.1.1"; - sha256 = "0wqkl3bk2yzyz4ldzx8njf9qawwfcr9ya3alpmdqid68bldagxl7"; - libraryHaskellDepends = [ base bytestring primitive ]; - testHaskellDepends = [ - attoparsec base base16-bytestring bytestring ppad-sha256 - ppad-sha512 tasty tasty-hunit - ]; - benchmarkHaskellDepends = [ - base bytestring criterion ppad-sha256 - ]; - description = "HMAC-based deterministic random bit generator"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - }) {}; - - "ppad-secp256k1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, criterion, deepseq, ppad-hmac-drbg, ppad-sha256 - , tasty, tasty-hunit, text - }: - mkDerivation { - pname = "ppad-secp256k1"; - version = "0.1.0"; - sha256 = "16a25c4l7bkv8sjjj0nf7i0ml6kvgvr9bajsgqx8aapbnamk6894"; - libraryHaskellDepends = [ - base bytestring ppad-hmac-drbg ppad-sha256 - ]; - testHaskellDepends = [ - aeson attoparsec base base16-bytestring bytestring tasty - tasty-hunit text - ]; - benchmarkHaskellDepends = [ - base base16-bytestring bytestring criterion deepseq - ]; - description = "Schnorr signatures & ECDSA on the elliptic curve secp256k1"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - }) {}; - - "ppad-sha256" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , criterion, SHA, tasty, tasty-hunit, text - }: - mkDerivation { - pname = "ppad-sha256"; - version = "0.2.1"; - sha256 = "0l33nmpp26d9mha8cr2r4p8b1xp2211rdm1gd9rk6lfg1vzw7a1f"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ - aeson base base16-bytestring bytestring tasty tasty-hunit text - ]; - benchmarkHaskellDepends = [ base bytestring criterion SHA ]; - description = "The SHA-256 and HMAC-SHA256 algorithms"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "ppad-sha512" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , criterion, SHA, tasty, tasty-hunit, text - }: - mkDerivation { - pname = "ppad-sha512"; - version = "0.1.1"; - sha256 = "0hm4z1samk203p7m2qwfg58mcadmybc987plg31rwf29s0z63yvy"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ - aeson base base16-bytestring bytestring tasty tasty-hunit text - ]; - benchmarkHaskellDepends = [ base bytestring criterion SHA ]; - description = "The SHA-512 and HMAC-SHA512 algorithms"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - "ppm" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -247137,17 +246689,12 @@ self: { }) {}; "predicate-transformers" = callPackage - ({ mkDerivation, adjunctions, base, deepseq, pretty-simple - , prettyprinter, recover-rtti, text - }: + ({ mkDerivation, adjunctions, base, deepseq, lens, mtl }: mkDerivation { pname = "predicate-transformers"; - version = "0.17.0.0"; - sha256 = "0ifqa30w96jm5l9834qcga6ml2vyyk9ywd0ij7is0jf4gp1rdw5c"; - libraryHaskellDepends = [ - adjunctions base deepseq pretty-simple prettyprinter recover-rtti - text - ]; + version = "0.15.0.0"; + sha256 = "0kjmdbm0a7c2vik0hansvkri7c9zp5cfazgk00r65syflsgfk91s"; + libraryHaskellDepends = [ adjunctions base deepseq lens mtl ]; description = "A library for writing predicates and transformations over predicates in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -247982,18 +247529,17 @@ self: { "prettychart" = callPackage ({ mkDerivation, async, base, box, bytestring, chart-svg - , containers, doctest-parallel, markup-parse, numhask-space - , optics-core, text, time, web-rep + , containers, markup-parse, numhask-space, optics-core, text, time + , web-rep }: mkDerivation { pname = "prettychart"; - version = "0.2.2.0"; - sha256 = "1mj20bhpjn7gf7kb123zmn27bfpk1zncqqg606xmdcyx225m43al"; + version = "0.2.0.0"; + sha256 = "1mpbn9i9h3g374nn6v7h664rypcxwbq3l94bxxmwy6jzpp8hzz0q"; libraryHaskellDepends = [ async base box bytestring chart-svg containers markup-parse numhask-space optics-core text time web-rep ]; - testHaskellDepends = [ base doctest-parallel ]; description = "Pretty print charts from ghci"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -248449,8 +247995,8 @@ self: { pname = "primitive"; version = "0.9.0.0"; sha256 = "1iwr176mx2xc96vgvzlby8z8s9d4vhbj266n89hp6kf9j794nvb9"; - revision = "2"; - editedCabalFile = "0nc7cd9921bzf31k48pnmx3k2bfaxakgv3jchn4215qzzx7by86y"; + revision = "1"; + editedCabalFile = "0g6rsz6hbpyfwbai04gmxil7wfcs1nd0xxcycvqwfn9mkr0ca21f"; libraryHaskellDepends = [ base deepseq template-haskell transformers ]; @@ -248553,8 +248099,8 @@ self: { }: mkDerivation { pname = "primitive-extras"; - version = "0.10.2.1"; - sha256 = "0h3q5zr0k3rns1mq4y56d2ji477h1kjqsv6hp3bbs0yfzkjjk5z2"; + version = "0.10.2"; + sha256 = "0z7xgd42dg5dq2ikjdbxjq39acv98s0p0sk3fincapw9vnxicnqy"; libraryHaskellDepends = [ base bytestring cereal deferred-folds focus foldl list-t primitive primitive-unlifted profunctors vector @@ -248761,26 +248307,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "primitive-unlifted_2_2_0_0" = callPackage - ({ mkDerivation, array, base, bytestring, primitive, QuickCheck - , quickcheck-classes-base, stm, tasty, tasty-quickcheck, text-short - }: - mkDerivation { - pname = "primitive-unlifted"; - version = "2.2.0.0"; - sha256 = "06r10v5dp1a4zpvv8ffmjab8bjsn5gmkx7irr02xwahwb8q4dv69"; - libraryHaskellDepends = [ - array base bytestring primitive text-short - ]; - testHaskellDepends = [ - base primitive QuickCheck quickcheck-classes-base stm tasty - tasty-quickcheck - ]; - description = "Primitive GHC types with unlifted types inside"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "primula-board" = callPackage ({ mkDerivation, base, ConfigFile, containers, directory, happstack , happstack-helpers, happstack-server, happstack-state, hsp @@ -249218,12 +248744,12 @@ self: { license = lib.licenses.mit; }) {}; - "process_1_6_25_0" = callPackage + "process_1_6_24_0" = callPackage ({ mkDerivation, base, deepseq, directory, filepath, unix }: mkDerivation { pname = "process"; - version = "1.6.25.0"; - sha256 = "0rbfwyz2418nw15fb5a8l1f8vsyzcz4wjakpx49b259rdibf0vs9"; + version = "1.6.24.0"; + sha256 = "1fl1y0zc4dsifw1f5nkmy18l46i8wlkcq9h8jp2cm4gzww8x92qy"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; description = "Process libraries"; license = lib.licenses.bsd3; @@ -250505,8 +250031,8 @@ self: { }: mkDerivation { pname = "prop-unit"; - version = "0.1.3"; - sha256 = "0wiqdmlbxq4792lw3gm99fngbb5jyhwimqf4fb757aqm1jmi9h7b"; + version = "0.1.2"; + sha256 = "0gs93yhfm2mc5x6j2khcmrxf1la84hy0gyixmcxwdvy675lx06p4"; libraryHaskellDepends = [ base hedgehog tasty tasty-hedgehog ]; testHaskellDepends = [ base hedgehog tasty tasty-hedgehog tasty-hunit @@ -250645,8 +250171,8 @@ self: { pname = "proquint"; version = "0.1.0.0"; sha256 = "04hhvrrclyav0nhk6zqp9s58vxad8ndi6yw851qprd6h7wr57wg5"; - revision = "2"; - editedCabalFile = "1bhc2cz76fi3rrn36nrgzi531f3p18k3n7q5mp1xyjz3vv0b2h2d"; + revision = "1"; + editedCabalFile = "1p3s3jpck7w9h5qxqp9w59mmf6yr9bgx339l1m01f6yjq720a6l6"; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Proquints: Identifiers that are Readable, Spellable, and Pronounceable"; @@ -252233,26 +251759,6 @@ self: { broken = true; }) {}; - "pure-noise" = callPackage - ({ mkDerivation, base, deepseq, mwc-random, tasty, tasty-bench - , tasty-discover, tasty-hunit, tasty-quickcheck, vector - }: - mkDerivation { - pname = "pure-noise"; - version = "0.1.0.1"; - sha256 = "116w6scl7kranx567jhnrir9sh0ysjzs45gfhk970q0pzbkgnj1l"; - libraryHaskellDepends = [ base vector ]; - testHaskellDepends = [ - base tasty tasty-discover tasty-hunit tasty-quickcheck vector - ]; - testToolDepends = [ tasty-discover ]; - benchmarkHaskellDepends = [ - base deepseq mwc-random tasty tasty-bench vector - ]; - description = "Performant, modern noise generation for Haskell with minimal dependencies. Based on FastNoiseLite."; - license = lib.licenses.bsd3; - }) {}; - "pure-priority-queue" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -253665,8 +253171,8 @@ self: { }: mkDerivation { pname = "qrcode-core"; - version = "0.9.10"; - sha256 = "117xsv0p2l6nwbl0a7qwip1cnix4x6gljl12w11pzrqmvrhgilx2"; + version = "0.9.9"; + sha256 = "1bahj10gflc8i9wml8gkis50xwsj7vxf9zyj9b1zvlmld2qnlndw"; libraryHaskellDepends = [ base binary bytestring case-insensitive containers dlist primitive text vector @@ -253675,7 +253181,40 @@ self: { license = lib.licenses.mit; }) {}; + "qrcode-core_0_9_10" = callPackage + ({ mkDerivation, base, binary, bytestring, case-insensitive + , containers, dlist, primitive, text, vector + }: + mkDerivation { + pname = "qrcode-core"; + version = "0.9.10"; + sha256 = "117xsv0p2l6nwbl0a7qwip1cnix4x6gljl12w11pzrqmvrhgilx2"; + libraryHaskellDepends = [ + base binary bytestring case-insensitive containers dlist primitive + text vector + ]; + description = "QR code library in pure Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "qrcode-juicypixels" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, JuicyPixels + , qrcode-core, text, vector + }: + mkDerivation { + pname = "qrcode-juicypixels"; + version = "0.8.5"; + sha256 = "0qgcdi77iyx04w2rx48nzk8lm9x368h9m4a468zcibn50cp4ynbg"; + libraryHaskellDepends = [ + base base64-bytestring bytestring JuicyPixels qrcode-core text + vector + ]; + description = "Converts a qrcode-core image to JuicyPixels"; + license = lib.licenses.mit; + }) {}; + + "qrcode-juicypixels_0_8_6" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, JuicyPixels , qrcode-core, text, vector }: @@ -253689,6 +253228,7 @@ self: { ]; description = "Converts a qrcode-core image to JuicyPixels"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "qsem" = callPackage @@ -254755,8 +254295,8 @@ self: { }: mkDerivation { pname = "quickcheck-quid"; - version = "0.0.1.6"; - sha256 = "1vm8654n4s0ylqssihwkv5w7gg9ml6ks8cbvbdfvcff7xmc38yrv"; + version = "0.0.1.5"; + sha256 = "0w54yxwmrf228q0bi3cymlfm2gbv098i0yfpm8xqp6wl5afm5291"; libraryHaskellDepends = [ base containers deepseq extra hashable QuickCheck text ]; @@ -257538,26 +257078,6 @@ self: { license = lib.licenses.asl20; }) {}; - "rawlock" = callPackage - ({ mkDerivation, base, io-classes, io-sim, mtl, nothunks - , QuickCheck, strict-mvar, strict-stm, tasty, tasty-quickcheck - }: - mkDerivation { - pname = "rawlock"; - version = "0.1.0.0"; - sha256 = "07nh83k9xc1iszd2glh0nm8phblm67nazybxq7pgq7c89fgv3v0w"; - libraryHaskellDepends = [ - base io-classes nothunks strict-mvar strict-stm - ]; - testHaskellDepends = [ - base io-classes io-sim mtl QuickCheck strict-stm tasty - tasty-quickcheck - ]; - description = "A writer-biased RAW lock"; - license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - }) {}; - "rawr" = callPackage ({ mkDerivation, base, criterion, deepseq, doctest, ghc-datasize , ghc-prim, lens, tasty, tasty-hunit, template-haskell @@ -257855,29 +257375,29 @@ self: { ({ mkDerivation, aeson, aeson-pretty, amazonka, amazonka-core , amazonka-rds, amazonka-rds-data, amazonka-secretsmanager, base , base64-bytestring, bytestring, contravariant, generic-lens - , hedgehog, hedgehog-extras, http-client, hw-polysemy, hw-prelude - , microlens, mtl, optparse-applicative, polysemy-log - , polysemy-plugin, polysemy-time, resourcet, stm, tasty - , tasty-discover, tasty-hedgehog, testcontainers, text, time - , transformers, ulid, uuid + , hedgehog, hedgehog-extras, http-client, hw-polysemy, microlens + , mtl, optparse-applicative, polysemy-log, polysemy-plugin + , polysemy-time, resourcet, stm, tasty, tasty-discover + , tasty-hedgehog, testcontainers, text, time, transformers, ulid + , uuid }: mkDerivation { pname = "rds-data"; - version = "0.1.0.0"; - sha256 = "1ilphv9pff2ixd4rphir6j3lc41m0jngk0f4byb4v991xjr6ldz8"; + version = "0.0.0.10"; + sha256 = "15kxk1k59b97nbs1kj2j8gy473bdzmzv7684kr3vwhd0mjwg69z2"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-rds amazonka-rds-data amazonka-secretsmanager base base64-bytestring bytestring - contravariant generic-lens hw-polysemy hw-prelude microlens mtl - polysemy-log polysemy-plugin text time transformers ulid uuid + contravariant generic-lens hw-polysemy microlens mtl polysemy-log + polysemy-plugin text time transformers ulid uuid ]; executableHaskellDepends = [ aeson amazonka amazonka-rds-data base bytestring generic-lens - hedgehog http-client hw-polysemy hw-prelude microlens - optparse-applicative polysemy-log polysemy-plugin polysemy-time - resourcet stm testcontainers text time ulid uuid + hedgehog http-client hw-polysemy microlens optparse-applicative + polysemy-log polysemy-plugin polysemy-time resourcet stm + testcontainers text time ulid uuid ]; testHaskellDepends = [ aeson aeson-pretty amazonka amazonka-core amazonka-rds @@ -258160,8 +257680,8 @@ self: { }: mkDerivation { pname = "reactive-banana-automation"; - version = "0.5.7"; - sha256 = "1wj790yahgham9llbw3c642lmi9nliy4bx48d3pws3i6hpvvi7k7"; + version = "0.5.6"; + sha256 = "161blkyhkff3z0blbrmrwmclhac481njn9ikb3x4ax0yfa1lpsvq"; libraryHaskellDepends = [ base reactive-banana stm time transformers ]; @@ -258698,8 +258218,8 @@ self: { ({ mkDerivation, base, extra, mtl, primes, QuickCheck, random }: mkDerivation { pname = "real-dice"; - version = "0.1.0.4"; - sha256 = "1ibyp3zhfassg1yhfjnn636mbcbd6b7n42y2pzcnsmhjs8n78j2a"; + version = "0.1.0.3"; + sha256 = "1yrcvacxw0gl87lfw566k1hdf71nm2nrnw9ijqfc25y7fsb1qk2w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl primes ]; @@ -258951,26 +258471,18 @@ self: { }) {}; "recommender-als" = callPackage - ({ mkDerivation, base, bytestring, cassava, containers - , data-default-class, hmatrix, optparse-applicative, parallel - , random, text, vector + ({ mkDerivation, base, containers, data-default-class, hmatrix + , parallel, random, vector }: mkDerivation { pname = "recommender-als"; - version = "0.2.2.0"; - sha256 = "19as4cd5p2y174zxn5rksa5hza5l667wkk9r40ny3lwmrgkng905"; - isLibrary = true; - isExecutable = true; + version = "0.2.1.1"; + sha256 = "0qc91hn42mc2pmljb836chdas1jzsrqbg44cjylx31y0y72dmhdq"; libraryHaskellDepends = [ base containers data-default-class hmatrix parallel random vector ]; - executableHaskellDepends = [ - base bytestring cassava containers data-default-class - optparse-applicative text vector - ]; description = "Recommendations using alternating least squares algorithm"; license = lib.licenses.bsd3; - mainProgram = "movielens"; }) {}; "record" = callPackage @@ -262602,8 +262114,10 @@ self: { }: mkDerivation { pname = "relude"; - version = "1.2.2.0"; - sha256 = "0ikp23nbzrxfalpsk6n8yg3byh43f8hp156wpxx45yc297gmgpil"; + version = "1.2.1.0"; + sha256 = "09fp8n2z6nz2yqkn8pgq56s6d971b4mgcaldkhc0ih3bz9dp8kvq"; + revision = "3"; + editedCabalFile = "1y4qgr64d02cqn46l8cqqwmzkkbd3v2w040b41z5inagbwbr50r8"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable mtl stm text transformers unordered-containers @@ -263768,20 +263282,15 @@ self: { "rerefined" = callPackage ({ mkDerivation, base, mono-traversable, QuickCheck , template-haskell, text, text-builder-linear, type-level-show - , type-spec }: mkDerivation { pname = "rerefined"; - version = "0.8.0"; - sha256 = "1w6p7sfl5mcq37cqlyfk3zzfb3sbw12idhdnk97jbrn0psms12rk"; + version = "0.6.0"; + sha256 = "0msawph4qcl3ch2821bq1kfjmzkxl6vkhglcp6glimkcsmkbabyv"; libraryHaskellDepends = [ base mono-traversable QuickCheck template-haskell text text-builder-linear type-level-show ]; - testHaskellDepends = [ - base mono-traversable QuickCheck template-haskell text - text-builder-linear type-level-show type-spec - ]; description = "Refinement types, again"; license = lib.licenses.mit; maintainers = [ lib.maintainers.raehik ]; @@ -264080,28 +263589,6 @@ self: { broken = true; }) {}; - "resource-registry" = callPackage - ({ mkDerivation, base, bimap, containers, generics-sop, io-classes - , mtl, nothunks, QuickCheck, quickcheck-state-machine, si-timers - , strict-mvar, strict-stm, tasty, tasty-quickcheck, tree-diff - }: - mkDerivation { - pname = "resource-registry"; - version = "0.1.0.0"; - sha256 = "0mkx8hf6k0117c15kq3cyqgxbfwjjk0yywp5xf6svdi5g2xpkg5p"; - libraryHaskellDepends = [ - base bimap containers io-classes mtl nothunks strict-stm - ]; - testHaskellDepends = [ - base containers generics-sop io-classes mtl QuickCheck - quickcheck-state-machine si-timers strict-mvar strict-stm tasty - tasty-quickcheck tree-diff - ]; - description = "Track allocated resources"; - license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - }) {}; - "resource-simple" = callPackage ({ mkDerivation, base, containers, monad-control, monad-fork , mtl-evil-instances, transformers, transformers-base @@ -265846,8 +265333,8 @@ self: { }: mkDerivation { pname = "ring-buffer"; - version = "0.4.1"; - sha256 = "0j5ysm2aliq06cic2y21587lcighagih9vc48dr7z4mvrfym4yz7"; + version = "0.4"; + sha256 = "14h1rzxzk9qzr6bimxng8nhxydngx92x75p1mrjfwbwi17bbwgby"; libraryHaskellDepends = [ base exceptions mtl primitive vector ]; testHaskellDepends = [ base HUnit QuickCheck vector ]; description = "A concurrent, mutable ring-buffer"; @@ -270645,7 +270132,7 @@ self: { license = lib.licenses.mit; }) {}; - "sbp_6_2_1" = callPackage + "sbp_6_1_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 @@ -270654,8 +270141,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "6.2.1"; - sha256 = "0cq2a62ipkbqmrryync5jqmlgyx5pgkrknk3lpcwmv1l1f9l9dgr"; + version = "6.1.0"; + sha256 = "1ihnsxil3f1fccm6zf3daiw12qblmxmrpfs6spqnh2jfyxgmrmkx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -273511,8 +272998,8 @@ self: { }: mkDerivation { pname = "sel"; - version = "0.0.2.0"; - sha256 = "0gidvbkcjgyq47gh2p19iawv8jcs7ajvih4mk6pwwbkjs8iybpx4"; + version = "0.0.1.0"; + sha256 = "0md8xdd7jci3jdq1l5acjfxgaz2ahiwz6c7cwam06x5kp0h1nik1"; libraryHaskellDepends = [ base base16 bytestring libsodium-bindings text text-display ]; @@ -274681,8 +274168,6 @@ self: { pname = "sequitur"; version = "0.2.0.0"; sha256 = "1k38xkhyika7aamzrkalc7kbz0v832amj4gxxs9l6si9v19ja185"; - revision = "1"; - editedCabalFile = "1l5jz58wxr5a20pjg842x931w195ab50n4w0jrbppchc836080fi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -277502,6 +276987,34 @@ self: { }) {}; "servant-static-th" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, containers + , directory, doctest, filepath, Glob, hspec-wai, http-media + , semigroups, servant, servant-blaze, servant-server, tasty + , tasty-hspec, tasty-hunit, template-haskell, text, wai + }: + mkDerivation { + pname = "servant-static-th"; + version = "1.0.0.0"; + sha256 = "1iky6bk92vzhsw31hfdhgclr4nq1kmic6w9mwd5fzjhbs5vcmm15"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-html bytestring containers directory filepath http-media + semigroups servant servant-blaze servant-server template-haskell + text + ]; + testHaskellDepends = [ + base blaze-html bytestring directory doctest filepath Glob + hspec-wai servant servant-blaze servant-server tasty tasty-hspec + tasty-hunit wai + ]; + description = "Embed a directory of static files in your Servant server"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "servant-static-th_1_0_0_1" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers , directory, filepath, hspec, hspec-wai, http-media, semigroups , servant, servant-blaze, servant-server, tasty, tasty-hspec @@ -280258,8 +279771,8 @@ self: { }: mkDerivation { pname = "shellify"; - version = "0.11.0.3"; - sha256 = "1hkf1p2qjb5jc7qkizwsrcb16fhnf2jvqg1y17ly0pgr22lkvxf1"; + version = "0.11.0.1"; + sha256 = "1ighr9py1c2njiwdzb4fy0rlz7k8zb51la5mr8ciwh7r8zkmi0gv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -280332,8 +279845,10 @@ self: { }: mkDerivation { pname = "shellmet"; - version = "0.0.5.0"; - sha256 = "1yqz8nlhjbi5ngl548j4gy07m6dbvxfykj5y2gm4vviwvx0kgmz4"; + version = "0.0.4.1"; + sha256 = "0jd05bazny7y25jnminal5wv30kxg6pzchswxpw5yac027qjagd0"; + revision = "1"; + editedCabalFile = "1ivpa3nrbp8qjam99m6dblhakc8gml1hhhigsmb708ndsyqfqa2i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base process text ]; @@ -282385,23 +281900,22 @@ self: { }) {}; "simple-sql-parser" = callPackage - ({ mkDerivation, base, containers, filepath, hspec - , hspec-expectations, hspec-golden, hspec-megaparsec, megaparsec - , mtl, parser-combinators, pretty-show, prettyprinter - , raw-strings-qq, text + ({ mkDerivation, base, containers, megaparsec, mtl + , parser-combinators, prettyprinter, tasty, tasty-hunit, text }: mkDerivation { pname = "simple-sql-parser"; - version = "0.8.0"; - sha256 = "01mymjr3gbdpkd660vz2v024b8jvzbzwqznmdxf3j2xpbmy36svw"; + version = "0.7.1"; + sha256 = "0jzmc5ian4y2jpng8c5xqf8igx5h186nw131vh6vq76nyzxxbx87"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers megaparsec mtl parser-combinators prettyprinter text ]; testHaskellDepends = [ - base containers filepath hspec hspec-expectations hspec-golden - hspec-megaparsec megaparsec mtl parser-combinators pretty-show - prettyprinter raw-strings-qq text + base containers megaparsec mtl parser-combinators prettyprinter + tasty tasty-hunit text ]; description = "A parser for SQL"; license = lib.licenses.bsd3; @@ -289164,14 +288678,13 @@ self: { }) {}; "specup" = callPackage - ({ mkDerivation, base, bytestring, directory, extra, hspec - , hspec-core, megaparsec, optparse-applicative, process, stache - , text, yaml + ({ mkDerivation, base, bytestring, extra, hspec, hspec-core + , megaparsec, optparse-applicative, stache, text, yaml }: mkDerivation { pname = "specup"; - version = "0.2.0.2"; - sha256 = "19419bzrgaky1ja5isx15fl1xbi9yrxh8i7nd06mh7bmymsprxja"; + version = "0.2.0.1"; + sha256 = "054v8qffs9wwl6vnfxmjv0753bchvsjibbvcs8fnnmy8si5hk80h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -289180,9 +288693,7 @@ self: { executableHaskellDepends = [ base bytestring optparse-applicative text ]; - testHaskellDepends = [ - base bytestring directory extra hspec hspec-core process text - ]; + testHaskellDepends = [ base bytestring hspec hspec-core text ]; description = "Manage the application of templates to custom yaml"; license = lib.licenses.gpl2Only; mainProgram = "specup"; @@ -291216,15 +290727,15 @@ self: { mainProgram = "stack-all"; }) {}; - "stack-all_0_6_4" = callPackage + "stack-all_0_6_3" = callPackage ({ mkDerivation, aeson, base, cached-json-file, config-ini , directory, extra, filepath, http-query, process, simple-cmd , simple-cmd-args, text, yaml }: mkDerivation { pname = "stack-all"; - version = "0.6.4"; - sha256 = "1yvzglvaalk537fza2nhzjacm7aanrnwsz0grg00ln0a06hb8wcb"; + version = "0.6.3"; + sha256 = "14cqjaz8rc59sfy1px7a7bbv82dnrnaawf64q731ipl51smi0662"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -292530,26 +292041,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "static-bytes_0_1_1" = callPackage - ({ mkDerivation, base, bytestring, hspec, hspec-discover, memory - , primitive, QuickCheck, rio, text, vector - }: - mkDerivation { - pname = "static-bytes"; - version = "0.1.1"; - sha256 = "14a0ww31y54hsvv2qf1wchpvzbsnxjjwgm13h9ysc3fclkwa0ba9"; - libraryHaskellDepends = [ - base bytestring memory primitive rio vector - ]; - testHaskellDepends = [ - base bytestring hspec memory primitive QuickCheck rio text vector - ]; - testToolDepends = [ hspec-discover ]; - description = "A Haskell library providing types representing 8, 16, 32, 64 or 128 bytes of data"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "static-canvas" = callPackage ({ mkDerivation, base, double-conversion, free, mtl, text }: mkDerivation { @@ -294475,6 +293966,27 @@ self: { }) {}; "streaming-bytestring" = callPackage + ({ mkDerivation, base, bytestring, deepseq, exceptions, ghc-prim + , mmorph, mtl, resourcet, smallcheck, streaming, tasty, tasty-hunit + , tasty-smallcheck, transformers, transformers-base + }: + mkDerivation { + pname = "streaming-bytestring"; + version = "0.3.2"; + sha256 = "0rxsxm0an21d2wrngg61vdz7lqcigi7fs96n8003yfcnah63qnw8"; + libraryHaskellDepends = [ + base bytestring deepseq exceptions ghc-prim mmorph mtl resourcet + streaming transformers transformers-base + ]; + testHaskellDepends = [ + base bytestring resourcet smallcheck streaming tasty tasty-hunit + tasty-smallcheck transformers + ]; + description = "Fast, effectful byte streams"; + license = lib.licenses.bsd3; + }) {}; + + "streaming-bytestring_0_3_3" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, ghc-prim , mmorph, mtl, resourcet, smallcheck, streaming, tasty, tasty-hunit , tasty-smallcheck, transformers, transformers-base @@ -294493,6 +294005,7 @@ self: { ]; description = "Fast, effectful byte streams"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "streaming-cassava" = callPackage @@ -294907,24 +294420,20 @@ self: { }) {}; "streamly-archive" = callPackage - ({ mkDerivation, archive, async, base, bytestring, containers - , cryptonite, directory, filepath, QuickCheck, split, streamly - , streamly-core, tar, tasty, tasty-hunit, tasty-quickcheck - , temporary, zlib + ({ mkDerivation, archive, base, bytestring, cryptonite, directory + , filepath, QuickCheck, streamly, streamly-core, tar, tasty + , tasty-hunit, tasty-quickcheck, temporary, zlib }: mkDerivation { pname = "streamly-archive"; - version = "0.3.0"; - sha256 = "1azjv8lsy4mp9brz6zdfls4srxr8zl3ki80d50k7ikzxhv117sp1"; + version = "0.2.0"; + sha256 = "0sjshmvndrysbfpj0w05khpga2qsb375iqpfwl6d822vaaxsykq2"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers streamly streamly-core - ]; + libraryHaskellDepends = [ base bytestring streamly streamly-core ]; librarySystemDepends = [ archive ]; testHaskellDepends = [ - async base bytestring containers cryptonite directory filepath - QuickCheck split streamly streamly-core tar tasty tasty-hunit - tasty-quickcheck temporary zlib + base bytestring cryptonite directory filepath QuickCheck streamly + streamly-core tar tasty tasty-hunit tasty-quickcheck temporary zlib ]; testSystemDepends = [ archive ]; description = "Stream data from archives using the streamly library"; @@ -295065,24 +294574,21 @@ self: { }) {}; "streamly-lmdb" = callPackage - ({ mkDerivation, async, base, bytestring, cereal, containers - , directory, lifted-base, lmdb, monad-control, mtl, QuickCheck - , random, safe-exceptions, stm, streamly, streamly-core, tasty - , tasty-hunit, tasty-quickcheck, temporary, transformers, vector + ({ mkDerivation, async, base, bytestring, directory, lmdb + , QuickCheck, streamly, streamly-core, tasty, tasty-quickcheck + , temporary }: mkDerivation { pname = "streamly-lmdb"; - version = "0.8.0"; - sha256 = "1yi3nfkv8jd3wl4hap4zcxs760ff61a0yxqvqz0jv0f0164czjkp"; + version = "0.7.0"; + sha256 = "1hr3zpvvnazxss12nqys000vcgvbni3c7zl14pi3j838dsw72qwi"; libraryHaskellDepends = [ - base bytestring containers directory lifted-base monad-control - safe-exceptions stm streamly streamly-core + async base bytestring streamly streamly-core ]; librarySystemDepends = [ lmdb ]; testHaskellDepends = [ - async base bytestring cereal containers directory mtl QuickCheck - random streamly streamly-core tasty tasty-hunit tasty-quickcheck - temporary transformers vector + async base bytestring directory QuickCheck streamly streamly-core + tasty tasty-quickcheck temporary ]; testSystemDepends = [ lmdb ]; description = "Stream data to or from LMDB databases using the streamly library"; @@ -296517,8 +296023,8 @@ self: { }: mkDerivation { pname = "strongweak"; - version = "0.11.0"; - sha256 = "0bzx25pwc2mg92f72lj32g78yn5gx8pl8341cxbv3j0ysim1fhfj"; + version = "0.9.1"; + sha256 = "0bq9vamnzidmcbapn6lc6vyz3lk2m0ld475z6a311xr5x0d70vad"; libraryHaskellDepends = [ base rerefined text text-builder-linear vector vector-sized ]; @@ -299019,14 +298525,14 @@ self: { license = "unknown"; }) {}; - "sydtest-aeson_0_2_0_1" = callPackage + "sydtest-aeson_0_2_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq , directory, path, path-io, sydtest, sydtest-discover, text }: mkDerivation { pname = "sydtest-aeson"; - version = "0.2.0.1"; - sha256 = "0qxbsbrz1vyafg7wx2yappzqj821dr86cafx34rx15zbyrbkmpvz"; + version = "0.2.0.0"; + sha256 = "14acwqaxb3dizpqa6xz7wpnb2qssyfzqh4g3g7dxdbk04sypz34h"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring deepseq path path-io sydtest text @@ -299151,25 +298657,6 @@ self: { broken = true; }) {}; - "sydtest-hspec_0_4_0_3" = callPackage - ({ mkDerivation, base, hspec, hspec-core, mtl, QuickCheck, stm - , sydtest, sydtest-discover - }: - mkDerivation { - pname = "sydtest-hspec"; - version = "0.4.0.3"; - sha256 = "1vnc6b8vswqbpz6l2rgx4r8k658wzdmv4ca601rfy03539n98nzl"; - libraryHaskellDepends = [ - base hspec-core mtl QuickCheck stm sydtest - ]; - testHaskellDepends = [ base hspec stm sydtest ]; - testToolDepends = [ sydtest-discover ]; - description = "An Hspec companion library for sydtest"; - license = "unknown"; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - "sydtest-mongo" = callPackage ({ mkDerivation, base, binary, bson, bytestring, mongoDB, network , path, path-io, port-utils, process, sydtest, sydtest-discover @@ -301425,45 +300912,43 @@ self: { ({ mkDerivation, aeson, ansi-terminal, base, broadcast-chan , bytestring, conduit, containers, data-default, dbus , dbus-hslogger, directory, dyre, either, enclosed-exceptions - , filepath, gi-cairo-connector, gi-cairo-render, gi-gdk + , filepath, gi-cairo, gi-cairo-connector, gi-cairo-render, gi-gdk , gi-gdkpixbuf, gi-gdkx11, gi-glib, gi-gtk, gi-gtk-hs, gi-pango - , gtk-sni-tray, gtk-strut, gtk3, haskell-gi-base, hslogger, hspec - , hspec-core, hspec-discover, hspec-golden, HStringTemplate - , http-client, http-client-tls, http-conduit, http-types, multimap + , gtk-sni-tray, gtk-strut, gtk3, haskell-gi, haskell-gi-base + , hslogger, HStringTemplate, http-client, http-client-tls + , http-conduit, http-types, multimap, old-locale , optparse-applicative, parsec, process, rate-limit, regex-compat , safe, scotty, split, status-notifier-item, stm, template-haskell - , temporary, text, time, time-locale-compat, time-units - , transformers, tuple, unix, utf8-string, X11, xdg-basedir + , text, time, time-locale-compat, time-units, transformers + , transformers-base, tuple, unix, utf8-string, X11, xdg-basedir , xdg-desktop-entry, xml, xml-helpers, xmonad }: mkDerivation { pname = "taffybar"; - version = "4.0.3"; - sha256 = "107hajq6y3hb9n80zncc8qi74dn6qqp7mic4xagnmah82sk1k5x9"; + version = "4.0.2"; + sha256 = "1w1lsz8bk4xq4dzsfi2yf3x036a8y6b14jpil74c1xbicjc74gmg"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal base broadcast-chan bytestring conduit containers data-default dbus dbus-hslogger directory dyre either - enclosed-exceptions filepath gi-cairo-connector gi-cairo-render - gi-gdk gi-gdkpixbuf gi-gdkx11 gi-glib gi-gtk gi-gtk-hs gi-pango - gtk-sni-tray gtk-strut haskell-gi-base hslogger HStringTemplate - http-client http-client-tls http-conduit http-types multimap parsec + enclosed-exceptions filepath gi-cairo gi-cairo-connector + gi-cairo-render gi-gdk gi-gdkpixbuf gi-gdkx11 gi-glib gi-gtk + gi-gtk-hs gi-pango gtk-sni-tray gtk-strut haskell-gi + haskell-gi-base hslogger HStringTemplate http-client + http-client-tls http-conduit http-types multimap old-locale parsec process rate-limit regex-compat safe scotty split status-notifier-item stm template-haskell text time - time-locale-compat time-units transformers tuple unix utf8-string - X11 xdg-basedir xdg-desktop-entry xml xml-helpers xmonad + time-locale-compat time-units transformers transformers-base tuple + unix utf8-string X11 xdg-basedir xdg-desktop-entry xml xml-helpers + xmonad ]; libraryPkgconfigDepends = [ gtk3 ]; executableHaskellDepends = [ base data-default directory hslogger optparse-applicative ]; executablePkgconfigDepends = [ gtk3 ]; - testHaskellDepends = [ - base directory filepath hspec hspec-core hspec-golden temporary - ]; - testToolDepends = [ hspec-discover ]; description = "A desktop bar similar to xmobar, but with more GUI"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; @@ -303210,8 +302695,6 @@ self: { pname = "tasty-flaky"; version = "0.1.0.0"; sha256 = "1p0lvfics2p98jhg46m1gl7lrpq73v1waxplvib77pl5q9ymlk87"; - revision = "1"; - editedCabalFile = "0kdx020wypr226q9syn1wiq3a7szyzy66khfzh3ssr290r0sknci"; libraryHaskellDepends = [ base retry tagged tasty ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Handle flaky Tasty-based tests"; @@ -304682,8 +304165,8 @@ self: { }: mkDerivation { pname = "telegram-bot-api"; - version = "7.4.1"; - sha256 = "1ppjyq278ri2467vcyb1z01jsqbirls8lazi1lr8pk9z0sw8mz5y"; + version = "7.4"; + sha256 = "0pbp14dg4qdf3vl93f46l6q1gdprkfvhfgi5ll3kln66z2bs40fq"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring cron filepath hashable http-api-data http-client http-client-tls monad-control mtl @@ -304706,10 +304189,8 @@ self: { }: mkDerivation { pname = "telegram-bot-simple"; - version = "0.14.3"; - sha256 = "0h7cpa5zbhz9y362djxznl2q1s0mj1ci6fg071i21fbk1fkjsmhf"; - revision = "1"; - editedCabalFile = "0warsrhsk3vqg9hyr5ircm01shls4n201z7nmjigli1nzzidljf8"; + version = "0.14.2"; + sha256 = "10jwvx6m8zqzicfy3iyc9igxlnzyd8h320280q9s53420gzfpdf4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -307919,36 +307400,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "text-show_3_11" = callPackage - ({ mkDerivation, array, base, base-compat-batteries, base-orphans - , bifunctors, bytestring, containers, criterion, deepseq - , deriving-compat, generic-deriving, ghc-boot-th, ghc-prim, hspec - , hspec-discover, QuickCheck, quickcheck-instances - , template-haskell, text, th-abstraction, transformers - , transformers-compat - }: - mkDerivation { - pname = "text-show"; - version = "3.11"; - sha256 = "1hp8bw5cmppdwqjvnmv7h38rckvdpxrzgcvbllgvf4zm9ns6dsr8"; - libraryHaskellDepends = [ - array base base-compat-batteries bifunctors bytestring containers - ghc-boot-th ghc-prim template-haskell text th-abstraction - transformers transformers-compat - ]; - testHaskellDepends = [ - array base base-compat-batteries base-orphans bytestring - deriving-compat generic-deriving ghc-prim hspec QuickCheck - quickcheck-instances template-haskell text transformers - transformers-compat - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; - description = "Efficient conversion of values into Text"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "text-show-instances" = callPackage ({ mkDerivation, aeson, base, base-compat, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim @@ -307986,42 +307437,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "text-show-instances_3_9_9" = callPackage - ({ mkDerivation, aeson, base, base-compat, bifunctors, binary - , containers, directory, generic-deriving, ghc-boot-th, ghc-prim - , haskeline, hpc, hspec, hspec-discover, nonempty-vector - , old-locale, old-time, pretty, QuickCheck, quickcheck-instances - , random, scientific, semigroups, tagged, template-haskell - , terminfo, text, text-short, text-show, th-orphans, time - , transformers, transformers-compat, unix, unordered-containers - , uuid-types, vector, xhtml - }: - mkDerivation { - pname = "text-show-instances"; - version = "3.9.9"; - sha256 = "0ip2ym2v3rh5bi6mjfxpzrbvbrpqyi2ccaf4kfg5sy0k0yv3nrhm"; - libraryHaskellDepends = [ - aeson base base-compat bifunctors binary containers directory - ghc-boot-th haskeline hpc nonempty-vector old-locale old-time - pretty random scientific semigroups tagged template-haskell - terminfo text text-short text-show time transformers unix - unordered-containers uuid-types vector xhtml - ]; - testHaskellDepends = [ - aeson base base-compat bifunctors binary containers directory - generic-deriving ghc-boot-th ghc-prim haskeline hpc hspec - nonempty-vector old-locale old-time pretty QuickCheck - quickcheck-instances random scientific tagged template-haskell - terminfo text-short text-show th-orphans time transformers - transformers-compat unix unordered-containers uuid-types vector - xhtml - ]; - testToolDepends = [ hspec-discover ]; - description = "Additional instances for text-show"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "text-stream-decode" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, hspec, text }: @@ -308846,8 +308261,8 @@ self: { pname = "th-lift"; version = "0.8.4"; sha256 = "06x6njyn6p6shwj5n1znq017vwalr867ziwbwzimz9jbilipgigr"; - revision = "3"; - editedCabalFile = "053glydkbz2h03s4l0isbabp4w4w4b8k3xfd61awf5vdnnyrq612"; + revision = "2"; + editedCabalFile = "1cwc4q408b9pina7069hi8v3m9nqa5c6sm8lamr5ssialiwchcig"; libraryHaskellDepends = [ base ghc-prim template-haskell th-abstraction ]; @@ -308856,22 +308271,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "th-lift_0_8_5" = callPackage - ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction - }: - mkDerivation { - pname = "th-lift"; - version = "0.8.5"; - sha256 = "0xhivxk89y76jkgm636d1qan3ssgiqk2g23abzdfgpq29s6mm739"; - libraryHaskellDepends = [ - base ghc-prim template-haskell th-abstraction - ]; - testHaskellDepends = [ base ghc-prim template-haskell ]; - description = "Derive Template Haskell's Lift class for datatypes"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "th-lift-instances" = callPackage ({ mkDerivation, base, bytestring, containers, QuickCheck , template-haskell, text, th-lift, transformers, vector @@ -308912,8 +308311,8 @@ self: { pname = "th-orphans"; version = "0.13.14"; sha256 = "0z07qcbbsj2b3j9p1qr4jvlpa7qgjfjvymkjd6vbizka1wd2mnwx"; - revision = "4"; - editedCabalFile = "10fq55a34h1cysgigf1s2vlb0ka9s7d0lklpk63zla53fx7jshrl"; + revision = "3"; + editedCabalFile = "19gh8f082ia27ch7xjj41vwlp7234sv545hhb3kcwkmw9brc67aj"; libraryHaskellDepends = [ base mtl template-haskell th-compat th-lift th-reify-many ]; @@ -308925,26 +308324,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "th-orphans_0_13_15" = callPackage - ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover - , mtl, template-haskell, th-compat, th-lift, th-reify-many - }: - mkDerivation { - pname = "th-orphans"; - version = "0.13.15"; - sha256 = "1gayl4afrl9swqhb12z5z84zl8vx684xj90s9h57029a72vjrl0k"; - libraryHaskellDepends = [ - base mtl template-haskell th-compat th-lift th-reify-many - ]; - testHaskellDepends = [ - base bytestring ghc-prim hspec template-haskell th-lift - ]; - testToolDepends = [ hspec-discover ]; - description = "Orphan instances for TH datatypes"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "th-pprint" = callPackage ({ mkDerivation, base, lens, pretty, template-haskell }: mkDerivation { @@ -312088,7 +311467,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "tls_2_1_1" = callPackage + "tls_2_1_0" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base , base16-bytestring, bytestring, cereal, crypton, crypton-x509 , crypton-x509-store, crypton-x509-validation, data-default-class @@ -312097,8 +311476,8 @@ self: { }: mkDerivation { pname = "tls"; - version = "2.1.1"; - sha256 = "1rzbyrc5x4zq0xdm5h4h0jh2l2ajhbjx5qny6x79ij7zv0c79hkp"; + version = "2.1.0"; + sha256 = "1i84j49gb1dgyqf4rwdrnjp47rynmyavh05dkijbj82qdcxjmb6v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -315008,7 +314387,7 @@ self: { license = lib.licenses.gpl2Plus; }) {}; - "tree-diff_0_3_2" = callPackage + "tree-diff_0_3_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base , bytestring, containers, criterion, deepseq, Diff, hashable , parsec, parsers, pretty, primitive, QuickCheck, scientific @@ -315018,8 +314397,10 @@ self: { }: mkDerivation { pname = "tree-diff"; - version = "0.3.2"; - sha256 = "067lf9fw0lk9pay6di6scc00sfg9p0n2avxs0wsqlyin9xc9h18v"; + version = "0.3.1"; + sha256 = "0ixv5122yz6p6a0vfjn5hgp81bs6dx6x3q731cwjyx03dr9lzicb"; + revision = "1"; + editedCabalFile = "1ga0xnyv24fgjiifypq95l7nhlm86swqscakfm98kxqi91gbzr5y"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base bytestring containers deepseq hashable parsec parsers pretty primitive QuickCheck @@ -316747,8 +316128,8 @@ self: { }: mkDerivation { pname = "twain"; - version = "2.2.0.0"; - sha256 = "1d69hc5nxc6pxbwbf13ch9yfmf9zphznv1w9hmszbndjwpc767nj"; + version = "2.1.2.0"; + sha256 = "1hkzp2g671dagmv1qznkf3mw3l2mslckg7h0a8x8633h6i3j6br0"; libraryHaskellDepends = [ aeson base bytestring case-insensitive cookie either exceptions http-types http2 text time transformers vault wai wai-extra @@ -318888,8 +318269,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Plugin to faciliate type-level let"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "typelevel" = callPackage @@ -319329,12 +318708,12 @@ self: { license = lib.licenses.mit; }) {}; - "typst-symbols_0_1_7" = callPackage + "typst-symbols_0_1_6" = callPackage ({ mkDerivation, base, text }: mkDerivation { pname = "typst-symbols"; - version = "0.1.7"; - sha256 = "1f158pjvkbx05aj0nv4qwlz2h7a811v9r7nlhnp54vws4h4rdvnz"; + version = "0.1.6"; + sha256 = "17a2grflk67vs68b2pxygvk7p50rj9fb3ri7fcwa19j9jnhg4zwl"; libraryHaskellDepends = [ base text ]; description = "Symbol and emoji lookup for typst language"; license = lib.licenses.mit; @@ -319373,8 +318752,8 @@ self: { pname = "tz"; version = "0.1.3.6"; sha256 = "1vqnfk656i6j3j1bf9lc36adziv52x1b2ccq6afp8cka1nay2mcd"; - revision = "7"; - editedCabalFile = "0awsb34hf2r6j0qkl0b087hdwcig33cmnfjwrl5w3mj35ligffja"; + revision = "6"; + editedCabalFile = "0za67vc1lvadrl6r287cmkkz7cnharm1yhsyin8qbn9xlm5r8ci0"; libraryHaskellDepends = [ base binary bytestring containers data-default deepseq template-haskell time tzdata vector @@ -320376,8 +319755,8 @@ self: { }: mkDerivation { pname = "unclogging"; - version = "0.1.0.3"; - sha256 = "1iy5aacr19xcabs0q2a2vqc43lsaxayy8avw0wbnkqnb5y7cjm5c"; + version = "0.1.0.2"; + sha256 = "1w38pifsff5c2p22afnnw6c6n5qxivyvbdciy5z0d46q7nxqgysr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -320393,17 +319772,6 @@ self: { mainProgram = "unclogging"; }) {}; - "unconditional-jump" = callPackage - ({ mkDerivation, base, int-supply }: - mkDerivation { - pname = "unconditional-jump"; - version = "1.0.0"; - sha256 = "1nmzqph0wchzr2cq7009d9xfchryb0nis74mcj7nbkz42r14k570"; - libraryHaskellDepends = [ base int-supply ]; - description = "Unconditional jumps"; - license = lib.licenses.bsd3; - }) {}; - "unconstrained" = callPackage ({ mkDerivation }: mkDerivation { @@ -322111,15 +321479,15 @@ self: { }) {}; "universum" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim - , hashable, hedgehog, microlens, microlens-mtl, mtl + ({ mkDerivation, base, bytestring, containers, deepseq, gauge + , ghc-prim, hashable, hedgehog, microlens, microlens-mtl, mtl , safe-exceptions, stm, tasty, tasty-discover, tasty-hedgehog, text , transformers, unordered-containers, utf8-string, vector }: mkDerivation { pname = "universum"; - version = "1.8.2.2"; - sha256 = "0h8ckr60gm5wxly5zyij9avzmlzljp21njd1k9j13nj5z23i1idp"; + version = "1.8.2.1"; + sha256 = "06kv2p7792r4d7nsq1wx7vw5jy72fjacc2jwmkqfanaaapdr27q9"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable microlens microlens-mtl mtl safe-exceptions stm text transformers @@ -322129,6 +321497,9 @@ self: { base bytestring hedgehog tasty tasty-hedgehog text ]; testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base containers gauge text unordered-containers + ]; description = "Custom prelude used in Serokell"; license = lib.licenses.mit; }) {}; @@ -322167,8 +321538,8 @@ self: { }: mkDerivation { pname = "unix-compat"; - version = "0.7.3"; - sha256 = "11qxh9l2kqx4pqphbbmcbmc9bb2mifnjmzlcbkak5mjj163sskvs"; + version = "0.7.2"; + sha256 = "02v9lr7i7m3nrd8wkg2psdm41i7vc0mzaqks89ds05lv9qsjqf2q"; libraryHaskellDepends = [ base unix ]; testHaskellDepends = [ base directory extra hspec HUnit monad-parallel temporary @@ -324236,8 +323607,8 @@ self: { }: mkDerivation { pname = "utxorpc"; - version = "0.0.11.0"; - sha256 = "1bnkhm21g67x1jr7lwybg5yj5n34jlhkf5j2fqzczdfggv4z6vnq"; + version = "0.0.10.0"; + sha256 = "0y1v4a8shg05mphcly4n77qf8a3jp43girc9kf3302p8sjgx2zv2"; libraryHaskellDepends = [ base proto-lens proto-lens-protobuf-types proto-lens-runtime ]; @@ -326096,8 +325467,8 @@ self: { pname = "vector"; version = "0.13.1.0"; sha256 = "1vpcxn0zkhmvksz373iz66bv42f358jv3zqg390vk2mbkqkp5wk3"; - revision = "2"; - editedCabalFile = "0ii5bzccaw632sjz9avbasmfabxc82w9vrn6lala9x9d1dyllmn8"; + revision = "1"; + editedCabalFile = "03fpy8vnjyk7hw6sci361pmb05jl5z05yb08yjv5wxqxnp7jq0xw"; libraryHaskellDepends = [ base deepseq primitive vector-stream ]; testHaskellDepends = [ base base-orphans doctest HUnit primitive QuickCheck random tasty @@ -326689,8 +326060,8 @@ self: { pname = "vector-stream"; version = "0.1.0.1"; sha256 = "0z5z88flyassdpgga412qci6brr9gyljbx875wd479fy9crhgxfh"; - revision = "2"; - editedCabalFile = "0lcsvwlpipdiafw7w6lf2mqfg5b8fmh2jrrs3s6j7hsjm09vs3id"; + revision = "1"; + editedCabalFile = "17sa7mq3maphzgwdjwxr1q9dm92gz4hcbyk0d3hkayqxswp9x9hn"; libraryHaskellDepends = [ base ghc-prim ]; description = "Efficient Streams"; license = lib.licenses.bsd3; @@ -327830,8 +327201,8 @@ self: { }: mkDerivation { pname = "vivid"; - version = "0.5.2.1"; - sha256 = "006y380fva59xr5wv6vn802wxssd91fgvfvb3g65zscv8dhb0z5d"; + version = "0.5.2.0"; + sha256 = "1p4x6q2ks259xzigj31f8bz3562k07dzj77a9bnhl934sl85hz6q"; libraryHaskellDepends = [ base binary bytestring cereal containers directory filepath hashable MonadRandom mtl network process random random-shuffle @@ -329199,22 +328570,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "wai-logger_2_5_0" = callPackage - ({ mkDerivation, base, byteorder, bytestring, fast-logger - , http-types, network, wai - }: - mkDerivation { - pname = "wai-logger"; - version = "2.5.0"; - sha256 = "1171qfz6wlmq69virwvlg79j4smk6sqhdvrdpnisr50zdc3x7ysw"; - libraryHaskellDepends = [ - base byteorder bytestring fast-logger http-types network wai - ]; - description = "A logging system for WAI"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "wai-logger-buffered" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , http-types, time, wai, warp @@ -329924,8 +329279,6 @@ self: { pname = "wai-middleware-throttle"; version = "0.3.0.1"; sha256 = "0mpw7b56k1a89kzwa3v4c4ff66m0py9s9p2jan2zhp8k3b8862jq"; - revision = "1"; - editedCabalFile = "1d6zyjpvjm03vsmi04n9zdmaxlq5by326lyf0xlvh05562jnvrqc"; libraryHaskellDepends = [ base bytestring bytestring-builder cache clock containers hashable http-types mtl network safe-exceptions stm text token-bucket @@ -330784,6 +330137,42 @@ self: { broken = true; }) {}; + "warp_3_3_30" = callPackage + ({ mkDerivation, array, auto-update, base, bsb-http-chunked + , bytestring, case-insensitive, containers, crypton-x509, directory + , gauge, ghc-prim, hashable, hspec, hspec-discover, http-client + , http-date, http-types, http2, iproute, network, process + , QuickCheck, recv, simple-sendfile, stm, streaming-commons, text + , time-manager, unix, unliftio, vault, wai, word8 + }: + mkDerivation { + pname = "warp"; + version = "3.3.30"; + sha256 = "1i5fnvc9n7w013asj7ckpfb59ybbvhif4d6f4g5jwwad50jmlbpg"; + libraryHaskellDepends = [ + array auto-update base bsb-http-chunked bytestring case-insensitive + containers crypton-x509 ghc-prim hashable http-date http-types + http2 iproute network recv simple-sendfile stm streaming-commons + text time-manager unix unliftio vault wai word8 + ]; + testHaskellDepends = [ + array auto-update base bsb-http-chunked bytestring case-insensitive + containers crypton-x509 directory ghc-prim hashable hspec + http-client http-date http-types http2 iproute network process + QuickCheck recv simple-sendfile stm streaming-commons text + time-manager unix unliftio vault wai word8 + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + auto-update base bytestring containers crypton-x509 gauge hashable + http-date http-types network recv time-manager unix unliftio + ]; + description = "A fast, light-weight web server for WAI applications"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.alexfmpe ]; + }) {}; + "warp" = callPackage ({ mkDerivation, array, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, crypton-x509, directory @@ -330819,7 +330208,7 @@ self: { maintainers = [ lib.maintainers.alexfmpe ]; }) {}; - "warp_3_4_3" = callPackage + "warp_3_4_2" = callPackage ({ mkDerivation, array, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, crypton-x509, directory , gauge, ghc-prim, hashable, hspec, hspec-discover, http-client @@ -330829,8 +330218,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.4.3"; - sha256 = "1g6g3bm8a4yjrd3h6r31ypf93r2as93d7cy17z6chwv8p41v0c86"; + version = "3.4.2"; + sha256 = "0b7f5darsa7n2bwlnj46xrgwbrb46yl62qyrcq84hvdpq2sfnxdl"; libraryHaskellDepends = [ array auto-update base bsb-http-chunked bytestring case-insensitive containers crypton-x509 ghc-prim hashable http-date http-types @@ -331517,16 +330906,15 @@ self: { "web-rep" = callPackage ({ mkDerivation, async, base, bifunctors, box, box-socket - , bytestring, doctest-parallel, flatparse, markup-parse, mtl - , optics-core, optics-extra, optparse-applicative, profunctors - , scotty, string-interpolate, text, transformers - , unordered-containers, wai-middleware-static, wai-websockets - , websockets + , bytestring, flatparse, markup-parse, mtl, optics-core + , optics-extra, optparse-applicative, profunctors, scotty + , string-interpolate, text, transformers, unordered-containers + , wai-middleware-static, wai-websockets, websockets }: mkDerivation { pname = "web-rep"; - version = "0.12.3.0"; - sha256 = "10k2fm7g1p54v6gnn045vgc8p58xal17vxin9ah11xqr0dddk7sa"; + version = "0.12.1.0"; + sha256 = "0hiqmivic82plziwa2fvc3rfz1h60f8i7vcb6hw65pfrz1aswk6n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -331538,7 +330926,6 @@ self: { executableHaskellDepends = [ base box markup-parse optics-core optparse-applicative ]; - testHaskellDepends = [ base doctest-parallel ]; description = "representations of a web page"; license = lib.licenses.bsd3; mainProgram = "web-rep-example"; @@ -331784,20 +331171,20 @@ self: { }) {}; "web3-crypto" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, crypton + ({ mkDerivation, aeson, base, bytestring, containers, cryptonite , hspec, hspec-contrib, hspec-discover, hspec-expectations, memory , memory-hexstring, text, uuid-types, vector }: mkDerivation { pname = "web3-crypto"; - version = "1.0.1.0"; - sha256 = "0p5bg9riai1z6wsii4q1i5135v7lcbdgspkhwvacy57w7yda3kda"; + version = "1.0.0.0"; + sha256 = "16ygvnkxcalh7a0h7l1bj5gyir79gihcwzzqk31qibvd1r17mwd6"; libraryHaskellDepends = [ - aeson base bytestring containers crypton memory memory-hexstring + aeson base bytestring containers cryptonite memory memory-hexstring text uuid-types vector ]; testHaskellDepends = [ - aeson base bytestring containers crypton hspec hspec-contrib + aeson base bytestring containers cryptonite hspec hspec-contrib hspec-discover hspec-expectations memory memory-hexstring text uuid-types vector ]; @@ -332247,8 +331634,8 @@ self: { }: mkDerivation { pname = "webdriver-wrapper"; - version = "0.2.0.1"; - sha256 = "1dvd2649vapwd8qcfv6arsi119rffbb89mzcpdcwdf827x243sci"; + version = "0.2.0.0"; + sha256 = "0dirnaxab9ddaa5jbqn0bhqlmh8x311vmq0il8xh0r3df5cvmgcg"; libraryHaskellDepends = [ aeson async base bytestring directory extra filepath http-conduit http-types process process-extras retry string-interpolate tar text @@ -333926,8 +333313,6 @@ self: { pname = "window-utils"; version = "0.2.2.0"; sha256 = "08s9rjpc2idrb5mgrnbwj2d0m8aj33g4v9djyvrkqnq5jb8mbzrz"; - revision = "1"; - editedCabalFile = "154cqir749zr19vap4zxm1dfj6ylz6p7rpqm0n0kmg2vl05ksimv"; libraryHaskellDepends = [ base bytestring JuicyPixels text vector X11 ]; @@ -334141,26 +333526,6 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "witch_1_2_2_0" = callPackage - ({ mkDerivation, base, bytestring, containers, HUnit, tagged - , template-haskell, text, time, transformers - }: - mkDerivation { - pname = "witch"; - version = "1.2.2.0"; - sha256 = "0wsy6fd75famn40vhj4ziygqai20szz17x9c4ddz073az4kig4d6"; - libraryHaskellDepends = [ - base bytestring containers tagged template-haskell text time - ]; - testHaskellDepends = [ - base bytestring containers HUnit tagged text time transformers - ]; - description = "Convert values from one type into another"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.maralorn ]; - }) {}; - "with-index" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -339914,8 +339279,8 @@ self: { }: mkDerivation { pname = "yampa-test"; - version = "0.14.11"; - sha256 = "11lwp60b11fkkasqflvslp489jrlg9l2x3wlzasikymy729lkrij"; + version = "0.14.10"; + sha256 = "0as6k36cq8w1p8nqjlnlc8ji45slynxg4aj3p6ping177lw5232h"; libraryHaskellDepends = [ base normaldistribution QuickCheck Yampa ]; @@ -340189,17 +339554,19 @@ self: { "yaya" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, comonad, doctest - , either, free, kan-extensions, lens, profunctors, strict - , template-haskell, th-abstraction, transformers + , either, foldable1-classes-compat, free, kan-extensions, lens + , profunctors, strict, template-haskell, th-abstraction + , transformers }: mkDerivation { pname = "yaya"; - version = "0.6.2.2"; - sha256 = "0b6sd8rdp6qys45s2lps0nhmqbs9x63axmhh3k71y81lmzyq1cax"; + version = "0.6.2.0"; + sha256 = "1k6w1c89s7c416xjxm23mllcm68l8ya6m7jw2ml9axwsns27kx98"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base comonad either free kan-extensions lens profunctors strict - template-haskell th-abstraction transformers + base comonad either foldable1-classes-compat free kan-extensions + lens profunctors strict template-haskell th-abstraction + transformers ]; testHaskellDepends = [ base doctest ]; description = "Total recursion schemes"; @@ -340214,8 +339581,8 @@ self: { }: mkDerivation { pname = "yaya-containers"; - version = "0.1.2.1"; - sha256 = "17akwh7inlcnizhx600ydf5j6fgbl25cnwm2fr2f6rlabkxvraki"; + version = "0.1.2.0"; + sha256 = "03rfpzsrjimlp40s5pbn2fd5v4cby529nhmsh9xna7n8xf6jmm05"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers yaya ]; testHaskellDepends = [ base doctest ]; @@ -340230,8 +339597,8 @@ self: { }: mkDerivation { pname = "yaya-hedgehog"; - version = "0.3.0.3"; - sha256 = "1adqxgpgarwka93h9xzx6443vj6b0nx4cyrh3dp38zcq2c7xji2v"; + version = "0.3.0.2"; + sha256 = "1kyqbqp84whi9jsygk7x2vhja76h45fk75k7bgh9jwjqfj83zy7s"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base deriving-compat hedgehog yaya ]; testHaskellDepends = [ @@ -340244,14 +339611,14 @@ self: { "yaya-quickcheck" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, doctest, QuickCheck - , yaya + , splitmix, yaya }: mkDerivation { pname = "yaya-quickcheck"; - version = "0.2.0.2"; - sha256 = "13c8zyv83sik5ms2p49850jrpvhmr4wacz27ib79pbgp2lh538n9"; + version = "0.2.0.1"; + sha256 = "0ncnp0m93fyjn9vqp8s0vbvra3v6nin8sh5jr58rv1r5538hkyr5"; setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base QuickCheck yaya ]; + libraryHaskellDepends = [ base QuickCheck splitmix yaya ]; testHaskellDepends = [ base doctest ]; description = "QuickCheck testing support for the Yaya recursion scheme library"; license = lib.licenses.agpl3Plus; @@ -340278,15 +339645,15 @@ self: { }) {}; "yaya-unsafe" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, comonad, doctest, free - , hedgehog, lens, yaya, yaya-hedgehog + ({ mkDerivation, base, bifunctors, Cabal, cabal-doctest, comonad + , doctest, free, hedgehog, lens, yaya, yaya-hedgehog }: mkDerivation { pname = "yaya-unsafe"; - version = "0.4.1.2"; - sha256 = "0n4c2zf6ds2y4433j44hi890rwjchd09qfrdx2s61vis28xqyc1k"; + version = "0.4.1.1"; + sha256 = "0s3fna5b0g5jxbndzmqsy9bqz8b4ry7p88kspnzv8shrq271mmmk"; setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base comonad free lens yaya ]; + libraryHaskellDepends = [ base bifunctors comonad free lens yaya ]; testHaskellDepends = [ base doctest hedgehog yaya yaya-hedgehog ]; description = "Non-total extensions to the Yaya recursion scheme library"; license = lib.licenses.agpl3Plus; @@ -341598,29 +340965,6 @@ self: { license = lib.licenses.mit; }) {}; - "yesod-form_1_7_9" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, containers, data-default - , email-validate, hspec, network-uri, persistent, resourcet - , shakespeare, text, time, transformers, wai, xss-sanitize - , yesod-core, yesod-persistent - }: - mkDerivation { - pname = "yesod-form"; - version = "1.7.9"; - sha256 = "1s59d3ccf76dmi43ivcfzbah9b0y18i9c3gv66dmcwy5f6wqhd52"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder blaze-html blaze-markup - byteable bytestring containers data-default email-validate - network-uri persistent resourcet shakespeare text time transformers - wai xss-sanitize yesod-core yesod-persistent - ]; - testHaskellDepends = [ base hspec text time ]; - description = "Form handling support for Yesod Web Framework"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - }) {}; - "yesod-form-bootstrap4" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, shakespeare, text , yesod-core, yesod-form @@ -342662,34 +342006,6 @@ self: { license = lib.licenses.mit; }) {}; - "yesod-test_1_6_19" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, bytestring, case-insensitive, conduit, containers - , cookie, hspec, hspec-core, html-conduit, http-types, HUnit - , memory, mtl, network, pretty-show, text, time, transformers - , unliftio, unliftio-core, wai, wai-extra, xml-conduit, xml-types - , yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-test"; - version = "1.6.19"; - sha256 = "0snq06yps28lkxfc1mhsvbv2kq0h0mi16zjdfrahm4zaz8axkqka"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder blaze-html blaze-markup - bytestring case-insensitive conduit containers cookie hspec-core - html-conduit http-types HUnit memory mtl network pretty-show text - time transformers wai wai-extra xml-conduit xml-types yesod-core - ]; - testHaskellDepends = [ - base bytestring containers cookie hspec html-conduit http-types - HUnit text unliftio unliftio-core wai wai-extra xml-conduit - yesod-core yesod-form - ]; - description = "integration testing for WAI/Yesod Applications"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - }) {}; - "yesod-test-json" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, hspec , http-types, HUnit, text, transformers, wai, wai-test @@ -342952,24 +342268,25 @@ self: { "yi" = callPackage ({ mkDerivation, base, microlens-platform, mtl - , optparse-applicative, yi-core, yi-frontend-pango, yi-frontend-vty - , yi-keymap-emacs, yi-keymap-vim, yi-misc-modes, yi-mode-haskell - , yi-mode-javascript, yi-rope + , optparse-applicative, yi-core, yi-frontend-vty, yi-keymap-emacs + , yi-keymap-vim, yi-misc-modes, yi-mode-haskell, yi-mode-javascript + , yi-rope }: mkDerivation { pname = "yi"; - version = "0.19.2"; - sha256 = "04ppydc16w6m0ldvpxq2xr313rwak18c4k4i1jsqlb8drcwfx7ch"; + version = "0.19.0"; + sha256 = "1m383r5gx3r9l0mh88gcv3rjnr1ig9rivwg2qz963xqjyhr8y2ni"; configureFlags = [ "-fpango" "-fvty" ]; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base microlens-platform mtl optparse-applicative yi-core - yi-frontend-pango yi-frontend-vty yi-keymap-emacs yi-keymap-vim - yi-misc-modes yi-mode-haskell yi-mode-javascript yi-rope + yi-frontend-vty yi-keymap-emacs yi-keymap-vim yi-misc-modes + yi-mode-haskell yi-mode-javascript yi-rope ]; description = "Yi editor"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; mainProgram = "yi"; }) {}; @@ -342990,7 +342307,6 @@ self: { description = "Add-ons to Yi, the Haskell-Scriptable Editor"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-core" = callPackage @@ -343005,8 +342321,8 @@ self: { }: mkDerivation { pname = "yi-core"; - version = "0.19.4"; - sha256 = "0gahw4cxzk9vfx2cnf63vgpcbn874aandml844z3jj6w4v78vbps"; + version = "0.19.3"; + sha256 = "0l0rqvgm1i43x2q4cwdxwy9bmpvgw0wxmcij31yyx2py01ws863i"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-default directory dlist dynamic-state exceptions filepath hashable ListLike @@ -343021,6 +342337,7 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq yi-rope ]; description = "Yi editor core library"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; }) {}; "yi-dynamic-configuration" = callPackage @@ -343037,6 +342354,7 @@ self: { ]; description = "Dynamic configuration support for Yi"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; }) {}; "yi-emacs-colours" = callPackage @@ -343048,6 +342366,7 @@ self: { libraryHaskellDepends = [ base containers split yi-language ]; description = "Simple mapping from colour names used in emacs to Color"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; }) {}; "yi-frontend-pango" = callPackage @@ -343057,8 +342376,8 @@ self: { }: mkDerivation { pname = "yi-frontend-pango"; - version = "0.19.2"; - sha256 = "1rghdvcf22rwkjq1p8jdrwlsixy5fi9yclbzfwgyrchzqbrv9nqy"; + version = "0.19.1"; + sha256 = "1ijvgxfbwnfpij3qajsci8hllb8n1p3iwd2n1wcp029kwpjhgzk9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers filepath glib gtk microlens-platform mtl @@ -343067,23 +342386,25 @@ self: { ]; description = "Pango frontend for Yi editor"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; }) {}; "yi-frontend-vty" = callPackage ({ mkDerivation, base, containers, data-default, dlist - , microlens-platform, pointedlist, stm, text, vty - , vty-crossplatform, yi-core, yi-language, yi-rope + , microlens-platform, pointedlist, stm, text, vty, yi-core + , yi-language, yi-rope }: mkDerivation { pname = "yi-frontend-vty"; - version = "0.19.1"; - sha256 = "1n73vvyzwl1f94z1gwr2pacw0hnm2gqcqwbji3qps301802337vs"; + version = "0.19.0"; + sha256 = "1vdpfqmvig16jissmra1p9zc42fs4kf2bxspy23bf8mihfr99ays"; libraryHaskellDepends = [ base containers data-default dlist microlens-platform pointedlist - stm text vty vty-crossplatform yi-core yi-language yi-rope + stm text vty yi-core yi-language yi-rope ]; description = "Vty frontend for Yi editor"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; }) {}; "yi-fuzzy-open" = callPackage @@ -343102,6 +342423,7 @@ self: { ]; description = "Fuzzy open plugin for yi"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; }) {}; "yi-gtk" = callPackage @@ -343129,6 +342451,7 @@ self: { ]; description = "Yi editor incremental reader"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; }) {}; "yi-keymap-cua" = callPackage @@ -343144,6 +342467,7 @@ self: { ]; description = "Cua keymap for Yi editor"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; }) {}; "yi-keymap-emacs" = callPackage @@ -343163,6 +342487,7 @@ self: { ]; description = "Emacs keymap for Yi editor"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; }) {}; "yi-keymap-vim" = callPackage @@ -343191,6 +342516,7 @@ self: { ]; description = "Vim keymap for Yi editor"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; }) {}; "yi-language" = callPackage @@ -343202,8 +342528,8 @@ self: { }: mkDerivation { pname = "yi-language"; - version = "0.19.1"; - sha256 = "0vy0dsrgg3mg1v982v71rlyshsf64rzx25x667ybsk27sl7jp6r0"; + version = "0.19.0"; + sha256 = "18r875casrk66ck8q9p1r0c4cfjjgyd5l3gxldr95rqdjci3c09z"; libraryHaskellDepends = [ array base binary containers data-default hashable microlens-platform oo-prototypes pointedlist regex-base regex-tdfa @@ -343218,6 +342544,8 @@ self: { ]; description = "Collection of language-related Yi libraries"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yi-misc-modes" = callPackage @@ -343226,8 +342554,8 @@ self: { }: mkDerivation { pname = "yi-misc-modes"; - version = "0.19.1"; - sha256 = "1j0rq3495ywac5yk5ar7c77jfahi8rm3ivf25wdw0kbfc764bs95"; + version = "0.19.0"; + sha256 = "1g65mfafrq5dzcrcapisvyvs5frwjmy50zfkxrv0wfsdcfapkn7s"; libraryHaskellDepends = [ array base binary data-default filepath microlens-platform text yi-core yi-language yi-rope @@ -343235,6 +342563,7 @@ self: { libraryToolDepends = [ alex ]; description = "Yi editor miscellaneous modes"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; }) {}; "yi-mode-haskell" = callPackage @@ -343243,8 +342572,8 @@ self: { }: mkDerivation { pname = "yi-mode-haskell"; - version = "0.19.1"; - sha256 = "1hhf98gvwfl8y51jkab1nxvm8ma1h19qjqzc7nvmjb9mz9c4clzw"; + version = "0.19.0"; + sha256 = "1hnwxqzaqg7zyfr7rd3l0la5hc8f4px4d0y78kq3xpy4pzx3yr8y"; libraryHaskellDepends = [ array base binary data-default filepath microlens-platform text yi-core yi-language yi-rope @@ -343252,6 +342581,7 @@ self: { libraryToolDepends = [ alex ]; description = "Yi editor haskell mode"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; }) {}; "yi-mode-javascript" = callPackage @@ -343261,8 +342591,10 @@ self: { }: mkDerivation { pname = "yi-mode-javascript"; - version = "0.19.1"; - sha256 = "0d1ishhv6sfk0q711rbapr5srf28n7rrf0m5kjd382r13266wr3a"; + version = "0.19.0"; + sha256 = "1zgx36kagalna8lk60i0djn6mvl6ki55x4kc7mzq2mgzcs292zq1"; + revision = "1"; + editedCabalFile = "09hdiy51i9piyh6889hzjhna8g9hlblrzgzkl8x6rc6pl12dg3wc"; libraryHaskellDepends = [ array base binary data-default dlist filepath microlens-platform mtl text yi-core yi-language yi-rope @@ -343270,6 +342602,7 @@ self: { libraryToolDepends = [ alex ]; description = "Yi editor javascript mode"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; }) {}; "yi-monokai" = callPackage @@ -343282,7 +342615,6 @@ self: { description = "Monokai colour theme for the Yi text editor"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-rope" = callPackage @@ -343322,6 +342654,7 @@ self: { ]; description = "Snippet support for yi"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; }) {}; "yi-solarized" = callPackage @@ -343334,7 +342667,6 @@ self: { description = "Solarized colour theme for the Yi text editor"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-spolsky" = callPackage @@ -343347,7 +342679,6 @@ self: { description = "Spolsky colour theme for the Yi text editor"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-vty" = callPackage diff --git a/pkgs/development/haskell-modules/patches/password-3.0.4.0-scrypt-conditional.patch b/pkgs/development/haskell-modules/patches/password-3.0.4.0-scrypt-conditional.patch deleted file mode 100644 index 1e9cc4c65ded..000000000000 --- a/pkgs/development/haskell-modules/patches/password-3.0.4.0-scrypt-conditional.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/password/password.cabal b/password/password.cabal -index 506457e..8fa978b 100644 ---- a/password.cabal -+++ b/password.cabal -@@ -186,6 +186,8 @@ test-suite password-tasty - other-modules: - Scrypt - Data.Password.Scrypt -+ build-depends: -+ scrypt - ghc-options: - -threaded -O2 -rtsopts -with-rtsopts=-N - build-depends: -@@ -195,7 +197,6 @@ test-suite password-tasty - , bytestring - , memory - , quickcheck-instances -- , scrypt - , tasty - , tasty-hunit - , tasty-quickcheck diff --git a/pkgs/development/tools/haskell/hadrian/make-hadrian.nix b/pkgs/development/tools/haskell/hadrian/make-hadrian.nix index 8db821a9794d..fb9ee89f7cdb 100644 --- a/pkgs/development/tools/haskell/hadrian/make-hadrian.nix +++ b/pkgs/development/tools/haskell/hadrian/make-hadrian.nix @@ -52,7 +52,4 @@ callPackage' ./hadrian.nix ({ # to build hadrian. (Hackage-released conditional dependencies are handled # in ./hadrian.nix without requiring intervention here.) inherit ghc-platform ghc-toolchain; -} // lib.optionalAttrs (lib.versionAtLeast ghcVersion "9.11") { - # See https://gitlab.haskell.org/ghc/ghc/-/commit/145a6477854d4003a07573d5e7ffa0c9a64ae29c - Cabal = bootPkgs.Cabal_3_14_0_0; }) diff --git a/pkgs/tools/networking/mailctl/default.nix b/pkgs/tools/networking/mailctl/default.nix new file mode 100644 index 000000000000..2e6233269280 --- /dev/null +++ b/pkgs/tools/networking/mailctl/default.nix @@ -0,0 +1,97 @@ +{ mkDerivation +, fetchFromGitHub +, aeson +, base +, base64 +, bytestring +, containers +, directory +, hsyslog +, http-conduit +, lib +, network-uri +, optparse-applicative +, pretty-simple +, process +, random +, strings +, template-haskell +, text +, time +, twain +, unix +, utf8-string +, warp +, yaml +}: +mkDerivation rec { + pname = "mailctl"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "pdobsan"; + repo = "mailctl"; + rev = version; + hash = "sha256-frT+fRJpixSvpb2+C34Z47zbMqvmDHdESItXb9YVbfU="; + }; + + isLibrary = true; + isExecutable = true; + + libraryHaskellDepends = [ + aeson + base + base64 + bytestring + containers + directory + hsyslog + http-conduit + network-uri + optparse-applicative + pretty-simple + process + random + strings + template-haskell + text + time + twain + unix + utf8-string + warp + yaml + ]; + + executableHaskellDepends = [ + aeson + base + base64 + bytestring + containers + directory + hsyslog + http-conduit + network-uri + optparse-applicative + pretty-simple + process + random + strings + template-haskell + text + time + twain + unix + utf8-string + warp + yaml + ]; + + description = "OAuth2 tool for mail clients"; + homepage = "https://github.com/pdobsan/mailctl"; + changelog = "https://github.com/pdobsan/mailctl/releases/tag/${version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ aidalgol ]; + mainProgram = "mailctl"; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 31052ecaf4f1..cd0b0dffff68 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1339,6 +1339,7 @@ mapAliases { yacc = throw "'yacc' has been renamed to/replaced by 'bison'"; # Converted to throw 2024-10-17 yafaray-core = libyafaray; # Added 2022-09-23 + yi = throw "'yi' has been removed, as it was broken and unmaintained"; # added 2024-05-09 youtrack_2022_3 = throw "'youtrack_2022_3' has been removed as it was deprecated. Please update to the 'youtrack' package."; # Added 2024-10-17 yrd = throw "'yrd' has been removed, as it was broken and unmaintained"; # added 2024-05-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62ac5512cca5..06be8789a7e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13819,9 +13819,6 @@ with pkgs; ytfzf = callPackage ../tools/misc/ytfzf { }; - # To expose more packages for Yi, override the extraPackages arg. - yi = callPackage ../applications/editors/yi/wrapper.nix { }; - yaydl = callPackage ../tools/video/yaydl { inherit (darwin.apple_sdk.frameworks) Security; }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 7a5a87ccf42e..e83e8a794fa7 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -379,7 +379,6 @@ let xmobar xmonadctl xmonad-with-packages - yi zsh-git-prompt ; @@ -561,8 +560,9 @@ let compilerNames.ghc9101 ] released; Cabal_3_10_3_0 = released; + Cabal-syntax_3_10_3_0 = released; Cabal_3_12_1_0 = released; - Cabal_3_14_0_0 = released; + Cabal-syntax_3_12_1_0 = released; cabal2nix = lib.subtractLists [ compilerNames.ghc9101 ] released; @@ -590,6 +590,9 @@ let language-nix = lib.subtractLists [ compilerNames.ghc9101 ] released; + large-hashable = [ + compilerNames.ghc928 + ]; nix-paths = released; titlecase = lib.subtractLists [ compilerNames.ghc9101 From 46b1474255f46382afd9e192dfc60bc8b1a4641c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Nov 2024 18:42:24 +0100 Subject: [PATCH 582/617] Reapply "haskellPackages: update stackage and hackage" (#354547) This reverts commit 7701a9e6c64005200573958e71ee43852dc65f20, reversing changes made to 8991dc8e9dc52974d9cdf73ebd89e1f12ccb1eda. Restore haskell-updates on staging-next to save resources on hydra. --- doc/languages-frameworks/haskell.section.md | 4 +- pkgs/applications/editors/yi/wrapper.nix | 28 + pkgs/by-name/oa/oama/package.nix | 9 +- pkgs/data/misc/hackage/pin.json | 8 +- pkgs/development/compilers/ghc/head.nix | 6 +- .../haskell-modules/configuration-common.nix | 76 +- .../haskell-modules/configuration-darwin.nix | 4 + .../configuration-ghc-9.10.x.nix | 4 +- .../configuration-ghc-9.8.x.nix | 11 +- .../configuration-hackage2nix/broken.yaml | 14 +- .../configuration-hackage2nix/main.yaml | 7 +- .../configuration-hackage2nix/stackage.yaml | 79 +- .../transitive-broken.yaml | 29 +- .../haskell-modules/configuration-nix.nix | 37 +- .../haskell-modules/hackage-packages.nix | 2783 ++++++++++------- .../password-3.0.4.0-scrypt-conditional.patch | 21 + .../tools/haskell/hadrian/make-hadrian.nix | 3 + pkgs/tools/networking/mailctl/default.nix | 97 - pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 3 + pkgs/top-level/release-haskell.nix | 7 +- 21 files changed, 1914 insertions(+), 1317 deletions(-) create mode 100644 pkgs/applications/editors/yi/wrapper.nix create mode 100644 pkgs/development/haskell-modules/patches/password-3.0.4.0-scrypt-conditional.patch delete mode 100644 pkgs/tools/networking/mailctl/default.nix diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index feeb6f38673d..d01991784977 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -57,8 +57,8 @@ Available compilers are collected under `haskell.compiler`. Each of those compiler versions has a corresponding attribute set `packages` built with it. However, the non-standard package sets are not tested regularly and, as a result, contain fewer working packages. The corresponding package set for GHC -9.4.5 is `haskell.packages.ghc945`. In fact `haskellPackages` is just an alias -for `haskell.packages.ghc964`: +9.4.5 is `haskell.packages.ghc945`. In fact `haskellPackages` (at the time of writing) is just an alias +for `haskell.packages.ghc966`: Every package set also re-exposes the GHC used to build its packages as `haskell.packages.*.ghc`. diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix new file mode 100644 index 000000000000..98b1697e9e70 --- /dev/null +++ b/pkgs/applications/editors/yi/wrapper.nix @@ -0,0 +1,28 @@ +# To use this for hacking of your Yi config file, drop into a shell +# with env attribute. +{ + lib, + stdenv, + makeWrapper, + haskellPackages, + extraPackages ? (s: [ ]), +}: +let + yiEnv = haskellPackages.ghcWithPackages (self: [ self.yi ] ++ extraPackages self); +in +stdenv.mkDerivation { + pname = "yi-custom"; + dontUnpack = true; + nativeBuildInputs = [ makeWrapper ]; + + buildCommand = '' + mkdir -p $out/bin + makeWrapper ${haskellPackages.yi}/bin/yi $out/bin/yi \ + --set NIX_GHC ${yiEnv}/bin/ghc + ''; + + # For hacking purposes + passthru.env = yiEnv; + + inherit (haskellPackages.yi) meta version; +} diff --git a/pkgs/by-name/oa/oama/package.nix b/pkgs/by-name/oa/oama/package.nix index e938805bac86..1f87b3bffe43 100644 --- a/pkgs/by-name/oa/oama/package.nix +++ b/pkgs/by-name/oa/oama/package.nix @@ -15,14 +15,7 @@ let passthru.updateScript = ./update.sh; }; - raw-pkg = (haskellPackages.callPackage ./generated-package.nix { }).overrideScope ( - final: prev: { - # Dependency twain requires an older version of http2, and we cannot mix - # versions of transitive dependencies. - http2 = final.http2_3_0_3; - warp = final.warp_3_3_30; - } - ); + raw-pkg = haskellPackages.callPackage ./generated-package.nix { }; in lib.pipe raw-pkg [ (overrideCabal overrides) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 557a787a0965..dcff9e8cb404 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "750067bc36e810a96c066c8800438e0ce9ced327", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/750067bc36e810a96c066c8800438e0ce9ced327.tar.gz", - "sha256": "1bfr8r14rkisjp1f3iln12h4f5n66k8wkk09jvk7adal4grlpjny", - "msg": "Update from Hackage at 2024-10-05T14:46:54Z" + "commit": "0b0765b206e909965c9a65d28e87ebc9aae4d8af", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0b0765b206e909965c9a65d28e87ebc9aae4d8af.tar.gz", + "sha256": "1rh4jmbj2v4n1lf8cv8qkj5rx10gjib2cmfsdxaf2d3n0c4cr4bn", + "msg": "Update from Hackage at 2024-10-25T11:10:52Z" } diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 8830b8d179b2..10554c4cb48a 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,5 +1,5 @@ import ./common-hadrian.nix { - version = "9.11.20240423"; - rev = "dddc9dff0547733a10e7f505612ab9df3a7c21b6"; - sha256 = "0993sdmzzyymllck8mcpa1zgrjqjfxcvk1ykvfc18bvbs4145cm9"; + version = "9.13.20241031"; + rev = "0b11cdc022ce33d089db95b2b2e7c1f4bb326d37"; + sha256 = "0kqnpcgv49ricbr950lffs8gx7jrcg6anzc0qvwy5pb518w0d37i"; } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 030b8a4d4379..bd174babd549 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -22,20 +22,16 @@ self: super: { # enable list-transformer, jailbreaking is necessary until next release >0.13.0: https://github.com/ivanperez-keera/dunai/issues/427 dunai = doJailbreak (addBuildDepend self.list-transformer (enableCabalFlag "list-transformer" super.dunai)); - # Make sure that Cabal 3.10.* can be built as-is - Cabal_3_10_3_0 = doDistribute (super.Cabal_3_10_3_0.override ({ + # Make sure that Cabal_* can be built as-is + Cabal_3_10_3_0 = doDistribute (super.Cabal_3_10_3_0.override { Cabal-syntax = self.Cabal-syntax_3_10_3_0; - } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { - # Use process core package when possible - process = self.process_1_6_24_0; - })); - - Cabal_3_12_1_0 = doDistribute (super.Cabal_3_12_1_0.override ({ + }); + Cabal_3_12_1_0 = doDistribute (super.Cabal_3_12_1_0.override { Cabal-syntax = self.Cabal-syntax_3_12_1_0; - } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { - # Use process core package when possible - process = self.process_1_6_24_0; - })); + }); + Cabal_3_14_0_0 = doDistribute (super.Cabal_3_14_0_0.override { + Cabal-syntax = self.Cabal-syntax_3_14_0_0; + }); # hackage-security == 0.6.2.6 has a wider support range in theory, but it only # makes sense to use the non Stackage version if we want to use Cabal* >= 3.12 @@ -366,15 +362,6 @@ self: super: { ] super.threadscope); - # http2 also overridden in all-packages.nix for mailctl. - # twain is currently only used by mailctl, so the .overrideScope shouldn't - # negatively affect any other packages, at least currently... - # https://github.com/alexmingoia/twain/issues/5 - twain = super.twain.overrideScope (self: _: { - http2 = self.http2_3_0_3; - warp = self.warp_3_3_30; - }); - # The latest release on hackage has an upper bound on containers which # breaks the build, though it works with the version of containers present # and the upper bound doesn't exist in code anymore: @@ -1270,6 +1257,7 @@ self: super: { stack = super.stack.overrideScope (lself: lsuper: { # stack-3.1.1 requires the latest versions of these libraries pantry = lself.pantry_0_10_0; + static-bytes = lself.static-bytes_0_1_1; # for pantry_0_10_0 tar = lself.tar_0_6_3_0; # Upstream stack-3.1.1 is compiled with hpack-0.37.0, and we make sure to @@ -2002,14 +1990,6 @@ self: super: { # Test suite fails, upstream not reachable for simple fix (not responsive on github) vivid-osc = dontCheck super.vivid-osc; vivid-supercollider = dontCheck super.vivid-supercollider; - vivid = overrideCabal (drv: assert drv.version == "0.5.2.0"; { - # 2024-10-18: Some library dependency must have stopped - # re-exporting 'void', so now it needs an extra import line. - # Fixed in 0.5.2.1. - postPatch = '' - sed -i '/) where/a import Control.Monad (void)' Vivid/GlobalState.hs - ''; - }) super.vivid; # Test suite does not compile. feed = dontCheck super.feed; @@ -2276,44 +2256,6 @@ self: super: { # Too strict bound on hspec (<2.11) utf8-light = doJailbreak super.utf8-light; - large-hashable = lib.pipe (super.large-hashable.override { - # https://github.com/factisresearch/large-hashable/commit/5ec9d2c7233fc4445303564047c992b693e1155c - utf8-light = null; - }) [ - # 2022-03-21: use version from git which supports GHC 9.{0,2} and aeson 2.0 - (assert super.large-hashable.version == "0.1.0.4"; overrideSrc { - version = "unstable-2022-06-10"; - src = pkgs.fetchFromGitHub { - owner = "factisresearch"; - repo = "large-hashable"; - rev = "4d149c828c185bcf05556d1660f79ff1aec7eaa1"; - sha256 = "141349qcw3m93jw95jcha9rsg2y8sn5ca5j59cv8xmci38k2nam0"; - }; - }) - # Provide newly added dependencies - (overrideCabal (drv: { - libraryHaskellDepends = drv.libraryHaskellDepends or [] ++ [ - self.cryptonite - self.memory - ]; - testHaskellDepends = drv.testHaskellDepends or [] ++ [ - self.inspection-testing - ]; - })) - # https://github.com/factisresearch/large-hashable/issues/24 - (overrideCabal (drv: { - testFlags = drv.testFlags or [] ++ [ - "-n" "^Data.LargeHashable.Tests.Inspection:genericSumGetsOptimized$" - ]; - })) - # https://github.com/factisresearch/large-hashable/issues/25 - # Currently broken with text >= 2.0 - (overrideCabal (lib.optionalAttrs (lib.versionAtLeast self.ghc.version "9.4") { - broken = true; - hydraPlatforms = []; - })) - ]; - # BSON defaults to requiring network instead of network-bsd which is # required nowadays: https://github.com/mongodb-haskell/bson/issues/26 bson = appendConfigureFlag "-f-_old_network" (super.bson.override { diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index e931a60ada41..1c432ce3c937 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -331,6 +331,10 @@ self: super: ({ # Tests fail on macOS https://github.com/mrkkrp/zip/issues/112 zip = dontCheck super.zip; + snap = super.snap.overrideAttrs (drv: { + __darwinAllowLocalNetworking = true; + }); + warp = super.warp.overrideAttrs (drv: { __darwinAllowLocalNetworking = true; }); diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix index dcb91d08add0..6d0cd255ef9c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix @@ -69,7 +69,7 @@ self: super: { integer-conversion = doDistribute self.integer-conversion_0_1_1; ghc-lib-parser = doDistribute self.ghc-lib-parser_9_10_1_20240511; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_10_0_0; - http2 = super.http2_5_3_4; + http2 = self.http2_5_3_4; lens = doDistribute self.lens_5_3_2; lukko = doDistribute self.lukko_0_1_2; network-control = super.network-control_0_1_3; @@ -84,6 +84,7 @@ self: super: { time-manager = super.time-manager_0_1_0; th-abstraction = doDistribute self.th-abstraction_0_7_0_0; uuid-types = doDistribute self.uuid-types_1_0_6; + warp = pkgs.haskell.lib.dontCheck super.warp_3_4_3; # test suite assumes it can freely call curl # A given major version of ghc-exactprint only supports one version of GHC. ghc-exactprint = doDistribute self.ghc-exactprint_1_9_0_0; @@ -126,7 +127,6 @@ self: super: { primitive-unlifted = dontCheck super.primitive-unlifted; # doesn't compile with primitive ==0.9.* bsb-http-chunked = pkgs.haskell.lib.dontCheck super.bsb-http-chunked; # https://github.com/sjakobi/bsb-http-chunked/issues/45 hinotify = pkgs.haskell.lib.dontCheck super.hinotify; # https://github.com/kolmodin/hinotify/issues/38 - warp = pkgs.haskell.lib.dontCheck super.warp_3_4_2; # test suite assumes it can freely call curl haskell-language-server = disableCabalFlag "retrie" (disableCabalFlag "hlint" (disableCabalFlag "stylishhaskel" (super.haskell-language-server.override {stylish-haskell = null;retrie = null;apply-refact=null;hlint = null;}))); diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index fb7115d6bbd2..91b24ebf9429 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -4,7 +4,7 @@ with haskellLib; let inherit (pkgs.stdenv.hostPlatform) isDarwin; - + inherit (pkgs) lib; in self: super: { @@ -54,9 +54,9 @@ self: super: { # Version upgrades # th-abstraction = doDistribute self.th-abstraction_0_7_0_0; - ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_2_20240223; + ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_3_20241022; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2; - ghc-lib = doDistribute self.ghc-lib_9_8_2_20240223; + ghc-lib = doDistribute self.ghc-lib_9_8_3_20241022; megaparsec = doDistribute self.megaparsec_9_6_1; # aeson 2.2.3.0 seemingly unnecessesarily bumped the lower bound on hashable # https://github.com/haskell/aeson/commit/1a666febd0775d8e88d315ece1b97cd20602fb5f @@ -147,3 +147,8 @@ self: super: { }) super.reflex; } +// lib.optionalAttrs (lib.versionAtLeast super.ghc.version "9.8.3") { + # Breakage related to GHC 9.8.3 / deepseq 1.5.1.0 + # https://github.com/typeable/generic-arbitrary/issues/18 + generic-arbitrary = dontCheck super.generic-arbitrary; +} diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 6d8bc6ad3b76..a34c5110db85 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -84,6 +84,7 @@ broken-packages: - aeson-flat # failure in job https://hydra.nixos.org/build/233220787 at 2023-09-02 - aeson-flatten # failure in job https://hydra.nixos.org/build/233242954 at 2023-09-02 - aeson-flowtyped # failure in job https://hydra.nixos.org/build/233245878 at 2023-09-02 + - aeson-generic-default # failure in job https://hydra.nixos.org/build/276370826 at 2024-11-06 - aeson-generics-typescript # failure in job https://hydra.nixos.org/build/245703304 at 2024-01-07 - aeson-injector # failure in job https://hydra.nixos.org/build/233200351 at 2023-09-02 - aeson-json-ast # failure in job https://hydra.nixos.org/build/233249406 at 2023-09-02 @@ -2159,6 +2160,7 @@ broken-packages: - graph-matchings # failure in job https://hydra.nixos.org/build/233245821 at 2023-09-02 - graphmod-plugin # failure in job https://hydra.nixos.org/build/233192543 at 2023-09-02 - graphql-api # failure in job https://hydra.nixos.org/build/233254333 at 2023-09-02 + - graphql-spice # failure in job https://hydra.nixos.org/build/276376899 at 2024-11-06 - graphql-utils # failure in job https://hydra.nixos.org/build/233221340 at 2023-09-02 - graphql-w-persistent # failure in job https://hydra.nixos.org/build/233228956 at 2023-09-02 - graph-rewriting # failure in job https://hydra.nixos.org/build/233191278 at 2023-09-02 @@ -2909,6 +2911,7 @@ broken-packages: - hssqlppp # failure in job https://hydra.nixos.org/build/233216888 at 2023-09-02 - HsSVN # failure in job https://hydra.nixos.org/build/233213151 at 2023-09-02 - hs-tags # failure in job https://hydra.nixos.org/build/233258358 at 2023-09-02 + - hs-tango # failure in job https://hydra.nixos.org/build/276377558 at 2024-11-06 - hstatsd # failure in job https://hydra.nixos.org/build/233232363 at 2023-09-02 - hstats # failure in job https://hydra.nixos.org/build/233239963 at 2023-09-02 - hs-term-emulator # failure in job https://hydra.nixos.org/build/233252262 at 2023-09-02 @@ -3068,6 +3071,7 @@ broken-packages: - ieee-utils # failure in job https://hydra.nixos.org/build/233224430 at 2023-09-02 - iexcloud # failure in job https://hydra.nixos.org/build/233224874 at 2023-09-02 - ifcxt # failure in job https://hydra.nixos.org/build/233196911 at 2023-09-02 + - if-instance # failure in job https://hydra.nixos.org/build/276378643 at 2024-11-06 - IFS # failure in job https://hydra.nixos.org/build/233246865 at 2023-09-02 - ige # failure in job https://hydra.nixos.org/build/233224389 at 2023-09-02 - ig # failure in job https://hydra.nixos.org/build/233203872 at 2023-09-02 @@ -3807,6 +3811,7 @@ broken-packages: - microbase # failure in job https://hydra.nixos.org/build/233204368 at 2023-09-02 - microformats2-parser # failure in job https://hydra.nixos.org/build/233238485 at 2023-09-02 - microgroove # failure in job https://hydra.nixos.org/build/233196933 at 2023-09-02 + - MicroHs # failure in job https://hydra.nixos.org/build/276379260 at 2024-11-06 - microlens-each # failure in job https://hydra.nixos.org/build/233253621 at 2023-09-02 - microlens-process # failure in job https://hydra.nixos.org/build/233190805 at 2023-09-02 - microlens-pro # failure in job https://hydra.nixos.org/build/252733422 at 2024-03-16 @@ -4227,6 +4232,7 @@ broken-packages: - oi # failure in job https://hydra.nixos.org/build/233190838 at 2023-09-02 - okapi # failure in job https://hydra.nixos.org/build/233193822 at 2023-09-02 - old-version # failure in job https://hydra.nixos.org/build/233198538 at 2023-09-02 + - ollama-haskell # failure in job https://hydra.nixos.org/build/276371507 at 2024-11-06 - om-actor # failure in job https://hydra.nixos.org/build/233231027 at 2023-09-02 - omaketex # failure in job https://hydra.nixos.org/build/233202599 at 2023-09-02 - ombra # failure in job https://hydra.nixos.org/build/233192387 at 2023-09-02 @@ -4731,6 +4737,8 @@ broken-packages: - powermate # failure in job https://hydra.nixos.org/build/233224977 at 2023-09-02 - powerpc # failure in job https://hydra.nixos.org/build/233217983 at 2023-09-02 - powerqueue-levelmem # failure in job https://hydra.nixos.org/build/233232882 at 2023-09-02 + - ppad-sha256 # failure in job https://hydra.nixos.org/build/276377736 at 2024-11-06 + - ppad-sha512 # failure in job https://hydra.nixos.org/build/276375868 at 2024-11-06 - pprecord # failure in job https://hydra.nixos.org/build/233198838 at 2023-09-02 - PPrinter # failure in job https://hydra.nixos.org/build/233253160 at 2023-09-02 - pqc # failure in job https://hydra.nixos.org/build/233217425 at 2023-09-02 @@ -6287,6 +6295,7 @@ broken-packages: - type-indexed-queues # failure in job https://hydra.nixos.org/build/233197833 at 2023-09-02 - type-interpreter # failure in job https://hydra.nixos.org/build/233192182 at 2023-09-02 - type-int # failure in job https://hydra.nixos.org/build/233245978 at 2023-09-02 + - typelet # failure in job https://hydra.nixos.org/build/276367145 at 2024-11-06 - type-level-bst # failure in job https://hydra.nixos.org/build/233202030 at 2023-09-02 - type-level-natural-number-induction # failure in job https://hydra.nixos.org/build/233259499 at 2023-09-02 - type-level-natural-number-operations # failure in job https://hydra.nixos.org/build/233198314 at 2023-09-02 @@ -6839,7 +6848,10 @@ broken-packages: - yhccore # failure in job https://hydra.nixos.org/build/233199669 at 2023-09-02 - yhseq # failure in job https://hydra.nixos.org/build/233191724 at 2023-09-02 - yices # failure in job https://hydra.nixos.org/build/233242137 at 2023-09-02 - - yi-language # failure in job https://hydra.nixos.org/build/233217570 at 2023-09-02 + - yi-contrib # failure in job https://hydra.nixos.org/build/276370855 at 2024-11-06 + - yi-monokai # failure in job https://hydra.nixos.org/build/276375617 at 2024-11-06 + - yi-solarized # failure in job https://hydra.nixos.org/build/276380211 at 2024-11-06 + - yi-spolsky # failure in job https://hydra.nixos.org/build/276371008 at 2024-11-06 - yoctoparsec # failure in job https://hydra.nixos.org/build/233192019 at 2023-09-02 - yoda # failure in job https://hydra.nixos.org/build/233200530 at 2023-09-02 - Yogurt # failure in job https://hydra.nixos.org/build/233212103 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 667a79adb859..b1dc2492f8b9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -36,7 +36,8 @@ default-package-overrides: - hnix-store-remote < 0.7 # 2024-09-12: match xmonad 0.17.* from Stackage LTS - xmonad-contrib < 0.18.1 - + # 2024-11-01: no release version of http2/3 supports http-semantics >= 0.3.0 at the moment + - http-semantics < 0.3.0 extra-packages: - Cabal == 3.2.* # Used for packages needing newer Cabal on ghc 8.6 and 8.8 @@ -72,7 +73,6 @@ extra-packages: - hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-megaparsec == 2.2.0 # 2023-11-18: Latest version compatible with ghc 9.0, needed for HLS - hspec-meta < 2.8 # 2022-12-07: Needed for elmPackages.elm / hspec-discover - - http2 < 3.3 # 2023-08-24: Needed for twain - immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20 - language-docker == 11.0.0 # required by hadolint 2.12.0, 2022-11-16 - language-javascript == 0.7.0.0 # required by purescript @@ -89,7 +89,6 @@ extra-packages: - primitive-unlifted == 0.1.3.1 # 2024-03-16: Needed for hls on ghc 9.2 - stylish-haskell == 0.14.4.0 # 2022-09-19: needed for hls on ghc 9.2 - text == 2.0.2 # 2023-09-14: Needed for elm (which is currently on ghc-8.10) - - warp < 3.3.31 # 2024-03-20: for twain, which requires http2 3.0.3 - weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7 - weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2 - weeder == 2.4.* # 2023-02-02: preserve for GHC 9.2.* @@ -821,8 +820,6 @@ supported-platforms: midi-alsa: [ platforms.linux ] # alsa-core only supported on linux midisurface: [ platforms.linux ] # alsa-core only supported on linux OrderedBits: [ platforms.x86 ] # lacks implementations for non-x86: https://github.com/choener/OrderedBits/blob/401cbbe933b1635aa33e8e9b29a4a570b0a8f044/lib/Data/Bits/Ordered.hs#L316 - password: [ platforms.x86 ] # uses scrypt, which requries x86 - password-instances: [ platforms.x86 ] # uses scrypt, which requries x86 reactivity: [ platforms.windows ] reflex-libtelnet: [ platforms.linux ] # pkgs.libtelnet only supports linux scat: [ platforms.x86 ] # uses scrypt, which requries x86 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 235261802442..5bde9a49a237 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 22.36 +# Stackage LTS 22.39 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -397,7 +397,7 @@ default-package-overrides: - atom-conduit ==0.9.0.1 - atomic-counter ==0.1.2.1 - atomic-primops ==0.8.8 - - atomic-write ==0.2.0.7 + - atomic-write ==0.2.1.0 - attoparsec ==0.14.4 - attoparsec-aeson ==2.1.0.0 - attoparsec-base64 ==0.0.0 @@ -454,7 +454,7 @@ default-package-overrides: - bcp47 ==0.2.0.6 - bcp47-orphans ==0.1.0.6 - bcrypt ==0.0.11 - - beam-core ==0.10.1.0 + - beam-core ==0.10.3.0 - bech32 ==1.1.7 - bech32-th ==1.1.7 - benchpress ==0.2.2.23 @@ -508,6 +508,8 @@ default-package-overrides: - blaze-textual ==0.2.3.1 - bloodhound ==0.21.0.0 - bloomfilter ==2.0.1.2 + - bluefin ==0.0.9.0 + - bluefin-internal ==0.0.9.0 - bm ==0.2.0.0 - bmp ==1.2.6.4 - bnb-staking-csvs ==0.2.2.0 @@ -527,7 +529,7 @@ default-package-overrides: - bounded-qsem ==0.1.0.2 - bounded-queue ==1.0.0 - boundingboxes ==0.2.3 - - box ==0.9.3.1 + - box ==0.9.3.2 - boxes ==0.1.5 - breakpoint ==0.1.4.0 - brick ==2.1.1 @@ -552,7 +554,7 @@ default-package-overrides: - bv-sized ==1.0.5 - byteable ==0.1.1 - bytebuild ==0.3.16.2 - - byte-count-reader ==0.10.1.11 + - byte-count-reader ==0.10.1.12 - bytedump ==1.0 - bytehash ==0.1.1.0 - byte-order ==0.1.3.1 @@ -577,7 +579,7 @@ default-package-overrides: - cabal2spec ==2.7.1 - cabal-appimage ==0.4.0.5 - cabal-clean ==0.2.20230609 - - cabal-debian ==5.2.3 + - cabal-debian ==5.2.4 - cabal-doctest ==1.0.10 - cabal-file ==0.1.1 - cabal-plan ==0.7.3.0 @@ -683,9 +685,9 @@ default-package-overrides: - comfort-fftw ==0.0.0.1 - comfort-glpk ==0.1 - comfort-graph ==0.0.4 - - commonmark ==0.2.6 + - commonmark ==0.2.6.1 - commonmark-extensions ==0.2.5.5 - - commonmark-pandoc ==0.2.2.1 + - commonmark-pandoc ==0.2.2.2 - commutative ==0.0.2 - commutative-semigroups ==0.1.1.0 - comonad ==5.0.8 @@ -824,14 +826,14 @@ default-package-overrides: - data-bword ==0.1.0.2 - data-checked ==0.3 - data-clist ==0.2 - - data-default ==0.7.1.1 - - data-default-class ==0.1.2.0 - - data-default-instances-base ==0.1.0.1 + - data-default ==0.7.1.2 + - data-default-class ==0.1.2.2 + - data-default-instances-base ==0.1.0.3 - data-default-instances-bytestring ==0.0.1 - data-default-instances-case-insensitive ==0.0.1 - data-default-instances-containers ==0.0.1 - - data-default-instances-dlist ==0.0.1 - - data-default-instances-old-locale ==0.0.1 + - data-default-instances-dlist ==0.0.1.2 + - data-default-instances-old-locale ==0.0.1.2 - data-default-instances-unordered-containers ==0.0.1 - data-default-instances-vector ==0.0.1 - data-diverse ==4.7.1.0 @@ -1057,7 +1059,7 @@ default-package-overrides: - extrapolate ==0.4.6 - fail ==4.9.0.0 - FailT ==0.1.2.0 - - fakedata ==1.0.3 + - fakedata ==1.0.5 - fakedata-parser ==0.1.0.0 - fakedata-quickcheck ==0.2.0 - fakefs ==0.3.0.2 @@ -1066,7 +1068,7 @@ default-package-overrides: - falsify ==0.2.0 - fasta ==0.10.4.2 - fast-digits ==0.3.2.0 - - fast-logger ==3.2.3 + - fast-logger ==3.2.4 - fast-math ==1.0.2 - fast-myers-diff ==0.0.1 - fb ==2.1.1.1 @@ -1074,12 +1076,11 @@ default-package-overrides: - fclabels ==2.0.5.1 - fdo-notify ==0.3.1 - feature-flags ==0.1.0.1 - - fedora-dists ==2.1.1 - - fedora-haskell-tools ==1.1 + - fedora-releases ==0.1.0 - FenwickTree ==0.1.2.1 - fft ==0.1.8.7 - fftw-ffi ==0.1 - - fgl ==5.8.2.0 + - fgl ==5.8.3.0 - fgl-arbitrary ==0.2.0.6 - fields-json ==0.4.0.0 - file-embed ==0.0.16.0 @@ -1132,7 +1133,7 @@ default-package-overrides: - ForestStructures ==0.0.1.1 - forkable-monad ==0.2.0.3 - forma ==1.2.0 - - formatn ==0.3.0.1 + - formatn ==0.3.1.0 - format-numbers ==0.1.0.1 - formatting ==7.2.0 - foundation ==0.0.30 @@ -1170,7 +1171,7 @@ default-package-overrides: - generically ==0.1.1 - generic-arbitrary ==1.0.1 - generic-constraints ==1.1.1.1 - - generic-data ==1.1.0.0 + - generic-data ==1.1.0.1 - generic-data-surgery ==0.3.0.0 - generic-deriving ==1.14.5 - generic-functor ==1.1.0.0 @@ -1296,7 +1297,7 @@ default-package-overrides: - GLUT ==2.7.0.16 - gmail-simple ==0.1.0.6 - gnuplot ==0.5.7 - - goldplate ==0.2.1.1 + - goldplate ==0.2.2.1 - google-isbn ==1.0.3 - gopher-proxy ==0.1.1.3 - gpolyline ==0.1.0.1 @@ -1343,7 +1344,7 @@ default-package-overrides: - hashing ==0.1.1.0 - hashmap ==1.3.3 - hashtables ==1.3.1 - - haskell-gi ==0.26.11 + - haskell-gi ==0.26.12 - haskell-gi-base ==0.26.8 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.1.1 @@ -1476,7 +1477,7 @@ default-package-overrides: - hslua-classes ==2.3.1 - hslua-cli ==1.4.3 - hslua-core ==2.3.2 - - hslua-list ==1.1.3 + - hslua-list ==1.1.4 - hslua-marshalling ==2.3.1 - hslua-module-doclayout ==1.1.1.2 - hslua-module-path ==1.1.1 @@ -1731,7 +1732,7 @@ default-package-overrides: - LambdaHack ==0.11.0.1 - lame ==0.2.2 - language-avro ==0.1.4.0 - - language-c ==0.9.3 + - language-c ==0.9.4 - language-c99 ==0.2.0 - language-c99-simple ==0.3.0 - language-c99-util ==0.2.0 @@ -1781,7 +1782,7 @@ default-package-overrides: - liboath-hs ==0.0.1.2 - libyaml ==0.1.4 - libyaml-clib ==0.2.5 - - lifted-async ==0.10.2.5 + - lifted-async ==0.10.2.6 - lifted-base ==0.2.3.12 - lift-generics ==0.2.1 - lift-type ==0.1.2.0 @@ -1853,7 +1854,7 @@ default-package-overrides: - markdown-unlit ==0.6.0 - markov-chain ==0.0.3.4 - markov-chain-usage-model ==0.0.0 - - markup-parse ==0.1.1 + - markup-parse ==0.1.1.1 - mason ==0.2.6 - massiv ==1.0.4.0 - massiv-io ==1.0.0.1 @@ -1872,7 +1873,7 @@ default-package-overrides: - matrix-static ==0.3 - maximal-cliques ==0.1.1 - mbox-utility ==0.0.3.1 - - mcmc ==0.8.2.0 + - mcmc ==0.8.3.1 - mcmc-types ==1.0.3 - median-stream ==0.7.0.0 - med-module ==0.1.3 @@ -2153,7 +2154,7 @@ default-package-overrides: - pandoc-cli ==3.1.11.1 - pandoc-dhall-decoder ==0.1.0.1 - pandoc-lua-engine ==0.2.1.2 - - pandoc-lua-marshal ==0.2.8 + - pandoc-lua-marshal ==0.2.9 - pandoc-plot ==1.8.0 - pandoc-server ==0.1.0.5 - pandoc-throw ==0.1.0.0 @@ -2317,7 +2318,7 @@ default-package-overrides: - primes ==0.2.1.0 - primitive ==0.8.0.0 - primitive-addr ==0.1.0.3 - - primitive-extras ==0.10.2 + - primitive-extras ==0.10.2.1 - primitive-offset ==0.2.0.1 - primitive-serial ==0.1 - primitive-unaligned ==0.1.1.2 @@ -2362,8 +2363,8 @@ default-package-overrides: - PyF ==0.11.3.0 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.1.0 - - qrcode-core ==0.9.9 - - qrcode-juicypixels ==0.8.5 + - qrcode-core ==0.9.10 + - qrcode-juicypixels ==0.8.6 - quaalude ==0.0.0.1 - quadratic-irrational ==0.1.1 - QuasiText ==0.1.2.6 @@ -2464,7 +2465,7 @@ default-package-overrides: - relational-record ==0.2.2.0 - relational-schemas ==0.1.8.1 - reliable-io ==0.0.2 - - relude ==1.2.1.0 + - relude ==1.2.2.0 - renderable ==0.2.0.1 - replace-attoparsec ==1.5.0.0 - replace-megaparsec ==1.5.0.1 @@ -2606,7 +2607,7 @@ default-package-overrides: - servant-rate-limit ==0.2.0.0 - servant-rawm ==1.0.0.0 - servant-server ==0.20.2 - - servant-static-th ==1.0.0.0 + - servant-static-th ==1.0.0.1 - servant-subscriber ==0.7.0.0 - servant-swagger ==1.2.1 - servant-swagger-ui ==0.3.5.5.0.0 @@ -2635,8 +2636,8 @@ default-package-overrides: - shared-memory ==0.2.0.1 - shell-conduit ==5.0.0 - shell-escape ==0.2.0 - - shellify ==0.11.0.1 - - shellmet ==0.0.4.1 + - shellify ==0.11.0.3 + - shellmet ==0.0.5.0 - shelltestrunner ==1.10 - shell-utility ==0.1 - shellwords ==0.1.3.1 @@ -2762,7 +2763,7 @@ default-package-overrides: - Stream ==0.4.7.2 - streaming ==0.2.4.0 - streaming-attoparsec ==1.0.0.1 - - streaming-bytestring ==0.3.2 + - streaming-bytestring ==0.3.3 - streaming-commons ==0.2.2.6 - streaming-wai ==0.1.1 - streamly ==0.10.1 @@ -3094,9 +3095,9 @@ default-package-overrides: - universe-instances-extended ==1.1.3 - universe-reverse-instances ==1.1.1 - universe-some ==1.2.1 - - universum ==1.8.2.1 + - universum ==1.8.2.2 - unix-bytestring ==0.4.0.2 - - unix-compat ==0.7.2 + - unix-compat ==0.7.3 - unix-time ==0.4.15 - unjson ==0.15.4 - unliftio ==0.2.25.0 @@ -3282,7 +3283,7 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.11.2 - yaml-unscrambler ==0.1.0.19 - - Yampa ==0.14.10 + - Yampa ==0.14.11 - yarn-lock ==0.6.5 - yeshql-core ==4.2.0.0 - yesod ==1.6.2.1 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 9fef480d2c11..7d3699af9eb5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -802,7 +802,7 @@ dont-distribute-packages: - chart-cli - chart-svg - chart-svg-various - - chart-svg_0_6_1_0 + - chart-svg_0_7_0_0 - chart-unit - chassis - chatty @@ -1866,6 +1866,7 @@ dont-distribute-packages: - hark - harmony - haroonga-httpd + - harpie-numhask - has-th - hasbolt - hascat @@ -2013,7 +2014,6 @@ dont-distribute-packages: - hedgehog-gen-json - hedis-pile - heftia - - heftia-effects - heist-aeson - helic - helics @@ -2498,6 +2498,7 @@ dont-distribute-packages: - language-python-colour - language-qux - language-spelling + - large-anon - lat - latex-formulae-hakyll - latex-formulae-pandoc @@ -3028,6 +3029,7 @@ dont-distribute-packages: - perdure - perf - perf-analysis + - perf_0_13_0_0 - perfecthash - periodic-client - periodic-client-exe @@ -3162,6 +3164,8 @@ dont-distribute-packages: - potoki-hasql - potoki-zlib - powerqueue-sqs + - ppad-hmac-drbg + - ppad-secp256k1 - pqueue-mtl - practice-room - pred-set @@ -3290,6 +3294,7 @@ dont-distribute-packages: - rasa-ext-vim - rascal - raw-feldspar + - rawlock - rawr - razom-text-util - rbr @@ -3379,6 +3384,7 @@ dont-distribute-packages: - reserve - resin - resource-pool-catchio + - resource-registry - resource-simple - respond - rest-client @@ -4289,25 +4295,6 @@ dont-distribute-packages: - yesod-routes-typescript - yesod-session-redis - yesod-worker - - yi - - yi-contrib - - yi-core - - yi-dynamic-configuration - - yi-emacs-colours - - yi-frontend-pango - - yi-frontend-vty - - yi-fuzzy-open - - yi-ireader - - yi-keymap-cua - - yi-keymap-emacs - - yi-keymap-vim - - yi-misc-modes - - yi-mode-haskell - - yi-mode-javascript - - yi-monokai - - yi-snippet - - yi-solarized - - yi-spolsky - yjftp - yjftp-libs - yoko diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 0fc43dec4927..7a85abfba34e 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -113,6 +113,35 @@ self: super: builtins.intersectAttrs super { '' + drv.preCheck or ""; }) super.agda2lagda; + # - Disable scrypt support since the library used only works on x86 due to SSE2: + # https://github.com/informatikr/scrypt/issues/8 + # - Use crypton as the encryption backend. That override becomes obsolete with + # 3.1.* since cabal2nix picks crypton by default then. + password = + let + scryptSupported = pkgs.stdenv.hostPlatform.isx86; + in + + lib.pipe + (super.password.override ({ + cryptonite = self.crypton; + } // lib.optionalAttrs (!scryptSupported) { + scrypt = null; + })) + ([ + (enableCabalFlag "crypton") + (disableCabalFlag "cryptonite") + # https://github.com/cdepillabout/password/pull/84 + (appendPatch ./patches/password-3.0.4.0-scrypt-conditional.patch) + (overrideCabal (drv: { + # patch doesn't apply otherwise because of revisions + prePatch = drv.prePatch or "" + '' + ${pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal + ''; + })) + ] ++ lib.optionals (!scryptSupported) [ + (disableCabalFlag "scrypt") + ]); audacity = enableCabalFlag "buildExamples" (overrideCabal (drv: { executableHaskellDepends = [self.optparse-applicative self.soxlib]; @@ -156,6 +185,11 @@ self: super: builtins.intersectAttrs super { ''; }) super.nvvm; + # Doesn't declare LLVM dependency, needs llvm-config + llvm-codegen = addBuildTools [ + pkgs.llvmPackages_17.llvm.dev # for native llvm-config + ] super.llvm-codegen; + # hledger* overrides inherit ( let @@ -381,7 +415,6 @@ self: super: builtins.intersectAttrs super { # The curl executable is required for withApplication tests. warp = addTestToolDepend pkgs.curl super.warp; - warp_3_3_30 = addTestToolDepend pkgs.curl super.warp_3_3_30; safe-exceptions = overrideCabal (drv: { # Fix strictDeps build error "could not execute: hspec-discover" @@ -1414,7 +1447,7 @@ self: super: builtins.intersectAttrs super { mpiImpl = pkgs.mpi.pname; disableUnused = with builtins; map disableCabalFlag (filter (n: n != mpiImpl) validMpi); in lib.pipe - (super.mpi-hs_0_7_3_0.override { ompi = pkgs.mpi; }) + (super.mpi-hs_0_7_3_1.override { ompi = pkgs.mpi; }) ( [ (addTestToolDepends [ pkgs.openssh pkgs.mpiCheckPhaseHook ]) ] ++ disableUnused ++ lib.optional (builtins.elem mpiImpl validMpi) (enableCabalFlag mpiImpl) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6e73461e51e5..d51851b2c471 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3379,6 +3379,8 @@ self: { pname = "ChasingBottoms"; version = "1.3.1.15"; sha256 = "0if8h6xq10y1xa90cwmx2jkxjn9628rzs8y6fsjmpjdcvcyr5wnj"; + revision = "1"; + editedCabalFile = "1h3c5dhaqkpmc7cvivigadfkjkjjriahzcpdw8qg62fl44gbkmh2"; libraryHaskellDepends = [ base containers mtl QuickCheck random syb ]; @@ -5885,8 +5887,8 @@ self: { pname = "Euterpea"; version = "2.0.7"; sha256 = "0kxdilxzg0dgz1684csbyfv4cifh9d92ac6pwp6dnrcwwpwskiw8"; - revision = "1"; - editedCabalFile = "1fdkjivbrp9q5vwiprjhpnpl9bir1qdiybc2hm52i016x3rx51d8"; + revision = "2"; + editedCabalFile = "05z8vn26yr8hl2dh23g80fpxj8s90hdaajjfnpblrkzhczz7317s"; libraryHaskellDepends = [ array arrows base bytestring containers deepseq ghc-prim HCodecs heap PortMidi random stm @@ -10783,8 +10785,8 @@ self: { ({ mkDerivation, array, base, containers, random }: mkDerivation { pname = "HaskellForMaths"; - version = "0.4.9"; - sha256 = "1jgim9g0jbv6k31aalq0yps843jmfx74k53lnd1p79kgad7670rz"; + version = "0.4.10"; + sha256 = "0ydaw5xwck2l9xzlqrdf3qv7p5s6dqd131q3mx6g0wpqpkjjic4q"; libraryHaskellDepends = [ array base containers random ]; description = "Combinatorics, group theory, commutative algebra, non-commutative algebra"; license = lib.licenses.bsd3; @@ -11801,8 +11803,8 @@ self: { }: mkDerivation { pname = "I1M"; - version = "0.1.0"; - sha256 = "0a5bh9hlsn6hmdqinc47hxlav1isv9jh2i4x3zfyfp4y4xrp2h93"; + version = "0.2.2"; + sha256 = "1p8rv0rhjyjjic03zzjp7qw1j3p5nz4if5ib9w1l0frlrybqb1s8"; libraryHaskellDepends = [ array base QuickCheck ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Code for the Haskell course taught at the University of Seville"; @@ -11933,8 +11935,8 @@ self: { }: mkDerivation { pname = "IPv6DB"; - version = "0.3.3.3"; - sha256 = "1f376a5zc0q20s2jp4z00hxj9h0ngp7k2bgx53g328hf3qyq676z"; + version = "0.3.3.4"; + sha256 = "1mkf2fqlg2n9q3l3p8rxdcmb7k281lz37x6hiry1wvxbn92d4pja"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -14365,8 +14367,8 @@ self: { }: mkDerivation { pname = "MicroHs"; - version = "0.9.18.0"; - sha256 = "1w1aazbsl80xk6kxmkcii6y33i42hw64bhjwcn62grh5xb220hag"; + version = "0.10.3.0"; + sha256 = "11zhgmkzkxxjhnf0jnzk50hsm60zxil5mqa6m1yq6wmg2h1g0vkf"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -14375,7 +14377,9 @@ self: { ]; description = "A small compiler for Haskell"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; mainProgram = "mhs"; + broken = true; }) {}; "MicrosoftTranslator" = callPackage @@ -14674,6 +14678,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "MonadRandom_0_6_1" = callPackage + ({ mkDerivation, base, mtl, primitive, random, transformers + , transformers-compat + }: + mkDerivation { + pname = "MonadRandom"; + version = "0.6.1"; + sha256 = "09v56xbp4l0qpv8l18289p4xmjjh56q07crj9h5801fiji8zz4w8"; + libraryHaskellDepends = [ + base mtl primitive random transformers transformers-compat + ]; + description = "Random-number generation monad"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "MonadRandomLazy" = callPackage ({ mkDerivation, base, MonadRandom, mtl, random }: mkDerivation { @@ -15258,6 +15278,8 @@ self: { pname = "NanoID"; version = "3.4.0.2"; sha256 = "1dddc7aakhrj65kdspj8ashfdfl894ybqf7iwy94l344ikldfkaj"; + revision = "1"; + editedCabalFile = "0kdr24dw1z1vj0a63bqsdz55ps4lksf4c5fw7l19bn51f71lpqrf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -18070,14 +18092,24 @@ self: { }) {}; "RandomDotOrg" = callPackage - ({ mkDerivation, base, HTTP-Simple, network }: + ({ mkDerivation, aeson, base, binary, bytestring, http-client + , http-client-tls, http-media, servant, servant-client + , servant-client-core, servant-jsonrpc, servant-jsonrpc-client + , text, time, unordered-containers, uuid-types + }: mkDerivation { pname = "RandomDotOrg"; - version = "0.2.1"; - sha256 = "0rfarn424wsvvwvi7b1qzvzc63dxfqmlyrfd0hdcvmgkq5h2iy4c"; - libraryHaskellDepends = [ base HTTP-Simple network ]; - description = "Interface to random.org"; - license = lib.licenses.publicDomain; + version = "1.0"; + sha256 = "10a4vh3n308i628v58s6wb5yn3vhpb4d989bmd4vvyv39xv92sj6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring http-client http-client-tls http-media + servant servant-client servant-client-core servant-jsonrpc + servant-jsonrpc-client text time unordered-containers uuid-types + ]; + description = "Haskell bindings to the RANDOM.ORG Core API"; + license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20330,6 +20362,8 @@ self: { pname = "Spintax"; version = "0.3.6.1"; sha256 = "066pks24c4501i86hgll3bygqkgyag7n2src19k0x9gc05p130wr"; + revision = "1"; + editedCabalFile = "1946q9361nzsp4aa6jxv36g96nhgb7isv3wpcrnvvk4r2w0jvlmp"; libraryHaskellDepends = [ attoparsec base extra mtl mwc-random text ]; @@ -20916,6 +20950,29 @@ self: { broken = true; }) {}; + "THSH" = callPackage + ({ mkDerivation, base, extra, filepath, ghc, parsec, process, PyF + , split, template-haskell, temporary, text, transformers + }: + mkDerivation { + pname = "THSH"; + version = "0.0.0.5"; + sha256 = "0hfc3f68w5n55k5gnlf6ip76j3b7yvirb81k373w8vq4rgqf447s"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base filepath ghc parsec process PyF template-haskell temporary + text transformers + ]; + executableHaskellDepends = [ + base extra filepath ghc process PyF split template-haskell + ]; + testHaskellDepends = [ base ghc PyF template-haskell ]; + description = "A \"noDSL\" approach to mixing shell scripting with Haskell programs using Template Haskell"; + license = lib.licenses.mit; + mainProgram = "thsh"; + }) {}; + "TLT" = callPackage ({ mkDerivation, ansi-terminal, base, free, mtl, resourcet , STMonadTrans, transformers @@ -23358,8 +23415,8 @@ self: { }: mkDerivation { pname = "Yampa"; - version = "0.14.10"; - sha256 = "1la2v70pzjmvw4j0v5sacb6vxclby86jx68jq6czzxyrl8ydijzc"; + version = "0.14.11"; + sha256 = "1pz1s0vb2h62zggbj6y6c3qhx7008758zq9gds347qv1hwg82jn9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -26011,15 +26068,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "aern2-mp_0_2_16_0" = callPackage + "aern2-mp_0_2_16_1" = callPackage ({ mkDerivation, base, cdar-mBound, collect-errors, deepseq, hspec , integer-logarithms, mixed-types-num, QuickCheck, reflection , regex-tdfa, template-haskell }: mkDerivation { pname = "aern2-mp"; - version = "0.2.16.0"; - sha256 = "1q9rc53zj49yfn5ap8khx8gvgphw7dr86agi77xaj1d0d97x35pi"; + version = "0.2.16.1"; + sha256 = "0y0043ckrg1cx1kpf18jk9nmav2h3bp1w4ywwnbwq2abqf3kmd1p"; libraryHaskellDepends = [ base cdar-mBound collect-errors deepseq hspec integer-logarithms mixed-types-num QuickCheck reflection regex-tdfa template-haskell @@ -26053,14 +26110,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "aern2-real_0_2_16_0" = callPackage + "aern2-real_0_2_16_1" = callPackage ({ mkDerivation, aern2-mp, base, collect-errors, hspec , integer-logarithms, mixed-types-num, QuickCheck }: mkDerivation { pname = "aern2-real"; - version = "0.2.16.0"; - sha256 = "14rdjkqpmk4f7135ssn03b7bqbakixx0hrrx742dc379pjq57k7d"; + version = "0.2.16.1"; + sha256 = "00g504rqvr3z5a8asnhr6c9xrhd6wjqzcscgik1qj2wvxfls32f6"; libraryHaskellDepends = [ aern2-mp base collect-errors hspec integer-logarithms mixed-types-num QuickCheck @@ -26618,6 +26675,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "aeson-generic-default" = callPackage + ({ mkDerivation, aeson, base, data-default, tasty, tasty-hunit + , text + }: + mkDerivation { + pname = "aeson-generic-default"; + version = "0.1.1.0"; + sha256 = "0al9xd9mdxffvpx0mb3rll68gmizwknh3g6ixfnvxx62anb47w2p"; + libraryHaskellDepends = [ aeson base data-default text ]; + testHaskellDepends = [ + aeson base data-default tasty tasty-hunit text + ]; + description = "Type-level default fields for aeson Generic FromJSON parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "aeson-generics-typescript" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, hspec, process, QuickCheck, random, split @@ -27386,8 +27461,8 @@ self: { }: mkDerivation { pname = "aftovolio"; - version = "0.2.1.0"; - sha256 = "18z69rzzzfkf4mivjzz9g5h4l1c7lc8s1dnsa6d1xwafhbc2mp2h"; + version = "0.4.0.0"; + sha256 = "0gf86va0x7ni169w4swcr1m5qf115i925pckbw342m7md3k8a6rv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36368,7 +36443,7 @@ self: { mainProgram = "amqp-builder"; }) {}; - "amqp_0_23_0" = callPackage + "amqp_0_24_0" = callPackage ({ mkDerivation, base, binary, bytestring, clock, containers , crypton-connection, data-binary-ieee754, data-default-class , hspec, hspec-expectations, monad-control, network, network-uri @@ -36376,8 +36451,8 @@ self: { }: mkDerivation { pname = "amqp"; - version = "0.23.0"; - sha256 = "0cp0hg4fmqxhzah67hgbwrrm2m7pn64y88chqk5vjhfa19km2np8"; + version = "0.24.0"; + sha256 = "0swrh5dh9hwp8m15x4hiplm89ls19bpmir44wnffzgz7v8rxh1mx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37037,14 +37112,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "annotated-exception_0_3_0_1" = callPackage + "annotated-exception_0_3_0_2" = callPackage ({ mkDerivation, base, containers, hspec, hspec-discover , safe-exceptions, text, unliftio-core }: mkDerivation { pname = "annotated-exception"; - version = "0.3.0.1"; - sha256 = "09lgqzx5g7wnfpj9a8zn10s8v919psxrzzg50vllryaqxxkfmj4a"; + version = "0.3.0.2"; + sha256 = "1xsyq28hkf7ngkq9v5ga958d2fqbmshc9gl8lzms6vknr64gaqr7"; libraryHaskellDepends = [ base containers safe-exceptions text unliftio-core ]; @@ -37259,8 +37334,8 @@ self: { pname = "ansigraph"; version = "0.3.0.5"; sha256 = "03ks75ik0jyfz55iz3gcccxgg73v1dw2nn0myl40c2rc31mwz39f"; - revision = "1"; - editedCabalFile = "047pnpd9sviia1wxx9czidz2in6jq7jgbln7l6dy2j157vyqi93k"; + revision = "2"; + editedCabalFile = "0kq3dijahr4yxp13v3v5d5v0v3zswkxh8idx5hyv0yp9d1czqars"; libraryHaskellDepends = [ ansi-terminal base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Terminal-based graphing via ANSI and Unicode"; @@ -39619,10 +39694,8 @@ self: { }: mkDerivation { pname = "arch-web"; - version = "0.2"; - sha256 = "0axyb62pjgh1l60qx6z8mppiq5gam3g6c9wfbrww8wl7f2kamwrp"; - revision = "1"; - editedCabalFile = "1msmx8w3m2aypigramyiwqz77vzx8r6ssyp0p35ndb03mzmrry3p"; + version = "0.3.1"; + sha256 = "1z8zfl0dskp7i0h5kgrw1nh94sxrmmfdpaykdjqiingn9dqnsmqm"; libraryHaskellDepends = [ aeson base deriving-aeson exceptions http-client http-client-tls http-types lens mtl servant servant-client servant-client-core text @@ -42273,24 +42346,6 @@ self: { }) {}; "atomic-write" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, hspec - , temporary, text, unix-compat - }: - mkDerivation { - pname = "atomic-write"; - version = "0.2.0.7"; - sha256 = "03cn3ii74h0w3g4h78xsx9v2sn58r3qsr2dbdwq340xwhiwcgxdm"; - libraryHaskellDepends = [ - base bytestring directory filepath temporary text unix-compat - ]; - testHaskellDepends = [ - base bytestring filepath hspec temporary text unix-compat - ]; - description = "Atomically write to a file"; - license = lib.licenses.mit; - }) {}; - - "atomic-write_0_2_1_0" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, hspec , hspec-discover, temporary, text, unix-compat }: @@ -42307,7 +42362,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Atomically write to a file"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "atomo" = callPackage @@ -46416,8 +46470,8 @@ self: { pname = "base16"; version = "1.0"; sha256 = "1plwc4yrkvd5j6y09fjvyzhr05mzhzwz6z41fyb60y0bj5j66dl6"; - revision = "1"; - editedCabalFile = "00r0j3l3af912b33mlsr5a48rr0l31gh34cmj8jf247c4a332rlk"; + revision = "2"; + editedCabalFile = "1dcb8m73xj2dfb8xbz731l91nm2jz532v971rsfm0kkid5ap9bvl"; libraryHaskellDepends = [ base bytestring deepseq primitive text text-short ]; @@ -47716,10 +47770,8 @@ self: { }: mkDerivation { pname = "beam-core"; - version = "0.10.1.0"; - sha256 = "0h1kr653wd00m5pypj4ia8d1ni6m2qrzqqqh19hnd8wz1n0pfd1h"; - revision = "1"; - editedCabalFile = "0sjc2zyy9f5r3qg4yxl1dq0c4ybvqvgh64vy078507sl8jxxl7v7"; + version = "0.10.3.0"; + sha256 = "1q3f95xjyinr6g9yxq1w32agp9n6q152b6mfpmabpv0l74c9mmhm"; libraryHaskellDepends = [ aeson base bytestring containers dlist free ghc-prim hashable microlens mtl network-uri scientific tagged text time vector @@ -47740,10 +47792,8 @@ self: { }: mkDerivation { pname = "beam-migrate"; - version = "0.5.2.1"; - sha256 = "16gl39cpj7gvb82i41h18606n6k40hi8lfyyw1x0dq73xs2ldfyc"; - revision = "2"; - editedCabalFile = "0788nzixn3fnm57vw5s69rwc3qmw0rr1d46lqwzxdsxqzcywq644"; + version = "0.5.3.1"; + sha256 = "0qx1nh5vvncgr4ixnraaahwp879v8wgn2lhixgzndk6zrs3y4a21"; libraryHaskellDepends = [ aeson base beam-core bytestring containers deepseq dependent-map dependent-sum free ghc-prim hashable haskell-src-exts microlens mtl @@ -47795,15 +47845,13 @@ self: { , bytestring, case-insensitive, conduit, free, hashable , haskell-src-exts, hedgehog, lifted-base, monad-control, mtl , network-uri, postgresql-libpq, postgresql-simple, scientific - , tagged, tasty, tasty-hunit, text, time, tmp-postgres + , tagged, tasty, tasty-hunit, testcontainers, text, time , transformers-base, unordered-containers, uuid, uuid-types, vector }: mkDerivation { pname = "beam-postgres"; - version = "0.5.3.1"; - sha256 = "19gagw9r2wfy398calkcnilsgl89sjpy8vj9bdswg390mw15m41n"; - revision = "2"; - editedCabalFile = "11f3jxljrfa4rva21r561w7vxafv63wmmsa9cq8bydcp3gzlgr4p"; + version = "0.5.4.1"; + sha256 = "0rxf275y89xh8if2w2my75fgy34vzc85lv4viyirgd0y26n9d0kc"; libraryHaskellDepends = [ aeson attoparsec base beam-core beam-migrate bytestring case-insensitive conduit free hashable haskell-src-exts lifted-base @@ -47813,7 +47861,7 @@ self: { ]; testHaskellDepends = [ aeson base beam-core beam-migrate bytestring hedgehog - postgresql-simple tasty tasty-hunit text tmp-postgres uuid vector + postgresql-simple tasty tasty-hunit testcontainers text uuid vector ]; description = "Connection layer between beam and postgres"; license = lib.licenses.mit; @@ -47900,8 +47948,8 @@ self: { }: mkDerivation { pname = "bearriver"; - version = "0.14.10"; - sha256 = "0fyjrwb3f7sqs1bbiga98h6bylgvmqfpqg59p07lhv4hrrgmx8ff"; + version = "0.14.11"; + sha256 = "13f9x9kavnkbg29mrp2zddvx5vqdyp6ias5a822hmlzqfzp5c1hy"; libraryHaskellDepends = [ base deepseq dunai mtl random simple-affine-space transformers ]; @@ -53290,8 +53338,10 @@ self: { ({ mkDerivation, bluefin-internal }: mkDerivation { pname = "bluefin"; - version = "0.0.8.0"; - sha256 = "16gzb82lrxhw4s1b1gmq03k094lfpczsls8csv02l77bkipjmfh8"; + version = "0.0.9.0"; + sha256 = "11balgaw73fi3bqnajhs570nfy5lcjzhxdkms2jbxsd80l6n1zx1"; + revision = "1"; + editedCabalFile = "0xll6fdlhr9h9kswn6kdbdk3wbd1z87wsrgr4g3bqsj29bdjqvb7"; libraryHaskellDepends = [ bluefin-internal ]; description = "The Bluefin effect system"; license = lib.licenses.mit; @@ -53322,10 +53372,8 @@ self: { }: mkDerivation { pname = "bluefin-internal"; - version = "0.0.8.0"; - sha256 = "1knhqll525qn74zbyqxn6k8d1zbb974h1qh92qpc7r3bqp5v576p"; - revision = "1"; - editedCabalFile = "1j27hka5sm5vld2mgvw238c4bg6ys7mzfjskdmdvbxs5yn6ywqpr"; + version = "0.0.9.0"; + sha256 = "06y5vq24jrm5l3lf2sq43qnc0i8zazrf9g28spmgzjlsqcv84g4d"; libraryHaskellDepends = [ async base monad-control transformers transformers-base unliftio-core @@ -54678,18 +54726,19 @@ self: { "box" = callPackage ({ mkDerivation, async, base, bytestring, containers, contravariant - , dlist, exceptions, kan-extensions, mtl, profunctors - , semigroupoids, stm, text, time + , dlist, doctest-parallel, exceptions, kan-extensions, mtl + , profunctors, semigroupoids, stm, text, time }: mkDerivation { pname = "box"; - version = "0.9.3.1"; - sha256 = "09mqz1ifq9sbq2h5wqy0lfvlc3v9m2nsw2f7gdss93qx8bz5cxmy"; + version = "0.9.3.2"; + sha256 = "0x2h5d6jgmv4nwsl955xb89q0f1fclsg5hjn7fyyja3z8w9qnf39"; libraryHaskellDepends = [ async base bytestring containers contravariant dlist exceptions kan-extensions mtl profunctors semigroupoids stm text time ]; - description = "A profunctor effect system"; + testHaskellDepends = [ base doctest-parallel ]; + description = "A profunctor effect system?"; license = lib.licenses.bsd3; }) {}; @@ -54707,13 +54756,14 @@ self: { }) {}; "box-socket" = callPackage - ({ mkDerivation, async, base, box, bytestring, network-simple - , optparse-applicative, profunctors, text, websockets + ({ mkDerivation, async, base, box, bytestring, doctest-parallel + , network-simple, optparse-applicative, profunctors, text + , websockets }: mkDerivation { pname = "box-socket"; - version = "0.5.1.0"; - sha256 = "0bm3csgz72fv41pilbwn0f2dx9gplin7qxi5i8mrwflaix156sy5"; + version = "0.5.2.0"; + sha256 = "13a8dclvf7m5j0a9gvmla8pr78qqrqnbqz8nc8js2yzp215p5qip"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54721,6 +54771,7 @@ self: { websockets ]; executableHaskellDepends = [ base optparse-applicative ]; + testHaskellDepends = [ base doctest-parallel ]; description = "Box websockets"; license = lib.licenses.bsd3; mainProgram = "box-socket"; @@ -54886,14 +54937,16 @@ self: { "brassica" = callPackage ({ mkDerivation, aeson, attoparsec-aeson, base, bytestring, conduit , conduit-extra, containers, criterion, deepseq, fast-myers-diff - , file-embed, megaparsec, mtl, optparse-applicative, parallel - , parser-combinators, split, tasty, tasty-golden, text - , transformers, utf8-string, vector + , file-embed, megaparsec, mtl, optparse-applicative, pandoc + , pandoc-types, parallel, parser-combinators, split, tasty + , tasty-golden, text, transformers, utf8-string, vector }: mkDerivation { pname = "brassica"; - version = "0.3.0"; - sha256 = "10ydb5w79y1jqa34mzrdl7s8ns29w1vxplv55ik51mkayclfgx3n"; + version = "1.0.0"; + sha256 = "04nrfc448m0kz73rwnvb6c0h9mhh55vjxxls6ddyq80avypsgb57"; + revision = "1"; + editedCabalFile = "1vqakf9jh6hrbicbrpwsv3fjqwi0mngnvrwg58xaaqhb4h18kzj4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54905,8 +54958,8 @@ self: { deepseq optparse-applicative parallel text ]; testHaskellDepends = [ - base bytestring conduit tasty tasty-golden text transformers - utf8-string + base bytestring conduit pandoc pandoc-types tasty tasty-golden text + transformers utf8-string ]; benchmarkHaskellDepends = [ base criterion file-embed parallel text @@ -55119,8 +55172,8 @@ self: { ({ mkDerivation, base, brick, containers, microlens, vector }: mkDerivation { pname = "brick-list-skip"; - version = "0.1.1.13"; - sha256 = "1n5mp9ikqmlckqywbvb1ry24j927qim3bw8bkw84w72yhlrxsmfc"; + version = "0.1.1.14"; + sha256 = "1gyc59y2ch2w5chiyx1d1s6rd71cvgvccmdfkbyzvcm8sywaqnnr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers microlens vector ]; @@ -55174,8 +55227,8 @@ self: { }: mkDerivation { pname = "brick-tabular-list"; - version = "2.2.0.11"; - sha256 = "0vikqrrhb94m6xg0k67j626gahx4iiwwywimlsqh96lvs5l07y9l"; + version = "2.2.0.12"; + sha256 = "0ss1rakdpv82pbyf9cnfd3sysap2ggjc7cpz4vh46w55ivy3ba3n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56945,8 +56998,8 @@ self: { }: mkDerivation { pname = "byte-count-reader"; - version = "0.10.1.11"; - sha256 = "1mi0560rcajp9q83y6vsw7ld1n429jdsmswassnyhh1z4hs6ihv7"; + version = "0.10.1.12"; + sha256 = "0bzks15c2s2xiv95v7fyzsndyiinp9ar8ajcalxs68zpwmbpzk3h"; libraryHaskellDepends = [ base extra parsec parsec-numbers text ]; testHaskellDepends = [ base extra hspec parsec parsec-numbers text @@ -58553,8 +58606,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "5.2.3"; - sha256 = "0gj6w5r07bmij41flx7rw4ad0qjl2fmbxp9jrdkl8k33b045lfc7"; + version = "5.2.4"; + sha256 = "02pwpdzq8lk9yk6d4zpw62v1yd3ccn3r88gz3l0z51mk17ifym44"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58724,14 +58777,15 @@ self: { "cabal-fix" = callPackage ({ mkDerivation, algebraic-graphs, base, bytestring, Cabal-syntax - , containers, directory, dotparse, filepath, flatparse - , optics-extra, optparse-applicative, pretty, pretty-simple - , string-interpolate, tar, text, these, tree-diff, vector + , containers, directory, doctest-parallel, dotparse, filepath + , flatparse, optics-extra, optparse-applicative, pretty + , pretty-simple, string-interpolate, tar, text, these, tree-diff + , vector }: mkDerivation { pname = "cabal-fix"; - version = "0.0.0.2"; - sha256 = "050003nvqc0x44jik7x5gsljqsrandpsl77xkqbhrh3xglw8cydb"; + version = "0.1.0.0"; + sha256 = "09q9nzxybkrqg96ys45jpq37ar5dgdvxc3yacfngk3kzxcw3ykms"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58743,6 +58797,7 @@ self: { base bytestring directory filepath optparse-applicative pretty-simple text tree-diff ]; + testHaskellDepends = [ base doctest-parallel ]; description = "Fix for cabal files"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -60126,21 +60181,22 @@ self: { , conduit-concurrent-map, conduit-extra, conduit-zstd, containers , crypton, deepseq, dhall, directory, ed25519, either, exceptions , extra, filepath, fsnotify, generic-lens, hercules-ci-cnix-store - , here, hnix-store-core, hspec, hspec-discover, http-client - , http-client-tls, http-conduit, http-types, immortal, inline-c-cpp - , katip, lukko, lzma-conduit, megaparsec, memory, microlens, netrc - , network, nix, nix-narinfo, optparse-applicative, pretty-terminal - , prettyprinter, process, protolude, resourcet, retry - , safe-exceptions, servant, servant-auth, servant-auth-client - , servant-client, servant-client-core, servant-conduit, stm - , stm-chans, stm-conduit, systemd, temporary, text, time - , transformers, unix, unliftio, unliftio-core, unordered-containers - , uri-bytestring, uuid, vector, versions, websockets, wuss + , here, hnix-store-core, hnix-store-nar, hspec, hspec-discover + , http-client, http-client-tls, http-conduit, http-types, immortal + , inline-c-cpp, katip, lukko, lzma-conduit, megaparsec, memory + , microlens, netrc, network, nix, nix-narinfo, optparse-applicative + , pretty-terminal, prettyprinter, process, protolude, resourcet + , retry, safe-exceptions, servant, servant-auth + , servant-auth-client, servant-client, servant-client-core + , servant-conduit, stm, stm-chans, stm-conduit, systemd, temporary + , text, time, transformers, unix, unliftio, unliftio-core + , unordered-containers, uri-bytestring, uuid, vector, versions + , websockets, wuss }: mkDerivation { pname = "cachix"; - version = "1.7.4"; - sha256 = "1bz80b9cfhib2j0bkxsxwvp8zzf1bfvzpwin1fb8lfw9nm9mz915"; + version = "1.7.5"; + sha256 = "0f9lp7drhiadn8blcf1m4hxmv3zj1ah9n0w6s9v5ad1zp1lgcd0y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60149,15 +60205,15 @@ self: { concurrent-extra conduit conduit-concurrent-map conduit-extra conduit-zstd containers crypton deepseq dhall directory ed25519 either exceptions extra filepath fsnotify generic-lens - hercules-ci-cnix-store here hnix-store-core http-client - http-client-tls http-conduit http-types immortal inline-c-cpp katip - lukko lzma-conduit megaparsec memory microlens netrc network - nix-narinfo optparse-applicative pretty-terminal prettyprinter - process protolude resourcet retry safe-exceptions servant - servant-auth servant-auth-client servant-client servant-conduit stm - stm-chans stm-conduit systemd temporary text time transformers unix - unliftio unliftio-core unordered-containers uri-bytestring uuid - vector versions websockets wuss + hercules-ci-cnix-store here hnix-store-core hnix-store-nar + http-client http-client-tls http-conduit http-types immortal + inline-c-cpp katip lukko lzma-conduit megaparsec memory microlens + netrc network nix-narinfo optparse-applicative pretty-terminal + prettyprinter process protolude resourcet retry safe-exceptions + servant servant-auth servant-auth-client servant-client + servant-conduit stm stm-chans stm-conduit systemd temporary text + time transformers unix unliftio unliftio-core unordered-containers + uri-bytestring uuid vector versions websockets wuss ]; libraryPkgconfigDepends = [ nix ]; executableHaskellDepends = [ @@ -60166,8 +60222,8 @@ self: { ]; testHaskellDepends = [ aeson async base bytestring cachix-api containers dhall directory - extra here hspec protolude retry servant-auth-client - servant-client-core stm temporary time versions + extra hercules-ci-cnix-store here hspec protolude retry + servant-auth-client servant-client-core stm temporary time versions ]; testToolDepends = [ hspec-discover ]; description = "Command-line client for Nix binary cache hosting https://cachix.org"; @@ -60176,18 +60232,18 @@ self: { }) {inherit (pkgs) nix;}; "cachix-api" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, conduit - , cryptonite, deriving-aeson, exceptions, hspec, hspec-discover - , http-media, jose, memory, nix-narinfo, protolude, resourcet - , safe-exceptions, servant, servant-auth, stm-chans, swagger2, text - , time, unordered-containers, uuid, websockets + ({ mkDerivation, aeson, async, base, bytestring, conduit, crypton + , deriving-aeson, exceptions, hspec, hspec-discover, http-media + , jose, memory, nix-narinfo, protolude, resourcet, safe-exceptions + , servant, servant-auth, stm-chans, swagger2, text, time + , unordered-containers, uuid, websockets }: mkDerivation { pname = "cachix-api"; - version = "1.7.4"; - sha256 = "0f19mxmas71mwj487jizwfmlfpp5c5jwhjk5j8w4kz3xc434irqy"; + version = "1.7.5"; + sha256 = "03iq1kwy2jnbpf2c2v0hs9s44sd2w92srrrcb61jm00ws7qnh5sw"; libraryHaskellDepends = [ - aeson async base bytestring conduit cryptonite deriving-aeson + aeson async base bytestring conduit crypton deriving-aeson exceptions http-media jose memory nix-narinfo protolude resourcet safe-exceptions servant servant-auth stm-chans swagger2 text time unordered-containers uuid websockets @@ -60521,8 +60577,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.12.0.0"; - sha256 = "00vdj70n5s05xx7yq4d28nbp9vncrdc4a9k3502xslkh6kj7zva2"; + version = "0.12.1.0"; + sha256 = "0ccwrnymkd96ca85n097iw9x5pnirc3ccmalyl1w507c56ph3jb4"; libraryHaskellDepends = [ aeson aeson-optics async base bytestring calamity-commands colour concurrent-extra containers crypton-connection crypton-x509-system @@ -64244,20 +64300,20 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "chart-svg_0_6_1_0" = callPackage - ({ mkDerivation, adjunctions, attoparsec, base, bytestring, Color - , containers, cubicbezier, doctest-parallel, flatparse, foldl - , formatn, markup-parse, mtl, numhask, numhask-array, numhask-space - , optics-core, random, string-interpolate, text, time + "chart-svg_0_7_0_0" = callPackage + ({ mkDerivation, base, bytestring, Color, containers, cubicbezier + , doctest-parallel, flatparse, formatn, harpie, markup-parse, mtl + , numhask, numhask-space, optics-core, random, string-interpolate + , text, time }: mkDerivation { pname = "chart-svg"; - version = "0.6.1.0"; - sha256 = "05z9raqqjnq0wvlknkl2z2g20hxal6nnz7g8p0fqplggv52f53vd"; + version = "0.7.0.0"; + sha256 = "1v1dhvn4rgv191byvr5dvaxifd48hskpqvv3kzpsq40ii7hqyj4m"; libraryHaskellDepends = [ - adjunctions attoparsec base bytestring Color containers cubicbezier - flatparse foldl formatn markup-parse mtl numhask numhask-array - numhask-space optics-core random string-interpolate text time + base bytestring Color containers cubicbezier flatparse formatn + harpie markup-parse mtl numhask numhask-space optics-core random + string-interpolate text time ]; testHaskellDepends = [ base doctest-parallel ]; description = "Charting library targetting SVGs"; @@ -64781,8 +64837,8 @@ self: { }: mkDerivation { pname = "chessIO"; - version = "0.9.3.1"; - sha256 = "1jq8x1mjjy89mfdrksdaiyqyhn7wvxnl3is36kacyck58l0sc738"; + version = "0.9.4.0"; + sha256 = "1dbbhpvpnrlx3a4a66q0732fdvb132xax0p5fh41xfhjfxxspzf2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66109,6 +66165,8 @@ self: { pname = "citeproc"; version = "0.8.1.1"; sha256 = "0hgkxgd1wmyrryv2ahavia6r5z9331i9557mnblq922lkdi0bs2g"; + revision = "1"; + editedCabalFile = "091gm0cbjsqvad3fhd2fx4bgsylv3gfakq3fhki3z40aywri8992"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70847,6 +70905,21 @@ self: { license = "unknown"; }) {}; + "comma-and" = callPackage + ({ mkDerivation, base, data-default-class, hspec, hspec-discover + , QuickCheck + }: + mkDerivation { + pname = "comma-and"; + version = "0.1.0.0"; + sha256 = "13z5z7c2xgljxk9lr786wbmayyqng3pp16pkhv6ch9p0a0adwwkc"; + libraryHaskellDepends = [ base data-default-class ]; + testHaskellDepends = [ base data-default-class hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Join text together with commas, and \"and\""; + license = lib.licenses.bsd3; + }) {}; + "command" = callPackage ({ mkDerivation, base, deepseq, process }: mkDerivation { @@ -70952,28 +71025,6 @@ self: { }) {}; "commonmark" = callPackage - ({ mkDerivation, base, bytestring, containers, parsec, tasty - , tasty-bench, tasty-hunit, tasty-quickcheck, text, transformers - , unicode-data, unicode-transforms - }: - mkDerivation { - pname = "commonmark"; - version = "0.2.6"; - sha256 = "0k0wkvlqbcv7iml9pa56pic4z417qydck22r4kbw51zixkj6rrp7"; - libraryHaskellDepends = [ - base bytestring containers parsec text transformers unicode-data - unicode-transforms - ]; - testHaskellDepends = [ - base parsec tasty tasty-hunit tasty-quickcheck text - unicode-transforms - ]; - benchmarkHaskellDepends = [ base tasty-bench text ]; - description = "Pure Haskell commonmark parser"; - license = lib.licenses.bsd3; - }) {}; - - "commonmark_0_2_6_1" = callPackage ({ mkDerivation, base, bytestring, containers, parsec, tasty , tasty-bench, tasty-hunit, tasty-quickcheck, text, transformers , unicode-data, unicode-transforms @@ -70993,7 +71044,6 @@ self: { benchmarkHaskellDepends = [ base tasty-bench text ]; description = "Pure Haskell commonmark parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "commonmark-cli" = callPackage @@ -71039,21 +71089,6 @@ self: { }) {}; "commonmark-pandoc" = callPackage - ({ mkDerivation, base, commonmark, commonmark-extensions - , pandoc-types, text - }: - mkDerivation { - pname = "commonmark-pandoc"; - version = "0.2.2.1"; - sha256 = "1kbs165li9fcizzivlb9ajsh9livc7vq8s903g5n829fpwayp431"; - libraryHaskellDepends = [ - base commonmark commonmark-extensions pandoc-types text - ]; - description = "Bridge between commonmark and pandoc AST"; - license = lib.licenses.bsd3; - }) {}; - - "commonmark-pandoc_0_2_2_2" = callPackage ({ mkDerivation, base, commonmark, commonmark-extensions , pandoc-types, text }: @@ -71066,7 +71101,6 @@ self: { ]; description = "Bridge between commonmark and pandoc AST"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "commonmark-simple" = callPackage @@ -74172,8 +74206,8 @@ self: { pname = "config-value"; version = "0.8.3"; sha256 = "0pkcwxg91wali7986k03d7q940hb078hlsxfknqhkp2spr3d1f3w"; - revision = "7"; - editedCabalFile = "0bzrsy2qlz6ylml38q905rcw2lg0khz6iqr67hhcihbgwgazrrsj"; + revision = "8"; + editedCabalFile = "1sfj9c77y7j5y5l7vsix4v94hmi5lajm1v5lgvwvcl7y063h0p2r"; libraryHaskellDepends = [ array base containers pretty text ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base text ]; @@ -75830,6 +75864,20 @@ self: { license = lib.licenses.publicDomain; }) {}; + "control-monad-omega_0_3_3" = callPackage + ({ mkDerivation, base, tasty, tasty-bench, tasty-quickcheck }: + mkDerivation { + pname = "control-monad-omega"; + version = "0.3.3"; + sha256 = "0f90q6mxxb8szqvw93pypbbf4nicj1w5n9sqs4434b6cp55665z6"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ base tasty-bench ]; + description = "A breadth-first list monad"; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + }) {}; + "control-monad-queue" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -79744,15 +79792,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "crypton_1_0_0" = callPackage + "crypton_1_0_1" = callPackage ({ mkDerivation, base, basement, bytestring, deepseq, gauge , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit , tasty-kat, tasty-quickcheck }: mkDerivation { pname = "crypton"; - version = "1.0.0"; - sha256 = "1q1kv37hv8cl6hykvssbd4hsd0zj8a562q42jr2gwk59lnwklhcx"; + version = "1.0.1"; + sha256 = "19674xqf6zp17g4qwlz1m3dzdsl05s1frb2drxb77iccfhabnhli"; libraryHaskellDepends = [ base basement bytestring deepseq ghc-prim integer-gmp memory ]; @@ -80402,8 +80450,8 @@ self: { }: mkDerivation { pname = "csv-conduit"; - version = "1.0.0.1"; - sha256 = "16falqdvm94dr4fjb9dndax1vj50amf1ns95x0hribww0vp85w8c"; + version = "1.0.1.0"; + sha256 = "0qlw5hhsrfpw972ryp3mr895q77d6p1g2q1z7jl7hf1xz7ba0c1r"; libraryHaskellDepends = [ array attoparsec base blaze-builder bytestring conduit conduit-extra containers data-default exceptions ordered-containers @@ -81406,7 +81454,7 @@ self: { hydraPlatforms = lib.platforms.none; mainProgram = "cut-the-crap"; broken = true; - }) {pocketsphinx = null; sphinxbase = null;}; + }) {inherit (pkgs) pocketsphinx; sphinxbase = null;}; "cutter" = callPackage ({ mkDerivation, base, bytestring, explicit-exception, spreadsheet @@ -82760,28 +82808,42 @@ self: { }) {}; "data-default" = callPackage - ({ mkDerivation, base, data-default-class + ({ mkDerivation, base, containers, data-default-class , data-default-instances-containers, data-default-instances-dlist - , data-default-instances-old-locale + , data-default-instances-old-locale, mtl, old-locale }: mkDerivation { pname = "data-default"; - version = "0.7.1.1"; - sha256 = "04d5n8ybmcxba9qb6h389w9zfq1lvj81b82jh6maqp6pkhkmvydh"; + version = "0.7.1.2"; + sha256 = "0kzq84bflmfhzc7650wykjamwq8zsxm9q2c1s7nfbgig5xyizkjc"; libraryHaskellDepends = [ base data-default-class data-default-instances-containers data-default-instances-dlist data-default-instances-old-locale ]; + testHaskellDepends = [ base containers mtl old-locale ]; description = "A class for types with a default value"; license = lib.licenses.bsd3; }) {}; + "data-default_0_8_0_0" = callPackage + ({ mkDerivation, base, containers, mtl }: + mkDerivation { + pname = "data-default"; + version = "0.8.0.0"; + sha256 = "0cfxfbgsxxla1hr59rnm1cljb6i18rbp8yq7f0bfwvwpi4q0xwi3"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers mtl ]; + description = "A class for types with a default value"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "data-default-class" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "data-default-class"; - version = "0.1.2.0"; - sha256 = "0miyjz8d4jyvqf2vp60lyfbnflx6cj2k8apmm9ly1hq0y0iv80ag"; + version = "0.1.2.2"; + sha256 = "1qxfyxdddl0rzigp81p36i1dgddw2yhqskyz8ngkcy6zbq0w407l"; libraryHaskellDepends = [ base ]; description = "A class for types with a default value"; license = lib.licenses.bsd3; @@ -82839,8 +82901,8 @@ self: { ({ mkDerivation, base, data-default-class }: mkDerivation { pname = "data-default-instances-base"; - version = "0.1.0.1"; - sha256 = "0ym1sw3ssdzzifxxhh76qlv8kkmb2iclc158incv1dklyr9y8kw4"; + version = "0.1.0.3"; + sha256 = "1cslj2bywl4w58f6wr4knk7zj6v8v7rykjxq9ddy8vzbydns1bn8"; libraryHaskellDepends = [ base data-default-class ]; description = "Default instances for types in base"; license = lib.licenses.bsd3; @@ -82883,12 +82945,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "data-default-instances-containers_0_1_0_3" = callPackage + ({ mkDerivation, base, containers, data-default-class }: + mkDerivation { + pname = "data-default-instances-containers"; + version = "0.1.0.3"; + sha256 = "0awk655khqc1cqfc2kcxkcxqpa90l882cz89f2gip6v31vyzmpdr"; + libraryHaskellDepends = [ base containers data-default-class ]; + description = "Default instances for types in containers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "data-default-instances-dlist" = callPackage ({ mkDerivation, base, data-default-class, dlist }: mkDerivation { pname = "data-default-instances-dlist"; - version = "0.0.1"; - sha256 = "0narkdqiprhgayjiawrr4390h4rq4pl2pb6mvixbv2phrc8kfs3x"; + version = "0.0.1.2"; + sha256 = "02wy7rq6d5z2hpxdw6vwnb1bri5bz9yrw5hnc1i7l0x5q68g3gg0"; libraryHaskellDepends = [ base data-default-class dlist ]; description = "Default instances for types in dlist"; license = lib.licenses.bsd3; @@ -82911,8 +82985,8 @@ self: { ({ mkDerivation, base, data-default-class, old-locale }: mkDerivation { pname = "data-default-instances-old-locale"; - version = "0.0.1"; - sha256 = "00h81i5phib741yj517p8mbnc48myvfj8axzsw44k34m48lv1lv0"; + version = "0.0.1.2"; + sha256 = "0vxqr7hmp1vxjv08lmrf15x4p6s7l44qz1c834a8dds807zri03h"; libraryHaskellDepends = [ base data-default-class old-locale ]; description = "Default instances for types in old-locale"; license = lib.licenses.bsd3; @@ -83062,8 +83136,10 @@ self: { }: mkDerivation { pname = "data-effects"; - version = "0.1.2.0"; - sha256 = "1gx04k8rsk2qcq74ya44w0249vfb8n3qqwc3bj95askm4nr7nfl6"; + version = "0.2.0.0"; + sha256 = "1fmag3frj414q3anp8711l53diy603rz6sh6pl3p9bliwk8npwfs"; + revision = "1"; + editedCabalFile = "13j27hw73a8kzjf6hvz8pyj8xfv6j9bzp8y2ahd8w6ycv7kdcl10"; libraryHaskellDepends = [ base data-default data-effects-core data-effects-th lens text these time @@ -83081,8 +83157,8 @@ self: { }: mkDerivation { pname = "data-effects-core"; - version = "0.1.0.0"; - sha256 = "1sz3wnna9h6211lc9pbvgf6wjr6csqzpl2q2jz8z3s4hky0m32jg"; + version = "0.2.0.0"; + sha256 = "1cxagw2h0987k3s1h3wbhqsydjk0yvz4nda5d6yvz2w3jlm1fnqg"; libraryHaskellDepends = [ base compdata mtl ]; testHaskellDepends = [ base tasty tasty-hunit ]; testToolDepends = [ tasty-discover ]; @@ -83100,8 +83176,10 @@ self: { }: mkDerivation { pname = "data-effects-th"; - version = "0.1.2.0"; - sha256 = "05jzplb3vxxhy8ham7v8w3n943fng3fk8v1pa09vbv68k3r1p14w"; + version = "0.2.0.0"; + sha256 = "0b6hwhh7hc7b81xsm1khrjda737gjwg0q48c8v9ai48q5nsnb646"; + revision = "1"; + editedCabalFile = "1bi4rhb6wl5n5myp1jc5rv3s483jspqfa53dkv7xsq6chvfqhf7h"; libraryHaskellDepends = [ base containers data-default data-effects-core either extra formatting infinite-list lens mtl template-haskell text @@ -83112,7 +83190,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; description = "Template Haskell utilities for the data-effects library"; - license = lib.licenses.mpl20; + license = "MPL-2.0 AND BSD-3-Clause"; hydraPlatforms = lib.platforms.none; }) {}; @@ -85149,17 +85227,17 @@ self: { license = lib.licenses.asl20; }) {}; - "dbus_1_3_7" = callPackage + "dbus_1_3_8" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, containers - , criterion, deepseq, directory, exceptions, extra, filepath, lens - , network, parsec, process, QuickCheck, random, resourcet, split - , tasty, tasty-hunit, tasty-quickcheck, template-haskell, temporary - , text, th-lift, transformers, unix, vector, xml-conduit, xml-types + , deepseq, directory, exceptions, extra, filepath, lens, network + , parsec, process, QuickCheck, random, resourcet, split, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, temporary, text + , th-lift, transformers, unix, vector, xml-conduit, xml-types }: mkDerivation { pname = "dbus"; - version = "1.3.7"; - sha256 = "0yjsgabcihy8gzzckh5ipy5bwspw3pg3ghj3in6mzlkyqj1hx964"; + version = "1.3.8"; + sha256 = "1vw6268w3gs7lzi3p0g1vhi930cwwb2l38w6mnv1yzsm26v6np4s"; libraryHaskellDepends = [ base bytestring cereal conduit containers deepseq exceptions filepath lens network parsec random split template-haskell text @@ -85170,7 +85248,6 @@ self: { parsec process QuickCheck random resourcet tasty tasty-hunit tasty-quickcheck temporary text transformers unix vector ]; - benchmarkHaskellDepends = [ base criterion ]; doCheck = false; description = "A client library for the D-Bus IPC system"; license = lib.licenses.asl20; @@ -87178,6 +87255,8 @@ self: { pname = "dependent-monoidal-map"; version = "0.1.1.4"; sha256 = "1cgk0dlag557krddaivbqkc3qp4crsspa53wkqx5mpgv6jaiq7dg"; + revision = "1"; + editedCabalFile = "0qm6b15ljxdpnyihz6ip932spbgz0kgkgqpif961599l35l1ajg9"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum dependent-sum-aeson-orphans @@ -87221,8 +87300,8 @@ self: { pname = "dependent-sum-aeson-orphans"; version = "0.3.1.1"; sha256 = "0d2255gxsamp19hl23m076ds2j08ny95swrk9r3njjfjrwkd4zbq"; - revision = "1"; - editedCabalFile = "023f0h3pifgjrv8qr7cka86iykpzw1c4vcx1kjsi8m9brl78hh1h"; + revision = "2"; + editedCabalFile = "1w50zxcngacgaq534dza7p1h37nkshmh9nhcaxlwkia2mr26fiv5"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum some @@ -87506,8 +87585,8 @@ self: { ({ mkDerivation, base, hspec, template-haskell, th-abstraction }: mkDerivation { pname = "derive-has-field"; - version = "0.0.1.2"; - sha256 = "03w0qvs7adgwc676gk0q36bm9s7f7b709siy4dh0y27qblcjb6a4"; + version = "0.0.1.4"; + sha256 = "19mbgv53sc4j200affnsig9g9qz9cn7xp7v3qc1l4cc93pgyf3m9"; libraryHaskellDepends = [ base template-haskell th-abstraction ]; testHaskellDepends = [ base hspec template-haskell th-abstraction @@ -87925,8 +88004,8 @@ self: { }: mkDerivation { pname = "desktop-portal"; - version = "0.6.0.0"; - sha256 = "18cgwz8cgsj1vjhk4rgv4lakqbnrrb5pspkpg5lnkc9kq7953d1g"; + version = "0.6.0.2"; + sha256 = "04z1d3gqcd0qvrvfhiv51sdhra5m39dq5jvp8hsrw2k32mkdixn9"; libraryHaskellDepends = [ base binary bytestring containers data-default-class dbus directory filepath modern-uri network random text unix @@ -89177,8 +89256,8 @@ self: { pname = "diagrams-builder"; version = "0.8.0.6"; sha256 = "17yi5dmcxx4sgk3wha386zbv9h69pwq72j8i21vmfh35brxhs9f4"; - revision = "1"; - editedCabalFile = "1w9bjc6zizp779rk4frfmffzlv4vq4sljdcvql9ma5qy679phiyr"; + revision = "2"; + editedCabalFile = "1mkxn0r6wmxyvdhwly1a6j0z4j234mfv7aimirwl7jmcv55lwbs4"; configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; isLibrary = true; isExecutable = true; @@ -90504,6 +90583,8 @@ self: { pname = "dimensional"; version = "1.5"; sha256 = "16d50vlln11hq894y8qxrg4cricz1459dg14z0wc1fzfiydxb6ns"; + revision = "1"; + editedCabalFile = "1149vwz3ywi2kkblsl8ayhca4ibwn76zdc5g6l18j8b03hvf3yzg"; libraryHaskellDepends = [ base deepseq exact-pi ieee754 numtype-dk vector ]; @@ -90524,6 +90605,8 @@ self: { pname = "dimensional"; version = "1.6"; sha256 = "05ikvdpl9j94alyf3r9fwfwn354z4gifbhp1fasspmd9s0bhi7wl"; + revision = "1"; + editedCabalFile = "0g51fw0k86jr0nlvriiprw5zpjqkifxc16s18h1h240y2v0cbgq0"; libraryHaskellDepends = [ base deepseq exact-pi ieee754 numtype-dk vector ]; @@ -90899,13 +90982,13 @@ self: { broken = true; }) {}; - "directory_1_3_8_5" = callPackage - ({ mkDerivation, base, filepath, time, unix }: + "directory_1_3_9_0" = callPackage + ({ mkDerivation, base, file-io, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.8.5"; - sha256 = "0s57dq5l02b9z3h17slw3yg73mzdx15pzj02xg91avpwvmafsr78"; - libraryHaskellDepends = [ base filepath time unix ]; + version = "1.3.9.0"; + sha256 = "1k34iqdkh9d5vjd7wihhjjc6388hfbh7sjwp3msziibz2534i8i0"; + libraryHaskellDepends = [ base file-io filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; license = lib.licenses.bsd3; @@ -91471,8 +91554,8 @@ self: { pname = "discrimination"; version = "0.5"; sha256 = "1qq7fs1dsfqgf4969gksqcp3swcx0wbzdh66a89fv78k6y94g0pc"; - revision = "3"; - editedCabalFile = "1i3mkza18y2dxj03zn9419rh7jgpkg1kq97blhjrcw5174p9p3c6"; + revision = "4"; + editedCabalFile = "1m4sv7mdqdm5xx5khbyq0il3dn5isg575vgn1akb283l2jkz4v1g"; libraryHaskellDepends = [ array base containers contravariant deepseq ghc-bignum ghc-prim hashable primitive promises transformers @@ -93495,7 +93578,7 @@ self: { mainProgram = "doctest"; }) {}; - "doctest_0_22_10" = callPackage + "doctest_0_23_0" = callPackage ({ mkDerivation, base, code-page, containers, deepseq, directory , exceptions, filepath, ghc, ghc-paths, hspec, hspec-core , hspec-discover, HUnit, mockery, process, QuickCheck, silently @@ -93503,8 +93586,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.22.10"; - sha256 = "0ylckg8mzfkv25a3yymfv8yal05ypr1qrx99qv4xakzpn8149m46"; + version = "0.23.0"; + sha256 = "1jh38pj6rbsli4ba6jvnrg9dm2di18i7g9706nnfm0xc9ckhfs90"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94411,18 +94494,20 @@ self: { "dotparse" = callPackage ({ mkDerivation, algebraic-graphs, base, bytestring, chart-svg - , containers, flatparse, numhask-space, optics-core, process-extras - , string-interpolate, template-haskell, text, these + , containers, doctest-parallel, flatparse, numhask-space + , optics-core, process-extras, string-interpolate, template-haskell + , text, these }: mkDerivation { pname = "dotparse"; - version = "0.1.0.0"; - sha256 = "06knlrrb2ma57d5rnv2xdqp7avdbcbnd5m6pk45953lmhz217ls6"; + version = "0.1.1.0"; + sha256 = "14829jdzb3vc3485y7hbri77giv2sbg8x4cyrc0pwk5cj8xb0yzf"; libraryHaskellDepends = [ algebraic-graphs base bytestring chart-svg containers flatparse numhask-space optics-core process-extras string-interpolate template-haskell text these ]; + testHaskellDepends = [ base doctest-parallel ]; description = "dot language parsing and printing"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -95426,6 +95511,8 @@ self: { pname = "dsp"; version = "0.2.5.2"; sha256 = "0inar9c0n4x0li9c7krr17qv7zc49162wchhyn6ix7adni8j92z0"; + revision = "1"; + editedCabalFile = "06lrjxcsyviifpw398za544r5wqfjlx3h206g1lmjmcqj0ph1n5q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers random ]; @@ -95597,8 +95684,8 @@ self: { pname = "dual-game"; version = "0.1.0.1"; sha256 = "1w69d7d2xbpi82n41gq08qdmldh834ka7qwvy159vsac556wwcfg"; - revision = "8"; - editedCabalFile = "1c4m2nwmnrjs8rinfa9p9vynmdr56i5ggydgnjs3d8szpbbbbrml"; + revision = "9"; + editedCabalFile = "140svi4r35rji7br3bcrcb7rgwkbzvrsc2nx1xml17sf8d3clj4r"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -95815,8 +95902,8 @@ self: { }: mkDerivation { pname = "dunai"; - version = "0.13.1"; - sha256 = "1hamj3yv6v0rdr06889iidhzpz6jbskq3bc5gbf45gzvq7bvcds7"; + version = "0.13.2"; + sha256 = "0x12hx51p5vfgscys40p8a9nnfj8d5rf5ynp436jzry6pzi0i6ab"; libraryHaskellDepends = [ base MonadRandom simple-affine-space transformers transformers-base ]; @@ -95847,8 +95934,8 @@ self: { ({ mkDerivation, base, dunai, normaldistribution, QuickCheck }: mkDerivation { pname = "dunai-test"; - version = "0.13.1"; - sha256 = "0hm5c9n890cxnw0pp62vqlw7yqmrzy2xb0inhbzcjm49i5gacfdq"; + version = "0.13.2"; + sha256 = "0z9rgirz7las2qrvagiiihgz03ds7dgbbmwk32mkz4paz339lkbg"; libraryHaskellDepends = [ base dunai normaldistribution QuickCheck ]; @@ -97788,6 +97875,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "effectful_2_5_0_0" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , effectful-core, exceptions, lifted-base, primitive, process + , safe-exceptions, stm, strict-mutable-base, tasty, tasty-bench + , tasty-hunit, text, time, unix, unliftio + }: + mkDerivation { + pname = "effectful"; + version = "2.5.0.0"; + sha256 = "1fv228n3cvbqhbvdrnix2wqr96zzvgav1dp5rkynpm12jjwknqkp"; + libraryHaskellDepends = [ + async base bytestring directory effectful-core process stm + strict-mutable-base time unliftio + ]; + testHaskellDepends = [ + base containers effectful-core exceptions lifted-base primitive + safe-exceptions strict-mutable-base tasty tasty-hunit unliftio + ]; + benchmarkHaskellDepends = [ + async base tasty-bench text unix unliftio + ]; + description = "An easy to use, performant extensible effects library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "effectful-core" = callPackage ({ mkDerivation, base, containers, exceptions, monad-control , primitive, transformers-base, unliftio-core @@ -97804,6 +97917,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "effectful-core_2_5_0_0" = callPackage + ({ mkDerivation, base, containers, deepseq, exceptions + , monad-control, primitive, strict-mutable-base, transformers-base + , unliftio-core + }: + mkDerivation { + pname = "effectful-core"; + version = "2.5.0.0"; + sha256 = "1fjk92pwpxapjkq8zzv36j071nq1g9lys78jwg8f4q68g3f7rlzr"; + libraryHaskellDepends = [ + base containers deepseq exceptions monad-control primitive + strict-mutable-base transformers-base unliftio-core + ]; + description = "An easy to use, performant extensible effects library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "effectful-plugin" = callPackage ({ mkDerivation, base, containers, effectful-core, ghc }: mkDerivation { @@ -97816,6 +97947,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "effectful-plugin_1_1_0_4" = callPackage + ({ mkDerivation, base, containers, effectful-core, ghc }: + mkDerivation { + pname = "effectful-plugin"; + version = "1.1.0.4"; + sha256 = "0c401ni8ajig5da4dgkk2xbajbkzghrjll8ccfh7pbbiknf7si7j"; + libraryHaskellDepends = [ base containers effectful-core ghc ]; + testHaskellDepends = [ base effectful-core ]; + description = "A GHC plugin for improving disambiguation of effects"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "effectful-st" = callPackage ({ mkDerivation, base, effectful-core, primitive }: mkDerivation { @@ -97848,14 +97992,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "effectful-th_1_0_0_2" = callPackage + "effectful-th_1_0_0_3" = callPackage ({ mkDerivation, base, containers, effectful-core, exceptions , template-haskell, th-abstraction }: mkDerivation { pname = "effectful-th"; - version = "1.0.0.2"; - sha256 = "14zj43wc3lz7aac0qcyzkxw2fbpgvp8b7wgk035ipcj7cfl25bhk"; + version = "1.0.0.3"; + sha256 = "0dzjy054n4zcrnnnj50yxxqicv50mfmzhgcqzhz4n6ap8v88ykiv"; libraryHaskellDepends = [ base containers effectful-core exceptions template-haskell th-abstraction @@ -98831,6 +98975,8 @@ self: { pname = "eliminators"; version = "0.9.5"; sha256 = "17pl2mg9bpagzkw50mydls883bj4mm7glmgnm59r57prky9h55gs"; + revision = "1"; + editedCabalFile = "0dzyskd0av2rdq9bk0y0d2605a65p9xailbbchvmaqjvqf4cqvpm"; libraryHaskellDepends = [ base extra singleton-nats singletons-base template-haskell text th-abstraction th-desugar @@ -102035,6 +102181,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "esqueleto_3_5_13_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring + , conduit, containers, exceptions, hspec, hspec-core, monad-logger + , mtl, mysql, mysql-simple, persistent, persistent-mysql + , persistent-postgresql, persistent-sqlite, postgresql-simple + , QuickCheck, resourcet, tagged, template-haskell, text, time + , transformers, unliftio, unordered-containers + }: + mkDerivation { + pname = "esqueleto"; + version = "3.5.13.0"; + sha256 = "01sp5g61kk6k3fzzdb9sx4sf8iqhncv5sg3hiw8hjp7xv6wc7341"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-html bytestring conduit containers + monad-logger persistent resourcet tagged template-haskell text time + transformers unliftio unordered-containers + ]; + testHaskellDepends = [ + aeson attoparsec base blaze-html bytestring conduit containers + exceptions hspec hspec-core monad-logger mtl mysql mysql-simple + persistent persistent-mysql persistent-postgresql persistent-sqlite + postgresql-simple QuickCheck resourcet tagged template-haskell text + time transformers unliftio unordered-containers + ]; + description = "Type-safe EDSL for SQL queries on persistent backends"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "esqueleto-compat" = callPackage ({ mkDerivation, base, conduit, esqueleto, hspec, persistent , resourcet, transformers @@ -104573,8 +104748,8 @@ self: { pname = "expiring-cache-map"; version = "0.0.6.1"; sha256 = "1fb47hsn06ybn2yzw7r6pjkmvvfpbdx7wjhbpxcywilbjyac4fqf"; - revision = "1"; - editedCabalFile = "1k5wqilafxp3ksqb7qy90cwipk0db568f15amn3mnf9krc1qjabg"; + revision = "2"; + editedCabalFile = "1lg38r5i6wdi39561g6kpdcdkhr34idkvh8n128gc7dz2a9irycl"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -105320,8 +105495,8 @@ self: { }: mkDerivation { pname = "extism-pdk"; - version = "1.1.0.0"; - sha256 = "0bnhi02f3m9shsn1x2vn7rpjaii72sb6lrsw9njzk743ap23d1kr"; + version = "1.2.0.0"; + sha256 = "1ph4c2l22mhdn8053shsh2spq5wdgvi7zw279ay9ffhhwkyan654"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105343,6 +105518,8 @@ self: { pname = "extra"; version = "1.7.16"; sha256 = "0w3wwwnf96ax70lrb0fkfich7b23kvk112j9rzr72b0bqd1ns315"; + revision = "1"; + editedCabalFile = "0xb2xd6qw664rz0d1pa7g4cd58ixqfhpxh7q6gz9lhc10afqw62g"; libraryHaskellDepends = [ base clock directory filepath process time unix ]; @@ -105353,6 +105530,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "extra_1_8" = callPackage + ({ mkDerivation, base, clock, directory, filepath, process + , QuickCheck, quickcheck-instances, time, unix + }: + mkDerivation { + pname = "extra"; + version = "1.8"; + sha256 = "18c9ad7wjf6q4yp0sagxhwyjpm9frw9kk27ih2x0nmjhmrgcx91g"; + libraryHaskellDepends = [ + base clock directory filepath process time unix + ]; + testHaskellDepends = [ + base directory filepath QuickCheck quickcheck-instances unix + ]; + description = "Extra functions I use"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "extra-data-yj" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -105732,6 +105928,8 @@ self: { pname = "failure"; version = "0.2.0.3"; sha256 = "0jimc2x46zq7wnmzfbnqi67jl8yhbvr0fa65ljlc9p3fns9mca3p"; + revision = "1"; + editedCabalFile = "0lnvh6slp057kl0sjn14iab8y3cpic60lhbmn9502zryp7by23ky"; libraryHaskellDepends = [ base transformers ]; description = "A simple type class for success/failure computations. (deprecated)"; license = lib.licenses.bsd3; @@ -105828,8 +106026,8 @@ self: { }: mkDerivation { pname = "fakedata"; - version = "1.0.3"; - sha256 = "12sldxpn14zx5zwblw28k593rdqz50d246rz8j3zj41ljmnbwj4i"; + version = "1.0.5"; + sha256 = "179j2r6ws6ngmwsswkmpas4ij5jywlvhk0rhbk8rn3vxc3yj7gnr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson attoparsec base bytestring containers directory exceptions @@ -106191,8 +106389,8 @@ self: { }: mkDerivation { pname = "fast-logger"; - version = "3.2.3"; - sha256 = "0af4228rnv2g3fgw00vx85fh0ngi092bx54awx1cd1jjkmpdyn73"; + version = "3.2.4"; + sha256 = "1fxh94qk24c7mki0049zc0h5g0cyn78fp54bgxczqcba6lqknx9r"; libraryHaskellDepends = [ array auto-update base bytestring directory easy-file filepath stm text unix-compat unix-time @@ -108150,23 +108348,6 @@ self: { }) {}; "fgl" = callPackage - ({ mkDerivation, array, base, containers, deepseq, hspec - , microbench, QuickCheck, transformers - }: - mkDerivation { - pname = "fgl"; - version = "5.8.2.0"; - sha256 = "1dn3x3rmdlglg1kbvx7vndkm66lvvyd23awwd0qzplzi43vhrks4"; - libraryHaskellDepends = [ - array base containers deepseq transformers - ]; - testHaskellDepends = [ base containers hspec QuickCheck ]; - benchmarkHaskellDepends = [ base deepseq microbench ]; - description = "Martin Erwig's Functional Graph Library"; - license = lib.licenses.bsd3; - }) {}; - - "fgl_5_8_3_0" = callPackage ({ mkDerivation, array, base, containers, deepseq, hspec , microbench, QuickCheck, transformers }: @@ -108181,7 +108362,6 @@ self: { benchmarkHaskellDepends = [ base deepseq microbench ]; description = "Martin Erwig's Functional Graph Library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fgl-arbitrary" = callPackage @@ -112391,12 +112571,15 @@ self: { }) {}; "formatn" = callPackage - ({ mkDerivation, base, containers, QuickCheck, text }: + ({ mkDerivation, base, containers, doctest-parallel, QuickCheck + , text + }: mkDerivation { pname = "formatn"; - version = "0.3.0.1"; - sha256 = "1w1isqk9mxrzl0sfj10kqfr2z8wkxvx5dmacig4k415cbaf4dqs3"; - libraryHaskellDepends = [ base containers QuickCheck text ]; + version = "0.3.1.0"; + sha256 = "0xh78ckdsih2p984qr170f6l4yfz5fnq7xni6gjzapcilfxzvky9"; + libraryHaskellDepends = [ base containers text ]; + testHaskellDepends = [ base doctest-parallel QuickCheck ]; description = "Formatting of doubles"; license = lib.licenses.bsd3; }) {}; @@ -113325,14 +113508,15 @@ self: { , monad-validate, MonadRandom, mtl, nonempty-containers, openapi3 , path-pieces, persistent, persistent-postgresql, postgresql-simple , primitive, QuickCheck, resource-pool, resourcet, scientist - , semigroupoids, template-haskell, text, time, transformers - , transformers-base, typed-process, unliftio, unordered-containers - , vector, wai, wai-extra, yaml, yesod-core, yesod-test + , semigroupoids, servant-server, template-haskell, text, time + , transformers, transformers-base, typed-process, unliftio + , unordered-containers, vector, wai, wai-extra, yaml, yesod-core + , yesod-test }: mkDerivation { pname = "freckle-app"; - version = "1.20.2.1"; - sha256 = "09j74p9mxhxz689c9i46474d23hp5p1xmfz2l4pbfh8wfg91bb5a"; + version = "1.20.3.0"; + sha256 = "0if5ijphbin6ff0krfhy7bpjambw4zf8ccg459caiff3qc97rlcy"; libraryHaskellDepends = [ aeson annotated-exception autodocodec autodocodec-openapi3 base bcp47 Blammo Blammo-wai bugsnag bytestring case-insensitive cassava @@ -113346,15 +113530,16 @@ self: { monad-validate MonadRandom mtl nonempty-containers openapi3 path-pieces persistent persistent-postgresql postgresql-simple primitive QuickCheck resource-pool resourcet scientist - semigroupoids template-haskell text time transformers - transformers-base typed-process unliftio unordered-containers - vector wai wai-extra yaml yesod-core yesod-test + semigroupoids servant-server template-haskell text time + transformers transformers-base typed-process unliftio + unordered-containers vector wai wai-extra yaml yesod-core + yesod-test ]; testHaskellDepends = [ aeson annotated-exception async base Blammo bugsnag bytestring cassava conduit hs-opentelemetry-api hspec http-types HUnit - monad-validate nonempty-containers postgresql-simple QuickCheck - vector wai wai-extra + monad-validate nonempty-containers path-pieces persistent + postgresql-simple QuickCheck servant-server vector wai wai-extra ]; description = "Haskell application toolkit used at Freckle"; license = lib.licenses.mit; @@ -113563,8 +113748,8 @@ self: { }: mkDerivation { pname = "free-alacarte"; - version = "1.0.0.7"; - sha256 = "033h3ghq7ibq74har4mv4njpwl6c6gndibq1qhlgx3x82ymxkgpk"; + version = "1.0.0.8"; + sha256 = "1il7ihn81g2341bx07pjjmjzyrxl3n9n70bg6qdxdgjs0w9b6b78"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers hspec QuickCheck relude tasty tasty-hspec text time @@ -116051,8 +116236,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.25.22"; - sha256 = "12x8n953l5j3msh95vbf94yh5yfw9x80grms2r59i3k6vg32bx01"; + version = "0.25.23"; + sha256 = "1yd1j5qv4rfijjxv48m0qq7y9r0qn31zliafgbmqs2i9ik5gg6sz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116124,8 +116309,8 @@ self: { }: mkDerivation { pname = "futhark-server"; - version = "1.2.2.1"; - sha256 = "0g8n1gkl4y2a65z1idx58b1ls2g4jf0pwjhnc3w5wffq9mpwliaq"; + version = "1.2.3.0"; + sha256 = "12gih73pvy54k4fs7s690b40cfhrvgzahhw3n571pi73ia86mljb"; libraryHaskellDepends = [ base binary bytestring directory futhark-data mtl process temporary text @@ -118035,19 +118220,16 @@ self: { }) {}; "generic-data" = callPackage - ({ mkDerivation, ap-normalize, base, base-orphans, contravariant - , deepseq, generic-lens, ghc-boot-th, one-liner, show-combinators - , tasty, tasty-bench, tasty-hunit + ({ mkDerivation, ap-normalize, base, base-orphans, deepseq + , generic-lens, ghc-boot-th, one-liner, show-combinators, tasty + , tasty-bench, tasty-hunit }: mkDerivation { pname = "generic-data"; - version = "1.1.0.0"; - sha256 = "1jxwkc475v0h1i5g5zyjq0x66fqvixdc99a7m8w3cpxkk56vqb5i"; - revision = "2"; - editedCabalFile = "187qabhjmymg18i7424s90f7nwx17hlpcr5i53ximwyd9z6i9ify"; + version = "1.1.0.1"; + sha256 = "0cbng88jsx5f34jrhj2c83jg9r0d7q4xj6vb2as97mgrdmy054nk"; libraryHaskellDepends = [ - ap-normalize base base-orphans contravariant ghc-boot-th - show-combinators + ap-normalize base base-orphans ghc-boot-th show-combinators ]; testHaskellDepends = [ base generic-lens one-liner show-combinators tasty tasty-hunit @@ -121089,7 +121271,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib_9_8_2_20240223" = callPackage + "ghc-lib_9_8_3_20241022" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser , ghc-prim, happy, hpc, parsec, pretty, process, rts @@ -121097,8 +121279,10 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.8.2.20240223"; - sha256 = "12lmk3ipd1pyiwzmnb0zgbw86yy7mhsy530dnackwidg3ww07nia"; + version = "9.8.3.20241022"; + sha256 = "0irdlkkb139spmggjam2n4ydcwkb1r8vsv29g5w9rxqd5rd66w1b"; + revision = "1"; + editedCabalFile = "0r1a022nf2kk9vk5ca7crx74fzi0vcd8r5c5ldarcvqjfhgayfvi"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -121121,6 +121305,8 @@ self: { pname = "ghc-lib"; version = "9.10.1.20240511"; sha256 = "1z8xpzkwp2abb8azhjsnmq0cyyvvc3xqm5dgs7vmrfj3yq72j6ys"; + revision = "1"; + editedCabalFile = "0zzp85lr6lps0w1ld535sc73nz4dmrk48rwvngzdwzb460lnqsiv"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -121174,15 +121360,17 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib-parser_9_8_2_20240223" = callPackage + "ghc-lib-parser_9_8_3_20241022" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.8.2.20240223"; - sha256 = "05k5grbh3s0ywm8y6cp9hqfj4bbq0nh1bx1ysgfv88df5hgg47r9"; + version = "9.8.3.20241022"; + sha256 = "0gnd9dvjbis9vdgjk671x9ys6b0af7399mim8gpi6dpa1nczgc7b"; + revision = "2"; + editedCabalFile = "0qbqx6qg8hab2il9idmxjfwhk7s86ffp24836irc85aazmpvzsxv"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -121204,6 +121392,8 @@ self: { pname = "ghc-lib-parser"; version = "9.10.1.20240511"; sha256 = "0fgissqfbgx5ra6gvfywxn76q16v5i97riaxqs1l9pa3zrfdzl9p"; + revision = "1"; + editedCabalFile = "0lsjzmdyqbganrq492vwwkx5j05p34vwn4bjkrd5zjww17fazfcj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -121998,8 +122188,8 @@ self: { ({ mkDerivation, base, containers, ghc, transformers }: mkDerivation { pname = "ghc-tcplugin-api"; - version = "0.11.0.0"; - sha256 = "0k0hr9l3w3xf60var20by5xp0wqfcwv8x4lfcag94f9bn60cnvra"; + version = "0.12.0.0"; + sha256 = "0gl5zhfvvkqa36ccl5hxjrw6pgpl1giwa1ysq4kbw41df8cwcxxl"; libraryHaskellDepends = [ base containers ghc transformers ]; description = "An API for type-checker plugins"; license = lib.licenses.bsd3; @@ -125411,8 +125601,8 @@ self: { pname = "github"; version = "0.29"; sha256 = "1hki9lvf5vcq980ky98vwc7rh86rgf3z8pvqfgpb6jinc7jylcpx"; - revision = "5"; - editedCabalFile = "094n02zbpvy3fpc1rss88ja7gq40ds8dp990bwsw73wrpgip67zg"; + revision = "6"; + editedCabalFile = "0ylwq4jzsng513pi98b3hxnn9lbjvjv5sgq1r7kfbd8nxgdcrbmw"; libraryHaskellDepends = [ aeson base base-compat base16-bytestring binary binary-instances bytestring containers cryptohash-sha1 deepseq deepseq-generics @@ -129995,30 +130185,6 @@ self: { }) {}; "goldplate" = callPackage - ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring, Diff - , directory, filepath, Glob, optparse-applicative, process - , regex-pcre-builtin, text, unordered-containers - }: - mkDerivation { - pname = "goldplate"; - version = "0.2.1.1"; - sha256 = "1cisak5ng6v0iq24djyg4jp87diay02m0k2saac49saxmk29jsr6"; - revision = "6"; - editedCabalFile = "1572x5xh8qja14qfv4whlj7zl7gwp5cyhmzdnbi44fnv4hr27l9d"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson aeson-pretty async base bytestring Diff directory filepath - Glob optparse-applicative process regex-pcre-builtin text - unordered-containers - ]; - testHaskellDepends = [ base process ]; - description = "A lightweight golden test runner"; - license = lib.licenses.asl20; - mainProgram = "goldplate"; - }) {}; - - "goldplate_0_2_2_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring, Diff , directory, filepath, Glob, optparse-applicative, process , regex-pcre-builtin, text, unordered-containers @@ -130038,7 +130204,6 @@ self: { testHaskellDepends = [ aeson base bytestring process ]; description = "A lightweight golden test runner"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; mainProgram = "goldplate"; }) {}; @@ -131802,8 +131967,8 @@ self: { }: mkDerivation { pname = "graphql-spice"; - version = "1.0.3.0"; - sha256 = "1jzrhbpxswi4znalwswjh43pwcysw7nzj6d1xa446xc3w8azs3ic"; + version = "1.0.4.0"; + sha256 = "182kjz5zky5z1wdg92823hhyprc13yfai0jlg6lx1cih83rwz3h5"; libraryHaskellDepends = [ aeson base conduit containers exceptions graphql hspec-expectations megaparsec scientific template-haskell text time transformers @@ -131815,6 +131980,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "GraphQL with batteries"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "graphql-utils" = callPackage @@ -134088,8 +134255,10 @@ self: { }: mkDerivation { pname = "h-raylib"; - version = "5.5.0.0"; - sha256 = "063sjmk48nrp27qajipcc2br0nfxa6206gybdpxngbs66vz4kgc1"; + version = "5.5.2.0"; + sha256 = "19y2vgy0s4mw47ip3jb78n2gjab2qyp6vyn5fra293srsp25qn5j"; + revision = "4"; + editedCabalFile = "17jcpz9vywj1kjg5llxb2qn0zx3cny4mh8xr478bd6l2m93ywm3b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -136486,8 +136655,8 @@ self: { pname = "hakyll"; version = "4.16.2.2"; sha256 = "0hnqf4xxgf1qgk262qvq0b0mx51jfv67y2kn6ca8jsp43dxy9941"; - revision = "2"; - editedCabalFile = "15457i7cjr2khv3ipis013cm11hinxr5r0s32bgmmbbdqi1g1y2s"; + revision = "3"; + editedCabalFile = "15q1wkjisjgvjn3mq6bj1rfrdsa50r0c37c4g75g905g7zrbmk51"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -136513,6 +136682,47 @@ self: { maintainers = [ lib.maintainers.erictapen ]; }) {inherit (pkgs) util-linux;}; + "hakyll_4_16_3_0" = callPackage + ({ mkDerivation, aeson, base, binary, blaze-html, blaze-markup + , bytestring, containers, data-default, deepseq, directory + , file-embed, filepath, fsnotify, hashable, http-conduit + , http-types, lrucache, mtl, network-uri, optparse-applicative + , pandoc, parsec, process, QuickCheck, random, regex-tdfa + , resourcet, scientific, tagsoup, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, template-haskell, text, time + , time-locale-compat, unordered-containers, util-linux, vector, wai + , wai-app-static, warp, yaml + }: + mkDerivation { + pname = "hakyll"; + version = "4.16.3.0"; + sha256 = "1m6kr9ph3ja3y2b6j1i2rk349v8ikqwjjj1z0my6p5ld77abz8qk"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base binary blaze-html blaze-markup bytestring containers + data-default deepseq directory file-embed filepath fsnotify + hashable http-conduit http-types lrucache mtl network-uri + optparse-applicative pandoc parsec process random regex-tdfa + resourcet scientific tagsoup template-haskell text time + time-locale-compat unordered-containers vector wai wai-app-static + warp yaml + ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ + aeson base bytestring containers filepath pandoc QuickCheck tagsoup + tasty tasty-golden tasty-hunit tasty-quickcheck text + unordered-containers yaml + ]; + testToolDepends = [ util-linux ]; + description = "A static website compiler library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hakyll-init"; + maintainers = [ lib.maintainers.erictapen ]; + }) {inherit (pkgs) util-linux;}; + "hakyll-R" = callPackage ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process }: @@ -138666,13 +138876,13 @@ self: { mainProgram = "happy"; }) {}; - "happy_2_0_2" = callPackage + "happy_2_1_1" = callPackage ({ mkDerivation, array, base, containers, happy-lib, mtl, process }: mkDerivation { pname = "happy"; - version = "2.0.2"; - sha256 = "0gp8fwn0k4vdz4g3s00jrh0n4g1arvpp6ps4f5xljqd1x1sjxxgp"; + version = "2.1.1"; + sha256 = "05vnv5dila8scra69vqn7gpxwn667nhsv9jx79pnx30444d8p8px"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers happy-lib mtl ]; @@ -138740,8 +138950,8 @@ self: { ({ mkDerivation, array, base, containers, mtl, transformers }: mkDerivation { pname = "happy-lib"; - version = "2.0.2"; - sha256 = "0ki1yn2m7fadsj1vjfskc2py7s6sgkhhzbs4l3ykbmgxkskvza29"; + version = "2.1.1"; + sha256 = "04sq8kzcgp6iv117s8z0469lg5g0qhc1s3grszksv781w71ljpp7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base containers mtl transformers ]; doHaddock = false; @@ -139079,8 +139289,8 @@ self: { }: mkDerivation { pname = "harpie"; - version = "0.1.0.0"; - sha256 = "11jdq7d1zx17qa2i1nvg6iysm56plikwk5bkq32xjbjq28yb0jhs"; + version = "0.1.1.0"; + sha256 = "18f49jjkf3zf20bmd9rfan768wlkaggikr1r6px354mfkfs8nb36"; libraryHaskellDepends = [ adjunctions base distributive first-class-families prettyprinter QuickCheck quickcheck-instances random vector vector-algorithms @@ -139092,6 +139302,23 @@ self: { broken = true; }) {}; + "harpie-numhask" = callPackage + ({ mkDerivation, adjunctions, base, doctest-parallel + , first-class-families, harpie, numhask, prettyprinter + }: + mkDerivation { + pname = "harpie-numhask"; + version = "0.1.0.1"; + sha256 = "1688gkwabg3ijnqq65j3nwrwdx2r6qb38dpchkm6wckycpy7i8f2"; + libraryHaskellDepends = [ + adjunctions base first-class-families harpie numhask + ]; + testHaskellDepends = [ base doctest-parallel prettyprinter ]; + description = "numhask shim for harpie"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "harpy" = callPackage ({ mkDerivation, array, base, containers, disassembler, mtl, parsec , pretty, template-haskell @@ -139498,8 +139725,8 @@ self: { }: mkDerivation { pname = "hash-cons"; - version = "0.1.0.0"; - sha256 = "04rdgc8lyf2byvjx5p3g06vcwjc6g0bh9qgk08c304p4q6rrijv4"; + version = "0.2.0.0"; + sha256 = "0dyg0xx8bxmh97p58bd8znlxjbld54af7q6blrsmaqqfvv4amxhn"; libraryHaskellDepends = [ base hashable ]; testHaskellDepends = [ async base hashable tasty tasty-hunit tasty-quickcheck @@ -140927,28 +141154,6 @@ self: { }) {}; "haskell-gi" = callPackage - ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal - , cabal-doctest, containers, directory, doctest, filepath, glib - , gobject-introspection, haskell-gi-base, mtl, pretty-show, process - , regex-tdfa, safe, text, transformers, xdg-basedir, xml-conduit - }: - mkDerivation { - pname = "haskell-gi"; - version = "0.26.11"; - sha256 = "0raf97k9w0794i1viv0xqcpwp6ahpqdja11a4d5qk80r811rc5iw"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - ansi-terminal attoparsec base bytestring Cabal containers directory - filepath haskell-gi-base mtl pretty-show process regex-tdfa safe - text transformers xdg-basedir xml-conduit - ]; - libraryPkgconfigDepends = [ glib gobject-introspection ]; - testHaskellDepends = [ base doctest process ]; - description = "Generate Haskell bindings for GObject Introspection capable libraries"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; - - "haskell-gi_0_26_12" = callPackage ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal , cabal-doctest, containers, directory, doctest, filepath, glib , gobject-introspection, haskell-gi-base, mtl, pretty-show, process @@ -140968,7 +141173,6 @@ self: { testHaskellDepends = [ base doctest process ]; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; "haskell-gi-base" = callPackage @@ -143512,8 +143716,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "1.5.12"; - sha256 = "19v7bwy3c3xwvsgxnch8p68fw67h0yy89sppjwhbndk2f5avshgq"; + version = "1.5.13"; + sha256 = "1bkwv3f494kqz9a7mmry831mfp3dkhz1zv209lgnl5k8kgf6a22z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144443,8 +144647,8 @@ self: { }: mkDerivation { pname = "haspara"; - version = "0.0.0.8"; - sha256 = "1yvzzkv0hbki5a5rp6md2kllrslafb26lkz4i9hfydllxqgrm0is"; + version = "0.0.0.10"; + sha256 = "0b80519m7g2iww89wj1vs6hz9sfkv8iv904si9wl83f0adh7r99w"; libraryHaskellDepends = [ aeson base containers data-default exceptions hashable megaparsec mtl refined safe-decimal scientific template-haskell text time @@ -145301,8 +145505,8 @@ self: { }: mkDerivation { pname = "hasqlator-mysql"; - version = "0.2.0"; - sha256 = "1dl72axgr6jaz9m243krys9x2svsrc7rnanc4pfvjx9w5648j3mq"; + version = "0.2.1"; + sha256 = "02hkkv2f0zck15dfmdrfr6vw9ma4xifv4jmz5crkyvmr68jw6n4d"; libraryHaskellDepends = [ aeson base binary bytestring containers dlist io-streams megaparsec mtl mysql-haskell optics-core pretty-simple prettyprinter @@ -148143,19 +148347,15 @@ self: { }) {}; "heftia" = callPackage - ({ mkDerivation, base, constraints, data-effects, extensible, free - , kan-extensions, membership, mtl, singletons-base, singletons-th - , tasty, tasty-discover, tasty-hunit, transformers - , transformers-base, unliftio + ({ mkDerivation, base, data-effects, freer-simple, mtl, tasty + , tasty-discover, tasty-hunit, unliftio }: mkDerivation { pname = "heftia"; - version = "0.3.1.0"; - sha256 = "09kvmpfkb88mgh3vvx78dn719ipifknav2b602l65ah7bwwn962n"; + version = "0.4.0.0"; + sha256 = "19p1l14cg6iqf5bk7pvllpd8z4qhzbpfvfzkvr3rgl7zsz7f28ih"; libraryHaskellDepends = [ - base constraints data-effects extensible free kan-extensions - membership mtl singletons-base singletons-th transformers - transformers-base unliftio + base data-effects freer-simple mtl unliftio ]; testHaskellDepends = [ base tasty tasty-hunit ]; testToolDepends = [ tasty-discover ]; @@ -148165,34 +148365,41 @@ self: { }) {}; "heftia-effects" = callPackage - ({ mkDerivation, base, containers, data-effects, extensible, extra - , free, ghc-typelits-knownnat, heftia, hspec, mtl, tasty - , tasty-discover, tasty-hspec, text, time, transformers - , unbounded-delays, unliftio + ({ mkDerivation, base, containers, data-effects, eff, effectful + , eveff, extra, freer-simple, fused-effects, ghc-typelits-knownnat + , heftia, hspec, logict, mpeff, mtl, polysemy, tasty, tasty-bench + , tasty-discover, tasty-hspec, text, time, unbounded-delays + , unliftio }: mkDerivation { pname = "heftia-effects"; - version = "0.3.1.0"; - sha256 = "1kdhhzw3kcpkjl5f4li6w3kygppj57bpscgdcxygy34cflgy4pdc"; + version = "0.4.0.1"; + sha256 = "05zsgfx2kmhgga4zczz2d9k45f1dkk12qvx5cwf2cx9kx44zi0ba"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers data-effects extensible extra free - ghc-typelits-knownnat heftia mtl time transformers unbounded-delays - unliftio + base containers data-effects ghc-typelits-knownnat heftia time + unbounded-delays unliftio ]; executableHaskellDepends = [ - base data-effects extra ghc-typelits-knownnat heftia text time + base containers data-effects extra ghc-typelits-knownnat heftia + text time unbounded-delays unliftio ]; testHaskellDepends = [ - base data-effects ghc-typelits-knownnat heftia hspec tasty - tasty-hspec unliftio + base containers data-effects ghc-typelits-knownnat heftia hspec + tasty tasty-hspec time unbounded-delays unliftio ]; testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base containers data-effects eff effectful eveff freer-simple + fused-effects ghc-typelits-knownnat heftia logict mpeff mtl + polysemy tasty-bench time unbounded-delays unliftio + ]; description = "higher-order effects done right"; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; - }) {}; + broken = true; + }) {eff = null;}; "hegg" = callPackage ({ mkDerivation, base, containers, deepseq, tasty, tasty-bench @@ -148404,6 +148611,8 @@ self: { pname = "helf"; version = "1.0.20240318"; sha256 = "0rmjfbai6k6kzynzm5skz4ska0awb012m4ykqhh47sd28vs9spk1"; + revision = "1"; + editedCabalFile = "151jk61357vydckahj0rhphph0yn8qm243p3rzvqi27w65969lyy"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -150972,6 +151181,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "hi-file-parser_0_1_7_0" = callPackage + ({ mkDerivation, base, binary, bytestring, hspec, mtl, rio, text + , vector + }: + mkDerivation { + pname = "hi-file-parser"; + version = "0.1.7.0"; + sha256 = "1rss6j85kj33jfp14qlafqlcbld6ibhhki2rjkdsz8ilchq32hqq"; + libraryHaskellDepends = [ + base binary bytestring mtl rio text vector + ]; + testHaskellDepends = [ + base binary bytestring hspec mtl rio text vector + ]; + description = "Parser for GHC's hi files"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hi3status" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, dbus, dyre , network, prefix-units, process, regex-pcre-builtin, text, time @@ -151126,8 +151354,8 @@ self: { pname = "hie-bios"; version = "0.14.0"; sha256 = "1caszgj3x3l13q6w26snx49yqyzjfgiik4403gl3mfalkrgbvk2g"; - revision = "1"; - editedCabalFile = "1g9gagj12jpazrq9zwq8vwv5saf23gqjgcvzcg81q7s4bn115l72"; + revision = "2"; + editedCabalFile = "0an5jy6hqa7v7r4s2lgzcb5sl7jlx5slncf73s4vyplx7qskjcah"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155572,8 +155800,8 @@ self: { }: mkDerivation { pname = "hmp3-ng"; - version = "2.14.3"; - sha256 = "02bcxzpmjm6kqcvx7036055chbyfyhi6pl4xrrxwwmkp85fh0apb"; + version = "2.15.0"; + sha256 = "12h06yzp3jiswfy95bryppc352wfkn666c17bd4g00v7k3qnda6p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -155923,8 +156151,8 @@ self: { }: mkDerivation { pname = "hnix-store-nar"; - version = "0.1.0.0"; - sha256 = "1kr8hmycb29sv646a3f3lpl0zzng9dg3nix7n0yfrfapycqd04cg"; + version = "0.1.1.0"; + sha256 = "16g03bvgdmpmzvq1acsayfq4b9xh7cgf41xn9bqjl0w72var67qp"; libraryHaskellDepends = [ algebraic-graphs base bytestring case-insensitive cereal containers directory filepath lifted-base monad-control mtl text unix @@ -158192,6 +158420,26 @@ self: { mainProgram = "hp2pretty"; }) {}; + "hp2pretty_0_10_1" = callPackage + ({ mkDerivation, array, attoparsec, base, containers, filepath + , floatshow, mtl, optparse-applicative, semigroups, text + }: + mkDerivation { + pname = "hp2pretty"; + version = "0.10.1"; + sha256 = "1wx3vxrx8qp85wfhpvv5vjxd45hmgy8m807m62b32ydxpw8mm89k"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array attoparsec base containers filepath floatshow mtl + optparse-applicative semigroups text + ]; + description = "generate pretty graphs from heap profiles"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hp2pretty"; + }) {}; + "hpack" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, crypton, deepseq, directory, filepath, Glob, hspec @@ -160556,8 +160804,8 @@ self: { pname = "hs-php-session"; version = "0.0.9.3"; sha256 = "1xwdikiqy2dxyzr6wx51wy51vifsvshblx7kkhfqd7izjf87ww8f"; - revision = "1"; - editedCabalFile = "1dj1r73v31bd2091pqvrg7vdc3lgjh373ynxn49dlhqmyw45kiw8"; + revision = "2"; + editedCabalFile = "00c8grlybwb22r5rqw82lmplgr3njkpij8ns1rx0caz2g6xr91xb"; libraryHaskellDepends = [ base bytestring ]; description = "PHP session and values serialization"; license = lib.licenses.bsd3; @@ -160837,6 +161085,21 @@ self: { broken = true; }) {}; + "hs-tango" = callPackage + ({ mkDerivation, base, derive-storable, tango, text, unliftio }: + mkDerivation { + pname = "hs-tango"; + version = "1.0.0"; + sha256 = "0ah4xp3vrarq8kpvgwk78hck8bj9w0fk3d6m5vi28cy8dq62qb5c"; + libraryHaskellDepends = [ base derive-storable text unliftio ]; + libraryPkgconfigDepends = [ tango ]; + benchmarkHaskellDepends = [ base text ]; + description = "Bindings to the Tango Controls system"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {inherit (pkgs) tango;}; + "hs-term-emulator" = callPackage ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring , containers, criterion, hspec, hspec-discover, lens, text, vector @@ -161395,8 +161658,8 @@ self: { pname = "hsc2hs"; version = "0.68.10"; sha256 = "0xpgbi6pssnizazz54583c50cz4axq3h78g03q4sfb7yi3bk8kkg"; - revision = "2"; - editedCabalFile = "099303623kck9pv6x0q2dzvwb3w39v5dazn3wryafcnwc1n8prv0"; + revision = "3"; + editedCabalFile = "0ndpgzmq2h2kv7xr9iaf957jnnykbjpd6vlii0n2rkahfckjaqr7"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -163051,18 +163314,6 @@ self: { }) {}; "hslua-list" = callPackage - ({ mkDerivation, base, bytestring, hslua-core, tasty, tasty-lua }: - mkDerivation { - pname = "hslua-list"; - version = "1.1.3"; - sha256 = "1ipmf3rpc3ndc23zjmyjmy9lx0q53pm6bjwsgidbqxi4rxsbddqw"; - libraryHaskellDepends = [ base bytestring hslua-core ]; - testHaskellDepends = [ base hslua-core tasty tasty-lua ]; - description = "Opinionated, but extensible Lua list type"; - license = lib.licenses.mit; - }) {}; - - "hslua-list_1_1_4" = callPackage ({ mkDerivation, base, bytestring, hslua-core, tasty, tasty-lua }: mkDerivation { pname = "hslua-list"; @@ -163072,7 +163323,6 @@ self: { testHaskellDepends = [ base hslua-core tasty tasty-lua ]; description = "Opinionated, but extensible Lua list type"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hslua-marshalling" = callPackage @@ -165208,10 +165458,8 @@ self: { }: mkDerivation { pname = "hstar"; - version = "0.1.0.6"; - sha256 = "0fcb37yi81059r2nqmq1809q5mdx8q2fyvs7b9fsj3j2fqmgnai6"; - revision = "2"; - editedCabalFile = "0ncj58a8rkwkwlcv50q5i6c9szss0kp0gbx8z38ycx1fhniig5qv"; + version = "0.1.0.7"; + sha256 = "00y5napbsbxdi3yjl9sj23zncqmxhnvdjppc2pwzj53xynpa4x94"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -167554,6 +167802,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "http-semantics_0_3_0" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive + , http-types, network, network-byte-order, time-manager + , utf8-string + }: + mkDerivation { + pname = "http-semantics"; + version = "0.3.0"; + sha256 = "0kviffsmvggzpbwxnqxshjq3w3yz5v367l5fywq9zcmzrc5ykklw"; + libraryHaskellDepends = [ + array base bytestring case-insensitive http-types network + network-byte-order time-manager utf8-string + ]; + description = "HTTP senmatics libarry"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "http-server" = callPackage ({ mkDerivation, base, HTTP, mime, network, network-uri, text, unix , url, utf8-string @@ -167707,41 +167973,6 @@ self: { broken = true; }) {}; - "http2_3_0_3" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, async, base - , base16-bytestring, bytestring, case-insensitive, containers - , cryptonite, directory, filepath, gauge, Glob, heaps, hspec - , hspec-discover, http-types, mwc-random, network - , network-byte-order, network-run, psqueues, stm, text - , time-manager, typed-process, unix-time, unordered-containers - , vector - }: - mkDerivation { - pname = "http2"; - version = "3.0.3"; - sha256 = "1kv99i3pnnx31xndlkaczrpd2j5mvzbqlfz1kaw6cwlwkdnl5bhv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array async base bytestring case-insensitive containers http-types - network network-byte-order psqueues stm time-manager unix-time - ]; - testHaskellDepends = [ - aeson aeson-pretty async base base16-bytestring bytestring - cryptonite directory filepath Glob hspec http-types network - network-byte-order network-run text typed-process - unordered-containers vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - array base bytestring case-insensitive containers gauge heaps - mwc-random network-byte-order psqueues stm - ]; - description = "HTTP/2 library"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "http2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, base , base16-bytestring, bytestring, case-insensitive, containers @@ -167927,19 +168158,19 @@ self: { "http2-tls" = callPackage ({ mkDerivation, base, bytestring, crypton-x509-store , crypton-x509-validation, data-default-class, http2, network - , network-control, network-run, recv, time-manager, tls, unliftio + , network-control, network-run, recv, time-manager, tls , utf8-string }: mkDerivation { pname = "http2-tls"; - version = "0.4.2"; - sha256 = "0fqdad7lrw7m942xl3k0yipm2qr48j3qd14a9a6m87dv2rypsqg4"; + version = "0.4.3"; + sha256 = "0pfjybiqiqafpbm9cr8dx4b2914l0n62xd36aw5jm8d9x8xsqdzy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring crypton-x509-store crypton-x509-validation data-default-class http2 network network-control network-run recv - time-manager tls unliftio utf8-string + time-manager tls utf8-string ]; description = "Library for HTTP/2 over TLS"; license = lib.licenses.bsd3; @@ -169603,8 +169834,8 @@ self: { }: mkDerivation { pname = "hw-kafka-avro"; - version = "6.0.1"; - sha256 = "1910yzn569x9iicd8c8ykkq3p5vz3py6d4j0pvwqy1h07xp528sk"; + version = "6.0.2"; + sha256 = "13lrmpglh31srd74a1ch68g723x08wns9sapmlckm1bzs6jj7s06"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169794,27 +170025,27 @@ self: { "hw-polysemy" = callPackage ({ mkDerivation, aeson, aeson-pretty, amazonka-s3, async, base , binary, bytestring, contravariant, Diff, directory, exceptions - , filepath, generic-lens, ghc-prim, http-conduit, lens, mtl - , network, polysemy, polysemy-log, polysemy-plugin, polysemy-time - , prettyprinter, process, resourcet, stm, tasty, tasty-discover - , tasty-hedgehog, temporary, testcontainers, text, time - , transformers, ulid, unliftio, yaml + , filepath, generic-lens, ghc-prim, http-conduit, hw-prelude, lens + , mtl, network, polysemy, polysemy-log, polysemy-plugin + , polysemy-time, prettyprinter, process, resourcet, stm, tasty + , tasty-discover, tasty-hedgehog, temporary, testcontainers, text + , time, transformers, ulid, unliftio, yaml }: mkDerivation { pname = "hw-polysemy"; - version = "0.2.14.11"; - sha256 = "1a71d98arml7qbq1374b4shkxv366f5w0agg4k6c89605h2zmfwl"; + version = "0.3.0.0"; + sha256 = "16cgg0z13f46hqp0abbv70pk6mw1lhckf2kf0hz994mjbprxrp2a"; libraryHaskellDepends = [ aeson aeson-pretty async base binary bytestring contravariant Diff directory exceptions filepath generic-lens ghc-prim http-conduit - lens mtl network polysemy polysemy-log polysemy-plugin + hw-prelude lens mtl network polysemy polysemy-log polysemy-plugin polysemy-time prettyprinter process resourcet stm temporary testcontainers text time transformers ulid unliftio yaml ]; testHaskellDepends = [ - amazonka-s3 base filepath generic-lens lens polysemy polysemy-log - polysemy-plugin tasty tasty-discover tasty-hedgehog testcontainers - text + amazonka-s3 base filepath generic-lens hw-prelude lens polysemy + polysemy-log polysemy-plugin tasty tasty-discover tasty-hedgehog + testcontainers text ]; testToolDepends = [ tasty-discover ]; doHaddock = false; @@ -169823,6 +170054,22 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "hw-prelude" = callPackage + ({ mkDerivation, async, base, bytestring, contravariant, directory + , filepath, network, process, resourcet, text, unliftio + }: + mkDerivation { + pname = "hw-prelude"; + version = "0.0.0.1"; + sha256 = "13zi55k9by4ysf0r48a7bhh6sb5qri39rqv5c33d4a9aw4jp5jyj"; + libraryHaskellDepends = [ + async base bytestring contravariant directory filepath network + process resourcet text unliftio + ]; + description = "Opinionated prelude library"; + license = lib.licenses.asl20; + }) {}; + "hw-prim" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, directory , doctest, doctest-discover, exceptions, ghc-prim, hedgehog, hspec @@ -171746,6 +171993,8 @@ self: { pname = "iCalendar"; version = "0.4.1.0"; sha256 = "1nh2gdmm1kd8dlflxwzdqg9xdylqblb7xhnhpl143j1wfcnd1cn4"; + revision = "1"; + editedCabalFile = "037il8bdhxbbpq5p7lpvjyvlrnx24km9lib9kz6q70p8m8mi43xn"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive containers data-default mime mtl network-uri old-locale parsec text time @@ -172468,6 +172717,8 @@ self: { doHaddock = false; description = "Branch on whether a constraint is satisfied"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ifcxt" = callPackage @@ -173987,14 +174238,16 @@ self: { license = "BSD-2-Clause-Patent"; }) {}; - "incipit-base_0_6_0_0" = callPackage + "incipit-base_0_6_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, data-default, stm , text }: mkDerivation { pname = "incipit-base"; - version = "0.6.0.0"; - sha256 = "15mmnixl4ny32h5aflqcq8kv37zhddhqwixa53mkz6ksrrdkpsxc"; + version = "0.6.1.0"; + sha256 = "1vlvwhgn4wfb6gaw1rld1qa1b54dvsymri0mf9x737faah0arhpy"; + revision = "1"; + editedCabalFile = "0gg499hfbi7fs7pffh00md4wdz2bcpm3wg2cqrb3kyr16y6nri1j"; libraryHaskellDepends = [ base bytestring containers data-default stm text ]; @@ -174016,12 +174269,12 @@ self: { license = "BSD-2-Clause-Patent"; }) {}; - "incipit-core_0_6_0_0" = callPackage + "incipit-core_0_6_1_0" = callPackage ({ mkDerivation, base, incipit-base, polysemy }: mkDerivation { pname = "incipit-core"; - version = "0.6.0.0"; - sha256 = "103fxzx6riyx5scfw340gj5dldxia7zw1i0xk5bkfbn1p5fw3sf4"; + version = "0.6.1.0"; + sha256 = "19m4pvrv6fyxj7ilns3ipfjhibmhgcrjz376djadbqb8fzxba2xb"; libraryHaskellDepends = [ base incipit-base polysemy ]; description = "A Prelude for Polysemy"; license = "BSD-2-Clause-Patent"; @@ -175423,8 +175676,8 @@ self: { pname = "inspection-testing"; version = "0.5.0.3"; sha256 = "1kh6lrcdyfnj0c8fqrllb21hfmnlsrllw6jkkg4hya0f9lqf4mgi"; - revision = "2"; - editedCabalFile = "01qs82sldkjvyjkdf2r96g4n480d2dwrncrlzl6k49b4py9hfdll"; + revision = "3"; + editedCabalFile = "1b66i5h8vbj3d3dn99wy6sffppfz8iywpwwdivxnxvn645crywa8"; libraryHaskellDepends = [ base containers ghc mtl template-haskell transformers ]; @@ -177032,6 +177285,18 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "io-embed" = callPackage + ({ mkDerivation, base, bytestring, hspec, template-haskell }: + mkDerivation { + pname = "io-embed"; + version = "0.1.0.1"; + sha256 = "0k50rkvak2647w43k083ib1yr845hmlh9wppgjg0fdyvqzxk45vb"; + libraryHaskellDepends = [ base bytestring hspec template-haskell ]; + testHaskellDepends = [ base bytestring hspec template-haskell ]; + description = "Use Template Haskell to embed the result of an IO computation"; + license = lib.licenses.bsd3; + }) {}; + "io-machine" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -177617,6 +177882,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "iproute_1_7_15" = callPackage + ({ mkDerivation, appar, base, byteorder, bytestring, containers + , hspec, hspec-discover, network, QuickCheck, safe + }: + mkDerivation { + pname = "iproute"; + version = "1.7.15"; + sha256 = "19abgdk9pk6n8qmvfcpqp282dgbn1mxmg5fsla4xryg6w2kk38qq"; + libraryHaskellDepends = [ + appar base byteorder bytestring containers network + ]; + testHaskellDepends = [ + appar base byteorder bytestring containers hspec network QuickCheck + safe + ]; + testToolDepends = [ hspec-discover ]; + description = "IP Routing Table"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "iptables-helpers" = callPackage ({ mkDerivation, base, containers, mtl, parsec, QuickCheck, safe , syb, utf8-string @@ -179291,8 +179577,10 @@ self: { }: mkDerivation { pname = "jacinda"; - version = "3.1.1.1"; - sha256 = "0jbssi0xq7y153avnd7c9qwnlnaiqdn7kznipi9c03rhax3yxdl1"; + version = "3.2.0.0"; + sha256 = "0vm55xalnlj7kkpc0n2hdzs5i5rizbig4bi2r77h1b5d9yz0iwjw"; + revision = "2"; + editedCabalFile = "0qf5zi8k7vlkli1d51mhhc9lbh39xd4gvrhcpar792npdi8jwx1c"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -180982,6 +181270,17 @@ self: { ]; }) {}; + "jsaddle-wasm" = callPackage + ({ mkDerivation, base, jsaddle }: + mkDerivation { + pname = "jsaddle-wasm"; + version = "0.0.0.0"; + sha256 = "03n1541sajbms1pkad6jajxfddx6xm5py4b7j1v77kafxi61dlxw"; + libraryHaskellDepends = [ base jsaddle ]; + description = "Run JSaddle @JSM@ with the GHC WASM backend"; + license = lib.licenses.cc0; + }) {}; + "jsaddle-webkit2gtk" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, gi-gio , gi-glib, gi-gtk, gi-javascriptcore, gi-webkit2, haskell-gi-base @@ -182426,8 +182725,8 @@ self: { }: mkDerivation { pname = "jsonrpc-tinyclient"; - version = "1.0.0.0"; - sha256 = "02xhijk3rk4c9yqh1ghs8gvi1r7fwbxba0h21nb23545wflg0bz9"; + version = "1.0.1.0"; + sha256 = "1rhfhyjzfazwvzw7xf3f5xccnd7p4wx9n9avbbrjwj2bzvlfn9b8"; libraryHaskellDepends = [ aeson base bytestring exceptions http-client http-client-tls mtl random text websockets @@ -184972,6 +185271,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "keycode_0_2_3" = callPackage + ({ mkDerivation, base, containers, ghc-prim, template-haskell }: + mkDerivation { + pname = "keycode"; + version = "0.2.3"; + sha256 = "1zq02yd7ldbyk7zpgq9bj37y52ckzyyrad2yi48amh7dzym1sbj2"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell + ]; + description = "Maps web browser keycodes to their corresponding keyboard keys"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "keyed" = callPackage ({ mkDerivation, base, containers, vector }: mkDerivation { @@ -187854,8 +188167,8 @@ self: { }: mkDerivation { pname = "language-c"; - version = "0.9.3"; - sha256 = "0lz2djw7zs8wnp23amqqxdyin3jgbjfh2dr2sr1v0kqpqav3yw81"; + version = "0.9.4"; + sha256 = "0cv2hqg4miajspwndn15s37nkra27bffqm4vv2gkk79nr86k9v31"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath mtl pretty process @@ -189318,6 +189631,7 @@ self: { ]; description = "Scalable anonymous records"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "large-anon-testsuite-fourmolu-preprocessor"; }) {}; @@ -189344,30 +189658,32 @@ self: { "large-hashable" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, byteable, bytes - , bytestring, cereal, containers, cryptohash, deepseq, hashable - , HTF, QuickCheck, safecopy, scientific, strict, template-haskell - , text, time, transformers, unordered-containers, utf8-light - , vector, void + , bytestring, cereal, containers, cpphs, criterion, cryptohash + , cryptonite, deepseq, hashable, HTF, inspection-testing, memory + , QuickCheck, safecopy, scientific, strict, template-haskell, text + , time, transformers, unordered-containers, vector, void }: mkDerivation { pname = "large-hashable"; - version = "0.1.0.4"; - sha256 = "13k2k8rqbk40whzn4hpa92ypws2c1gh5fb4zh0diy5m0kxfk9hz9"; - revision = "1"; - editedCabalFile = "1xfl265ryvrjra2nsjvlcmwgilbnxhp8pwxy54wi1ada645nwgbr"; + version = "0.1.1.0"; + sha256 = "0i7xk128c1hp1bw50n4wpbdyd6paqbl6vmnknyymkaaga07g5ba0"; libraryHaskellDepends = [ - aeson base base16-bytestring bytes bytestring containers scientific - strict template-haskell text time transformers unordered-containers - utf8-light vector void + aeson base base16-bytestring bytes bytestring containers cryptonite + memory scientific strict template-haskell text time transformers + unordered-containers vector void ]; + libraryToolDepends = [ cpphs ]; testHaskellDepends = [ - aeson base bytes bytestring containers hashable HTF QuickCheck - scientific strict text time unordered-containers vector + aeson base bytes bytestring containers hashable HTF + inspection-testing QuickCheck scientific strict text time + unordered-containers vector ]; + testToolDepends = [ cpphs ]; benchmarkHaskellDepends = [ - base base16-bytestring byteable bytes bytestring cereal cryptohash - deepseq safecopy text transformers + base base16-bytestring byteable bytes bytestring cereal criterion + cryptohash deepseq safecopy text transformers ]; + benchmarkToolDepends = [ cpphs ]; description = "Efficiently hash (large) Haskell values"; license = lib.licenses.bsd3; badPlatforms = [ "aarch64-linux" ]; @@ -189375,22 +189691,22 @@ self: { }) {}; "large-records" = callPackage - ({ mkDerivation, base, containers, generic-deriving, ghc + ({ mkDerivation, base, containers, generic-deriving, ghc, ghc-prim , large-generics, mtl, newtype, primitive, record-dot-preprocessor , record-hasfield, syb, tasty, tasty-hunit, template-haskell , transformers }: mkDerivation { pname = "large-records"; - version = "0.4.1"; - sha256 = "0z0k8r4im1rzykwgk8wgyy8zv1wcb06fmikgir09bxhymg0fzpw8"; + version = "0.4.2"; + sha256 = "1z61v8vi3ax2pjw0d4k3vznbiziwflgraralrkxv12s3s3kq0pm5"; libraryHaskellDepends = [ base containers ghc large-generics mtl primitive record-dot-preprocessor record-hasfield syb template-haskell transformers ]; testHaskellDepends = [ - base generic-deriving large-generics mtl newtype + base generic-deriving ghc-prim large-generics mtl newtype record-dot-preprocessor record-hasfield tasty tasty-hunit template-haskell transformers ]; @@ -189697,8 +190013,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "4.2.0"; - sha256 = "1ip40njah6i25v7wzkd5vpw9gs43dinb1x8ri8mhdn430h30mr05"; + version = "4.3.0"; + sha256 = "0prsix4w6x3413pix2971nlwd1pnz6s8w91wq12wcbvyv6lvlb03"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring clock containers cryptohash exceptions extra generic-lens hashtables http-client @@ -193029,8 +193345,8 @@ self: { ({ mkDerivation, base, libsodium }: mkDerivation { pname = "libsodium-bindings"; - version = "0.0.1.1"; - sha256 = "0gfksw47rl13a3mhyzawhxrcp9ia6g85m5v59pp85jci0bgs7bda"; + version = "0.0.2.0"; + sha256 = "12zg8ckvv8qhdmw6pdwfyif23y6iw5hgwcyhb4hlhfk8q7qv2av3"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ libsodium ]; description = "FFI bindings to libsodium"; @@ -193494,6 +193810,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "lift-generics_0_3" = callPackage + ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover + , mtl, template-haskell, th-compat, th-lift-instances + }: + mkDerivation { + pname = "lift-generics"; + version = "0.3"; + sha256 = "1walsrpschxg2bqw925z6cr24cznrcq04bb37azvwdcfrbl19r7a"; + libraryHaskellDepends = [ + base ghc-prim template-haskell th-compat + ]; + testHaskellDepends = [ + base containers hspec mtl template-haskell th-compat + th-lift-instances + ]; + testToolDepends = [ hspec-discover ]; + description = "GHC.Generics-based Language.Haskell.TH.Syntax.lift implementation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lift-read-show" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -193518,29 +193855,6 @@ self: { }) {}; "lifted-async" = callPackage - ({ mkDerivation, async, base, constraints, deepseq, HUnit - , lifted-base, monad-control, mtl, tasty, tasty-bench - , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base - }: - mkDerivation { - pname = "lifted-async"; - version = "0.10.2.5"; - sha256 = "1lhyjv32plqs0r2gi7ca8b527z5qas7xgjkh680lqwi0l81xd80n"; - revision = "1"; - editedCabalFile = "18z12n6v3n810qp7hxanixwhznphpw69jz9ahwxfknww51dj2jx0"; - libraryHaskellDepends = [ - async base constraints lifted-base monad-control transformers-base - ]; - testHaskellDepends = [ - async base HUnit lifted-base monad-control mtl tasty - tasty-expected-failure tasty-hunit tasty-th - ]; - benchmarkHaskellDepends = [ async base deepseq tasty-bench ]; - description = "Run lifted IO operations asynchronously and wait for their results"; - license = lib.licenses.bsd3; - }) {}; - - "lifted-async_0_10_2_6" = callPackage ({ mkDerivation, async, base, constraints, deepseq, HUnit , lifted-base, monad-control, mtl, tasty, tasty-bench , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base @@ -193559,7 +193873,6 @@ self: { benchmarkHaskellDepends = [ async base deepseq tasty-bench ]; description = "Run lifted IO operations asynchronously and wait for their results"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "lifted-base" = callPackage @@ -196287,6 +196600,28 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "llvm-codegen" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, dlist + , ghc-prim, hspec, hspec-hedgehog, mmorph, mtl, neat-interpolation + , text, text-builder-linear + }: + mkDerivation { + pname = "llvm-codegen"; + version = "0.1.0.0"; + sha256 = "1iqrfkyhqdw7mvpl86jrccl6iqmdp64mmzmhlc4bp59cbxifb0zz"; + setupHaskellDepends = [ base Cabal containers ]; + libraryHaskellDepends = [ + base bytestring containers dlist ghc-prim mmorph mtl text + text-builder-linear + ]; + testHaskellDepends = [ + base bytestring containers dlist ghc-prim hspec hspec-hedgehog + mmorph mtl neat-interpolation text text-builder-linear + ]; + description = "A DSL for LLVM IR code generation based on llvm-hs"; + license = lib.licenses.bsd3; + }) {}; + "llvm-data-interop" = callPackage ({ mkDerivation, array, base, bytestring, c2hs, containers , data-default, deepseq, dwarf, hashable, hashtables @@ -198707,6 +199042,8 @@ self: { pname = "lrucache"; version = "1.2.0.1"; sha256 = "11avhnjnb89rvn2s41jhh5r40zgp7r6kb5c0hcfiibpabqvv46pw"; + revision = "1"; + editedCabalFile = "0v2wc5k2knvv5knbarzspmbzf657r52jyjm9kf6r4ylsmi9cbq0k"; libraryHaskellDepends = [ base containers contravariant ]; description = "a simple, pure LRU cache"; license = lib.licenses.bsd3; @@ -202320,25 +202657,21 @@ self: { }) {}; "markup-parse" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, flatparse - , html-parse, optparse-applicative, perf, string-interpolate, tasty - , tasty-golden, text, these, tree-diff + ({ mkDerivation, base, bytestring, containers, deepseq + , doctest-parallel, flatparse, string-interpolate, tasty + , tasty-golden, these, tree-diff }: mkDerivation { pname = "markup-parse"; - version = "0.1.1"; - sha256 = "1ybmppxd4hpqjr2lnb1x9jk96fkd8snq6l2p0fzpr7q6bq09wx0a"; - revision = "1"; - editedCabalFile = "1p9hba5fcfbv9qm4aqg9hn5bamw6slyr1sxz5pzg3hnj1c8npzl6"; + version = "0.1.1.1"; + sha256 = "0k9ga485l7nvhny0kqjb6s4q407a1mnfpcsy90892qgj42dkkdb4"; libraryHaskellDepends = [ base bytestring containers deepseq flatparse string-interpolate tasty tasty-golden these tree-diff ]; testHaskellDepends = [ - base bytestring string-interpolate tasty tasty-golden tree-diff - ]; - benchmarkHaskellDepends = [ - base bytestring flatparse html-parse optparse-applicative perf text + base bytestring doctest-parallel string-interpolate tasty + tasty-golden tree-diff ]; description = "A markup parser"; license = lib.licenses.bsd3; @@ -203827,8 +204160,8 @@ self: { }: mkDerivation { pname = "mcmc"; - version = "0.8.2.0"; - sha256 = "0ms2v86wam1gl5ibhs8pl8rqxxbp2zlr3pv7vfbbp6vgjw2i4x7h"; + version = "0.8.3.1"; + sha256 = "1x0r4ph3vc5aamd1pbpbx39l8cih0nmm7pl3ywkl8hmbgzmmkami"; libraryHaskellDepends = [ ad aeson async base bytestring circular containers covariance directory dirichlet hmatrix log-domain math-functions microlens @@ -203844,33 +204177,6 @@ self: { maintainers = [ lib.maintainers.dschrempf ]; }) {}; - "mcmc_0_8_3_0" = callPackage - ({ mkDerivation, ad, aeson, async, base, bytestring, circular - , containers, covariance, criterion, directory, dirichlet - , fixed-vector, hmatrix, hspec, log-domain, math-functions - , microlens, mwc-random, parallel, primitive, random, splitmix - , statistics, time, transformers, vector, zlib - }: - mkDerivation { - pname = "mcmc"; - version = "0.8.3.0"; - sha256 = "1p4j59wzzbrn5xy64pcg42g2qicski3j16prpm082sags0pv3i7r"; - libraryHaskellDepends = [ - ad aeson async base bytestring circular containers covariance - directory dirichlet hmatrix log-domain math-functions microlens - mwc-random parallel primitive random splitmix statistics time - transformers vector zlib - ]; - testHaskellDepends = [ base hspec random statistics ]; - benchmarkHaskellDepends = [ - aeson base criterion fixed-vector math-functions random vector - ]; - description = "Sample from a posterior using Markov chain Monte Carlo"; - license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.dschrempf ]; - }) {}; - "mcmc-samplers" = callPackage ({ mkDerivation, base, containers, hakaru, hmatrix, mwc-random , primitive, statistics @@ -204045,16 +204351,16 @@ self: { "mealy" = callPackage ({ mkDerivation, adjunctions, base, containers, doctest-parallel - , mwc-probability, numhask, numhask-array, primitive, profunctors - , tdigest, text, vector, vector-algorithms + , harpie, harpie-numhask, mwc-probability, numhask, primitive + , profunctors, tdigest, text, vector, vector-algorithms }: mkDerivation { pname = "mealy"; - version = "0.4.5.0"; - sha256 = "1lyqskr9pddhdm0i8ncykz9gvbjxhfac3y49cvm6vziy3wmxd6ji"; + version = "0.5.0.0"; + sha256 = "0cijjmi3wqi7z3vbhm0ya8va9397rlkr3wkri6kf94qqr1vimgxy"; libraryHaskellDepends = [ - adjunctions base containers mwc-probability numhask numhask-array - primitive profunctors tdigest text vector vector-algorithms + adjunctions base containers harpie harpie-numhask mwc-probability + numhask primitive profunctors tdigest text vector vector-algorithms ]; testHaskellDepends = [ base doctest-parallel ]; description = "Mealy machines for processing time-series and ordered data"; @@ -207445,17 +207751,17 @@ self: { ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , case-insensitive, directory, file-embed-lzma, filepath , http-api-data, http-types, insert-ordered-containers, lens - , minion, minion-wai-extra, openapi3, template-haskell, text + , minion, openapi3, template-haskell, text }: mkDerivation { pname = "minion-openapi3"; - version = "0.1.0.0"; - sha256 = "03rqqx8dy6sk8ryp2a0ykw67rxj531sw12vzpnz8f17vw90x5npp"; + version = "0.1.0.1"; + sha256 = "1vc1cmmf1sspdfcbxk1d1807rggiridyhvvsh27j0z34n3p9whih"; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring case-insensitive directory file-embed-lzma filepath http-api-data http-types - insert-ordered-containers lens minion minion-wai-extra openapi3 - template-haskell text + insert-ordered-containers lens minion openapi3 template-haskell + text ]; description = "Minion openapi3 support"; license = lib.licenses.mit; @@ -208045,17 +208351,19 @@ self: { "mit-3qvpPyAi6mH" = callPackage ({ mkDerivation, base, base64, containers, directory, ki - , optparse-applicative, parsec, process, stm, text, text-ansi, unix + , optparse-applicative, parsec, process, stm, text, text-ansi + , text-builder-linear, unconditional-jump, unix }: mkDerivation { pname = "mit-3qvpPyAi6mH"; - version = "11"; - sha256 = "0p5v2spwd8rz5h5zclbr7wq5m4qvsihvp91p52d2vd3jdd6xaszx"; + version = "12"; + sha256 = "0lvn4fal9my2gngcic6kx5xq3sdsl63xm9b6bnsy23ww10zkxdp3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base64 containers directory ki optparse-applicative parsec - process stm text text-ansi unix + process stm text text-ansi text-builder-linear unconditional-jump + unix ]; executableHaskellDepends = [ base ]; description = "A git wrapper with a streamlined UX"; @@ -208692,18 +209000,19 @@ self: { "mmzk-typeid" = callPackage ({ mkDerivation, aeson, array, base, binary, bytestring, containers - , entropy, hashable, hspec, random, text, time, uuid, uuid-types + , entropy, hashable, hint, hspec, random, text, time, uuid + , uuid-types }: mkDerivation { pname = "mmzk-typeid"; - version = "0.7.0.0"; - sha256 = "139wn08imnasz40v8hlcjm4fmkxwq9lr0xbcl1kqnxqph8yfmmwa"; + version = "0.7.0.1"; + sha256 = "1c2mybdgnn9nzvk2php5i3xid3cm1ws7zrcsg4ngy2a60057pwbz"; libraryHaskellDepends = [ aeson array base binary bytestring entropy hashable random text time uuid uuid-types ]; testHaskellDepends = [ - aeson array base binary bytestring containers entropy hashable + aeson array base binary bytestring containers entropy hashable hint hspec random text time uuid uuid-types ]; description = "A TypeID and UUIDv7 implementation for Haskell"; @@ -213229,12 +213538,12 @@ self: { maintainers = [ lib.maintainers.sheepforce ]; }) {inherit (pkgs) mpich;}; - "mpi-hs_0_7_3_0" = callPackage + "mpi-hs_0_7_3_1" = callPackage ({ mkDerivation, base, bytestring, c2hs, monad-loops, ompi }: mkDerivation { pname = "mpi-hs"; - version = "0.7.3.0"; - sha256 = "1q6jb3sm8jspw9zas5iggvzr6w0zmcbr2qqw4q4j96hrfpjgj798"; + version = "0.7.3.1"; + sha256 = "1f4jdk5wysi54skz2jpzh83v5xi4gqa0q3r89l1adlz4m5i90l70"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring monad-loops ]; @@ -221453,6 +221762,8 @@ self: { pname = "nix-derivation"; version = "1.1.3"; sha256 = "11drhg3zjhwbvdw25k0icvbkcpqilx0m9qw60k7snfaz1iadfkdb"; + revision = "1"; + editedCabalFile = "1w84h665dls927g1zwzyfp91jyk97dy0ccii8m07y1prp007ccxa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -221708,8 +222019,8 @@ self: { }: mkDerivation { pname = "nix-tree"; - version = "0.4.1"; - sha256 = "1w8fg872fw40r346vkkqffahplmyly792ygcbqq0czapwhl0wbvv"; + version = "0.5.0"; + sha256 = "0gjmmnkizqb5pzzr13a1bzs0smch353nvhwplcp04kwcdgm22axd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -223311,23 +223622,27 @@ self: { }) {}; "nri-redis" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, conduit, hedis - , nri-env-parser, nri-observability, nri-prelude, resourcet - , safe-exceptions, text, unordered-containers, uuid + ({ mkDerivation, aeson, async, base, bytestring, conduit + , containers, cryptohash-sha1, haskell-src-meta, hedis, megaparsec + , modern-uri, nri-env-parser, nri-observability, nri-prelude + , pcre-light, resourcet, safe-exceptions, template-haskell, text + , unordered-containers, uuid }: mkDerivation { pname = "nri-redis"; - version = "0.1.0.4"; - sha256 = "1ws5j8r4ny8dhw2bf2zqvq42ab9h44ly562cjrl6ha5mlk78mvpq"; + version = "0.2.0.2"; + sha256 = "0hp8sbf7pvnplzg13n42xfp169japknm3z0szzspg2khi5fgwk86"; libraryHaskellDepends = [ - aeson async base bytestring conduit hedis nri-env-parser - nri-observability nri-prelude resourcet safe-exceptions text - unordered-containers uuid + aeson async base bytestring conduit containers cryptohash-sha1 + haskell-src-meta hedis megaparsec modern-uri nri-env-parser + nri-observability nri-prelude pcre-light resourcet safe-exceptions + template-haskell text unordered-containers uuid ]; testHaskellDepends = [ - aeson async base bytestring conduit hedis nri-env-parser - nri-observability nri-prelude resourcet safe-exceptions text - unordered-containers uuid + aeson async base bytestring conduit containers cryptohash-sha1 + haskell-src-meta hedis megaparsec modern-uri nri-env-parser + nri-observability nri-prelude pcre-light resourcet safe-exceptions + template-haskell text unordered-containers uuid ]; description = "An intuitive hedis wrapper library"; license = lib.licenses.bsd3; @@ -224018,13 +224333,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "numhask_0_12_0_3" = callPackage - ({ mkDerivation, base, QuickCheck }: + "numhask_0_12_1_0" = callPackage + ({ mkDerivation, base, doctest-parallel, QuickCheck }: mkDerivation { pname = "numhask"; - version = "0.12.0.3"; - sha256 = "0rxh2avhfb2m5ss8b70k7dv3scla9ki7a8d73hnqlcfp7vjwm9qk"; - libraryHaskellDepends = [ base QuickCheck ]; + version = "0.12.1.0"; + sha256 = "1709f96j4jk81cqadb2lngr35j7jv7rixjx1i7qcccqr80dxhbq6"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest-parallel QuickCheck ]; description = "A numeric class hierarchy"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -225652,6 +225968,24 @@ self: { broken = true; }) {}; + "ollama-haskell" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-client, http-types + , silently, tasty, tasty-hunit, text, time + }: + mkDerivation { + pname = "ollama-haskell"; + version = "0.1.0.2"; + sha256 = "12m9ar8fyfxj2bd2q6qgslmyh85fxzqvh09mgvxskdb14yxzil1c"; + libraryHaskellDepends = [ + aeson base bytestring http-client http-types text time + ]; + testHaskellDepends = [ base silently tasty tasty-hunit text ]; + description = "Ollama Haskell library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "olwrapper" = callPackage ({ mkDerivation, base, bytestring, fay, fay-jquery, fay-text, lens , mtl, snap, snap-core, snap-loader-dynamic, snap-loader-static @@ -226164,6 +226498,8 @@ self: { pname = "one-time-password"; version = "3.0.0.0"; sha256 = "0yark6agy421mk7zblzy4vpccbd1i53gpiysa0a7s9sh0szy4bql"; + revision = "3"; + editedCabalFile = "0dbck4bw97w1ci6yjgvgzzgbpr9xlnc8kghndigipxxy77sx5nqg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -227554,8 +227890,8 @@ self: { }: mkDerivation { pname = "opentelemetry-plugin"; - version = "1.1.0"; - sha256 = "1lkfgkpbw340nh09dw53y4jv19plb6y19sbyb0fqpnf5g3zchmx0"; + version = "1.1.1"; + sha256 = "1sp6bzy0is704x18522b2kmbbsw3nbfz9x69rvidmpz0x52cpwbg"; libraryHaskellDepends = [ base bytestring containers ghc hs-opentelemetry-api hs-opentelemetry-propagator-w3c hs-opentelemetry-sdk mwc-random stm @@ -228146,8 +228482,8 @@ self: { }: mkDerivation { pname = "opt-env-conf"; - version = "0.5.1.0"; - sha256 = "024qqi8gfha21ch54dja0rrmcqalmxn6qgxypzvmqzxdmv1fcwjh"; + version = "0.6.0.2"; + sha256 = "1mwj5x3s40w7rgl6s87l29q47qv26nzrpilr1qfm0xinvrnq6bj2"; libraryHaskellDepends = [ aeson autodocodec autodocodec-nix autodocodec-schema autodocodec-yaml base containers hashable mtl path path-io @@ -230853,39 +231189,39 @@ self: { ]; }) {}; - "pandoc_3_4" = callPackage + "pandoc_3_5" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions - , commonmark-pandoc, containers, crypton-connection + , commonmark-pandoc, containers, crypton, crypton-connection , crypton-x509-system, data-default, deepseq, Diff, directory, djot , doclayout, doctemplates, emojis, exceptions, file-embed, filepath , Glob, gridtables, haddock-library, http-client, http-client-tls , http-types, ipynb, jira-wiki-markup, JuicyPixels, mime-types, mtl , network, network-uri, pandoc-types, parsec, pretty, pretty-show - , process, random, safe, scientific, SHA, skylighting - , skylighting-core, split, syb, tagsoup, tasty, tasty-bench - , tasty-golden, tasty-hunit, tasty-quickcheck, temporary, texmath - , text, text-conversions, time, tls, typst, unicode-collation + , process, random, safe, scientific, skylighting, skylighting-core + , split, syb, tagsoup, tasty, tasty-bench, tasty-golden + , tasty-hunit, tasty-quickcheck, temporary, texmath, text + , text-conversions, time, tls, typst, unicode-collation , unicode-transforms, unix, vector, xml, xml-conduit, xml-types , yaml, zip-archive, zlib }: mkDerivation { pname = "pandoc"; - version = "3.4"; - sha256 = "0kwq6xpycd5sv5h6mbiv08imnzzsgchvyxx5hzscha4kkk2hr0nw"; + version = "3.5"; + sha256 = "0p23nfdx8xb60g2xplpfh3084i04gi3hy88s8864i8mq5i5ajpql"; configureFlags = [ "-f-trypandoc" ]; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty array attoparsec base base64-bytestring binary blaze-html blaze-markup bytestring case-insensitive citeproc commonmark commonmark-extensions commonmark-pandoc containers - crypton-connection crypton-x509-system data-default deepseq + crypton crypton-connection crypton-x509-system data-default deepseq directory djot doclayout doctemplates emojis exceptions file-embed filepath Glob gridtables haddock-library http-client http-client-tls http-types ipynb jira-wiki-markup JuicyPixels mime-types mtl network network-uri pandoc-types parsec pretty - pretty-show process random safe scientific SHA skylighting + pretty-show process random safe scientific skylighting skylighting-core split syb tagsoup temporary texmath text text-conversions time tls typst unicode-collation unicode-transforms unix vector xml xml-conduit xml-types yaml @@ -230995,14 +231331,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "pandoc-cli_3_4" = callPackage + "pandoc-cli_3_5" = callPackage ({ mkDerivation, base, hslua-cli, pandoc, pandoc-lua-engine , pandoc-server, safe, temporary, text, wai-extra, warp }: mkDerivation { pname = "pandoc-cli"; - version = "3.4"; - sha256 = "0qrgjx1q7g80lx98580q3w4pddmh2qqpxkmg005hmdmp6hqvd30s"; + version = "3.5"; + sha256 = "0q6zhwgzipfcy36fsdnq5mkqq25kirscvfb347n3drmc2lnw5lmr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -231042,10 +231378,10 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.17.1"; - sha256 = "0md7i54rnvgn0yll7mwhi124nak0pfmpga34vnd996r6fgmnq5fb"; - revision = "3"; - editedCabalFile = "14zqqrv5mgd8kdnis2k97ydcbi2rr77cq09z918lwcfcx7dxsl6w"; + version = "0.3.18.0"; + sha256 = "01kj17rf53kshfw7dd1875xi6s43b84hr7dvbfbhsb1c10pvdwac"; + revision = "1"; + editedCabalFile = "014brzc3r46b93hi4wzlyx9qf9qcf1js5qvpwk5rvzqpvazjglkj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -231383,25 +231719,25 @@ self: { license = lib.licenses.gpl2Plus; }) {}; - "pandoc-lua-engine_0_3_2" = callPackage + "pandoc-lua-engine_0_3_3" = callPackage ({ mkDerivation, aeson, base, bytestring, citeproc, containers - , data-default, directory, doclayout, doctemplates, exceptions - , filepath, hslua, hslua-module-doclayout, hslua-module-path - , hslua-module-system, hslua-module-text, hslua-module-version - , hslua-module-zip, hslua-repl, lpeg, mtl, pandoc - , pandoc-lua-marshal, pandoc-types, parsec, SHA, tasty + , crypton, data-default, directory, doclayout, doctemplates + , exceptions, filepath, hslua, hslua-module-doclayout + , hslua-module-path, hslua-module-system, hslua-module-text + , hslua-module-version, hslua-module-zip, hslua-repl, lpeg, mtl + , pandoc, pandoc-lua-marshal, pandoc-types, parsec, tasty , tasty-golden, tasty-hunit, tasty-lua, text }: mkDerivation { pname = "pandoc-lua-engine"; - version = "0.3.2"; - sha256 = "0lh533m3xvr8c29mazdb09b7w7ivrlscc5dxzmrfnkwkr0friw8c"; + version = "0.3.3"; + sha256 = "0jzddmg2qnbdv83hrfmxhfibp8p1mm9j32vxm89kg6fbx688n5hw"; libraryHaskellDepends = [ - aeson base bytestring citeproc containers data-default doclayout - doctemplates exceptions hslua hslua-module-doclayout + aeson base bytestring citeproc containers crypton data-default + doclayout doctemplates exceptions hslua hslua-module-doclayout hslua-module-path hslua-module-system hslua-module-text hslua-module-version hslua-module-zip hslua-repl lpeg mtl pandoc - pandoc-lua-marshal pandoc-types parsec SHA text + pandoc-lua-marshal pandoc-types parsec text ]; testHaskellDepends = [ base bytestring data-default directory exceptions filepath hslua @@ -231413,28 +231749,6 @@ self: { }) {}; "pandoc-lua-marshal" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, exceptions - , hslua, hslua-list, hslua-marshalling, pandoc-types, QuickCheck - , safe, tasty, tasty-hunit, tasty-lua, tasty-quickcheck, text - }: - mkDerivation { - pname = "pandoc-lua-marshal"; - version = "0.2.8"; - sha256 = "0z58mn895hhgkl9lww2zxc0zrpqdnf6m8bpvxfdsh8az0sxgsgba"; - libraryHaskellDepends = [ - aeson base bytestring containers exceptions hslua hslua-list - hslua-marshalling pandoc-types safe text - ]; - testHaskellDepends = [ - aeson base bytestring containers exceptions hslua hslua-list - hslua-marshalling pandoc-types QuickCheck safe tasty tasty-hunit - tasty-lua tasty-quickcheck text - ]; - description = "Use pandoc types in Lua"; - license = lib.licenses.mit; - }) {}; - - "pandoc-lua-marshal_0_2_9" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, exceptions , hslua, hslua-list, hslua-marshalling, pandoc-types, QuickCheck , safe, tasty, tasty-hunit, tasty-lua, tasty-quickcheck, text @@ -231454,7 +231768,6 @@ self: { ]; description = "Use pandoc types in Lua"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "pandoc-markdown-ghci-filter" = callPackage @@ -231679,7 +231992,7 @@ self: { license = lib.licenses.gpl2Plus; }) {}; - "pandoc-server_0_1_0_8" = callPackage + "pandoc-server_0_1_0_9" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, data-default, doctemplates, pandoc, pandoc-types , servant-server, skylighting, text, unicode-collation, wai @@ -231687,8 +232000,8 @@ self: { }: mkDerivation { pname = "pandoc-server"; - version = "0.1.0.8"; - sha256 = "1ffsbi1ik0lx06xj1ffr2zpn4a9wn8lsawyhak77nqaih93336a5"; + version = "0.1.0.9"; + sha256 = "1bdfd0lq0vdrr8rvjxin6j011jg4kn210zzpz2lixvc8wfcw66w8"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring containers data-default doctemplates pandoc pandoc-types servant-server skylighting text @@ -232128,8 +232441,8 @@ self: { pname = "pantry"; version = "0.10.0"; sha256 = "1f0ck7j82km4sy1ia2iqv9aqkdr3p2h8sarbksrsx2dq68552xym"; - revision = "1"; - editedCabalFile = "1kz5glyqd86g8jg9n7cvgmamw0kw4fq2wsf7fd5hgjf4fhbs2scd"; + revision = "2"; + editedCabalFile = "1v2d03rzrj0gmilx2qa1c0y1srzjh96xq02sd7qarc2kjw4rjgyi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -234118,7 +234431,32 @@ self: { ]; description = "Hashing and checking of passwords"; license = lib.licenses.bsd3; - platforms = lib.platforms.x86; + maintainers = [ lib.maintainers.cdepillabout ]; + }) {}; + + "password_3_1_0_0" = callPackage + ({ mkDerivation, base, base-compat, base64, bytestring, Cabal + , cabal-doctest, crypton, doctest, memory, password-types + , QuickCheck, quickcheck-instances, scrypt, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text + }: + mkDerivation { + pname = "password"; + version = "3.1.0.0"; + sha256 = "0rmcmp9bwa4nqma1pphjga2bmd5axw3579v6i1sh5yih1cfqzi2q"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base64 bytestring crypton memory password-types + template-haskell text + ]; + testHaskellDepends = [ + base base-compat base64 bytestring crypton doctest memory + password-types QuickCheck quickcheck-instances scrypt tasty + tasty-hunit tasty-quickcheck template-haskell text + ]; + description = "Hashing and checking of passwords"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.cdepillabout ]; }) {}; @@ -234143,7 +234481,6 @@ self: { ]; description = "typeclass instances for password package"; license = lib.licenses.bsd3; - platforms = lib.platforms.x86; maintainers = [ lib.maintainers.cdepillabout ]; }) {}; @@ -236093,6 +236430,31 @@ self: { mainProgram = "perf-explore"; }) {}; + "perf_0_13_0_0" = callPackage + ({ mkDerivation, base, clock, containers, deepseq, formatn, mtl + , numhask-space, optparse-applicative, recursion-schemes, text + , vector + }: + mkDerivation { + pname = "perf"; + version = "0.13.0.0"; + sha256 = "0xqwg42cl9f1s9niyc2r9py75w26bp7rlax04ifjjbbq5y9aw2gb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base clock containers deepseq formatn mtl numhask-space + optparse-applicative recursion-schemes text vector + ]; + executableHaskellDepends = [ + base clock containers deepseq formatn mtl optparse-applicative text + ]; + benchmarkHaskellDepends = [ base ]; + description = "Performance methods and monad"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "perf-explore"; + }) {}; + "perf-analysis" = callPackage ({ mkDerivation, base, containers, deepseq, optparse-generic, perf , protolude, readme-lhs, scientific, tdigest, text, text-format @@ -237603,8 +237965,8 @@ self: { pname = "pg-entity"; version = "0.0.4.4"; sha256 = "0xbsys4h6p84m3vh076v5cjrmf2v9yl8d44zaknfxbjc8ssfbmh2"; - revision = "2"; - editedCabalFile = "19firm055d3j9gw8cf6qb6n2jy5jgs287mcgmskbcj78fs1a9g62"; + revision = "5"; + editedCabalFile = "1dawp5f6pha1z96bkx34whpqik20azx6aizcv8xrmj0ai6vvkhik"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -242242,6 +242604,8 @@ self: { pname = "pointfree"; version = "1.1.1.12"; sha256 = "0mrrdmslcdk2ld8g78i00jwidn765w3l7la0qdlawc2lc17w2ili"; + revision = "1"; + editedCabalFile = "1nl2rbkg4dl5ljg77fazg88xs496hx1q7vj3b9wiqvf96g9j2lyf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -246392,6 +246756,90 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ppad-hmac-drbg" = callPackage + ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring + , criterion, ppad-sha256, ppad-sha512, primitive, tasty + , tasty-hunit + }: + mkDerivation { + pname = "ppad-hmac-drbg"; + version = "0.1.1"; + sha256 = "0wqkl3bk2yzyz4ldzx8njf9qawwfcr9ya3alpmdqid68bldagxl7"; + libraryHaskellDepends = [ base bytestring primitive ]; + testHaskellDepends = [ + attoparsec base base16-bytestring bytestring ppad-sha256 + ppad-sha512 tasty tasty-hunit + ]; + benchmarkHaskellDepends = [ + base bytestring criterion ppad-sha256 + ]; + description = "HMAC-based deterministic random bit generator"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "ppad-secp256k1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, criterion, deepseq, ppad-hmac-drbg, ppad-sha256 + , tasty, tasty-hunit, text + }: + mkDerivation { + pname = "ppad-secp256k1"; + version = "0.1.0"; + sha256 = "16a25c4l7bkv8sjjj0nf7i0ml6kvgvr9bajsgqx8aapbnamk6894"; + libraryHaskellDepends = [ + base bytestring ppad-hmac-drbg ppad-sha256 + ]; + testHaskellDepends = [ + aeson attoparsec base base16-bytestring bytestring tasty + tasty-hunit text + ]; + benchmarkHaskellDepends = [ + base base16-bytestring bytestring criterion deepseq + ]; + description = "Schnorr signatures & ECDSA on the elliptic curve secp256k1"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "ppad-sha256" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , criterion, SHA, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "ppad-sha256"; + version = "0.2.1"; + sha256 = "0l33nmpp26d9mha8cr2r4p8b1xp2211rdm1gd9rk6lfg1vzw7a1f"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + aeson base base16-bytestring bytestring tasty tasty-hunit text + ]; + benchmarkHaskellDepends = [ base bytestring criterion SHA ]; + description = "The SHA-256 and HMAC-SHA256 algorithms"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "ppad-sha512" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , criterion, SHA, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "ppad-sha512"; + version = "0.1.1"; + sha256 = "0hm4z1samk203p7m2qwfg58mcadmybc987plg31rwf29s0z63yvy"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + aeson base base16-bytestring bytestring tasty tasty-hunit text + ]; + benchmarkHaskellDepends = [ base bytestring criterion SHA ]; + description = "The SHA-512 and HMAC-SHA512 algorithms"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "ppm" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -246689,12 +247137,17 @@ self: { }) {}; "predicate-transformers" = callPackage - ({ mkDerivation, adjunctions, base, deepseq, lens, mtl }: + ({ mkDerivation, adjunctions, base, deepseq, pretty-simple + , prettyprinter, recover-rtti, text + }: mkDerivation { pname = "predicate-transformers"; - version = "0.15.0.0"; - sha256 = "0kjmdbm0a7c2vik0hansvkri7c9zp5cfazgk00r65syflsgfk91s"; - libraryHaskellDepends = [ adjunctions base deepseq lens mtl ]; + version = "0.17.0.0"; + sha256 = "0ifqa30w96jm5l9834qcga6ml2vyyk9ywd0ij7is0jf4gp1rdw5c"; + libraryHaskellDepends = [ + adjunctions base deepseq pretty-simple prettyprinter recover-rtti + text + ]; description = "A library for writing predicates and transformations over predicates in Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -247529,17 +247982,18 @@ self: { "prettychart" = callPackage ({ mkDerivation, async, base, box, bytestring, chart-svg - , containers, markup-parse, numhask-space, optics-core, text, time - , web-rep + , containers, doctest-parallel, markup-parse, numhask-space + , optics-core, text, time, web-rep }: mkDerivation { pname = "prettychart"; - version = "0.2.0.0"; - sha256 = "1mpbn9i9h3g374nn6v7h664rypcxwbq3l94bxxmwy6jzpp8hzz0q"; + version = "0.2.2.0"; + sha256 = "1mj20bhpjn7gf7kb123zmn27bfpk1zncqqg606xmdcyx225m43al"; libraryHaskellDepends = [ async base box bytestring chart-svg containers markup-parse numhask-space optics-core text time web-rep ]; + testHaskellDepends = [ base doctest-parallel ]; description = "Pretty print charts from ghci"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -247995,8 +248449,8 @@ self: { pname = "primitive"; version = "0.9.0.0"; sha256 = "1iwr176mx2xc96vgvzlby8z8s9d4vhbj266n89hp6kf9j794nvb9"; - revision = "1"; - editedCabalFile = "0g6rsz6hbpyfwbai04gmxil7wfcs1nd0xxcycvqwfn9mkr0ca21f"; + revision = "2"; + editedCabalFile = "0nc7cd9921bzf31k48pnmx3k2bfaxakgv3jchn4215qzzx7by86y"; libraryHaskellDepends = [ base deepseq template-haskell transformers ]; @@ -248099,8 +248553,8 @@ self: { }: mkDerivation { pname = "primitive-extras"; - version = "0.10.2"; - sha256 = "0z7xgd42dg5dq2ikjdbxjq39acv98s0p0sk3fincapw9vnxicnqy"; + version = "0.10.2.1"; + sha256 = "0h3q5zr0k3rns1mq4y56d2ji477h1kjqsv6hp3bbs0yfzkjjk5z2"; libraryHaskellDepends = [ base bytestring cereal deferred-folds focus foldl list-t primitive primitive-unlifted profunctors vector @@ -248307,6 +248761,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "primitive-unlifted_2_2_0_0" = callPackage + ({ mkDerivation, array, base, bytestring, primitive, QuickCheck + , quickcheck-classes-base, stm, tasty, tasty-quickcheck, text-short + }: + mkDerivation { + pname = "primitive-unlifted"; + version = "2.2.0.0"; + sha256 = "06r10v5dp1a4zpvv8ffmjab8bjsn5gmkx7irr02xwahwb8q4dv69"; + libraryHaskellDepends = [ + array base bytestring primitive text-short + ]; + testHaskellDepends = [ + base primitive QuickCheck quickcheck-classes-base stm tasty + tasty-quickcheck + ]; + description = "Primitive GHC types with unlifted types inside"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "primula-board" = callPackage ({ mkDerivation, base, ConfigFile, containers, directory, happstack , happstack-helpers, happstack-server, happstack-state, hsp @@ -248744,12 +249218,12 @@ self: { license = lib.licenses.mit; }) {}; - "process_1_6_24_0" = callPackage + "process_1_6_25_0" = callPackage ({ mkDerivation, base, deepseq, directory, filepath, unix }: mkDerivation { pname = "process"; - version = "1.6.24.0"; - sha256 = "1fl1y0zc4dsifw1f5nkmy18l46i8wlkcq9h8jp2cm4gzww8x92qy"; + version = "1.6.25.0"; + sha256 = "0rbfwyz2418nw15fb5a8l1f8vsyzcz4wjakpx49b259rdibf0vs9"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; description = "Process libraries"; license = lib.licenses.bsd3; @@ -250031,8 +250505,8 @@ self: { }: mkDerivation { pname = "prop-unit"; - version = "0.1.2"; - sha256 = "0gs93yhfm2mc5x6j2khcmrxf1la84hy0gyixmcxwdvy675lx06p4"; + version = "0.1.3"; + sha256 = "0wiqdmlbxq4792lw3gm99fngbb5jyhwimqf4fb757aqm1jmi9h7b"; libraryHaskellDepends = [ base hedgehog tasty tasty-hedgehog ]; testHaskellDepends = [ base hedgehog tasty tasty-hedgehog tasty-hunit @@ -250171,8 +250645,8 @@ self: { pname = "proquint"; version = "0.1.0.0"; sha256 = "04hhvrrclyav0nhk6zqp9s58vxad8ndi6yw851qprd6h7wr57wg5"; - revision = "1"; - editedCabalFile = "1p3s3jpck7w9h5qxqp9w59mmf6yr9bgx339l1m01f6yjq720a6l6"; + revision = "2"; + editedCabalFile = "1bhc2cz76fi3rrn36nrgzi531f3p18k3n7q5mp1xyjz3vv0b2h2d"; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Proquints: Identifiers that are Readable, Spellable, and Pronounceable"; @@ -251759,6 +252233,26 @@ self: { broken = true; }) {}; + "pure-noise" = callPackage + ({ mkDerivation, base, deepseq, mwc-random, tasty, tasty-bench + , tasty-discover, tasty-hunit, tasty-quickcheck, vector + }: + mkDerivation { + pname = "pure-noise"; + version = "0.1.0.1"; + sha256 = "116w6scl7kranx567jhnrir9sh0ysjzs45gfhk970q0pzbkgnj1l"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ + base tasty tasty-discover tasty-hunit tasty-quickcheck vector + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base deepseq mwc-random tasty tasty-bench vector + ]; + description = "Performant, modern noise generation for Haskell with minimal dependencies. Based on FastNoiseLite."; + license = lib.licenses.bsd3; + }) {}; + "pure-priority-queue" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -253166,22 +253660,6 @@ self: { }) {}; "qrcode-core" = callPackage - ({ mkDerivation, base, binary, bytestring, case-insensitive - , containers, dlist, primitive, text, vector - }: - mkDerivation { - pname = "qrcode-core"; - version = "0.9.9"; - sha256 = "1bahj10gflc8i9wml8gkis50xwsj7vxf9zyj9b1zvlmld2qnlndw"; - libraryHaskellDepends = [ - base binary bytestring case-insensitive containers dlist primitive - text vector - ]; - description = "QR code library in pure Haskell"; - license = lib.licenses.mit; - }) {}; - - "qrcode-core_0_9_10" = callPackage ({ mkDerivation, base, binary, bytestring, case-insensitive , containers, dlist, primitive, text, vector }: @@ -253195,26 +253673,9 @@ self: { ]; description = "QR code library in pure Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "qrcode-juicypixels" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, JuicyPixels - , qrcode-core, text, vector - }: - mkDerivation { - pname = "qrcode-juicypixels"; - version = "0.8.5"; - sha256 = "0qgcdi77iyx04w2rx48nzk8lm9x368h9m4a468zcibn50cp4ynbg"; - libraryHaskellDepends = [ - base base64-bytestring bytestring JuicyPixels qrcode-core text - vector - ]; - description = "Converts a qrcode-core image to JuicyPixels"; - license = lib.licenses.mit; - }) {}; - - "qrcode-juicypixels_0_8_6" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, JuicyPixels , qrcode-core, text, vector }: @@ -253228,7 +253689,6 @@ self: { ]; description = "Converts a qrcode-core image to JuicyPixels"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "qsem" = callPackage @@ -254295,8 +254755,8 @@ self: { }: mkDerivation { pname = "quickcheck-quid"; - version = "0.0.1.5"; - sha256 = "0w54yxwmrf228q0bi3cymlfm2gbv098i0yfpm8xqp6wl5afm5291"; + version = "0.0.1.6"; + sha256 = "1vm8654n4s0ylqssihwkv5w7gg9ml6ks8cbvbdfvcff7xmc38yrv"; libraryHaskellDepends = [ base containers deepseq extra hashable QuickCheck text ]; @@ -257078,6 +257538,26 @@ self: { license = lib.licenses.asl20; }) {}; + "rawlock" = callPackage + ({ mkDerivation, base, io-classes, io-sim, mtl, nothunks + , QuickCheck, strict-mvar, strict-stm, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "rawlock"; + version = "0.1.0.0"; + sha256 = "07nh83k9xc1iszd2glh0nm8phblm67nazybxq7pgq7c89fgv3v0w"; + libraryHaskellDepends = [ + base io-classes nothunks strict-mvar strict-stm + ]; + testHaskellDepends = [ + base io-classes io-sim mtl QuickCheck strict-stm tasty + tasty-quickcheck + ]; + description = "A writer-biased RAW lock"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "rawr" = callPackage ({ mkDerivation, base, criterion, deepseq, doctest, ghc-datasize , ghc-prim, lens, tasty, tasty-hunit, template-haskell @@ -257375,29 +257855,29 @@ self: { ({ mkDerivation, aeson, aeson-pretty, amazonka, amazonka-core , amazonka-rds, amazonka-rds-data, amazonka-secretsmanager, base , base64-bytestring, bytestring, contravariant, generic-lens - , hedgehog, hedgehog-extras, http-client, hw-polysemy, microlens - , mtl, optparse-applicative, polysemy-log, polysemy-plugin - , polysemy-time, resourcet, stm, tasty, tasty-discover - , tasty-hedgehog, testcontainers, text, time, transformers, ulid - , uuid + , hedgehog, hedgehog-extras, http-client, hw-polysemy, hw-prelude + , microlens, mtl, optparse-applicative, polysemy-log + , polysemy-plugin, polysemy-time, resourcet, stm, tasty + , tasty-discover, tasty-hedgehog, testcontainers, text, time + , transformers, ulid, uuid }: mkDerivation { pname = "rds-data"; - version = "0.0.0.10"; - sha256 = "15kxk1k59b97nbs1kj2j8gy473bdzmzv7684kr3vwhd0mjwg69z2"; + version = "0.1.0.0"; + sha256 = "1ilphv9pff2ixd4rphir6j3lc41m0jngk0f4byb4v991xjr6ldz8"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-rds amazonka-rds-data amazonka-secretsmanager base base64-bytestring bytestring - contravariant generic-lens hw-polysemy microlens mtl polysemy-log - polysemy-plugin text time transformers ulid uuid + contravariant generic-lens hw-polysemy hw-prelude microlens mtl + polysemy-log polysemy-plugin text time transformers ulid uuid ]; executableHaskellDepends = [ aeson amazonka amazonka-rds-data base bytestring generic-lens - hedgehog http-client hw-polysemy microlens optparse-applicative - polysemy-log polysemy-plugin polysemy-time resourcet stm - testcontainers text time ulid uuid + hedgehog http-client hw-polysemy hw-prelude microlens + optparse-applicative polysemy-log polysemy-plugin polysemy-time + resourcet stm testcontainers text time ulid uuid ]; testHaskellDepends = [ aeson aeson-pretty amazonka amazonka-core amazonka-rds @@ -257680,8 +258160,8 @@ self: { }: mkDerivation { pname = "reactive-banana-automation"; - version = "0.5.6"; - sha256 = "161blkyhkff3z0blbrmrwmclhac481njn9ikb3x4ax0yfa1lpsvq"; + version = "0.5.7"; + sha256 = "1wj790yahgham9llbw3c642lmi9nliy4bx48d3pws3i6hpvvi7k7"; libraryHaskellDepends = [ base reactive-banana stm time transformers ]; @@ -258218,8 +258698,8 @@ self: { ({ mkDerivation, base, extra, mtl, primes, QuickCheck, random }: mkDerivation { pname = "real-dice"; - version = "0.1.0.3"; - sha256 = "1yrcvacxw0gl87lfw566k1hdf71nm2nrnw9ijqfc25y7fsb1qk2w"; + version = "0.1.0.4"; + sha256 = "1ibyp3zhfassg1yhfjnn636mbcbd6b7n42y2pzcnsmhjs8n78j2a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl primes ]; @@ -258471,18 +258951,26 @@ self: { }) {}; "recommender-als" = callPackage - ({ mkDerivation, base, containers, data-default-class, hmatrix - , parallel, random, vector + ({ mkDerivation, base, bytestring, cassava, containers + , data-default-class, hmatrix, optparse-applicative, parallel + , random, text, vector }: mkDerivation { pname = "recommender-als"; - version = "0.2.1.1"; - sha256 = "0qc91hn42mc2pmljb836chdas1jzsrqbg44cjylx31y0y72dmhdq"; + version = "0.2.2.0"; + sha256 = "19as4cd5p2y174zxn5rksa5hza5l667wkk9r40ny3lwmrgkng905"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers data-default-class hmatrix parallel random vector ]; + executableHaskellDepends = [ + base bytestring cassava containers data-default-class + optparse-applicative text vector + ]; description = "Recommendations using alternating least squares algorithm"; license = lib.licenses.bsd3; + mainProgram = "movielens"; }) {}; "record" = callPackage @@ -262114,10 +262602,8 @@ self: { }: mkDerivation { pname = "relude"; - version = "1.2.1.0"; - sha256 = "09fp8n2z6nz2yqkn8pgq56s6d971b4mgcaldkhc0ih3bz9dp8kvq"; - revision = "3"; - editedCabalFile = "1y4qgr64d02cqn46l8cqqwmzkkbd3v2w040b41z5inagbwbr50r8"; + version = "1.2.2.0"; + sha256 = "0ikp23nbzrxfalpsk6n8yg3byh43f8hp156wpxx45yc297gmgpil"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable mtl stm text transformers unordered-containers @@ -263282,15 +263768,20 @@ self: { "rerefined" = callPackage ({ mkDerivation, base, mono-traversable, QuickCheck , template-haskell, text, text-builder-linear, type-level-show + , type-spec }: mkDerivation { pname = "rerefined"; - version = "0.6.0"; - sha256 = "0msawph4qcl3ch2821bq1kfjmzkxl6vkhglcp6glimkcsmkbabyv"; + version = "0.8.0"; + sha256 = "1w6p7sfl5mcq37cqlyfk3zzfb3sbw12idhdnk97jbrn0psms12rk"; libraryHaskellDepends = [ base mono-traversable QuickCheck template-haskell text text-builder-linear type-level-show ]; + testHaskellDepends = [ + base mono-traversable QuickCheck template-haskell text + text-builder-linear type-level-show type-spec + ]; description = "Refinement types, again"; license = lib.licenses.mit; maintainers = [ lib.maintainers.raehik ]; @@ -263589,6 +264080,28 @@ self: { broken = true; }) {}; + "resource-registry" = callPackage + ({ mkDerivation, base, bimap, containers, generics-sop, io-classes + , mtl, nothunks, QuickCheck, quickcheck-state-machine, si-timers + , strict-mvar, strict-stm, tasty, tasty-quickcheck, tree-diff + }: + mkDerivation { + pname = "resource-registry"; + version = "0.1.0.0"; + sha256 = "0mkx8hf6k0117c15kq3cyqgxbfwjjk0yywp5xf6svdi5g2xpkg5p"; + libraryHaskellDepends = [ + base bimap containers io-classes mtl nothunks strict-stm + ]; + testHaskellDepends = [ + base containers generics-sop io-classes mtl QuickCheck + quickcheck-state-machine si-timers strict-mvar strict-stm tasty + tasty-quickcheck tree-diff + ]; + description = "Track allocated resources"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "resource-simple" = callPackage ({ mkDerivation, base, containers, monad-control, monad-fork , mtl-evil-instances, transformers, transformers-base @@ -265333,8 +265846,8 @@ self: { }: mkDerivation { pname = "ring-buffer"; - version = "0.4"; - sha256 = "14h1rzxzk9qzr6bimxng8nhxydngx92x75p1mrjfwbwi17bbwgby"; + version = "0.4.1"; + sha256 = "0j5ysm2aliq06cic2y21587lcighagih9vc48dr7z4mvrfym4yz7"; libraryHaskellDepends = [ base exceptions mtl primitive vector ]; testHaskellDepends = [ base HUnit QuickCheck vector ]; description = "A concurrent, mutable ring-buffer"; @@ -270132,7 +270645,7 @@ self: { license = lib.licenses.mit; }) {}; - "sbp_6_1_0" = callPackage + "sbp_6_2_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base64-bytestring, basic-prelude, binary, binary-conduit , bytestring, cmdargs, conduit, conduit-extra, data-binary-ieee754 @@ -270141,8 +270654,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "6.1.0"; - sha256 = "1ihnsxil3f1fccm6zf3daiw12qblmxmrpfs6spqnh2jfyxgmrmkx"; + version = "6.2.1"; + sha256 = "0cq2a62ipkbqmrryync5jqmlgyx5pgkrknk3lpcwmv1l1f9l9dgr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -272998,8 +273511,8 @@ self: { }: mkDerivation { pname = "sel"; - version = "0.0.1.0"; - sha256 = "0md8xdd7jci3jdq1l5acjfxgaz2ahiwz6c7cwam06x5kp0h1nik1"; + version = "0.0.2.0"; + sha256 = "0gidvbkcjgyq47gh2p19iawv8jcs7ajvih4mk6pwwbkjs8iybpx4"; libraryHaskellDepends = [ base base16 bytestring libsodium-bindings text text-display ]; @@ -274168,6 +274681,8 @@ self: { pname = "sequitur"; version = "0.2.0.0"; sha256 = "1k38xkhyika7aamzrkalc7kbz0v832amj4gxxs9l6si9v19ja185"; + revision = "1"; + editedCabalFile = "1l5jz58wxr5a20pjg842x931w195ab50n4w0jrbppchc836080fi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -276987,34 +277502,6 @@ self: { }) {}; "servant-static-th" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, containers - , directory, doctest, filepath, Glob, hspec-wai, http-media - , semigroups, servant, servant-blaze, servant-server, tasty - , tasty-hspec, tasty-hunit, template-haskell, text, wai - }: - mkDerivation { - pname = "servant-static-th"; - version = "1.0.0.0"; - sha256 = "1iky6bk92vzhsw31hfdhgclr4nq1kmic6w9mwd5fzjhbs5vcmm15"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-html bytestring containers directory filepath http-media - semigroups servant servant-blaze servant-server template-haskell - text - ]; - testHaskellDepends = [ - base blaze-html bytestring directory doctest filepath Glob - hspec-wai servant servant-blaze servant-server tasty tasty-hspec - tasty-hunit wai - ]; - description = "Embed a directory of static files in your Servant server"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "servant-static-th_1_0_0_1" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers , directory, filepath, hspec, hspec-wai, http-media, semigroups , servant, servant-blaze, servant-server, tasty, tasty-hspec @@ -279771,8 +280258,8 @@ self: { }: mkDerivation { pname = "shellify"; - version = "0.11.0.1"; - sha256 = "1ighr9py1c2njiwdzb4fy0rlz7k8zb51la5mr8ciwh7r8zkmi0gv"; + version = "0.11.0.3"; + sha256 = "1hkf1p2qjb5jc7qkizwsrcb16fhnf2jvqg1y17ly0pgr22lkvxf1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -279845,10 +280332,8 @@ self: { }: mkDerivation { pname = "shellmet"; - version = "0.0.4.1"; - sha256 = "0jd05bazny7y25jnminal5wv30kxg6pzchswxpw5yac027qjagd0"; - revision = "1"; - editedCabalFile = "1ivpa3nrbp8qjam99m6dblhakc8gml1hhhigsmb708ndsyqfqa2i"; + version = "0.0.5.0"; + sha256 = "1yqz8nlhjbi5ngl548j4gy07m6dbvxfykj5y2gm4vviwvx0kgmz4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base process text ]; @@ -281900,22 +282385,23 @@ self: { }) {}; "simple-sql-parser" = callPackage - ({ mkDerivation, base, containers, megaparsec, mtl - , parser-combinators, prettyprinter, tasty, tasty-hunit, text + ({ mkDerivation, base, containers, filepath, hspec + , hspec-expectations, hspec-golden, hspec-megaparsec, megaparsec + , mtl, parser-combinators, pretty-show, prettyprinter + , raw-strings-qq, text }: mkDerivation { pname = "simple-sql-parser"; - version = "0.7.1"; - sha256 = "0jzmc5ian4y2jpng8c5xqf8igx5h186nw131vh6vq76nyzxxbx87"; - isLibrary = true; - isExecutable = true; + version = "0.8.0"; + sha256 = "01mymjr3gbdpkd660vz2v024b8jvzbzwqznmdxf3j2xpbmy36svw"; libraryHaskellDepends = [ base containers megaparsec mtl parser-combinators prettyprinter text ]; testHaskellDepends = [ - base containers megaparsec mtl parser-combinators prettyprinter - tasty tasty-hunit text + base containers filepath hspec hspec-expectations hspec-golden + hspec-megaparsec megaparsec mtl parser-combinators pretty-show + prettyprinter raw-strings-qq text ]; description = "A parser for SQL"; license = lib.licenses.bsd3; @@ -288678,13 +289164,14 @@ self: { }) {}; "specup" = callPackage - ({ mkDerivation, base, bytestring, extra, hspec, hspec-core - , megaparsec, optparse-applicative, stache, text, yaml + ({ mkDerivation, base, bytestring, directory, extra, hspec + , hspec-core, megaparsec, optparse-applicative, process, stache + , text, yaml }: mkDerivation { pname = "specup"; - version = "0.2.0.1"; - sha256 = "054v8qffs9wwl6vnfxmjv0753bchvsjibbvcs8fnnmy8si5hk80h"; + version = "0.2.0.2"; + sha256 = "19419bzrgaky1ja5isx15fl1xbi9yrxh8i7nd06mh7bmymsprxja"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -288693,7 +289180,9 @@ self: { executableHaskellDepends = [ base bytestring optparse-applicative text ]; - testHaskellDepends = [ base bytestring hspec hspec-core text ]; + testHaskellDepends = [ + base bytestring directory extra hspec hspec-core process text + ]; description = "Manage the application of templates to custom yaml"; license = lib.licenses.gpl2Only; mainProgram = "specup"; @@ -290727,15 +291216,15 @@ self: { mainProgram = "stack-all"; }) {}; - "stack-all_0_6_3" = callPackage + "stack-all_0_6_4" = callPackage ({ mkDerivation, aeson, base, cached-json-file, config-ini , directory, extra, filepath, http-query, process, simple-cmd , simple-cmd-args, text, yaml }: mkDerivation { pname = "stack-all"; - version = "0.6.3"; - sha256 = "14cqjaz8rc59sfy1px7a7bbv82dnrnaawf64q731ipl51smi0662"; + version = "0.6.4"; + sha256 = "1yvzglvaalk537fza2nhzjacm7aanrnwsz0grg00ln0a06hb8wcb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -292041,6 +292530,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "static-bytes_0_1_1" = callPackage + ({ mkDerivation, base, bytestring, hspec, hspec-discover, memory + , primitive, QuickCheck, rio, text, vector + }: + mkDerivation { + pname = "static-bytes"; + version = "0.1.1"; + sha256 = "14a0ww31y54hsvv2qf1wchpvzbsnxjjwgm13h9ysc3fclkwa0ba9"; + libraryHaskellDepends = [ + base bytestring memory primitive rio vector + ]; + testHaskellDepends = [ + base bytestring hspec memory primitive QuickCheck rio text vector + ]; + testToolDepends = [ hspec-discover ]; + description = "A Haskell library providing types representing 8, 16, 32, 64 or 128 bytes of data"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "static-canvas" = callPackage ({ mkDerivation, base, double-conversion, free, mtl, text }: mkDerivation { @@ -293966,27 +294475,6 @@ self: { }) {}; "streaming-bytestring" = callPackage - ({ mkDerivation, base, bytestring, deepseq, exceptions, ghc-prim - , mmorph, mtl, resourcet, smallcheck, streaming, tasty, tasty-hunit - , tasty-smallcheck, transformers, transformers-base - }: - mkDerivation { - pname = "streaming-bytestring"; - version = "0.3.2"; - sha256 = "0rxsxm0an21d2wrngg61vdz7lqcigi7fs96n8003yfcnah63qnw8"; - libraryHaskellDepends = [ - base bytestring deepseq exceptions ghc-prim mmorph mtl resourcet - streaming transformers transformers-base - ]; - testHaskellDepends = [ - base bytestring resourcet smallcheck streaming tasty tasty-hunit - tasty-smallcheck transformers - ]; - description = "Fast, effectful byte streams"; - license = lib.licenses.bsd3; - }) {}; - - "streaming-bytestring_0_3_3" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, ghc-prim , mmorph, mtl, resourcet, smallcheck, streaming, tasty, tasty-hunit , tasty-smallcheck, transformers, transformers-base @@ -294005,7 +294493,6 @@ self: { ]; description = "Fast, effectful byte streams"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "streaming-cassava" = callPackage @@ -294420,20 +294907,24 @@ self: { }) {}; "streamly-archive" = callPackage - ({ mkDerivation, archive, base, bytestring, cryptonite, directory - , filepath, QuickCheck, streamly, streamly-core, tar, tasty - , tasty-hunit, tasty-quickcheck, temporary, zlib + ({ mkDerivation, archive, async, base, bytestring, containers + , cryptonite, directory, filepath, QuickCheck, split, streamly + , streamly-core, tar, tasty, tasty-hunit, tasty-quickcheck + , temporary, zlib }: mkDerivation { pname = "streamly-archive"; - version = "0.2.0"; - sha256 = "0sjshmvndrysbfpj0w05khpga2qsb375iqpfwl6d822vaaxsykq2"; + version = "0.3.0"; + sha256 = "1azjv8lsy4mp9brz6zdfls4srxr8zl3ki80d50k7ikzxhv117sp1"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ base bytestring streamly streamly-core ]; + libraryHaskellDepends = [ + base bytestring containers streamly streamly-core + ]; librarySystemDepends = [ archive ]; testHaskellDepends = [ - base bytestring cryptonite directory filepath QuickCheck streamly - streamly-core tar tasty tasty-hunit tasty-quickcheck temporary zlib + async base bytestring containers cryptonite directory filepath + QuickCheck split streamly streamly-core tar tasty tasty-hunit + tasty-quickcheck temporary zlib ]; testSystemDepends = [ archive ]; description = "Stream data from archives using the streamly library"; @@ -294574,21 +295065,24 @@ self: { }) {}; "streamly-lmdb" = callPackage - ({ mkDerivation, async, base, bytestring, directory, lmdb - , QuickCheck, streamly, streamly-core, tasty, tasty-quickcheck - , temporary + ({ mkDerivation, async, base, bytestring, cereal, containers + , directory, lifted-base, lmdb, monad-control, mtl, QuickCheck + , random, safe-exceptions, stm, streamly, streamly-core, tasty + , tasty-hunit, tasty-quickcheck, temporary, transformers, vector }: mkDerivation { pname = "streamly-lmdb"; - version = "0.7.0"; - sha256 = "1hr3zpvvnazxss12nqys000vcgvbni3c7zl14pi3j838dsw72qwi"; + version = "0.8.0"; + sha256 = "1yi3nfkv8jd3wl4hap4zcxs760ff61a0yxqvqz0jv0f0164czjkp"; libraryHaskellDepends = [ - async base bytestring streamly streamly-core + base bytestring containers directory lifted-base monad-control + safe-exceptions stm streamly streamly-core ]; librarySystemDepends = [ lmdb ]; testHaskellDepends = [ - async base bytestring directory QuickCheck streamly streamly-core - tasty tasty-quickcheck temporary + async base bytestring cereal containers directory mtl QuickCheck + random streamly streamly-core tasty tasty-hunit tasty-quickcheck + temporary transformers vector ]; testSystemDepends = [ lmdb ]; description = "Stream data to or from LMDB databases using the streamly library"; @@ -296023,8 +296517,8 @@ self: { }: mkDerivation { pname = "strongweak"; - version = "0.9.1"; - sha256 = "0bq9vamnzidmcbapn6lc6vyz3lk2m0ld475z6a311xr5x0d70vad"; + version = "0.11.0"; + sha256 = "0bzx25pwc2mg92f72lj32g78yn5gx8pl8341cxbv3j0ysim1fhfj"; libraryHaskellDepends = [ base rerefined text text-builder-linear vector vector-sized ]; @@ -298525,14 +299019,14 @@ self: { license = "unknown"; }) {}; - "sydtest-aeson_0_2_0_0" = callPackage + "sydtest-aeson_0_2_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq , directory, path, path-io, sydtest, sydtest-discover, text }: mkDerivation { pname = "sydtest-aeson"; - version = "0.2.0.0"; - sha256 = "14acwqaxb3dizpqa6xz7wpnb2qssyfzqh4g3g7dxdbk04sypz34h"; + version = "0.2.0.1"; + sha256 = "0qxbsbrz1vyafg7wx2yappzqj821dr86cafx34rx15zbyrbkmpvz"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring deepseq path path-io sydtest text @@ -298657,6 +299151,25 @@ self: { broken = true; }) {}; + "sydtest-hspec_0_4_0_3" = callPackage + ({ mkDerivation, base, hspec, hspec-core, mtl, QuickCheck, stm + , sydtest, sydtest-discover + }: + mkDerivation { + pname = "sydtest-hspec"; + version = "0.4.0.3"; + sha256 = "1vnc6b8vswqbpz6l2rgx4r8k658wzdmv4ca601rfy03539n98nzl"; + libraryHaskellDepends = [ + base hspec-core mtl QuickCheck stm sydtest + ]; + testHaskellDepends = [ base hspec stm sydtest ]; + testToolDepends = [ sydtest-discover ]; + description = "An Hspec companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "sydtest-mongo" = callPackage ({ mkDerivation, base, binary, bson, bytestring, mongoDB, network , path, path-io, port-utils, process, sydtest, sydtest-discover @@ -300912,43 +301425,45 @@ self: { ({ mkDerivation, aeson, ansi-terminal, base, broadcast-chan , bytestring, conduit, containers, data-default, dbus , dbus-hslogger, directory, dyre, either, enclosed-exceptions - , filepath, gi-cairo, gi-cairo-connector, gi-cairo-render, gi-gdk + , filepath, gi-cairo-connector, gi-cairo-render, gi-gdk , gi-gdkpixbuf, gi-gdkx11, gi-glib, gi-gtk, gi-gtk-hs, gi-pango - , gtk-sni-tray, gtk-strut, gtk3, haskell-gi, haskell-gi-base - , hslogger, HStringTemplate, http-client, http-client-tls - , http-conduit, http-types, multimap, old-locale + , gtk-sni-tray, gtk-strut, gtk3, haskell-gi-base, hslogger, hspec + , hspec-core, hspec-discover, hspec-golden, HStringTemplate + , http-client, http-client-tls, http-conduit, http-types, multimap , optparse-applicative, parsec, process, rate-limit, regex-compat , safe, scotty, split, status-notifier-item, stm, template-haskell - , text, time, time-locale-compat, time-units, transformers - , transformers-base, tuple, unix, utf8-string, X11, xdg-basedir + , temporary, text, time, time-locale-compat, time-units + , transformers, tuple, unix, utf8-string, X11, xdg-basedir , xdg-desktop-entry, xml, xml-helpers, xmonad }: mkDerivation { pname = "taffybar"; - version = "4.0.2"; - sha256 = "1w1lsz8bk4xq4dzsfi2yf3x036a8y6b14jpil74c1xbicjc74gmg"; + version = "4.0.3"; + sha256 = "107hajq6y3hb9n80zncc8qi74dn6qqp7mic4xagnmah82sk1k5x9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal base broadcast-chan bytestring conduit containers data-default dbus dbus-hslogger directory dyre either - enclosed-exceptions filepath gi-cairo gi-cairo-connector - gi-cairo-render gi-gdk gi-gdkpixbuf gi-gdkx11 gi-glib gi-gtk - gi-gtk-hs gi-pango gtk-sni-tray gtk-strut haskell-gi - haskell-gi-base hslogger HStringTemplate http-client - http-client-tls http-conduit http-types multimap old-locale parsec + enclosed-exceptions filepath gi-cairo-connector gi-cairo-render + gi-gdk gi-gdkpixbuf gi-gdkx11 gi-glib gi-gtk gi-gtk-hs gi-pango + gtk-sni-tray gtk-strut haskell-gi-base hslogger HStringTemplate + http-client http-client-tls http-conduit http-types multimap parsec process rate-limit regex-compat safe scotty split status-notifier-item stm template-haskell text time - time-locale-compat time-units transformers transformers-base tuple - unix utf8-string X11 xdg-basedir xdg-desktop-entry xml xml-helpers - xmonad + time-locale-compat time-units transformers tuple unix utf8-string + X11 xdg-basedir xdg-desktop-entry xml xml-helpers xmonad ]; libraryPkgconfigDepends = [ gtk3 ]; executableHaskellDepends = [ base data-default directory hslogger optparse-applicative ]; executablePkgconfigDepends = [ gtk3 ]; + testHaskellDepends = [ + base directory filepath hspec hspec-core hspec-golden temporary + ]; + testToolDepends = [ hspec-discover ]; description = "A desktop bar similar to xmobar, but with more GUI"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; @@ -302695,6 +303210,8 @@ self: { pname = "tasty-flaky"; version = "0.1.0.0"; sha256 = "1p0lvfics2p98jhg46m1gl7lrpq73v1waxplvib77pl5q9ymlk87"; + revision = "1"; + editedCabalFile = "0kdx020wypr226q9syn1wiq3a7szyzy66khfzh3ssr290r0sknci"; libraryHaskellDepends = [ base retry tagged tasty ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Handle flaky Tasty-based tests"; @@ -304165,8 +304682,8 @@ self: { }: mkDerivation { pname = "telegram-bot-api"; - version = "7.4"; - sha256 = "0pbp14dg4qdf3vl93f46l6q1gdprkfvhfgi5ll3kln66z2bs40fq"; + version = "7.4.1"; + sha256 = "1ppjyq278ri2467vcyb1z01jsqbirls8lazi1lr8pk9z0sw8mz5y"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring cron filepath hashable http-api-data http-client http-client-tls monad-control mtl @@ -304189,8 +304706,10 @@ self: { }: mkDerivation { pname = "telegram-bot-simple"; - version = "0.14.2"; - sha256 = "10jwvx6m8zqzicfy3iyc9igxlnzyd8h320280q9s53420gzfpdf4"; + version = "0.14.3"; + sha256 = "0h7cpa5zbhz9y362djxznl2q1s0mj1ci6fg071i21fbk1fkjsmhf"; + revision = "1"; + editedCabalFile = "0warsrhsk3vqg9hyr5ircm01shls4n201z7nmjigli1nzzidljf8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -307400,6 +307919,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-show_3_11" = callPackage + ({ mkDerivation, array, base, base-compat-batteries, base-orphans + , bifunctors, bytestring, containers, criterion, deepseq + , deriving-compat, generic-deriving, ghc-boot-th, ghc-prim, hspec + , hspec-discover, QuickCheck, quickcheck-instances + , template-haskell, text, th-abstraction, transformers + , transformers-compat + }: + mkDerivation { + pname = "text-show"; + version = "3.11"; + sha256 = "1hp8bw5cmppdwqjvnmv7h38rckvdpxrzgcvbllgvf4zm9ns6dsr8"; + libraryHaskellDepends = [ + array base base-compat-batteries bifunctors bytestring containers + ghc-boot-th ghc-prim template-haskell text th-abstraction + transformers transformers-compat + ]; + testHaskellDepends = [ + array base base-compat-batteries base-orphans bytestring + deriving-compat generic-deriving ghc-prim hspec QuickCheck + quickcheck-instances template-haskell text transformers + transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; + description = "Efficient conversion of values into Text"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-show-instances" = callPackage ({ mkDerivation, aeson, base, base-compat, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim @@ -307437,6 +307986,42 @@ self: { license = lib.licenses.bsd3; }) {}; + "text-show-instances_3_9_9" = callPackage + ({ mkDerivation, aeson, base, base-compat, bifunctors, binary + , containers, directory, generic-deriving, ghc-boot-th, ghc-prim + , haskeline, hpc, hspec, hspec-discover, nonempty-vector + , old-locale, old-time, pretty, QuickCheck, quickcheck-instances + , random, scientific, semigroups, tagged, template-haskell + , terminfo, text, text-short, text-show, th-orphans, time + , transformers, transformers-compat, unix, unordered-containers + , uuid-types, vector, xhtml + }: + mkDerivation { + pname = "text-show-instances"; + version = "3.9.9"; + sha256 = "0ip2ym2v3rh5bi6mjfxpzrbvbrpqyi2ccaf4kfg5sy0k0yv3nrhm"; + libraryHaskellDepends = [ + aeson base base-compat bifunctors binary containers directory + ghc-boot-th haskeline hpc nonempty-vector old-locale old-time + pretty random scientific semigroups tagged template-haskell + terminfo text text-short text-show time transformers unix + unordered-containers uuid-types vector xhtml + ]; + testHaskellDepends = [ + aeson base base-compat bifunctors binary containers directory + generic-deriving ghc-boot-th ghc-prim haskeline hpc hspec + nonempty-vector old-locale old-time pretty QuickCheck + quickcheck-instances random scientific tagged template-haskell + terminfo text-short text-show th-orphans time transformers + transformers-compat unix unordered-containers uuid-types vector + xhtml + ]; + testToolDepends = [ hspec-discover ]; + description = "Additional instances for text-show"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-stream-decode" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, hspec, text }: @@ -308261,8 +308846,8 @@ self: { pname = "th-lift"; version = "0.8.4"; sha256 = "06x6njyn6p6shwj5n1znq017vwalr867ziwbwzimz9jbilipgigr"; - revision = "2"; - editedCabalFile = "1cwc4q408b9pina7069hi8v3m9nqa5c6sm8lamr5ssialiwchcig"; + revision = "3"; + editedCabalFile = "053glydkbz2h03s4l0isbabp4w4w4b8k3xfd61awf5vdnnyrq612"; libraryHaskellDepends = [ base ghc-prim template-haskell th-abstraction ]; @@ -308271,6 +308856,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-lift_0_8_5" = callPackage + ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction + }: + mkDerivation { + pname = "th-lift"; + version = "0.8.5"; + sha256 = "0xhivxk89y76jkgm636d1qan3ssgiqk2g23abzdfgpq29s6mm739"; + libraryHaskellDepends = [ + base ghc-prim template-haskell th-abstraction + ]; + testHaskellDepends = [ base ghc-prim template-haskell ]; + description = "Derive Template Haskell's Lift class for datatypes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-lift-instances" = callPackage ({ mkDerivation, base, bytestring, containers, QuickCheck , template-haskell, text, th-lift, transformers, vector @@ -308311,8 +308912,8 @@ self: { pname = "th-orphans"; version = "0.13.14"; sha256 = "0z07qcbbsj2b3j9p1qr4jvlpa7qgjfjvymkjd6vbizka1wd2mnwx"; - revision = "3"; - editedCabalFile = "19gh8f082ia27ch7xjj41vwlp7234sv545hhb3kcwkmw9brc67aj"; + revision = "4"; + editedCabalFile = "10fq55a34h1cysgigf1s2vlb0ka9s7d0lklpk63zla53fx7jshrl"; libraryHaskellDepends = [ base mtl template-haskell th-compat th-lift th-reify-many ]; @@ -308324,6 +308925,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-orphans_0_13_15" = callPackage + ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover + , mtl, template-haskell, th-compat, th-lift, th-reify-many + }: + mkDerivation { + pname = "th-orphans"; + version = "0.13.15"; + sha256 = "1gayl4afrl9swqhb12z5z84zl8vx684xj90s9h57029a72vjrl0k"; + libraryHaskellDepends = [ + base mtl template-haskell th-compat th-lift th-reify-many + ]; + testHaskellDepends = [ + base bytestring ghc-prim hspec template-haskell th-lift + ]; + testToolDepends = [ hspec-discover ]; + description = "Orphan instances for TH datatypes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-pprint" = callPackage ({ mkDerivation, base, lens, pretty, template-haskell }: mkDerivation { @@ -311467,7 +312088,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "tls_2_1_0" = callPackage + "tls_2_1_1" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base , base16-bytestring, bytestring, cereal, crypton, crypton-x509 , crypton-x509-store, crypton-x509-validation, data-default-class @@ -311476,8 +312097,8 @@ self: { }: mkDerivation { pname = "tls"; - version = "2.1.0"; - sha256 = "1i84j49gb1dgyqf4rwdrnjp47rynmyavh05dkijbj82qdcxjmb6v"; + version = "2.1.1"; + sha256 = "1rzbyrc5x4zq0xdm5h4h0jh2l2ajhbjx5qny6x79ij7zv0c79hkp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -314387,7 +315008,7 @@ self: { license = lib.licenses.gpl2Plus; }) {}; - "tree-diff_0_3_1" = callPackage + "tree-diff_0_3_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base , bytestring, containers, criterion, deepseq, Diff, hashable , parsec, parsers, pretty, primitive, QuickCheck, scientific @@ -314397,10 +315018,8 @@ self: { }: mkDerivation { pname = "tree-diff"; - version = "0.3.1"; - sha256 = "0ixv5122yz6p6a0vfjn5hgp81bs6dx6x3q731cwjyx03dr9lzicb"; - revision = "1"; - editedCabalFile = "1ga0xnyv24fgjiifypq95l7nhlm86swqscakfm98kxqi91gbzr5y"; + version = "0.3.2"; + sha256 = "067lf9fw0lk9pay6di6scc00sfg9p0n2avxs0wsqlyin9xc9h18v"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base bytestring containers deepseq hashable parsec parsers pretty primitive QuickCheck @@ -316128,8 +316747,8 @@ self: { }: mkDerivation { pname = "twain"; - version = "2.1.2.0"; - sha256 = "1hkzp2g671dagmv1qznkf3mw3l2mslckg7h0a8x8633h6i3j6br0"; + version = "2.2.0.0"; + sha256 = "1d69hc5nxc6pxbwbf13ch9yfmf9zphznv1w9hmszbndjwpc767nj"; libraryHaskellDepends = [ aeson base bytestring case-insensitive cookie either exceptions http-types http2 text time transformers vault wai wai-extra @@ -318269,6 +318888,8 @@ self: { testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Plugin to faciliate type-level let"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "typelevel" = callPackage @@ -318708,12 +319329,12 @@ self: { license = lib.licenses.mit; }) {}; - "typst-symbols_0_1_6" = callPackage + "typst-symbols_0_1_7" = callPackage ({ mkDerivation, base, text }: mkDerivation { pname = "typst-symbols"; - version = "0.1.6"; - sha256 = "17a2grflk67vs68b2pxygvk7p50rj9fb3ri7fcwa19j9jnhg4zwl"; + version = "0.1.7"; + sha256 = "1f158pjvkbx05aj0nv4qwlz2h7a811v9r7nlhnp54vws4h4rdvnz"; libraryHaskellDepends = [ base text ]; description = "Symbol and emoji lookup for typst language"; license = lib.licenses.mit; @@ -318752,8 +319373,8 @@ self: { pname = "tz"; version = "0.1.3.6"; sha256 = "1vqnfk656i6j3j1bf9lc36adziv52x1b2ccq6afp8cka1nay2mcd"; - revision = "6"; - editedCabalFile = "0za67vc1lvadrl6r287cmkkz7cnharm1yhsyin8qbn9xlm5r8ci0"; + revision = "7"; + editedCabalFile = "0awsb34hf2r6j0qkl0b087hdwcig33cmnfjwrl5w3mj35ligffja"; libraryHaskellDepends = [ base binary bytestring containers data-default deepseq template-haskell time tzdata vector @@ -319755,8 +320376,8 @@ self: { }: mkDerivation { pname = "unclogging"; - version = "0.1.0.2"; - sha256 = "1w38pifsff5c2p22afnnw6c6n5qxivyvbdciy5z0d46q7nxqgysr"; + version = "0.1.0.3"; + sha256 = "1iy5aacr19xcabs0q2a2vqc43lsaxayy8avw0wbnkqnb5y7cjm5c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -319772,6 +320393,17 @@ self: { mainProgram = "unclogging"; }) {}; + "unconditional-jump" = callPackage + ({ mkDerivation, base, int-supply }: + mkDerivation { + pname = "unconditional-jump"; + version = "1.0.0"; + sha256 = "1nmzqph0wchzr2cq7009d9xfchryb0nis74mcj7nbkz42r14k570"; + libraryHaskellDepends = [ base int-supply ]; + description = "Unconditional jumps"; + license = lib.licenses.bsd3; + }) {}; + "unconstrained" = callPackage ({ mkDerivation }: mkDerivation { @@ -321479,15 +322111,15 @@ self: { }) {}; "universum" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, gauge - , ghc-prim, hashable, hedgehog, microlens, microlens-mtl, mtl + ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim + , hashable, hedgehog, microlens, microlens-mtl, mtl , safe-exceptions, stm, tasty, tasty-discover, tasty-hedgehog, text , transformers, unordered-containers, utf8-string, vector }: mkDerivation { pname = "universum"; - version = "1.8.2.1"; - sha256 = "06kv2p7792r4d7nsq1wx7vw5jy72fjacc2jwmkqfanaaapdr27q9"; + version = "1.8.2.2"; + sha256 = "0h8ckr60gm5wxly5zyij9avzmlzljp21njd1k9j13nj5z23i1idp"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable microlens microlens-mtl mtl safe-exceptions stm text transformers @@ -321497,9 +322129,6 @@ self: { base bytestring hedgehog tasty tasty-hedgehog text ]; testToolDepends = [ tasty-discover ]; - benchmarkHaskellDepends = [ - base containers gauge text unordered-containers - ]; description = "Custom prelude used in Serokell"; license = lib.licenses.mit; }) {}; @@ -321538,8 +322167,8 @@ self: { }: mkDerivation { pname = "unix-compat"; - version = "0.7.2"; - sha256 = "02v9lr7i7m3nrd8wkg2psdm41i7vc0mzaqks89ds05lv9qsjqf2q"; + version = "0.7.3"; + sha256 = "11qxh9l2kqx4pqphbbmcbmc9bb2mifnjmzlcbkak5mjj163sskvs"; libraryHaskellDepends = [ base unix ]; testHaskellDepends = [ base directory extra hspec HUnit monad-parallel temporary @@ -323607,8 +324236,8 @@ self: { }: mkDerivation { pname = "utxorpc"; - version = "0.0.10.0"; - sha256 = "0y1v4a8shg05mphcly4n77qf8a3jp43girc9kf3302p8sjgx2zv2"; + version = "0.0.11.0"; + sha256 = "1bnkhm21g67x1jr7lwybg5yj5n34jlhkf5j2fqzczdfggv4z6vnq"; libraryHaskellDepends = [ base proto-lens proto-lens-protobuf-types proto-lens-runtime ]; @@ -325467,8 +326096,8 @@ self: { pname = "vector"; version = "0.13.1.0"; sha256 = "1vpcxn0zkhmvksz373iz66bv42f358jv3zqg390vk2mbkqkp5wk3"; - revision = "1"; - editedCabalFile = "03fpy8vnjyk7hw6sci361pmb05jl5z05yb08yjv5wxqxnp7jq0xw"; + revision = "2"; + editedCabalFile = "0ii5bzccaw632sjz9avbasmfabxc82w9vrn6lala9x9d1dyllmn8"; libraryHaskellDepends = [ base deepseq primitive vector-stream ]; testHaskellDepends = [ base base-orphans doctest HUnit primitive QuickCheck random tasty @@ -326060,8 +326689,8 @@ self: { pname = "vector-stream"; version = "0.1.0.1"; sha256 = "0z5z88flyassdpgga412qci6brr9gyljbx875wd479fy9crhgxfh"; - revision = "1"; - editedCabalFile = "17sa7mq3maphzgwdjwxr1q9dm92gz4hcbyk0d3hkayqxswp9x9hn"; + revision = "2"; + editedCabalFile = "0lcsvwlpipdiafw7w6lf2mqfg5b8fmh2jrrs3s6j7hsjm09vs3id"; libraryHaskellDepends = [ base ghc-prim ]; description = "Efficient Streams"; license = lib.licenses.bsd3; @@ -327201,8 +327830,8 @@ self: { }: mkDerivation { pname = "vivid"; - version = "0.5.2.0"; - sha256 = "1p4x6q2ks259xzigj31f8bz3562k07dzj77a9bnhl934sl85hz6q"; + version = "0.5.2.1"; + sha256 = "006y380fva59xr5wv6vn802wxssd91fgvfvb3g65zscv8dhb0z5d"; libraryHaskellDepends = [ base binary bytestring cereal containers directory filepath hashable MonadRandom mtl network process random random-shuffle @@ -328570,6 +329199,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "wai-logger_2_5_0" = callPackage + ({ mkDerivation, base, byteorder, bytestring, fast-logger + , http-types, network, wai + }: + mkDerivation { + pname = "wai-logger"; + version = "2.5.0"; + sha256 = "1171qfz6wlmq69virwvlg79j4smk6sqhdvrdpnisr50zdc3x7ysw"; + libraryHaskellDepends = [ + base byteorder bytestring fast-logger http-types network wai + ]; + description = "A logging system for WAI"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "wai-logger-buffered" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , http-types, time, wai, warp @@ -329279,6 +329924,8 @@ self: { pname = "wai-middleware-throttle"; version = "0.3.0.1"; sha256 = "0mpw7b56k1a89kzwa3v4c4ff66m0py9s9p2jan2zhp8k3b8862jq"; + revision = "1"; + editedCabalFile = "1d6zyjpvjm03vsmi04n9zdmaxlq5by326lyf0xlvh05562jnvrqc"; libraryHaskellDepends = [ base bytestring bytestring-builder cache clock containers hashable http-types mtl network safe-exceptions stm text token-bucket @@ -330137,42 +330784,6 @@ self: { broken = true; }) {}; - "warp_3_3_30" = callPackage - ({ mkDerivation, array, auto-update, base, bsb-http-chunked - , bytestring, case-insensitive, containers, crypton-x509, directory - , gauge, ghc-prim, hashable, hspec, hspec-discover, http-client - , http-date, http-types, http2, iproute, network, process - , QuickCheck, recv, simple-sendfile, stm, streaming-commons, text - , time-manager, unix, unliftio, vault, wai, word8 - }: - mkDerivation { - pname = "warp"; - version = "3.3.30"; - sha256 = "1i5fnvc9n7w013asj7ckpfb59ybbvhif4d6f4g5jwwad50jmlbpg"; - libraryHaskellDepends = [ - array auto-update base bsb-http-chunked bytestring case-insensitive - containers crypton-x509 ghc-prim hashable http-date http-types - http2 iproute network recv simple-sendfile stm streaming-commons - text time-manager unix unliftio vault wai word8 - ]; - testHaskellDepends = [ - array auto-update base bsb-http-chunked bytestring case-insensitive - containers crypton-x509 directory ghc-prim hashable hspec - http-client http-date http-types http2 iproute network process - QuickCheck recv simple-sendfile stm streaming-commons text - time-manager unix unliftio vault wai word8 - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - auto-update base bytestring containers crypton-x509 gauge hashable - http-date http-types network recv time-manager unix unliftio - ]; - description = "A fast, light-weight web server for WAI applications"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - maintainers = [ lib.maintainers.alexfmpe ]; - }) {}; - "warp" = callPackage ({ mkDerivation, array, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, crypton-x509, directory @@ -330208,7 +330819,7 @@ self: { maintainers = [ lib.maintainers.alexfmpe ]; }) {}; - "warp_3_4_2" = callPackage + "warp_3_4_3" = callPackage ({ mkDerivation, array, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, crypton-x509, directory , gauge, ghc-prim, hashable, hspec, hspec-discover, http-client @@ -330218,8 +330829,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.4.2"; - sha256 = "0b7f5darsa7n2bwlnj46xrgwbrb46yl62qyrcq84hvdpq2sfnxdl"; + version = "3.4.3"; + sha256 = "1g6g3bm8a4yjrd3h6r31ypf93r2as93d7cy17z6chwv8p41v0c86"; libraryHaskellDepends = [ array auto-update base bsb-http-chunked bytestring case-insensitive containers crypton-x509 ghc-prim hashable http-date http-types @@ -330906,15 +331517,16 @@ self: { "web-rep" = callPackage ({ mkDerivation, async, base, bifunctors, box, box-socket - , bytestring, flatparse, markup-parse, mtl, optics-core - , optics-extra, optparse-applicative, profunctors, scotty - , string-interpolate, text, transformers, unordered-containers - , wai-middleware-static, wai-websockets, websockets + , bytestring, doctest-parallel, flatparse, markup-parse, mtl + , optics-core, optics-extra, optparse-applicative, profunctors + , scotty, string-interpolate, text, transformers + , unordered-containers, wai-middleware-static, wai-websockets + , websockets }: mkDerivation { pname = "web-rep"; - version = "0.12.1.0"; - sha256 = "0hiqmivic82plziwa2fvc3rfz1h60f8i7vcb6hw65pfrz1aswk6n"; + version = "0.12.3.0"; + sha256 = "10k2fm7g1p54v6gnn045vgc8p58xal17vxin9ah11xqr0dddk7sa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -330926,6 +331538,7 @@ self: { executableHaskellDepends = [ base box markup-parse optics-core optparse-applicative ]; + testHaskellDepends = [ base doctest-parallel ]; description = "representations of a web page"; license = lib.licenses.bsd3; mainProgram = "web-rep-example"; @@ -331171,20 +331784,20 @@ self: { }) {}; "web3-crypto" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, cryptonite + ({ mkDerivation, aeson, base, bytestring, containers, crypton , hspec, hspec-contrib, hspec-discover, hspec-expectations, memory , memory-hexstring, text, uuid-types, vector }: mkDerivation { pname = "web3-crypto"; - version = "1.0.0.0"; - sha256 = "16ygvnkxcalh7a0h7l1bj5gyir79gihcwzzqk31qibvd1r17mwd6"; + version = "1.0.1.0"; + sha256 = "0p5bg9riai1z6wsii4q1i5135v7lcbdgspkhwvacy57w7yda3kda"; libraryHaskellDepends = [ - aeson base bytestring containers cryptonite memory memory-hexstring + aeson base bytestring containers crypton memory memory-hexstring text uuid-types vector ]; testHaskellDepends = [ - aeson base bytestring containers cryptonite hspec hspec-contrib + aeson base bytestring containers crypton hspec hspec-contrib hspec-discover hspec-expectations memory memory-hexstring text uuid-types vector ]; @@ -331634,8 +332247,8 @@ self: { }: mkDerivation { pname = "webdriver-wrapper"; - version = "0.2.0.0"; - sha256 = "0dirnaxab9ddaa5jbqn0bhqlmh8x311vmq0il8xh0r3df5cvmgcg"; + version = "0.2.0.1"; + sha256 = "1dvd2649vapwd8qcfv6arsi119rffbb89mzcpdcwdf827x243sci"; libraryHaskellDepends = [ aeson async base bytestring directory extra filepath http-conduit http-types process process-extras retry string-interpolate tar text @@ -333313,6 +333926,8 @@ self: { pname = "window-utils"; version = "0.2.2.0"; sha256 = "08s9rjpc2idrb5mgrnbwj2d0m8aj33g4v9djyvrkqnq5jb8mbzrz"; + revision = "1"; + editedCabalFile = "154cqir749zr19vap4zxm1dfj6ylz6p7rpqm0n0kmg2vl05ksimv"; libraryHaskellDepends = [ base bytestring JuicyPixels text vector X11 ]; @@ -333526,6 +334141,26 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; + "witch_1_2_2_0" = callPackage + ({ mkDerivation, base, bytestring, containers, HUnit, tagged + , template-haskell, text, time, transformers + }: + mkDerivation { + pname = "witch"; + version = "1.2.2.0"; + sha256 = "0wsy6fd75famn40vhj4ziygqai20szz17x9c4ddz073az4kig4d6"; + libraryHaskellDepends = [ + base bytestring containers tagged template-haskell text time + ]; + testHaskellDepends = [ + base bytestring containers HUnit tagged text time transformers + ]; + description = "Convert values from one type into another"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.maralorn ]; + }) {}; + "with-index" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -339279,8 +339914,8 @@ self: { }: mkDerivation { pname = "yampa-test"; - version = "0.14.10"; - sha256 = "0as6k36cq8w1p8nqjlnlc8ji45slynxg4aj3p6ping177lw5232h"; + version = "0.14.11"; + sha256 = "11lwp60b11fkkasqflvslp489jrlg9l2x3wlzasikymy729lkrij"; libraryHaskellDepends = [ base normaldistribution QuickCheck Yampa ]; @@ -339554,19 +340189,17 @@ self: { "yaya" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, comonad, doctest - , either, foldable1-classes-compat, free, kan-extensions, lens - , profunctors, strict, template-haskell, th-abstraction - , transformers + , either, free, kan-extensions, lens, profunctors, strict + , template-haskell, th-abstraction, transformers }: mkDerivation { pname = "yaya"; - version = "0.6.2.0"; - sha256 = "1k6w1c89s7c416xjxm23mllcm68l8ya6m7jw2ml9axwsns27kx98"; + version = "0.6.2.2"; + sha256 = "0b6sd8rdp6qys45s2lps0nhmqbs9x63axmhh3k71y81lmzyq1cax"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base comonad either foldable1-classes-compat free kan-extensions - lens profunctors strict template-haskell th-abstraction - transformers + base comonad either free kan-extensions lens profunctors strict + template-haskell th-abstraction transformers ]; testHaskellDepends = [ base doctest ]; description = "Total recursion schemes"; @@ -339581,8 +340214,8 @@ self: { }: mkDerivation { pname = "yaya-containers"; - version = "0.1.2.0"; - sha256 = "03rfpzsrjimlp40s5pbn2fd5v4cby529nhmsh9xna7n8xf6jmm05"; + version = "0.1.2.1"; + sha256 = "17akwh7inlcnizhx600ydf5j6fgbl25cnwm2fr2f6rlabkxvraki"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers yaya ]; testHaskellDepends = [ base doctest ]; @@ -339597,8 +340230,8 @@ self: { }: mkDerivation { pname = "yaya-hedgehog"; - version = "0.3.0.2"; - sha256 = "1kyqbqp84whi9jsygk7x2vhja76h45fk75k7bgh9jwjqfj83zy7s"; + version = "0.3.0.3"; + sha256 = "1adqxgpgarwka93h9xzx6443vj6b0nx4cyrh3dp38zcq2c7xji2v"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base deriving-compat hedgehog yaya ]; testHaskellDepends = [ @@ -339611,14 +340244,14 @@ self: { "yaya-quickcheck" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, doctest, QuickCheck - , splitmix, yaya + , yaya }: mkDerivation { pname = "yaya-quickcheck"; - version = "0.2.0.1"; - sha256 = "0ncnp0m93fyjn9vqp8s0vbvra3v6nin8sh5jr58rv1r5538hkyr5"; + version = "0.2.0.2"; + sha256 = "13c8zyv83sik5ms2p49850jrpvhmr4wacz27ib79pbgp2lh538n9"; setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base QuickCheck splitmix yaya ]; + libraryHaskellDepends = [ base QuickCheck yaya ]; testHaskellDepends = [ base doctest ]; description = "QuickCheck testing support for the Yaya recursion scheme library"; license = lib.licenses.agpl3Plus; @@ -339645,15 +340278,15 @@ self: { }) {}; "yaya-unsafe" = callPackage - ({ mkDerivation, base, bifunctors, Cabal, cabal-doctest, comonad - , doctest, free, hedgehog, lens, yaya, yaya-hedgehog + ({ mkDerivation, base, Cabal, cabal-doctest, comonad, doctest, free + , hedgehog, lens, yaya, yaya-hedgehog }: mkDerivation { pname = "yaya-unsafe"; - version = "0.4.1.1"; - sha256 = "0s3fna5b0g5jxbndzmqsy9bqz8b4ry7p88kspnzv8shrq271mmmk"; + version = "0.4.1.2"; + sha256 = "0n4c2zf6ds2y4433j44hi890rwjchd09qfrdx2s61vis28xqyc1k"; setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base bifunctors comonad free lens yaya ]; + libraryHaskellDepends = [ base comonad free lens yaya ]; testHaskellDepends = [ base doctest hedgehog yaya yaya-hedgehog ]; description = "Non-total extensions to the Yaya recursion scheme library"; license = lib.licenses.agpl3Plus; @@ -340965,6 +341598,29 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-form_1_7_9" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, containers, data-default + , email-validate, hspec, network-uri, persistent, resourcet + , shakespeare, text, time, transformers, wai, xss-sanitize + , yesod-core, yesod-persistent + }: + mkDerivation { + pname = "yesod-form"; + version = "1.7.9"; + sha256 = "1s59d3ccf76dmi43ivcfzbah9b0y18i9c3gv66dmcwy5f6wqhd52"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html blaze-markup + byteable bytestring containers data-default email-validate + network-uri persistent resourcet shakespeare text time transformers + wai xss-sanitize yesod-core yesod-persistent + ]; + testHaskellDepends = [ base hspec text time ]; + description = "Form handling support for Yesod Web Framework"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-form-bootstrap4" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, shakespeare, text , yesod-core, yesod-form @@ -342006,6 +342662,34 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-test_1_6_19" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, bytestring, case-insensitive, conduit, containers + , cookie, hspec, hspec-core, html-conduit, http-types, HUnit + , memory, mtl, network, pretty-show, text, time, transformers + , unliftio, unliftio-core, wai, wai-extra, xml-conduit, xml-types + , yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-test"; + version = "1.6.19"; + sha256 = "0snq06yps28lkxfc1mhsvbv2kq0h0mi16zjdfrahm4zaz8axkqka"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html blaze-markup + bytestring case-insensitive conduit containers cookie hspec-core + html-conduit http-types HUnit memory mtl network pretty-show text + time transformers wai wai-extra xml-conduit xml-types yesod-core + ]; + testHaskellDepends = [ + base bytestring containers cookie hspec html-conduit http-types + HUnit text unliftio unliftio-core wai wai-extra xml-conduit + yesod-core yesod-form + ]; + description = "integration testing for WAI/Yesod Applications"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-test-json" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, hspec , http-types, HUnit, text, transformers, wai, wai-test @@ -342268,25 +342952,24 @@ self: { "yi" = callPackage ({ mkDerivation, base, microlens-platform, mtl - , optparse-applicative, yi-core, yi-frontend-vty, yi-keymap-emacs - , yi-keymap-vim, yi-misc-modes, yi-mode-haskell, yi-mode-javascript - , yi-rope + , optparse-applicative, yi-core, yi-frontend-pango, yi-frontend-vty + , yi-keymap-emacs, yi-keymap-vim, yi-misc-modes, yi-mode-haskell + , yi-mode-javascript, yi-rope }: mkDerivation { pname = "yi"; - version = "0.19.0"; - sha256 = "1m383r5gx3r9l0mh88gcv3rjnr1ig9rivwg2qz963xqjyhr8y2ni"; + version = "0.19.2"; + sha256 = "04ppydc16w6m0ldvpxq2xr313rwak18c4k4i1jsqlb8drcwfx7ch"; configureFlags = [ "-fpango" "-fvty" ]; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base microlens-platform mtl optparse-applicative yi-core - yi-frontend-vty yi-keymap-emacs yi-keymap-vim yi-misc-modes - yi-mode-haskell yi-mode-javascript yi-rope + yi-frontend-pango yi-frontend-vty yi-keymap-emacs yi-keymap-vim + yi-misc-modes yi-mode-haskell yi-mode-javascript yi-rope ]; description = "Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; mainProgram = "yi"; }) {}; @@ -342307,6 +342990,7 @@ self: { description = "Add-ons to Yi, the Haskell-Scriptable Editor"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yi-core" = callPackage @@ -342321,8 +343005,8 @@ self: { }: mkDerivation { pname = "yi-core"; - version = "0.19.3"; - sha256 = "0l0rqvgm1i43x2q4cwdxwy9bmpvgw0wxmcij31yyx2py01ws863i"; + version = "0.19.4"; + sha256 = "0gahw4cxzk9vfx2cnf63vgpcbn874aandml844z3jj6w4v78vbps"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-default directory dlist dynamic-state exceptions filepath hashable ListLike @@ -342337,7 +343021,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq yi-rope ]; description = "Yi editor core library"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-dynamic-configuration" = callPackage @@ -342354,7 +343037,6 @@ self: { ]; description = "Dynamic configuration support for Yi"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-emacs-colours" = callPackage @@ -342366,7 +343048,6 @@ self: { libraryHaskellDepends = [ base containers split yi-language ]; description = "Simple mapping from colour names used in emacs to Color"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-frontend-pango" = callPackage @@ -342376,8 +343057,8 @@ self: { }: mkDerivation { pname = "yi-frontend-pango"; - version = "0.19.1"; - sha256 = "1ijvgxfbwnfpij3qajsci8hllb8n1p3iwd2n1wcp029kwpjhgzk9"; + version = "0.19.2"; + sha256 = "1rghdvcf22rwkjq1p8jdrwlsixy5fi9yclbzfwgyrchzqbrv9nqy"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers filepath glib gtk microlens-platform mtl @@ -342386,25 +343067,23 @@ self: { ]; description = "Pango frontend for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-frontend-vty" = callPackage ({ mkDerivation, base, containers, data-default, dlist - , microlens-platform, pointedlist, stm, text, vty, yi-core - , yi-language, yi-rope + , microlens-platform, pointedlist, stm, text, vty + , vty-crossplatform, yi-core, yi-language, yi-rope }: mkDerivation { pname = "yi-frontend-vty"; - version = "0.19.0"; - sha256 = "1vdpfqmvig16jissmra1p9zc42fs4kf2bxspy23bf8mihfr99ays"; + version = "0.19.1"; + sha256 = "1n73vvyzwl1f94z1gwr2pacw0hnm2gqcqwbji3qps301802337vs"; libraryHaskellDepends = [ base containers data-default dlist microlens-platform pointedlist - stm text vty yi-core yi-language yi-rope + stm text vty vty-crossplatform yi-core yi-language yi-rope ]; description = "Vty frontend for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-fuzzy-open" = callPackage @@ -342423,7 +343102,6 @@ self: { ]; description = "Fuzzy open plugin for yi"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-gtk" = callPackage @@ -342451,7 +343129,6 @@ self: { ]; description = "Yi editor incremental reader"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-keymap-cua" = callPackage @@ -342467,7 +343144,6 @@ self: { ]; description = "Cua keymap for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-keymap-emacs" = callPackage @@ -342487,7 +343163,6 @@ self: { ]; description = "Emacs keymap for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-keymap-vim" = callPackage @@ -342516,7 +343191,6 @@ self: { ]; description = "Vim keymap for Yi editor"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-language" = callPackage @@ -342528,8 +343202,8 @@ self: { }: mkDerivation { pname = "yi-language"; - version = "0.19.0"; - sha256 = "18r875casrk66ck8q9p1r0c4cfjjgyd5l3gxldr95rqdjci3c09z"; + version = "0.19.1"; + sha256 = "0vy0dsrgg3mg1v982v71rlyshsf64rzx25x667ybsk27sl7jp6r0"; libraryHaskellDepends = [ array base binary containers data-default hashable microlens-platform oo-prototypes pointedlist regex-base regex-tdfa @@ -342544,8 +343218,6 @@ self: { ]; description = "Collection of language-related Yi libraries"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "yi-misc-modes" = callPackage @@ -342554,8 +343226,8 @@ self: { }: mkDerivation { pname = "yi-misc-modes"; - version = "0.19.0"; - sha256 = "1g65mfafrq5dzcrcapisvyvs5frwjmy50zfkxrv0wfsdcfapkn7s"; + version = "0.19.1"; + sha256 = "1j0rq3495ywac5yk5ar7c77jfahi8rm3ivf25wdw0kbfc764bs95"; libraryHaskellDepends = [ array base binary data-default filepath microlens-platform text yi-core yi-language yi-rope @@ -342563,7 +343235,6 @@ self: { libraryToolDepends = [ alex ]; description = "Yi editor miscellaneous modes"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-mode-haskell" = callPackage @@ -342572,8 +343243,8 @@ self: { }: mkDerivation { pname = "yi-mode-haskell"; - version = "0.19.0"; - sha256 = "1hnwxqzaqg7zyfr7rd3l0la5hc8f4px4d0y78kq3xpy4pzx3yr8y"; + version = "0.19.1"; + sha256 = "1hhf98gvwfl8y51jkab1nxvm8ma1h19qjqzc7nvmjb9mz9c4clzw"; libraryHaskellDepends = [ array base binary data-default filepath microlens-platform text yi-core yi-language yi-rope @@ -342581,7 +343252,6 @@ self: { libraryToolDepends = [ alex ]; description = "Yi editor haskell mode"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-mode-javascript" = callPackage @@ -342591,10 +343261,8 @@ self: { }: mkDerivation { pname = "yi-mode-javascript"; - version = "0.19.0"; - sha256 = "1zgx36kagalna8lk60i0djn6mvl6ki55x4kc7mzq2mgzcs292zq1"; - revision = "1"; - editedCabalFile = "09hdiy51i9piyh6889hzjhna8g9hlblrzgzkl8x6rc6pl12dg3wc"; + version = "0.19.1"; + sha256 = "0d1ishhv6sfk0q711rbapr5srf28n7rrf0m5kjd382r13266wr3a"; libraryHaskellDepends = [ array base binary data-default dlist filepath microlens-platform mtl text yi-core yi-language yi-rope @@ -342602,7 +343270,6 @@ self: { libraryToolDepends = [ alex ]; description = "Yi editor javascript mode"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-monokai" = callPackage @@ -342615,6 +343282,7 @@ self: { description = "Monokai colour theme for the Yi text editor"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yi-rope" = callPackage @@ -342654,7 +343322,6 @@ self: { ]; description = "Snippet support for yi"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yi-solarized" = callPackage @@ -342667,6 +343334,7 @@ self: { description = "Solarized colour theme for the Yi text editor"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yi-spolsky" = callPackage @@ -342679,6 +343347,7 @@ self: { description = "Spolsky colour theme for the Yi text editor"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yi-vty" = callPackage diff --git a/pkgs/development/haskell-modules/patches/password-3.0.4.0-scrypt-conditional.patch b/pkgs/development/haskell-modules/patches/password-3.0.4.0-scrypt-conditional.patch new file mode 100644 index 000000000000..1e9cc4c65ded --- /dev/null +++ b/pkgs/development/haskell-modules/patches/password-3.0.4.0-scrypt-conditional.patch @@ -0,0 +1,21 @@ +diff --git a/password/password.cabal b/password/password.cabal +index 506457e..8fa978b 100644 +--- a/password.cabal ++++ b/password.cabal +@@ -186,6 +186,8 @@ test-suite password-tasty + other-modules: + Scrypt + Data.Password.Scrypt ++ build-depends: ++ scrypt + ghc-options: + -threaded -O2 -rtsopts -with-rtsopts=-N + build-depends: +@@ -195,7 +197,6 @@ test-suite password-tasty + , bytestring + , memory + , quickcheck-instances +- , scrypt + , tasty + , tasty-hunit + , tasty-quickcheck diff --git a/pkgs/development/tools/haskell/hadrian/make-hadrian.nix b/pkgs/development/tools/haskell/hadrian/make-hadrian.nix index fb9ee89f7cdb..8db821a9794d 100644 --- a/pkgs/development/tools/haskell/hadrian/make-hadrian.nix +++ b/pkgs/development/tools/haskell/hadrian/make-hadrian.nix @@ -52,4 +52,7 @@ callPackage' ./hadrian.nix ({ # to build hadrian. (Hackage-released conditional dependencies are handled # in ./hadrian.nix without requiring intervention here.) inherit ghc-platform ghc-toolchain; +} // lib.optionalAttrs (lib.versionAtLeast ghcVersion "9.11") { + # See https://gitlab.haskell.org/ghc/ghc/-/commit/145a6477854d4003a07573d5e7ffa0c9a64ae29c + Cabal = bootPkgs.Cabal_3_14_0_0; }) diff --git a/pkgs/tools/networking/mailctl/default.nix b/pkgs/tools/networking/mailctl/default.nix deleted file mode 100644 index 2e6233269280..000000000000 --- a/pkgs/tools/networking/mailctl/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ mkDerivation -, fetchFromGitHub -, aeson -, base -, base64 -, bytestring -, containers -, directory -, hsyslog -, http-conduit -, lib -, network-uri -, optparse-applicative -, pretty-simple -, process -, random -, strings -, template-haskell -, text -, time -, twain -, unix -, utf8-string -, warp -, yaml -}: -mkDerivation rec { - pname = "mailctl"; - version = "0.9.2"; - - src = fetchFromGitHub { - owner = "pdobsan"; - repo = "mailctl"; - rev = version; - hash = "sha256-frT+fRJpixSvpb2+C34Z47zbMqvmDHdESItXb9YVbfU="; - }; - - isLibrary = true; - isExecutable = true; - - libraryHaskellDepends = [ - aeson - base - base64 - bytestring - containers - directory - hsyslog - http-conduit - network-uri - optparse-applicative - pretty-simple - process - random - strings - template-haskell - text - time - twain - unix - utf8-string - warp - yaml - ]; - - executableHaskellDepends = [ - aeson - base - base64 - bytestring - containers - directory - hsyslog - http-conduit - network-uri - optparse-applicative - pretty-simple - process - random - strings - template-haskell - text - time - twain - unix - utf8-string - warp - yaml - ]; - - description = "OAuth2 tool for mail clients"; - homepage = "https://github.com/pdobsan/mailctl"; - changelog = "https://github.com/pdobsan/mailctl/releases/tag/${version}"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ aidalgol ]; - mainProgram = "mailctl"; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cd0b0dffff68..31052ecaf4f1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1339,7 +1339,6 @@ mapAliases { yacc = throw "'yacc' has been renamed to/replaced by 'bison'"; # Converted to throw 2024-10-17 yafaray-core = libyafaray; # Added 2022-09-23 - yi = throw "'yi' has been removed, as it was broken and unmaintained"; # added 2024-05-09 youtrack_2022_3 = throw "'youtrack_2022_3' has been removed as it was deprecated. Please update to the 'youtrack' package."; # Added 2024-10-17 yrd = throw "'yrd' has been removed, as it was broken and unmaintained"; # added 2024-05-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0db7478887b5..9bd1308e1537 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13819,6 +13819,9 @@ with pkgs; ytfzf = callPackage ../tools/misc/ytfzf { }; + # To expose more packages for Yi, override the extraPackages arg. + yi = callPackage ../applications/editors/yi/wrapper.nix { }; + yaydl = callPackage ../tools/video/yaydl { inherit (darwin.apple_sdk.frameworks) Security; }; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index e83e8a794fa7..7a5a87ccf42e 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -379,6 +379,7 @@ let xmobar xmonadctl xmonad-with-packages + yi zsh-git-prompt ; @@ -560,9 +561,8 @@ let compilerNames.ghc9101 ] released; Cabal_3_10_3_0 = released; - Cabal-syntax_3_10_3_0 = released; Cabal_3_12_1_0 = released; - Cabal-syntax_3_12_1_0 = released; + Cabal_3_14_0_0 = released; cabal2nix = lib.subtractLists [ compilerNames.ghc9101 ] released; @@ -590,9 +590,6 @@ let language-nix = lib.subtractLists [ compilerNames.ghc9101 ] released; - large-hashable = [ - compilerNames.ghc928 - ]; nix-paths = released; titlecase = lib.subtractLists [ compilerNames.ghc9101 From 5be55538137a57aa946e56a04c2795668dbdbe21 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 8 Nov 2024 20:41:53 +0300 Subject: [PATCH 583/617] kdePackages: Frameworks 6.7 -> 6.8 --- .../extra-cmake-modules/default.nix | 11 + pkgs/kde/frameworks/kwallet/default.nix | 2 - pkgs/kde/gear/kmailtransport/default.nix | 7 +- pkgs/kde/generated/dependencies.json | 191 +++----- pkgs/kde/generated/licenses.json | 1 + pkgs/kde/generated/projects.json | 232 +++++----- pkgs/kde/generated/sources/frameworks.json | 432 +++++++++--------- pkgs/kde/misc/klevernotes/default.nix | 2 + 8 files changed, 413 insertions(+), 465 deletions(-) diff --git a/pkgs/kde/frameworks/extra-cmake-modules/default.nix b/pkgs/kde/frameworks/extra-cmake-modules/default.nix index d0b5c09a101d..08b18f38672c 100644 --- a/pkgs/kde/frameworks/extra-cmake-modules/default.nix +++ b/pkgs/kde/frameworks/extra-cmake-modules/default.nix @@ -1,5 +1,6 @@ { mkKdeDerivation, + fetchpatch, python3, }: mkKdeDerivation { @@ -7,6 +8,16 @@ mkKdeDerivation { outputs = [ "out" ]; + patches = [ + # Cherry-pick fix for not finding libmount include path correctly + # Upstream PR: https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/486 + # FIXME: remove in next update + (fetchpatch { + url = "https://invent.kde.org/frameworks/extra-cmake-modules/-/commit/1cc17521fefd7adb0631d24a03497bcf63b9512d.patch"; + hash = "sha256-4NbhsVf14YuFHumbnXRgMcS3i/LZUDdrCWHrjHSjuo0="; + }) + ]; + # Packages that have an Android APK (e.g. KWeather) require Python3 at build time. # See: https://invent.kde.org/frameworks/extra-cmake-modules/-/blob/v6.1.0/modules/ECMAddAndroidApk.cmake?ref_type=tags#L57 propagatedNativeBuildInputs = [ diff --git a/pkgs/kde/frameworks/kwallet/default.nix b/pkgs/kde/frameworks/kwallet/default.nix index 331bdee02b31..bc478ed582cc 100644 --- a/pkgs/kde/frameworks/kwallet/default.nix +++ b/pkgs/kde/frameworks/kwallet/default.nix @@ -1,7 +1,6 @@ { mkKdeDerivation, libgcrypt, - kcrash, kdoctools, }: mkKdeDerivation { @@ -9,7 +8,6 @@ mkKdeDerivation { extraBuildInputs = [ libgcrypt - kcrash kdoctools ]; } diff --git a/pkgs/kde/gear/kmailtransport/default.nix b/pkgs/kde/gear/kmailtransport/default.nix index 7953ec021b64..b021413b9328 100644 --- a/pkgs/kde/gear/kmailtransport/default.nix +++ b/pkgs/kde/gear/kmailtransport/default.nix @@ -1,4 +1,9 @@ -{ mkKdeDerivation }: +{ + mkKdeDerivation, + kconfigwidgets, +}: mkKdeDerivation { pname = "kmailtransport"; + + extraBuildInputs = [ kconfigwidgets ]; } diff --git a/pkgs/kde/generated/dependencies.json b/pkgs/kde/generated/dependencies.json index 9bc6f8d4c125..1ac78bdc0813 100644 --- a/pkgs/kde/generated/dependencies.json +++ b/pkgs/kde/generated/dependencies.json @@ -162,7 +162,6 @@ "kxmlgui" ], "amarok": [ - "attica", "extra-cmake-modules", "karchive", "kcmutils", @@ -172,7 +171,6 @@ "kcoreaddons", "kcrash", "kdbusaddons", - "kdeclarative", "kdnssd", "kdoctools", "kglobalaccel", @@ -184,6 +182,7 @@ "knewstuff", "knotifications", "kpackage", + "kstatusnotifieritem", "ktexteditor", "kwidgetsaddons", "kwindowsystem", @@ -192,17 +191,6 @@ "solid", "threadweaver" ], - "amor": [ - "extra-cmake-modules", - "kconfig", - "kcoreaddons", - "kdbusaddons", - "kdoctools", - "ki18n", - "kwidgetsaddons", - "kwindowsystem", - "kxmlgui" - ], "analitza": [ "extra-cmake-modules" ], @@ -267,9 +255,6 @@ "kirigami", "knewstuff" ], - "atcore": [ - "extra-cmake-modules" - ], "atlantik": [ "extra-cmake-modules", "kconfig", @@ -508,7 +493,6 @@ "kjobwidgets", "knotifications", "knotifyconfig", - "kparts", "ktextwidgets", "kwidgetsaddons", "kwindowsystem", @@ -573,24 +557,6 @@ "ktextwidgets", "kwidgetsaddons" ], - "choqok": [ - "extra-cmake-modules", - "kcmutils", - "kconfigwidgets", - "kcoreaddons", - "kdoctools", - "kglobalaccel", - "ki18n", - "kio", - "knotifications", - "knotifyconfig", - "ktextwidgets", - "kwallet", - "kwidgetsaddons", - "kxmlgui", - "purpose", - "sonnet" - ], "codevis": [ "extra-cmake-modules", "kcmutils", @@ -618,6 +584,10 @@ "croutons": [ "extra-cmake-modules" ], + "crow-translate": [ + "extra-cmake-modules", + "kwayland" + ], "daykountdown": [ "extra-cmake-modules", "kcoreaddons", @@ -953,6 +923,7 @@ "kconfig", "kconfigwidgets", "kcoreaddons", + "kcrash", "kfilemetadata", "ki18n", "kiconthemes", @@ -1023,6 +994,7 @@ "itinerary": [ "extra-cmake-modules", "karchive", + "kcolorscheme", "kconfig", "kcontacts", "kcoreaddons", @@ -1049,6 +1021,7 @@ "prison", "qqc2-breeze-style", "qqc2-desktop-style", + "qtkeychain", "selenium-webdriver-at-spi" ], "juk": [ @@ -1413,8 +1386,8 @@ "kbookmarks": [ "extra-cmake-modules", "kconfig", - "kconfigwidgets", - "kcoreaddons" + "kcoreaddons", + "kwidgetsaddons" ], "kbounce": [ "extra-cmake-modules", @@ -1972,9 +1945,15 @@ ], "kdev-python": [ "extra-cmake-modules", + "kconfig", + "kcoreaddons", "kdevelop", "ki18n", + "kparts", + "kservice", "ktexteditor", + "kwidgetsaddons", + "kxmlgui", "threadweaver" ], "kdev-ruby": [ @@ -2149,6 +2128,7 @@ "keysmith": [ "extra-cmake-modules", "kconfig", + "kcoreaddons", "kdbusaddons", "kguiaddons", "ki18n", @@ -2380,7 +2360,7 @@ "extra-cmake-modules", "karchive", "kcolorscheme", - "kconfigwidgets", + "kconfig", "ki18n", "kwidgetsaddons" ], @@ -2517,7 +2497,6 @@ "kcolorscheme", "kcompletion", "kconfig", - "kconfigwidgets", "kcoreaddons", "kcrash", "kdbusaddons", @@ -2603,16 +2582,6 @@ "ki18n", "kio" ], - "kipi-plugins": [ - "extra-cmake-modules", - "kconfig", - "ki18n", - "kio", - "kwindowsystem", - "kxmlgui", - "libkipi", - "libmediawiki" - ], "kirigami": [ "extra-cmake-modules" ], @@ -2695,23 +2664,6 @@ "knotifications", "kwidgetsaddons" ], - "kjots": [ - "akonadi", - "akonadi-notes", - "extra-cmake-modules", - "kbookmarks", - "kcmutils", - "kconfig", - "kconfigwidgets", - "kio", - "kmime", - "kontactinterface", - "kparts", - "kpimtextedit", - "ktextaddons", - "ktexttemplate", - "kxmlgui" - ], "kjournald": [ "extra-cmake-modules", "kcoreaddons", @@ -3096,39 +3048,6 @@ "libkdegames", "libplasma" ], - "knotes": [ - "akonadi", - "akonadi-notes", - "akonadi-search", - "extra-cmake-modules", - "grantleetheme", - "kcalutils", - "kcmutils", - "kcompletion", - "kconfig", - "kcoreaddons", - "kcrash", - "kdnssd", - "kdoctools", - "kglobalaccel", - "kiconthemes", - "kitemmodels", - "kitemviews", - "kmime", - "knewstuff", - "knotifications", - "knotifyconfig", - "kontactinterface", - "kparts", - "kstatusnotifieritem", - "ktextaddons", - "ktexttemplate", - "ktextwidgets", - "kwidgetsaddons", - "kwindowsystem", - "kxmlgui", - "pimcommon" - ], "knotifications": [ "extra-cmake-modules", "kconfig" @@ -3138,8 +3057,7 @@ "ki18n", "kio", "knotifications", - "kxmlgui", - "phonon" + "kxmlgui" ], "kodaskanna": [ "extra-cmake-modules", @@ -3238,8 +3156,10 @@ "kongress": [ "extra-cmake-modules", "kcalendarcore", + "kcolorscheme", "kconfig", "kcoreaddons", + "kcrash", "kdbusaddons", "ki18n", "kirigami", @@ -3374,25 +3294,6 @@ "kholidays", "ki18n" ], - "kopete": [ - "extra-cmake-modules", - "kcmutils", - "kconfig", - "kcontacts", - "kcoreaddons", - "kcrash", - "kdbusaddons", - "kdnssd", - "kdoctools", - "ki18n", - "kidentitymanagement", - "knotifyconfig", - "kparts", - "ktexteditor", - "kwallet", - "libkleo", - "phonon" - ], "korganizer": [ "akonadi", "akonadi-calendar", @@ -3486,7 +3387,6 @@ "kwidgetsaddons", "kxmlgui", "libkdcraw", - "marble", "phonon", "purpose" ], @@ -3591,7 +3491,6 @@ "kcrash", "kdoctools", "ki18n", - "kiconthemes", "ktextwidgets", "kwidgetsaddons", "kxmlgui" @@ -3697,6 +3596,7 @@ "kitemviews", "knotifications", "kparts", + "kstatusnotifieritem", "ktextwidgets", "kwallet", "kwidgetsaddons", @@ -3951,7 +3851,6 @@ "kio", "kjobwidgets", "kparts", - "ktextwidgets", "kxmlgui", "sonnet", "syntax-highlighting" @@ -3961,9 +3860,9 @@ ], "ktextwidgets": [ "extra-cmake-modules", + "kcolorscheme", "kcompletion", "kconfig", - "kconfigwidgets", "ki18n", "kwidgetsaddons", "sonnet" @@ -3987,6 +3886,7 @@ "kcmutils", "kconfig", "kconfigwidgets", + "kcrash", "kdbusaddons", "kdoctools", "ki18n", @@ -4050,6 +3950,7 @@ "kconfig", "kcontacts", "kcoreaddons", + "kcrash", "ki18n", "kirigami", "kirigami-addons", @@ -4095,6 +3996,15 @@ "kxmlgui", "libkdegames" ], + "kuickshow": [ + "extra-cmake-modules", + "kdoctools", + "ki18n", + "kiconthemes", + "kio", + "kwindowsystem", + "kxmlgui" + ], "kunifiedpush": [ "extra-cmake-modules", "kcmutils", @@ -4112,6 +4022,7 @@ "kcmutils", "kconfig", "kcoreaddons", + "kcrash", "kdbusaddons", "ki18n", "kidletime", @@ -4131,6 +4042,7 @@ "kcolorscheme", "kconfig", "kcoreaddons", + "kcrash", "kdbusaddons", "ki18n", "kiconthemes", @@ -4392,12 +4304,6 @@ "kcontacts", "kwallet" ], - "libkipi": [ - "extra-cmake-modules", - "kconfig", - "kservice", - "kxmlgui" - ], "libkleo": [ "extra-cmake-modules", "kcodecs", @@ -4468,10 +4374,6 @@ "kio", "solid" ], - "libmediawiki": [ - "extra-cmake-modules", - "kcoreaddons" - ], "libplasma": [ "extra-cmake-modules", "karchive", @@ -4497,9 +4399,6 @@ "libqaccessibilityclient": [ "extra-cmake-modules" ], - "libqmycroft": [ - "extra-cmake-modules" - ], "licensedigger": [ "extra-cmake-modules" ], @@ -4550,6 +4449,7 @@ "libkdepim", "mailimporter", "messagelib", + "phonon", "pimcommon" ], "mailimporter": [ @@ -5344,6 +5244,7 @@ "extra-cmake-modules", "kcmutils", "kcoreaddons", + "kcrash", "kdbusaddons", "ki18n", "kirigami-addons" @@ -5406,7 +5307,8 @@ "solid" ], "plasma-wayland-protocols": [ - "extra-cmake-modules" + "extra-cmake-modules", + "wayland" ], "plasma-welcome": [ "extra-cmake-modules", @@ -5659,6 +5561,7 @@ "extra-cmake-modules", "kcontacts", "kcoreaddons", + "kcrash", "ki18n", "kio", "kirigami", @@ -5847,6 +5750,7 @@ "knewstuff", "knotifyconfig", "kparts", + "krunner", "kwallet", "kwidgetsaddons", "kwindowsystem", @@ -5892,6 +5796,7 @@ "kconfig", "kcontacts", "kcoreaddons", + "kcrash", "kdbusaddons", "ki18n", "kio", @@ -6025,6 +5930,7 @@ "extra-cmake-modules", "kconfig", "kconfigwidgets", + "kcrash", "kdoctools", "kfilemetadata", "ki18n", @@ -6065,6 +5971,7 @@ "kcolorscheme", "kconfig", "kcoreaddons", + "kcrash", "kdbusaddons", "kdeclarative", "ki18n", @@ -6081,6 +5988,11 @@ "qtkeychain", "selenium-webdriver-at-spi" ], + "trojita": [ + "akonadi-contacts", + "extra-cmake-modules", + "sonnet" + ], "umbrello": [ "extra-cmake-modules", "karchive", @@ -6192,6 +6104,7 @@ "xwaylandvideobridge": [ "extra-cmake-modules", "kcoreaddons", + "kcrash", "ki18n", "knotifications", "kpipewire", @@ -6229,5 +6142,5 @@ "kwindowsystem" ] }, - "version": "10b4e2ea" + "version": "9fe21091" } \ No newline at end of file diff --git a/pkgs/kde/generated/licenses.json b/pkgs/kde/generated/licenses.json index a4327d496d72..b9ff32e2e483 100644 --- a/pkgs/kde/generated/licenses.json +++ b/pkgs/kde/generated/licenses.json @@ -1921,6 +1921,7 @@ "MIT" ], "ktexttemplate": [ + "BSD-2-Clause", "CC0-1.0", "LGPL-2.0-or-later", "LGPL-2.1-or-later" diff --git a/pkgs/kde/generated/projects.json b/pkgs/kde/generated/projects.json index 44709ad504a0..e3aa269e5dd0 100644 --- a/pkgs/kde/generated/projects.json +++ b/pkgs/kde/generated/projects.json @@ -372,7 +372,7 @@ "repo_path": "games/atlantik" }, "attica": { - "description": "Attica is a Qt library that implements the Open Collaboration Services API.\n\nMailing list: https://lists.freedesktop.org/mailman/listinfo/ocs\nInternet Relay Chat: #ocs@freenode", + "description": "Attica is a Qt library that implements the Open Collaboration Services API.", "name": "attica", "project_path": "frameworks/attica", "repo_path": "frameworks/attica" @@ -744,7 +744,7 @@ "repo_path": "packaging/craft-blueprints-community" }, "craft-blueprints-kde": { - "description": "Project build blueprints for Craft \u2014 the meta build system and package manager", + "description": "Project build blueprints for Craft - the meta build system and package manager", "name": "craft-blueprints-kde", "project_path": "kdesupport/craft-blueprints-kde", "repo_path": "packaging/craft-blueprints-kde" @@ -1073,6 +1073,12 @@ "project_path": "extragear/edu/gcompris-data", "repo_path": "education/gcompris-data" }, + "geonames-data": { + "description": "Cache of geo name exports from geonames.org", + "name": "geonames-data", + "project_path": "playground/packaging/geonames-data", + "repo_path": "packaging/geonames-data" + }, "gestures-kde": { "description": "Handles gestures of multi touch input devices", "name": "gestures-kde", @@ -1739,6 +1745,18 @@ "project_path": "extragear/system/kde-inotify-survey", "repo_path": "system/kde-inotify-survey" }, + "kde-linux": { + "description": "", + "name": "kde-linux", + "project_path": "kde-linux/kde-linux", + "repo_path": "kde-linux/kde-linux" + }, + "kde-linux-packages": { + "description": "", + "name": "kde-linux-packages", + "project_path": "kde-linux/kde-linux-packages", + "repo_path": "kde-linux/kde-linux-packages" + }, "kde-nomodeset": { "description": "Safe Graphics Mode Startup Utility", "name": "kde-nomodeset", @@ -3494,7 +3512,7 @@ "krdp": { "description": "Library and examples for creating an RDP server.", "name": "krdp", - "project_path": "playground/libs/krdp", + "project_path": "kde/workspace/krdp", "repo_path": "plasma/krdp" }, "krecipes": { @@ -3668,7 +3686,7 @@ "ksanecore": { "description": "Library providing logic to interface scanners", "name": "ksanecore", - "project_path": "libraries/ksanecore", + "project_path": "extragear/libraries/ksanecore", "repo_path": "libraries/ksanecore" }, "ksaneplugin": { @@ -4106,7 +4124,7 @@ "kunifiedpush": { "description": "UnifiedPush client components", "name": "kunifiedpush", - "project_path": "libraries/kunifiedpush", + "project_path": "playground/libraries/kunifiedpush", "repo_path": "libraries/kunifiedpush" }, "kunitconversion": { @@ -4850,7 +4868,7 @@ "mimetreeparser": { "description": "Parser for MIME trees", "name": "mimetreeparser", - "project_path": "playground/pim/mimetreeparser", + "project_path": "kde/pim/mimetreeparser", "repo_path": "pim/mimetreeparser" }, "ministro": { @@ -5802,7 +5820,7 @@ "repo_path": "libraries/pykde5" }, "qca": { - "description": "Qt Cryptographic Architecture \u2014 straightforward cross-platform crypto API", + "description": "Qt Cryptographic Architecture - straightforward cross-platform crypto API", "name": "qca", "project_path": "kdesupport/qca", "repo_path": "libraries/qca" @@ -5966,7 +5984,7 @@ "repo-management": { "description": "This project contains the hooks and scripts that power the KDE git infrastructure.", "name": "repo-management", - "project_path": "repo-management", + "project_path": "sysadmin/repo-management", "repo_path": "sysadmin/repo-management" }, "ring-kde": { @@ -6852,7 +6870,7 @@ "repo_path": null }, "websites-20years-kde-org": { - "description": "Website for the \"20 years of KDE\" book \u2014 20years.kde.org", + "description": "Website for the \"20 years of KDE\" book - 20years.kde.org", "name": "websites-20years-kde-org", "project_path": "websites/20years-kde-org", "repo_path": "websites/20years-kde-org" @@ -6918,61 +6936,61 @@ "repo_path": "websites/akademy-registration" }, "websites-akademy-schedule-kde-org": { - "description": "Website for the Akademy schedule \u2014 akademy-schedule.kde.org", + "description": "Website for the Akademy schedule - akademy-schedule.kde.org", "name": "websites-akademy-schedule-kde-org", "project_path": "websites/akademy-schedule-kde-org", "repo_path": "websites/akademy-schedule-kde-org" }, "websites-akademy2004-kde-org": { - "description": "Static copy of the 2004 Conference (Akademy) website \u2014 conference2004.kde.org", + "description": "Static copy of the 2004 Conference (Akademy) website - conference2004.kde.org", "name": "websites-akademy2004-kde-org", "project_path": "websites/akademy2004-kde-org", "repo_path": "websites/akademy2004-kde-org" }, "websites-akademy2005-kde-org": { - "description": "Static copy of the 2005 Conference (Akademy) website \u2014 conference2005.kde.org", + "description": "Static copy of the 2005 Conference (Akademy) website - conference2005.kde.org", "name": "websites-akademy2005-kde-org", "project_path": "websites/akademy2005-kde-org", "repo_path": "websites/akademy2005-kde-org" }, "websites-akademy2006-kde-org": { - "description": "Static copy of the Akademy 2006 website \u2014 akademy2006.kde.org", + "description": "Static copy of the Akademy 2006 website - akademy2006.kde.org", "name": "websites-akademy2006-kde-org", "project_path": "websites/akademy2006-kde-org", "repo_path": "websites/akademy2006-kde-org" }, "websites-akademy2007-kde-org": { - "description": "Static copy of the Akademy 2007 website \u2014 akademy2007.kde.org", + "description": "Static copy of the Akademy 2007 website - akademy2007.kde.org", "name": "websites-akademy2007-kde-org", "project_path": "websites/akademy2007-kde-org", "repo_path": "websites/akademy2007-kde-org" }, "websites-akademy2008-kde-org": { - "description": "Static copy of the Akademy 2008 website \u2014 akademy2008.kde.org", + "description": "Static copy of the Akademy 2008 website - akademy2008.kde.org", "name": "websites-akademy2008-kde-org", "project_path": "websites/akademy2008-kde-org", "repo_path": "websites/akademy2008-kde-org" }, "websites-akademy2009-kde-org": { - "description": "Static copy of the Akademy 2009 website \u2014 akademy2009.kde.org", + "description": "Static copy of the Akademy 2009 website - akademy2009.kde.org", "name": "websites-akademy2009-kde-org", "project_path": "websites/akademy2009-kde-org", "repo_path": "websites/akademy2009-kde-org" }, "websites-akademy2010-kde-org": { - "description": "Static copy of the Akademy 2010 website \u2014 akademy2010.kde.org", + "description": "Static copy of the Akademy 2010 website - akademy2010.kde.org", "name": "websites-akademy2010-kde-org", "project_path": "websites/akademy2010-kde-org", "repo_path": "websites/akademy2010-kde-org" }, "websites-akademy2012-kde-org": { - "description": "Static copy of the Akademy 2012 website \u2014 akademy2012.kde.org", + "description": "Static copy of the Akademy 2012 website - akademy2012.kde.org", "name": "websites-akademy2012-kde-org", "project_path": "websites/akademy2012-kde-org", "repo_path": "websites/akademy2012-kde-org" }, "websites-amarok-kde-org": { - "description": "Static copy of the Amarok website \u2014 amarok.kde.org", + "description": "Static copy of the Amarok website - amarok.kde.org", "name": "websites-amarok-kde-org", "project_path": "websites/amarok-kde-org", "repo_path": "websites/amarok-kde-org" @@ -6984,7 +7002,7 @@ "repo_path": "websites/api-kde-org" }, "websites-apps-kde-org": { - "description": "KDE application catalog \u2014 apps.kde.org", + "description": "KDE application catalog - apps.kde.org", "name": "websites-apps-kde-org", "project_path": "websites/apps-kde-org", "repo_path": "websites/apps-kde-org" @@ -7008,7 +7026,7 @@ "repo_path": "websites/autoconfig-kde-org" }, "websites-ballot-kde-org": { - "description": "Ugly, simple, and very secure voting system \u2014 ballot.kde.org", + "description": "Ugly, simple, and very secure voting system - ballot.kde.org", "name": "websites-ballot-kde-org", "project_path": "websites/ballot-kde-org", "repo_path": "websites/ballot-kde-org" @@ -7020,13 +7038,13 @@ "repo_path": "websites/blogs-kde-org" }, "websites-br-qtcon-org": { - "description": "Website for QtCon Brazil \u2014 br.qtcon.org", + "description": "Website for QtCon Brazil - br.qtcon.org", "name": "websites-br-qtcon-org", "project_path": "websites/br-qtcon-org", "repo_path": "websites/br-qtcon-org" }, "websites-bugs-kde-org": { - "description": "Modified sources for the KDE Bugtracking System \u2014 bugs.kde.org", + "description": "Modified sources for the KDE Bugtracking System - bugs.kde.org", "name": "websites-bugs-kde-org", "project_path": "websites/bugs-kde-org", "repo_path": "websites/bugs-kde-org" @@ -7038,7 +7056,7 @@ "repo_path": "websites/buzz-kde-org" }, "websites-calligra-org": { - "description": "Website for Calligra \u2014 calligra.org", + "description": "Website for Calligra - calligra.org", "name": "websites-calligra-org", "project_path": "websites/calligra-org", "repo_path": "websites/calligra-org" @@ -7050,7 +7068,7 @@ "repo_path": "websites/camp-kde-org" }, "websites-cantor-kde-org": { - "description": "Website for Cantor \u2014 cantor.kde.org", + "description": "Website for Cantor - cantor.kde.org", "name": "websites-cantor-kde-org", "project_path": "websites/cantor-kde-org", "repo_path": "websites/cantor-kde-org" @@ -7062,55 +7080,55 @@ "repo_path": "websites/capacity" }, "websites-choqok-kde-org": { - "description": "Website for Choqok \u2014 choqok.kde.org", + "description": "Website for Choqok - choqok.kde.org", "name": "websites-choqok-kde-org", "project_path": "websites/choqok-kde-org", "repo_path": "websites/choqok-kde-org" }, "websites-commit-digest-kde-org": { - "description": "Static copy of the KDE Commit Digest \u2014 commit-digest.kde.org", + "description": "Static copy of the KDE Commit Digest - commit-digest.kde.org", "name": "websites-commit-digest-kde-org", "project_path": "websites/commit-digest-kde-org", "repo_path": "websites/commit-digest-kde-org" }, "websites-conf-kde-in": { - "description": "Website for the KDE India Conference \u2014 conf.kde.in", + "description": "Website for the KDE India Conference - conf.kde.in", "name": "websites-conf-kde-in", "project_path": "websites/conf-kde-in", "repo_path": "websites/conf-kde-in" }, "websites-conf-kde-org": { - "description": "Conference planning and management system \u2014 conf.kde.org", + "description": "Conference planning and management system - conf.kde.org", "name": "websites-conf-kde-org", "project_path": "websites/conf-kde-org", "repo_path": "websites/conf-kde-org" }, "websites-conf-qtcon-org": { - "description": "Static archive of the QtCon Conference Organization system \u2014 conf.qtcon.org", + "description": "Static archive of the QtCon Conference Organization system - conf.qtcon.org", "name": "websites-conf-qtcon-org", "project_path": "websites/conf-qtcon-org", "repo_path": "websites/conf-qtcon-org" }, "websites-contents-neon-kde-org": { - "description": "REST API for Neon package contents queries \u2014 contents.neon.kde.org", + "description": "REST API for Neon package contents queries - contents.neon.kde.org", "name": "websites-contents-neon-kde-org", "project_path": "websites/contents-neon-kde-org", "repo_path": "websites/contents-neon-kde-org" }, "websites-cutehmi-kde-org": { - "description": "Website for CuteHMI \u2014 cutehmi.kde.org", + "description": "Website for CuteHMI - cutehmi.kde.org", "name": "websites-cutehmi-kde-org", "project_path": "websites/cutehmi-kde-org", "repo_path": "websites/cutehmi-kde-org" }, "websites-desktopsummit-org": { - "description": "Static copy of the DesktopSummit website \u2014 desktopsummit.org", + "description": "Static copy of the DesktopSummit website - desktopsummit.org", "name": "websites-desktopsummit-org", "project_path": "websites/desktopsummit-org", "repo_path": "websites/desktopsummit-org" }, "websites-digikam-org": { - "description": "Website for digiKam \u2014 digikam.org", + "description": "Website for digiKam - digikam.org", "name": "websites-digikam-org", "project_path": "websites/digikam-org", "repo_path": "websites/digikam-org" @@ -7122,7 +7140,7 @@ "repo_path": "websites/discover-kde-org" }, "websites-docs-glaxnimate-org": { - "description": "Documentation website for Glaxnimate \u2014 docs.glaxnimate.org", + "description": "Documentation website for Glaxnimate - docs.glaxnimate.org", "name": "websites-docs-glaxnimate-org", "project_path": "websites/docs-glaxnimate-org", "repo_path": "websites/docs-glaxnimate-org" @@ -7140,7 +7158,7 @@ "repo_path": "websites/dot-kde-org" }, "websites-download-kde-org": { - "description": "MirrorBrain configuration, templates, etc. \u2014 download.kde.org", + "description": "MirrorBrain configuration, templates, etc. - download.kde.org", "name": "websites-download-kde-org", "project_path": "websites/download-kde-org", "repo_path": "websites/download-kde-org" @@ -7152,25 +7170,25 @@ "repo_path": "websites/eco-kde-org" }, "websites-edu-kde-org": { - "description": "Website for KDE's educational software \u2014 edu.kde.org", + "description": "Website for KDE's educational software - edu.kde.org", "name": "websites-edu-kde-org", "project_path": "websites/edu-kde-org", "repo_path": "websites/edu-kde-org" }, "websites-elisa-kde-org": { - "description": "Website for Elisa \u2014 elisa.kde.org", + "description": "Website for Elisa - elisa.kde.org", "name": "websites-elisa-kde-org", "project_path": "websites/elisa-kde-org", "repo_path": "websites/elisa-kde-org" }, "websites-ev-kde-org": { - "description": "Website for KDE e.V. \u2014 ev.kde.org", + "description": "Website for KDE e.V. - ev.kde.org", "name": "websites-ev-kde-org", "project_path": "websites/ev-kde-org", "repo_path": "websites/ev-kde-org" }, "websites-events-kde-org": { - "description": "Conference and sprint attendance management system \u2014 events.kde.org", + "description": "Conference and sprint attendance management system - events.kde.org", "name": "websites-events-kde-org", "project_path": "websites/events-kde-org", "repo_path": "websites/events-kde-org" @@ -7188,13 +7206,13 @@ "repo_path": "websites/extensions-krita-org" }, "websites-falkon-org": { - "description": "Website for Falkon \u2014 falkon.org", + "description": "Website for Falkon - falkon.org", "name": "websites-falkon-org", "project_path": "websites/falkon-org", "repo_path": "websites/falkon-org" }, "websites-forum-kde-org": { - "description": "KDE Community Forum version of phpBB \u2014 forum.kde.org", + "description": "KDE Community Forum version of phpBB - forum.kde.org", "name": "websites-forum-kde-org", "project_path": "websites/forum-kde-org", "repo_path": "websites/forum-kde-org" @@ -7212,13 +7230,13 @@ "repo_path": "websites/fosdem-2021-website-static" }, "websites-fr-kde-org": { - "description": "Website for the French KDE community \u2014 fr.kde.org", + "description": "Website for the French KDE community - fr.kde.org", "name": "websites-fr-kde-org", "project_path": "websites/fr-kde-org", "repo_path": "websites/fr-kde-org" }, "websites-freebsd-kde-org": { - "description": "Website of the KDE/FreeBSD initiative \u2014 freebsd.kde.org", + "description": "Website of the KDE/FreeBSD initiative - freebsd.kde.org", "name": "websites-freebsd-kde-org", "project_path": "websites/freebsd-kde-org", "repo_path": "websites/freebsd-kde-org" @@ -7230,13 +7248,13 @@ "repo_path": "websites/fund-krita-org" }, "websites-games-kde-org": { - "description": "Website for KDE's games \u2014 games.kde.org", + "description": "Website for KDE's games - games.kde.org", "name": "websites-games-kde-org", "project_path": "websites/games-kde-org", "repo_path": "websites/games-kde-org" }, "websites-gcompris-net": { - "description": "Website for GCompris \u2014 gcompris.net", + "description": "Website for GCompris - gcompris.net", "name": "websites-gcompris-net", "project_path": "websites/gcompris-net", "repo_path": "websites/gcompris-net" @@ -7248,7 +7266,7 @@ "repo_path": "websites/ghostwriter-kde-org" }, "websites-glaxnimate-org": { - "description": "Website for Glaxnimate \u2014 glaxnimate.org", + "description": "Website for Glaxnimate - glaxnimate.org", "name": "websites-glaxnimate-org", "project_path": "websites/glaxnimate-org", "repo_path": "websites/glaxnimate-org" @@ -7290,7 +7308,7 @@ "repo_path": "websites/hugo-kde-template" }, "websites-i-kaidan-im": { - "description": "Easy XMPP invitation landing page for Kaidan \u2014 i.kaidan.im", + "description": "Easy XMPP invitation landing page for Kaidan - i.kaidan.im", "name": "websites-i-kaidan-im", "project_path": "websites/i-kaidan-im", "repo_path": "websites/i-kaidan-im" @@ -7302,13 +7320,13 @@ "repo_path": "websites/identity-kde-org" }, "websites-inqlude": { - "description": "Tools for Inqlude, the Qt library archive \u2014 inqlude.org", + "description": "Tools for Inqlude, the Qt library archive - inqlude.org", "name": "websites-inqlude", "project_path": "websites/inqlude", "repo_path": "websites/inqlude" }, "websites-inqlude-data": { - "description": "Metadata for Inqlude, the Qt library archive \u2014 inqlude.org", + "description": "Metadata for Inqlude, the Qt library archive - inqlude.org", "name": "websites-inqlude-data", "project_path": "websites/inqlude-data", "repo_path": "websites/inqlude-data" @@ -7326,49 +7344,49 @@ "repo_path": "websites/jointhegame-kde-org" }, "websites-jp-kde-org": { - "description": "Website for the Japanese KDE community / \u65e5\u672c KDE \u30e6\u30fc\u30b6\u4f1a\u306e\u30a6\u30a7\u30d6\u30b5\u30a4\u30c8 \u2014 jp.kde.org", + "description": "Website for the Japanese KDE community / \u65e5\u672c KDE \u30e6\u30fc\u30b6\u4f1a\u306e\u30a6\u30a7\u30d6\u30b5\u30a4\u30c8 - jp.kde.org", "name": "websites-jp-kde-org", "project_path": "websites/jp-kde-org", "repo_path": "websites/jp-kde-org" }, "websites-juk-kde-org": { - "description": "Website for JuK \u2014 juk.kde.org", + "description": "Website for JuK - juk.kde.org", "name": "websites-juk-kde-org", "project_path": "websites/juk-kde-org", "repo_path": "websites/juk-kde-org" }, "websites-kaidan-im": { - "description": "Website for Kaidan \u2014 kaidan.im", + "description": "Website for Kaidan - kaidan.im", "name": "websites-kaidan-im", "project_path": "websites/kaidan-im", "repo_path": "websites/kaidan-im" }, "websites-kate-editor-org": { - "description": "Website for Kate \u2014 kate-editor.org", + "description": "Website for Kate - kate-editor.org", "name": "websites-kate-editor-org", "project_path": "websites/kate-editor-org", "repo_path": "websites/kate-editor-org" }, "websites-kde-china-org": { - "description": "Website for the Chinese KDE community \u2014 kde-china.org", + "description": "Website for the Chinese KDE community - kde-china.org", "name": "websites-kde-china-org", "project_path": "websites/kde-china-org", "repo_path": "websites/kde-china-org" }, "websites-kde-in": { - "description": "Website for the Indian KDE community \u2014 kde.in", + "description": "Website for the Indian KDE community - kde.in", "name": "websites-kde-in", "project_path": "websites/kde-in", "repo_path": "websites/kde-in" }, "websites-kde-org": { - "description": "Main KDE Community website \u2014 kde.org", + "description": "Main KDE Community website - kde.org", "name": "websites-kde-org", "project_path": "websites/kde-org", "repo_path": "websites/kde-org" }, "websites-kde-org-announcements-releases": { - "description": "Website for KDE.org release announcements \u2014 kde.org/announcements/releases", + "description": "Website for KDE.org release announcements - kde.org/announcements/releases", "name": "websites-kde-org-announcements-releases", "project_path": "websites/kde-org-announcements-releases", "repo_path": "websites/kde-org-announcements-releases" @@ -7380,25 +7398,25 @@ "repo_path": "websites/kde-org-applications-extractor" }, "websites-kde-ru": { - "description": "Website for the Russian KDE community \u2014 kde.ru", + "description": "Website for the Russian KDE community - kde.ru", "name": "websites-kde-ru", "project_path": "websites/kde-ru", "repo_path": "websites/kde-ru" }, "websites-kdeconnect-kde-org": { - "description": "Website for KDE Connect \u2014 kdeconnect.kde.org", + "description": "Website for KDE Connect - kdeconnect.kde.org", "name": "websites-kdeconnect-kde-org", "project_path": "websites/kdeconnect-kde-org", "repo_path": "websites/kdeconnect-kde-org" }, "websites-kdeitalia-it": { - "description": "Website for the Italian KDE community \u2014 kdeitalia.it", + "description": "Website for the Italian KDE community - kdeitalia.it", "name": "websites-kdeitalia-it", "project_path": "websites/kdeitalia-it", "repo_path": "websites/kdeitalia-it" }, "websites-kdemail-net": { - "description": "E-mail service for KDE contributors \u2014 kdemail.net", + "description": "E-mail service for KDE contributors - kdemail.net", "name": "websites-kdemail-net", "project_path": "websites/kdemail-net", "repo_path": "websites/kdemail-net" @@ -7410,13 +7428,13 @@ "repo_path": "websites/kdenlive-org" }, "websites-kdesrc-build-kde-org": { - "description": "Website for kdesrc-build \u2014 kdesrc-build.kde.org", + "description": "Website for kdesrc-build - kdesrc-build.kde.org", "name": "websites-kdesrc-build-kde-org", "project_path": "websites/kdesrc-build-kde-org", "repo_path": "websites/kdesrc-build-kde-org" }, "websites-kdetalk-net": { - "description": "Website for KDE's Jabber server \u2014 kdetalk.net", + "description": "Website for KDE's Jabber server - kdetalk.net", "name": "websites-kdetalk-net", "project_path": "websites/kdetalk-net", "repo_path": "websites/kdetalk-net" @@ -7440,19 +7458,19 @@ "repo_path": "websites/kgeotag-kde-org" }, "websites-kid3-kde-org": { - "description": "Website for Kid3 \u2014 kid3.kde.org", + "description": "Website for Kid3 - kid3.kde.org", "name": "websites-kid3-kde-org", "project_path": "websites/kid3-kde-org", "repo_path": "websites/kid3-kde-org" }, "websites-kirogi-org": { - "description": "Website for Kirogi \u2014 kirogi.org", + "description": "Website for Kirogi - kirogi.org", "name": "websites-kirogi-org", "project_path": "websites/kirogi-org", "repo_path": "websites/kirogi-org" }, "websites-kmymoney-org": { - "description": "Website for KMyMoney \u2014 kmymoney.org", + "description": "Website for KMyMoney - kmymoney.org", "name": "websites-kmymoney-org", "project_path": "websites/kmymoney-org", "repo_path": "websites/kmymoney-org" @@ -7464,31 +7482,31 @@ "repo_path": "websites/konqueror-org" }, "websites-konsole-kde-org": { - "description": "Website for Konsole \u2014 konsole.kde.org", + "description": "Website for Konsole - konsole.kde.org", "name": "websites-konsole-kde-org", "project_path": "websites/konsole-kde-org", "repo_path": "websites/konsole-kde-org" }, "websites-kontact-kde-org": { - "description": "Website for Kontact \u2014 kontact.kde.org", + "description": "Website for Kontact - kontact.kde.org", "name": "websites-kontact-kde-org", "project_path": "websites/kontact-kde-org", "repo_path": "websites/kontact-kde-org" }, "websites-konversation-kde-org": { - "description": "Website for Konversation \u2014 konversation.kde.org", + "description": "Website for Konversation - konversation.kde.org", "name": "websites-konversation-kde-org", "project_path": "websites/konversation-kde-org", "repo_path": "websites/konversation-kde-org" }, "websites-kpdf-kde-org": { - "description": "Static copy of the KPDF website \u2014 kpdf.kde.org", + "description": "Static copy of the KPDF website - kpdf.kde.org", "name": "websites-kpdf-kde-org", "project_path": "websites/kpdf-kde-org", "repo_path": "websites/kpdf-kde-org" }, "websites-kphotoalbum-org": { - "description": "Website for KPhotoAlbum \u2014 kphotoalbum.org", + "description": "Website for KPhotoAlbum - kphotoalbum.org", "name": "websites-kphotoalbum-org", "project_path": "websites/kphotoalbum-org", "repo_path": "websites/kphotoalbum-org" @@ -7506,31 +7524,31 @@ "repo_path": "websites/krita-org-theme" }, "websites-krusader-org": { - "description": "Website for Krusader \u2014 krusader.org", + "description": "Website for Krusader - krusader.org", "name": "websites-krusader-org", "project_path": "websites/krusader-org", "repo_path": "websites/krusader-org" }, "websites-kst-plot-kde-org": { - "description": "Static copy of the Kst Plot website \u2014 kst-plot.kde.org", + "description": "Static copy of the Kst Plot website - kst-plot.kde.org", "name": "websites-kst-plot-kde-org", "project_path": "websites/kst-plot-kde-org", "repo_path": "websites/kst-plot-kde-org" }, "websites-kstars-kde-org": { - "description": "Website for KStars \u2014 kstars.kde.org", + "description": "Website for KStars - kstars.kde.org", "name": "websites-kstars-kde-org", "project_path": "websites/kstars-kde-org", "repo_path": "websites/kstars-kde-org" }, "websites-kube-kde-org": { - "description": "Website for Kube \u2014 kube-project.com", + "description": "Website for Kube - kube-project.com", "name": "websites-kube-kde-org", "project_path": "websites/kube-kde-org", "repo_path": "websites/kube-kde-org" }, "websites-lakademy-kde-org": { - "description": "Website for LaKademy \u2014 lakademy.kde.org", + "description": "Website for LaKademy - lakademy.kde.org", "name": "websites-lakademy-kde-org", "project_path": "websites/lakademy-kde-org", "repo_path": "websites/lakademy-kde-org" @@ -7548,13 +7566,13 @@ "repo_path": "websites/lokalize-kde-org" }, "websites-manifesto-kde-org": { - "description": "Website for the KDE Manifesto \u2014 manifesto.kde.org", + "description": "Website for the KDE Manifesto - manifesto.kde.org", "name": "websites-manifesto-kde-org", "project_path": "websites/manifesto-kde-org", "repo_path": "websites/manifesto-kde-org" }, "websites-marble-kde-org": { - "description": "Website for Marble \u2014 marble.kde.org", + "description": "Website for Marble - marble.kde.org", "name": "websites-marble-kde-org", "project_path": "websites/marble-kde-org", "repo_path": "websites/marble-kde-org" @@ -7590,13 +7608,13 @@ "repo_path": "websites/mentorship-kde-org" }, "websites-minuet-kde-org": { - "description": "Website for Minuet \u2014 minuet.kde.org", + "description": "Website for Minuet - minuet.kde.org", "name": "websites-minuet-kde-org", "project_path": "websites/minuet-kde-org", "repo_path": "websites/minuet-kde-org" }, "websites-multimedia-kde-org": { - "description": "Website for KDE's multimedia software \u2014 multimedia.kde.org", + "description": "Website for KDE's multimedia software - multimedia.kde.org", "name": "websites-multimedia-kde-org", "project_path": "websites/multimedia-kde-org", "repo_path": "websites/multimedia-kde-org" @@ -7620,7 +7638,7 @@ "repo_path": "websites/necessitas-kde-org" }, "websites-neon-kde-org": { - "description": "Website for Neon \u2014 neon.kde.org", + "description": "Website for Neon - neon.kde.org", "name": "websites-neon-kde-org", "project_path": "websites/neon-kde-org", "repo_path": "websites/neon-kde-org" @@ -7632,7 +7650,7 @@ "repo_path": "websites/neverland" }, "websites-okular-kde-org": { - "description": "Website for Okular \u2014 okular.kde.org", + "description": "Website for Okular - okular.kde.org", "name": "websites-okular-kde-org", "project_path": "websites/okular-kde-org", "repo_path": "websites/okular-kde-org" @@ -7644,13 +7662,13 @@ "repo_path": "websites/paste-kde-org" }, "websites-pe-kde-org": { - "description": "Website for the Peruvian KDE community \u2014 pe.kde.org", + "description": "Website for the Peruvian KDE community - pe.kde.org", "name": "websites-pe-kde-org", "project_path": "websites/pe-kde-org", "repo_path": "websites/pe-kde-org" }, "websites-peruse-kde-org": { - "description": "Website for Peruse \u2014 peruse.kde.org", + "description": "Website for Peruse - peruse.kde.org", "name": "websites-peruse-kde-org", "project_path": "websites/peruse-kde-org", "repo_path": "websites/peruse-kde-org" @@ -7662,13 +7680,13 @@ "repo_path": "websites/phonon-kde-org" }, "websites-planet-kde-org": { - "description": "Planet KDE website code and configuration \u2014 planet.kde.org", + "description": "Planet KDE website code and configuration - planet.kde.org", "name": "websites-planet-kde-org", "project_path": "websites/planet-kde-org", "repo_path": "websites/planet-kde-org" }, "websites-plasma-bigscreen-org": { - "description": "Website for Plasma BigScreen \u2014 plasma-bigscreen.org", + "description": "Website for Plasma BigScreen - plasma-bigscreen.org", "name": "websites-plasma-bigscreen-org", "project_path": "websites/plasma-bigscreen-org", "repo_path": "websites/plasma-bigscreen-org" @@ -7680,13 +7698,13 @@ "repo_path": "websites/plasma-kde-org" }, "websites-plasma-mobile-org": { - "description": "Website for Plasma Mobile \u2014 plasma-mobile.org", + "description": "Website for Plasma Mobile - plasma-mobile.org", "name": "websites-plasma-mobile-org", "project_path": "websites/plasma-mobile-org", "repo_path": "websites/plasma-mobile-org" }, "websites-product-screenshots": { - "description": "Screenshots of KDE software for promotional use \u2014 cdn.kde.org/screenshots", + "description": "Screenshots of KDE software for promotional use - cdn.kde.org/screenshots", "name": "websites-product-screenshots", "project_path": "websites/product-screenshots", "repo_path": "websites/product-screenshots" @@ -7728,7 +7746,7 @@ "repo_path": "websites/rekonq-kde-org" }, "websites-releases-neon-kde-org": { - "description": "Metadata of Neon releases \u2014 releases.neon.kde.org", + "description": "Metadata of Neon releases - releases.neon.kde.org", "name": "websites-releases-neon-kde-org", "project_path": "websites/releases-neon-kde-org", "repo_path": "websites/releases-neon-kde-org" @@ -7746,13 +7764,13 @@ "repo_path": "websites/reservoir" }, "websites-rkward-kde-org": { - "description": "Website for RKWard \u2014 rkward.kde.org", + "description": "Website for RKWard - rkward.kde.org", "name": "websites-rkward-kde-org", "project_path": "websites/rkward-kde-org", "repo_path": "websites/rkward-kde-org" }, "websites-rolisteam-org": { - "description": "Website for Rolisteam \u2014 rolisteam.org", + "description": "Website for Rolisteam - rolisteam.org", "name": "websites-rolisteam-org", "project_path": "websites/rolisteam-org", "repo_path": "websites/rolisteam-org" @@ -7764,19 +7782,19 @@ "repo_path": "websites/scripting-krita-org" }, "websites-season-kde-org": { - "description": "Website to organize programs like Season of KDE \u2014 season.kde.org", + "description": "Website to organize programs like Season of KDE - season.kde.org", "name": "websites-season-kde-org", "project_path": "websites/season-kde-org", "repo_path": "websites/season-kde-org" }, "websites-simon-kde-org": { - "description": "Static copy of the Drupal-based Simon website \u2014 simon.kde.org", + "description": "Static copy of the Drupal-based Simon website - simon.kde.org", "name": "websites-simon-kde-org", "project_path": "websites/simon-kde-org", "repo_path": "websites/simon-kde-org" }, "websites-skrooge-org": { - "description": "Website for Skrooge \u2014 skrooge.org", + "description": "Website for Skrooge - skrooge.org", "name": "websites-skrooge-org", "project_path": "websites/skrooge-org", "repo_path": "websites/skrooge-org" @@ -7812,13 +7830,13 @@ "repo_path": "websites/sysadmin-kde-org-trellis" }, "websites-telemetry-krita-org": { - "description": "Telemetry backend for Krita \u2014 telemetry.krita.org", + "description": "Telemetry backend for Krita - telemetry.krita.org", "name": "websites-telemetry-krita-org", "project_path": "websites/telemetry-krita-org", "repo_path": "websites/telemetry-krita-org" }, "websites-timeline-kde-org": { - "description": "Website for community history timeline \u2014 timeline.kde.org", + "description": "Website for community history timeline - timeline.kde.org", "name": "websites-timeline-kde-org", "project_path": "websites/timeline-kde-org", "repo_path": "websites/timeline-kde-org" @@ -7830,13 +7848,13 @@ "repo_path": "websites/tr-kde-org" }, "websites-umbrello-kde-org": { - "description": "Website for Umbrello \u2014 umbrello.kde.org", + "description": "Website for Umbrello - umbrello.kde.org", "name": "websites-umbrello-kde-org", "project_path": "websites/umbrello-kde-org", "repo_path": "websites/umbrello-kde-org" }, "websites-utils-kde-org": { - "description": "Website for KDE's utilities \u2014 utils.kde.org", + "description": "Website for KDE's utilities - utils.kde.org", "name": "websites-utils-kde-org", "project_path": "websites/utils-kde-org", "repo_path": "websites/utils-kde-org" @@ -7854,13 +7872,13 @@ "repo_path": "websites/video-subtitles" }, "websites-volunteers-akademy-kde-org": { - "description": "Volunteer management and coordination system \u2014 volunteers.akademy.kde.org", + "description": "Volunteer management and coordination system - volunteers.akademy.kde.org", "name": "websites-volunteers-akademy-kde-org", "project_path": "websites/volunteers-akademy-kde-org", "repo_path": "websites/volunteers-akademy-kde-org" }, "websites-vvave-kde-org": { - "description": "Website for Vvave \u2014 vvave.kde.org", + "description": "Website for Vvave - vvave.kde.org", "name": "websites-vvave-kde-org", "project_path": "websites/vvave-kde-org", "repo_path": "websites/vvave-kde-org" @@ -7872,25 +7890,25 @@ "repo_path": "websites/vvave-stream-kde-org" }, "websites-websvn-kde-org": { - "description": "KDE SVN repository browser \u2014 websvn.kde.org", + "description": "KDE SVN repository browser - websvn.kde.org", "name": "websites-websvn-kde-org", "project_path": "websites/websvn-kde-org", "repo_path": "websites/websvn-kde-org" }, "websites-wiki-desktopsummit-org": { - "description": "Static copy of the DesktopSummit wiki \u2014 wiki.desktopsummit.org", + "description": "Static copy of the DesktopSummit wiki - wiki.desktopsummit.org", "name": "websites-wiki-desktopsummit-org", "project_path": "websites/wiki-desktopsummit-org", "repo_path": "websites/wiki-desktopsummit-org" }, "websites-wiki-kde-org": { - "description": "Landing wiki list website \u2014 wiki.kde.org", + "description": "Landing wiki list website - wiki.kde.org", "name": "websites-wiki-kde-org", "project_path": "websites/wiki-kde-org", "repo_path": "websites/wiki-kde-org" }, "websites-wiki-rolisteam-org": { - "description": "Rolisteam documentation (wiki) \u2014 doc.rolisteam.org", + "description": "Rolisteam documentation (wiki) - doc.rolisteam.org", "name": "websites-wiki-rolisteam-org", "project_path": "websites/wiki-rolisteam-org", "repo_path": "websites/wiki-rolisteam-org" @@ -7914,7 +7932,7 @@ "repo_path": "websites/yakuake-kde-org" }, "websites-zanshin-kde-org": { - "description": "Website for Zanshin \u2014 zanshin.kde.org", + "description": "Website for Zanshin - zanshin.kde.org", "name": "websites-zanshin-kde-org", "project_path": "websites/zanshin-kde-org", "repo_path": "websites/zanshin-kde-org" @@ -8108,7 +8126,7 @@ "xwaylandvideobridge": { "description": "Utility to allow streaming Wayland windows to X applications", "name": "xwaylandvideobridge", - "project_path": "system/xwaylandvideobridge", + "project_path": "playground/system/xwaylandvideobridge", "repo_path": "system/xwaylandvideobridge" }, "yakuake": { diff --git a/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json index f5a2219941c7..a609999b7402 100644 --- a/pkgs/kde/generated/sources/frameworks.json +++ b/pkgs/kde/generated/sources/frameworks.json @@ -1,362 +1,362 @@ { "attica": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/attica-6.7.0.tar.xz", - "hash": "sha256-2qXAe0dImeFrQnEOA9BZCTa84PVIACOdYz1IyqO+DX0=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/attica-6.8.0.tar.xz", + "hash": "sha256-RDAKLQ7UZdmtsAI/rG1ns7Kb7CmaVP6j/zR32RGNH90=" }, "baloo": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/baloo-6.7.0.tar.xz", - "hash": "sha256-zowYoh7XrNWRLH0nPKxfbLGttSSgQV1Wxv3eLpZ/Z8w=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/baloo-6.8.0.tar.xz", + "hash": "sha256-WaWWl+fSvsUNqoPeUmh3W953z5g1EnfQ9KxVEiNLrv0=" }, "bluez-qt": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/bluez-qt-6.7.0.tar.xz", - "hash": "sha256-sGQBBphiE+Gyjyy6E9nMIu49JZdV8nUh8uhhY0M4+Ts=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/bluez-qt-6.8.0.tar.xz", + "hash": "sha256-NxqJ98WpyI397rLcxtGtl7OXoj7BC9b86uCoNeB0DXY=" }, "breeze-icons": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/breeze-icons-6.7.0.tar.xz", - "hash": "sha256-OQN+P8u7emUBFoXEmMrjH/SWpfJJMmnJVbspyUpoi3Q=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/breeze-icons-6.8.0.tar.xz", + "hash": "sha256-de4R/EQcJ1BOGZ42VpMpbtzUZfiQ22qryw3soKziLTo=" }, "extra-cmake-modules": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/extra-cmake-modules-6.7.0.tar.xz", - "hash": "sha256-2B3oJpLT0rt3EQMyplyCZiUr7MLD8wfOgUmQzlYHuNw=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/extra-cmake-modules-6.8.0.tar.xz", + "hash": "sha256-/4oL9yKFvsF2jjrNj3xmWibVWhUn6W1z41eJ3J8ONHI=" }, "frameworkintegration": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/frameworkintegration-6.7.0.tar.xz", - "hash": "sha256-iQEBhUu7s5N9Mh8qw1sqCo886DNCIpfd2lm9qMjKxp0=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/frameworkintegration-6.8.0.tar.xz", + "hash": "sha256-FBvFnf2yRskFAaSIy/ATufC7wcJ6ePLyV0QzlXbtrzc=" }, "kapidox": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kapidox-6.7.0.tar.xz", - "hash": "sha256-czjx4xjrLSTLlbVtUwamHQoZLpCXe+rWBRd0HIMF4kA=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kapidox-6.8.0.tar.xz", + "hash": "sha256-RL24w9VRMOLkqPtndDKmVt3A8lTcu4MixQqcpKbTUlo=" }, "karchive": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/karchive-6.7.0.tar.xz", - "hash": "sha256-60JD5if1HxIkqZr10Kb44wn55du3R496eONOK4VBOYo=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/karchive-6.8.0.tar.xz", + "hash": "sha256-6QPrVLh1JYcn/VJLJInSpQGZc+J99nszu1b7qR5O7DQ=" }, "kauth": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kauth-6.7.0.tar.xz", - "hash": "sha256-FzZU7uKJGs1BU40xrOi5165ghjvH+u8crOx+IcfrEiM=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kauth-6.8.0.tar.xz", + "hash": "sha256-u/g6OYcPdWqu+5r7005iHV/FMoDF63Dbm9Nn/FH4x0k=" }, "kbookmarks": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kbookmarks-6.7.0.tar.xz", - "hash": "sha256-vUGjnfdlFe40598HsmAOHltnsYEsyVnsUVhfLrzFZXM=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kbookmarks-6.8.0.tar.xz", + "hash": "sha256-DL0hXdG/L3wwU1bRNiw+sFhbDenhlb4SURD0sJ/KUBU=" }, "kcalendarcore": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kcalendarcore-6.7.0.tar.xz", - "hash": "sha256-jlKC2NegzgoaG9syEzukEC0GBwEFUT5xLa/nbjJkffs=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kcalendarcore-6.8.0.tar.xz", + "hash": "sha256-zF/DwwSxF0cHRGiYKelLr4XGzk3CRZO5lY8d6JnIdBI=" }, "kcmutils": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kcmutils-6.7.0.tar.xz", - "hash": "sha256-QRg4j49iql8ROe14gjtYsAnp6/fzdV6alKtfnrpkTL4=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kcmutils-6.8.0.tar.xz", + "hash": "sha256-+BBsg++FofybQYW4EmAEjr2KZM3wXI0Ccv+D1mZcscA=" }, "kcodecs": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kcodecs-6.7.0.tar.xz", - "hash": "sha256-mrSUBV4Gvc5FVot8R+2yqp7Kqd7AwPsVI2e0MhkhufI=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kcodecs-6.8.0.tar.xz", + "hash": "sha256-lslTXG95VxzXFwNg3Atkoz1SnVnL2UV5NL/Az2z0sn8=" }, "kcolorscheme": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kcolorscheme-6.7.0.tar.xz", - "hash": "sha256-G0xuhPHdlrLuYr51X2DaYNYbqA1nCe6zGG2IgucuITA=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kcolorscheme-6.8.0.tar.xz", + "hash": "sha256-L9oHaFRpGdQn40qQSb9cXo/mGh1rfnbfSbtC4iwSNN0=" }, "kcompletion": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kcompletion-6.7.0.tar.xz", - "hash": "sha256-ftWparDSqxe7Uh7Kr0TW7Gt8mj1uCUAzYLpJsk2UVg8=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kcompletion-6.8.0.tar.xz", + "hash": "sha256-ipFfQqSeAhyHKbQlp5kGgzSQybqhskrwHNT8gltYxGE=" }, "kconfig": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kconfig-6.7.0.tar.xz", - "hash": "sha256-vi1d22PlZwO8CX5dmRKzmrxROsUWVN4uDYOhrtLFSxs=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kconfig-6.8.0.tar.xz", + "hash": "sha256-P488LvOEpSga5aORij48wr4BaOsUvs/aphcQZV2LFqw=" }, "kconfigwidgets": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kconfigwidgets-6.7.0.tar.xz", - "hash": "sha256-wHnGfFeJMLqvriQbtPJSxj/dEl5E8fuVLjm648mFnNE=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kconfigwidgets-6.8.0.tar.xz", + "hash": "sha256-ncOoLx+zJ1Dm7PeKhjpDImow4vyt11Ue7HiGkW4ctPE=" }, "kcontacts": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kcontacts-6.7.0.tar.xz", - "hash": "sha256-KS+BBPnzHWLFkomjqCF2bR7FQPT8UT/8O29xl2AtQsU=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kcontacts-6.8.0.tar.xz", + "hash": "sha256-RjgiYW8R2iNo+v7Y9x4cmK1HEDyJ2/qMiP5lpBrhUFE=" }, "kcoreaddons": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kcoreaddons-6.7.0.tar.xz", - "hash": "sha256-SFEenasfLoCzxIIruHwumBGG3juJd9kggtNNADsSg8U=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kcoreaddons-6.8.0.tar.xz", + "hash": "sha256-KJd/R4vl19X1ZQh2v3uAZnTtb8YJ1wPuoymoGfpK2Zw=" }, "kcrash": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kcrash-6.7.0.tar.xz", - "hash": "sha256-HcLGXY72LvmEV/irQjt2ht4+cTdmwG5k1jIqqdsm7qQ=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kcrash-6.8.0.tar.xz", + "hash": "sha256-pwKUTIfJY07v1SKT9iU1UxRHPmxMJLRy7nhUy4xolX8=" }, "kdav": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kdav-6.7.0.tar.xz", - "hash": "sha256-ZinyrwBC6x4NwMCLUYCse0ja5rWZnh3Qtniu2Lh0wdc=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kdav-6.8.0.tar.xz", + "hash": "sha256-2JXjttT/mRbRhexQ+UsIpwY2IC4oc5/MdHcuLs2SGCw=" }, "kdbusaddons": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kdbusaddons-6.7.0.tar.xz", - "hash": "sha256-6H0I9tADfY+jPx59FqTjqhfX0LEsaqlvdjI/eDROFRs=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kdbusaddons-6.8.0.tar.xz", + "hash": "sha256-bHYKDcNyrwovgltlV1v6vRlQx2wON/h94h1HzsjVi8c=" }, "kdeclarative": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kdeclarative-6.7.0.tar.xz", - "hash": "sha256-8fgE9rrCsilQPP0WXr2K4JNTOIiuFeDmFHTG4yjVNbk=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kdeclarative-6.8.0.tar.xz", + "hash": "sha256-rUYQhce/wqxo8dwlLGZpWSYe+y/6gOeSPna3gccjNqE=" }, "kded": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kded-6.7.0.tar.xz", - "hash": "sha256-IqobZUO0DglDRhOFFhMcD363inDocpaThFf9E4ZoCi8=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kded-6.8.0.tar.xz", + "hash": "sha256-UpJj+xqXqlWCji4MeBEYcAphId9Jrb7R7lboecjsUSE=" }, "kdesu": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kdesu-6.7.0.tar.xz", - "hash": "sha256-QQkepFxuIuFBHYnRU4ssi9mL3B841Z3z6cQjqsAiTig=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kdesu-6.8.0.tar.xz", + "hash": "sha256-DooAfEE/rKT6fiQ4KgGbrs/mtmB2ALpkEcdh57yVOY8=" }, "kdnssd": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kdnssd-6.7.0.tar.xz", - "hash": "sha256-6RQEdfxuTuHg/jmiGBajwAP8sQkiIgefQi/QKtKpAqE=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kdnssd-6.8.0.tar.xz", + "hash": "sha256-SdmskRrGQSFwszDIMUIERhCukPVxxgMYsi4ZfiiYlz4=" }, "kdoctools": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kdoctools-6.7.0.tar.xz", - "hash": "sha256-n+U53/7QGDaUD6Twb5U6xO0M1PtfAjL+W2bCI2TBaS8=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kdoctools-6.8.0.tar.xz", + "hash": "sha256-YGhj6G1qqRars+N2C3P+nbGDLB5BcnNJ0CzcjDq5a6c=" }, "kfilemetadata": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kfilemetadata-6.7.0.tar.xz", - "hash": "sha256-piQqeeZytSPr8bJVTr+DrKep1QZZKbbxUnMemFHQCNA=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kfilemetadata-6.8.0.tar.xz", + "hash": "sha256-UEZrNpm74wF+2ww8sJRjpX4t07ZtYPX2ENnuOiHjSJQ=" }, "kglobalaccel": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kglobalaccel-6.7.0.tar.xz", - "hash": "sha256-KjW54GxmAdYCs6ReJ4xJ4R5GJ5Oc+s/7H97ggmpvbgs=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kglobalaccel-6.8.0.tar.xz", + "hash": "sha256-yqbYWwiGfLg38Ip4l5iERyTVOSMgGTeCqD4UE19ml4M=" }, "kguiaddons": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kguiaddons-6.7.0.tar.xz", - "hash": "sha256-rEN8prr1CwF4vIvwtN0ebnDg5O8ax3AllzihxC0DW8w=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kguiaddons-6.8.0.tar.xz", + "hash": "sha256-ac5pgDyNab280b7OvXW9SWqdHp6m5y1cb0pc/adqI4Y=" }, "kholidays": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kholidays-6.7.0.tar.xz", - "hash": "sha256-K1Q9/etqUvQQH9+fFIAt11nQqf/wYOo3Hx87kA3TNas=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kholidays-6.8.0.tar.xz", + "hash": "sha256-FiuK3kLegEFTgPZHaihfv6tbsnDzWw19E7qhw0pfsWQ=" }, "ki18n": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/ki18n-6.7.0.tar.xz", - "hash": "sha256-VVtbwZVGw6eRxpck4jjF0XEKlXXPh0ABL4/FRvNUEis=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/ki18n-6.8.0.tar.xz", + "hash": "sha256-cdc6BY5SZ4l60/2CAnTkyO13Djwu7uyryAub6NTyho4=" }, "kiconthemes": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kiconthemes-6.7.0.tar.xz", - "hash": "sha256-viW/8fX2Xt1Fsk/5vtpEsEwOItGT5yRYyWpcWRtwuWg=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kiconthemes-6.8.0.tar.xz", + "hash": "sha256-zF4RarvYEADSHYdfeeWGrwULMaF5M70gZLIQBDcUzao=" }, "kidletime": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kidletime-6.7.0.tar.xz", - "hash": "sha256-YKbHA4e2PmEUcCnOV/FwI3JxQRYwozcqDo1yQLgAaq8=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kidletime-6.8.0.tar.xz", + "hash": "sha256-UQFgWPrzklFep/WC0lxmar3fOO9mq/GHUCz0bF4R5BA=" }, "kimageformats": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kimageformats-6.7.0.tar.xz", - "hash": "sha256-cihQZIrBZ+TA7mMVcf3knp/RXQBKEn3YBKFPn1ebcx8=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kimageformats-6.8.0.tar.xz", + "hash": "sha256-2fJiZBzEfl8t0b3VbukuN5q0yzTUYN/IhP2ZElDXtBc=" }, "kio": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kio-6.7.0.tar.xz", - "hash": "sha256-3yNQGaB6zVeZIPbGVQUOAtrPhHxwb0uCeedVvkb52ZA=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kio-6.8.0.tar.xz", + "hash": "sha256-y4rCWlMk6LYXgX/u/N93Oesg3DXc9ERLiGwdy7maVr4=" }, "kirigami": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kirigami-6.7.0.tar.xz", - "hash": "sha256-TWRaA3TTO5Rl554+FxcIguLL2hUm9FvFtrF22t2nfXY=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kirigami-6.8.0.tar.xz", + "hash": "sha256-DguQrJa6SWMOLAHYl3vYxRyasYCDE/yI9g3heXAHQqI=" }, "kitemmodels": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kitemmodels-6.7.0.tar.xz", - "hash": "sha256-CqAgUyO68tUZ67j5bOftVSSoFkp0QNkF+XdBi/vm00k=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kitemmodels-6.8.0.tar.xz", + "hash": "sha256-THraGyliGAOxZMMd42WNW9odXUzxAelzYoucL+GYI2U=" }, "kitemviews": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kitemviews-6.7.0.tar.xz", - "hash": "sha256-XmNRYpk8nx4V86EQnKMifQ0s5Xz3BwYVZRtlz3kNsEk=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kitemviews-6.8.0.tar.xz", + "hash": "sha256-62gx/b/tozKFAP8PP1ewkBwEz75zpac4N64LEbIpJa8=" }, "kjobwidgets": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kjobwidgets-6.7.0.tar.xz", - "hash": "sha256-Ftfnq1QjXW+h6yE9PWNxguIvy9vLe0sUAyQwoCoviIo=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kjobwidgets-6.8.0.tar.xz", + "hash": "sha256-hvIwHdm+heYt7ml4df9acxhj2wgyM7SwxgSdq2SphQE=" }, "knewstuff": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/knewstuff-6.7.0.tar.xz", - "hash": "sha256-pBhGItQwtk7HzEx3ET32fIhvNZzInMYxP7zHF2TSP6c=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/knewstuff-6.8.0.tar.xz", + "hash": "sha256-NhUFCfm3+h68k1FfxHRgGWKvHkcSy9RfsTYQrhvtRMo=" }, "knotifications": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/knotifications-6.7.0.tar.xz", - "hash": "sha256-npcvAV2bMbMoO/hCoy0nAJYiTRJ8E6bnlFD08EUt5ec=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/knotifications-6.8.0.tar.xz", + "hash": "sha256-GznXfAJeBv0hxxYAD1EkaBCixettoqP3+zzl3oLM+K8=" }, "knotifyconfig": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/knotifyconfig-6.7.0.tar.xz", - "hash": "sha256-Qifaehj5uoOzS/VLbT/BaNwHJryhSdL4lYW7VKsTgpU=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/knotifyconfig-6.8.0.tar.xz", + "hash": "sha256-yaMdb0VmsBzd12DehPXSlihxzQOHmTgXBC/CkWmTiL8=" }, "kpackage": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kpackage-6.7.0.tar.xz", - "hash": "sha256-kWwR9ZcnYNmlA5ZD+8Vc3p0R7BjyeNPWN5Mzb/pEKGU=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kpackage-6.8.0.tar.xz", + "hash": "sha256-0y5vYUjZzZPzIaZSz6TTP98jSa8QGWQSROKE4dLA0rY=" }, "kparts": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kparts-6.7.0.tar.xz", - "hash": "sha256-CxswUFDWH8vvpwJrCW3GtHcJ10NcabGKtWp+LqV9dZ4=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kparts-6.8.0.tar.xz", + "hash": "sha256-CiHSq/TEQGAV99Wr6+/sBJNXWEfqTsNOoj1T21JVsyc=" }, "kpeople": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kpeople-6.7.0.tar.xz", - "hash": "sha256-02JGusUPW/QG9oP+YcksteYjpR3p/+0RBGZeXxNe+Ig=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kpeople-6.8.0.tar.xz", + "hash": "sha256-2QmzyTlktqnS/Cn2P+AEBhrc5O8CXcbc/e0Up6a7lTA=" }, "kplotting": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kplotting-6.7.0.tar.xz", - "hash": "sha256-Ew7twjTw/tryxBXeiVyXlFT2TDsEkEMyfUPNUJ4jhrM=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kplotting-6.8.0.tar.xz", + "hash": "sha256-c2yV93YcoGJYXtK1tyZWubtqXnBlSMvZ8H2k9iyPuos=" }, "kpty": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kpty-6.7.0.tar.xz", - "hash": "sha256-QswbH3DuC9rNJoEoV9MQR9IY4fWFrDX+kWWQhQGplGo=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kpty-6.8.0.tar.xz", + "hash": "sha256-+8fzkKC4OXpRY/FrFAwGYsmU9hSgX35aUWFJPDy8PjY=" }, "kquickcharts": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kquickcharts-6.7.0.tar.xz", - "hash": "sha256-ZkBH57YiwLhl10ZoFxeUVfs4UcuxWo8sOLirnPhQmKQ=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kquickcharts-6.8.0.tar.xz", + "hash": "sha256-NugREaf67SCDYnRvhmRu0QTj4xShgukofPLSFPJhAjk=" }, "krunner": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/krunner-6.7.0.tar.xz", - "hash": "sha256-GH/+kYDpjoP7rFvTZE7GZxuh6AZspgE6mLTx10Oc/zo=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/krunner-6.8.0.tar.xz", + "hash": "sha256-RigsSTTfvC0l33Cwu/ZRgsMNjDnCGjp0n+VmHjs0w/s=" }, "kservice": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kservice-6.7.0.tar.xz", - "hash": "sha256-OdJULjj7NDTFQFyS1bReDVumUNJlMJrfk8eHp0HVf6E=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kservice-6.8.0.tar.xz", + "hash": "sha256-Iwls8j7j8mJgnAk/NskME5NQ6rHRMhMuC/wCrYuBgSg=" }, "kstatusnotifieritem": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kstatusnotifieritem-6.7.0.tar.xz", - "hash": "sha256-gOriaTzbXaZptO1qgii93DmBasoP3pKPIx5IlIJ9HeA=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kstatusnotifieritem-6.8.0.tar.xz", + "hash": "sha256-bk/4G4DXhC0qEOe3WOSXs3JPxU6jptpvCb7oBjZDmDI=" }, "ksvg": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/ksvg-6.7.0.tar.xz", - "hash": "sha256-u998eGyVlwfNnGfASmflGhXbzdbv96tSsDwJVE5m8YQ=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/ksvg-6.8.0.tar.xz", + "hash": "sha256-/mWwhS10rHO6S1l/41LpG/dM9h//+ARqG9URyKhQhOM=" }, "ktexteditor": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/ktexteditor-6.7.0.tar.xz", - "hash": "sha256-7Xb3IyQiWpJuAMLJcNSNfxGldulC5I0JLpg3vaedaZE=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/ktexteditor-6.8.0.tar.xz", + "hash": "sha256-alirdMTv3fMWEXToYNIRQmRUEi6ESyX8Je9igqHnonA=" }, "ktexttemplate": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/ktexttemplate-6.7.0.tar.xz", - "hash": "sha256-1rdfGT9NjYF883SHKldCdInGFzYSHHKmnE3X7mLh4jM=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/ktexttemplate-6.8.0.tar.xz", + "hash": "sha256-OoPa+0B1rwuwFVVqZCBQlPzKK6xbn7De5hTq/yUqBBI=" }, "ktextwidgets": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/ktextwidgets-6.7.0.tar.xz", - "hash": "sha256-I7txRQ459DfAa9mvSOeJMlPDGtEGSbCQHQqOwe4YrgE=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/ktextwidgets-6.8.0.tar.xz", + "hash": "sha256-XR0uMhM8v3frYNJE3PT9EMKFVeONpTdsAjtGK5tosrg=" }, "kunitconversion": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kunitconversion-6.7.0.tar.xz", - "hash": "sha256-swNgHGI81m7bZqZv1y6VdBW43TPnAwW+gTb6a0OxpAo=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kunitconversion-6.8.0.tar.xz", + "hash": "sha256-5iBUeIHmNcyKqXcabsqal6bLQJJawHXTPvd0T6zB2VQ=" }, "kuserfeedback": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kuserfeedback-6.7.0.tar.xz", - "hash": "sha256-Te+NDW7yJ4B7YGbLdizsNSRSoY4OKLVq7M6O8861J2E=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kuserfeedback-6.8.0.tar.xz", + "hash": "sha256-fp3FceNeJjT9Q9QqRobJIQl4KPulVD1KegHvf5udrbU=" }, "kwallet": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kwallet-6.7.0.tar.xz", - "hash": "sha256-/7MZzg3+6pU4nhovSDPRCZuJTIHx33q1Dc+3luqH/6I=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kwallet-6.8.0.tar.xz", + "hash": "sha256-4LUxHYjZLKW95MJK6HXcOk/GfpMZ0N4qSeJdBEYehig=" }, "kwidgetsaddons": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kwidgetsaddons-6.7.0.tar.xz", - "hash": "sha256-vTY0KJOGPmEQxfEkX4rgs6M4J19OrxJLFVhdL+SSMpo=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kwidgetsaddons-6.8.0.tar.xz", + "hash": "sha256-z4Zm7A8Kcg/qtkHqPhla8UBqQAgNEY0c9P+vEjxvqwg=" }, "kwindowsystem": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kwindowsystem-6.7.0.tar.xz", - "hash": "sha256-YsDwtKlQeTnYSu7aVbvUMAuIwE43lT5RibE5ADMQqPQ=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kwindowsystem-6.8.0.tar.xz", + "hash": "sha256-e0xSDnnC6xD5ih17TXVjPukNGHOvut+fYHUeZ7wOJDY=" }, "kxmlgui": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/kxmlgui-6.7.0.tar.xz", - "hash": "sha256-pFHBbXClkd4TlzB5EV81kF48QjAvXIyK4+x112oG/KE=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/kxmlgui-6.8.0.tar.xz", + "hash": "sha256-mX8xCkbsLBUwEPxZZ3UzkKmbxQYh0Z+SZIgWQXLFH8w=" }, "modemmanager-qt": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/modemmanager-qt-6.7.0.tar.xz", - "hash": "sha256-/EXc2K2iQ7r3kACZBi8xK2d79pT4jzZ0bVNK/pB7+PM=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/modemmanager-qt-6.8.0.tar.xz", + "hash": "sha256-CiLuylr897QgWbvfUGkk8lutFN9zfIhPqP0+J146Fxs=" }, "networkmanager-qt": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/networkmanager-qt-6.7.0.tar.xz", - "hash": "sha256-VjIxZEWHkYyVC8vl/aC/ajXpehL2sOm/nqpM4xQdMSI=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/networkmanager-qt-6.8.0.tar.xz", + "hash": "sha256-FYeSUe8aXohGW3j49Z4r49HylpTFyRUfoNVC6niUl2c=" }, "prison": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/prison-6.7.0.tar.xz", - "hash": "sha256-CgU6gL6uIyzvXaP2UlsU7mSbJ1zqZN4MD/rUHD8uwmA=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/prison-6.8.0.tar.xz", + "hash": "sha256-uue1p2xG4ri3yBwaqvIHIdBQz99IKR0rzGb1dZCy3rM=" }, "purpose": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/purpose-6.7.0.tar.xz", - "hash": "sha256-T4u/GQIscN8dw0Wkq9gWd6UFouj+9kMxEof+jpIS1Wo=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/purpose-6.8.0.tar.xz", + "hash": "sha256-fugYJlElHIKAp99iiNP2JXadzYtKbU/ufv5WmVQ18Go=" }, "qqc2-desktop-style": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/qqc2-desktop-style-6.7.0.tar.xz", - "hash": "sha256-tmAtIbqJGmNGGCeqRROUau8NjgFB9KgxqvssTS4/syk=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/qqc2-desktop-style-6.8.0.tar.xz", + "hash": "sha256-6WkvANebljvcrnFsqrlkwlNHUMhdf+AvznqQgAPrTaM=" }, "solid": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/solid-6.7.0.tar.xz", - "hash": "sha256-NnPxd3bDDZUj/kC4845ivhA3YQBQ94LBNtoawEsg5uc=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/solid-6.8.0.tar.xz", + "hash": "sha256-rOUUX1nbVIvPQjy2tw/YcP77o38HpkkWQ5SoArPKeUE=" }, "sonnet": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/sonnet-6.7.0.tar.xz", - "hash": "sha256-L5cNSQ7/1mjmTdk//vNEqA235jEwuyPfT6DWsUFQ5Yg=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/sonnet-6.8.0.tar.xz", + "hash": "sha256-xCG0YCFPOiWEKryyYFJRudqJtimtk2Fg051KpQJAVjY=" }, "syndication": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/syndication-6.7.0.tar.xz", - "hash": "sha256-wqSFIp2KQwhY1/Rz/osTNzfZPTOnduRu7fp3u54wuiQ=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/syndication-6.8.0.tar.xz", + "hash": "sha256-v84kBvpM+D8ikRwc19uvwleLYV+EM2i1UGm4/2MOK6k=" }, "syntax-highlighting": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/syntax-highlighting-6.7.0.tar.xz", - "hash": "sha256-bvUnqUF0C53f4FPrCOrX4RwSooOqiKXd8aGFIM2dLKc=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/syntax-highlighting-6.8.0.tar.xz", + "hash": "sha256-7Tx9PZLBVNmvOaGro5FmsH5kEcGMMQARYgjzpEI7Elc=" }, "threadweaver": { - "version": "6.7.0", - "url": "mirror://kde/stable/frameworks/6.7/threadweaver-6.7.0.tar.xz", - "hash": "sha256-GsP8gFHzGsT3bf1dFX5cN10YO8B2IVKkThgxz1gWqVY=" + "version": "6.8.0", + "url": "mirror://kde/stable/frameworks/6.8/threadweaver-6.8.0.tar.xz", + "hash": "sha256-iGTdMLelX3UcG6gavaeJo5NJZL4YuhyOaU4rxIdov94=" } } \ No newline at end of file diff --git a/pkgs/kde/misc/klevernotes/default.nix b/pkgs/kde/misc/klevernotes/default.nix index ae66125fddf4..3ab9fb6291f7 100644 --- a/pkgs/kde/misc/klevernotes/default.nix +++ b/pkgs/kde/misc/klevernotes/default.nix @@ -4,6 +4,7 @@ fetchurl, qtsvg, qtwebengine, + kconfigwidgets, }: mkKdeDerivation rec { pname = "klevernotes"; @@ -17,6 +18,7 @@ mkKdeDerivation rec { extraBuildInputs = [ qtsvg qtwebengine + kconfigwidgets ]; meta.license = with lib.licenses; [ From 73d24364fb3e5d90a687b22d0aa51597b48a7bc0 Mon Sep 17 00:00:00 2001 From: Patka Date: Fri, 8 Nov 2024 19:42:07 +0100 Subject: [PATCH 584/617] netbox2netshot: 0.1.12 -> 0.1.13; fix build release notes: https://github.com/scaleway/netbox2netshot/releases/tag/0.1.13 --- pkgs/tools/admin/netbox2netshot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/netbox2netshot/default.nix b/pkgs/tools/admin/netbox2netshot/default.nix index 0b5e1ed73793..ada70c8f37ef 100644 --- a/pkgs/tools/admin/netbox2netshot/default.nix +++ b/pkgs/tools/admin/netbox2netshot/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "netbox2netshot"; - version = "0.1.12"; + version = "0.1.13"; src = fetchFromGitHub { owner = "scaleway"; repo = "netbox2netshot"; rev = version; - hash = "sha256-PT/eQBe0CX1l6tcC5QBiXKGWgIQ8s4h6IApeWyb8ysc="; + hash = "sha256-zi/on31uYSW3XhIZzKMkxIj0QZxUzoOcpRR8w5LFH90="; }; - cargoHash = "sha256-/T+6cjWG8u/Mr8gtBOXbEEZOO0pDykEpNIVTgooAmuw="; + cargoHash = "sha256-qMIGCE3YsV+ZihqBpayrxddsSkmFPldgYNHnAK5semA="; nativeBuildInputs = [ pkg-config From e5d280c40ba589019087d16cf402c93aa78979bb Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 8 Nov 2024 19:48:59 +0100 Subject: [PATCH 585/617] .github/labeler.yml: remove darwin and bsd --- .github/labeler.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 77ed9da6df72..1d8e612d4ed3 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,3 +1,4 @@ +# NOTE: bsd, darwin and cross-compilation labels are handled by ofborg "6.topic: agda": - any: - changed-files: @@ -8,12 +9,6 @@ - pkgs/development/libraries/agda/**/* - pkgs/top-level/agda-packages.nix -"6.topic: bsd": - - any: - - changed-files: - - any-glob-to-any-file: - - pkgs/os-specific/bsd/**/* - "6.topic: cinnamon": - any: - changed-files: @@ -55,14 +50,6 @@ - pkgs/development/cuda-modules/**/* - pkgs/top-level/cuda-packages.nix -"6.topic: darwin": - - any: - - changed-files: - - any-glob-to-any-file: - - pkgs/os-specific/darwin/**/* - - pkgs/top-level/darwin-aliases.nix - - pkgs/top-level/darwin-packages.nix - "6.topic: deepin": - any: - changed-files: From eaa9c5eba82927f068ea66ee32bc752a1678ff8d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Nov 2024 19:49:31 +0100 Subject: [PATCH 586/617] linux_testing: 6.12-rc5 -> 6.12-rc6 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index bd57aee756b0..9e3ce882fc79 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.12-rc5", - "hash": "sha256:18zh3nwhsz1hpyhmlim9a2hz8yvx5psrrav4346k46x9ybfardqy" + "version": "6.12-rc6", + "hash": "sha256:1cllyav4pg2z22a52j8vq1sdk8qrr6h8w2f3blrs4ispbhxa8xsb" }, "6.1": { "version": "6.1.115", From 019f743c691cc4742ea48b08d50c782ab77d6e77 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Nov 2024 19:49:39 +0100 Subject: [PATCH 587/617] linux_6_11: 6.11.6 -> 6.11.7 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 9e3ce882fc79..1f55646eb38c 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -24,7 +24,7 @@ "hash": "sha256:0vd76ccd4li4wsg04gc4nai9f4y1nknz967qby0i53y0v046hq93" }, "6.11": { - "version": "6.11.6", - "hash": "sha256:1kiky6viwrgm47slpv234lfq1wrwj29p5rx168gix3q0jw0zcm69" + "version": "6.11.7", + "hash": "sha256:1cpbycx79nl517rz573mja52bgzm249mhqzp424r5mqp91jfrx8b" } } From cab288a30511bfc5bdd357c52ee0f8cd06564d85 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Nov 2024 19:50:00 +0100 Subject: [PATCH 588/617] linux_6_6: 6.6.59 -> 6.6.60 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 1f55646eb38c..c7e7ae1b2f46 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "hash": "sha256:0axkwfhvq3w2072xjqww476qa3rjglxyqmf72mlp9b5ymswil8kp" }, "6.6": { - "version": "6.6.59", - "hash": "sha256:0vd76ccd4li4wsg04gc4nai9f4y1nknz967qby0i53y0v046hq93" + "version": "6.6.60", + "hash": "sha256:1vsjb7ifmf6ic6zv16fbrxjvffqc1mkndza76hjr9aw2a0ny7yaj" }, "6.11": { "version": "6.11.7", From bf6ccfccdb0024d1653002f9b76c1c589f2fd2ff Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Nov 2024 19:50:17 +0100 Subject: [PATCH 589/617] linux_6_1: 6.1.115 -> 6.1.116 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index c7e7ae1b2f46..f0fbf9ce15e9 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:1cllyav4pg2z22a52j8vq1sdk8qrr6h8w2f3blrs4ispbhxa8xsb" }, "6.1": { - "version": "6.1.115", - "hash": "sha256:0vxs6zj4p0ihcp11h3svqy3wa1yph0f1vzc8dlvqh60zgs1bmn0g" + "version": "6.1.116", + "hash": "sha256:109vhc1hcfx6sacw4553xmwbj1gqx3zqjq5zg11z7a72dqrnisqp" }, "5.15": { "version": "5.15.170", From c51850c016fd8bf3de419e060a7ed0c69393bf16 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Nov 2024 19:50:27 +0100 Subject: [PATCH 590/617] linux_5_15: 5.15.170 -> 5.15.171 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index f0fbf9ce15e9..9c3e61bb82eb 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -8,8 +8,8 @@ "hash": "sha256:109vhc1hcfx6sacw4553xmwbj1gqx3zqjq5zg11z7a72dqrnisqp" }, "5.15": { - "version": "5.15.170", - "hash": "sha256:1ag7fvixhdcyxv6rqfsvq2wh02g64r4rx8izvfb33nfnld2nangx" + "version": "5.15.171", + "hash": "sha256:0fra5zwcixgl6fg9hgdzlfcqng6pg09h2j7xqhi4qg0jv1jf0lr9" }, "5.10": { "version": "5.10.228", From 878ea7b096f53336c0619f17ce995360bf15220b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Nov 2024 19:50:35 +0100 Subject: [PATCH 591/617] linux_5_10: 5.10.228 -> 5.10.229 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 9c3e61bb82eb..9137f1853d2d 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -12,8 +12,8 @@ "hash": "sha256:0fra5zwcixgl6fg9hgdzlfcqng6pg09h2j7xqhi4qg0jv1jf0lr9" }, "5.10": { - "version": "5.10.228", - "hash": "sha256:0wkvn49sdy9ykyz6cqdqd9yplqfhc6b255w6wc17ky182mzqvk3n" + "version": "5.10.229", + "hash": "sha256:1q6di05rk4bsy91r03zw6vz14zzcpvv25dv7gw0yz1gzpgkbb9h8" }, "5.4": { "version": "5.4.284", From f919f99e9c858544ac2a9eb897061fea384f4d69 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Nov 2024 19:50:48 +0100 Subject: [PATCH 592/617] linux-rt_5_15: 5.15.167-rt79 -> 5.15.170-rt81 --- pkgs/os-specific/linux/kernel/linux-rt-5.15.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix index a1cd2eb5d93f..bd48959b2b23 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.15.167-rt79"; # updated by ./update-rt.sh + version = "5.15.170-rt81"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -19,14 +19,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "0c6s6l5sz9ibws7bymb393ww0z9i3amsk1yx0bahipz3xhc1yxdi"; + sha256 = "1ag7fvixhdcyxv6rqfsvq2wh02g64r4rx8izvfb33nfnld2nangx"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0z9yhg0vxzrqn2vyg973pd8qy5iq30jkza8c0mrjjpjzyc8jvm57"; + sha256 = "0vr6c93dr0gcszx0hfnfhqbg5flkvxmkpf2hw13gi4rg8x4bx5ll"; }; }; in [ rt-patch ] ++ kernelPatches; From 0216aad1747f9f518f3139bfbd4a5662d0f899d0 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Nov 2024 19:51:00 +0100 Subject: [PATCH 593/617] linux-rt_6_1: 6.1.111-rt42 -> 6.1.112-rt43 --- pkgs/os-specific/linux/kernel/linux-rt-6.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix index 29a40809d0fc..16c4f021ed00 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.1.111-rt42"; # updated by ./update-rt.sh + version = "6.1.112-rt43"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -19,14 +19,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; - sha256 = "1c7d49kppv8xgqlsrfm1286mnvz8vcnbqqh6zgfca2s13px9hwn4"; + sha256 = "094z3wfcxqx2rbi072i5frshpy6rdvk39aahwm9nc07vc8sxxn4b"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "16yb962fkkvgppbx8glp5ph3h1jl2q1b4m2s8gsf3k9i9yim7v5c"; + sha256 = "0qvil92xkbwmyrmj0zlg0ssg95ncscmr4ga4380903bqhhh74d6h"; }; }; in [ rt-patch ] ++ kernelPatches; From 040a0dae71928896326c70d8d2120548e248db06 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Nov 2024 19:51:14 +0100 Subject: [PATCH 594/617] linux-rt_6_6: 6.6.52-rt43 -> 6.6.58-rt45 --- pkgs/os-specific/linux/kernel/linux-rt-6.6.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix index c27ae8cf120a..ffbe4fc47e4c 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.6.52-rt43"; # updated by ./update-rt.sh + version = "6.6.58-rt45"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -19,14 +19,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; - sha256 = "1f5l6y7abscm01dr740fzvq8r756ar854n0i299smm4rhcsap48m"; + sha256 = "1nwrd017l5m4w12yrcf31y3g0l9xqm5b0fzcqdgan3ypi3jq3pz7"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0g33n9idc3lhbj5z637zm3bgqh601a05cl1s8ji8zbnfh971jcgh"; + sha256 = "0npvydlk2z33c5xqhg31xky045s5rvjnvfqml30nycmzbsmqjc7c"; }; }; in [ rt-patch ] ++ kernelPatches; From 7c1e8955b7015f496d5611e5c62d270fbcb403da Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Nov 2024 19:51:34 +0100 Subject: [PATCH 595/617] linux_latest-libre: 19643 -> 19663 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 4cdb819a6224..06adab0e0ac9 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19643"; - sha256 = "1gnji0hglzh6kj9ssawlrix1vlbcyfjdjx5d9qwpnn2p0sgsq7nj"; + rev = "19663"; + sha256 = "126b05v6hcdag3pfaxwbabfwkrp4c7010v52rk2dqh9i631ykavd"; } , ... } @ args: From 6a2e37b3189adb3703d65f1730f1f3645c470df8 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 8 Nov 2024 22:01:52 +0300 Subject: [PATCH 596/617] linux/update-mainline: fix oldest version check --- pkgs/os-specific/linux/kernel/update-mainline.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/update-mainline.py b/pkgs/os-specific/linux/kernel/update-mainline.py index 320d5065fefa..13e89d3df1e1 100755 --- a/pkgs/os-specific/linux/kernel/update-mainline.py +++ b/pkgs/os-specific/linux/kernel/update-mainline.py @@ -87,9 +87,8 @@ def get_hash(kernel: KernelRelease): return f"sha256:{hash}" -def get_oldest_branch() -> Version: - with open(VERSIONS_FILE) as f: - return parse_version(sorted(json.load(f).keys())[0]) +def get_oldest_branch(kernels) -> Version: + return min(parse_version(v) for v in kernels.keys() if v != "testing") def predates_oldest_branch(oldest: Version, to_compare: str) -> bool: @@ -118,8 +117,7 @@ def main(): if (parsed := parse_release(release)) is not None ] all_kernels = json.load(VERSIONS_FILE.open()) - - oldest_branch = get_oldest_branch() + oldest_branch = get_oldest_branch(all_kernels) for (branch, kernels) in groupby(parsed_releases, lambda kernel: kernel.branch): kernel = max(kernels, key=lambda kernel: kernel.parsed_version) From d051f421fb8f21dc591656a417a508afbf92bd5a Mon Sep 17 00:00:00 2001 From: Karolis Stasaitis Date: Sat, 19 Oct 2024 19:53:57 +0200 Subject: [PATCH 597/617] packetry: init at 0.4.0 Co-authored-by: zi3m5f <113244000+zi3m5f@users.noreply.github.com> --- pkgs/by-name/pa/packetry/package.nix | 63 ++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 pkgs/by-name/pa/packetry/package.nix diff --git a/pkgs/by-name/pa/packetry/package.nix b/pkgs/by-name/pa/packetry/package.nix new file mode 100644 index 000000000000..f2766c3998d0 --- /dev/null +++ b/pkgs/by-name/pa/packetry/package.nix @@ -0,0 +1,63 @@ +{ + fetchFromGitHub, + lib, + stdenv, + rustPlatform, + gtk4, + pkg-config, + pango, + wrapGAppsHook4, + apple-sdk_11, + versionCheckHook, +}: + +rustPlatform.buildRustPackage rec { + pname = "packetry"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "greatscottgadgets"; + repo = "packetry"; + rev = "refs/tags/v${version}"; + hash = "sha256-eDVom0kAL1QwO8BtrJS76VTvxtKs7CP6Ob5BWlE6wOM="; + }; + + cargoHash = "sha256-xz9PdVVB1u6s/anPBRonWS1kMN+4kfkK/gaOlF9Z3yk="; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = + [ + gtk4 + pango + ] + ++ lib.optionals stdenv.isDarwin [ + apple-sdk_11 + ]; + + # Disable test_replay tests as they need a gui + preCheck = '' + sed -i 's:#\[test\]:#[test] #[ignore]:' src/test_replay.rs + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + # packetry-cli is only necessary on windows https://github.com/greatscottgadgets/packetry/pull/154 + postInstall = '' + rm $out/bin/packetry-cli + ''; + + meta = { + description = "USB 2.0 protocol analysis application for use with Cynthion"; + homepage = "https://github.com/greatscottgadgets/packetry"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ carlossless ]; + mainProgram = "packetry"; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} From e62a69dc686070b68da31ea4a5aaa32c8c6acb70 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 8 Nov 2024 20:08:06 +0100 Subject: [PATCH 598/617] linux_5_4: 5.4.284 -> 5.4.285 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 9137f1853d2d..e448d42e3e5f 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -16,8 +16,8 @@ "hash": "sha256:1q6di05rk4bsy91r03zw6vz14zzcpvv25dv7gw0yz1gzpgkbb9h8" }, "5.4": { - "version": "5.4.284", - "hash": "sha256:0axkwfhvq3w2072xjqww476qa3rjglxyqmf72mlp9b5ymswil8kp" + "version": "5.4.285", + "hash": "sha256:1722sc365ajxmqyr4r49yp73mzdckay3rx5c2gx29xzny9zc6cmy" }, "6.6": { "version": "6.6.60", From ce43435b27200424357c77ed2c172a8858de450d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Fri, 8 Nov 2024 20:40:07 +0100 Subject: [PATCH 599/617] jwhois: unbreak darwin --- pkgs/tools/networking/jwhois/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/jwhois/default.nix b/pkgs/tools/networking/jwhois/default.nix index 50959152d710..78f2398b2876 100644 --- a/pkgs/tools/networking/jwhois/default.nix +++ b/pkgs/tools/networking/jwhois/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation (finalAttrs: { # TODO: this should probably be fixed at a lower level than this? env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-undef-prefix"; + env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv"; + meta = { description = "Client for the WHOIS protocol allowing you to query the owner of a domain name"; homepage = "https://www.gnu.org/software/jwhois/"; From 9d90eac487efea2c81c0756755e5d02ec8720766 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Thu, 31 Oct 2024 10:13:47 -0500 Subject: [PATCH 600/617] nimble: 0-unstable-2024-05-14 -> 0.16.2 --- pkgs/by-name/ni/nimble/lock.json | 24 +++++++++++++----------- pkgs/by-name/ni/nimble/package.nix | 6 +++--- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ni/nimble/lock.json b/pkgs/by-name/ni/nimble/lock.json index 5fe2cca79da1..14fde9f99106 100644 --- a/pkgs/by-name/ni/nimble/lock.json +++ b/pkgs/by-name/ni/nimble/lock.json @@ -2,25 +2,27 @@ "depends": [ { "method": "fetchzip", + "path": "/nix/store/6aph9sfwcws7pd2725fwjnibdfrv7qmw-source", + "rev": "f8f6bd34bfa3fe12c64b919059ad856a96efcba0", + "sha256": "11m1rb6rzk70kvskppf97ddzgf5fnh9crjziqc6hib0jgsm5d615", + "srcDir": "src", + "url": "https://github.com/nim-lang/checksums/archive/f8f6bd34bfa3fe12c64b919059ad856a96efcba0.tar.gz", + "subDir": "", "packages": [ "checksums" - ], - "path": "/nix/store/z6799507gzbw46lzbi1i8mwm0nbvrvnx-source", - "rev": "7ff0b762332d2591bbeb65df9bb86d52ea44ec01", - "sha256": "11612prr2wwbx414ip0zjh1fv638dgfvzxfd6v2f432n0wfwhjhj", - "srcDir": "src", - "url": "https://github.com/nim-lang/checksums/archive/7ff0b762332d2591bbeb65df9bb86d52ea44ec01.tar.gz" + ] }, { "method": "fetchzip", - "packages": [ - "sat" - ], "path": "/nix/store/lwg9fm34h5xv0dvxij9r5m2y6pn1zsvx-source", - "rev": "a53d9d6e0470f78f8ba14652d981e7bcdbcd579f", + "rev": "faf1617f44d7632ee9601ebc13887644925dcc01", "sha256": "1dxbc41wbvkpdp6q3qz1r38lpn32447qkkgyh2s12ym6bx4ynni4", "srcDir": "src", - "url": "https://github.com/nim-lang/sat/archive/a53d9d6e0470f78f8ba14652d981e7bcdbcd579f.tar.gz" + "url": "https://github.com/nim-lang/sat/archive/faf1617f44d7632ee9601ebc13887644925dcc01.tar.gz", + "subDir": "", + "packages": [ + "sat" + ] } ] } diff --git a/pkgs/by-name/ni/nimble/package.nix b/pkgs/by-name/ni/nimble/package.nix index 213f621fd866..1854c005b0e9 100644 --- a/pkgs/by-name/ni/nimble/package.nix +++ b/pkgs/by-name/ni/nimble/package.nix @@ -10,13 +10,13 @@ buildNimPackage ( final: prev: { pname = "nimble"; - version = "0-unstable-2024-05-14"; + version = "0.16.2"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nimble"; - rev = "f8bd7b5fa6ea7a583b411b5959b06e6b5eb23667"; - hash = "sha256-aRDaucD6wOUPtXLIrahvK0vBfurdgFrk+swzqzMA09w="; + rev = "v${final.version}"; + hash = "sha256-MVHf19UbOWk8Zba2scj06PxdYYOJA6OXrVyDQ9Ku6Us="; }; lockFile = ./lock.json; From 3e1a9ffb61ae001dcacdf7ba0e71b70bf06e7016 Mon Sep 17 00:00:00 2001 From: Ryan Hendrickson Date: Fri, 8 Nov 2024 14:55:58 -0500 Subject: [PATCH 601/617] sudo: fix cross-compilation linking error --- pkgs/tools/security/sudo/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index d238ef3166c6..1fecbceb98cb 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchpatch , fetchurl , buildPackages , coreutils @@ -30,6 +31,14 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace src/Makefile.in --replace 04755 0755 ''; + patches = [ + # Fix for https://github.com/NixOS/nixpkgs/issues/354544 + (fetchpatch { + url = "https://www.sudo.ws/repos/sudo/raw-rev/71e3f5a288e1ac21151b1b9577f0fe3745671cf7"; + hash = "sha256-L4AF1ee+qW9QKLrUzL5+hC5EznNC9k7sNeVGNBAJ6S4="; + }) + ]; + configureFlags = [ "--with-env-editor" "--with-editor=/run/current-system/sw/bin/nano" From a2e51f8786959b5fa9dd598df781034e0cf4c618 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Nov 2024 21:04:15 +0100 Subject: [PATCH 602/617] python312Packages.agent-py: 0.0.23 -> 0.0.24 https://github.com/ispysoftware/agent-py/compare/refs/tags/agent-py.0.0.23...0.0.24 --- .../python-modules/agent-py/default.nix | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/agent-py/default.nix b/pkgs/development/python-modules/agent-py/default.nix index eb1702d32709..8c9ef8be3c58 100644 --- a/pkgs/development/python-modules/agent-py/default.nix +++ b/pkgs/development/python-modules/agent-py/default.nix @@ -1,33 +1,33 @@ { aiohttp, buildPythonPackage, - fetchPypi, - isPy3k, + fetchFromGitHub, lib, - python, - requests, + setuptools, + pytestCheckHook, }: buildPythonPackage rec { pname = "agent-py"; - version = "0.0.23"; - format = "setuptools"; + version = "0.0.24"; + pyproject = true; - disabled = !isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "1hx88m8b8kfb2gm6hii5ldjv7hlvqf99cz0w2vj0d0grrxcbn5cz"; + src = fetchFromGitHub { + owner = "ispysoftware"; + repo = "agent-py"; + rev = "refs/tags/agent-py.${version}"; + hash = "sha256-PP4gQ3AFYLJPUt9jhhiV9HkfBhIzd+JIsGpgK6FNmaE="; }; - propagatedBuildInputs = [ - requests - aiohttp - ]; + build-system = [ setuptools ]; - checkPhase = '' - ${python.interpreter} tests/test_agent.py - ''; + dependencies = [ aiohttp ]; + + doCheck = false; # only test is outdated + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "agent" ]; meta = with lib; { description = "Python wrapper around the Agent REST API"; From 621e3513817699cbed7957ba7f0a020c906723b9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Nov 2024 21:05:09 +0100 Subject: [PATCH 603/617] python312Packages.google-nest-sdm: 6.1.3 -> 6.1.4 https://github.com/allenporter/python-google-nest-sdm/releases/tag/6.1.4 --- pkgs/development/python-modules/google-nest-sdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index 1f4e2ef3cdc4..6bdda8efbc1d 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "6.1.3"; + version = "6.1.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = "refs/tags/${version}"; - hash = "sha256-X/jiers05zNAEUau6SVKGyyIx9HCs7yI0HsuZ7/tXfo="; + hash = "sha256-F/vpyg3EYgKCsq/0yL3uP+1azu8bbHOMsf85Yabl0KQ="; }; build-system = [ setuptools ]; From e816e355239021519ac261aa82215c70633f8185 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Nov 2024 21:05:22 +0100 Subject: [PATCH 604/617] python312Packages.ha-ffmpeg: 3.2.1 -> 3.2.2 https://github.com/home-assistant-libs/ha-ffmpeg/releases/tag/3.2.2 --- pkgs/development/python-modules/ha-ffmpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix index e8d1537b58ba..c765c22428ff 100644 --- a/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ha-ffmpeg"; - version = "3.2.1"; + version = "3.2.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "ha-ffmpeg"; rev = "refs/tags/${version}"; - hash = "sha256-Yu23kRChPbq/9sKvu9uY4qtKXX7CVNagZX9Z6ZzDqcw="; + hash = "sha256-TbSoKoOiLx3O7iykiTri5GBHGj7WoB8iSCpFIrV4ZgU="; }; build-system = [ setuptools ]; From 27c3ae3b08e0708a45a3e19ac0477ab6cb08752c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Nov 2024 21:06:14 +0100 Subject: [PATCH 605/617] python312Packages.python-roborock: 2.6.1 -> 2.7.2 https://github.com/humbertogontijo/python-roborock/blob/v2.7.2/CHANGELOG.md --- pkgs/development/python-modules/python-roborock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 1385f887bd12..9cfebbbbaa90 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "2.6.1"; + version = "2.7.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-0gzbPa19UIt8Vs0Vnqs9j0tFJAkRTupU7DxT+7rwouI="; + hash = "sha256-sPG3AqVrv+BiB+copgaghWDT/Rb/WU0R+Y8Z2J6l+7E="; }; postPatch = '' From 37976f9cfdd9860e5f78abe269b59e4bb5d640ea Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Nov 2024 21:06:37 +0100 Subject: [PATCH 606/617] python312Packages.sense-energy: 0.13.2 -> 0.13.3 https://github.com/scottbonline/sense/releases/tag/0.13.3 --- pkgs/development/python-modules/sense-energy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sense-energy/default.nix b/pkgs/development/python-modules/sense-energy/default.nix index 54e7d1c2b368..11991b9ef17d 100644 --- a/pkgs/development/python-modules/sense-energy/default.nix +++ b/pkgs/development/python-modules/sense-energy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "sense-energy"; - version = "0.13.2"; + version = "0.13.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "scottbonline"; repo = "sense"; rev = "refs/tags/${version}"; - hash = "sha256-HE0bMcxfzfaMLDepjwDwV8AXQ3Q/bQt6SqHt7m/UY9I="; + hash = "sha256-k1W84c0odpYv0vI2u2zqfWGJXSpYJRSwfFyXACMto7s="; }; postPatch = '' From 7dec9f228a03b2186b0710da8821e4ac870b0eb6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Nov 2024 21:06:55 +0100 Subject: [PATCH 607/617] python312Packages.spotifyaio: 0.8.5 -> 0.8.7 https://github.com/joostlek/python-spotify/releases/tag/v0.8.7 --- pkgs/development/python-modules/spotifyaio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spotifyaio/default.nix b/pkgs/development/python-modules/spotifyaio/default.nix index de088932713e..54308db1a8b0 100644 --- a/pkgs/development/python-modules/spotifyaio/default.nix +++ b/pkgs/development/python-modules/spotifyaio/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "spotifyaio"; - version = "0.8.5"; + version = "0.8.7"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-spotify"; rev = "refs/tags/v${version}"; - hash = "sha256-6OX9awRmy2DT8SHvoVsLcsZ6LxTek/HgXNG9b2wSfGU="; + hash = "sha256-8CvXh3lU6CWOIFyfKQv4TX4R9O9BzwEu/Cua0MRdma4="; }; build-system = [ poetry-core ]; From c71079125f5b3fe382381756ddcb91c3b11621ed Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Nov 2024 21:09:56 +0100 Subject: [PATCH 608/617] home-assistant.intents: 2024.11.4 -> 2024.11.6 https://github.com/home-assistant/intents/releases/tag/2024.11.6 --- pkgs/servers/home-assistant/intents.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 57598ad2b0f5..a88446e8acba 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2024.11.4"; + version = "2024.11.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { repo = "intents-package"; rev = "refs/tags/${version}"; fetchSubmodules = true; - hash = "sha256-6SgvRaiPOfXM5OxrBQ/w600k7E+AKZEB8vukic6M4lA="; + hash = "sha256-C2q0mUdA6VGKPHtG2g9Zi0nPvwWP1LAdepJCRkF4ky8="; }; build-system = [ From f5ddf1a751b3036b37b8d63fec11f4bf9bf9d484 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 8 Nov 2024 21:15:18 +0100 Subject: [PATCH 609/617] home-assistant: 2024.11.0 -> 2024.11.1 https://github.com/home-assistant/core/releases/tag/2024.11.1 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 6 +++--- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index f72064a46c0f..31c5656a170b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2024.11.0"; + version = "2024.11.1"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index bb06d48683d0..34478297238b 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -439,7 +439,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.11.0"; + hassVersion = "2024.11.1"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -457,13 +457,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-9wFF0tDy3IAnmjjP1juQsU2G6qmQiBnBX1imNrbib7Y="; + hash = "sha256-t8f0em5EaWPLZlr+fi/Kn3AE0dFEAyy0FpwdjJOYBCI="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-9DtxrMhozse672aa1pHvk/wOpr7GdWUZtz0u7GNGBVw="; + hash = "sha256-e9RF1oer4FyDEYof7qLTFUkmSxDh71qi+ResNXO6G5o="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 1ee12aaf46f3..53bc67e53179 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20241106.0"; + version = "20241106.2"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-EqF3fgT7pMjYTMVFcoXXnbeGjT7ZevmmTCqG8q3Qqt4="; + hash = "sha256-9Il9/lHKIaymw7H8fL1gpp80+VzSqVJ1IyHGEa3OoO8="; }; # there is nothing to strip in this package From 2a29ee734cb9e6441b6297ba94ca7eeb460a412a Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 2 Nov 2024 18:13:35 +0000 Subject: [PATCH 610/617] hal-hardware-analyzer: 4.2.0 -> 4.4.1 also add verilator support --- .../4.4.1-newer-spdlog-fmt-compat.patch | 28 +++++++ .../hal-hardware-analyzer/default.nix | 74 ++++++------------- 2 files changed, 49 insertions(+), 53 deletions(-) create mode 100644 pkgs/applications/science/electronics/hal-hardware-analyzer/4.4.1-newer-spdlog-fmt-compat.patch diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/4.4.1-newer-spdlog-fmt-compat.patch b/pkgs/applications/science/electronics/hal-hardware-analyzer/4.4.1-newer-spdlog-fmt-compat.patch new file mode 100644 index 000000000000..016e74415644 --- /dev/null +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/4.4.1-newer-spdlog-fmt-compat.patch @@ -0,0 +1,28 @@ +compatibility with newer spdlog/fmt versions + +diff --git a/plugins/module_identification/src/api/module_identification.cpp b/plugins/module_identification/src/api/module_identification.cpp +index 808875e8a68..3cf3cf1fb8b 100644 +--- a/plugins/module_identification/src/api/module_identification.cpp ++++ b/plugins/module_identification/src/api/module_identification.cpp +@@ -406,7 +406,7 @@ namespace hal + + const u32 num_threads = std::min(config.m_max_thread_count, std::thread::hardware_concurrency() - 1); + +- log_info("module_identification", "running with {} threads and {} multithreading priority", num_threads, config.m_multithreading_priority); ++ log_info("module_identification", "running with {} threads and {} multithreading priority", num_threads, fmt::underlying(config.m_multithreading_priority)); + + auto stats = Statistics(); + +diff --git a/plugins/z3_utils/src/simplification.cpp b/plugins/z3_utils/src/simplification.cpp +index d64cab665f2..561fa7f1a23 100644 +--- a/plugins/z3_utils/src/simplification.cpp ++++ b/plugins/z3_utils/src/simplification.cpp +@@ -617,7 +617,7 @@ namespace hal + return false; + + default: { +- log_error("z3_utils", "commutative check not implemeted for type {}!", t); ++ log_error("z3_utils", "commutative check not implemeted for type {}!", fmt::underlying(t)); + return false; + } + } diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index acf52931c7ed..e8c15c35f2f9 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -8,6 +8,7 @@ , igraph , llvmPackages , ninja +, nlohmann_json , pkg-config , python3Packages , qtbase @@ -15,75 +16,36 @@ , quazip , rapidjson , spdlog -, suitesparse +, verilator , wrapQtAppsHook , z3 }: -let - # hal doesn't work with igraph 0.10.x yet https://github.com/emsec/hal/pull/487 - igraph' = igraph.overrideAttrs (final: prev: { - version = "0.9.10"; - src = fetchFromGitHub { - owner = "igraph"; - repo = final.pname; - rev = final.version; - hash = "sha256-prDadHsNhDRkNp1i0niKIYxE0g85Zs0ngvUy6uK8evk="; - }; - patches = (prev.patches or []) ++ [ - # needed by clang - (fetchpatch { - name = "libxml2-2.11-compat.patch"; - url = "https://github.com/igraph/igraph/commit/5ad464be5ae2f6ebb69c97cb0140c800cc8d97d6.patch"; - hash = "sha256-adU5SctH+H54UaAmr5BZInytD3wjUzLtQbCwngAWs4o="; - }) - ]; - postPatch = prev.postPatch + lib.optionalString stdenv.hostPlatform.isAarch64 '' - # https://github.com/igraph/igraph/issues/1694 - substituteInPlace tests/CMakeLists.txt \ - --replace "igraph_scg_grouping3" "" \ - --replace "igraph_scg_semiprojectors2" "" - ''; - NIX_CFLAGS_COMPILE = (prev.NIX_CFLAGS_COMPILE or []) ++ lib.optionals stdenv.cc.isClang [ - "-Wno-strict-prototypes" - "-Wno-unused-but-set-parameter" - "-Wno-unused-but-set-variable" - ]; - # general options brought back from the old 0.9.x package - buildInputs = prev.buildInputs ++ [ suitesparse ]; - cmakeFlags = prev.cmakeFlags ++ [ "-DIGRAPH_USE_INTERNAL_CXSPARSE=OFF" ]; - }); - -in stdenv.mkDerivation rec { - version = "4.2.0"; +stdenv.mkDerivation rec { + version = "4.4.1"; pname = "hal-hardware-analyzer"; src = fetchFromGitHub { owner = "emsec"; repo = "hal"; rev = "v${version}"; - sha256 = "sha256-Yl86AClE3vWygqj1omCOXX8koJK2SjTkMZFReRThez0="; + sha256 = "sha256-8kmYeqsmqR7tY044rZb3KuEAVGv37IObX6k1qjXWG0A="; }; patches = [ (fetchpatch { - name = "cmake-add-no-vendored-options.patch"; - # https://github.com/emsec/hal/pull/529 - url = "https://github.com/emsec/hal/commit/37d5c1a0eacb25de57cc552c13e74f559a5aa6e8.patch"; - hash = "sha256-a30VjDt4roJOTntisixqnH17wwCgWc4VWeh1+RgqFuY="; + name = "de-vendor-nlohmann-json.patch"; + # https://github.com/emsec/hal/pull/596 + url = "https://github.com/emsec/hal/commit/f8337d554d80cfa2588512696696fd4c878dd7a3.patch"; + hash = "sha256-QjgvcduwbFccC807JFOevlTfO3KiL9T3HSqYmh3sXAQ="; }) (fetchpatch { - name = "hal-fix-fmt-10.1-compat.patch"; - # https://github.com/emsec/hal/pull/530 - url = "https://github.com/emsec/hal/commit/b639a56b303141afbf6731b70b7cc7452551f024.patch"; - hash = "sha256-a7AyDEKkqdbiHpa4OHTRuP9Yewb3Nxs/j6bwez5m0yU="; - }) - (fetchpatch { - name = "fix-gcc-13-build.patch"; - # https://github.com/emsec/hal/pull/557 - url = "https://github.com/emsec/hal/commit/831b1a7866aa9aabd55ff288c084862dc6a138d8.patch"; - hash = "sha256-kB/sJJtLGl5PUv+mmWVpee/okkJzp5HF0BCiCRCcTKw="; + name = "fix-vendored-igraph-regression.patch"; + # https://github.com/emsec/hal/pull/596 + url = "https://github.com/emsec/hal/commit/fe1fe74719ab4fef873a22e2b28cce0c57d570e0.patch"; + hash = "sha256-bjbW4pr04pP0TCuSdzPcV8h6LbLWMvdGSf61RL9Ju6E="; }) + ./4.4.1-newer-spdlog-fmt-compat.patch ]; # make sure bundled dependencies don't get in the way - install also otherwise @@ -105,9 +67,11 @@ in stdenv.mkDerivation rec { qtsvg boost rapidjson - igraph' + igraph + nlohmann_json spdlog graphviz + verilator z3 quazip ] @@ -129,12 +93,16 @@ in stdenv.mkDerivation rec { "-DUSE_VENDORED_SPDLOG=off" "-DUSE_VENDORED_QUAZIP=off" "-DUSE_VENDORED_IGRAPH=off" + "-DUSE_VENDORED_NLOHMANN_JSON=off" "-DBUILD_ALL_PLUGINS=on" ]; # needed for macos build - this is why we use wrapQtAppsHook instead of # the qt mkDerivation - the latter forcibly overrides this. cmakeBuildType = "MinSizeRel"; + # https://github.com/emsec/hal/issues/598 + NIX_CFLAGS_COMPILE = lib.optional stdenv.hostPlatform.isAarch64 "-flax-vector-conversions"; + # some plugins depend on other plugins and need to be able to load them postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' find $out/lib/hal_plugins -name '*.so*' | while read -r f ; do From 8e67b23d40ba2f3fdbc068dbcff5f4742abad35b Mon Sep 17 00:00:00 2001 From: dvishal485 <26341736+dvishal485@users.noreply.github.com> Date: Sat, 9 Nov 2024 02:20:07 +0530 Subject: [PATCH 611/617] libfprint-focaltech-2808-a658: init at 1.94.4 Signed-off-by: dvishal485 <26341736+dvishal485@users.noreply.github.com> --- .../libfprint-focaltech-2808-a658/package.nix | 104 ++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 pkgs/by-name/li/libfprint-focaltech-2808-a658/package.nix diff --git a/pkgs/by-name/li/libfprint-focaltech-2808-a658/package.nix b/pkgs/by-name/li/libfprint-focaltech-2808-a658/package.nix new file mode 100644 index 000000000000..41b7b3129ce3 --- /dev/null +++ b/pkgs/by-name/li/libfprint-focaltech-2808-a658/package.nix @@ -0,0 +1,104 @@ +{ + stdenv, + lib, + fetchurl, + rpm, + cpio, + glib, + gusb, + pixman, + libgudev, + nss, + libfprint, + cairo, + pkg-config, + autoPatchelfHook, + makePkgconfigItem, + copyPkgconfigItems, +}: + +# https://discourse.nixos.org/t/request-for-libfprint-port-for-2808-a658/55474 +let + # The provided `.so`'s name in the binary package we fetch and unpack + libso = "libfprint-2.so.2.0.0"; +in +stdenv.mkDerivation rec { + pname = "libfprint-focaltech-2808-a658"; + version = "1.94.4"; + # https://gitlab.freedesktop.org/libfprint/libfprint/-/merge_requests/413#note_2476573 + src = fetchurl { + url = "https://github.com/ftfpteams/RTS5811-FT9366-fingerprint-linux-driver-with-VID-2808-and-PID-a658/raw/b040ccd953c27e26c1285c456b4264e70b36bc3f/libfprint-2-2-${version}+tod1-FT9366_20240627.x86_64.rpm"; + hash = "sha256-MRWHwBievAfTfQqjs1WGKBnht9cIDj9aYiT3YJ0/CUM="; + }; + + nativeBuildInputs = [ + rpm + cpio + pkg-config + autoPatchelfHook + copyPkgconfigItems + ]; + + buildInputs = [ + stdenv.cc.cc + glib + gusb + pixman + nss + libgudev + libfprint + cairo + ]; + + unpackPhase = '' + runHook preUnpack + + rpm2cpio $src | cpio -idmv + + runHook postUnpack + ''; + + # custom pkg-config based on libfprint's pkg-config + pkgconfigItems = [ + (makePkgconfigItem rec { + name = "libfprint-2"; + inherit version; + inherit (meta) description; + cflags = [ "-I${variables.includedir}/libfprint-2" ]; + libs = [ + "-L${variables.libdir}" + "-lfprint-2" + ]; + variables = rec { + prefix = "${placeholder "out"}"; + includedir = "${prefix}/include"; + libdir = "${prefix}/lib"; + }; + }) + ]; + + installPhase = '' + runHook preInstall + + install -Dm444 usr/lib64/${libso} -t $out/lib + + # create this symlink as it was there in libfprint + ln -s -T $out/lib/${libso} $out/lib/libfprint-2.so + ln -s -T $out/lib/${libso} $out/lib/libfprint-2.so.2 + + # get files from libfprint required to build the package + cp -r ${libfprint}/lib/girepository-1.0 $out/lib + cp -r ${libfprint}/include $out + + runHook postInstall + ''; + + meta = { + description = "Focaltech Fingerprint driver for focaltech 0x2808:0xa658"; + homepage = "https://github.com/ftfpteams/RTS5811-FT9366-fingerprint-linux-driver-with-VID-2808-and-PID-a658"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.imsick ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + }; +} From 717248d7283b98c0ab5d5f67cff1ceaffbdd81be Mon Sep 17 00:00:00 2001 From: Brian McGee Date: Fri, 8 Nov 2024 21:20:21 +0000 Subject: [PATCH 612/617] treefmt2: 2.0.5 -> 2.1.0 (#354455) --- pkgs/by-name/tr/treefmt2/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tr/treefmt2/package.nix b/pkgs/by-name/tr/treefmt2/package.nix index ca5b0445ab23..659ba98707d0 100644 --- a/pkgs/by-name/tr/treefmt2/package.nix +++ b/pkgs/by-name/tr/treefmt2/package.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "treefmt"; - version = "2.0.5"; + version = "2.1.0"; src = fetchFromGitHub { owner = "numtide"; repo = "treefmt"; rev = "v${version}"; - hash = "sha256-lDQbrq9AWH5Hjgy5AllbLLBUl/JkYGw68M5wob14kus="; + hash = "sha256-I97mCxQMPq6fV0GD9gVbtQ/i/Sju9/+ZazbkbGqy9Qw="; }; - vendorHash = "sha256-OyOgTBwcRNd6kdnn3TFuq7xukeK0A1imK/WMer0tldk="; + vendorHash = "sha256-PiH+FMSPeTFwS6cMgZX8Uy2bjZnQ+APqL5d7FMnqR9U="; subPackages = [ "." ]; From 317f7f1a4c599086cac578ba6e29369497fbcec6 Mon Sep 17 00:00:00 2001 From: Valentin Gagarin Date: Fri, 8 Nov 2024 22:38:34 +0100 Subject: [PATCH 613/617] docs: make sample code valid Nix expressions --- lib/fixed-points.nix | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix index ccc897755c11..1de5351d95aa 100644 --- a/lib/fixed-points.nix +++ b/lib/fixed-points.nix @@ -160,7 +160,9 @@ rec { A fixed-point function returning an attribute set has the form ```nix - final: { # attributes } + final: { + # attributes + } ``` where `final` refers to the lazily evaluated attribute set returned by the fixed-point function. @@ -168,7 +170,9 @@ rec { An overlay to such a fixed-point function has the form ```nix - final: prev: { # attributes } + final: prev: { + # attributes + } ``` where `prev` refers to the result of the original function to `final`, and `final` is the result of the composition of the overlay and the original function. @@ -177,8 +181,12 @@ rec { ```nix let - f = final: { # attributes }; - overlay = final: prev: { # attributes }; + f = final: { + # attributes + }; + overlay = final: prev: { + # attributes + }; in extends overlay f; ``` @@ -186,8 +194,12 @@ rec { ```nix let - f = final: { # attributes }; - overlay = final: prev: { # attributes }; + f = final: { + # attributes + }; + overlay = final: prev: { + # attributes + }; g = extends overlay f; in fix g ``` From 4209bebed841f4d9fba68afc963140e85aa674cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Nov 2024 22:31:26 +0000 Subject: [PATCH 614/617] python312Packages.stookwijzer: 1.4.10 -> 1.5.0 --- pkgs/development/python-modules/stookwijzer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stookwijzer/default.nix b/pkgs/development/python-modules/stookwijzer/default.nix index 6a2cb56f1161..9da9317464f8 100644 --- a/pkgs/development/python-modules/stookwijzer/default.nix +++ b/pkgs/development/python-modules/stookwijzer/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "stookwijzer"; - version = "1.4.10"; + version = "1.5.0"; pyproject = true; src = fetchFromGitHub { owner = "fwestenberg"; repo = "stookwijzer"; rev = "refs/tags/v${version}"; - hash = "sha256-uvmv35rdmqfr+psGQdnb3g2q72qCx4ew3gJdGeun6W8="; + hash = "sha256-QZyuzOAz/VAThgZdhOGeOLvC+2wtp1mgCXzIekBm/Xs="; }; build-system = [ setuptools ]; From 9c075c8fa5de1ebdcf1ebfb5eb1126ea61a6c2cb Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 1 Nov 2024 16:18:01 +0100 Subject: [PATCH 615/617] gnat: 12.4.0 -> 13.3.0 This matches the default gcc version. --- nixos/doc/manual/release-notes/rl-2411.section.md | 3 +++ pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index d75a03e41ab9..49e981355581 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -245,6 +245,9 @@ Also be aware that if you have set additional options in `services.wstunnel.{clients,servers}..extraArgs`, they may have been modified or removed upstream. +- `gnat` and `gnatPackages` now use GNAT 13 instead of GNAT 12. This matches + the default `gcc` version. + - `percona-server_8_4` and `mysql84` now have password authentication via the deprecated `mysql_native_password` disabled by default. This authentication plugin can be enabled via a CLI argument again, for detailed instructions and alternative authentication methods [see upstream documentation](https://dev.mysql.com/doc/refman/8.4/en/native-pluggable-authentication.html). The config file directive `default_authentication_plugin` has been removed. - Percona has decided not to follow the LTS/ Innovation release scheme of upstream MySQL and thus [will only create releases for MySQL LTS versions](https://www.percona.com/blog/no-mysql-9-x-innovation-releases-from-percona/). Hence, the package names `percona-server_lts`, `percona-server_innovation`, `percona-xtrabackup_lts` and `percona-xtrabackup_innovation` are deprecated. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index feb6b38faef3..f199f58a0e66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14491,7 +14491,7 @@ with pkgs; enableLTO = false; }; - gnat = gnat12; # When changing this, update also gnatPackages + gnat = gnat13; # When changing this, update also gnatPackages gnat11 = wrapCC (gcc11.cc.override { name = "gnat"; @@ -14596,7 +14596,7 @@ with pkgs; gnat12Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat12; }); gnat13Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat13; }); gnat14Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat14; }); - gnatPackages = gnat12Packages; + gnatPackages = gnat13Packages; inherit (gnatPackages) gprbuild From 171e7de37e185876c9e6ba3b23f8c89a43c5fd02 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sat, 9 Nov 2024 01:51:17 +0000 Subject: [PATCH 616/617] kanidm: 1.4.1 -> 1.4.2 https://github.com/kanidm/kanidm/releases/tag/v1.4.2 --- pkgs/by-name/ka/kanidm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ka/kanidm/package.nix b/pkgs/by-name/ka/kanidm/package.nix index 6e0de068a7f9..710400154f25 100644 --- a/pkgs/by-name/ka/kanidm/package.nix +++ b/pkgs/by-name/ka/kanidm/package.nix @@ -28,16 +28,16 @@ let in rustPlatform.buildRustPackage rec { pname = "kanidm"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cL1XV9UeoRxl7RPZzeeLtgyNjXxeFwpzapnuS292yc4="; + hash = "sha256-vKllSbJ44cO3FFIaf8rkhvKAVa2NG1Ps06VTzpi9xj0="; }; - cargoHash = "sha256-c6HeE0971mBIN9NR7knu8SN0Z2W/u1rvIsE6ZCiHBEs="; + cargoHash = "sha256-1mZm39l11eUjAGe0Oi9Mz94cb7DurfvUjCH5+GnA2Z0="; KANIDM_BUILD_PROFILE = "release_nixos_${arch}"; From 7234221a0ea3a5437a0920e29dd32ec377a8f699 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 9 Nov 2024 03:27:30 +0100 Subject: [PATCH 617/617] python312Packages.homeassistant-stubs: 2024.11.0 -> 2024.11.1 https://github.com/KapJI/homeassistant-stubs/releases/tag/2024.11.1 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 44cff2d2d7ba..0e6ca0d74c1d 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.11.0"; + version = "2024.11.1"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-ktKmYr5wzrmZoedK2FB1qFcqt3NGKzXcL7f1j2/K6vc="; + hash = "sha256-6Av1LSzmgjJonXlRFMrzdvGDm6latErBxCmgYlCDZ28="; }; build-system = [