From a9b277d7342693e97c6a591d1391b73da35c63ec Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sun, 18 Aug 2024 01:07:49 +0800 Subject: [PATCH 001/100] python3Packages.pycolorecho: init at 0.1.1 --- .../python-modules/pycolorecho/default.nix | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/pycolorecho/default.nix diff --git a/pkgs/development/python-modules/pycolorecho/default.nix b/pkgs/development/python-modules/pycolorecho/default.nix new file mode 100644 index 000000000000..91d29555800d --- /dev/null +++ b/pkgs/development/python-modules/pycolorecho/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "pycolorecho"; + version = "0.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "coldsofttech"; + repo = "pycolorecho"; + rev = version; + hash = "sha256-h/7Wi0x8iLMZpPYekK6W9LTM+2nYJTaKClNtRTzbmdg="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pycolorecho" ]; + + meta = { + description = "Simple Python package for colorized terminal output"; + homepage = "https://github.com/coldsofttech/pycolorecho"; + changelog = "https://github.com/coldsofttech/pycolorecho/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ShamrockLee ]; + }; +} From 3b9e993adb4f3c463d1a8131d61f373d75d2a067 Mon Sep 17 00:00:00 2001 From: Anthony Rodriguez Date: Mon, 2 Sep 2024 15:07:16 +0200 Subject: [PATCH 002/100] maintainers: add nezia --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 493e2848ddf0..0327afbfff7c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14660,6 +14660,12 @@ githubId = 7845120; name = "Alex Martens"; }; + nezia = { + email = "anthony@nezia.dev"; + github = "nezia1"; + githubId = 43719748; + name = "Anthony Rodriguez"; + }; ngerstle = { name = "Nicholas Gerstle"; email = "ngerstle@gmail.com"; From 0f3f5456236487d3ad9d0565d45e5711cb031709 Mon Sep 17 00:00:00 2001 From: Nate Eagleson Date: Mon, 11 Nov 2024 14:55:30 -0500 Subject: [PATCH 003/100] maintainers: add nateeag --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 44b7464cee3b..bb7c477d4af4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15198,6 +15198,12 @@ githubId = 93013864; name = "nat-418"; }; + nateeag = { + github = "NateEag"; + githubId = 837719; + name = "Nate Eagleson"; + email = "nate@nateeag.com"; + }; nathan-gs = { email = "nathan@nathan.gs"; github = "nathan-gs"; From 095b8a3af886ff9e8f9e1b04955b44163ddc031d Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 20 Nov 2024 16:54:13 +0100 Subject: [PATCH 004/100] reuse: 4.0.3 -> 5.0.2 https://github.com/fsfe/reuse-tool/releases/tag/v5.0.0 https://github.com/fsfe/reuse-tool/releases/tag/v5.0.1 https://github.com/fsfe/reuse-tool/releases/tag/v5.0.2 --- pkgs/development/python-modules/reuse/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reuse/default.nix b/pkgs/development/python-modules/reuse/default.nix index 277933b3c358..19ce6386b45e 100644 --- a/pkgs/development/python-modules/reuse/default.nix +++ b/pkgs/development/python-modules/reuse/default.nix @@ -13,6 +13,7 @@ attrs, binaryornot, boolean-py, + click, debian, jinja2, license-expression, @@ -25,14 +26,14 @@ buildPythonPackage rec { pname = "reuse"; - version = "4.0.3"; + version = "5.0.2"; pyproject = true; src = fetchFromGitHub { owner = "fsfe"; repo = "reuse-tool"; rev = "refs/tags/v${version}"; - hash = "sha256-oKtQBT8tuAk4S/Sygp4qxLk4ADWDTG0MbVaL5O2qsuA="; + hash = "sha256-MzI3AY5WLNyCLJZM7Q5wUH3ttx+FHPlSgAfngzOgzec="; }; outputs = [ @@ -54,6 +55,7 @@ buildPythonPackage rec { attrs binaryornot boolean-py + click debian jinja2 license-expression From 216c6f28d9c896913511773c8e0f05432a5ae3b0 Mon Sep 17 00:00:00 2001 From: Peter Frank Date: Mon, 25 Nov 2024 09:46:39 +0100 Subject: [PATCH 005/100] surrealist: 2.1.6 -> 3.0.8 --- pkgs/by-name/su/surrealist/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/su/surrealist/package.nix b/pkgs/by-name/su/surrealist/package.nix index 453c3107c393..c205bb4d9a7e 100644 --- a/pkgs/by-name/su/surrealist/package.nix +++ b/pkgs/by-name/su/surrealist/package.nix @@ -40,13 +40,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "surrealist"; - version = "2.1.6"; + version = "3.0.8"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealist"; rev = "surrealist-v${finalAttrs.version}"; - hash = "sha256-jOjOdrVOcGPenFW5mkkXKA64C6c+/f9KzlvtUmw6vXc="; + hash = "sha256-46CXldjhWc7H6wdKfMK2IlmBqfe0QHi/J1uFhbV42HY="; }; # HACK: A dependency (surrealist -> tauri -> **reqwest**) contains hyper-tls @@ -61,14 +61,14 @@ in stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) patches src; - sourceRoot = finalAttrs.cargoRoot; - name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-LtQS0kH+2P4odV7BJYiH6T51+iZHAM9W9mV96rNfNWs="; + sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; + hash = "sha256-HmdEcjgxPyRsQqhU0P/C3KVgwZsSvfHjyzj0OHKe5jY"; + patchFlags = [ "-p2" ]; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-Y14wBYiAsctMf4Ljt7G/twGEQP2nCSDQZVG8otImnIE="; + hash = "sha256-uBDbBfWC9HxxzY1x4+rNo87D5C1zZa2beFLa5NkLs80="; }; nativeBuildInputs = [ From 2cded1ab8dbbbdf27a448dbcac94a101662d279b Mon Sep 17 00:00:00 2001 From: mangoiv Date: Mon, 25 Nov 2024 10:21:20 +0100 Subject: [PATCH 006/100] polarity: add nix-update updatescript --- pkgs/by-name/po/polarity/package.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix index 7ae41d90317d..f3917488f5a4 100644 --- a/pkgs/by-name/po/polarity/package.nix +++ b/pkgs/by-name/po/polarity/package.nix @@ -1,6 +1,8 @@ -{ lib -, fetchFromGitHub -, rustPlatform +{ + lib, + fetchFromGitHub, + rustPlatform, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -16,14 +18,21 @@ rustPlatform.buildRustPackage rec { cargoLock = { lockFile = ./Cargo.lock; - outputHashes = { "codespan-0.11.1" = "sha256-Wq99v77bqSGIOK/iyv+x/EG1563XSeaTDW5K2X3kSXU="; }; + outputHashes = { + "codespan-0.11.1" = "sha256-Wq99v77bqSGIOK/iyv+x/EG1563XSeaTDW5K2X3kSXU="; + }; }; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + meta = { description = "A Language with Dependent Data and Codata Types"; homepage = "https://polarity-lang.github.io/"; changelog = "https://github.com/polarity-lang/polarity/blob/${src.rev}/CHANGELOG.md"; - license = with lib.licenses; [ mit asl20 ]; + license = with lib.licenses; [ + mit + asl20 + ]; maintainers = [ lib.maintainers.mangoiv ]; mainProgram = "pol"; platforms = lib.platforms.all; From 1276771ea7f1533be13af78089b7d94a4e7ed2c4 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Tue, 29 Oct 2024 12:51:09 +0100 Subject: [PATCH 007/100] vulkan-cts: 1.3.9.0 -> 1.3.10.0 Changelog: https://github.com/KhronosGroup/VK-GL-CTS/releases/tag/vulkan-cts-1.3.10.0 --- pkgs/tools/graphics/vulkan-cts/default.nix | 4 ++-- pkgs/tools/graphics/vulkan-cts/sources.nix | 24 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/graphics/vulkan-cts/default.nix b/pkgs/tools/graphics/vulkan-cts/default.nix index 885a17e7a694..7907b9cc67ed 100644 --- a/pkgs/tools/graphics/vulkan-cts/default.nix +++ b/pkgs/tools/graphics/vulkan-cts/default.nix @@ -43,13 +43,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "vulkan-cts"; - version = "1.3.9.0"; + version = "1.3.10.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "VK-GL-CTS"; rev = "vulkan-cts-${finalAttrs.version}"; - hash = "sha256-JCepNBVHaN4KXRcLOZ2z7toBMri90tV7kjNWHRXRESE="; + hash = "sha256-owa4Z/gu9+plPxeSfduS3gUk9WTOHSDoXLTBju6tTGc="; }; prePatch = '' diff --git a/pkgs/tools/graphics/vulkan-cts/sources.nix b/pkgs/tools/graphics/vulkan-cts/sources.nix index 9e0ed7502ce7..3b61e9776865 100644 --- a/pkgs/tools/graphics/vulkan-cts/sources.nix +++ b/pkgs/tools/graphics/vulkan-cts/sources.nix @@ -4,15 +4,15 @@ rec { amber = fetchFromGitHub { owner = "google"; repo = "amber"; - rev = "0f003c2785489f59cd01bb2440fcf303149100f2"; - hash = "sha256-Q3LP8hQrKeM8J0qmJyTeC8Hq949Fe0wOjnkiia+UDag="; + rev = "67fea651b886460d7b72295e680528c059bbbe40"; + hash = "sha256-oDN7UdyfNMG4r36nnRJmYdbd0wyd1titGQQNa9e/3tU="; }; glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "b9b8fd917b195f680a1ce3f3f663c03e1c82579d"; - hash = "sha256-85kHk1KqhhOqLodRVVpQMhE44IQnzLoFXf/YPNY8aUI="; + rev = "c5b76b78c9dec95251e9c1840a671e19bf61abe3"; + hash = "sha256-N7vGPqQieWnr+mbrmdbvzz7n9q3bbRKLxkYt6OiaJvU="; }; jsoncpp = fetchFromGitHub { @@ -32,29 +32,29 @@ rec { spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "4f7b471f1a66b6d06462cd4ba57628cc0cd087d7"; - hash = "sha256-CAmDDqeMVKNdV/91VQYAKyCc+e+H99PRYZzt5WjswBI="; + rev = "2a9b6f951c7d6b04b6c21fe1bf3f475b68b84801"; + hash = "sha256-o1yRTvP7a+XVwendTKBJKNnelVGWLD0gH258GGeUDhQ="; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "dd4b663e13c07fea4fbb3f70c1c91c86731099f7"; - hash = "sha256-at3krE0torhjg7G+NkX0/ewc26Sg/1t2xW7wghAAuZo="; + rev = "44936c4a9d42f1c67e34babb5792adf5bce7f76b"; + hash = "sha256-kSiP94hMlblFod2mQhlAQDAENGOvBh7v8bCxxaiYWq4="; }; vulkan-docs = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Docs"; - rev = "dedb71a7edc6d5af3f9bfd5e2ef53814de999ef7"; - hash = "sha256-A61qx7sdcRipX4mHpGJVhd9Qlcv1xcjeGGnfyblMxUg="; + rev = "486e4b289053a7d64784e7ce791711843c60c235"; + hash = "sha256-LGAHUeWF9X6Li1HcdD14pgnBUquWxA+bQpAL09JmwLQ="; }; vulkan-validationlayers = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; - rev = "f589bc456545fbab97caf49380b102b8aafe1f40"; - hash = "sha256-ZNJGGrUwTw3I0MQl9nKqGhb2bdPZZl+AR3YH3T+cn+c="; + rev = "9a46ae006fa5c92e2d2af7944187f7794210844b"; + hash = "sha256-qVQy3kKkZRWHjtj2YxJTZqKg1kwnmLa3bgVathisfOc="; }; From cfb258343f5e6e1807a242f513017a96cc8a3e61 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 27 Nov 2024 20:39:33 +0800 Subject: [PATCH 008/100] alda: nixfmt --- pkgs/by-name/al/alda/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/al/alda/package.nix b/pkgs/by-name/al/alda/package.nix index f9711c16a573..ca93785ef612 100644 --- a/pkgs/by-name/al/alda/package.nix +++ b/pkgs/by-name/al/alda/package.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre }: +{ + lib, + stdenv, + fetchurl, + makeWrapper, + jre, +}: stdenv.mkDerivation rec { pname = "alda"; From 9f2c121124ba78064edb4f8bdf01ebad48c6f498 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 27 Nov 2024 20:40:51 +0800 Subject: [PATCH 009/100] alda: 2.2.3 -> 2.3.1 --- pkgs/by-name/al/alda/package.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/al/alda/package.nix b/pkgs/by-name/al/alda/package.nix index ca93785ef612..9dd53d82834a 100644 --- a/pkgs/by-name/al/alda/package.nix +++ b/pkgs/by-name/al/alda/package.nix @@ -6,18 +6,18 @@ jre, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "alda"; - version = "2.2.3"; + version = "2.3.1"; src_alda = fetchurl { - url = "https://alda-releases.nyc3.digitaloceanspaces.com/${version}/client/linux-amd64/alda"; - hash = "sha256-cyOAXQ3ITIgy4QusjdYBNmNIzB6BzfbQEypvJbkbvWo="; + url = "https://alda-releases.nyc3.digitaloceanspaces.com/${finalAttrs.version}/client/linux-amd64/alda"; + hash = "sha256-m4d3cLgqWmGMw0SM4J+7nvV/ytSoB7obMDiJCh3yboQ="; }; src_player = fetchurl { - url = "https://alda-releases.nyc3.digitaloceanspaces.com/${version}/player/non-windows/alda-player"; - hash = "sha256-HsX0mNWrusL2FaK2oK8xhmr/ai+3ZiMmrJk7oS3b93g="; + url = "https://alda-releases.nyc3.digitaloceanspaces.com/${finalAttrs.version}/player/non-windows/alda-player"; + hash = "sha256-XwgOidQjnMClXPIS1JPzsVJ6c7vXwBHBAfUPX3WL8uU="; }; dontUnpack = true; @@ -29,18 +29,18 @@ stdenv.mkDerivation rec { binPath = lib.makeBinPath [ jre ]; in '' - install -D $src_alda $out/bin/alda - install -D $src_player $out/bin/alda-player + install -D ${finalAttrs.src_alda} $out/bin/alda + install -D ${finalAttrs.src_player} $out/bin/alda-player wrapProgram $out/bin/alda --prefix PATH : $out/bin:${binPath} wrapProgram $out/bin/alda-player --prefix PATH : $out/bin:${binPath} ''; - meta = with lib; { + meta = { description = "Music programming language for musicians"; homepage = "https://alda.io"; - license = licenses.epl10; - maintainers = [ maintainers.ericdallo ]; + license = lib.licenses.epl10; + maintainers = [ lib.maintainers.ericdallo ]; platforms = jre.meta.platforms; }; -} +}) From d35845f8f8ba8abaebe1011e8dbe882126606958 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Fri, 29 Nov 2024 02:13:44 +0800 Subject: [PATCH 010/100] mihomo-party: 1.4.5 -> 1.5.12 --- pkgs/by-name/mi/mihomo-party/package.nix | 36 ++++++++++++++++++------ 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix index 1a879e408e93..8c46298a4005 100644 --- a/pkgs/by-name/mi/mihomo-party/package.nix +++ b/pkgs/by-name/mi/mihomo-party/package.nix @@ -15,15 +15,31 @@ libGL, }: let - pname = "mihomo-party"; - version = "1.4.5"; - src = fetchurl { - url = "https://github.com/mihomo-party-org/mihomo-party/releases/download/v${version}/mihomo-party-linux-${version}-amd64.deb"; - hash = "sha256-O332nt2kgpDGY84S78Tx2PGUw1Pyj80ab2ZE3woYm4Y="; - }; + version = "1.5.12"; + src = + let + inherit (stdenv.hostPlatform) system; + selectSystem = attrs: attrs.${system}; + suffix = selectSystem { + x86_64-linux = "amd64"; + aarch64-linux = "arm64"; + }; + hash = selectSystem { + x86_64-linux = "sha256-1vJ2FcJOcpNyfSm5HyLkexsULBBPlI0AW2jXuhK8khA="; + aarch64-linux = "sha256-P+zCO6HxcQJAGIVxOSRga+1Bqtn31mw2v+/EyEDpgF8="; + }; + in + fetchurl { + url = "https://github.com/mihomo-party-org/mihomo-party/releases/download/v${version}/mihomo-party-linux-${version}-${suffix}.deb"; + inherit hash; + }; in stdenv.mkDerivation { - inherit pname version src; + inherit version src; + + pname = "mihomo-party"; + + passthru.updateScript = ./update.sh; nativeBuildInputs = [ dpkg @@ -70,8 +86,10 @@ stdenv.mkDerivation { description = "Another Mihomo GUI"; homepage = "https://github.com/mihomo-party-org/mihomo-party"; mainProgram = "mihomo-party"; - platforms = with lib.platforms; linux ++ darwin; - broken = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64); + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; license = lib.licenses.gpl3Plus; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with lib.maintainers; [ aucub ]; From 3df9613e1620d1043189ce0b30d6413ec5fe05b7 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Fri, 29 Nov 2024 02:34:33 +0800 Subject: [PATCH 011/100] mihomo-party: add update script --- pkgs/by-name/mi/mihomo-party/update.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100755 pkgs/by-name/mi/mihomo-party/update.sh diff --git a/pkgs/by-name/mi/mihomo-party/update.sh b/pkgs/by-name/mi/mihomo-party/update.sh new file mode 100755 index 000000000000..380b997c2512 --- /dev/null +++ b/pkgs/by-name/mi/mihomo-party/update.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash nixVersions.latest curl coreutils jq common-updater-scripts + +latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/mihomo-party-org/mihomo-party/releases/latest | jq -r ".tag_name") +latestVersion="$(expr "$latestTag" : 'v\(.*\)')" +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; mihomo-party.version" | tr -d '"') + +echo "latest version: $latestVersion" +echo "current version: $currentVersion" + +if [[ "$latestVersion" == "$currentVersion" ]]; then + echo "package is up-to-date" + exit 0 +fi + +for i in \ + "x86_64-linux amd64" \ + "aarch64-linux arm64"; do + set -- $i + prefetch=$(nix-prefetch-url "https://github.com/mihomo-party-org/mihomo-party/releases/download/v$latestVersion/mihomo-party-linux-$latestVersion-$2.deb") + hash=$(nix hash convert --hash-algo sha256 --to sri $prefetch) + update-source-version mihomo-party $latestVersion $hash --system=$1 --ignore-same-version +done From 747ce40fe2980f720e9745915984fb71a38a0b3d Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Fri, 29 Nov 2024 10:58:35 -0500 Subject: [PATCH 012/100] cirrus-cli: 0.132.0 -> 0.133.0 Diff: https://github.com/cirruslabs/cirrus-cli/compare/v0.132.0...v0.133.0 --- pkgs/by-name/ci/cirrus-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/cirrus-cli/package.nix b/pkgs/by-name/ci/cirrus-cli/package.nix index 946bf84ae8c2..a2c65797ad23 100644 --- a/pkgs/by-name/ci/cirrus-cli/package.nix +++ b/pkgs/by-name/ci/cirrus-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.132.0"; + version = "0.133.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = "cirrus-cli"; rev = "v${version}"; - hash = "sha256-juDe/Dw8tdVoz5F1bGGQMwZYz9HbQaQ0xZo8LqD03RA="; + hash = "sha256-uID2rHHsYYfGBDi4bg19G3Em0ztWGe5goBj1hIdAMkE="; }; vendorHash = "sha256-+OMhaAGA+pmiDUyXDo9UfQ0SFEAN9zuNZjnLkgr7a+0="; From 1441fa7fbe5150c66a89bfae919bcfeb35867450 Mon Sep 17 00:00:00 2001 From: Nicholas Sielicki Date: Fri, 29 Nov 2024 20:57:44 -0800 Subject: [PATCH 013/100] linuxPackages.ena: add updateScript Signed-off-by: Nicholas Sielicki --- pkgs/os-specific/linux/ena/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index 6e6e5d7444cc..cd58ce9296b9 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -2,17 +2,21 @@ lib, stdenv, fetchFromGitHub, + gitUpdater, kernel, }: - -stdenv.mkDerivation rec { +let + rev-prefix = "ena_linux_"; version = "2.13.0"; +in +stdenv.mkDerivation { + inherit version; name = "ena-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "amzn"; repo = "amzn-drivers"; - rev = "ena_linux_${version}"; + rev = "${rev-prefix}${version}"; hash = "sha256-uYWKu9M/5PcHV4WdMSi0f29S7KnQft67dgjdN0AS1d8="; }; @@ -40,6 +44,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = gitUpdater { + inherit rev-prefix; + }; + meta = with lib; { description = "Amazon Elastic Network Adapter (ENA) driver for Linux"; homepage = "https://github.com/amzn/amzn-drivers"; From fb56d1e4a7dac4486eaf7b302892cabd0cbf3c2f Mon Sep 17 00:00:00 2001 From: Nicholas Sielicki Date: Fri, 29 Nov 2024 22:55:26 -0800 Subject: [PATCH 014/100] linuxPackages.ena: bump 2.13.0 -> 2.13.1 Signed-off-by: Nicholas Sielicki --- pkgs/os-specific/linux/ena/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index cd58ce9296b9..8062b2ccb5de 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -7,7 +7,7 @@ }: let rev-prefix = "ena_linux_"; - version = "2.13.0"; + version = "2.13.1"; in stdenv.mkDerivation { inherit version; @@ -17,7 +17,7 @@ stdenv.mkDerivation { owner = "amzn"; repo = "amzn-drivers"; rev = "${rev-prefix}${version}"; - hash = "sha256-uYWKu9M/5PcHV4WdMSi0f29S7KnQft67dgjdN0AS1d8="; + hash = "sha256-oFeTaulcnp9U7Zxhf08yNxpEtyxjI5QJmfITHVHDES0="; }; hardeningDisable = [ "pic" ]; From 9b9c3d1974815cf08467570adaead79be6a1fc6f Mon Sep 17 00:00:00 2001 From: Kristian Nedrevold-Hansen Date: Sat, 30 Nov 2024 12:02:27 +0100 Subject: [PATCH 015/100] bleep 0.0.9 -> 0.0.11 release notes: - https://github.com/oyvindberg/bleep/releases/tag/v0.0.11 - https://github.com/oyvindberg/bleep/releases/tag/v0.0.10 --- pkgs/by-name/bl/bleep/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/bl/bleep/package.nix b/pkgs/by-name/bl/bleep/package.nix index a209372f64ab..b435c8e2eb8f 100644 --- a/pkgs/by-name/bl/bleep/package.nix +++ b/pkgs/by-name/bl/bleep/package.nix @@ -19,15 +19,15 @@ let hash = { - x86_64-linux = "sha256-Tp354ecJAZfTRrg1Rmot7nFGYfcp0ZBEn/ygTRkCBCM="; - x86_64-darwin = "sha256-1tgFHdbrGGVofhSxJIw1oXkI6q5SJvN8L9bqRyj75j8="; - aarch64-darwin = "sha256-UB0SoUwg9C8F8F2/CTKVNcqAofHkU7Rop04mMwBSIyY="; + x86_64-linux = "sha256-Y9vWtuv1eyrPmJn/XpAw4uDHxhLUdhKszwJZmMIOCqI="; + x86_64-darwin = "sha256-p8Y6XKHb/CmRcnQ7po3s3oUZh0f+1iIHk38sAu2qym8="; + aarch64-darwin = "sha256-Qfqeo5syprwtLoNdi/EwsI+EYdpKkkVlFVja8uIFDsM="; } ."${stdenvNoCC.system}" or (throw "unsupported system ${stdenvNoCC.hostPlatform.system}"); in stdenvNoCC.mkDerivation (finalAttrs: { pname = "bleep"; - version = "0.0.9"; + version = "0.0.11"; src = fetchzip { url = "https://github.com/oyvindberg/bleep/releases/download/v${finalAttrs.version}/bleep-${platform}.tar.gz"; From 8ba40fdd4fae1edd4d725a53c04401d1f0d8b2a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20=C5=BDlender?= Date: Wed, 20 Nov 2024 22:51:15 +0100 Subject: [PATCH 016/100] lib: add defaultTo --- lib/default.nix | 2 +- lib/trivial.nix | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/lib/default.nix b/lib/default.nix index aff1df150f13..48574ab3e4a2 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -71,7 +71,7 @@ let # these are the only ones that are currently not inherit (builtins) addErrorContext isPath trace typeOf unsafeGetAttrPos; inherit (self.trivial) id const pipe concat or and xor bitAnd bitOr bitXor - bitNot boolToString mergeAttrs flip mapNullable inNixShell isFloat min max + bitNot boolToString mergeAttrs flip defaultTo mapNullable inNixShell isFloat min max importJSON importTOML warn warnIf warnIfNot throwIf throwIfNot checkListOfEnum info showWarnings nixpkgsVersion version isInOldestRelease oldestSupportedReleaseIsAtLeast mod compare splitByAndCompare seq deepSeq lessThan add sub diff --git a/lib/trivial.nix b/lib/trivial.nix index 04fb9ffd4618..0e196018961c 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -316,6 +316,40 @@ in { */ flip = f: a: b: f b a; + /** + Return `maybeValue` if not null, otherwise return `default`. + + + # Inputs + + `default` + + : 1\. Function argument + + `maybeValue` + + : 2\. Function argument + + + # Examples + :::{.example} + ## `lib.trivial.defaultTo` usage example + + ```nix + defaultTo "default" null + => "default" + defaultTo "default" "foo" + => "foo" + defaultTo "default" false + => false + ``` + + ::: + */ + defaultTo = default: maybeValue: + if maybeValue != null then maybeValue + else default; + /** Apply function if the supplied argument is non-null. From 3097041404ec5505a03c16990b9c1508146c85b6 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 2 Dec 2024 01:45:54 +0100 Subject: [PATCH 017/100] obs-studio: fix lossless audio support Adds patch from upstream to fix lossless audio support due to an incompatibility with ffmpeg 7.1. Fixes #356683. --- pkgs/applications/video/obs-studio/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index ebe293597606..5dff164084de 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -95,6 +95,13 @@ stdenv.mkDerivation (finalAttrs: { stripLen = 1; hash = "sha256-7SDBRr9G40b9DfbgdaYJxTeiDSLUfVixtMtM3cLTVZs="; }) + + # Fix lossless audio, ffmpeg 7,1 compatibility issue + (fetchpatch { + name = "fix-lossless-audio.patch"; + url = "https://github.com/obsproject/obs-studio/commit/dfc3a69c5276edf84c933035ff2a7e278fa13c9a.patch"; + hash = "sha256-wiF3nolBpZKp7LR7NloNfJ+v4Uq/nBgwCVoKZX+VEMA="; + }) ]; nativeBuildInputs = [ From 303d8c4631a556f9ec32eb0d9ba331d71f9186a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Dec 2024 00:54:20 +0000 Subject: [PATCH 018/100] libmediainfo: 24.06 -> 24.11 --- pkgs/by-name/li/libmediainfo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libmediainfo/package.nix b/pkgs/by-name/li/libmediainfo/package.nix index 4f433e9b6f14..e6855bd2d0e6 100644 --- a/pkgs/by-name/li/libmediainfo/package.nix +++ b/pkgs/by-name/li/libmediainfo/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmediainfo"; - version = "24.06"; + version = "24.11"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - hash = "sha256-BoPyiiR13CQXIFulKN68zEB9pNn6ZRbrS3Wz/3JE6W4="; + hash = "sha256-luRKYX+QyLY7toWtU75nFrffQiF5PDKXgPAq6m5weqE="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 1588344e2b22ee8dbf9531abea3bff18e131776d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Dec 2024 01:01:01 +0000 Subject: [PATCH 019/100] mediainfo: 24.06 -> 24.11.1 --- pkgs/by-name/me/mediainfo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/mediainfo/package.nix b/pkgs/by-name/me/mediainfo/package.nix index d0df9a933e93..88bb3edfa44b 100644 --- a/pkgs/by-name/me/mediainfo/package.nix +++ b/pkgs/by-name/me/mediainfo/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mediainfo"; - version = "24.06"; + version = "24.11.1"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - hash = "sha256-MvSoKjHjhuF3/fbkwjcFPkdbUBCJJpqyxylFKgkxNSA="; + hash = "sha256-FRBD/o1xmfEjBv3bwwtYoSlueaATrDgaKlfmO9YLy9E="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From f73975a6e3425905d9e409b2f41a2c3efeb69141 Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 4 Dec 2024 04:08:55 +0000 Subject: [PATCH 020/100] diesel-cli: 2.2.5 -> 2.2.6 Changelog: https://github.com/diesel-rs/diesel/releases/tag/v2.2.6 Diff: https://github.com/diesel-rs/diesel/compare/v2.2.5...v2.2.6 --- pkgs/by-name/di/diesel-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix index b4f721c5305d..55df1b18be23 100644 --- a/pkgs/by-name/di/diesel-cli/package.nix +++ b/pkgs/by-name/di/diesel-cli/package.nix @@ -27,15 +27,15 @@ assert lib.assertMsg (lib.elem true [ rustPlatform.buildRustPackage rec { pname = "diesel-cli"; - version = "2.2.5"; + version = "2.2.6"; src = fetchCrate { inherit version; crateName = "diesel_cli"; - hash = "sha256-cMGSBZ2UexIvSWRI2LIXR7thKciM9+HTB4V8FWpP3ZU="; + hash = "sha256-jKTQxlmpTlb0eITwNbnYfONknGhHsO/nzdup04ikEB0="; }; - cargoHash = "sha256-Qdi9zdBiaAWS0Ao/8Z1jrb07FLE92ETd7RCMd/7J+mI="; + cargoHash = "sha256-+QbCPHczxCkDOFo/PDFTK0xReCWoz8AiLNwXA3aG9N0="; nativeBuildInputs = [ installShellFiles From e032f3a2586281b31dd479803bbaa9fe95528370 Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 4 Dec 2024 00:53:22 -0500 Subject: [PATCH 021/100] diesel-cli: migrate to new darwin SDK pattern https://github.com/NixOS/nixpkgs/issues/354146 --- pkgs/by-name/di/diesel-cli/package.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix index 55df1b18be23..37b0afc49ebb 100644 --- a/pkgs/by-name/di/diesel-cli/package.nix +++ b/pkgs/by-name/di/diesel-cli/package.nix @@ -1,24 +1,24 @@ { lib, stdenv, + diesel-cli, fetchCrate, - rustPlatform, installShellFiles, - darwin, libiconv, libmysqlclient, nix-update-script, openssl, pkg-config, postgresql, + rustPlatform, sqlite, testers, zlib, - diesel-cli, sqliteSupport ? true, postgresqlSupport ? true, mysqlSupport ? true, }: + assert lib.assertMsg (lib.elem true [ postgresqlSupport mysqlSupport @@ -44,8 +44,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security - ++ lib.optional (stdenv.hostPlatform.isDarwin && mysqlSupport) libiconv ++ lib.optional sqliteSupport sqlite ++ lib.optional postgresqlSupport postgresql ++ lib.optionals mysqlSupport [ From ff5fcb8b18771ca889d58e410ab35c2568d971a5 Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 4 Dec 2024 04:13:42 +0000 Subject: [PATCH 022/100] passepartui: 0.1.4 -> 0.1.5 Changelog: https://github.com/kardwen/passepartui/releases/tag/v0.1.5 Diff: https://github.com/kardwen/passepartui/compare/v0.1.4...v0.1.5 --- pkgs/by-name/pa/passepartui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/passepartui/package.nix b/pkgs/by-name/pa/passepartui/package.nix index 82b0ea62d81f..2586029487af 100644 --- a/pkgs/by-name/pa/passepartui/package.nix +++ b/pkgs/by-name/pa/passepartui/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "passepartui"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "kardwen"; repo = "passepartui"; rev = "refs/tags/v${version}"; - hash = "sha256-ydX+Rjpfhi0K6f8pzjqWGF0O22gBco6Iot8fXSFNG5c="; + hash = "sha256-/rYdOurPlpGKCMAXTAhoWRn4NU3usPpJmef3f8V8EQA="; }; - cargoHash = "sha256-/lgEQ6PmHagt8TlGUV2A95MbV8IQzUwyQ/UkoaGIVHE="; + cargoHash = "sha256-8TmrsRbFC1TyoiUNVVTEdvDLj0BIJmqM00OoPLpaoFQ="; passthru = { updateScript = nix-update-script { }; From 49bb843df8118e599d90ed7124e09797368e6a5b Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 4 Dec 2024 15:30:55 +0800 Subject: [PATCH 023/100] temporal-cli: inherit version of tctl-next --- pkgs/by-name/te/temporal-cli/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/te/temporal-cli/package.nix b/pkgs/by-name/te/temporal-cli/package.nix index 2f13537432f2..99329977a708 100644 --- a/pkgs/by-name/te/temporal-cli/package.nix +++ b/pkgs/by-name/te/temporal-cli/package.nix @@ -101,7 +101,7 @@ let in symlinkJoin rec { pname = "temporal-cli"; - inherit (tctl) version; + inherit (tctl-next) version; name = "${pname}-${version}"; paths = [ From 5d012c002dfa4debdf0c012178bbe82679eb5d03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 08:07:33 +0000 Subject: [PATCH 024/100] python312Packages.llama-cloud: 0.1.4 -> 0.1.6 --- pkgs/development/python-modules/llama-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix index 1da515654a97..4a7322a5c9a7 100644 --- a/pkgs/development/python-modules/llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-cloud"; - version = "0.1.4"; + version = "0.1.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_cloud"; inherit version; - hash = "sha256-bwFVl5vZYWCVHLgSxIg28frOA3vHnM/Y0YWxjvTJ+vg="; + hash = "sha256-ISAPb91G4IRV00sTb2Rc5rjDgA4K4T2Ad5Excakh2lo="; }; build-system = [ poetry-core ]; From a0dfb5910dce09d0e92cd477847c345b8f9a16df Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Wed, 4 Dec 2024 09:09:13 +0100 Subject: [PATCH 025/100] dnf5: 5.2.7.0 -> 5.2.8.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/dn/dnf5/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dn/dnf5/package.nix b/pkgs/by-name/dn/dnf5/package.nix index f90845a56872..bc5e700c12c2 100644 --- a/pkgs/by-name/dn/dnf5/package.nix +++ b/pkgs/by-name/dn/dnf5/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "dnf5"; - version = "5.2.7.0"; + version = "5.2.8.0"; outputs = [ "out" @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "rpm-software-management"; repo = "dnf5"; rev = finalAttrs.version; - hash = "sha256-gKPC8nrEoayOGGrO+pk164w1xRuhrx74JcxJ1JDhOug="; + hash = "sha256-NazBI9u72np7P8pUqJ272wk7r+tZVXNr/EiMSFcoAvA="; }; nativeBuildInputs = From e9efed0f0c29c5139857ba6d2079348cb0a474f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 09:01:28 +0000 Subject: [PATCH 026/100] python312Packages.roadrecon: 1.5.0 -> 1.6.0 --- pkgs/development/python-modules/roadrecon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/roadrecon/default.nix b/pkgs/development/python-modules/roadrecon/default.nix index 688d1902fc2c..1ae3f05c5697 100644 --- a/pkgs/development/python-modules/roadrecon/default.nix +++ b/pkgs/development/python-modules/roadrecon/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "roadrecon"; - version = "1.5.0"; + version = "1.6.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hDIMDNmvGQAcpPMet31MbuJtOU2JCrbLlpAu19skNVg="; + hash = "sha256-0Rv88lbqvTJD183nLhvi2Ue1ZD1eoRW1sytJ+t85bcg="; }; pythonRelaxDeps = [ "flask" ]; From cc6bdfcae8246599fb2f085b23df924d5a318650 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Tue, 3 Dec 2024 22:00:04 +0800 Subject: [PATCH 027/100] open5gs: init at 2.7.2 --- pkgs/by-name/op/open5gs/package.nix | 135 ++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) create mode 100644 pkgs/by-name/op/open5gs/package.nix diff --git a/pkgs/by-name/op/open5gs/package.nix b/pkgs/by-name/op/open5gs/package.nix new file mode 100644 index 000000000000..74a7f985f56e --- /dev/null +++ b/pkgs/by-name/op/open5gs/package.nix @@ -0,0 +1,135 @@ +{ + stdenv, + nodejs, + buildNpmPackage, + lib, + fetchFromGitHub, + meson, + ninja, + talloc, + pkg-config, + mongoc, + cmake, + libyaml, + libmicrohttpd, + flex, + bison, + libgcrypt, + libidn, + lksctp-tools, + gnutls, + libnghttp2, + openssl, + curl, + libtins, + mongosh, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "open5gs"; + version = "2.7.2"; + + diameter = fetchFromGitHub { + owner = "open5gs"; + repo = "freeDiameter"; + rev = "20196a265aecb7b1573ceb526bb619e092c1fd3f"; # r1.5.0 + hash = "sha256-0sxzQtKBx313+x3TRsmeswAq90Vk5jNA//rOJcEZJTQ="; + }; + + libtins = fetchFromGitHub { + owner = "open5gs"; + repo = "libtins"; + rev = "fb152ba63bd8d7d024d5f86e5fbd24a4cb3dd93d"; # r4.3 + hash = "sha256-q++F1bvf739P82VpUf4TUygHjhYwOsaQzStJv8PN2Hc="; + }; + + mesonFlags = [ + "-Dwerror=false" + "--buildtype=release" + ]; + + promc = fetchFromGitHub { + owner = "open5gs"; + repo = "prometheus-client-c"; + rev = "a58ba25bf87a9b1b7c6be4e6f4c62047d620f402"; # open5gs branch + hash = "sha256-COZV4UeB7YRfpLwloIfc/WdlTP9huwVfXrJWH4jmvB8="; + }; + + src = fetchFromGitHub { + owner = "open5gs"; + repo = "open5gs"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-XSDjVW+5l2trrilKMcSfX6QIfh/ijWxjoJg33Bn1DBU="; + }; + + webui = buildNpmPackage { + pname = finalAttrs.pname + "-webui"; + inherit (finalAttrs) src version meta; + + sourceRoot = "${finalAttrs.src.name}/webui"; + + npmDepsHash = "sha256-IpqineYa15GBqoPDJ7RpaDsq+MQIIDcdq7yhwmH4Lzo="; + + installPhase = '' + rm -rf node_modules + mkdir $out + cp -r * $out + ''; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + cmake + flex + bison + ]; + + buildInputs = [ + talloc + mongoc + libyaml + libmicrohttpd + libgcrypt + lksctp-tools + libidn + openssl + curl + libtins + gnutls + libnghttp2.dev + ]; + + # For subproject + env = { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=array-bounds" + "-Wno-error=stringop-overflow" + ]; + }; + + preConfigure = '' + cp -R --no-preserve=mode,ownership ${finalAttrs.diameter} subprojects/freeDiameter + cp -R --no-preserve=mode,ownership ${finalAttrs.libtins} subprojects/libtins + cp -R --no-preserve=mode,ownership ${finalAttrs.promc} subprojects/prometheus-client-c + + rm -rf webui/* + cp -r ${finalAttrs.webui}/* webui/ + ''; + + postInstall = '' + cp misc/db/open5gs-dbctl $out/bin + substituteInPlace $out/bin/open5gs-dbctl \ + --replace "mongosh" "${lib.getExe mongosh}" + ''; + + meta = { + homepage = "https://open5gs.org/"; + description = "4G/5G core network components"; + license = lib.licenses.agpl3Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + changelog = "https://github.com/open5gs/open5gs/releases/tag/v${finalAttrs.version}"; + }; +}) From 1969be69119d183d3ff4f187c637e066a18b72d1 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Wed, 4 Dec 2024 23:15:09 +0000 Subject: [PATCH 028/100] mpir: fix configure with gcc-14 https://github.com/wbhart/mpir/commit/4ff3b770cbf86e29b75d12c13e8b854c74bccc5a --- pkgs/by-name/mp/mpir/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/mp/mpir/package.nix b/pkgs/by-name/mp/mpir/package.nix index 9857317ea188..788260ac06c8 100644 --- a/pkgs/by-name/mp/mpir/package.nix +++ b/pkgs/by-name/mp/mpir/package.nix @@ -20,6 +20,12 @@ stdenv.mkDerivation rec { url = "https://github.com/wbhart/mpir/commit/bbc43ca6ae0bec4f64e69c9cd4c967005d6470eb.patch"; hash = "sha256-vW+cDK5Hq2hKEyprOJaNbj0bT2FJmMcyZHPE8GUNUWc="; }) + # https://github.com/wbhart/mpir/pull/299 + (fetchpatch { + name = "gcc-14-fixes.patch"; + url = "https://github.com/wbhart/mpir/commit/4ff3b770cbf86e29b75d12c13e8b854c74bccc5a.patch"; + hash = "sha256-dCB2+1IYTGzHUQkDUF4gqvR1xoMPEYVPLGE+EP2wLL4="; + }) ]; configureFlags = [ "--enable-cxx" ] From c3c95f78549875b5e8d34af8df2fe9804256d545 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Thu, 5 Dec 2024 09:58:00 +0000 Subject: [PATCH 029/100] netris: fix gcc-14 build --- .../netris/configure-fixes-for-gcc-14.patch | 63 +++++++++++++++++++ pkgs/by-name/ne/netris/package.nix | 5 ++ 2 files changed, 68 insertions(+) create mode 100644 pkgs/by-name/ne/netris/configure-fixes-for-gcc-14.patch diff --git a/pkgs/by-name/ne/netris/configure-fixes-for-gcc-14.patch b/pkgs/by-name/ne/netris/configure-fixes-for-gcc-14.patch new file mode 100644 index 000000000000..a2e41ce96a78 --- /dev/null +++ b/pkgs/by-name/ne/netris/configure-fixes-for-gcc-14.patch @@ -0,0 +1,63 @@ +From 9f82b88e17f5e04929eff96c673dac5810006c87 Mon Sep 17 00:00:00 2001 +From: Reno Dakota +Date: Thu, 5 Dec 2024 09:49:40 +0000 +Subject: [PATCH] configure fixes for gcc-14 + +--- + Configure | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/Configure b/Configure +index fbc57a8..e8cea16 100755 +--- a/Configure ++++ b/Configure +@@ -76,7 +76,7 @@ done + CFLAGS="$COPT $CEXTRA" + + echo "Checking for libraries" +-echo 'main(){}' > test.c ++echo 'int main(void){ return 0; }' > test.c + LFLAGS="" + for lib in -lcurses -lncurses; do + if $CC $CFLAGS $LEXTRA test.c $lib > /dev/null 2>&1; then +@@ -91,8 +91,9 @@ done + + echo "Checking for on_exit()" + cat << END > test.c ++#include + void handler(void) {} +-main() { on_exit(handler, (void *)0); } ++int main(void) { on_exit(handler, (void *)0); return 0; } + END + if $CC $CFLAGS $LEXTRA test.c > /dev/null 2>&1; then + HAS_ON_EXIT=true +@@ -103,7 +104,7 @@ fi + echo "Checking for sigprocmask()" + cat << END > test.c + #include +-main() { sigset_t set; sigprocmask(SIG_BLOCK, &set, &set); } ++int main(void) { sigset_t set; sigprocmask(SIG_BLOCK, &set, &set); return 0; } + END + if $CC $CFLAGS $LEXTRA test.c > /dev/null 2>&1; then + HAS_SIGPROCMASK=true +@@ -114,7 +115,7 @@ fi + echo "Checking for getopt.h" + cat << END > test.c + #include +-main(){} ++int main(void){ return 0; } + END + + if $CC $CFLAGS $LEXTRA test.c > /dev/null 2>&1; then +@@ -126,7 +127,7 @@ fi + echo "Checking for memory.h" + cat << END > test.c + #include +-main(){} ++int main(void){ return 0; } + END + + if $CC $CFLAGS $LEXTRA test.c > /dev/null 2>&1; then +-- +2.47.0 + diff --git a/pkgs/by-name/ne/netris/package.nix b/pkgs/by-name/ne/netris/package.nix index 583d6efa58fe..2c5fbb39126f 100644 --- a/pkgs/by-name/ne/netris/package.nix +++ b/pkgs/by-name/ne/netris/package.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation { sha256 = "0gmxbpn50pnffidwjchkzph9rh2jm4wfq7hj8msp5vhdq5h0z9hm"; }; + patches = [ + # https://github.com/naclander/netris/pull/1 + ./configure-fixes-for-gcc-14.patch + ]; + buildInputs = [ ncurses ]; From 376dcb7b2607f7b0beb1c8f393a8437f421f6520 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Thu, 5 Dec 2024 10:20:44 +0000 Subject: [PATCH 030/100] netris: fix non-gcc builds --- pkgs/by-name/ne/netris/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ne/netris/package.nix b/pkgs/by-name/ne/netris/package.nix index 2c5fbb39126f..a1da31af70b2 100644 --- a/pkgs/by-name/ne/netris/package.nix +++ b/pkgs/by-name/ne/netris/package.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation { configureScript = "./Configure"; dontAddPrefix = true; + configureFlags = [ + "--cc" "${stdenv.cc.targetPrefix}cc" + ]; + installPhase = '' mkdir -p $out/bin cp ./netris $out/bin @@ -33,6 +37,6 @@ stdenv.mkDerivation { mainProgram = "netris"; license = licenses.gpl2Plus; maintainers = with maintainers; [ patryk27 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 654ef1d49b5bb7f86127caef97baa6eed50d2493 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Thu, 5 Dec 2024 11:05:55 +0000 Subject: [PATCH 031/100] netris: build with -O2 --- pkgs/by-name/ne/netris/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ne/netris/package.nix b/pkgs/by-name/ne/netris/package.nix index a1da31af70b2..92b4cb123922 100644 --- a/pkgs/by-name/ne/netris/package.nix +++ b/pkgs/by-name/ne/netris/package.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation { configureFlags = [ "--cc" "${stdenv.cc.targetPrefix}cc" + "-O2" ]; installPhase = '' From e0e69f2d76227a3706efb73dcff5b13b8a125b44 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 5 Dec 2024 22:29:14 +0100 Subject: [PATCH 032/100] milkytracker: 1.04.00 -> 1.05.01 --- pkgs/applications/audio/milkytracker/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index b792c1ad9b49..6fea98975d88 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , gitUpdater , alsa-lib , cmake @@ -21,24 +20,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "milkytracker"; - version = "1.04.00"; + version = "1.05.01"; src = fetchFromGitHub { owner = "milkytracker"; repo = "MilkyTracker"; rev = "v${finalAttrs.version}"; - hash = "sha256-ta4eV/FGBfgTppJwDam0OKQ7udtlinbWly/FPCE+Qss="; + hash = "sha256-31Jy93bQj9wZ9vWJe5DVnBqFXfPSH1qmk8kcT/t+FY0="; }; - patches = [ - # Fix crash after querying midi ports - # Remove when version > 1.04.00 - (fetchpatch { - url = "https://github.com/milkytracker/MilkyTracker/commit/7e9171488fc47ad2de646a4536794fda21e7303d.patch"; - hash = "sha256-CmnIwmGGnsnlRrvVAXe2zaQf1CFMB5BJPKmiwGOHgGY="; - }) - ]; - strictDeps = true; nativeBuildInputs = [ @@ -66,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm644 $src/resources/milkytracker.desktop $out/share/applications/milkytracker.desktop install -Dm644 $src/resources/pictures/carton.png $out/share/pixmaps/milkytracker.png - install -Dm644 $src/resources/milkytracker.appdata $out/share/appdata/milkytracker.appdata.xml + install -Dm644 $src/resources/org.milkytracker.MilkyTracker.metainfo.xml $out/share/appdata/org.milkytracker.MilkyTracker.metainfo.xml ''; passthru.updateScript = gitUpdater { From 089f7815b4b1c1bb04b534ffe075ded242d010e5 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 5 Dec 2024 22:34:45 +0100 Subject: [PATCH 033/100] milkytracker: Modernise - nixfmt - Drop meta-wide "with lib" - Darwin frameworks are stdenv-provided now --- .../audio/milkytracker/default.nix | 68 +++++++++---------- 1 file changed, 31 insertions(+), 37 deletions(-) diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index 6fea98975d88..526756b31b8c 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -1,21 +1,18 @@ -{ lib -, stdenv -, fetchFromGitHub -, gitUpdater -, alsa-lib -, cmake -, Cocoa -, CoreAudio -, Foundation -, libjack2 -, lhasa -, makeWrapper -, perl -, pkg-config -, rtmidi -, SDL2 -, zlib -, zziplib +{ + lib, + stdenv, + fetchFromGitHub, + gitUpdater, + alsa-lib, + cmake, + libjack2, + lhasa, + makeWrapper, + pkg-config, + rtmidi, + SDL2, + zlib, + zziplib, }: stdenv.mkDerivation (finalAttrs: { @@ -37,21 +34,18 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = [ - lhasa - libjack2 - perl - rtmidi - SDL2 - zlib - zziplib - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - CoreAudio - Foundation - ]; + buildInputs = + [ + lhasa + libjack2 + rtmidi + SDL2 + zlib + zziplib + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ]; postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm644 $src/resources/milkytracker.desktop $out/share/applications/milkytracker.desktop @@ -63,14 +57,14 @@ stdenv.mkDerivation (finalAttrs: { rev-prefix = "v"; }; - meta = with lib; { + meta = { description = "Music tracker application, similar to Fasttracker II"; homepage = "https://milkytracker.org/"; - license = licenses.gpl3Plus; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; # ibtool -> real Xcode -> I can't get that, and Ofborg can't test that broken = stdenv.hostPlatform.isDarwin; - maintainers = with maintainers; [ OPNA2608 ]; + maintainers = with lib.maintainers; [ OPNA2608 ]; mainProgram = "milkytracker"; }; }) From 56262ecfd3f87bf6b47d70c9ca871dbcfe8ae07b Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 5 Dec 2024 22:41:07 +0100 Subject: [PATCH 034/100] milkytracker: Migrate to by-name --- .../default.nix => by-name/mi/milkytracker/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 4 deletions(-) rename pkgs/{applications/audio/milkytracker/default.nix => by-name/mi/milkytracker/package.nix} (100%) diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/by-name/mi/milkytracker/package.nix similarity index 100% rename from pkgs/applications/audio/milkytracker/default.nix rename to pkgs/by-name/mi/milkytracker/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b8ef4e29fec..bf12e6681748 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13284,10 +13284,6 @@ with pkgs; stdenv; }; - milkytracker = callPackage ../applications/audio/milkytracker { - inherit (darwin.apple_sdk.frameworks) Cocoa CoreAudio Foundation; - }; - ptcollab = callPackage ../by-name/pt/ptcollab/package.nix { stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; From c311c34523a385c414f1fcffb3b0bd4c7a0ce159 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 5 Dec 2024 23:32:13 +0100 Subject: [PATCH 035/100] haguichi: 1.5.0 -> 1.5.1 --- pkgs/tools/networking/haguichi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/haguichi/default.nix b/pkgs/tools/networking/haguichi/default.nix index d6bb1a1a8769..b9d07e66b709 100644 --- a/pkgs/tools/networking/haguichi/default.nix +++ b/pkgs/tools/networking/haguichi/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "haguichi"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "ztefn"; repo = "haguichi"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-Rhag2P4GAO9qhcajwDHIkgzKZqNii/SgvFwCI6Kc8XE="; + hash = "sha256-hSQsKG86QUzv/dfqz2amSXyAaA1ZAk9dTvel9KVgeFs="; }; postPatch = '' From 0e8a27ece5bcc5ec833560b3b050389af6900784 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 5 Dec 2024 23:32:58 +0100 Subject: [PATCH 036/100] haguichi: nixfmt --- pkgs/tools/networking/haguichi/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/haguichi/default.nix b/pkgs/tools/networking/haguichi/default.nix index b9d07e66b709..a0d8c78ba100 100644 --- a/pkgs/tools/networking/haguichi/default.nix +++ b/pkgs/tools/networking/haguichi/default.nix @@ -59,7 +59,9 @@ stdenv.mkDerivation (finalAttrs: { description = "Graphical frontend for Hamachi on Linux"; mainProgram = "haguichi"; homepage = "https://haguichi.net/"; - changelog = "https://haguichi.net/news/release${lib.strings.replaceStrings ["."] [""] finalAttrs.version}"; + changelog = "https://haguichi.net/news/release${ + lib.strings.replaceStrings [ "." ] [ "" ] finalAttrs.version + }"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ OPNA2608 ]; From e1bf3822864e79d1450500aa087588a48ae51aef Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 5 Dec 2024 23:33:57 +0100 Subject: [PATCH 037/100] haguichi: Migrate to by-pkgs --- .../haguichi/default.nix => by-name/ha/haguichi/package.nix} | 0 pkgs/{tools/networking => by-name/ha}/haguichi/update.sh | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{tools/networking/haguichi/default.nix => by-name/ha/haguichi/package.nix} (100%) rename pkgs/{tools/networking => by-name/ha}/haguichi/update.sh (100%) diff --git a/pkgs/tools/networking/haguichi/default.nix b/pkgs/by-name/ha/haguichi/package.nix similarity index 100% rename from pkgs/tools/networking/haguichi/default.nix rename to pkgs/by-name/ha/haguichi/package.nix diff --git a/pkgs/tools/networking/haguichi/update.sh b/pkgs/by-name/ha/haguichi/update.sh similarity index 100% rename from pkgs/tools/networking/haguichi/update.sh rename to pkgs/by-name/ha/haguichi/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b8ef4e29fec..6d05f99ba2ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3727,8 +3727,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; - haguichi = callPackage ../tools/networking/haguichi { }; - hashcat = callPackage ../tools/security/hashcat { inherit (darwin.apple_sdk.frameworks) Foundation IOKit Metal OpenCL; }; From 4a9420c739e820138c381577fe4375033271f8da Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 5 Dec 2024 23:55:23 +0100 Subject: [PATCH 038/100] libsidplayfp: 2.11.0 -> 2.12.0 --- pkgs/by-name/li/libsidplayfp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libsidplayfp/package.nix b/pkgs/by-name/li/libsidplayfp/package.nix index 0367e4e3e41a..a418c784a5bf 100644 --- a/pkgs/by-name/li/libsidplayfp/package.nix +++ b/pkgs/by-name/li/libsidplayfp/package.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libsidplayfp"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-O6VzHjJT3k1uLI0bjBDRntLqAZdMurs8onLZ6L6NlIU="; + hash = "sha256-VBzobT/UT1YFLYWfJ5XFND+p6fClf/qZVb4eEVpdTqg="; }; outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ]; From b5db689b8ac954b1c54d6d957b635ab38dc86a96 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 6 Dec 2024 00:00:32 +0100 Subject: [PATCH 039/100] sidplayfp: 2.11.0 -> 2.12.0 --- pkgs/by-name/si/sidplayfp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/sidplayfp/package.nix b/pkgs/by-name/si/sidplayfp/package.nix index ac1b3aa55278..d48ba980a53f 100644 --- a/pkgs/by-name/si/sidplayfp/package.nix +++ b/pkgs/by-name/si/sidplayfp/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sidplayfp"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "sidplayfp"; rev = "v${finalAttrs.version}"; - hash = "sha256-X2ds7pYglxvwLOHXfCULwSeWAS9l2Y3PUdSxcuugwHs="; + hash = "sha256-78NlRBZ2GlZWhnZiefNIgRNv6bnJaHH94WsxEhP9rAk="; }; strictDeps = true; From 5eb75bf013ce37956b6ba501f79d2c2e1d18df10 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 6 Dec 2024 00:03:32 +0100 Subject: [PATCH 040/100] sidplayfp: Modernise - nixfmt - Drop meta-wide "with lib" - Add meta.changelog - Use gitUpdater --- pkgs/by-name/si/sidplayfp/package.nix | 65 +++++++++++++++------------ 1 file changed, 37 insertions(+), 28 deletions(-) diff --git a/pkgs/by-name/si/sidplayfp/package.nix b/pkgs/by-name/si/sidplayfp/package.nix index d48ba980a53f..d396dec60c0e 100644 --- a/pkgs/by-name/si/sidplayfp/package.nix +++ b/pkgs/by-name/si/sidplayfp/package.nix @@ -1,17 +1,18 @@ -{ stdenv -, lib -, fetchFromGitHub -, nix-update-script -, alsaSupport ? stdenv.hostPlatform.isLinux -, alsa-lib -, autoreconfHook -, pulseSupport ? stdenv.hostPlatform.isLinux -, libpulseaudio -, libsidplayfp -, out123Support ? stdenv.hostPlatform.isDarwin -, mpg123 -, perl -, pkg-config +{ + stdenv, + lib, + fetchFromGitHub, + gitUpdater, + alsaSupport ? stdenv.hostPlatform.isLinux, + alsa-lib, + autoreconfHook, + pulseSupport ? stdenv.hostPlatform.isLinux, + libpulseaudio, + libsidplayfp, + out123Support ? stdenv.hostPlatform.isDarwin, + mpg123, + perl, + pkg-config, }: stdenv.mkDerivation (finalAttrs: { @@ -33,15 +34,19 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = [ - libsidplayfp - ] ++ lib.optionals alsaSupport [ - alsa-lib - ] ++ lib.optionals pulseSupport [ - libpulseaudio - ] ++ lib.optionals out123Support [ - mpg123 - ]; + buildInputs = + [ + libsidplayfp + ] + ++ lib.optionals alsaSupport [ + alsa-lib + ] + ++ lib.optionals pulseSupport [ + libpulseaudio + ] + ++ lib.optionals out123Support [ + mpg123 + ]; configureFlags = [ (lib.strings.withFeature out123Support "out123") @@ -50,15 +55,19 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; passthru = { - updateScript = nix-update-script { }; + updateScript = gitUpdater { rev-prefix = "v"; }; }; - meta = with lib; { + meta = { description = "SID player using libsidplayfp"; homepage = "https://github.com/libsidplayfp/sidplayfp"; - license = with licenses; [ gpl2Plus ]; + changelog = "https://github.com/libsidplayfp/sidplayfp/releases/tag/v${finalAttrs.version}"; + license = with lib.licenses; [ gpl2Plus ]; mainProgram = "sidplayfp"; - maintainers = with maintainers; [ dezgeg OPNA2608 ]; - platforms = platforms.all; + maintainers = with lib.maintainers; [ + dezgeg + OPNA2608 + ]; + platforms = lib.platforms.all; }; }) From 97f1216c3f6603b69d281b75ab1d6e9f1c04b0f7 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 6 Dec 2024 00:08:03 +0100 Subject: [PATCH 041/100] wipeout-rewrite: 0-unstable-2024-07-07 -> 0-unstable-2024-11-09 --- pkgs/by-name/wi/wipeout-rewrite/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wi/wipeout-rewrite/package.nix b/pkgs/by-name/wi/wipeout-rewrite/package.nix index 24d51774a7bf..17f70e0ac692 100644 --- a/pkgs/by-name/wi/wipeout-rewrite/package.nix +++ b/pkgs/by-name/wi/wipeout-rewrite/package.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "wipeout-rewrite"; - version = "0-unstable-2024-07-07"; + version = "0-unstable-2024-11-09"; src = fetchFromGitHub { owner = "phoboslab"; repo = "wipeout-rewrite"; - rev = "a372b51f59217da4a5208352123a4acca800783c"; - hash = "sha256-RJrWOTb5cZ2rSgO/J8qW5ifMJryBaK6MDtYwQZfghS0="; + rev = "05e9c2d3a1272e631e256a76b89aca235b92e4a9"; + hash = "sha256-rzwh4JZNea5Wu/BEWGWpfxyPjY0GLrUPynPTbUC9Mak="; }; enableParallelBuilding = true; From 86014b26f55c8e05c654a8a527ffd6a113ddb09d Mon Sep 17 00:00:00 2001 From: Nate Eagleson Date: Mon, 11 Nov 2024 14:43:51 -0500 Subject: [PATCH 042/100] mighty-mike: init at 3.0.2-unstable-2024-04-01 --- pkgs/by-name/mi/mighty-mike/package.nix | 63 +++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 pkgs/by-name/mi/mighty-mike/package.nix diff --git a/pkgs/by-name/mi/mighty-mike/package.nix b/pkgs/by-name/mi/mighty-mike/package.nix new file mode 100644 index 000000000000..5abe538e8424 --- /dev/null +++ b/pkgs/by-name/mi/mighty-mike/package.nix @@ -0,0 +1,63 @@ +{ + lib, + stdenv, + fetchFromGitHub, + SDL2, + cmake, + makeWrapper, + unstableGitUpdater, +}: + +stdenv.mkDerivation { + pname = "mighty-mike"; + version = "3.0.2-unstable-2024-04-01"; + + src = fetchFromGitHub { + owner = "jorio"; + repo = "MightyMike"; + rev = "0a1d6c4c80a90ed6e333651cd0a438ec003cfbe5"; + hash = "sha256-c7o0Q9KTbJhYOZ2c/V1EdV4ibdR3AnHTCZBManJQzrw="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + SDL2 + cmake + makeWrapper + ]; + + buildInputs = [ SDL2 ]; + + strictDeps = true; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/share/MightyMike" + mv Data ReadMe.txt "$out/share/MightyMike/" + + install -Dm755 {.,$out/bin}/MightyMike + wrapProgram $out/bin/MightyMike --chdir "$out/share/MightyMike" + + install -Dm644 $src/packaging/io.jor.mightymike.desktop $out/share/applications/mightymike.desktop + install -Dm644 $src/packaging/io.jor.mightymike.png $out/share/pixmaps/mightymike-desktopicon.png + + runHook postInstall + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Port of Mighty Mike, a 1995 Macintosh game by Pangea Software, for modern operating systems"; + longDescription = '' + This is Pangea Software's Mighty Mike updated to run on modern systems. + Set in a toy store, this top-down action game is a staple of 90's Macintosh games. + It was initially published in 1995 under the name Power Pete. + ''; + homepage = "https://jorio.itch.io/mightymike"; + license = lib.licenses.cc-by-nc-sa-40; + mainProgram = "MightyMike"; + maintainers = with lib.maintainers; [ nateeag ]; + platforms = lib.platforms.linux; + }; +} From 8583c47ec13d1af68ee893f87983cef4fc485533 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:34:48 +0100 Subject: [PATCH 043/100] dnf5: 5.2.8.0 -> 5.2.8.1 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/dn/dnf5/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dn/dnf5/package.nix b/pkgs/by-name/dn/dnf5/package.nix index bc5e700c12c2..aedbb9114f35 100644 --- a/pkgs/by-name/dn/dnf5/package.nix +++ b/pkgs/by-name/dn/dnf5/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "dnf5"; - version = "5.2.8.0"; + version = "5.2.8.1"; outputs = [ "out" @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "rpm-software-management"; repo = "dnf5"; rev = finalAttrs.version; - hash = "sha256-NazBI9u72np7P8pUqJ272wk7r+tZVXNr/EiMSFcoAvA="; + hash = "sha256-R9woS84vZkF7yatbJr7KNhaUsLZcGaiS+XnYXG3i1jA="; }; nativeBuildInputs = From 541eefafee65a57a2418ae49ac1eb03990f1ad10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 13:22:12 +0000 Subject: [PATCH 044/100] xmrig-mo: 6.22.1-mo1 -> 6.22.2-mo1 --- pkgs/applications/misc/xmrig/moneroocean.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix index dac636ddbdb3..b74ab0803e0f 100644 --- a/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/pkgs/applications/misc/xmrig/moneroocean.nix @@ -5,13 +5,13 @@ xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; - version = "6.22.1-mo1"; + version = "6.22.2-mo1"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - hash = "sha256-CwGHSrnxzKCLKJC7MmqWATqTUNehhRECcX4g/e9oGSI="; + hash = "sha256-pJ4NTdpWCt7C98k1EqGoiU0Lup25Frdm1kFJuwTfXgY="; }; meta = with lib; { From 3195f0788845570503374f2e31e56c406bab190b Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Fri, 6 Dec 2024 15:47:10 +0100 Subject: [PATCH 045/100] foomatic-db*: add leading digit to version attribute ...as mandated by current /pkgs/README.md#versioning . --- pkgs/by-name/fo/foomatic-db-engine/package.nix | 2 +- pkgs/by-name/fo/foomatic-db-nonfree/package.nix | 2 +- pkgs/by-name/fo/foomatic-db/package.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fo/foomatic-db-engine/package.nix b/pkgs/by-name/fo/foomatic-db-engine/package.nix index 5408f7eff38e..d9ae78139192 100644 --- a/pkgs/by-name/fo/foomatic-db-engine/package.nix +++ b/pkgs/by-name/fo/foomatic-db-engine/package.nix @@ -17,7 +17,7 @@ perlPackages.buildPerlPackage rec { pname = "foomatic-db-engine"; - version = "unstable-2024-02-10"; + version = "0-unstable-2024-02-10"; src = fetchFromGitHub { # there is also a daily snapshot at the `downloadPage`, diff --git a/pkgs/by-name/fo/foomatic-db-nonfree/package.nix b/pkgs/by-name/fo/foomatic-db-nonfree/package.nix index a433b58a0ac9..c67362a49dee 100644 --- a/pkgs/by-name/fo/foomatic-db-nonfree/package.nix +++ b/pkgs/by-name/fo/foomatic-db-nonfree/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "foomatic-db-nonfree"; - version = "unstable-2015-06-05"; + version = "0-unstable-2015-06-05"; src = fetchFromGitHub { # there is also a daily snapshot at the `downloadPage`, diff --git a/pkgs/by-name/fo/foomatic-db/package.nix b/pkgs/by-name/fo/foomatic-db/package.nix index 4f2a08952a4a..4ac77e20f8d6 100644 --- a/pkgs/by-name/fo/foomatic-db/package.nix +++ b/pkgs/by-name/fo/foomatic-db/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "foomatic-db"; - version = "unstable-2024-08-13"; + version = "0-unstable-2024-08-13"; src = fetchFromGitHub { # there is also a daily snapshot at the `downloadPage`, From ab8c8edc97d64477ec8c838ea2d5e9be0e0fde1e Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Fri, 6 Dec 2024 15:47:26 +0100 Subject: [PATCH 046/100] foomatic-db: 0-unstable-2024-08-13 -> 0-unstable-2024-12-05 Adds one Oki printer PPD file. --- pkgs/by-name/fo/foomatic-db/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fo/foomatic-db/package.nix b/pkgs/by-name/fo/foomatic-db/package.nix index 4ac77e20f8d6..d35d3915eb33 100644 --- a/pkgs/by-name/fo/foomatic-db/package.nix +++ b/pkgs/by-name/fo/foomatic-db/package.nix @@ -13,15 +13,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "foomatic-db"; - version = "0-unstable-2024-08-13"; + version = "0-unstable-2024-12-05"; src = fetchFromGitHub { # there is also a daily snapshot at the `downloadPage`, # but it gets deleted quickly and would provoke 404 errors owner = "OpenPrinting"; repo = "foomatic-db"; - rev = "359508733741039b65c86e7a1318a89862e03b13"; - hash = "sha256-DSduuSC9XX2+fS2XOQ4/FrmBzOu7rgfNDeLzpcBplsY="; + rev = "9a7a08318598fea569cf073489709899c9af6143"; + hash = "sha256-7vvJPhUa4oDe101Iv897LoChNIcdTa4LviLUndHxWtw="; }; buildInputs = [ cups cups-filters ghostscript gnused perl ]; From 32e4542ae6197e84daf98774b45e240c64eca748 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 16:20:51 +0000 Subject: [PATCH 047/100] python312Packages.minio: 7.2.10 -> 7.2.12 --- pkgs/development/python-modules/minio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index 51b70234dde1..4c086580a467 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "minio"; - version = "7.2.10"; + version = "7.2.12"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "minio"; repo = "minio-py"; rev = "refs/tags/${version}"; - hash = "sha256-vPIMYaCt2f1OXPUtaw0OXMEADHNCv4DxpueZSyJiYqA="; + hash = "sha256-8CthbR62TZ7MFC3OCwtbHtGwmlQeFLgBtkyRX1P5SYU="; }; postPatch = '' From 2c8a792facf48253c26838dc98faeed66291ec2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 Dec 2024 14:52:42 -0800 Subject: [PATCH 048/100] immich: 1.121.0 -> 1.122.1 https://github.com/immich-app/immich/releases/tag/v1.122.0 https://github.com/immich-app/immich/releases/tag/v1.122.1 --- nixos/tests/web-apps/immich.nix | 2 +- pkgs/by-name/im/immich/package.nix | 2 +- pkgs/by-name/im/immich/sources.json | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/nixos/tests/web-apps/immich.nix b/nixos/tests/web-apps/immich.nix index 94a63fbfb9c1..089037ad837c 100644 --- a/nixos/tests/web-apps/immich.nix +++ b/nixos/tests/web-apps/immich.nix @@ -53,7 +53,7 @@ import ../make-test-python.nix ( res = machine.succeed(""" curl -f -H 'Cookie: immich_access_token=%s' http://localhost:2283/api/jobs """ % token) - assert json.loads(res)["backupDatabase"]["jobCounts"]["active"] == 1 + assert sum(json.loads(res)["backupDatabase"]["jobCounts"].values()) >= 1 machine.wait_until_succeeds("ls /var/lib/immich/backups/*.sql.gz") ''; } diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index dc0b2aa4d296..3d8c2591bc5d 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -160,7 +160,7 @@ buildNpmPackage' { python3 makeWrapper glib - node-gyp + node-gyp # for building node_modules/sharp from source ]; buildInputs = [ diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json index ae1b7e68e009..f79a56726d0a 100644 --- a/pkgs/by-name/im/immich/sources.json +++ b/pkgs/by-name/im/immich/sources.json @@ -1,22 +1,22 @@ { - "version": "1.121.0", - "hash": "sha256-3Rk/0LtbRIrtnPBhG6TzYFcPlZqlkZoyO01jIL4gzC8=", + "version": "1.122.1", + "hash": "sha256-wpqmaMT2yIlwihUB3q8TKCrhhikf09pNJQJ9HsloHR4=", "components": { "cli": { - "npmDepsHash": "sha256-LsStgf6iJMpqCYZoZoP7cNnHbuzawTQ02wvJ5q/2RyU=", - "version": "2.2.32" + "npmDepsHash": "sha256-a6BK3A9Qlm0ygTRXSgqwzLv/KGyKFdeDfvSraayRC2U=", + "version": "2.2.34" }, "server": { - "npmDepsHash": "sha256-9xyl+8YItzHSHcgUi1X9MwNtmZpdDGtg4DUa2YZv08I=", - "version": "1.121.0" + "npmDepsHash": "sha256-dTKtuMhO1K/inQZFLCGxg6VlBDPC35x+AEMFLR3kH9w=", + "version": "1.122.1" }, "web": { - "npmDepsHash": "sha256-vHmiNWVLl4len6SnJ/NmiRVLLc4uUUWF/25LiOMnvf0=", - "version": "1.121.0" + "npmDepsHash": "sha256-YKEbylbrsrjnUKDBSOZLz8iZWpcKfQtyRxrKG0TR4y0=", + "version": "1.122.1" }, "open-api/typescript-sdk": { - "npmDepsHash": "sha256-jiwUoWrMH/mDO+GPi13Q+Z87NAtDx95h6igI0NuPhnc=", - "version": "1.121.0" + "npmDepsHash": "sha256-ou/o1NNpA3rOZTBwxXDmegUelC6praXB1muiu391BzM=", + "version": "1.122.1" } } } From 100f49fed46889beff47c2ab698d7f8f096d0a2e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 Dec 2024 22:02:46 +0100 Subject: [PATCH 049/100] dnsvalidator: init at 0.1-unstable-2023-01-17 Tool to maintain a list of IPv4 DNS servers https://github.com/vortexau/dnsvalidator --- pkgs/by-name/dn/dnsvalidator/package.nix | 48 ++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pkgs/by-name/dn/dnsvalidator/package.nix diff --git a/pkgs/by-name/dn/dnsvalidator/package.nix b/pkgs/by-name/dn/dnsvalidator/package.nix new file mode 100644 index 000000000000..34077e9f1d26 --- /dev/null +++ b/pkgs/by-name/dn/dnsvalidator/package.nix @@ -0,0 +1,48 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "dnsvalidator"; + version = "0.1-unstable-2023-01-17"; + pyproject = true; + + src = fetchFromGitHub { + owner = "vortexau"; + repo = "dnsvalidator"; + # https://github.com/vortexau/dnsvalidator/issues/21 + rev = "146c9b0e24d806b25697fbb541bf9f19a3086d41"; + hash = "sha256-8pbBEtkiaGYp5ekkA1UUZ+5DX/iarxKdpQn5hM3cmvA="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "'pytest-runner'" "" + ''; + + pythonRemoveDeps = [ "ipaddress" ]; + + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ + colorclass + dnspython + netaddr + requests + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "dnsvalidator" ]; + + meta = { + description = "Tool to maintain a list of IPv4 DNS servers"; + homepage = "https://github.com/vortexau/dnsvalidator"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "dnsvalidator"; + }; +} From 7e48fbbcad4538a1732d50f377a07ade7dc15314 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 6 Dec 2024 23:58:16 +0100 Subject: [PATCH 050/100] yara-x: 0.11.0 -> 0.11.1 Changes: https://github.com/VirusTotal/yara-x/releases/tag/v0.11.1 --- pkgs/by-name/ya/yara-x/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix index 9c7f8affe29e..88d9b32bcf16 100644 --- a/pkgs/by-name/ya/yara-x/package.nix +++ b/pkgs/by-name/ya/yara-x/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "yara-x"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara-x"; rev = "refs/tags/v${version}"; - hash = "sha256-14YHaaZpqB8448MGdKsYqxZ4N/+p92khQWRov3cO/eU="; + hash = "sha256-eRA1Vov+K7nLOkvcC8KS0S2eNSSDn++UcQqDFVJOhME="; }; - cargoHash = "sha256-gcRLnPlNVzA5nxdviWz8dDzblFujytYPrt7eyFgm5Lc="; + cargoHash = "sha256-iWgfI5jiEbBHkew82Ej7Ku17JDVI4O0iiOxs9lxEJS4="; nativeBuildInputs = [ cmake installShellFiles ]; From 87ae7fe2470d30542142aeebdfd66e10f7900066 Mon Sep 17 00:00:00 2001 From: PassiveLemon Date: Sun, 20 Oct 2024 13:12:57 -0400 Subject: [PATCH 051/100] wivrn: 0.19 -> 0.22 --- .../wi/wivrn/force-enable-steamvr_lh.patch | 13 ++ pkgs/by-name/wi/wivrn/package.nix | 203 +++++++++++++----- 2 files changed, 161 insertions(+), 55 deletions(-) create mode 100644 pkgs/by-name/wi/wivrn/force-enable-steamvr_lh.patch diff --git a/pkgs/by-name/wi/wivrn/force-enable-steamvr_lh.patch b/pkgs/by-name/wi/wivrn/force-enable-steamvr_lh.patch new file mode 100644 index 000000000000..7ea67c738506 --- /dev/null +++ b/pkgs/by-name/wi/wivrn/force-enable-steamvr_lh.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6c7956b4c..633fb6f72 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -205,6 +205,7 @@ option(BUILD_TESTING "Enable building of the test suite?" ON) + if(EXISTS "$ENV{HOME}/.steam/root") + set(XRT_HAVE_STEAM YES) + endif() ++set(XRT_HAVE_STEAM YES) + + if(CMAKE_SYSTEM_NAME STREQUAL "Linux") + set(XRT_HAVE_INTERNAL_HID ON) + diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix index f795ec72b348..452d14a3082a 100644 --- a/pkgs/by-name/wi/wivrn/package.nix +++ b/pkgs/by-name/wi/wivrn/package.nix @@ -1,4 +1,5 @@ { + # Commented packages are not currently in nixpkgs. They don't appear to cause a problem when not present. config, lib, stdenv, @@ -7,49 +8,81 @@ applyPatches, autoAddDriverRunpath, avahi, + bluez, boost, + cjson, cli11, cmake, cudaPackages ? { }, cudaSupport ? config.cudaSupport, + dbus, + # depthai + doxygen, eigen, + elfutils, ffmpeg, freetype, git, + glib, glm, glslang, + gst_all_1, harfbuzz, - libdrm, + hidapi, + # leapsdk + # leapv2 libGL, - libva, - libpulseaudio, libX11, libXrandr, + libbsd, + libdrm, + libdwg, + libjpeg, + libmd, + libnotify, + libpulseaudio, + librealsense, + librsvg, + libsurvive, + libunwind, + libusb1, + libuvc, + libva, + makeDesktopItem, nix-update-script, nlohmann_json, onnxruntime, + opencv4, + openhmd, + openvr, openxr-loader, + orc, + # percetto pipewire, pkg-config, python3, + qt6, + SDL2, shaderc, spdlog, systemd, udev, vulkan-headers, vulkan-loader, - vulkan-tools, + wayland, + wayland-protocols, + wayland-scanner, x264, }: stdenv.mkDerivation (finalAttrs: { pname = "wivrn"; - version = "0.19"; + version = "0.22"; src = fetchFromGitHub { owner = "wivrn"; repo = "wivrn"; rev = "v${finalAttrs.version}"; - hash = "sha256-DYV+JUWjjhLZLq+4Hv7jxOyxDqQut/mU1X0ZFMoNkDI="; + hash = "sha256-i/CG+zD64cwnu0z1BRkRn7Wm67KszE+wZ5geeAvrvMY="; }; monado = applyPatches { @@ -57,18 +90,17 @@ stdenv.mkDerivation (finalAttrs: { domain = "gitlab.freedesktop.org"; owner = "monado"; repo = "monado"; - rev = "bcbe19ddd795f182df42051e5495e9727db36c1c"; - hash = "sha256-sh5slHROcuC3Dgenu1+hm8U5lUOW48JUbiluYvc3NiQ="; + rev = "aa2b0f9f1d638becd6bb9ca3c357ac2561a36b07"; + hash = "sha256-yfHtkMvX/gyVG0UgpSB6KjSDdCym6Reb9LRb3OortaI="; }; patches = [ - "${finalAttrs.src}/patches/monado/0001-c-multi-disable-dropping-of-old-frames.patch" - "${finalAttrs.src}/patches/monado/0002-ipc-server-Always-listen-to-stdin.patch" - "${finalAttrs.src}/patches/monado/0003-c-multi-Don-t-log-frame-time-diff.patch" - "${finalAttrs.src}/patches/monado/0005-distortion-images.patch" - "${finalAttrs.src}/patches/monado/0008-Use-mipmaps-for-distortion-shader.patch" - "${finalAttrs.src}/patches/monado/0009-convert-to-YCbCr-in-monado.patch" + ./force-enable-steamvr_lh.patch ]; + + postPatch = '' + ${finalAttrs.src}/patches/apply.sh ${finalAttrs.src}/patches/monado/* + ''; }; strictDeps = true; @@ -85,65 +117,126 @@ stdenv.mkDerivation (finalAttrs: { fi ''; - nativeBuildInputs = [ - cmake - git - glslang - pkg-config - python3 - ] ++ lib.optionals cudaSupport [ autoAddDriverRunpath ]; + nativeBuildInputs = + [ + cmake + doxygen + git + glib + glslang + librsvg + pkg-config + python3 + qt6.wrapQtAppsHook + ] + ++ lib.optionals cudaSupport [ + autoAddDriverRunpath + ]; - buildInputs = [ - avahi - boost - cli11 - eigen - ffmpeg - freetype - glm - harfbuzz - libdrm - libGL - libva - libX11 - libXrandr - libpulseaudio - nlohmann_json - onnxruntime - openxr-loader - pipewire - shaderc - spdlog - systemd - udev - vulkan-headers - vulkan-loader - vulkan-tools - x264 - ] ++ lib.optionals cudaSupport [ cudaPackages.cudatoolkit ]; + buildInputs = + [ + avahi + boost + bluez + cjson + cli11 + dbus + eigen + elfutils + ffmpeg + freetype + glib + glm + gst_all_1.gst-plugins-base + gst_all_1.gstreamer + harfbuzz + hidapi + libbsd + libdrm + libdwg + libGL + libjpeg + libmd + libnotify + librealsense + libsurvive + libunwind + libusb1 + libuvc + libva + libX11 + libXrandr + libpulseaudio + nlohmann_json + opencv4 + openhmd + openvr + openxr-loader + onnxruntime + orc + pipewire + qt6.qtbase + qt6.qttools + SDL2 + shaderc + spdlog + systemd + udev + vulkan-headers + vulkan-loader + wayland + wayland-protocols + wayland-scanner + x264 + ] + ++ lib.optionals cudaSupport [ + cudaPackages.cudatoolkit + ]; cmakeFlags = [ - (lib.cmakeBool "WIVRN_USE_VAAPI" true) - (lib.cmakeBool "WIVRN_USE_X264" true) (lib.cmakeBool "WIVRN_USE_NVENC" cudaSupport) - (lib.cmakeBool "WIVRN_USE_SYSTEMD" true) + (lib.cmakeBool "WIVRN_USE_VAAPI" true) + (lib.cmakeBool "WIVRN_USE_VULKAN" true) + (lib.cmakeBool "WIVRN_USE_X264" true) (lib.cmakeBool "WIVRN_USE_PIPEWIRE" true) (lib.cmakeBool "WIVRN_USE_PULSEAUDIO" true) + (lib.cmakeBool "WIVRN_FEATURE_STEAMVR_LIGHTHOUSE" true) (lib.cmakeBool "WIVRN_BUILD_CLIENT" false) - (lib.cmakeBool "WIVRN_OPENXR_INSTALL_ABSOLUTE_RUNTIME_PATH" true) + (lib.cmakeBool "WIVRN_BUILD_DASHBOARD" true) + (lib.cmakeBool "WIVRN_CHECK_CAPSYSNICE" false) (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) + (lib.cmakeFeature "WIVRN_OPENXR_MANIFEST_TYPE" "absolute") + (lib.cmakeFeature "GIT_DESC" "${finalAttrs.version}") (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MONADO" "${finalAttrs.monado}") + (lib.cmakeFeature "CUDA_TOOLKIT_ROOT_DIR" "${cudaPackages.cudatoolkit}") + ]; + + desktopItems = [ + (makeDesktopItem { + name = "WiVRn Server"; + desktopName = "WiVRn Server"; + genericName = "WiVRn Server"; + comment = "Play your PC VR games on a standalone headset"; + icon = "io.github.wivrn.wivrn"; + exec = "wivrn-dashboard"; + type = "Application"; + categories = [ + "Network" + "Game" + ]; + }) ]; passthru.updateScript = nix-update-script { }; meta = with lib; { description = "An OpenXR streaming application to a standalone headset"; - homepage = "https://github.com/Meumeu/WiVRn/"; - changelog = "https://github.com/Meumeu/WiVRn/releases/"; + homepage = "https://github.com/WiVRn/WiVRn/"; + changelog = "https://github.com/WiVRn/WiVRn/releases/"; license = licenses.gpl3Only; maintainers = with maintainers; [ passivelemon ]; platforms = platforms.linux; mainProgram = "wivrn-server"; + sourceProvenance = with sourceTypes; [ fromSource ]; }; }) From 7a625d3ccf9b0fa9d45412aea94daffb27233657 Mon Sep 17 00:00:00 2001 From: PassiveLemon Date: Sun, 20 Oct 2024 13:13:24 -0400 Subject: [PATCH 052/100] nixos/wivrn: add server flags option and refactor type check --- nixos/modules/services/video/wivrn.nix | 96 +++++++++++++++++--------- 1 file changed, 63 insertions(+), 33 deletions(-) diff --git a/nixos/modules/services/video/wivrn.nix b/nixos/modules/services/video/wivrn.nix index f571832053ad..da6edd02f5b2 100644 --- a/nixos/modules/services/video/wivrn.nix +++ b/nixos/modules/services/video/wivrn.nix @@ -24,36 +24,66 @@ let # For the application option to work with systemd PATH, we find the store binary path of # the package, concat all of the following strings, and then update the application attribute. - # Application can either be a package or a list that has a package as the first element. - applicationExists = builtins.hasAttr "application" cfg.config.json; + + # Since the json config attribute type "configFormat.type" doesn't allow specifying types for + # individual attributes, we have to type check manually. + + # The application option must be either a package or a list with package as the first element. + + # Checking if an application is provided + applicationAttrExists = builtins.hasAttr "application" cfg.config.json; applicationListNotEmpty = ( if builtins.isList cfg.config.json.application then (builtins.length cfg.config.json.application) != 0 else true ); - applicationCheck = applicationExists && applicationListNotEmpty; + applicationCheck = applicationAttrExists && applicationListNotEmpty; - applicationBinary = ( + # Manage packages and their exe paths + applicationAttr = ( if builtins.isList cfg.config.json.application then builtins.head cfg.config.json.application else cfg.config.json.application ); + applicationPackage = mkIf applicationCheck applicationAttr; + applicationPackageExe = getExe applicationAttr; + serverPackageExe = getExe cfg.package; + + # Managing strings applicationStrings = builtins.tail cfg.config.json.application; - - applicationPath = mkIf applicationCheck applicationBinary; - applicationConcat = ( if builtins.isList cfg.config.json.application then - builtins.concatStringsSep " " ([ (getExe applicationBinary) ] ++ applicationStrings) + builtins.concatStringsSep " " ([ applicationPackageExe ] ++ applicationStrings) else - (getExe applicationBinary) + applicationPackageExe ); + + # Manage config file applicationUpdate = recursiveUpdate cfg.config.json ( optionalAttrs applicationCheck { application = applicationConcat; } ); configFile = configFormat.generate "config.json" applicationUpdate; + enabledConfig = optionalString cfg.config.enable "-f ${configFile}"; + + # Manage server executables and flags + serverExec = builtins.concatStringsSep " " ( + [ + serverPackageExe + "--systemd" + enabledConfig + ] + ++ cfg.extraServerFlags + ); + applicationExec = builtins.concatStringsSep " " ( + [ + serverPackageExe + "--application" + enabledConfig + ] + ++ cfg.extraApplicationFlags + ); in { options = { @@ -84,6 +114,19 @@ in }; }; + extraServerFlags = mkOption { + type = types.listOf types.str; + description = "Flags to add to the wivrn service."; + default = [ ]; + example = ''[ "--no-publish-service" ]''; + }; + + extraApplicationFlags = mkOption { + type = types.listOf types.str; + description = "Flags to add to the wivrn-application service. This is NOT the WiVRn startup application."; + default = [ ]; + }; + extraPackages = mkOption { type = types.listOf types.package; description = "Packages to add to the wivrn-application service $PATH."; @@ -96,17 +139,17 @@ in json = mkOption { type = configFormat.type; description = '' - Configuration for WiVRn. The attributes are serialized to JSON in config.json. + Configuration for WiVRn. The attributes are serialized to JSON in config.json. If a config or certain attributes are not provided, the server will default to stock values. Note that the application option must be either a package or a list with package as the first element. - See https://github.com/Meumeu/WiVRn/blob/master/docs/configuration.md + See https://github.com/WiVRn/WiVRn/blob/master/docs/configuration.md ''; default = { }; example = literalExpression '' { - scale = 0.8; + scale = 0.5; bitrate = 100000000; encoders = [ { @@ -119,7 +162,6 @@ in } ]; application = [ pkgs.wlx-overlay-s ]; - tcp_only = true; } ''; }; @@ -130,14 +172,14 @@ in config = mkIf cfg.enable { assertions = [ { - assertion = !applicationCheck || isDerivation applicationBinary; + assertion = !applicationCheck || isDerivation applicationAttr; message = "The application in WiVRn configuration is not a package. Please ensure that the application is a package or that a package is the first element in the list."; } ]; systemd.user = { services = { - # The WiVRn server runs in a hardened service and starts the applications in a different service + # The WiVRn server runs in a hardened service and starts the application in a different service wivrn = { description = "WiVRn XR runtime service"; environment = { @@ -148,9 +190,7 @@ in IPC_EXIT_ON_DISCONNECT = "off"; } // cfg.monadoEnvironment; serviceConfig = { - ExecStart = ( - (getExe cfg.package) + " --systemd" + optionalString cfg.config.enable " -f ${configFile}" - ); + ExecStart = serverExec; # Hardening options CapabilityBoundingSet = [ "CAP_SYS_NICE" ]; AmbientCapabilities = [ "CAP_SYS_NICE" ]; @@ -169,34 +209,24 @@ in RestrictSUIDSGID = true; }; wantedBy = mkIf cfg.autoStart [ "default.target" ]; - restartTriggers = [ - cfg.package - configFile - ]; + restartTriggers = [ cfg.package ]; }; wivrn-application = mkIf applicationCheck { description = "WiVRn application service"; requires = [ "wivrn.service" ]; serviceConfig = { - ExecStart = ( - (getExe cfg.package) + " --application" + optionalString cfg.config.enable " -f ${configFile}" - ); + ExecStart = applicationExec; Restart = "on-failure"; RestartSec = 0; PrivateTmp = true; }; - # We need to add the application to PATH so WiVRn can find it - path = [ applicationPath ] ++ cfg.extraPackages; + path = [ applicationPackage ] ++ cfg.extraPackages; }; }; }; services = { - # WiVRn can be used with some wired headsets so we include xr-hardware - udev.packages = with pkgs; [ - android-udev-rules - xr-hardware - ]; + udev.packages = with pkgs; [ android-udev-rules ]; avahi = { enable = true; publish = { @@ -214,7 +244,7 @@ in environment = { systemPackages = [ cfg.package - applicationPath + applicationPackage ]; pathsToLink = [ "/share/openxr" ]; etc."xdg/openxr/1/active_runtime.json" = mkIf cfg.defaultRuntime { From b43c292077a5f8266e19da99edf936624645d037 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Ga=C5=82kowski?= Date: Sat, 7 Dec 2024 02:46:47 +0100 Subject: [PATCH 053/100] lisp-modules: detect circular dependencies during quicklisp import Quicklisp's October 2024 release had such a problem between the new packages qvm and cl-quil. It caused an issue with the "nixpkgs-review" tool because the Nix interpreter was stopping with an error due to too much recursion. --- .../import/repository/quicklisp.lisp | 38 ++++++++++++++----- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/pkgs/development/lisp-modules/import/repository/quicklisp.lisp b/pkgs/development/lisp-modules/import/repository/quicklisp.lisp index 9666fc9fba2a..634795ab17a4 100644 --- a/pkgs/development/lisp-modules/import/repository/quicklisp.lisp +++ b/pkgs/development/lisp-modules/import/repository/quicklisp.lisp @@ -120,16 +120,34 @@ asds 'vector)))))) - ;; Skip known broken systems and their dependents - (dolist (system *broken-systems*) - (sql-query - "with recursive broken(name) as ( - select ? - union - select s.name from quicklisp_system s, broken b - where b.name in (select value from json_each(deps)) - ) delete from quicklisp_system where name in (select name from broken)" - system)) + ;; Weed out circular dependencies from the package graph. + (sqlite:with-transaction db + (sql-query "create temp table will_delete (root,name)") + (loop for (system) in (sql-query "select name from quicklisp_system") do + (when (sql-query + "with recursive dep(root, name) as ( + select s.name, d.value + from quicklisp_system s + cross join json_each(s.deps) d + where s.name = ? + union + select dep.root, d.value + from quicklisp_system s, dep + cross join json_each(s.deps) d + where s.name = dep.name + ) select 1 from dep where name = root" + system) + (sql-query + "with recursive broken(name) as ( + select ? + union + select s.name from quicklisp_system s, broken b + where b.name in (select value from json_each(s.deps)) + ) insert into will_delete select ?, name from broken" + system system))) + (loop for (root name) in (sql-query "select root, name from will_delete") do + (warn "Circular dependency in '~a': Omitting '~a'" root name) + (sql-query "delete from quicklisp_system where name = ?" name))) (sqlite:with-transaction db ;; Should these be temp tables, that then get queried by From 8a8487fc1b7fdd9f68f097e344cf49b29881f71a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 28 Nov 2024 01:30:30 +0100 Subject: [PATCH 054/100] python312Packages.pybids: 0.17.2 -> 0.18.1 --- .../python-modules/pybids/default.nix | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index aaf3efd234cd..e7c8750ad8ee 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, formulaic, click, @@ -19,14 +19,21 @@ buildPythonPackage rec { pname = "pybids"; - version = "0.17.2"; + version = "0.18.1"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-4MpFXGh2uOHCjMa213CF6QzKCyEQNiN1moyNolEcySQ="; + src = fetchFromGitHub { + owner = "bids-standard"; + repo = "pybids"; + rev = version; + hash = "sha256-nSBc4vhkCdRo7CNBwvJreCiwoxJK6ztyI5gvcpzYZ/Y="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + ''; + pythonRelaxDeps = [ "formulaic" "sqlalchemy" @@ -54,16 +61,15 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + disabledTestPaths = [ + # Could not connect to the endpoint URL + "src/bids/layout/tests/test_remote_bids.py" + ]; + disabledTests = [ - # Test looks for missing data - "test_config_filename" # Regression associated with formulaic >= 0.6.0 # (see https://github.com/bids-standard/pybids/issues/1000) "test_split" - # AssertionError, TypeError - "test_run_variable_collection_bad_length_to_df_all_dense_var" - "test_extension_initial_dot" - "test_to_df" ]; meta = { From 4d5a42681aacd9d62b64dd977ab951947f58790c Mon Sep 17 00:00:00 2001 From: Alex James Date: Fri, 6 Dec 2024 18:58:14 -0600 Subject: [PATCH 055/100] wormhole-william: install shell completions --- pkgs/by-name/wo/wormhole-william/package.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/wo/wormhole-william/package.nix b/pkgs/by-name/wo/wormhole-william/package.nix index aeecc73e64d9..eaf637ea3843 100644 --- a/pkgs/by-name/wo/wormhole-william/package.nix +++ b/pkgs/by-name/wo/wormhole-william/package.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "wormhole-william"; @@ -22,6 +22,15 @@ buildGoModule rec { "SkipWormholeDirectoryTransportSendRecvDirect" ''; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd wormhole-william \ + --bash <($out/bin/wormhole-william shell-completion bash) \ + --fish <($out/bin/wormhole-william shell-completion fish) \ + --zsh <($out/bin/wormhole-william shell-completion zsh) + ''; + meta = with lib; { homepage = "https://github.com/psanford/wormhole-william"; description = "End-to-end encrypted file transfers"; From 25261a0199d65d11402949c711b8b6c29debbc1e Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 4 Dec 2024 16:37:06 +0800 Subject: [PATCH 056/100] harbor-cli: 0.0.1 -> 0.0.2 --- pkgs/by-name/ha/harbor-cli/package.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ha/harbor-cli/package.nix b/pkgs/by-name/ha/harbor-cli/package.nix index c47f50ecc2aa..4b9213239337 100644 --- a/pkgs/by-name/ha/harbor-cli/package.nix +++ b/pkgs/by-name/ha/harbor-cli/package.nix @@ -10,16 +10,18 @@ buildGoModule rec { pname = "harbor-cli"; - version = "0.0.1"; + version = "0.0.2"; src = fetchFromGitHub { owner = "goharbor"; repo = "harbor-cli"; rev = "v${version}"; - hash = "sha256-WSADuhr6p8N0Oh1xIG7yItM6t0EWUiAkzNbdKsSc4WA="; + hash = "sha256-baS4UHjmE2eURFMDBhXbx9lcKPArb2RH2NVDt3MPE4s="; }; - vendorHash = "sha256-UUD9/5+McR1t5oO4/6TSScT7hhSKM0OpBf94LVQG1Pw="; + vendorHash = "sha256-rw2VPRi0VTm7/zVnQ8zL5f4mbzYKnmuxgCbgrpcukaU="; + + excludedPackages = [ "dagger" ]; nativeBuildInputs = [ installShellFiles ]; @@ -29,7 +31,11 @@ buildGoModule rec { "-X github.com/goharbor/harbor-cli/cmd/harbor/internal/version.Version=${version}" ]; + doCheck = false; # Network required + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + export HOME="$(mktemp -d)" + installShellCompletion --cmd harbor \ --bash <($out/bin/harbor completion bash) \ --fish <($out/bin/harbor completion fish) \ @@ -38,7 +44,7 @@ buildGoModule rec { passthru.tests.version = testers.testVersion { package = harbor-cli; - command = "harbor version"; + command = "HOME=\"$(mktemp -d)\" harbor version"; }; meta = { From 84225e0e3594db5b498b1d100608eeb06e7e20e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 7 Dec 2024 09:13:07 +0100 Subject: [PATCH 057/100] scarab: 2.5.0.0 -> 2.6.0.0 --- pkgs/by-name/sc/scarab/deps.nix | 1590 +++++++++++++++++++++++----- pkgs/by-name/sc/scarab/package.nix | 15 +- 2 files changed, 1319 insertions(+), 286 deletions(-) diff --git a/pkgs/by-name/sc/scarab/deps.nix b/pkgs/by-name/sc/scarab/deps.nix index 10d83f3ec4a9..c20aa86843ee 100644 --- a/pkgs/by-name/sc/scarab/deps.nix +++ b/pkgs/by-name/sc/scarab/deps.nix @@ -1,277 +1,1321 @@ # This file was automatically generated by passthru.fetch-deps. # Please dont edit it manually, your changes might get overwritten! -{ fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "11.0.0"; hash = "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E="; }) - (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; hash = "sha256-TWop9cvak6cMv2vrA/GlpuYBxS8Fuj5UmupGIV7Q5Ks="; }) - (fetchNuGet { pname = "Avalonia.AvaloniaEdit"; version = "11.0.0"; hash = "sha256-8lJBbbUn6RP4+8qO7VMDdL334o6hTf3Lj3EgIA75K4o="; }) - (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.28"; hash = "sha256-7NQWQl3xrBDOXhGihCkt5DIrws48KyDGon/7+gPzMDU="; }) - (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.0"; hash = "sha256-xzbJvbOYGHtd8rtKgsMTtOarbVQ8mIvs7IruODv8jxs="; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.0"; hash = "sha256-Ukvt2JebIWb+y1x77EAVl2Nbay92OX30k5TdwElvjGI="; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.0"; hash = "sha256-jopgP4nMzEqrMuzCpUSd30j1uNMS8vcCO125U8YKwyM="; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.0"; hash = "sha256-6dqx4JIrmjnDDa1mhI7CCiKPfaIR1qDK+ZZrl1OgnYw="; }) - (fetchNuGet { pname = "Avalonia.Fonts.Inter"; version = "11.0.0"; hash = "sha256-VaWAQk1+LlaKokkAg2je5jKUajmIySJ65Dh5KE+ac+0="; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.0"; hash = "sha256-Q18zDlzjXApnV1hANvh/OQGmKSdB/ajZ84bTgRhFWhA="; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.0"; hash = "sha256-UOf5jXEGg6tTnWgX8qLQ5raythkusO/gN5BjHtC+/Mg="; }) - (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.0"; hash = "sha256-EBugQUNJI6xw21jul16bineWU0y5aCAZ/XUJqYQzF7o="; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0"; hash = "sha256-gkVpdbk/0RDM7Hhq0jwZwltDpTsGRmbX+ZFTjWYYoKw="; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0"; hash = "sha256-A01nrs3Ij1eTo6tPmu7++T1K+Wo/H/9LvpeuOUGbQeU="; }) - (fetchNuGet { pname = "Avalonia.Svg"; version = "11.0.0.1"; hash = "sha256-7p/doak1h7bNtjAvnELCR5WtiGmCbFkrSF5Wds3rwSg="; }) - (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "11.0.0.1"; hash = "sha256-zpkQcv1tF45cUV+POzhND52ntUcV2qU0e7ww3HB+3K8="; }) - (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.0"; hash = "sha256-temZl8DKFuhIewVQDAqq1b+sF1RLfZ8CoZ0Eho41h+M="; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.0"; hash = "sha256-o+bNmGBLiQoBTPXb6Ban1AmwvR6bbKmTE5HY6EslV7Y="; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.0"; hash = "sha256-zyA2ZKathdIO48GjfG0bQdWjGLgd7ohIGw8O7mX+pL0="; }) - (fetchNuGet { pname = "Castle.Core"; version = "5.1.1"; hash = "sha256-oVkQB+ON7S6Q27OhXrTLaxTL0kWB58HZaFFuiw4iTrE="; }) - (fetchNuGet { pname = "ColorTextBlock.Avalonia"; version = "11.0.0-d1"; hash = "sha256-8EEmUYrMLBdZ4gNolsiBTkFWjRTB3TWVXkH0H8J1xe0="; }) - (fetchNuGet { pname = "ColorTextBlock.Avalonia"; version = "11.0.2"; hash = "sha256-FmaYhszWp/VCIp4BUnWXGMQr62WzVNUo/IKEbN59bX8="; }) - (fetchNuGet { pname = "coverlet.collector"; version = "1.3.0"; hash = "sha256-HoiYZuABqQdt6Sm1KvMm4MLLYCyWuB4DT6WZp2BqxUw="; }) - (fetchNuGet { pname = "DryIoc.dll"; version = "5.4.1"; hash = "sha256-xhbD2H92TyN4LtP+HIywa6emLsOZDhoxqbGeeAtTarU="; }) - (fetchNuGet { pname = "DryIoc.Microsoft.DependencyInjection"; version = "6.2.0"; hash = "sha256-C06B0tj3qFkVVGL0kSflf88As4t9TRaw/++N05Zaz0c="; }) - (fetchNuGet { pname = "DynamicData"; version = "7.9.5"; hash = "sha256-3XjOMuFathku9oWyss360+Ze5UMP7tSmUbMoax7qONU="; }) - (fetchNuGet { pname = "ExCSS"; version = "4.1.4"; hash = "sha256-7dKCwRC+Jt4CTLz9LF3LpmaB8ch1HFrcan7CmM3toPg="; }) - (fetchNuGet { pname = "FakeItEasy"; version = "8.0.0-alpha.1.10"; hash = "sha256-+FLBsGvUV+B17vhqNRmWYOUAWa0zI5pYPlcJGb1iIhE="; }) - (fetchNuGet { pname = "Fizzler"; version = "1.2.1"; hash = "sha256-FROW1WzitXTauf2Hn7YejOLqNKN2Nd+Q2etFB1pYsvA="; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; hash = "sha256-4tbdgUabPjlkBm3aUFeocj4Fdslmms2olDFpzOLyqoQ="; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; hash = "sha256-3xwVfNfKTkuLdnT+e3bfG9tNTdEmar7ByzY+NTlUKLg="; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; hash = "sha256-ZohUEaovj/sRB4rjuJIOq6S9eim3m+qMlpHIebNDTRQ="; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; hash = "sha256-ZsiBGpXfODHUHPgU/50k9QR/j6Klo7rsB0SUt8zYcBA="; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; hash = "sha256-5GSzM5IUoOwK+zJg0d74WlT3n1VZly8pKlyjiqVocCI="; }) - (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.42"; hash = "sha256-y1sdZXb4+wjvH5gmwyBZOn5CLid7lTHgxEsy13BgdjM="; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.2.0"; hash = "sha256-Um10fSmO+21I7f+lbzzVq5e8GBijJ9amTvOlt362p1s="; }) - (fetchNuGet { pname = "Markdown.Avalonia"; version = "11.0.2"; hash = "sha256-UxkZQezuimp+K2y+MQvB4tcj2lqmodku585diu9wods="; }) - (fetchNuGet { pname = "Markdown.Avalonia.Html"; version = "11.0.2"; hash = "sha256-mBxg9ETSWmcS5HuaNTxqy9RCAvBuaUAb44619GghX/Y="; }) - (fetchNuGet { pname = "Markdown.Avalonia.Svg"; version = "11.0.2"; hash = "sha256-4wdhRhwBTTA0+1S8Z1rj/EzuLDOk/h+tYBPW+9VXvug="; }) - (fetchNuGet { pname = "Markdown.Avalonia.SyntaxHigh"; version = "11.0.2"; hash = "sha256-F+A56Zw+smQJhB4Wd8P1Bcm0jqSBUw7y21S4GDnIJzY="; }) - (fetchNuGet { pname = "Markdown.Avalonia.Tight"; version = "11.0.0-d1"; hash = "sha256-0ze59lFF8zq7ylWlu5roKAfrsn2ESbZ41LptjvmYSU8="; }) - (fetchNuGet { pname = "Markdown.Avalonia.Tight"; version = "11.0.2"; hash = "sha256-9P3/ZCF1psp8VoZMzJJlnoqz2y2EytmBGDc4QXIS4tc="; }) - (fetchNuGet { pname = "MessageBox.Avalonia"; version = "2.3.1-rc1"; hash = "sha256-inBUfNAFAD+OgQ3/9830uOd7mx+GTgTRKrsoXtLD+48="; }) - (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.36"; hash = "sha256-9jDkWbjw/nd8yqdzVTagCuqr6owJ/DUMi4BlUZT4hWU="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.36"; hash = "sha256-JQULJyF0ivLoUU1JaFfK/HHg+/qzpN7V2RR2Cc+WlQ4="; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.36"; hash = "sha256-zUsVIpV481vMLAXaLEEUpEMA9/f1HGOnvaQnaWdzlyY="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; hash = "sha256-KDbCfsBWSJ5ohEXUKp1s1LX9xA2NPvXE/xVzj68EdC0="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; hash = "sha256-3G9vSc/gHH7FWgOySLTut1+eEaf3H66qcPOvNPLOx4o="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; hash = "sha256-i/r3V/No/VzqmJlWxpGoirvlbJDbBPa/ONZtzYrxuc4="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; hash = "sha256-fA9Qu+vTyMZ9REzxJ4aMg/SHCDRk4q9k4ZGUdynoHnA="; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; hash = "sha256-866jMHp8kbc1FYpKuUWnd7ViU6kGJTAxPcL/IjXrT0I="; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.7.1"; hash = "sha256-pHVwPobSO66j5rn+mU3g3asXZKJGO3oj840VQobhWbk="; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; hash = "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; hash = "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8="; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; hash = "sha256-N2DHyHiaNvYDQ77f8HI0gE0uIX2aj/rvejVGdCXRP4g="; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; hash = "sha256-55lsa2QdX1CJn1TpW1vTnkvbGXKCeE9P0O6AkW49LaA="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; hash = "sha256-rr/NXIZ/3FG5FYGrHD7iIIr12AksP4CnfUy1YvEdDa8="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; hash = "sha256-uoMkX/TnwP0YabThacTMmyxdc9itQp73CN7xEFFox74="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; hash = "sha256-pj9I/2HpCU7bLu002/Bb5NF+ofUrJ3IyH7yVqfP8IC0="; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; hash = "sha256-AGnfNNDvZDGZ0Er9JQxeyLoUbVH+jfXF3anFr12qk6w="; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.7.1"; hash = "sha256-yE1At8TgGCK3xQip5kpF1aPT722escTNsaIrcuSNHXs="; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.36"; hash = "sha256-9lC/LYnthYhjkWWz2kkFCvlA5LJOv11jdt59SDnpdy0="; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.36"; hash = "sha256-VFRDzx7LJuvI5yzKdGmw/31NYVbwHWPKQvueQt5xc10="; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.36"; hash = "sha256-9LZgVoIFF8qNyUu8kdJrYGLutMF/cL2K82HN2ywwlx8="; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.36"; hash = "sha256-k3rxvUhCEU0pVH8KgEMtkPiSOibn+nBh+0zT2xIfId8="; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.36"; hash = "sha256-U8wJ2snSDFqeAgDVLXjnniidC7Cr5aJ1/h/BMSlyu0c="; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; hash = "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.7.1"; hash = "sha256-wKuZ0tdSRd74JWnkQHKWI5qasojIkF1imLf9lxL0LWk="; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.7.1"; hash = "sha256-GlL8dJCdJoTxAT1v3CpTY68oKNvJfmDjQPom27MBM/Y="; }) - (fetchNuGet { pname = "Microsoft.Toolkit.HighPerformance"; version = "7.1.2"; hash = "sha256-qzNmWXboGnrGTRESKFv0WZ5oxRg30XDODxpRgCsoiaI="; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; hash = "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; hash = "sha256-WWLh+v9Y9as+WURW8tUPowQB8HWIiVJzbpKzEWTdMqI="; }) - (fetchNuGet { pname = "Projektanker.Icons.Avalonia"; version = "6.6.0-rc1.1"; hash = "sha256-UiY/xQ86e4SrkFpaYFgSEGcPpgkxie5y6KsGlp9gShM="; }) - (fetchNuGet { pname = "Projektanker.Icons.Avalonia.FontAwesome"; version = "6.6.0-rc1.1"; hash = "sha256-rIcR1IlWjVO8cTW5Q93PCXnljNI3S/WQv+o4YXR77dc="; }) - (fetchNuGet { pname = "PropertyChanged.SourceGenerator"; version = "1.0.8"; hash = "sha256-piqoZmrDv/JSotsAoYsW33ry4YepELfRMZz9qINszxc="; }) - (fetchNuGet { pname = "ReactiveUI"; version = "18.3.1"; hash = "sha256-1rf4icGRKTR3XIWJpkQJCG7ObRM+72ITB5K+ND1is9M="; }) - (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 = "Semi.Avalonia"; version = "11.0.0"; hash = "sha256-se/sc0QsAhzTv82JmBHoJ1jcmokqDZih8eEEX8CkR8s="; }) - (fetchNuGet { pname = "Serilog"; version = "3.0.1"; hash = "sha256-cfcZXT2eQ4K6RQ0twDYPN5jkDpG9dYqpmHJX4zWrL+o="; }) - (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "7.0.0"; hash = "sha256-Wf0Kb6YhvvIXNI0P/uOQP691DdlKuoNohpKMkp18bWE="; }) - (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.1.0"; hash = "sha256-MXIj6YJ4GQbUS8553InMUZPPEfr8h33q2GtAhyu88+Y="; }) - (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 = "SerilogAnalyzer"; version = "0.15.0"; hash = "sha256-NG0osFNhuVIHDUOd3ZUpygSd0foH3C2QwECURL9nA00="; }) - (fetchNuGet { pname = "ShimSkiaSharp"; version = "1.0.0.1"; hash = "sha256-j9V8IDg7vmnWNV65pDZ/wgj5wKLcmb4Fdbf8vbcP6sc="; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; hash = "sha256-WyMAjnQt8ZsuWpGLI89l/f4bHvv+cg7FdTAL7CtJBvs="; }) - (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.3"; hash = "sha256-ykTtwAzO+ne5Wmss/IDvfUlR84wG5Xx0/AOC590Xvys="; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; hash = "sha256-eExWAAURgnwwm2fRwsK/rf+TeOAPs2n02XZzC0zeUjU="; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; hash = "sha256-8G4swiLMr6XS3kjfO/YC1PyoVdfSq7nxZthZZ+KTKqQ="; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.3"; hash = "sha256-/SkV2pIZnt0ziSKB7gt7U2Rltk2Id+zOzbmqgfWUtvA="; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; hash = "sha256-2PhMTwRHitT13KCKiZltKIFieAvNY4jBmVZ2ndVynA8="; }) - (fetchNuGet { pname = "Splat"; version = "14.4.1"; hash = "sha256-i1yzIVpKdFjZMI4J8H970nZCxszklgDitYTEKKz0zA8="; }) - (fetchNuGet { pname = "Splat"; version = "14.6.37"; hash = "sha256-UPRwJetwHR31Z7sw7c0dojnvlFAmDNQEF7RXssiMQuY="; }) - (fetchNuGet { pname = "Splat"; version = "14.7.1"; hash = "sha256-RzNQU8tTstC1MBZL6D11Ivq69pmPvl+A9eT9zXhdSOc="; }) - (fetchNuGet { pname = "Splat.Microsoft.Extensions.DependencyInjection"; version = "14.6.37"; hash = "sha256-xq6jSI/go1Lt6hs1nhK5Gmqs0imX6iJF6vLXGWQEC98="; }) - (fetchNuGet { pname = "Splat.Serilog"; version = "14.7.1"; hash = "sha256-EjoEF7a7qyJRVhyTVJUfoIoPwhFKfrSTVXdn1aVIvHU="; }) - (fetchNuGet { pname = "Svg.Custom"; version = "1.0.0.1"; hash = "sha256-bRCllLNP+95+xov0ttRzvAgqCJ/x/BfOFPooVNcNngI="; }) - (fetchNuGet { pname = "Svg.Model"; version = "1.0.0.1"; hash = "sha256-xrOGrMYTWvblI0BMMhVMv9Vm2x9rlJfRhvsb5Zel1E8="; }) - (fetchNuGet { pname = "Svg.Skia"; version = "1.0.0.1"; hash = "sha256-fsuiMVlaDaZpHq387kugQhFPpIuW0E5KMZ6J8O09iPw="; }) - (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.Collections"; version = "4.0.11"; hash = "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="; }) - (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 = "1.6.0"; hash = "sha256-gnu+8nN48GAd4GRgeB5cAQmW7VnCubL/8h7zO377fd0="; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; hash = "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; hash = "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="; }) - (fetchNuGet { pname = "System.Console"; version = "4.3.0"; hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; hash = "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="; }) - (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.0.1"; hash = "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="; }) - (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.Dynamic.Runtime"; version = "4.0.11"; hash = "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; hash = "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; }) - (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.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) - (fetchNuGet { pname = "System.IO.Abstractions"; version = "19.2.29"; hash = "sha256-CTB8tE7mtG2ZCi4mRo8pS8IRsRkgIXdcD9yM94eJRbQ="; }) - (fetchNuGet { pname = "System.IO.Abstractions.TestingHelpers"; version = "19.2.29"; hash = "sha256-2psTGHZlJESXZcPdpCw6pAHOApmn4b+qmbhWWxTZQSE="; }) - (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.0.1"; hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; hash = "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="; }) - (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.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; hash = "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; }) - (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.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; hash = "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="; }) - (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.Linq"; version = "5.0.0"; hash = "sha256-K2t5JSmwsqWtYZj9IUGUdnCJaJlhCII07KtHP8Iu4B4="; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; hash = "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; hash = "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; hash = "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; hash = "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; hash = "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; hash = "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; hash = "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; hash = "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; hash = "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; hash = "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; hash = "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; hash = "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; hash = "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; hash = "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="; }) - (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.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; hash = "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="; }) - (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.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; }) - (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.Text.Encoding"; version = "4.0.11"; hash = "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; hash = "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; hash = "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; hash = "sha256-tF8qt9GZh/nPy0mEnj6nKLG4Lldpoi/D8xM5lv2CoYQ="; }) - (fetchNuGet { pname = "System.Text.Json"; version = "7.0.0"; hash = "sha256-198zqA6NR4lGCKgpdy/ptkS0jsYRT6KUjewtfi4Fi2k="; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; }) - (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; hash = "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="; }) - (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.ValueTuple"; version = "4.5.0"; hash = "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; hash = "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; hash = "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; }) - (fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "19.2.29"; hash = "sha256-/WRBPWmUeiVDsj5HDXum1O5gJB2VZG93uEytNvhK7gE="; }) - (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.TestingHelpers"; version = "19.2.29"; hash = "sha256-ZfmcWG0jhZuub3Xm/6iOSC+v7Ua/DXaJYCsJ6TwSJ8g="; }) - (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "19.2.29"; hash = "sha256-fzhNO4mkQuf9iKIMV/f3HTzA4+bHPMtzCCeYyMkv07k="; }) - (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; hash = "sha256-4gk2vXDjKFaBh82gTkwg3c/5GRjiH+bvM5elfDSbKTU="; }) - (fetchNuGet { pname = "xunit"; version = "2.4.1"; hash = "sha256-QGDuE0ZnsxyEJONP8GcJ80PmPeb+OawwdSW8y72aw3U="; }) - (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; hash = "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM="; }) - (fetchNuGet { pname = "xunit.analyzers"; version = "0.10.0"; hash = "sha256-8lRZhogXHYksa9ChnkFXpBnTMlLlYIvu3Av7qQYWwJY="; }) - (fetchNuGet { pname = "xunit.assert"; version = "2.4.1"; hash = "sha256-hl1cMSakAlwkpFEchxCNMdvQie6PMJ1uFrhzgOC3vsY="; }) - (fetchNuGet { pname = "xunit.core"; version = "2.4.1"; hash = "sha256-KgUgAIJIPHQ5VQ4FiB+i5u2JXSYxmvMCV8zXP4kcy9o="; }) - (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.4.1"; hash = "sha256-oACVOrvF4XmKFr+8ZqPVpjbopZgeRwaXveJGW2XUeIA="; }) - (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.4.1"; hash = "sha256-KmKEdgsUq4zuQJ2saJA0YT1CIZ2AuhZL5V7cF2Cncd0="; }) - (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.4.3"; hash = "sha256-42axn0yDDiJWKV8UEYzYWgiKbpc6mHh9M/eeylYGLUg="; }) +{ fetchNuGet }: +[ + (fetchNuGet { + pname = "Avalonia"; + version = "11.0.0"; + hash = "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E="; + }) + (fetchNuGet { + pname = "Avalonia.Angle.Windows.Natives"; + version = "2.1.0.2023020321"; + hash = "sha256-TWop9cvak6cMv2vrA/GlpuYBxS8Fuj5UmupGIV7Q5Ks="; + }) + (fetchNuGet { + pname = "Avalonia.AvaloniaEdit"; + version = "11.0.0"; + hash = "sha256-8lJBbbUn6RP4+8qO7VMDdL334o6hTf3Lj3EgIA75K4o="; + }) + (fetchNuGet { + pname = "Avalonia.BuildServices"; + version = "0.0.28"; + hash = "sha256-7NQWQl3xrBDOXhGihCkt5DIrws48KyDGon/7+gPzMDU="; + }) + (fetchNuGet { + pname = "Avalonia.Controls.ColorPicker"; + version = "11.0.0"; + hash = "sha256-xzbJvbOYGHtd8rtKgsMTtOarbVQ8mIvs7IruODv8jxs="; + }) + (fetchNuGet { + pname = "Avalonia.Controls.DataGrid"; + version = "11.0.0"; + hash = "sha256-Ukvt2JebIWb+y1x77EAVl2Nbay92OX30k5TdwElvjGI="; + }) + (fetchNuGet { + pname = "Avalonia.Desktop"; + version = "11.0.0"; + hash = "sha256-jopgP4nMzEqrMuzCpUSd30j1uNMS8vcCO125U8YKwyM="; + }) + (fetchNuGet { + pname = "Avalonia.Diagnostics"; + version = "11.0.0"; + hash = "sha256-6dqx4JIrmjnDDa1mhI7CCiKPfaIR1qDK+ZZrl1OgnYw="; + }) + (fetchNuGet { + pname = "Avalonia.Fonts.Inter"; + version = "11.0.0"; + hash = "sha256-VaWAQk1+LlaKokkAg2je5jKUajmIySJ65Dh5KE+ac+0="; + }) + (fetchNuGet { + pname = "Avalonia.FreeDesktop"; + version = "11.0.0"; + hash = "sha256-Q18zDlzjXApnV1hANvh/OQGmKSdB/ajZ84bTgRhFWhA="; + }) + (fetchNuGet { + pname = "Avalonia.Native"; + version = "11.0.0"; + hash = "sha256-UOf5jXEGg6tTnWgX8qLQ5raythkusO/gN5BjHtC+/Mg="; + }) + (fetchNuGet { + pname = "Avalonia.ReactiveUI"; + version = "11.0.0"; + hash = "sha256-EBugQUNJI6xw21jul16bineWU0y5aCAZ/XUJqYQzF7o="; + }) + (fetchNuGet { + pname = "Avalonia.Remote.Protocol"; + version = "11.0.0"; + hash = "sha256-gkVpdbk/0RDM7Hhq0jwZwltDpTsGRmbX+ZFTjWYYoKw="; + }) + (fetchNuGet { + pname = "Avalonia.Skia"; + version = "11.0.0"; + hash = "sha256-A01nrs3Ij1eTo6tPmu7++T1K+Wo/H/9LvpeuOUGbQeU="; + }) + (fetchNuGet { + pname = "Avalonia.Svg"; + version = "11.0.0.1"; + hash = "sha256-7p/doak1h7bNtjAvnELCR5WtiGmCbFkrSF5Wds3rwSg="; + }) + (fetchNuGet { + pname = "Avalonia.Svg.Skia"; + version = "11.0.0.1"; + hash = "sha256-zpkQcv1tF45cUV+POzhND52ntUcV2qU0e7ww3HB+3K8="; + }) + (fetchNuGet { + pname = "Avalonia.Themes.Simple"; + version = "11.0.0"; + hash = "sha256-temZl8DKFuhIewVQDAqq1b+sF1RLfZ8CoZ0Eho41h+M="; + }) + (fetchNuGet { + pname = "Avalonia.Win32"; + version = "11.0.0"; + hash = "sha256-o+bNmGBLiQoBTPXb6Ban1AmwvR6bbKmTE5HY6EslV7Y="; + }) + (fetchNuGet { + pname = "Avalonia.X11"; + version = "11.0.0"; + hash = "sha256-zyA2ZKathdIO48GjfG0bQdWjGLgd7ohIGw8O7mX+pL0="; + }) + (fetchNuGet { + pname = "Castle.Core"; + version = "5.1.1"; + hash = "sha256-oVkQB+ON7S6Q27OhXrTLaxTL0kWB58HZaFFuiw4iTrE="; + }) + (fetchNuGet { + pname = "ColorTextBlock.Avalonia"; + version = "11.0.0-d1"; + hash = "sha256-8EEmUYrMLBdZ4gNolsiBTkFWjRTB3TWVXkH0H8J1xe0="; + }) + (fetchNuGet { + pname = "ColorTextBlock.Avalonia"; + version = "11.0.2"; + hash = "sha256-FmaYhszWp/VCIp4BUnWXGMQr62WzVNUo/IKEbN59bX8="; + }) + (fetchNuGet { + pname = "coverlet.collector"; + version = "1.3.0"; + hash = "sha256-HoiYZuABqQdt6Sm1KvMm4MLLYCyWuB4DT6WZp2BqxUw="; + }) + (fetchNuGet { + pname = "DryIoc.dll"; + version = "5.4.1"; + hash = "sha256-xhbD2H92TyN4LtP+HIywa6emLsOZDhoxqbGeeAtTarU="; + }) + (fetchNuGet { + pname = "DryIoc.Microsoft.DependencyInjection"; + version = "6.2.0"; + hash = "sha256-C06B0tj3qFkVVGL0kSflf88As4t9TRaw/++N05Zaz0c="; + }) + (fetchNuGet { + pname = "DynamicData"; + version = "7.9.5"; + hash = "sha256-3XjOMuFathku9oWyss360+Ze5UMP7tSmUbMoax7qONU="; + }) + (fetchNuGet { + pname = "ExCSS"; + version = "4.1.4"; + hash = "sha256-7dKCwRC+Jt4CTLz9LF3LpmaB8ch1HFrcan7CmM3toPg="; + }) + (fetchNuGet { + pname = "FakeItEasy"; + version = "8.0.0-alpha.1.10"; + hash = "sha256-+FLBsGvUV+B17vhqNRmWYOUAWa0zI5pYPlcJGb1iIhE="; + }) + (fetchNuGet { + pname = "Fizzler"; + version = "1.2.1"; + hash = "sha256-FROW1WzitXTauf2Hn7YejOLqNKN2Nd+Q2etFB1pYsvA="; + }) + (fetchNuGet { + pname = "HarfBuzzSharp"; + version = "2.8.2.3"; + hash = "sha256-4tbdgUabPjlkBm3aUFeocj4Fdslmms2olDFpzOLyqoQ="; + }) + (fetchNuGet { + pname = "HarfBuzzSharp.NativeAssets.Linux"; + version = "2.8.2.3"; + hash = "sha256-3xwVfNfKTkuLdnT+e3bfG9tNTdEmar7ByzY+NTlUKLg="; + }) + (fetchNuGet { + pname = "HarfBuzzSharp.NativeAssets.macOS"; + version = "2.8.2.3"; + hash = "sha256-ZohUEaovj/sRB4rjuJIOq6S9eim3m+qMlpHIebNDTRQ="; + }) + (fetchNuGet { + pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; + version = "2.8.2.3"; + hash = "sha256-ZsiBGpXfODHUHPgU/50k9QR/j6Klo7rsB0SUt8zYcBA="; + }) + (fetchNuGet { + pname = "HarfBuzzSharp.NativeAssets.Win32"; + version = "2.8.2.3"; + hash = "sha256-5GSzM5IUoOwK+zJg0d74WlT3n1VZly8pKlyjiqVocCI="; + }) + (fetchNuGet { + pname = "HtmlAgilityPack"; + version = "1.11.42"; + hash = "sha256-y1sdZXb4+wjvH5gmwyBZOn5CLid7lTHgxEsy13BgdjM="; + }) + (fetchNuGet { + pname = "JetBrains.Annotations"; + version = "2023.2.0"; + hash = "sha256-Um10fSmO+21I7f+lbzzVq5e8GBijJ9amTvOlt362p1s="; + }) + (fetchNuGet { + pname = "Markdown.Avalonia"; + version = "11.0.2"; + hash = "sha256-UxkZQezuimp+K2y+MQvB4tcj2lqmodku585diu9wods="; + }) + (fetchNuGet { + pname = "Markdown.Avalonia.Html"; + version = "11.0.2"; + hash = "sha256-mBxg9ETSWmcS5HuaNTxqy9RCAvBuaUAb44619GghX/Y="; + }) + (fetchNuGet { + pname = "Markdown.Avalonia.Svg"; + version = "11.0.2"; + hash = "sha256-4wdhRhwBTTA0+1S8Z1rj/EzuLDOk/h+tYBPW+9VXvug="; + }) + (fetchNuGet { + pname = "Markdown.Avalonia.SyntaxHigh"; + version = "11.0.2"; + hash = "sha256-F+A56Zw+smQJhB4Wd8P1Bcm0jqSBUw7y21S4GDnIJzY="; + }) + (fetchNuGet { + pname = "Markdown.Avalonia.Tight"; + version = "11.0.0-d1"; + hash = "sha256-0ze59lFF8zq7ylWlu5roKAfrsn2ESbZ41LptjvmYSU8="; + }) + (fetchNuGet { + pname = "Markdown.Avalonia.Tight"; + version = "11.0.2"; + hash = "sha256-9P3/ZCF1psp8VoZMzJJlnoqz2y2EytmBGDc4QXIS4tc="; + }) + (fetchNuGet { + pname = "MessageBox.Avalonia"; + version = "2.3.1-rc1"; + hash = "sha256-inBUfNAFAD+OgQ3/9830uOd7mx+GTgTRKrsoXtLD+48="; + }) + (fetchNuGet { + pname = "MicroCom.Runtime"; + version = "0.11.0"; + hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.Analyzers"; + version = "3.0.0"; + hash = "sha256-KDbCfsBWSJ5ohEXUKp1s1LX9xA2NPvXE/xVzj68EdC0="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.Common"; + version = "3.8.0"; + hash = "sha256-3G9vSc/gHH7FWgOySLTut1+eEaf3H66qcPOvNPLOx4o="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.CSharp"; + version = "3.8.0"; + hash = "sha256-i/r3V/No/VzqmJlWxpGoirvlbJDbBPa/ONZtzYrxuc4="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; + version = "3.8.0"; + hash = "sha256-fA9Qu+vTyMZ9REzxJ4aMg/SHCDRk4q9k4ZGUdynoHnA="; + }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.Scripting.Common"; + version = "3.8.0"; + hash = "sha256-866jMHp8kbc1FYpKuUWnd7ViU6kGJTAxPcL/IjXrT0I="; + }) + (fetchNuGet { + pname = "Microsoft.CodeCoverage"; + version = "16.7.1"; + hash = "sha256-pHVwPobSO66j5rn+mU3g3asXZKJGO3oj840VQobhWbk="; + }) + (fetchNuGet { + pname = "Microsoft.CSharp"; + version = "4.0.1"; + hash = "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="; + }) + (fetchNuGet { + pname = "Microsoft.CSharp"; + version = "4.3.0"; + hash = "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.DependencyInjection"; + version = "7.0.0"; + hash = "sha256-N2DHyHiaNvYDQ77f8HI0gE0uIX2aj/rvejVGdCXRP4g="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "7.0.0"; + hash = "sha256-55lsa2QdX1CJn1TpW1vTnkvbGXKCeE9P0O6AkW49LaA="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Logging"; + version = "7.0.0"; + hash = "sha256-rr/NXIZ/3FG5FYGrHD7iIIr12AksP4CnfUy1YvEdDa8="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Logging.Abstractions"; + version = "7.0.0"; + hash = "sha256-uoMkX/TnwP0YabThacTMmyxdc9itQp73CN7xEFFox74="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Options"; + version = "7.0.0"; + hash = "sha256-pj9I/2HpCU7bLu002/Bb5NF+ofUrJ3IyH7yVqfP8IC0="; + }) + (fetchNuGet { + pname = "Microsoft.Extensions.Primitives"; + version = "7.0.0"; + hash = "sha256-AGnfNNDvZDGZ0Er9JQxeyLoUbVH+jfXF3anFr12qk6w="; + }) + (fetchNuGet { + pname = "Microsoft.NET.Test.Sdk"; + version = "16.7.1"; + hash = "sha256-yE1At8TgGCK3xQip5kpF1aPT722escTNsaIrcuSNHXs="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "1.0.1"; + hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "1.1.0"; + hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Platforms"; + version = "2.1.2"; + hash = "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Targets"; + version = "1.0.1"; + hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; + }) + (fetchNuGet { + pname = "Microsoft.NETCore.Targets"; + version = "1.1.0"; + hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; + }) + (fetchNuGet { + pname = "Microsoft.TestPlatform.ObjectModel"; + version = "16.7.1"; + hash = "sha256-wKuZ0tdSRd74JWnkQHKWI5qasojIkF1imLf9lxL0LWk="; + }) + (fetchNuGet { + pname = "Microsoft.TestPlatform.TestHost"; + version = "16.7.1"; + hash = "sha256-GlL8dJCdJoTxAT1v3CpTY68oKNvJfmDjQPom27MBM/Y="; + }) + (fetchNuGet { + pname = "Microsoft.Toolkit.HighPerformance"; + version = "7.1.2"; + hash = "sha256-qzNmWXboGnrGTRESKFv0WZ5oxRg30XDODxpRgCsoiaI="; + }) + (fetchNuGet { + pname = "Microsoft.Win32.Primitives"; + version = "4.3.0"; + hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; + }) + (fetchNuGet { + pname = "Microsoft.Win32.SystemEvents"; + version = "6.0.0"; + hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="; + }) + (fetchNuGet { + pname = "NETStandard.Library"; + version = "1.6.1"; + hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; + }) + (fetchNuGet { + pname = "Newtonsoft.Json"; + version = "9.0.1"; + hash = "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="; + }) + (fetchNuGet { + pname = "NuGet.Frameworks"; + version = "5.0.0"; + hash = "sha256-WWLh+v9Y9as+WURW8tUPowQB8HWIiVJzbpKzEWTdMqI="; + }) + (fetchNuGet { + pname = "Projektanker.Icons.Avalonia"; + version = "6.6.0-rc1.1"; + hash = "sha256-UiY/xQ86e4SrkFpaYFgSEGcPpgkxie5y6KsGlp9gShM="; + }) + (fetchNuGet { + pname = "Projektanker.Icons.Avalonia.FontAwesome"; + version = "6.6.0-rc1.1"; + hash = "sha256-rIcR1IlWjVO8cTW5Q93PCXnljNI3S/WQv+o4YXR77dc="; + }) + (fetchNuGet { + pname = "PropertyChanged.SourceGenerator"; + version = "1.0.8"; + hash = "sha256-piqoZmrDv/JSotsAoYsW33ry4YepELfRMZz9qINszxc="; + }) + (fetchNuGet { + pname = "ReactiveUI"; + version = "18.3.1"; + hash = "sha256-1rf4icGRKTR3XIWJpkQJCG7ObRM+72ITB5K+ND1is9M="; + }) + (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 = "Semi.Avalonia"; + version = "11.0.0"; + hash = "sha256-se/sc0QsAhzTv82JmBHoJ1jcmokqDZih8eEEX8CkR8s="; + }) + (fetchNuGet { + pname = "Serilog"; + version = "3.0.1"; + hash = "sha256-cfcZXT2eQ4K6RQ0twDYPN5jkDpG9dYqpmHJX4zWrL+o="; + }) + (fetchNuGet { + pname = "Serilog.Extensions.Logging"; + version = "7.0.0"; + hash = "sha256-Wf0Kb6YhvvIXNI0P/uOQP691DdlKuoNohpKMkp18bWE="; + }) + (fetchNuGet { + pname = "Serilog.Sinks.Console"; + version = "4.1.0"; + hash = "sha256-MXIj6YJ4GQbUS8553InMUZPPEfr8h33q2GtAhyu88+Y="; + }) + (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 = "SerilogAnalyzer"; + version = "0.15.0"; + hash = "sha256-NG0osFNhuVIHDUOd3ZUpygSd0foH3C2QwECURL9nA00="; + }) + (fetchNuGet { + pname = "ShimSkiaSharp"; + version = "1.0.0.1"; + hash = "sha256-j9V8IDg7vmnWNV65pDZ/wgj5wKLcmb4Fdbf8vbcP6sc="; + }) + (fetchNuGet { + pname = "SkiaSharp"; + version = "2.88.3"; + hash = "sha256-WyMAjnQt8ZsuWpGLI89l/f4bHvv+cg7FdTAL7CtJBvs="; + }) + (fetchNuGet { + pname = "SkiaSharp.HarfBuzz"; + version = "2.88.3"; + hash = "sha256-ykTtwAzO+ne5Wmss/IDvfUlR84wG5Xx0/AOC590Xvys="; + }) + (fetchNuGet { + pname = "SkiaSharp.NativeAssets.Linux"; + version = "2.88.3"; + hash = "sha256-eExWAAURgnwwm2fRwsK/rf+TeOAPs2n02XZzC0zeUjU="; + }) + (fetchNuGet { + pname = "SkiaSharp.NativeAssets.macOS"; + version = "2.88.3"; + hash = "sha256-8G4swiLMr6XS3kjfO/YC1PyoVdfSq7nxZthZZ+KTKqQ="; + }) + (fetchNuGet { + pname = "SkiaSharp.NativeAssets.WebAssembly"; + version = "2.88.3"; + hash = "sha256-/SkV2pIZnt0ziSKB7gt7U2Rltk2Id+zOzbmqgfWUtvA="; + }) + (fetchNuGet { + pname = "SkiaSharp.NativeAssets.Win32"; + version = "2.88.3"; + hash = "sha256-2PhMTwRHitT13KCKiZltKIFieAvNY4jBmVZ2ndVynA8="; + }) + (fetchNuGet { + pname = "Splat"; + version = "14.4.1"; + hash = "sha256-i1yzIVpKdFjZMI4J8H970nZCxszklgDitYTEKKz0zA8="; + }) + (fetchNuGet { + pname = "Splat"; + version = "14.6.37"; + hash = "sha256-UPRwJetwHR31Z7sw7c0dojnvlFAmDNQEF7RXssiMQuY="; + }) + (fetchNuGet { + pname = "Splat"; + version = "14.7.1"; + hash = "sha256-RzNQU8tTstC1MBZL6D11Ivq69pmPvl+A9eT9zXhdSOc="; + }) + (fetchNuGet { + pname = "Splat.Microsoft.Extensions.DependencyInjection"; + version = "14.6.37"; + hash = "sha256-xq6jSI/go1Lt6hs1nhK5Gmqs0imX6iJF6vLXGWQEC98="; + }) + (fetchNuGet { + pname = "Splat.Serilog"; + version = "14.7.1"; + hash = "sha256-EjoEF7a7qyJRVhyTVJUfoIoPwhFKfrSTVXdn1aVIvHU="; + }) + (fetchNuGet { + pname = "Svg.Custom"; + version = "1.0.0.1"; + hash = "sha256-bRCllLNP+95+xov0ttRzvAgqCJ/x/BfOFPooVNcNngI="; + }) + (fetchNuGet { + pname = "Svg.Model"; + version = "1.0.0.1"; + hash = "sha256-xrOGrMYTWvblI0BMMhVMv9Vm2x9rlJfRhvsb5Zel1E8="; + }) + (fetchNuGet { + pname = "Svg.Skia"; + version = "1.0.0.1"; + hash = "sha256-fsuiMVlaDaZpHq387kugQhFPpIuW0E5KMZ6J8O09iPw="; + }) + (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.Collections"; + version = "4.0.11"; + hash = "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="; + }) + (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 = "1.6.0"; + hash = "sha256-gnu+8nN48GAd4GRgeB5cAQmW7VnCubL/8h7zO377fd0="; + }) + (fetchNuGet { + pname = "System.Collections.Immutable"; + version = "5.0.0"; + hash = "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="; + }) + (fetchNuGet { + pname = "System.Collections.Immutable"; + version = "7.0.0"; + hash = "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="; + }) + (fetchNuGet { + pname = "System.ComponentModel.Annotations"; + version = "4.5.0"; + hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="; + }) + (fetchNuGet { + pname = "System.Console"; + version = "4.3.0"; + hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; + }) + (fetchNuGet { + pname = "System.Diagnostics.Debug"; + version = "4.0.11"; + hash = "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="; + }) + (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.0.1"; + hash = "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="; + }) + (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.Dynamic.Runtime"; + version = "4.0.11"; + hash = "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="; + }) + (fetchNuGet { + pname = "System.Dynamic.Runtime"; + version = "4.3.0"; + hash = "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="; + }) + (fetchNuGet { + pname = "System.Globalization"; + version = "4.0.11"; + hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; + }) + (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.1.0"; + hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; + }) + (fetchNuGet { + pname = "System.IO"; + version = "4.3.0"; + hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; + }) + (fetchNuGet { + pname = "System.IO.Abstractions"; + version = "19.2.29"; + hash = "sha256-CTB8tE7mtG2ZCi4mRo8pS8IRsRkgIXdcD9yM94eJRbQ="; + }) + (fetchNuGet { + pname = "System.IO.Abstractions.TestingHelpers"; + version = "19.2.29"; + hash = "sha256-2psTGHZlJESXZcPdpCw6pAHOApmn4b+qmbhWWxTZQSE="; + }) + (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.0.1"; + hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; + }) + (fetchNuGet { + pname = "System.IO.FileSystem"; + version = "4.3.0"; + hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; + }) + (fetchNuGet { + pname = "System.IO.FileSystem.Primitives"; + version = "4.0.1"; + hash = "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="; + }) + (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.Linq"; + version = "4.1.0"; + hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; + }) + (fetchNuGet { + pname = "System.Linq"; + version = "4.3.0"; + hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; + }) + (fetchNuGet { + pname = "System.Linq.Expressions"; + version = "4.1.0"; + hash = "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="; + }) + (fetchNuGet { + pname = "System.Linq.Expressions"; + version = "4.3.0"; + hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; + }) + (fetchNuGet { + pname = "System.Memory"; + version = "4.5.4"; + hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; + }) + (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.5.0"; + hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; + }) + (fetchNuGet { + pname = "System.ObjectModel"; + version = "4.0.12"; + hash = "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="; + }) + (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.Linq"; + version = "5.0.0"; + hash = "sha256-K2t5JSmwsqWtYZj9IUGUdnCJaJlhCII07KtHP8Iu4B4="; + }) + (fetchNuGet { + pname = "System.Reflection"; + version = "4.1.0"; + hash = "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="; + }) + (fetchNuGet { + pname = "System.Reflection"; + version = "4.3.0"; + hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; + }) + (fetchNuGet { + pname = "System.Reflection.Emit"; + version = "4.0.1"; + hash = "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="; + }) + (fetchNuGet { + pname = "System.Reflection.Emit"; + version = "4.3.0"; + hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; + }) + (fetchNuGet { + pname = "System.Reflection.Emit.ILGeneration"; + version = "4.0.1"; + hash = "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="; + }) + (fetchNuGet { + pname = "System.Reflection.Emit.ILGeneration"; + version = "4.3.0"; + hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; + }) + (fetchNuGet { + pname = "System.Reflection.Emit.Lightweight"; + version = "4.0.1"; + hash = "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="; + }) + (fetchNuGet { + pname = "System.Reflection.Emit.Lightweight"; + version = "4.3.0"; + hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; + }) + (fetchNuGet { + pname = "System.Reflection.Extensions"; + version = "4.0.1"; + hash = "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="; + }) + (fetchNuGet { + pname = "System.Reflection.Extensions"; + version = "4.3.0"; + hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; + }) + (fetchNuGet { + pname = "System.Reflection.Metadata"; + version = "5.0.0"; + hash = "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="; + }) + (fetchNuGet { + pname = "System.Reflection.Primitives"; + version = "4.0.1"; + hash = "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="; + }) + (fetchNuGet { + pname = "System.Reflection.Primitives"; + version = "4.3.0"; + hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; + }) + (fetchNuGet { + pname = "System.Reflection.TypeExtensions"; + version = "4.1.0"; + hash = "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="; + }) + (fetchNuGet { + pname = "System.Reflection.TypeExtensions"; + version = "4.3.0"; + hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; + }) + (fetchNuGet { + pname = "System.Resources.ResourceManager"; + version = "4.0.1"; + hash = "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="; + }) + (fetchNuGet { + pname = "System.Resources.ResourceManager"; + version = "4.3.0"; + hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; + }) + (fetchNuGet { + pname = "System.Runtime"; + version = "4.1.0"; + hash = "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="; + }) + (fetchNuGet { + pname = "System.Runtime"; + version = "4.3.0"; + hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; + }) + (fetchNuGet { + pname = "System.Runtime.CompilerServices.Unsafe"; + version = "4.7.1"; + hash = "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="; + }) + (fetchNuGet { + pname = "System.Runtime.Extensions"; + version = "4.1.0"; + hash = "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="; + }) + (fetchNuGet { + pname = "System.Runtime.Extensions"; + version = "4.3.0"; + hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; + }) + (fetchNuGet { + pname = "System.Runtime.Handles"; + version = "4.0.1"; + hash = "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="; + }) + (fetchNuGet { + pname = "System.Runtime.Handles"; + version = "4.3.0"; + hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; + }) + (fetchNuGet { + pname = "System.Runtime.InteropServices"; + version = "4.1.0"; + hash = "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="; + }) + (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.Numerics"; + version = "4.3.0"; + hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; + }) + (fetchNuGet { + pname = "System.Runtime.Serialization.Primitives"; + version = "4.1.1"; + hash = "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="; + }) + (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.X509Certificates"; + version = "4.3.0"; + hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; + }) + (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.Text.Encoding"; + version = "4.0.11"; + hash = "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="; + }) + (fetchNuGet { + pname = "System.Text.Encoding"; + version = "4.3.0"; + hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; + }) + (fetchNuGet { + pname = "System.Text.Encoding.CodePages"; + version = "4.5.1"; + hash = "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="; + }) + (fetchNuGet { + pname = "System.Text.Encoding.Extensions"; + version = "4.0.11"; + hash = "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="; + }) + (fetchNuGet { + pname = "System.Text.Encoding.Extensions"; + version = "4.3.0"; + hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; + }) + (fetchNuGet { + pname = "System.Text.Encodings.Web"; + version = "7.0.0"; + hash = "sha256-tF8qt9GZh/nPy0mEnj6nKLG4Lldpoi/D8xM5lv2CoYQ="; + }) + (fetchNuGet { + pname = "System.Text.Json"; + version = "7.0.0"; + hash = "sha256-198zqA6NR4lGCKgpdy/ptkS0jsYRT6KUjewtfi4Fi2k="; + }) + (fetchNuGet { + pname = "System.Text.RegularExpressions"; + version = "4.1.0"; + hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; + }) + (fetchNuGet { + pname = "System.Text.RegularExpressions"; + version = "4.3.0"; + hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; + }) + (fetchNuGet { + pname = "System.Threading"; + version = "4.0.11"; + hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; + }) + (fetchNuGet { + pname = "System.Threading"; + version = "4.3.0"; + hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks"; + version = "4.0.11"; + hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks"; + version = "4.3.0"; + hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; + }) + (fetchNuGet { + pname = "System.Threading.Tasks.Extensions"; + version = "4.0.0"; + hash = "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="; + }) + (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.ValueTuple"; + version = "4.5.0"; + hash = "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="; + }) + (fetchNuGet { + pname = "System.Xml.ReaderWriter"; + version = "4.0.11"; + hash = "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="; + }) + (fetchNuGet { + pname = "System.Xml.ReaderWriter"; + version = "4.3.0"; + hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; + }) + (fetchNuGet { + pname = "System.Xml.XDocument"; + version = "4.0.11"; + hash = "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="; + }) + (fetchNuGet { + pname = "System.Xml.XDocument"; + version = "4.3.0"; + hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; + }) + (fetchNuGet { + pname = "TestableIO.System.IO.Abstractions"; + version = "19.2.29"; + hash = "sha256-/WRBPWmUeiVDsj5HDXum1O5gJB2VZG93uEytNvhK7gE="; + }) + (fetchNuGet { + pname = "TestableIO.System.IO.Abstractions.TestingHelpers"; + version = "19.2.29"; + hash = "sha256-ZfmcWG0jhZuub3Xm/6iOSC+v7Ua/DXaJYCsJ6TwSJ8g="; + }) + (fetchNuGet { + pname = "TestableIO.System.IO.Abstractions.Wrappers"; + version = "19.2.29"; + hash = "sha256-fzhNO4mkQuf9iKIMV/f3HTzA4+bHPMtzCCeYyMkv07k="; + }) + (fetchNuGet { + pname = "Tmds.DBus.Protocol"; + version = "0.15.0"; + hash = "sha256-4gk2vXDjKFaBh82gTkwg3c/5GRjiH+bvM5elfDSbKTU="; + }) + (fetchNuGet { + pname = "xunit"; + version = "2.4.1"; + hash = "sha256-QGDuE0ZnsxyEJONP8GcJ80PmPeb+OawwdSW8y72aw3U="; + }) + (fetchNuGet { + pname = "xunit.abstractions"; + version = "2.0.3"; + hash = "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM="; + }) + (fetchNuGet { + pname = "xunit.analyzers"; + version = "0.10.0"; + hash = "sha256-8lRZhogXHYksa9ChnkFXpBnTMlLlYIvu3Av7qQYWwJY="; + }) + (fetchNuGet { + pname = "xunit.assert"; + version = "2.4.1"; + hash = "sha256-hl1cMSakAlwkpFEchxCNMdvQie6PMJ1uFrhzgOC3vsY="; + }) + (fetchNuGet { + pname = "xunit.core"; + version = "2.4.1"; + hash = "sha256-KgUgAIJIPHQ5VQ4FiB+i5u2JXSYxmvMCV8zXP4kcy9o="; + }) + (fetchNuGet { + pname = "xunit.extensibility.core"; + version = "2.4.1"; + hash = "sha256-oACVOrvF4XmKFr+8ZqPVpjbopZgeRwaXveJGW2XUeIA="; + }) + (fetchNuGet { + pname = "xunit.extensibility.execution"; + version = "2.4.1"; + hash = "sha256-KmKEdgsUq4zuQJ2saJA0YT1CIZ2AuhZL5V7cF2Cncd0="; + }) + (fetchNuGet { + pname = "xunit.runner.visualstudio"; + version = "2.4.3"; + hash = "sha256-42axn0yDDiJWKV8UEYzYWgiKbpc6mHh9M/eeylYGLUg="; + }) ] diff --git a/pkgs/by-name/sc/scarab/package.nix b/pkgs/by-name/sc/scarab/package.nix index 5f829b4a2805..bfc6d078c2d2 100644 --- a/pkgs/by-name/sc/scarab/package.nix +++ b/pkgs/by-name/sc/scarab/package.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "scarab"; - version = "2.5.0.0"; + version = "2.6.0.0"; src = fetchFromGitHub { owner = "fifty-six"; repo = "scarab"; rev = "refs/tags/v${version}"; - hash = "sha256-z1hmMrfeoYyjVEPPjWvUfKUKsOS7UsocSWMYrFY+/kI="; + hash = "sha256-xnvS3FDY4hi3yauwoSzO1fO6tJJAwFCkAc0Wzfs/puQ="; }; dotnet-sdk = dotnetCorePackages.sdk_8_0; @@ -26,17 +26,6 @@ buildDotnetModule rec { testProjectFile = "Scarab.Tests/Scarab.Tests.csproj"; executables = [ "Scarab" ]; - postPatch = '' - substituteInPlace Scarab/Scarab.csproj Scarab.Tests/Scarab.Tests.csproj \ - --replace-fail 'net6.0' 'net8.0' - ''; - - preConfigureNuGet = '' - # This should really be in the upstream nuget.config - dotnet nuget add source https://api.nuget.org/v3/index.json \ - -n nuget.org --configfile NuGet.Config - ''; - runtimeDeps = [ bc ]; From 0ae64adaa91ead284446e6ed2b80e8f72f454315 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 09:22:47 +0100 Subject: [PATCH 058/100] xsubfind3r: format with nixfmt --- pkgs/by-name/xs/xsubfind3r/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/xs/xsubfind3r/package.nix b/pkgs/by-name/xs/xsubfind3r/package.nix index 976624c16b60..1d776ed8f521 100644 --- a/pkgs/by-name/xs/xsubfind3r/package.nix +++ b/pkgs/by-name/xs/xsubfind3r/package.nix @@ -1,6 +1,7 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + buildGoModule, + fetchFromGitHub, }: buildGoModule rec { @@ -23,10 +24,10 @@ buildGoModule rec { meta = with lib; { description = "CLI utility to find subdomains from curated passive online sources"; - mainProgram = "xsubfind3r"; homepage = "https://github.com/hueristiq/xsubfind3r"; changelog = "https://github.com/hueristiq/xsubfind3r/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "xsubfind3r"; }; } From 2dc8bb0a824bf99ef4a042955150eaf12f221743 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 09:35:48 +0100 Subject: [PATCH 059/100] chaos: format with nixfmt --- pkgs/by-name/ch/chaos/package.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ch/chaos/package.nix b/pkgs/by-name/ch/chaos/package.nix index f77f2114d493..7d4e897c351d 100644 --- a/pkgs/by-name/ch/chaos/package.nix +++ b/pkgs/by-name/ch/chaos/package.nix @@ -1,6 +1,7 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + buildGoModule, + fetchFromGitHub, }: buildGoModule rec { @@ -16,9 +17,7 @@ buildGoModule rec { vendorHash = "sha256-c5J2cTzyb7CiBlS4vS3PdRhr6DhIvXE2lt40u0s6G0k="; - subPackages = [ - "cmd/chaos/" - ]; + subPackages = [ "cmd/chaos/" ]; meta = with lib; { description = "Tool to communicate with Chaos DNS API"; From 3fea04cafcf86f5a139ab644b86e8d94b9b6d67c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 09:36:14 +0100 Subject: [PATCH 060/100] chaos: add ldflags --- pkgs/by-name/ch/chaos/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ch/chaos/package.nix b/pkgs/by-name/ch/chaos/package.nix index 7d4e897c351d..0261a6e45caa 100644 --- a/pkgs/by-name/ch/chaos/package.nix +++ b/pkgs/by-name/ch/chaos/package.nix @@ -19,6 +19,11 @@ buildGoModule rec { subPackages = [ "cmd/chaos/" ]; + ldflags = [ + "-s" + "-w" + ]; + meta = with lib; { description = "Tool to communicate with Chaos DNS API"; homepage = "https://github.com/projectdiscovery/chaos-client"; From 8e79b2d450a25a1e56f5ce48a375ca16af19dcf1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 09:38:42 +0100 Subject: [PATCH 061/100] chaos: add versionCheckHook --- pkgs/by-name/ch/chaos/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/ch/chaos/package.nix b/pkgs/by-name/ch/chaos/package.nix index 0261a6e45caa..dfbfbb62b73a 100644 --- a/pkgs/by-name/ch/chaos/package.nix +++ b/pkgs/by-name/ch/chaos/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + versionCheckHook, }: buildGoModule rec { @@ -24,6 +25,12 @@ buildGoModule rec { "-w" ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + + doInstallCheck = true; + + versionCheckProgramArg = [ "--version" ]; + meta = with lib; { description = "Tool to communicate with Chaos DNS API"; homepage = "https://github.com/projectdiscovery/chaos-client"; From 712a80b99bd401702af22899f8079597489e38d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 08:46:05 +0000 Subject: [PATCH 062/100] hyprls: 0.2.0 -> 0.3.0 --- pkgs/by-name/hy/hyprls/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hy/hyprls/package.nix b/pkgs/by-name/hy/hyprls/package.nix index d4ff467bc24b..57c732d70b4c 100644 --- a/pkgs/by-name/hy/hyprls/package.nix +++ b/pkgs/by-name/hy/hyprls/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "hyprls"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "hyprland-community"; repo = "hyprls"; rev = "v${version}"; - hash = "sha256-boA2kWlHm9bEM/o0xi/1FlH6WGU4wL1RRvbGGXdzHYQ="; + hash = "sha256-uNT3sC81pnFqDzmhL20q5YDLBSVJwv0frNGB9wzkRkg="; }; vendorHash = "sha256-rG+oGJOABA9ee5nIpC5/U0mMsPhwvVtQvJBlQWfxi5Y="; From b769bf390731af2ac5889799f354ef8ce9be1c73 Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 7 Dec 2024 17:28:56 +0800 Subject: [PATCH 063/100] deepin.deepin-movie-reborn: mark as broken --- pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix index 7e6b31b3ff30..bc98fa4e4e4f 100644 --- a/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix @@ -121,5 +121,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = teams.deepin.members; + broken = true; # Crash when playing any video }; } From 3632a79510539111c02f1e4399a6d587012fa2d4 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Sat, 7 Dec 2024 11:01:43 +0100 Subject: [PATCH 064/100] errands: 46.2.6 -> 46.2.7 --- pkgs/by-name/er/errands/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/er/errands/package.nix b/pkgs/by-name/er/errands/package.nix index 88372821b179..ed0ffa236824 100644 --- a/pkgs/by-name/er/errands/package.nix +++ b/pkgs/by-name/er/errands/package.nix @@ -17,7 +17,7 @@ }: python3Packages.buildPythonApplication rec { pname = "errands"; - version = "46.2.6"; + version = "46.2.7"; pyproject = false; @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { owner = "mrvladus"; repo = "Errands"; rev = "refs/tags/${version}"; - hash = "sha256-NIhDMsKPxxPJfDHXOpPl7NPUCO/M5wA2T72ej/+w+Z0="; + hash = "sha256-kPF6BS7qDFstCGadSB8MSvBy+T4PkG/wRisYAaIU6rY="; }; nativeBuildInputs = [ From 05f5413f31720a35a4036fcb2d3a8a8a88c9802e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 11:01:27 +0000 Subject: [PATCH 065/100] trufflehog: 3.84.2 -> 3.85.0 --- pkgs/tools/security/trufflehog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index af0e142cc316..a9d52bec88d6 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.84.2"; + version = "3.85.0"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-NpWXjZstFpl0oZhzMnCFt7IFyWfpJybGaeyOSxjVPWY="; + hash = "sha256-WvGD4iYYryB9A8a3+6/WQBf1tHLKjyCgYDbpE1bHz7g="; }; - vendorHash = "sha256-s4oks1OP9qN/2JMN6TI36mBWvGXE2HnDHFAMCRFVB1w="; + vendorHash = "sha256-QFcA/m41l0QCmKSGN5SB7KPdRja+7bGfcqqqHg//OXU="; proxyVendor = true; From 83ef6e599442dc91f5b63be1e1482ff4c55b56e6 Mon Sep 17 00:00:00 2001 From: eilvelia Date: Thu, 5 Dec 2024 01:55:17 +0000 Subject: [PATCH 066/100] check-sieve: init at 0.10 --- pkgs/by-name/ch/check-sieve/package.nix | 64 +++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 pkgs/by-name/ch/check-sieve/package.nix diff --git a/pkgs/by-name/ch/check-sieve/package.nix b/pkgs/by-name/ch/check-sieve/package.nix new file mode 100644 index 000000000000..626d10774ac1 --- /dev/null +++ b/pkgs/by-name/ch/check-sieve/package.nix @@ -0,0 +1,64 @@ +{ + lib, + stdenv, + fetchFromGitHub, + bison, + diffutils, + flex, + python3, + nix-update-script, +}: +stdenv.mkDerivation rec { + pname = "check-sieve"; + version = "0.10"; + + src = fetchFromGitHub { + owner = "dburkart"; + repo = "check-sieve"; + tag = "check-sieve-${version}"; + hash = "sha256-UMtkiyRGX+/lL7a+c+iZHUJhg0nb4+puSPzM5W71F9o="; + }; + + nativeBuildInputs = [ + bison + flex + ]; + + nativeCheckInputs = [ + (python3.withPackages (p: [ p.setuptools ])) + ]; + + # https://github.com/dburkart/check-sieve/issues/67 + # Remove after the next (>0.10) release + env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result"; + + installPhase = '' + runHook preInstall + install -Dm755 check-sieve -t $out/bin + runHook postInstall + ''; + + preCheck = '' + substituteInPlace test/AST/util.py \ + --replace-fail "/usr/bin/diff" "${diffutils}/bin/diff" + # Disable flaky tests: https://github.com/dburkart/check-sieve/issues/68 + # Remove after the next (>0.10) release + rm -rf test/{6785,7352} + ''; + + doCheck = true; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex=check-sieve-(.*)" ]; + }; + + meta = { + description = "Syntax checker for mail sieves"; + mainProgram = "check-sieve"; + homepage = "https://github.com/dburkart/check-sieve"; + changelog = "https://github.com/dburkart/check-sieve/blob/master/ChangeLog"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ eilvelia ]; + }; +} From 0ba194b1a4e2574ad949c57d4d5cc7a5ad00c5fa Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Thu, 14 Nov 2024 13:59:11 -0600 Subject: [PATCH 067/100] nixos/rygel: add package option --- .../modules/services/desktops/gnome/rygel.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/desktops/gnome/rygel.nix b/nixos/modules/services/desktops/gnome/rygel.nix index 7ce7e079b6af..ccac72c6a436 100644 --- a/nixos/modules/services/desktops/gnome/rygel.nix +++ b/nixos/modules/services/desktops/gnome/rygel.nix @@ -1,6 +1,12 @@ # rygel service. { config, lib, pkgs, ... }: +let + + cfg = config.services.gnome.rygel; + +in + { meta = { maintainers = lib.teams.gnome.members; @@ -18,17 +24,19 @@ ''; type = lib.types.bool; }; + + package = lib.options.mkPackageOption pkgs "rygel" { }; }; }; ###### implementation - config = lib.mkIf config.services.gnome.rygel.enable { - environment.systemPackages = [ pkgs.rygel ]; + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; - services.dbus.packages = [ pkgs.rygel ]; + services.dbus.packages = [ cfg.package ]; - systemd.packages = [ pkgs.rygel ]; + systemd.packages = [ cfg.package ]; - environment.etc."rygel.conf".source = "${pkgs.rygel}/etc/rygel.conf"; + environment.etc."rygel.conf".source = "${cfg.package}/etc/rygel.conf"; }; } From 78a67786eee4dbb39f2f39a5cf22247ded4cd580 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 14:17:00 +0100 Subject: [PATCH 068/100] godspeed: unstable-2021-08-27 -> 1.0 --- pkgs/by-name/go/godspeed/package.nix | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/go/godspeed/package.nix b/pkgs/by-name/go/godspeed/package.nix index 2d0e4e32dea2..a86f1c9c3f21 100644 --- a/pkgs/by-name/go/godspeed/package.nix +++ b/pkgs/by-name/go/godspeed/package.nix @@ -1,37 +1,37 @@ -{ stdenv -, lib -, buildGoModule -, fetchFromGitHub -, libpcap +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + libpcap, }: buildGoModule rec { pname = "godspeed"; - version = "unstable-2021-08-27"; + version = "1.0"; src = fetchFromGitHub { owner = "redcode-labs"; repo = "GodSpeed"; - rev = "c02b184ab0fd304d1bd8cbe1566a3d3de727975e"; - sha256 = "sha256-y/mCfNWe5ShdxEz8IUQ8zUzgVkUy/+5lX6rcJ3r6KoI="; + rev = "refs/tags/${version}"; + hash = "sha256-y/mCfNWe5ShdxEz8IUQ8zUzgVkUy/+5lX6rcJ3r6KoI="; }; vendorHash = "sha256-DCDAuKvov4tkf77nJNo9mQU/bAeQasp4VBQRtLX+U6c="; - buildInputs = [ - libpcap - ]; + buildInputs = [ libpcap ]; postFixup = '' mv $out/bin/GodSpeed $out/bin/${pname} ''; meta = with lib; { - broken = stdenv.hostPlatform.isDarwin; description = "Manager for reverse shells"; homepage = "https://github.com/redcode-labs/GodSpeed"; - license = with licenses; [ mit ]; + changelog = "https://github.com/redcode-labs/GodSpeed/releases/tag/${version}"; + license = licenses.mit; maintainers = with maintainers; [ fab ] ++ teams.redcodelabs.members; mainProgram = "godspeed"; + broken = stdenv.hostPlatform.isDarwin; }; } From b4d58aeade80376442ca71ae1175850428c7b4d7 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sun, 18 Aug 2024 01:08:15 +0800 Subject: [PATCH 069/100] python3Packages.pyloggermanager: init at 0.1.4 --- .../pyloggermanager/default.nix | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/pyloggermanager/default.nix diff --git a/pkgs/development/python-modules/pyloggermanager/default.nix b/pkgs/development/python-modules/pyloggermanager/default.nix new file mode 100644 index 000000000000..827f826c99e2 --- /dev/null +++ b/pkgs/development/python-modules/pyloggermanager/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, + pycolorecho, +}: + +buildPythonPackage rec { + pname = "pyloggermanager"; + version = "0.1.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "coldsofttech"; + repo = "pyloggermanager"; + rev = version; + hash = "sha256-1hfcmMLH2d71EV71ExKqjZ7TMcqVd1AQrEwJhmEWOVU="; + }; + + build-system = [ setuptools ]; + + dependencies = [ pycolorecho ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pyloggermanager" ]; + + meta = { + description = "Logging framework for Python applications"; + homepage = "https://github.com/coldsofttech/pyloggermanager"; + changelog = "https://github.com/coldsofttech/pyloggermanager/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ShamrockLee ]; + }; +} From 835fa4c61020e6beff479e04011fcacac3b25022 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sun, 18 Aug 2024 00:31:41 +0800 Subject: [PATCH 070/100] python3Packages.pym3u8downloader: init at 0.1.5 --- .../pym3u8downloader/default.nix | 88 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 6 ++ 2 files changed, 94 insertions(+) create mode 100644 pkgs/development/python-modules/pym3u8downloader/default.nix diff --git a/pkgs/development/python-modules/pym3u8downloader/default.nix b/pkgs/development/python-modules/pym3u8downloader/default.nix new file mode 100644 index 000000000000..ff3ee2998537 --- /dev/null +++ b/pkgs/development/python-modules/pym3u8downloader/default.nix @@ -0,0 +1,88 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, + pyloggermanager, + requests, + pym3u8downloader, # For package tests +}: + +buildPythonPackage rec { + pname = "pym3u8downloader"; + version = "0.1.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "coldsofttech"; + repo = "pym3u8downloader"; + rev = version; + hash = "sha256-Kcvtl4jP2pSiETTKUmuiBsysxaFfd4K/E2/nXY8Vlw8="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pyloggermanager + requests + ]; + + pythonImportsCheck = [ "pym3u8downloader" ]; + + doCheck = false; + + passthru = { + tests = { + pytest = pym3u8downloader.overridePythonAttrs (previousPythonAttrs: { + TEST_SERVER_PORT = "8000"; + + postPatch = + previousPythonAttrs.postPatch or "" + + '' + # Patch test data location + substituteInPlace tests/commonclass.py \ + --replace-fail \ + "f'https://raw.githubusercontent.com/coldsofttech/pym3u8downloader/{branch_name}/tests/files'" \ + "'http://localhost:$TEST_SERVER_PORT/tests/files'" + # Patch the `is_internet_connected()` method + substituteInPlace pym3u8downloader/__main__.py \ + --replace-fail "'http://www.github.com'" "'http://localhost:$TEST_SERVER_PORT'" + ''; + + doCheck = true; + + nativeCheckInputs = [ pytestCheckHook ]; + + preCheck = + previousPythonAttrs.preCheck or "" + + '' + python3 -m http.server "$TEST_SERVER_PORT" & + TEST_SERVER_PID="$!" + ''; + + postCheck = + previousPythonAttrs.postCheck or "" + + '' + kill -s TERM "$TEST_SERVER_PID" + ''; + }); + }; + }; + + meta = { + description = "Python class to download and concatenate video files from M3U8 playlists"; + longDescription = '' + M3U8 Downloader is a Python class designed to + download and concatenate video files from M3U8 playlists. + This class provides functionality to handle M3U8 playlist files, + download video segments, + concatenate them into a single video file, + and manage various error conditions. + ''; + homepage = "https://github.com/coldsofttech/pym3u8downloader"; + changelog = "https://github.com/coldsofttech/pym3u8downloader/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ShamrockLee ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7b8140fa845e..0f5b52364af8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10308,6 +10308,8 @@ self: super: with self; { pycketcasts = callPackage ../development/python-modules/pycketcasts { }; + pycolorecho = callPackage ../development/python-modules/pycolorecho { }; + pycomm3 = callPackage ../development/python-modules/pycomm3 { }; pycompliance = callPackage ../development/python-modules/pycompliance { }; @@ -11734,6 +11736,8 @@ self: super: with self; { py-libzfs = callPackage ../development/python-modules/py-libzfs { }; + pyloggermanager = callPackage ../development/python-modules/pyloggermanager { }; + py-lru-cache = callPackage ../development/python-modules/py-lru-cache { }; pylnk3 = callPackage ../development/python-modules/pylnk3 { }; @@ -11766,6 +11770,8 @@ self: super: with self; { pylzma = callPackage ../development/python-modules/pylzma { }; + pym3u8downloader = callPackage ../development/python-modules/pym3u8downloader { }; + pymacaroons = callPackage ../development/python-modules/pymacaroons { }; pymailgunner = callPackage ../development/python-modules/pymailgunner { }; From 925e6d9f8fb7c50b9a026268457c86fed237e852 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 13:39:19 +0000 Subject: [PATCH 071/100] keepwn: 0.4 -> 0.5 --- pkgs/by-name/ke/keepwn/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ke/keepwn/package.nix b/pkgs/by-name/ke/keepwn/package.nix index 8306cbe441ea..dfa1d681b243 100644 --- a/pkgs/by-name/ke/keepwn/package.nix +++ b/pkgs/by-name/ke/keepwn/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "keepwn"; - version = "0.4"; + version = "0.5"; pyproject = true; src = fetchFromGitHub { owner = "Orange-Cyberdefense"; repo = "KeePwn"; - rev = "refs/tags/${version}"; - hash = "sha256-AkqBC65XrMt4V5KgzLepnQoqpdvbrtWLY3DmVuy8Zck="; + tag = version; + hash = "sha256-z2+l7zOexcqbwkrdmB3EcYIjnGlproINF51Pcpp7Nz4="; }; build-system = with python3.pkgs; [ setuptools ]; From ae0a36e92bf380ddcf172f874150ae2792a88ff1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 05:07:08 +0000 Subject: [PATCH 072/100] conkeyscan: 1.0.0 -> 1.1.0 --- pkgs/by-name/co/conkeyscan/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/co/conkeyscan/package.nix b/pkgs/by-name/co/conkeyscan/package.nix index 8b95916046da..b3563b5b54ef 100644 --- a/pkgs/by-name/co/conkeyscan/package.nix +++ b/pkgs/by-name/co/conkeyscan/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "conkeyscan"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "CompassSecurity"; repo = "conkeyscan"; - rev = "refs/tags/${version}"; - hash = "sha256-F5lYpETzv03O9I4vi4qnLgQLvBlv8bLtJQArxliO8JI="; + tag = "v${version}"; + hash = "sha256-xYCms+Su7FmaG7KVHZpzfD/wx9Gepz11t8dEK/YDfvI="; }; postPatch = '' @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Tool to scan Confluence for keywords"; homepage = "https://github.com/CompassSecurity/conkeyscan"; - changelog = "https://github.com/CompassSecurity/conkeyscan/releases/tag/${version}"; + changelog = "https://github.com/CompassSecurity/conkeyscan/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "conkeyscan"; From 615cca5d92037bf99354bdf7f004f1c421d3df3e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 16:30:18 +0100 Subject: [PATCH 073/100] python312Packages.meilisearch: 0.32.0 -> 0.33.0 Diff: https://github.com/meilisearch/meilisearch-python/compare/refs/tags/v0.32.0...v0.33.0 Changelog: https://github.com/meilisearch/meilisearch-python/releases/tag/v0.33.0 --- pkgs/development/python-modules/meilisearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix index 32566d057067..4b8802d9ecb1 100644 --- a/pkgs/development/python-modules/meilisearch/default.nix +++ b/pkgs/development/python-modules/meilisearch/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "meilisearch"; - version = "0.32.0"; + version = "0.33.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "meilisearch"; repo = "meilisearch-python"; rev = "refs/tags/v${version}"; - hash = "sha256-hgIgsimO2BIYyA7Wsosp1aY0JbA7u/ccuBLQnA8IMlo="; + hash = "sha256-Eo1KBpSek1FnSp21vpsJEwISvUYEqOaodwrbarVcu7c="; }; build-system = [ setuptools ]; From 2708bd6c18a1af1305c22a6d507f105c2bd18a13 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 16:33:24 +0100 Subject: [PATCH 074/100] python312Packages.llama-parse: 0.5.14 -> 0.5.17 --- pkgs/development/python-modules/llama-parse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix index 457b75d40ff3..abf1a82708c8 100644 --- a/pkgs/development/python-modules/llama-parse/default.nix +++ b/pkgs/development/python-modules/llama-parse/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-parse"; - version = "0.5.14"; + version = "0.5.17"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_parse"; inherit version; - hash = "sha256-uQUQ9Yd01u5ztidf5PGqD/OjBgJt8plZYG5WBzOEJIw="; + hash = "sha256-K6JwDKOxXoTvBy/ty7/q4vwTzntj/uIPzVJJ5vzb04E="; }; build-system = [ poetry-core ]; From f05c2b5b9b7456ed3fab675779418e7d23d3b546 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sat, 7 Dec 2024 23:32:43 +0800 Subject: [PATCH 075/100] nhost-cli: 1.27.1 -> 1.28.1 Diff: https://github.com/nhost/cli/compare/refs/tags/v1.27.1...v1.28.1 Changelog: https://github.com/nhost/cli/releases/tag/v1.28.1 --- pkgs/by-name/nh/nhost-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nh/nhost-cli/package.nix b/pkgs/by-name/nh/nhost-cli/package.nix index 213a22828c82..37a0cfd47483 100644 --- a/pkgs/by-name/nh/nhost-cli/package.nix +++ b/pkgs/by-name/nh/nhost-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "nhost-cli"; - version = "1.27.1"; + version = "1.28.1"; src = fetchFromGitHub { owner = "nhost"; repo = "cli"; - rev = "refs/tags/v${version}"; - hash = "sha256-31YkO0zvAp470pQQKapkwXnk6uDmzIZlLMQVsPhGaZ4="; + tag = "v${version}"; + hash = "sha256-bktz8ummBML8y//KnAQsOzwX+OO3ntiUkw8RG3PnGXg="; }; vendorHash = null; From a0195def6da70f794b3b27db92ae36693606993c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 17:41:25 +0100 Subject: [PATCH 076/100] python312Packages.twentemilieu: 2.1.0 -> 2.2.0 Diff: https://github.com/frenck/python-twentemilieu/compare/refs/tags/v2.1.0...v2.2.0 Changelog: https://github.com/frenck/python-twentemilieu/releases/tag/v2.2.0 --- pkgs/development/python-modules/twentemilieu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twentemilieu/default.nix b/pkgs/development/python-modules/twentemilieu/default.nix index 37475238320a..c89089104c66 100644 --- a/pkgs/development/python-modules/twentemilieu/default.nix +++ b/pkgs/development/python-modules/twentemilieu/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "twentemilieu"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-twentemilieu"; rev = "refs/tags/v${version}"; - hash = "sha256-R2zCDDSS6vpdD0TGSuYs6Xl8Ij2lU2UWqkOE4aFyxto="; + hash = "sha256-8tYa/fnc8km0Tl0N/OMP8GUUlIjzB8XP1Ivy9jDmY3s="; }; postPatch = '' From 289a490f068e831054d14752f229099ffca51b14 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 16:58:55 +0000 Subject: [PATCH 077/100] crowdin-cli: 4.3.0 -> 4.4.1 --- pkgs/by-name/cr/crowdin-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cr/crowdin-cli/package.nix b/pkgs/by-name/cr/crowdin-cli/package.nix index 88fe8b8c3a59..d0431f3569fa 100644 --- a/pkgs/by-name/cr/crowdin-cli/package.nix +++ b/pkgs/by-name/cr/crowdin-cli/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "crowdin-cli"; - version = "4.3.0"; + version = "4.4.1"; src = fetchurl { url = "https://github.com/crowdin/crowdin-cli/releases/download/${finalAttrs.version}/crowdin-cli.zip"; - hash = "sha256-Bzh8srMKTHTaA396sPAbICXKGJ/zM+IYMD91zfPLc7I="; + hash = "sha256-u1drLK/eLvNijCL3BupXyAO7yb+FD9EQwD0+9hQJsgQ="; }; nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; From 2f1909547fd4e223cb676b1cab46074f59b7a520 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 18:14:19 +0100 Subject: [PATCH 078/100] openrisk: format with nixfmt --- pkgs/by-name/op/openrisk/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/op/openrisk/package.nix b/pkgs/by-name/op/openrisk/package.nix index ebc177a6908f..00ef5fe95006 100644 --- a/pkgs/by-name/op/openrisk/package.nix +++ b/pkgs/by-name/op/openrisk/package.nix @@ -1,6 +1,7 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + buildGoModule, + fetchFromGitHub, }: buildGoModule rec { @@ -9,7 +10,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "projectdiscovery"; - repo = pname; + repo = "openrisk"; rev = "refs/tags/v${version}"; hash = "sha256-8DGwNoucLpdazf9r4PZrN4DEOMpTr5U7tal2Rab92pA="; }; @@ -18,10 +19,10 @@ buildGoModule rec { meta = with lib; { description = "Tool that generates an AI-based risk score"; - mainProgram = "openrisk"; homepage = "https://github.com/projectdiscovery/openrisk"; changelog = "https://github.com/projectdiscovery/openrisk/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "openrisk"; }; } From f78b15bd0c9294734783c6071b2fd95ac2bfa1e4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 Dec 2024 18:21:50 +0100 Subject: [PATCH 079/100] openrisk: add versionCheckHook --- pkgs/by-name/op/openrisk/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/op/openrisk/package.nix b/pkgs/by-name/op/openrisk/package.nix index 00ef5fe95006..f3600335803d 100644 --- a/pkgs/by-name/op/openrisk/package.nix +++ b/pkgs/by-name/op/openrisk/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + versionCheckHook, }: buildGoModule rec { @@ -17,6 +18,15 @@ buildGoModule rec { vendorHash = "sha256-BLowqqlMLDtsthS4uKeycmtG7vASG25CARGpUcuibcw="; + ldflags = [ + "-w" + "-s" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + doInstallCheck = true; + meta = with lib; { description = "Tool that generates an AI-based risk score"; homepage = "https://github.com/projectdiscovery/openrisk"; From 22d51a3f2ce00d846232ef3f37760db5f0e03c53 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 17:47:30 +0000 Subject: [PATCH 080/100] python312Packages.psd-tools: 1.10.2 -> 1.10.4 --- pkgs/development/python-modules/psd-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index f196ef52a1ea..827733a8a66d 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "psd-tools"; - version = "1.10.2"; + version = "1.10.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,8 +27,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "psd-tools"; repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-vBDFKWNksF8/h5Jp1VOxVWgAzPdOLhv0iDrNDVXzm54="; + tag = "v${version}"; + hash = "sha256-62Q8eMPPW12HnoBDwAM3+48BEarEqLzEnHcG3TR5XDc="; }; build-system = [ From 3f275c75b831cb0c4ed0e6f863361adb4df83658 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 18:49:35 +0000 Subject: [PATCH 081/100] scip-go: 0.1.21 -> 0.1.22 --- pkgs/by-name/sc/scip-go/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sc/scip-go/package.nix b/pkgs/by-name/sc/scip-go/package.nix index 3f4c8de886a7..5b7511062663 100644 --- a/pkgs/by-name/sc/scip-go/package.nix +++ b/pkgs/by-name/sc/scip-go/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "scip-go"; - version = "0.1.21"; + version = "0.1.22"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "scip-go"; rev = "v${version}"; - hash = "sha256-CUmivqMFAjtSS06tEs8xuXh5nyLD3MYdI2j0EAyWpY0="; + hash = "sha256-1vu6+0CMQwju+Ym0iYXqVktwfJtZFWbn7aOK/w5pVq4="; }; vendorHash = "sha256-E/1ubWGIx+sGC+owqw4nOkrwUFJfgTeqDNpH8HCwNhA="; From b2ad492e00e5af6ee1013fe0a2a70da241a8ffc9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 19:30:59 +0000 Subject: [PATCH 082/100] committed: 1.0.20 -> 1.1.2 --- pkgs/by-name/co/committed/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/committed/package.nix b/pkgs/by-name/co/committed/package.nix index 229414b14f68..27c2a452f71c 100644 --- a/pkgs/by-name/co/committed/package.nix +++ b/pkgs/by-name/co/committed/package.nix @@ -8,7 +8,7 @@ , committed }: let - version = "1.0.20"; + version = "1.1.2"; in rustPlatform.buildRustPackage { pname = "committed"; @@ -18,9 +18,9 @@ rustPlatform.buildRustPackage { owner = "crate-ci"; repo = "committed"; rev = "refs/tags/v${version}"; - hash = "sha256-HqZYxV2YjnK7Q3A7B6yVFXME0oc3DZ4RfMkDGa2IQxA="; + hash = "sha256-dBNtzKqaaqJrKMNwamUY0DO9VCVqDyf45lT82nOn8UM="; }; - cargoHash = "sha256-AmAEGVWq6KxLtiHDGIFVcoP1Wck8z+P9mnDy0SSSJNM="; + cargoHash = "sha256-F+6pTxgr/I3DcDGZsfDjLe0+5wj9Mu7nqghyOzSWlvc="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; From def6d0caf379f5679f072cf90055c2c0a1d37c5e Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 21 Sep 2024 08:39:34 +0000 Subject: [PATCH 083/100] sblast: init at 0.7.0 `sblast` is a CLI tool to cast your pulseaudio or pipewire system audio to any DLNA renderer, for example, your T.V. project homepage: the audio stream is pulled by the DLNA renderer from the host machine's port 9000, so one must open that in the firewall ```nix networking.firewall.allowedTCPPorts = [ 9000 ]; ``` Co-authored-by: Arne Keller <2012gdwu+github@posteo.de> --- pkgs/by-name/sb/sblast/package.nix | 61 ++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 pkgs/by-name/sb/sblast/package.nix diff --git a/pkgs/by-name/sb/sblast/package.nix b/pkgs/by-name/sb/sblast/package.nix new file mode 100644 index 000000000000..a9caf85253b0 --- /dev/null +++ b/pkgs/by-name/sb/sblast/package.nix @@ -0,0 +1,61 @@ +{ + buildGoModule, + fetchFromGitHub, + ffmpeg, + lib, + makeBinaryWrapper, + nix-update-script, + pulseaudio, + testers, +}: +let + self = buildGoModule rec { + pname = "sblast"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "ugjka"; + repo = "sblast"; + rev = "v${version}"; + hash = "sha256-+ZeZ2lohAngfljCa/z9yjCKvQwCMEiwzzPFrpAU8lWA="; + }; + + vendorHash = "sha256-yPwLilMiDR1aSeuk8AEmuYPsHPRWqiByGLwgkdI5t+s="; + + nativeBuildInputs = [ + makeBinaryWrapper + ]; + + postInstall = '' + wrapProgram $out/bin/sblast \ + --suffix PATH : ${ + lib.makeBinPath [ + ffmpeg + pulseaudio + ] + } + ''; + + # build only the toplevel package, and not `makerel` + subPackages = "."; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = self; + version = "v${version}"; + }; + }; + + meta = { + description = "Blast your Linux audio to DLNA receivers"; + homepage = "https://github.com/ugjka/sblast"; + # license is "MIT+NoAI": + license = lib.licenses.unfree; + mainProgram = "sblast"; + maintainers = with lib.maintainers; [ colinsane ]; + platforms = lib.platforms.linux; + }; + }; +in +self From 38d3c1a8c629faf3a28b1f33f7509fd6d423a784 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 23:12:01 +0000 Subject: [PATCH 084/100] tpnote: 1.24.9 -> 1.24.10 --- pkgs/by-name/tp/tpnote/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix index 91d03eb80a14..1efa9e1b61c9 100644 --- a/pkgs/by-name/tp/tpnote/package.nix +++ b/pkgs/by-name/tp/tpnote/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "tpnote"; - version = "1.24.9"; + version = "1.24.10"; src = fetchFromGitHub { owner = "getreu"; repo = "tp-note"; rev = "v${version}"; - hash = "sha256-KXkriFFn1GapoVimcK7Hqv1mUTZ2EbnnZPyX2izI2oo="; + hash = "sha256-K0GwSt0TucclJRp30ZwVfBk5BJBUaIKplzXRbRNtPtU="; }; - cargoHash = "sha256-MCnQJ1cJeWUJ8L+u09px4COG7XUAVOOgBg8nUi37J90="; + cargoHash = "sha256-l7MfErGXrxiNjGYZ7r9LAdUqynOp/FbUIEM0Wq9Vbxs="; nativeBuildInputs = [ cmake From 7e945690180c4624101cdc7e205c9190c8fc92b5 Mon Sep 17 00:00:00 2001 From: Jo-Blade Date: Sun, 8 Dec 2024 00:37:28 +0100 Subject: [PATCH 085/100] gnome-decoder : 0.4.1 -> 0.6.1 --- .../graphics/gnome-decoder/default.nix | 20 ++++++++++++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/gnome-decoder/default.nix b/pkgs/applications/graphics/gnome-decoder/default.nix index c105ba1fad0a..cc4661111bb9 100644 --- a/pkgs/applications/graphics/gnome-decoder/default.nix +++ b/pkgs/applications/graphics/gnome-decoder/default.nix @@ -17,29 +17,41 @@ , gstreamer , gst-plugins-base , gst-plugins-bad +, gst-plugins-good +, gst-plugins-rs , wrapGAppsHook4 , appstream-glib , desktop-file-utils +, glycin-loaders }: clangStdenv.mkDerivation rec { pname = "gnome-decoder"; - version = "0.4.1"; + version = "0.6.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "decoder"; rev = version; - hash = "sha256-ZEt4QaT2w7PgsnwBCYeDbhcYX0yd0boes/LoejQx0XU="; + hash = "sha256-qSPuEVW+FwC9OJa+dseIy4/2bhVdTryJSJNSpes9tpY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-acYOSPSUgm0Kg/bo2WF4sRWfCt03AZdTyNNt3Qv7Zjg="; + hash = "sha256-MbfukvqlzZPnWNtWCwYn7lABqBxtZWvPDba9Deah+w8="; }; + preFixup = '' + gappsWrapperArgs+=( + # vp8enc preset + --prefix GST_PRESET_PATH : "${gst-plugins-good}/share/gstreamer-1.0/presets" + # See https://gitlab.gnome.org/sophie-h/glycin/-/blob/0.1.beta.2/glycin/src/config.rs#L44 + --prefix XDG_DATA_DIRS : "${glycin-loaders}/share" + ) + ''; + nativeBuildInputs = [ meson ninja @@ -64,6 +76,8 @@ clangStdenv.mkDerivation rec { gstreamer gst-plugins-base gst-plugins-bad + gst-plugins-good + gst-plugins-rs # for gtk4paintablesink ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e234d8ca810..2373794c77df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3514,7 +3514,7 @@ with pkgs; }; gnome-decoder = callPackage ../applications/graphics/gnome-decoder { - inherit (gst_all_1) gstreamer gst-plugins-base; + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-rs; gst-plugins-bad = gst_all_1.gst-plugins-bad.override { enableZbar = true; }; }; From bf56fff2609f57c2b493dd5c9d2d03c155887c7e Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sat, 7 Dec 2024 00:24:03 +0900 Subject: [PATCH 086/100] dprint: add kachick as maintainer --- pkgs/by-name/dp/dprint/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix index 6cfb7183c78e..1b3cb8f91e2e 100644 --- a/pkgs/by-name/dp/dprint/package.nix +++ b/pkgs/by-name/dp/dprint/package.nix @@ -59,7 +59,10 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/dprint/dprint/releases/tag/${version}"; homepage = "https://dprint.dev"; license = licenses.mit; - maintainers = with maintainers; [ khushraj ]; + maintainers = with maintainers; [ + khushraj + kachick + ]; mainProgram = "dprint"; }; } From c329f0625c80af08ed35db3460e0eecc3827080a Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sat, 7 Dec 2024 00:27:03 +0900 Subject: [PATCH 087/100] dprint: enable doCheck with some skips For a preparation task, replace fetchCrate with fetchFromGitHub - https://github.com/dprint/dprint/blob/0.47.6/Cargo.lock - https://github.com/dprint/dprint/tree/0.47.6/crates/test-plugin And skips some tests which cannot be succeeded even if setting DPRINT_CACHE_DIR --- pkgs/by-name/dp/dprint/package.nix | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix index 1b3cb8f91e2e..05543ec1217c 100644 --- a/pkgs/by-name/dp/dprint/package.nix +++ b/pkgs/by-name/dp/dprint/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchCrate, + fetchFromGitHub, rustPlatform, installShellFiles, testers, @@ -13,21 +13,30 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; version = "0.47.6"; - src = fetchCrate { - inherit pname version; - hash = "sha256-7tGzSFp7Dnu27L65mqFd7hzeFFDfe1xJ6cMul3hGyJs="; + # Prefer repository rather than crate here + # - They have Cargo.lock in the repository + # - They have WASM files in the repository which will be used in checkPhase + src = fetchFromGitHub { + owner = "dprint"; + repo = "dprint"; + rev = "refs/tags/${version}"; + hash = "sha256-zyiBFZbetKx0H47MAU4JGauAmthcuEdJMl93M6MobD8="; }; - cargoHash = "sha256-y3tV3X7YMOUGBn2hCmxsUUc9QQleKEioTIw7SGoBvSQ="; - - # Tests fail because they expect a test WASM plugin. Tests already run for - # every commit upstream on GitHub Actions - doCheck = false; + cargoHash = "sha256-XuzxoJgJJl4Blw1lDnCG3faEqL9U40MhZEb9LYjiaSs="; nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ installShellFiles ]; + checkFlags = [ + # Require creating directory and network access + "--skip=plugins::cache_fs_locks::test" + "--skip=utils::lax_single_process_fs_flag::test" + # Require cargo is running + "--skip=utils::process::test" + ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' export DPRINT_CACHE_DIR="$(mktemp -d)" installShellCompletion --cmd dprint \ From 58787b620d47cce0fe3557244bcb8845fe5da058 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Dec 2024 01:40:52 +0000 Subject: [PATCH 088/100] gotify-server: 2.5.0 -> 2.6.1 --- pkgs/by-name/go/gotify-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gotify-server/package.nix b/pkgs/by-name/go/gotify-server/package.nix index 320042f7157e..b4ee796dc0b7 100644 --- a/pkgs/by-name/go/gotify-server/package.nix +++ b/pkgs/by-name/go/gotify-server/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "gotify-server"; - version = "2.5.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "gotify"; repo = "server"; rev = "v${version}"; - hash = "sha256-Na/bxETIgVm1mxMOXWTgYIFFuB6XG1jGvbW6q/n5LRw="; + hash = "sha256-6PmJnRBovyufrSB+uMbU+bqhZb1bEs39MxBVMnnE6f8="; }; # With `allowGoReference = true;`, `buildGoModule` adds the `-trimpath` @@ -24,7 +24,7 @@ buildGoModule rec { # server[780]: stat /var/lib/private/ui/build/index.html: no such file or directory allowGoReference = true; - vendorHash = "sha256-Vnk/c2dzxIXDChobFSP++9uyiFD+SKyxJC9ZwaQ2pVw="; + vendorHash = "sha256-aru1Q3esLtyxV6CVup4qjsuaJlM5DuLuP8El4RYoVVE="; doCheck = false; From 0938529cc9271dde3434be45438f24a02e9d0d76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Dec 2024 01:56:05 +0000 Subject: [PATCH 089/100] klog-rs: 0.2.0 -> 0.3.1 --- pkgs/by-name/kl/klog-rs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/kl/klog-rs/package.nix b/pkgs/by-name/kl/klog-rs/package.nix index 6ee5bef9465e..d320acf9a991 100644 --- a/pkgs/by-name/kl/klog-rs/package.nix +++ b/pkgs/by-name/kl/klog-rs/package.nix @@ -7,15 +7,15 @@ rustPlatform.buildRustPackage rec { pname = "klog-rs"; - version = "0.2.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "tobifroe"; repo = "klog"; rev = version; - hash = "sha256-GbYkTCo+MUKBz0AtfDSjOOe8j+v6gxRkbq1Dj1E2jl0="; + hash = "sha256-E3oL6XAp9N0ptDTpGBd6pmg4DJx9GDJv3ZSbkc6at60="; }; - cargoHash = "sha256-h68NEAPLlgzDTSerL+0DrvSSfB85RHtBvuoUhrxLDWU="; + cargoHash = "sha256-S2F9oVPZH52luSsFUlQCLANPJudjJvecv8S6BBUnC78="; checkFlags = [ # this integration test depends on a running kubernetes cluster "--skip=k8s::tests::test_get_pod_list" From 8b8864c4198bd4364c67507273502991f5c45aea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Dec 2024 02:26:20 +0000 Subject: [PATCH 090/100] quarkus: 3.15.1 -> 3.17.3 --- pkgs/by-name/qu/quarkus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix index 1afbff315203..a8f0bddb4bce 100644 --- a/pkgs/by-name/qu/quarkus/package.nix +++ b/pkgs/by-name/qu/quarkus/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "quarkus-cli"; - version = "3.15.1"; + version = "3.17.3"; src = fetchurl { url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz"; - hash = "sha256-cvZ1jEIeEQOgmAiQba6AYob+84ozM0AQcnVpgRLSIIc="; + hash = "sha256-Nm0tu4YYjD1NH4n0qV1YZl7ZXfN5jccFV6EPn5mPu+8="; }; nativeBuildInputs = [ makeWrapper ]; From 5c1b62b3d9346fc7c9a32b5ca646d75040725825 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 8 Dec 2024 13:59:47 +0800 Subject: [PATCH 091/100] python312Packages.parselmouth: fix build --- pkgs/development/python-modules/parselmouth/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/parselmouth/default.nix b/pkgs/development/python-modules/parselmouth/default.nix index 78417fe48c0b..183ee3100fd8 100644 --- a/pkgs/development/python-modules/parselmouth/default.nix +++ b/pkgs/development/python-modules/parselmouth/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "YannickJadoul"; repo = "Parselmouth"; - rev = "v${version}"; + tag = "v${version}"; fetchSubmodules = true; hash = "sha256-/Hde/DpSbmHs8WF3PAk4esYuMgOX6SxMaYJrrHYr/ZU="; }; @@ -47,6 +47,11 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "--run-praat-tests" + "-v" + ]; + pythonImportsCheck = [ "parselmouth" ]; meta = { From a65078f73bca61e78878302c61364061fb16b15f Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 8 Dec 2024 07:26:53 +0100 Subject: [PATCH 092/100] trafficserver: 9.2.5 -> 9.2.6 (#355733) * trafficserver: 9.2.5 -> 9.2.7 Signed-off-by: Sefa Eyeoglu * trafficserver: auto reconfigure broken configure script This fixes the build on macOS 11 Upstream recommends always running autoreconf: https://github.com/apache/trafficserver/pull/8556#issuecomment-995319215 Signed-off-by: Sefa Eyeoglu * trafficserver: remove unneeded substitutes Signed-off-by: Sefa Eyeoglu --------- Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/tr/trafficserver/package.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/tr/trafficserver/package.nix b/pkgs/by-name/tr/trafficserver/package.nix index e0b20f68bf06..56c0d3babbc2 100644 --- a/pkgs/by-name/tr/trafficserver/package.nix +++ b/pkgs/by-name/tr/trafficserver/package.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchzip +, autoreconfHook , makeWrapper , nixosTests , pkg-config @@ -10,7 +11,6 @@ , pcre , perlPackages , python3 -, catch2 # recommended dependencies , withHwloc ? true , hwloc @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { pname = "trafficserver"; - version = "9.2.5"; + version = "9.2.7"; src = fetchzip { url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2"; - hash = "sha256-RwhTI31LyupkAbXHsNrjcJqUjVoVpX3/2Ofxl2NdasU="; + hash = "sha256-i3UTqOO3gQezL2HmQllJa+hwy03tJViyOOflW2iXBAM="; }; # NOTE: The upstream README indicates that flex is needed for some features, @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { # # [1]: https://github.com/apache/trafficserver/pull/5617 # [2]: https://github.com/apache/trafficserver/blob/3fd2c60/configure.ac#L742-L788 - nativeBuildInputs = [ makeWrapper pkg-config file python3 ] + nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config file python3 ] ++ (with perlPackages; [ perl ExtUtilsMakeMaker ]) ++ lib.optionals stdenv.hostPlatform.isLinux [ linuxHeaders ]; @@ -93,15 +93,13 @@ stdenv.mkDerivation rec { src/traffic_via/test_traffic_via \ src/traffic_logstats/tests \ tools/check-unused-dependencies - - substituteInPlace configure --replace '/usr/bin/file' '${file}/bin/file' '' + lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace configure \ - --replace '/usr/include/linux' '${linuxHeaders}/include/linux' + substituteInPlace configure.ac \ + --replace-fail '/usr/include/linux' '${linuxHeaders}/include/linux' '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # 'xcrun leaks' probably requires non-free XCode substituteInPlace iocore/net/test_certlookup.cc \ - --replace 'xcrun leaks' 'true' + --replace-fail 'xcrun leaks' 'true' ''; configureFlags = [ @@ -123,7 +121,6 @@ stdenv.mkDerivation rec { ]; postInstall = '' - substituteInPlace rc/trafficserver.service --replace "syslog.target" "" install -Dm644 rc/trafficserver.service $out/lib/systemd/system/trafficserver.service wrapProgram $out/bin/tspush \ From 47bd11bf0dcdc7eef87407e8da3340d9769dc6db Mon Sep 17 00:00:00 2001 From: Emil Fresk Date: Sun, 8 Dec 2024 07:43:42 +0100 Subject: [PATCH 093/100] openems: allow building on aarch64-linux (#359424) Made OpenEMS build on `aarch64` systems. OpenEMS, according to its own `CMakeLists.txt`, has support for this target since 2022-12-07 (commit https://github.com/thliebig/openEMS/commit/0b43416651efaa7ec31d5cea64b5c173a007f5da), and is part of the current release `0.0.36`. --- pkgs/applications/science/electronics/openems/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/science/electronics/openems/default.nix b/pkgs/applications/science/electronics/openems/default.nix index 864b120993d9..77998781a55b 100644 --- a/pkgs/applications/science/electronics/openems/default.nix +++ b/pkgs/applications/science/electronics/openems/default.nix @@ -64,6 +64,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ matthuszagh ]; platforms = platforms.linux; - badPlatforms = platforms.aarch64; }; } From 6a7d80b43fda1a1787383b7b498a84762914eff8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Dec 2024 06:51:56 +0000 Subject: [PATCH 094/100] hugo: 0.139.0 -> 0.139.3 --- pkgs/by-name/hu/hugo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index 763fb3b93a2b..605d9ada6934 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.139.0"; + version = "0.139.3"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; rev = "refs/tags/v${version}"; - hash = "sha256-UXOZCiwYpMnJsNSO7y3CsB8nmPxtBErYYl8YwWO3Hts="; + hash = "sha256-bUqLVM1jQ6LVsnDIP2NanmmEFe3mDUt446kH9I0aZQI="; }; - vendorHash = "sha256-qhiCZMSLRnLbyHplcaPn/BGJ3Lv8O8eEvCuIHwA4sMs="; + vendorHash = "sha256-LwXrCYGlWe6dOdPTh3YKhJDUID6e+OUOfDYtYxYnx/Y="; checkFlags = [ # Workaround for "failed to load modules" From 2b0c08d74fa5140c5b03ba420e15f4e2cda59a8f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Dec 2024 07:09:47 +0000 Subject: [PATCH 095/100] mympd: 18.1.2 -> 18.2.2 --- pkgs/by-name/my/mympd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/my/mympd/package.nix b/pkgs/by-name/my/mympd/package.nix index 251c343c17df..dd38997971d6 100644 --- a/pkgs/by-name/my/mympd/package.nix +++ b/pkgs/by-name/my/mympd/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "18.1.2"; + version = "18.2.2"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-4BGW7jDeqwhbAi1LODeiFrmBIzv0qAMKT3IVRgYn87E="; + sha256 = "sha256-ztZ4AdVRQ5KCmxAIT6SSexIle6IfREGqNZLhAplPtrQ="; }; nativeBuildInputs = [ From d12a87265db42f38a16516ce185f2027a1fc03ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Dec 2024 07:32:05 +0000 Subject: [PATCH 096/100] boxbuddy: 2.3.1 -> 2.5.0 --- pkgs/by-name/bo/boxbuddy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bo/boxbuddy/package.nix b/pkgs/by-name/bo/boxbuddy/package.nix index eb0682542036..37b5a7acc26b 100644 --- a/pkgs/by-name/bo/boxbuddy/package.nix +++ b/pkgs/by-name/bo/boxbuddy/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "boxbuddy"; - version = "2.3.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "Dvlv"; repo = "BoxBuddyRS"; rev = version; - hash = "sha256-s0StSMpLNRwiI+T78ySfW2DQ3s5A9kuclC9f32UDkiI="; + hash = "sha256-SI/Yxk3bJayXPIWlJLG/je7NBG0I+49cIIlfBeMhTBk="; }; - cargoHash = "sha256-WJ35lxo4h91xtcfUuevLsWNBvulxq5ZaAVE3u9BbtzI="; + cargoHash = "sha256-5R+PWV34Ob9y/EtO+46kI/fzqYw6QI86bRVpvMznw9Y="; # The software assumes it is installed either in flatpak or in the home directory # so the xdg data path needs to be patched here From 0ffaf9bfca26065fe3fb13cc4624fe6ec500c699 Mon Sep 17 00:00:00 2001 From: Anthony Rodriguez Date: Mon, 2 Sep 2024 19:12:11 +0200 Subject: [PATCH 097/100] bolt-launcher: init at 0.9.0 Added bolt-launcher, an alternative launcher for Runescape 3 / Old School Runescape. https://github.com/Adamcake/Bolt/releases/tag/0.9.0 bolt-launcher: add plugin loader for rs3 Building the app with luajit, which allows for Runescape 3 plugin loading. bolt-launcher: add runescape 3 dependencies Added Runescape 3 dependencies inside the buildFHSEnv, so that it can be used by the binary (downloaded from the internet by bolt-launcher itself, hence why the fhs env is needed here). bolt-launcher: fix dependency issues Added libbolt-plugin.so into $out/lib, which allows the program to use the Runescape 3 plugin loader. Also updated the mainProgram as well as runScript so that the program can be ran from nix run instead of just being able to be ran manually. Add feature flags for RS3 and HDOSAndRuneLite as well as .desktop and icon file support (#1) * Add enable flags for RS3 and HDOSAndRuneLite * Add .desktop and icon * Fix formatting w/ nixfmt * Remove enableHDOSAndRuneLite feature flag * Fix formatting Co-authored-by: Thomas King --- pkgs/by-name/bo/bolt-launcher/package.nix | 214 ++++++++++++++++++++++ 1 file changed, 214 insertions(+) create mode 100644 pkgs/by-name/bo/bolt-launcher/package.nix diff --git a/pkgs/by-name/bo/bolt-launcher/package.nix b/pkgs/by-name/bo/bolt-launcher/package.nix new file mode 100644 index 000000000000..aa14f6cd5911 --- /dev/null +++ b/pkgs/by-name/bo/bolt-launcher/package.nix @@ -0,0 +1,214 @@ +{ + lib, + stdenv, + fetchFromGitHub, + makeWrapper, + cmake, + ninja, + libarchive, + libz, + libcef, + luajit, + xorg, + mesa, + glib, + nss, + nspr, + atk, + at-spi2-atk, + libdrm, + expat, + libxkbcommon, + gtk3, + jdk17, + pango, + cairo, + alsa-lib, + dbus, + at-spi2-core, + cups, + systemd, + buildFHSEnv, + makeDesktopItem, + copyDesktopItems, + enableRS3 ? false, +}: +let + cef = libcef.overrideAttrs (oldAttrs: { + installPhase = + let + gl_rpath = lib.makeLibraryPath [ + stdenv.cc.cc.lib + ]; + rpath = lib.makeLibraryPath [ + glib + nss + nspr + atk + at-spi2-atk + libdrm + expat + xorg.libxcb + libxkbcommon + xorg.libX11 + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + mesa + gtk3 + pango + cairo + alsa-lib + dbus + at-spi2-core + cups + xorg.libxshmfence + systemd + ]; + in + '' + mkdir -p $out/lib/ $out/share/cef/ + cp libcef_dll_wrapper/libcef_dll_wrapper.a $out/lib/ + cp -r ../Resources/* $out/lib/ + cp -r ../Release/* $out/lib/ + patchelf --set-rpath "${rpath}" $out/lib/libcef.so + patchelf --set-rpath "${gl_rpath}" $out/lib/libEGL.so + patchelf --set-rpath "${gl_rpath}" $out/lib/libGLESv2.so + cp ../Release/*.bin $out/share/cef/ + cp -r ../Resources/* $out/share/cef/ + cp -r ../include $out + cp -r ../libcef_dll $out + cp -r ../cmake $out + ''; + }); +in +let + bolt = stdenv.mkDerivation (finalAttrs: { + pname = "bolt-launcher"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "AdamCake"; + repo = "bolt"; + rev = finalAttrs.version; + fetchSubmodules = true; + hash = "sha256-LIlRDcUWbQwIhFjtqYF+oVpTOPZ7IT0vMgysEVyJ1k8="; + }; + + nativeBuildInputs = [ + cmake + ninja + luajit + makeWrapper + copyDesktopItems + ]; + + buildInputs = [ + mesa + xorg.libX11 + xorg.libxcb + libarchive + libz + cef + jdk17 + ]; + + cmakeFlags = [ + "-D CMAKE_BUILD_TYPE=Release" + "-D BOLT_LUAJIT_INCLUDE_DIR=${luajit}/include" + "-G Ninja" + ]; + + preConfigure = '' + mkdir -p cef/dist/Release cef/dist/Resources cef/dist/include + + ln -s ${cef}/lib/* cef/dist/Release + + ln -s ${cef}/share/cef/*.pak cef/dist/Resources + ln -s ${cef}/share/cef/icudtl.dat cef/dist/Resources + ln -s ${cef}/share/cef/locales cef/dist/Resources + + ln -s ${cef}/include/* cef/dist/include + ln -s ${cef}/libcef_dll cef/dist/libcef_dll + + ln -s ${cef}/cmake cef/dist/cmake + ln -s ${cef}/CMakeLists.txt cef/dist + ''; + + postFixup = '' + makeWrapper "$out/opt/bolt-launcher/bolt" "$out/bin/${finalAttrs.pname}-${finalAttrs.version}" \ + --set JAVA_HOME ${jdk17} + mkdir -p $out/lib + cp $out/usr/local/lib/libbolt-plugin.so $out/lib + mkdir -p $out/share/icons/hicolor/256x256/apps + cp ../icon/256.png $out/share/icons/hicolor/256x256/apps/${finalAttrs.pname}.png + ''; + + desktopItems = [ + (makeDesktopItem { + type = "Application"; + terminal = false; + name = "Bolt"; + desktopName = "Bolt Launcher"; + genericName = finalAttrs.pname; + comment = "An alternative launcher for RuneScape"; + exec = "${finalAttrs.pname}-${finalAttrs.version}"; + icon = finalAttrs.pname; + categories = [ "Game" ]; + }) + ]; + }); +in +buildFHSEnv { + inherit (bolt) name version; + + targetPkgs = + pkgs: + [ bolt ] + ++ (with pkgs; [ + xorg.libSM + xorg.libXxf86vm + xorg.libX11 + glib + pango + cairo + gdk-pixbuf + libz + libcap + libsecret + SDL2 + libGL + ]) + ++ lib.optionals enableRS3 ( + with pkgs; + [ + gtk2-x11 + openssl_1_1 + ] + ); + + extraInstallCommands = '' + mkdir -p $out/share/applications + mkdir -p $out/share/icons/hicolor/256x256/apps + + ln -s ${bolt}/share/applications/*.desktop $out/share/applications/ + + ln -s ${bolt}/share/icons/hicolor/256x256/apps/*.png $out/share/icons/hicolor/256x256/apps/ + ''; + + runScript = "${bolt.name}"; + + meta = { + homepage = "https://github.com/Adamcake/Bolt"; + description = "An alternative launcher for RuneScape."; + longDescription = '' + Bolt Launcher supports HDOS/RuneLite by default with an optional feature flag for RS3 (enableRS3). + ''; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ nezia ]; + platforms = lib.platforms.linux; + mainProgram = "${bolt.name}"; + }; +} From 82c1a1523912a71aaeaf6a4644b1812e345be089 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Dec 2024 10:02:28 +0000 Subject: [PATCH 098/100] vscode-extensions.mongodb.mongodb-vscode: 1.9.3 -> 1.10.0 --- .../vscode/extensions/mongodb.mongodb-vscode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix index d53540ba0cf6..660ea90bbbc8 100644 --- a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "mongodb-vscode"; publisher = "mongodb"; - version = "1.9.3"; - hash = "sha256-3+KIO2d/0egvc4awStYgPvpWa9fmYH0V7QHUavzFn8A="; + version = "1.10.0"; + hash = "sha256-5U1wHrcDqN5gJEFGvRDlBm7fu4LoP0/u0ykcqYhD1nQ="; }; meta = { From 18843afdea793177872657353aaa559cc31d7516 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sun, 8 Dec 2024 18:36:19 +0800 Subject: [PATCH 099/100] flclash: 0.8.68 -> 0.8.69 --- pkgs/by-name/fl/flclash/package.nix | 65 ++++++++++++++++------------- 1 file changed, 36 insertions(+), 29 deletions(-) diff --git a/pkgs/by-name/fl/flclash/package.nix b/pkgs/by-name/fl/flclash/package.nix index f2c0a69a7827..7c79262f6d6a 100644 --- a/pkgs/by-name/fl/flclash/package.nix +++ b/pkgs/by-name/fl/flclash/package.nix @@ -1,22 +1,25 @@ { lib, fetchFromGitHub, - flutter, + flutter324, keybinder3, libayatana-appindicator, buildGoModule, makeDesktopItem, copyDesktopItems, + zenity, + wrapGAppsHook3, + autoPatchelfHook, }: let pname = "flclash"; - version = "0.8.68"; + version = "0.8.69"; src = (fetchFromGitHub { owner = "chen08209"; repo = "FlClash"; - rev = "v${version}"; - hash = "sha256-0S3sNmOxM5SpRLpYzi4br5/PJnxDklFHsEAKiHd0vOM="; + tag = "v${version}"; + hash = "sha256-T9sqHzqnOvZG95EJegqT6TqOOrAuqzjNvVQWLyeQwng="; fetchSubmodules = true; }).overrideAttrs (_: { @@ -26,13 +29,18 @@ let }); libclash = buildGoModule { inherit pname version src; + modRoot = "./core"; - vendorHash = "sha256-BpZB+0r7x7Ntldimo/nHXIu98jwhcA53l3kMav9lHkA="; + + vendorHash = "sha256-yam3DgY/dfwIRc7OvFltwX29x6xGlrrsK4Oj6oaGYRw="; + + CGO_ENABLED = 0; + buildPhase = '' runHook preBuild - mkdir -p $out/lib - go build -ldflags="-w -s" -tags=with_gvisor -buildmode=c-shared -o $out/lib/libclash.so + mkdir -p $out/bin + go build -ldflags="-w -s" -tags=with_gvisor -o $out/bin/FlClashCore runHook postBuild ''; @@ -42,18 +50,30 @@ let homepage = "https://github.com/chen08209/FlClash"; license = with lib.licenses; [ gpl3Plus ]; maintainers = with lib.maintainers; [ aucub ]; - platforms = lib.platforms.linux; }; }; in -flutter.buildFlutterApplication { +flutter324.buildFlutterApplication { inherit pname version src; + pubspecLock = lib.importJSON ./pubspec.lock.json; + + nativeBuildInputs = [ + copyDesktopItems + wrapGAppsHook3 + autoPatchelfHook + ]; + + buildInputs = [ + keybinder3 + libayatana-appindicator + ]; + desktopItems = [ (makeDesktopItem { - name = "FlClash"; + name = "flclash"; exec = "FlClash %U"; - icon = "FlClash"; + icon = "flclash"; genericName = "FlClash"; desktopName = "FlClash"; categories = [ @@ -68,31 +88,18 @@ flutter.buildFlutterApplication { }) ]; - postPatch = '' - substituteInPlace lib/clash/core.dart \ - --replace-fail 'DynamicLibrary.open("libclash.so")' 'DynamicLibrary.open("${libclash}/lib/libclash.so")' - ''; - preBuild = '' mkdir -p ./libclash/linux/ - cp ${libclash}/lib/libclash.so ./libclash/linux/libclash.so + cp ${libclash}/bin/FlClashCore ./libclash/linux/FlClashCore ''; postInstall = '' - mkdir -p $out/share/pixmaps/ - cp ./assets/images/icon.png $out/share/pixmaps/FlClash.png + install -Dm644 ./assets/images/icon.png $out/share/pixmaps/flclash.png ''; - pubspecLock = lib.importJSON ./pubspec.lock.json; - - nativeBuildInputs = [ - copyDesktopItems - ]; - - buildInputs = [ - keybinder3 - libayatana-appindicator - ]; + extraWrapProgramArgs = '' + --prefix PATH : ${lib.makeBinPath [ zenity ]} + ''; meta = { description = "Multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free"; From 4df4b61819cc507de86509cd56f551015b0f46c8 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sun, 8 Dec 2024 19:15:57 +0800 Subject: [PATCH 100/100] kazumi: 1.4.4 -> 1.4.5 --- pkgs/by-name/ka/kazumi/package.nix | 85 ++++++-- pkgs/by-name/ka/kazumi/pubspec.lock.json | 246 +++++++++++++---------- 2 files changed, 213 insertions(+), 118 deletions(-) diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix index 43883f3223ff..49c928f50118 100644 --- a/pkgs/by-name/ka/kazumi/package.nix +++ b/pkgs/by-name/ka/kazumi/package.nix @@ -1,28 +1,28 @@ { lib, fetchFromGitHub, - flutter, + flutter324, webkitgtk_4_1, alsa-lib, libayatana-appindicator, - libepoxy, autoPatchelfHook, wrapGAppsHook3, gst_all_1, - at-spi2-atk, + stdenv, + mimalloc, + mpv, + mpv-unwrapped, + xdg-user-dirs, }: -let - version = "1.4.4"; -in -flutter.buildFlutterApplication { +flutter324.buildFlutterApplication rec { pname = "kazumi"; - inherit version; + version = "1.4.5"; src = fetchFromGitHub { owner = "Predidit"; repo = "Kazumi"; - rev = "refs/tags/${version}"; - hash = "sha256-p5eFabIa04io180tBNCMRs2pX7HU8b+PdyBwZohmKR8="; + tag = version; + hash = "sha256-CbfNvLJrGjJAWSeHejtHG0foSGmjpJtvbWvK994q4uQ="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; @@ -35,9 +35,8 @@ flutter.buildFlutterApplication { buildInputs = [ webkitgtk_4_1 alsa-lib - at-spi2-atk libayatana-appindicator - libepoxy + mpv gst_all_1.gstreamer gst_all_1.gst-vaapi gst_all_1.gst-libav @@ -46,23 +45,81 @@ flutter.buildFlutterApplication { gst_all_1.gst-plugins-base ]; + customSourceBuilders = { + # unofficial media_kit_libs_linux + media_kit_libs_linux = + { version, src, ... }: + stdenv.mkDerivation rec { + pname = "media_kit_libs_linux"; + inherit version src; + inherit (src) passthru; + + postPatch = '' + sed -i '/set(MIMALLOC "mimalloc-/,/add_custom_target/d' libs/linux/media_kit_libs_linux/linux/CMakeLists.txt + sed -i '/set(PLUGIN_NAME "media_kit_libs_linux_plugin")/i add_custom_target("MIMALLOC_TARGET" ALL DEPENDS ${mimalloc}/lib/mimalloc.o)' libs/linux/media_kit_libs_linux/linux/CMakeLists.txt + ''; + + installPhase = '' + runHook preInstall + + cp -r . $out + + runHook postInstall + ''; + }; + # unofficial media_kit_video + media_kit_video = + { version, src, ... }: + stdenv.mkDerivation rec { + pname = "media_kit_video"; + inherit version src; + inherit (src) passthru; + + postPatch = '' + sed -i '/set(LIBMPV_ZIP_URL/,/if(MEDIA_KIT_LIBS_AVAILABLE)/{//!d; /set(LIBMPV_ZIP_URL/d}' media_kit_video/linux/CMakeLists.txt + sed -i '/if(MEDIA_KIT_LIBS_AVAILABLE)/i set(LIBMPV_HEADER_UNZIP_DIR "${mpv-unwrapped.dev}/include/mpv")' media_kit_video/linux/CMakeLists.txt + sed -i '/if(MEDIA_KIT_LIBS_AVAILABLE)/i set(LIBMPV_PATH "${mpv}/lib")' media_kit_video/linux/CMakeLists.txt + sed -i '/if(MEDIA_KIT_LIBS_AVAILABLE)/i set(LIBMPV_UNZIP_DIR "${mpv}/lib")' media_kit_video/linux/CMakeLists.txt + ''; + + installPhase = '' + runHook preInstall + + cp -r . $out + + runHook postInstall + ''; + }; + }; + gitHashes = { desktop_webview_window = "sha256-Z9ehzDKe1W3wGa2AcZoP73hlSwydggO6DaXd9mop+cM="; webview_windows = "sha256-9oWTvEoFeF7djEVA3PSM72rOmOMUhV8ZYuV6+RreNzE="; + media_kit = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ="; + media_kit_libs_android_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ="; + media_kit_libs_ios_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ="; + media_kit_libs_linux = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ="; + media_kit_libs_macos_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ="; + media_kit_libs_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ="; + media_kit_libs_windows_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ="; + media_kit_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ="; }; postInstall = '' - mkdir -p $out/share/applications/ $out/share/icons/hicolor/512x512/apps/ install -Dm0644 ./assets/linux/io.github.Predidit.Kazumi.desktop $out/share/applications/io.github.Predidit.Kazumi.desktop install -Dm0644 ./assets/images/logo/logo_linux.png $out/share/icons/hicolor/512x512/apps/io.github.Predidit.Kazumi.png ''; + extraWrapProgramArgs = '' + --prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]} + ''; + meta = { description = "Watch Animes online with danmaku support"; homepage = "https://github.com/Predidit/Kazumi"; mainProgram = "kazumi"; license = with lib.licenses; [ gpl3Plus ]; maintainers = with lib.maintainers; [ aucub ]; - platforms = [ "x86_64-linux" ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json index a9a4c7884ecd..8227279b1428 100644 --- a/pkgs/by-name/ka/kazumi/pubspec.lock.json +++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json @@ -210,11 +210,11 @@ "dependency": "direct main", "description": { "name": "canvas_danmaku", - "sha256": "539beee7dab73b0d01980194885730de11527ec0f96d9c4fa26ae4eac6699b7f", + "sha256": "8e9971dab1ebc4b29bbda95b95cc19966fef5f1e313bc3bedbcc6ce697ebc523", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.3" + "version": "0.2.4" }, "characters": { "dependency": "transitive", @@ -621,16 +621,6 @@ "source": "hosted", "version": "4.0.0" }, - "fvp": { - "dependency": "direct main", - "description": { - "name": "fvp", - "sha256": "3dd245cac5dfba36311cbf5834d8f275ba1f3e49a5cdcb4a98e01cb41e9a21d8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.28.0" - }, "glob": { "dependency": "transitive", "description": { @@ -815,11 +805,11 @@ "dependency": "direct main", "description": { "name": "logger", - "sha256": "697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32", + "sha256": "be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "2.5.0" }, "logging": { "dependency": "transitive", @@ -861,6 +851,94 @@ "source": "hosted", "version": "0.11.1" }, + "media_kit": { + "dependency": "direct main", + "description": { + "path": "media_kit", + "ref": "main", + "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b", + "url": "https://github.com/Predidit/media-kit.git" + }, + "source": "git", + "version": "1.1.11" + }, + "media_kit_libs_android_video": { + "dependency": "direct overridden", + "description": { + "path": "libs/android/media_kit_libs_android_video", + "ref": "main", + "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b", + "url": "https://github.com/Predidit/media-kit.git" + }, + "source": "git", + "version": "1.3.6" + }, + "media_kit_libs_ios_video": { + "dependency": "direct overridden", + "description": { + "path": "libs/ios/media_kit_libs_ios_video", + "ref": "main", + "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b", + "url": "https://github.com/Predidit/media-kit.git" + }, + "source": "git", + "version": "1.1.4" + }, + "media_kit_libs_linux": { + "dependency": "direct overridden", + "description": { + "path": "libs/linux/media_kit_libs_linux", + "ref": "main", + "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b", + "url": "https://github.com/Predidit/media-kit.git" + }, + "source": "git", + "version": "1.1.3" + }, + "media_kit_libs_macos_video": { + "dependency": "direct overridden", + "description": { + "path": "libs/macos/media_kit_libs_macos_video", + "ref": "main", + "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b", + "url": "https://github.com/Predidit/media-kit.git" + }, + "source": "git", + "version": "1.1.4" + }, + "media_kit_libs_video": { + "dependency": "direct main", + "description": { + "path": "libs/universal/media_kit_libs_video", + "ref": "main", + "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b", + "url": "https://github.com/Predidit/media-kit.git" + }, + "source": "git", + "version": "1.0.5" + }, + "media_kit_libs_windows_video": { + "dependency": "direct overridden", + "description": { + "path": "libs/windows/media_kit_libs_windows_video", + "ref": "main", + "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b", + "url": "https://github.com/Predidit/media-kit.git" + }, + "source": "git", + "version": "1.0.10" + }, + "media_kit_video": { + "dependency": "direct main", + "description": { + "path": "media_kit_video", + "ref": "main", + "resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b", + "url": "https://github.com/Predidit/media-kit.git" + }, + "source": "git", + "version": "1.2.5" + }, "menu_base": { "dependency": "transitive", "description": { @@ -1151,65 +1229,45 @@ "source": "hosted", "version": "0.28.0" }, - "screen_brightness": { - "dependency": "direct main", + "safe_local_storage": { + "dependency": "transitive", "description": { - "name": "screen_brightness", - "sha256": "7d4ac84ae26b37c01d6f5db7123a72db7933e1f2a2a8c369a51e08f81b3178d8", + "name": "safe_local_storage", + "sha256": "e9a21b6fec7a8aa62cc2585ff4c1b127df42f3185adbd2aca66b47abe2e80236", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.1" + "version": "2.0.1" }, "screen_brightness_android": { "dependency": "transitive", "description": { "name": "screen_brightness_android", - "sha256": "8c69d3ac475e4d625e7fa682a3a51a69ff59abe5b4a9e57f6ec7d830a6c69bd6", + "sha256": "74455f9901ab8a1a45c9097b83855dbbb7498110cc2bc249cb5a86570dd1cf7c", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.1" + "version": "2.0.0" }, "screen_brightness_ios": { "dependency": "transitive", "description": { "name": "screen_brightness_ios", - "sha256": "f08f70ca1ac3e30719764b5cfb8b3fe1e28163065018a41b3e6f243ab146c2f1", + "sha256": "caee02b34e0089b138a7aee35c461bd2d7c78446dd417f07613def192598ca08", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.1" - }, - "screen_brightness_macos": { - "dependency": "transitive", - "description": { - "name": "screen_brightness_macos", - "sha256": "70c2efa4534e22b927e82693488f127dd4a0f008469fccf4f0eefe9061bbdd6a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.1" + "version": "2.0.0" }, "screen_brightness_platform_interface": { "dependency": "transitive", "description": { "name": "screen_brightness_platform_interface", - "sha256": "9f3ebf7f22d5487e7676fe9ddaf3fc55b6ff8057707cf6dc0121c7dfda346a16", + "sha256": "321e9455b0057e3647fd37700931e063739d94a8aa1b094f98133c01cb56c27b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.1" - }, - "screen_brightness_windows": { - "dependency": "transitive", - "description": { - "name": "screen_brightness_windows", - "sha256": "c8e12a91cf6dd912a48bd41fcf749282a51afa17f536c3460d8d05702fb89ffa", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.1" + "version": "2.0.0" }, "screen_pixel": { "dependency": "direct main", @@ -1365,11 +1423,11 @@ "dependency": "transitive", "description": { "name": "shelf_web_socket", - "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611", + "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "2.0.1" }, "shortid": { "dependency": "transitive", @@ -1451,11 +1509,11 @@ "dependency": "transitive", "description": { "name": "sqflite_common", - "sha256": "4468b24876d673418a7b7147e5a08a715b4998a7ae69227acafaab762e0e5490", + "sha256": "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.4+5" + "version": "2.5.4+6" }, "sqflite_darwin": { "dependency": "transitive", @@ -1597,6 +1655,26 @@ "source": "hosted", "version": "2.2.2" }, + "universal_platform": { + "dependency": "transitive", + "description": { + "name": "universal_platform", + "sha256": "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "uri_parser": { + "dependency": "transitive", + "description": { + "name": "uri_parser", + "sha256": "ff4d2c720aca3f4f7d5445e23b11b2d15ef8af5ddce5164643f38ff962dcb270", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, "url_launcher": { "dependency": "direct main", "description": { @@ -1697,56 +1775,6 @@ "source": "hosted", "version": "2.1.4" }, - "video_player": { - "dependency": "direct main", - "description": { - "name": "video_player", - "sha256": "4a8c3492d734f7c39c2588a3206707a05ee80cef52e8c7f3b2078d430c84bc17", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.9.2" - }, - "video_player_android": { - "dependency": "transitive", - "description": { - "name": "video_player_android", - "sha256": "391e092ba4abe2f93b3e625bd6b6a6ec7d7414279462c1c0ee42b5ab8d0a0898", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.7.16" - }, - "video_player_avfoundation": { - "dependency": "transitive", - "description": { - "name": "video_player_avfoundation", - "sha256": "cd5ab8a8bc0eab65ab0cea40304097edc46da574c8c1ecdee96f28cd8ef3792f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.6.2" - }, - "video_player_platform_interface": { - "dependency": "transitive", - "description": { - "name": "video_player_platform_interface", - "sha256": "229d7642ccd9f3dc4aba169609dd6b5f3f443bb4cc15b82f7785fcada5af9bbb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.2.3" - }, - "video_player_web": { - "dependency": "transitive", - "description": { - "name": "video_player_web", - "sha256": "881b375a934d8ebf868c7fb1423b2bfaa393a0a265fa3f733079a86536064a10", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.3" - }, "vm_service": { "dependency": "transitive", "description": { @@ -1757,8 +1785,18 @@ "source": "hosted", "version": "14.2.5" }, + "volume_controller": { + "dependency": "transitive", + "description": { + "name": "volume_controller", + "sha256": "c71d4c62631305df63b72da79089e078af2659649301807fa746088f365cb48e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.8" + }, "wakelock_plus": { - "dependency": "direct main", + "dependency": "transitive", "description": { "name": "wakelock_plus", "sha256": "bf4ee6f17a2fa373ed3753ad0e602b7603f8c75af006d5b9bdade263928c0484", @@ -1841,11 +1879,11 @@ "dependency": "transitive", "description": { "name": "webview_flutter_android", - "sha256": "86c2d01c37c4578ee46560109cf2e18fb271f0d080a796f09188d0952352e057", + "sha256": "285cedfd9441267f6cca8843458620b5fda1af75b04f5818d0441acda5d7df19", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.1.0" }, "webview_flutter_platform_interface": { "dependency": "transitive", @@ -1861,11 +1899,11 @@ "dependency": "transitive", "description": { "name": "webview_flutter_wkwebview", - "sha256": "3be297aa4ca78205abdd284cf55f168c35246c75b3079990ad8ba9d257681a30", + "sha256": "b7e92f129482460951d96ef9a46b49db34bd2e1621685de26e9eaafd9674e7eb", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.16.2" + "version": "3.16.3" }, "webview_windows": { "dependency": "direct main",