From 3b413092b5b6d6f842e679f55384bd5770205487 Mon Sep 17 00:00:00 2001 From: Ulysses Zhan Date: Thu, 5 Dec 2024 14:39:19 -0800 Subject: [PATCH 01/60] megacmd: format; better coding style (avoid rec; avoid with lib) --- pkgs/by-name/me/megacmd/package.nix | 63 +++++++++++++++++------------ 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/me/megacmd/package.nix b/pkgs/by-name/me/megacmd/package.nix index 3e2625e9a7a8..c773fe5ccf1f 100644 --- a/pkgs/by-name/me/megacmd/package.nix +++ b/pkgs/by-name/me/megacmd/package.nix @@ -1,29 +1,33 @@ -{ lib -, stdenv -, autoreconfHook -, c-ares -, cryptopp -, curl -, fetchFromGitHub +{ + lib, + stdenv, + autoreconfHook, + c-ares, + cryptopp, + curl, + fetchFromGitHub, # build fails with latest ffmpeg, see https://github.com/meganz/MEGAcmd/issues/523. # to be re-enabled when patch available - # , ffmpeg -, gcc-unwrapped -, icu -, libmediainfo -, libraw -, libsodium -, libuv -, libzen -, pcre-cpp -, pkg-config -, readline -, sqlite + # ffmpeg, + gcc-unwrapped, + icu, + libmediainfo, + libraw, + libsodium, + libuv, + libzen, + pcre-cpp, + pkg-config, + readline, + sqlite, }: -stdenv.mkDerivation rec { +let pname = "megacmd"; version = "1.7.0"; +in +stdenv.mkDerivation { + inherit pname version; src = fetchFromGitHub { owner = "meganz"; @@ -34,7 +38,10 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; buildInputs = [ c-ares @@ -71,11 +78,17 @@ stdenv.mkDerivation rec { "--with-termcap" ]; - meta = with lib; { + meta = { description = "MEGA Command Line Interactive and Scriptable Application"; homepage = "https://mega.io/cmd"; - license = with licenses; [ bsd2 gpl3Only ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = with maintainers; [ lunik1 ]; + license = with lib.licenses; [ + bsd2 + gpl3Only + ]; + platforms = [ + "i686-linux" + "x86_64-linux" + ]; + maintainers = with lib.maintainers; [ lunik1 ]; }; } From 4211063dc86534794842e8dfb88c597d774d4d62 Mon Sep 17 00:00:00 2001 From: Ulysses Zhan Date: Thu, 5 Dec 2024 15:19:47 -0800 Subject: [PATCH 02/60] megacmd: fix build with ffmpeg; add option to build with freeimage --- pkgs/by-name/me/megacmd/fix-ffmpeg.patch | 29 ++++++++++++++++++++++++ pkgs/by-name/me/megacmd/package.nix | 22 +++++++++++------- 2 files changed, 43 insertions(+), 8 deletions(-) create mode 100644 pkgs/by-name/me/megacmd/fix-ffmpeg.patch diff --git a/pkgs/by-name/me/megacmd/fix-ffmpeg.patch b/pkgs/by-name/me/megacmd/fix-ffmpeg.patch new file mode 100644 index 000000000000..45d6e85b373c --- /dev/null +++ b/pkgs/by-name/me/megacmd/fix-ffmpeg.patch @@ -0,0 +1,29 @@ +--- a/sdk/src/gfx/freeimage.cpp ++++ b/sdk/src/gfx/freeimage.cpp +@@ -216,11 +216,13 @@ bool GfxProviderFreeImage::readbitmapFreeimage(const LocalPath& imagePath, int s + + #ifdef HAVE_FFMPEG + ++#if LIBAVCODEC_VERSION_MAJOR < 60 + #ifdef AV_CODEC_CAP_TRUNCATED + #define CAP_TRUNCATED AV_CODEC_CAP_TRUNCATED + #else + #define CAP_TRUNCATED CODEC_CAP_TRUNCATED + #endif ++#endif + + const char *GfxProviderFreeImage::supportedformatsFfmpeg() + { +@@ -323,10 +325,12 @@ bool GfxProviderFreeImage::readbitmapFfmpeg(const LocalPath& imagePath, int size + + // Force seeking to key frames + formatContext->seek2any = false; ++#if LIBAVCODEC_VERSION_MAJOR < 60 + if (decoder->capabilities & CAP_TRUNCATED) + { + codecContext->flags |= CAP_TRUNCATED; + } ++#endif + + AVPixelFormat sourcePixelFormat = static_cast(codecParm->format); + AVPixelFormat targetPixelFormat = AV_PIX_FMT_BGR24; //raw data expected by freeimage is in this format diff --git a/pkgs/by-name/me/megacmd/package.nix b/pkgs/by-name/me/megacmd/package.nix index c773fe5ccf1f..42ac1284fa7d 100644 --- a/pkgs/by-name/me/megacmd/package.nix +++ b/pkgs/by-name/me/megacmd/package.nix @@ -6,9 +6,8 @@ cryptopp, curl, fetchFromGitHub, - # build fails with latest ffmpeg, see https://github.com/meganz/MEGAcmd/issues/523. - # to be re-enabled when patch available - # ffmpeg, + ffmpeg, + freeimage, gcc-unwrapped, icu, libmediainfo, @@ -20,6 +19,7 @@ pkg-config, readline, sqlite, + withFreeImage ? false, # default to false because freeimage is insecure }: let @@ -47,7 +47,7 @@ stdenv.mkDerivation { c-ares cryptopp curl - # ffmpeg + ffmpeg icu gcc-unwrapped libmediainfo @@ -58,7 +58,7 @@ stdenv.mkDerivation { pcre-cpp readline sqlite - ]; + ] ++ lib.optionals withFreeImage [ freeimage ]; configureFlags = [ "--disable-curl-checks" @@ -66,8 +66,7 @@ stdenv.mkDerivation { "--with-cares" "--with-cryptopp" "--with-curl" - # "--with-ffmpeg" - "--without-freeimage" # disabled as freeimage is insecure + "--with-ffmpeg" "--with-icu" "--with-libmediainfo" "--with-libuv" @@ -76,6 +75,10 @@ stdenv.mkDerivation { "--with-readline" "--with-sodium" "--with-termcap" + ] ++ (if withFreeImage then [ "--with-freeimage" ] else [ "--without-freeimage" ]); + + patches = [ + ./fix-ffmpeg.patch # https://github.com/meganz/sdk/issues/2635#issuecomment-1495405085 ]; meta = { @@ -89,6 +92,9 @@ stdenv.mkDerivation { "i686-linux" "x86_64-linux" ]; - maintainers = with lib.maintainers; [ lunik1 ]; + maintainers = with lib.maintainers; [ + lunik1 + ulysseszhan + ]; }; } From 7c87ea18820bfa3b65e9d883cc843206e2c53e60 Mon Sep 17 00:00:00 2001 From: Ulysses Zhan Date: Thu, 5 Dec 2024 21:00:36 -0800 Subject: [PATCH 03/60] megacmd: add darwin support --- pkgs/by-name/me/megacmd/fix-darwin.patch | 49 ++++++++++++++++ pkgs/by-name/me/megacmd/package.nix | 72 +++++++++++++++--------- 2 files changed, 93 insertions(+), 28 deletions(-) create mode 100644 pkgs/by-name/me/megacmd/fix-darwin.patch diff --git a/pkgs/by-name/me/megacmd/fix-darwin.patch b/pkgs/by-name/me/megacmd/fix-darwin.patch new file mode 100644 index 000000000000..7fa87b43163a --- /dev/null +++ b/pkgs/by-name/me/megacmd/fix-darwin.patch @@ -0,0 +1,49 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -25,6 +25,11 @@ AM_CPPFLAGS = \ + + AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/sdk/include + ++if DARWIN ++AM_LIBTOOLFLAGS="--tag=CXX" ++AM_CPPFLAGS+=-I$(top_srcdir)/include/mega/osx -I$(top_srcdir)/sdk/include/mega/osx ++endif ++ + if WIN32 + AM_CPPFLAGS+=-I$(top_srcdir)/sdk/include/mega/win32 + else +--- a/src/megacmdshell/megacmdshellcommunications.cpp ++++ b/src/megacmdshell/megacmdshellcommunications.cpp +@@ -306,10 +306,6 @@ SOCKET MegaCmdShellCommunications::createSocket(int number, bool initializeserve + #endif + const char executable2[] = "./mega-cmd-server"; + #else +- #ifdef __MACH__ +- const char executable[] = "/Applications/MEGAcmd.app/Contents/MacOS/mega-cmd"; +- const char executable2[] = "./mega-cmd"; +- #else + const char executable[] = "mega-cmd-server"; + #ifdef __linux__ + char executable2[PATH_MAX]; +@@ -317,7 +313,6 @@ SOCKET MegaCmdShellCommunications::createSocket(int number, bool initializeserve + #else + const char executable2[] = "./mega-cmd-server"; + #endif +- #endif + #endif + + std::vector argsVector{ +--- a/sdk/Makefile.am ++++ b/sdk/Makefile.am +@@ -27,6 +27,11 @@ AM_CPPFLAGS = \ + + include m4/aminclude.am + ++if DARWIN ++AM_LIBTOOLFLAGS="--tag=CXX" ++AM_CPPFLAGS+=-I$(top_srcdir)/include/mega/osx ++endif ++ + if WIN32 + AM_CPPFLAGS+=-I$(top_srcdir)/include/mega/win32 + else diff --git a/pkgs/by-name/me/megacmd/package.nix b/pkgs/by-name/me/megacmd/package.nix index 42ac1284fa7d..ea68f8fa84ce 100644 --- a/pkgs/by-name/me/megacmd/package.nix +++ b/pkgs/by-name/me/megacmd/package.nix @@ -25,17 +25,29 @@ let pname = "megacmd"; version = "1.7.0"; + srcOptions = + if stdenv.isLinux then + { + tag = "${version}_Linux"; + hash = "sha256-UlSqwM8GQKeG8/K0t5DbM034NQOeBg+ujNi/MMsVCuM="; + } + else + { + tag = "${version}_macOS"; + hash = "sha256-UlSqwM8GQKeG8/K0t5DbM034NQOeBg+ujNi/MMsVCuM="; + }; in stdenv.mkDerivation { inherit pname version; - src = fetchFromGitHub { - owner = "meganz"; - repo = "MEGAcmd"; - rev = "${version}_Linux"; - hash = "sha256-UlSqwM8GQKeG8/K0t5DbM034NQOeBg+ujNi/MMsVCuM="; - fetchSubmodules = true; - }; + src = fetchFromGitHub ( + srcOptions + // { + owner = "meganz"; + repo = "MEGAcmd"; + fetchSubmodules = true; + } + ); enableParallelBuilding = true; nativeBuildInputs = [ @@ -43,25 +55,26 @@ stdenv.mkDerivation { pkg-config ]; - buildInputs = [ - c-ares - cryptopp - curl - ffmpeg - icu - gcc-unwrapped - libmediainfo - libraw - libsodium - libuv - libzen - pcre-cpp - readline - sqlite - ] ++ lib.optionals withFreeImage [ freeimage ]; + buildInputs = + lib.optionals stdenv.isLinux [ gcc-unwrapped ] # fix: ld: cannot find lib64/libstdc++fs.a + ++ [ + c-ares + cryptopp + curl + ffmpeg + icu + libmediainfo + libraw + libsodium + libuv + libzen + pcre-cpp + readline + sqlite + ] + ++ lib.optionals withFreeImage [ freeimage ]; configureFlags = [ - "--disable-curl-checks" "--disable-examples" "--with-cares" "--with-cryptopp" @@ -77,8 +90,14 @@ stdenv.mkDerivation { "--with-termcap" ] ++ (if withFreeImage then [ "--with-freeimage" ] else [ "--without-freeimage" ]); + # On darwin, some macros defined in AssertMacros.h (from apple-sdk) are conflicting. + postConfigure = '' + echo '#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0' >> sdk/include/mega/config.h + ''; + patches = [ ./fix-ffmpeg.patch # https://github.com/meganz/sdk/issues/2635#issuecomment-1495405085 + ./fix-darwin.patch # fix: libtool tag not found; MacFileSystemAccess not declared; server cannot init ]; meta = { @@ -88,10 +107,7 @@ stdenv.mkDerivation { bsd2 gpl3Only ]; - platforms = [ - "i686-linux" - "x86_64-linux" - ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ lunik1 ulysseszhan From a7bee5911ccdbf0bce2cf21296e43a3694642ff1 Mon Sep 17 00:00:00 2001 From: Daniel Coonce <1077480+coonce@users.noreply.github.com> Date: Mon, 16 Dec 2024 14:31:24 -0600 Subject: [PATCH 04/60] jellyseerr: migrate to by-name --- pkgs/{servers => by-name/je}/jellyseerr/package.json | 0 .../default.nix => by-name/je/jellyseerr/package.nix} | 0 pkgs/{servers => by-name/je}/jellyseerr/update.sh | 0 pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 2 deletions(-) rename pkgs/{servers => by-name/je}/jellyseerr/package.json (100%) rename pkgs/{servers/jellyseerr/default.nix => by-name/je/jellyseerr/package.nix} (100%) rename pkgs/{servers => by-name/je}/jellyseerr/update.sh (100%) diff --git a/pkgs/servers/jellyseerr/package.json b/pkgs/by-name/je/jellyseerr/package.json similarity index 100% rename from pkgs/servers/jellyseerr/package.json rename to pkgs/by-name/je/jellyseerr/package.json diff --git a/pkgs/servers/jellyseerr/default.nix b/pkgs/by-name/je/jellyseerr/package.nix similarity index 100% rename from pkgs/servers/jellyseerr/default.nix rename to pkgs/by-name/je/jellyseerr/package.nix diff --git a/pkgs/servers/jellyseerr/update.sh b/pkgs/by-name/je/jellyseerr/update.sh similarity index 100% rename from pkgs/servers/jellyseerr/update.sh rename to pkgs/by-name/je/jellyseerr/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 579612e8d204..998ac748c8f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2444,8 +2444,6 @@ with pkgs; jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { }; - jellyseerr = callPackage ../servers/jellyseerr { }; - juce = callPackage ../development/misc/juce { stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; From 28765958d2d4aeb14a6687b60d2ffa735b816e6f Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Wed, 18 Dec 2024 15:14:50 -0300 Subject: [PATCH 05/60] nextcloudXXPackages.apps.recognize: use lib.{getExe,getDev}, fix typo --- .../nextcloud/packages/apps/recognize.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/apps/recognize.nix b/pkgs/servers/nextcloud/packages/apps/recognize.nix index d72fb41600dd..86d648447959 100644 --- a/pkgs/servers/nextcloud/packages/apps/recognize.nix +++ b/pkgs/servers/nextcloud/packages/apps/recognize.nix @@ -3,6 +3,8 @@ fetchurl, lib, nodejs, + node-pre-gyp, + node-gyp, python3, util-linux, ffmpeg, @@ -36,7 +38,7 @@ let in stdenv.mkDerivation rec { - pname = "nextcloud-app-recognise"; + pname = "nextcloud-app-recognize"; version = currentVersionInfo.version; srcs = @@ -80,11 +82,11 @@ stdenv.mkDerivation rec { # Replace all occurences of node (and check that we actually remved them all) test "$(grep "get[a-zA-Z]*('node_binary'" recognize/lib/**/*.php | wc -l)" -gt 0 substituteInPlace recognize/lib/**/*.php \ - --replace-quiet "\$this->settingsService->getSetting('node_binary')" "'${nodejs}/bin/node'" \ - --replace-quiet "\$this->config->getAppValueString('node_binary', '""')" "'${nodejs}/bin/node'" \ - --replace-quiet "\$this->config->getAppValueString('node_binary')" "'${nodejs}/bin/node'" \ - --replace-quiet "\$this->config->getAppValue('node_binary', '""')" "'${nodejs}/bin/node'" \ - --replace-quiet "\$this->config->getAppValue('node_binary')" "'${nodejs}/bin/node'" + --replace-quiet "\$this->settingsService->getSetting('node_binary')" "'${lib.getExe nodejs}'" \ + --replace-quiet "\$this->config->getAppValueString('node_binary', '""')" "'${lib.getExe nodejs}'" \ + --replace-quiet "\$this->config->getAppValueString('node_binary')" "'${lib.getExe nodejs}'" \ + --replace-quiet "\$this->config->getAppValue('node_binary', '""')" "'${lib.getExe nodejs}'" \ + --replace-quiet "\$this->config->getAppValue('node_binary')" "'${lib.getExe nodejs}'" test "$(grep "get[a-zA-Z]*('node_binary'" recognize/lib/**/*.php | wc -l)" -eq 0 @@ -92,13 +94,13 @@ stdenv.mkDerivation rec { # Skip trying to install it... (less warnings in the log) sed -i '/public function run/areturn ; //skip' recognize/lib/Migration/InstallDeps.php - ln -s ${ffmpeg}/bin/ffmpeg recognize/node_modules/ffmpeg-static/ffmpeg + ln -s ${lib.getExe ffmpeg} recognize/node_modules/ffmpeg-static/ffmpeg ''; nativeBuildInputs = lib.optionals useLibTensorflow [ nodejs - nodejs.pkgs.node-pre-gyp - nodejs.pkgs.node-gyp + node-pre-gyp + node-gyp python3 util-linux ]; @@ -107,7 +109,7 @@ stdenv.mkDerivation rec { cd recognize # Install tfjs dependency - export CPPFLAGS="-I${nodejs}/include/node -Ideps/include" + export CPPFLAGS="-I${lib.getDev nodejs}/include/node -Ideps/include" cd node_modules/@tensorflow/tfjs-node node-pre-gyp install --prefer-offline --build-from-source --nodedir=${nodejs}/include/node cd - From 4bdb74811ea2b24688e5995e004c47444a905d0b Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Wed, 18 Dec 2024 15:38:38 -0300 Subject: [PATCH 06/60] nextcloudXXPackages.apps.recognize: add meta.description and meta.changelog --- pkgs/servers/nextcloud/packages/apps/recognize.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/nextcloud/packages/apps/recognize.nix b/pkgs/servers/nextcloud/packages/apps/recognize.nix index 86d648447959..2e0a45ca4dd2 100644 --- a/pkgs/servers/nextcloud/packages/apps/recognize.nix +++ b/pkgs/servers/nextcloud/packages/apps/recognize.nix @@ -135,5 +135,7 @@ stdenv.mkDerivation rec { This app goes through your media collection and adds fitting tags, automatically categorizing your photos and music. ''; homepage = "https://apps.nextcloud.com/apps/recognize"; + description = "Smart media tagging for Nextcloud: recognizes faces, objects, landscapes, music genres"; + changelog = "https://github.com/nextcloud/recognize/blob/v${version}/CHANGELOG.md"; }; } From 854f0111d37e93dd870035c5512d3d2fbaee6e5e Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Mon, 23 Dec 2024 10:33:28 +0000 Subject: [PATCH 07/60] rquickshare: fix opening This fixes https://github.com/NixOS/nixpkgs/issues/350315 by applying upstream instructions and downloading the legacy package instead. The app should open now. --- pkgs/by-name/rq/rquickshare/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/rq/rquickshare/package.nix b/pkgs/by-name/rq/rquickshare/package.nix index ae38de23828a..2e40ec4a4494 100644 --- a/pkgs/by-name/rq/rquickshare/package.nix +++ b/pkgs/by-name/rq/rquickshare/package.nix @@ -7,17 +7,17 @@ let pname = "rquickshare"; version = "0.11.2"; src = fetchurl { - url = "https://github.com/Martichou/rquickshare/releases/download/v${version}/r-quick-share-main_v${version}_glibc-2.39_amd64.AppImage"; - hash = "sha256-7w1zybCPRg4RK5bKHoHLDUDXVDQL23ox/6wh8H9vTPg="; + url = "https://github.com/Martichou/rquickshare/releases/download/v${version}/r-quick-share-legacy_v${version}_glibc-2.31_amd64.AppImage"; + hash = "sha256-VXYiYrTSedH8xFjuxbdplzVdfnO6s3ftY2I121Unlfw="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - install -Dm444 ${appimageContents}/rquickshare.desktop -t $out/share/applications - substituteInPlace $out/share/applications/rquickshare.desktop \ - --replace-fail 'Exec=rquickshare' 'Exec=rquickshare %u' + install -Dm444 ${appimageContents}/r-quick-share.desktop -t $out/share/applications + substituteInPlace $out/share/applications/r-quick-share.desktop \ + --replace-fail 'Exec=r-quick-share' 'Exec=r-quick-share %u' cp -r ${appimageContents}/usr/share/icons $out/share ''; From d77da17f0c54e99a0ad37bf7d6d43749600369bd Mon Sep 17 00:00:00 2001 From: kilianar Date: Wed, 25 Dec 2024 17:22:45 +0100 Subject: [PATCH 08/60] stellarium: 24.3 -> 24.4 https://github.com/Stellarium/stellarium/releases/tag/v24.4 --- .../science/astronomy/stellarium/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index e970cfc16b34..54728665daea 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -28,20 +28,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "stellarium"; - version = "24.3"; + version = "24.4"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${finalAttrs.version}"; - hash = "sha256-shDp2tCOynMiEuTSx4TEK8V9h3EsMDq+kkZFhldrinM="; + hash = "sha256-/xF9hXlPKhmpvpx9t1IgSqpvvqrGnd0xaf0QMvu+9IA="; }; patches = [ - # Compatibility with INDI 2.0 series from https://github.com/Stellarium/stellarium/pull/3269 + # Fix indi headers from https://github.com/Stellarium/stellarium/pull/4025 (fetchpatch { - url = "https://github.com/Stellarium/stellarium/commit/31fd7bebf33fa710ce53ac8375238a24758312bc.patch"; - hash = "sha256-eJEqqitZgtV6noeCi8pDBYMVTFIVWXZU1fiEvoilX8o="; + url = "https://github.com/Stellarium/stellarium/commit/9669d64fb4104830412c6c6c2b45811075a92300.patch"; + hash = "sha256-CXeghxxRIV7Filveg+3pNAWymUpUuGnylvt4e8THJ8A="; }) ]; From b12eaf3813b24261705488d48ba9902f15b9f8eb Mon Sep 17 00:00:00 2001 From: Daniel Coonce <1077480+coonce@users.noreply.github.com> Date: Mon, 16 Dec 2024 15:01:21 -0600 Subject: [PATCH 09/60] jellyseerr: 1.9.2 -> 2.1.0 --- nixos/modules/services/misc/jellyseerr.nix | 4 +- pkgs/by-name/je/jellyseerr/package.json | 247 --------------------- pkgs/by-name/je/jellyseerr/package.nix | 79 +++---- pkgs/by-name/je/jellyseerr/update.sh | 16 -- 4 files changed, 35 insertions(+), 311 deletions(-) delete mode 100644 pkgs/by-name/je/jellyseerr/package.json delete mode 100755 pkgs/by-name/je/jellyseerr/update.sh diff --git a/nixos/modules/services/misc/jellyseerr.nix b/nixos/modules/services/misc/jellyseerr.nix index e09de7aec50b..09aaf4ed5b97 100644 --- a/nixos/modules/services/misc/jellyseerr.nix +++ b/nixos/modules/services/misc/jellyseerr.nix @@ -31,10 +31,10 @@ in serviceConfig = { Type = "exec"; StateDirectory = "jellyseerr"; - WorkingDirectory = "${cfg.package}/libexec/jellyseerr/deps/jellyseerr"; + WorkingDirectory = "${cfg.package}/share/dist"; DynamicUser = true; ExecStart = lib.getExe cfg.package; - BindPaths = [ "/var/lib/jellyseerr/:${cfg.package}/libexec/jellyseerr/deps/jellyseerr/config/" ]; + BindPaths = [ "/var/lib/jellyseerr/:${cfg.package}/share/dist/config/" ]; Restart = "on-failure"; ProtectHome = true; ProtectSystem = "strict"; diff --git a/pkgs/by-name/je/jellyseerr/package.json b/pkgs/by-name/je/jellyseerr/package.json deleted file mode 100644 index 6e97347f75b7..000000000000 --- a/pkgs/by-name/je/jellyseerr/package.json +++ /dev/null @@ -1,247 +0,0 @@ -{ - "name": "jellyseerr", - "version": "1.9.2", - "private": true, - "scripts": { - "dev": "nodemon -e ts --watch server --watch overseerr-api.yml -e .json,.ts,.yml -x ts-node -r tsconfig-paths/register --files --project server/tsconfig.json server/index.ts", - "build:server": "tsc --project server/tsconfig.json && copyfiles -u 2 server/templates/**/*.{html,pug} dist/templates && tsc-alias -p server/tsconfig.json", - "build:next": "next build", - "build": "yarn build:next && yarn build:server", - "lint": "eslint \"./server/**/*.{ts,tsx}\" \"./src/**/*.{ts,tsx}\" --cache", - "lintfix": "eslint \"./server/**/*.{ts,tsx}\" \"./src/**/*.{ts,tsx}\" --fix", - "start": "NODE_ENV=production node dist/index.js", - "i18n:extract": "extract-messages -l=en -o src/i18n/locale -d en --flat true --overwriteDefault true \"./src/**/!(*.test).{ts,tsx}\"", - "migration:generate": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:generate -d server/datasource.ts", - "migration:create": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:create -d server/datasource.ts", - "migration:run": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:run -d server/datasource.ts", - "format": "prettier --loglevel warn --write --cache .", - "format:check": "prettier --check --cache .", - "typecheck": "yarn typecheck:server && yarn typecheck:client", - "typecheck:server": "tsc --project server/tsconfig.json --noEmit", - "typecheck:client": "tsc --noEmit", - "prepare": "husky install", - "cypress:open": "cypress open", - "cypress:prepare": "ts-node -r tsconfig-paths/register --files --project server/tsconfig.json server/scripts/prepareTestDb.ts", - "cypress:build": "yarn build && yarn cypress:prepare" - }, - "repository": { - "type": "git", - "url": "https://github.com/fallenbagel/jellyseerr.git" - }, - "license": "MIT", - "dependencies": { - "@formatjs/intl-displaynames": "6.2.6", - "@formatjs/intl-locale": "3.1.1", - "@formatjs/intl-pluralrules": "5.1.10", - "@formatjs/intl-utils": "3.8.4", - "@headlessui/react": "1.7.12", - "@heroicons/react": "2.0.16", - "@supercharge/request-ip": "1.2.0", - "@svgr/webpack": "6.5.1", - "@tanem/react-nprogress": "5.0.30", - "ace-builds": "1.15.2", - "axios": "1.3.4", - "axios-rate-limit": "1.3.0", - "bcrypt": "5.1.0", - "bowser": "2.11.0", - "cacheable-lookup": "^7.0.0", - "connect-typeorm": "1.1.4", - "cookie-parser": "1.4.6", - "copy-to-clipboard": "3.3.3", - "country-flag-icons": "1.5.5", - "cronstrue": "2.23.0", - "csurf": "1.11.0", - "date-fns": "2.29.3", - "dayjs": "1.11.7", - "email-templates": "9.0.0", - "email-validator": "2.0.4", - "express": "4.18.2", - "express-openapi-validator": "4.13.8", - "express-rate-limit": "6.7.0", - "express-session": "1.17.3", - "formik": "2.2.9", - "gravatar-url": "3.1.0", - "intl": "1.2.5", - "lodash": "4.17.21", - "next": "12.3.4", - "node-cache": "5.1.2", - "node-gyp": "9.3.1", - "node-schedule": "2.1.1", - "nodemailer": "6.9.1", - "openpgp": "5.7.0", - "plex-api": "5.3.2", - "pug": "3.0.2", - "react": "18.2.0", - "react-ace": "10.1.0", - "react-animate-height": "2.1.2", - "react-aria": "3.23.0", - "react-dom": "18.2.0", - "react-intersection-observer": "9.4.3", - "react-intl": "6.2.10", - "react-markdown": "8.0.5", - "react-popper-tooltip": "4.4.2", - "react-select": "5.7.0", - "react-spring": "9.7.1", - "react-tailwindcss-datepicker-sct": "1.3.4", - "react-toast-notifications": "2.5.1", - "react-truncate-markup": "5.1.2", - "react-use-clipboard": "1.0.9", - "reflect-metadata": "0.1.13", - "secure-random-password": "0.2.3", - "semver": "7.3.8", - "sqlite3": "5.1.4", - "swagger-ui-express": "4.6.2", - "swr": "2.0.4", - "typeorm": "0.3.12", - "web-push": "3.5.0", - "winston": "3.8.2", - "winston-daily-rotate-file": "4.7.1", - "xml2js": "0.4.23", - "yamljs": "0.3.0", - "yup": "0.32.11", - "zod": "3.20.6" - }, - "devDependencies": { - "@babel/cli": "7.21.0", - "@commitlint/cli": "17.4.4", - "@commitlint/config-conventional": "17.4.4", - "@semantic-release/changelog": "6.0.2", - "@semantic-release/commit-analyzer": "9.0.2", - "@semantic-release/exec": "6.0.3", - "@semantic-release/git": "10.0.1", - "@tailwindcss/aspect-ratio": "0.4.2", - "@tailwindcss/forms": "0.5.3", - "@tailwindcss/typography": "0.5.9", - "@types/bcrypt": "5.0.0", - "@types/cookie-parser": "1.4.3", - "@types/country-flag-icons": "1.2.0", - "@types/csurf": "1.11.2", - "@types/email-templates": "8.0.4", - "@types/express": "4.17.17", - "@types/express-session": "1.17.6", - "@types/lodash": "4.14.191", - "@types/node": "17.0.36", - "@types/node-schedule": "2.1.0", - "@types/nodemailer": "6.4.7", - "@types/react": "18.0.28", - "@types/react-dom": "18.0.11", - "@types/react-transition-group": "4.4.5", - "@types/secure-random-password": "0.2.1", - "@types/semver": "7.3.13", - "@types/swagger-ui-express": "4.1.3", - "@types/web-push": "3.3.2", - "@types/xml2js": "0.4.11", - "@types/yamljs": "0.2.31", - "@types/yup": "0.29.14", - "@typescript-eslint/eslint-plugin": "5.54.0", - "@typescript-eslint/parser": "5.54.0", - "autoprefixer": "10.4.13", - "babel-plugin-react-intl": "8.2.25", - "babel-plugin-react-intl-auto": "3.3.0", - "commitizen": "4.3.0", - "copyfiles": "2.4.1", - "cy-mobile-commands": "0.3.0", - "cypress": "12.7.0", - "cz-conventional-changelog": "3.3.0", - "eslint": "8.35.0", - "eslint-config-next": "12.3.4", - "eslint-config-prettier": "8.6.0", - "eslint-plugin-formatjs": "4.9.0", - "eslint-plugin-jsx-a11y": "6.7.1", - "eslint-plugin-no-relative-import-paths": "1.5.2", - "eslint-plugin-prettier": "4.2.1", - "eslint-plugin-react": "7.32.2", - "eslint-plugin-react-hooks": "4.6.0", - "extract-react-intl-messages": "4.1.1", - "husky": "8.0.3", - "lint-staged": "13.1.2", - "nodemon": "2.0.20", - "postcss": "8.4.21", - "prettier": "2.8.4", - "prettier-plugin-organize-imports": "3.2.2", - "prettier-plugin-tailwindcss": "0.2.3", - "semantic-release": "19.0.5", - "semantic-release-docker-buildx": "1.0.1", - "tailwindcss": "3.2.7", - "ts-node": "10.9.1", - "tsc-alias": "1.8.2", - "tsconfig-paths": "4.1.2", - "typescript": "4.9.5" - }, - "resolutions": { - "sqlite3/node-gyp": "8.4.1", - "@types/react": "18.0.28", - "@types/react-dom": "18.0.11", - "@types/express-session": "1.17.6" - }, - "config": { - "commitizen": { - "path": "./node_modules/cz-conventional-changelog" - } - }, - "lint-staged": { - "**/*.{ts,tsx,js}": [ - "prettier --write", - "eslint" - ], - "**/*.{json,md,css}": [ - "prettier --write" - ] - }, - "commitlint": { - "extends": [ - "@commitlint/config-conventional" - ] - }, - "release": { - "plugins": [ - "@semantic-release/commit-analyzer", - "@semantic-release/release-notes-generator", - [ - "@semantic-release/changelog", - { - "changelogFile": "CHANGELOG.md" - } - ], - "@semantic-release/npm", - [ - "@semantic-release/git", - { - "assets": [ - "package.json", - "CHANGELOG.md" - ], - "message": "chore(release): ${nextRelease.version}" - } - ], - "semantic-release-docker-buildx", - [ - "@semantic-release/github", - { - "addReleases": "bottom" - } - ] - ], - "branches": [ - "main" - ], - "npmPublish": false, - "publish": [ - { - "path": "semantic-release-docker-buildx", - "buildArgs": { - "COMMIT_TAG": "$GIT_SHA" - }, - "imageNames": [ - "fallenbagel/jellyseerr" - ], - "platforms": [ - "linux/amd64", - "linux/arm64", - "linux/arm/v7" - ] - }, - "@semantic-release/github" - ] - } -} diff --git a/pkgs/by-name/je/jellyseerr/package.nix b/pkgs/by-name/je/jellyseerr/package.nix index 42f258da608a..10ced98b0050 100644 --- a/pkgs/by-name/je/jellyseerr/package.nix +++ b/pkgs/by-name/je/jellyseerr/package.nix @@ -1,84 +1,71 @@ { lib, - mkYarnPackage, + pnpm_9, fetchFromGitHub, - fetchYarnDeps, + stdenv, makeWrapper, - node-pre-gyp, nodejs, python3, sqlite, + nix-update-script, }: -mkYarnPackage rec { +stdenv.mkDerivation rec { pname = "jellyseerr"; - version = "1.9.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "Fallenbagel"; repo = "jellyseerr"; rev = "v${version}"; - hash = "sha256-TXe/k/pb7idu7G1wGu6TZksnoFQ5/PN0voVlve3k1UI="; + hash = "sha256-5kaeqhjUy9Lgx4/uFcGRlAo+ROEOdTWc2m49rq8R8Hs="; }; - packageJSON = ./package.json; - - offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; - hash = "sha256-2iRxguxEI+YKm8ddhRgZMvfZuUgQmCK5ER4jMCFJQMQ="; + pnpmDeps = pnpm_9.fetchDeps { + inherit pname version src; + hash = "sha256-xu6DeaBArQmnqEnIgjc1DTZujQebSkjuai9tMHeQWCk="; }; + buildInputs = [ sqlite ]; + nativeBuildInputs = [ + python3 nodejs makeWrapper + pnpm_9.configHook ]; - # Fixes "SQLite package has not been found installed" at launch - pkgConfig.sqlite3 = { - nativeBuildInputs = [ - node-pre-gyp - python3 - sqlite - ]; - postInstall = '' - export CPPFLAGS="-I${nodejs}/include/node" - node-pre-gyp install --prefer-offline --build-from-source --nodedir=${nodejs}/include/node --sqlite=${sqlite.dev} - rm -r build-tmp-napi-v6 - ''; - }; - - pkgConfig.bcrypt = { - nativeBuildInputs = [ - node-pre-gyp - python3 - ]; - postInstall = '' - export CPPFLAGS="-I${nodejs}/include/node" - node-pre-gyp install --prefer-offline --build-from-source --nodedir=${nodejs}/include/node - ''; - }; + preBuild = '' + export npm_config_nodedir=${nodejs} + pushd node_modules + pnpm rebuild bcrypt sqlite3 + popd + ''; buildPhase = '' runHook preBuild - ( - shopt -s dotglob - cd deps/jellyseerr - rm -r config/* - yarn build - rm -r .next/cache - ) + pnpm build + pnpm prune --prod --ignore-scripts + rm -rf .next/cache runHook postBuild ''; + installPhase = '' + runHook preInstall + mkdir -p $out/share + cp -r -t $out/share .next node_modules dist public package.json overseerr-api.yml + runHook postInstall + ''; + postInstall = '' + mkdir -p $out/bin makeWrapper '${nodejs}/bin/node' "$out/bin/jellyseerr" \ - --add-flags "$out/libexec/jellyseerr/deps/jellyseerr/dist/index.js" \ + --add-flags "$out/share/dist/index.js" \ + --chdir "$out/share" \ --set NODE_ENV production ''; - doDist = false; - - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Fork of overseerr for jellyfin support"; diff --git a/pkgs/by-name/je/jellyseerr/update.sh b/pkgs/by-name/je/jellyseerr/update.sh deleted file mode 100755 index cd8f6c03081c..000000000000 --- a/pkgs/by-name/je/jellyseerr/update.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq common-updater-scripts nix prefetch-yarn-deps - -set -eu -o pipefail - -version=${1:-$(curl -s https://api.github.com/repos/Fallenbagel/jellyseerr/releases/latest | jq --raw-output '.tag_name[1:]')} -update-source-version jellyseerr $version - -nix_file=$(nix-instantiate --eval --strict -A "jellyseerr.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/') -nix_dir=$(dirname $nix_file) -cp $(nix-instantiate --eval --expr 'with import ./default.nix { }; "${jellyseerr.src}/package.json"' | sed 's/"//g') $nix_dir - -old_yarn_hash=$(nix-instantiate --eval --strict -A "jellyseerr.offlineCache.outputHash" | tr -d '"' | sed -re 's|[+]|\\&|g') -lock_file=$(nix-instantiate --eval --expr 'with import ./default.nix { }; "${jellyseerr.src}/yarn.lock"' | sed 's/"//g') -new_yarn_hash=$(nix hash to-sri --type sha256 $(prefetch-yarn-deps $lock_file)) -sed -i "$nix_file" -re "s|\"$old_yarn_hash\"|\"$new_yarn_hash\"|" From 4b21c0c436e5623ff096ff647c5e4dee50fd0197 Mon Sep 17 00:00:00 2001 From: Daniel Coonce <1077480+coonce@users.noreply.github.com> Date: Wed, 25 Dec 2024 18:49:03 -0600 Subject: [PATCH 10/60] nixos/jellyseerr: add configDir option --- nixos/modules/services/misc/jellyseerr.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/misc/jellyseerr.nix b/nixos/modules/services/misc/jellyseerr.nix index 09aaf4ed5b97..c500cc8b3a62 100644 --- a/nixos/modules/services/misc/jellyseerr.nix +++ b/nixos/modules/services/misc/jellyseerr.nix @@ -20,6 +20,12 @@ in default = 5055; description = ''The port which the Jellyseerr web UI should listen to.''; }; + + configDir = lib.mkOption { + type = lib.types.path; + default = "/var/lib/jellyseerr/config"; + description = "Config data directory"; + }; }; config = lib.mkIf cfg.enable { @@ -27,14 +33,15 @@ in description = "Jellyseerr, a requests manager for Jellyfin"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - environment.PORT = toString cfg.port; + environment = { + PORT = toString cfg.port; + CONFIG_DIRECTORY = cfg.configDir; + }; serviceConfig = { Type = "exec"; StateDirectory = "jellyseerr"; - WorkingDirectory = "${cfg.package}/share/dist"; DynamicUser = true; ExecStart = lib.getExe cfg.package; - BindPaths = [ "/var/lib/jellyseerr/:${cfg.package}/share/dist/config/" ]; Restart = "on-failure"; ProtectHome = true; ProtectSystem = "strict"; From aee561742c7922005ec624b9b8332d31b25a0891 Mon Sep 17 00:00:00 2001 From: weriomat Date: Thu, 26 Dec 2024 11:39:16 +0100 Subject: [PATCH 11/60] pingvin-share: 1.7.0 -> 1.7.1 --- pkgs/servers/pingvin-share/backend.nix | 2 +- pkgs/servers/pingvin-share/default.nix | 4 ++-- pkgs/servers/pingvin-share/frontend.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/pingvin-share/backend.nix b/pkgs/servers/pingvin-share/backend.nix index 6cd1dd9f94cb..258ed2da3ef5 100644 --- a/pkgs/servers/pingvin-share/backend.nix +++ b/pkgs/servers/pingvin-share/backend.nix @@ -31,7 +31,7 @@ buildNpmPackage { prisma ]; - npmDepsHash = "sha256-BkwFQVHpg7PuMU5MaW73S6R+wbdGOJ62PR9EE2ghQFg="; + npmDepsHash = "sha256-SBVkrrNKD3hCf1dT4ZWXYcQCat+wVQ9+ti1d0hfpWIw="; makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; diff --git a/pkgs/servers/pingvin-share/default.nix b/pkgs/servers/pingvin-share/default.nix index 447a00670a56..f6169075f43e 100644 --- a/pkgs/servers/pingvin-share/default.nix +++ b/pkgs/servers/pingvin-share/default.nix @@ -5,12 +5,12 @@ }: let - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "stonith404"; repo = "pingvin-share"; rev = "v${version}"; - hash = "sha256-wZV3PKnGoD3g4PjSDPwMm4ftUTlEZykNkWlwLCDJfuM="; + hash = "sha256-XchwPP573z4tzwAlSdWwi0aZwNlLcL1wGGgGyYgJAWg="; }; in diff --git a/pkgs/servers/pingvin-share/frontend.nix b/pkgs/servers/pingvin-share/frontend.nix index 6c50bf697225..810448aca363 100644 --- a/pkgs/servers/pingvin-share/frontend.nix +++ b/pkgs/servers/pingvin-share/frontend.nix @@ -23,7 +23,7 @@ buildNpmPackage { buildInputs = [ vips ]; nativeBuildInputs = [ pkg-config ]; - npmDepsHash = "sha256-uu/JX039QjVwMtGI8lOjuzPC7kM1knhKycbJ/4cc1o4="; + npmDepsHash = "sha256-TC5yMvAXO3oKRhyVgGAiXT213vvv+cOxY4z6vQU1gX4="; makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; From 25569750ccc0c692128e667a77585d6d27ff7e57 Mon Sep 17 00:00:00 2001 From: Daniel Coonce <1077480+coonce@users.noreply.github.com> Date: Sat, 28 Dec 2024 09:58:06 -0600 Subject: [PATCH 12/60] jellyseerr: pin nodejs_20 --- pkgs/by-name/je/jellyseerr/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/je/jellyseerr/package.nix b/pkgs/by-name/je/jellyseerr/package.nix index 10ced98b0050..58e6507f0513 100644 --- a/pkgs/by-name/je/jellyseerr/package.nix +++ b/pkgs/by-name/je/jellyseerr/package.nix @@ -4,12 +4,16 @@ fetchFromGitHub, stdenv, makeWrapper, - nodejs, + nodejs_20, python3, sqlite, nix-update-script, }: +let + nodejs = nodejs_20; + pnpm = pnpm_9.override { inherit nodejs; }; +in stdenv.mkDerivation rec { pname = "jellyseerr"; version = "2.1.0"; @@ -21,7 +25,7 @@ stdenv.mkDerivation rec { hash = "sha256-5kaeqhjUy9Lgx4/uFcGRlAo+ROEOdTWc2m49rq8R8Hs="; }; - pnpmDeps = pnpm_9.fetchDeps { + pnpmDeps = pnpm.fetchDeps { inherit pname version src; hash = "sha256-xu6DeaBArQmnqEnIgjc1DTZujQebSkjuai9tMHeQWCk="; }; @@ -32,7 +36,7 @@ stdenv.mkDerivation rec { python3 nodejs makeWrapper - pnpm_9.configHook + pnpm.configHook ]; preBuild = '' From 79029e1c300fe2535a49f868d1893a234e2482c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 15:31:30 +0000 Subject: [PATCH 13/60] vopono: 0.10.10 -> 0.10.11 --- pkgs/by-name/vo/vopono/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vo/vopono/package.nix b/pkgs/by-name/vo/vopono/package.nix index 85070ac840cd..f4f6a63c2ca3 100644 --- a/pkgs/by-name/vo/vopono/package.nix +++ b/pkgs/by-name/vo/vopono/package.nix @@ -6,14 +6,14 @@ rustPlatform.buildRustPackage rec { pname = "vopono"; - version = "0.10.10"; + version = "0.10.11"; src = fetchCrate { inherit pname version; - hash = "sha256-HjubzbRsmRU33oI1p1kzCFUjC2YQJhVqljd/FHzAnMw="; + hash = "sha256-qgsfTniikrdykFSFqZATp7ewPZm5z5p5FMztNKWzPIY="; }; - cargoHash = "sha256-YBDB1g8cUOo1hS8Fi03Bvpe63bolbPmhGbvT16G73js="; + cargoHash = "sha256-/z4qBBY/Htlv55vNKj2c1frWsUFTRweJh/G0T2jHLr4="; meta = with lib; { description = "Run applications through VPN connections in network namespaces"; From abcad3a1a6b7e0bb43a580820f3918303ea48236 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 22:41:13 +0000 Subject: [PATCH 14/60] remnote: 1.18.19 -> 1.18.26 --- pkgs/by-name/re/remnote/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix index b63a6c93bfae..b2f4e3843252 100644 --- a/pkgs/by-name/re/remnote/package.nix +++ b/pkgs/by-name/re/remnote/package.nix @@ -6,10 +6,10 @@ }: let pname = "remnote"; - version = "1.18.19"; + version = "1.18.26"; src = fetchurl { url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage"; - hash = "sha256-J7bghty2F54pdd/maWMWtG1kDm/sETgY1bR/jMy23e4="; + hash = "sha256-G7I2r/jZ3Ht8Is2TagNnyQolasfLlO57qzGcVT4QvkI="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in From b895f9201940f6b1ddd1dd23eb59d4e7521a9c4c Mon Sep 17 00:00:00 2001 From: t4ccer Date: Thu, 2 Jan 2025 06:41:50 -0700 Subject: [PATCH 15/60] outils: fix build --- pkgs/by-name/ou/outils/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/ou/outils/package.nix b/pkgs/by-name/ou/outils/package.nix index a133d68e30c8..416bfc9abac9 100644 --- a/pkgs/by-name/ou/outils/package.nix +++ b/pkgs/by-name/ou/outils/package.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, + fetchpatch2, lib, }: @@ -15,6 +16,14 @@ stdenv.mkDerivation rec { hash = "sha256-FokJytwQsbGsryBzyglpb1Hg3wti/CPQTOfIGIz9ThA="; }; + patches = [ + (fetchpatch2 { + url = "https://github.com/leahneukirchen/outils/commit/50877e1bf7c905044e0b50b227ecff48cfec394b.patch?full_index=1"; + name = "outils-add-recallocarray-prototype.patch"; + hash = "sha256-jOnCMPcHKMRR3J0Yh+ZTHAn7P85FO80yXVX0K2vtlVk="; + }) + ]; + makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { From d45e7d764c646049014d3414a0ea35f330bacf6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jan 2025 00:35:04 +0000 Subject: [PATCH 16/60] civo: 1.1.92 -> 1.1.93 --- pkgs/by-name/ci/civo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/civo/package.nix b/pkgs/by-name/ci/civo/package.nix index f26722131bcd..d5b5896ccad0 100644 --- a/pkgs/by-name/ci/civo/package.nix +++ b/pkgs/by-name/ci/civo/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "civo"; - version = "1.1.92"; + version = "1.1.93"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - hash = "sha256-nsH/6OVvCOU4f9UZNFOm9AtyN9L4tXB285580g3SsxE="; + hash = "sha256-FX2hnqYqvPoD6Fn1363XrK4n0tMd9xkWlIcyIhDJDW4="; }; vendorHash = "sha256-G3ijLi3ZbURVHkjUwylFWwxRyxroppVUFJveKw5qLq8="; From 56323119c98c98d2a6a1a38975d73d0593f742da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jan 2025 01:38:51 +0000 Subject: [PATCH 17/60] ghidra-extensions.ghidra-delinker-extension: 0.5.0 -> 0.5.1 --- .../ghidra/extensions/ghidra-delinker-extension/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix index 0a8cc8352354..22b53b61ab53 100644 --- a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix +++ b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, }: let - version = "0.5.0"; + version = "0.5.1"; self = ghidra.buildGhidraExtension { pname = "ghidra-delinker-extension"; inherit version; @@ -14,7 +14,7 @@ let owner = "boricj"; repo = "ghidra-delinker-extension"; rev = "v${version}"; - hash = "sha256-y0afqqIsWN33b/zGsxJYn8O+R5IP4eD300CgzMymEA0="; + hash = "sha256-h6F50Z7S6tPOl9mIhChLKoFxHuAkq/n36ysUEFwWGxI="; }; postPatch = '' From 51773b1a1f55ce4a206cce925cffb92226a94068 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jan 2025 02:55:38 +0000 Subject: [PATCH 18/60] goread: 1.7.1 -> 1.7.2 --- pkgs/by-name/go/goread/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/goread/package.nix b/pkgs/by-name/go/goread/package.nix index 51849cb0cc65..98a5b066d565 100644 --- a/pkgs/by-name/go/goread/package.nix +++ b/pkgs/by-name/go/goread/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "goread"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "TypicalAM"; repo = "goread"; rev = "v${version}"; - hash = "sha256-tWQVqHtuTCHrsZu3CfTWUQzvUYbQrrdJoWHp43dfPEE="; + hash = "sha256-8QjroS0aKALcrDJkpihD70iJJBdiVP4Q2j2n3BsY71w="; }; vendorHash = "sha256-S/0uuy/G7ZT239OgKaOT1dmY+u5/lnZKL4GtbEi2zCI="; From 096ab963dcda8b8e274789186a33b43c07b0edf9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jan 2025 03:46:07 +0000 Subject: [PATCH 19/60] erofs-utils: 1.8.3 -> 1.8.4 --- pkgs/by-name/er/erofs-utils/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/er/erofs-utils/package.nix b/pkgs/by-name/er/erofs-utils/package.nix index aabbe20cde6c..05968132a811 100644 --- a/pkgs/by-name/er/erofs-utils/package.nix +++ b/pkgs/by-name/er/erofs-utils/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "erofs-utils"; - version = "1.8.3"; + version = "1.8.4"; outputs = [ "out" "man" @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${finalAttrs.version}.tar.gz"; - hash = "sha256-PFzANgPqCLqa5eBCDurqX/F+0p4igGhTEDVsvyUwToU="; + hash = "sha256-eRWHqgdLufn6IYx2LMH2CwFeL1G8ss6R9oLwQ4VqtJQ="; }; nativeBuildInputs = [ From 283118767b8767a6f70240fe94c057f107ac8642 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jan 2025 03:59:08 +0000 Subject: [PATCH 20/60] goreleaser: 2.5.0 -> 2.5.1 --- pkgs/by-name/go/goreleaser/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/goreleaser/package.nix b/pkgs/by-name/go/goreleaser/package.nix index e2c2ec088a7e..19f350b0205e 100644 --- a/pkgs/by-name/go/goreleaser/package.nix +++ b/pkgs/by-name/go/goreleaser/package.nix @@ -10,16 +10,16 @@ }: buildGoModule rec { pname = "goreleaser"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = "goreleaser"; rev = "v${version}"; - hash = "sha256-DWxYcviI/J9SlHe81UU8yw19pz671C+BsUnrId4JbDE="; + hash = "sha256-W3f/1nn2gZhNloZNEg4ucTKt7B0K6NIYcBsPJyEhaKc="; }; - vendorHash = "sha256-Dbd7zKmzaMixD7AsWjsdiSXUebyjFvPfmwMjozMnaUQ="; + vendorHash = "sha256-lEtuEtz0FMTiUYHiOhPlH78IXHjXCj0Y9Uf2lLgJw/o="; ldflags = [ "-s" From 51deb46482e312afb92504791fa1092bfa0645ee Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 3 Jan 2025 11:12:40 +0900 Subject: [PATCH 21/60] hmmer: enable aarch64 support hmmer supports aarch64 since v3.4 --- pkgs/by-name/hm/hmmer/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/hm/hmmer/package.nix b/pkgs/by-name/hm/hmmer/package.nix index 81d0cdb1ec81..9a3d0a364082 100644 --- a/pkgs/by-name/hm/hmmer/package.nix +++ b/pkgs/by-name/hm/hmmer/package.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/EddyRivasLab/hmmer/blob/hmmer-${version}/release-notes/RELEASE-${version}.md"; license = licenses.gpl3; maintainers = [ maintainers.iimog ]; - # at least SSE is *required* - platforms = platforms.x86_64; + platforms = lib.platforms.unix; }; } From 9e00c8a8519bf11c7f58e765daf0279d68c5723b Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 3 Jan 2025 11:18:55 +0900 Subject: [PATCH 22/60] hmmer: change license from gpl3 to bsd3 --- pkgs/by-name/hm/hmmer/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/hm/hmmer/package.nix b/pkgs/by-name/hm/hmmer/package.nix index 9a3d0a364082..c05ccd065d04 100644 --- a/pkgs/by-name/hm/hmmer/package.nix +++ b/pkgs/by-name/hm/hmmer/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://hmmer.org/"; changelog = "https://github.com/EddyRivasLab/hmmer/blob/hmmer-${version}/release-notes/RELEASE-${version}.md"; - license = licenses.gpl3; + license = licenses.bsd3; maintainers = [ maintainers.iimog ]; platforms = lib.platforms.unix; }; From 0890b8133312e2aeef7e3d5529ad7e8e692cae20 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 3 Jan 2025 12:22:09 +0900 Subject: [PATCH 23/60] easel: init at 0.49 --- pkgs/by-name/ea/easel/package.nix | 49 +++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/ea/easel/package.nix diff --git a/pkgs/by-name/ea/easel/package.nix b/pkgs/by-name/ea/easel/package.nix new file mode 100644 index 000000000000..d172f891eb69 --- /dev/null +++ b/pkgs/by-name/ea/easel/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + perl, + python3, + versionCheckHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "easel"; + version = "0.49"; + + src = fetchFromGitHub { + owner = "EddyRivasLab"; + repo = "easel"; + tag = "easel-${finalAttrs.version}"; + hash = "sha256-NSKy7ptNYR0K/VFJNv+5TGWdC1ZM4Y5i/3L+3Coj/sg="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + enableParallelBuilding = true; + + doCheck = true; + + nativeCheckInputs = [ + perl + python3 + ]; + + preCheck = '' + patchShebangs devkit/sqc + ''; + + doInstallCheck = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + meta = { + description = "Sequence analysis library used by Eddy/Rivas lab code"; + homepage = "https://github.com/EddyRivasLab/easel"; + license = lib.licenses.bsd2; + mainProgram = "easel"; + maintainers = with lib.maintainers; [ natsukium ]; + platforms = lib.platforms.unix; + }; +}) From e3f9d35315ccb2cff631a8f3c0cbf536e8ef9135 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 3 Jan 2025 13:43:07 +0900 Subject: [PATCH 24/60] hmmer: enable tests --- pkgs/by-name/hm/hmmer/package.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pkgs/by-name/hm/hmmer/package.nix b/pkgs/by-name/hm/hmmer/package.nix index c05ccd065d04..941a59068b32 100644 --- a/pkgs/by-name/hm/hmmer/package.nix +++ b/pkgs/by-name/hm/hmmer/package.nix @@ -2,6 +2,10 @@ lib, stdenv, fetchurl, + easel, + perl, + python3, + versionCheckHook, }: stdenv.mkDerivation rec { @@ -13,6 +17,28 @@ stdenv.mkDerivation rec { sha256 = "sha256-ynDZT9DPJxvXBjQjqrsRbULeUzEXNDqbJ6ZcF/8G+/M="; }; + enableParallelBuilding = true; + + doCheck = true; + + nativeCheckInputs = [ + perl + python3 + ]; + + preCheck = '' + install -Dm755 ${easel.src}/devkit/sqc easel/devkit/sqc + patchShebangs easel/devkit/sqc testsuite/* src/hmmpress.itest.pl + ''; + + doInstallCheck = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + versionCheckProgram = "${placeholder "out"}/bin/hmmalign"; + + versionCheckProgramArg = [ "-h" ]; + meta = with lib; { description = "Biosequence analysis using profile hidden Markov models"; longDescription = '' From 2e4f197e17d4651a1b293f36f92148b05b8422e2 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 3 Jan 2025 13:46:25 +0900 Subject: [PATCH 25/60] hmmer: refactor --- pkgs/by-name/hm/hmmer/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/hm/hmmer/package.nix b/pkgs/by-name/hm/hmmer/package.nix index 941a59068b32..ef70f6d37ca9 100644 --- a/pkgs/by-name/hm/hmmer/package.nix +++ b/pkgs/by-name/hm/hmmer/package.nix @@ -8,13 +8,13 @@ versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "3.4"; pname = "hmmer"; src = fetchurl { - url = "http://eddylab.org/software/hmmer/${pname}-${version}.tar.gz"; - sha256 = "sha256-ynDZT9DPJxvXBjQjqrsRbULeUzEXNDqbJ6ZcF/8G+/M="; + url = "http://eddylab.org/software/hmmer/hmmer-${finalAttrs.version}.tar.gz"; + hash = "sha256-ynDZT9DPJxvXBjQjqrsRbULeUzEXNDqbJ6ZcF/8G+/M="; }; enableParallelBuilding = true; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { versionCheckProgramArg = [ "-h" ]; - meta = with lib; { + meta = { description = "Biosequence analysis using profile hidden Markov models"; longDescription = '' HMMER is used for searching sequence databases for sequence homologs, and for making sequence alignments. It implements methods using probabilistic models called profile hidden Markov models (profile HMMs). @@ -48,9 +48,9 @@ stdenv.mkDerivation rec { HMMER can be downloaded and installed as a command line tool on your own hardware, and now it is also more widely accessible to the scientific community via new search servers at the European Bioinformatics Institute. ''; homepage = "http://hmmer.org/"; - changelog = "https://github.com/EddyRivasLab/hmmer/blob/hmmer-${version}/release-notes/RELEASE-${version}.md"; - license = licenses.bsd3; - maintainers = [ maintainers.iimog ]; + changelog = "https://github.com/EddyRivasLab/hmmer/blob/hmmer-${finalAttrs.version}/release-notes/RELEASE-${finalAttrs.version}.md"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.iimog ]; platforms = lib.platforms.unix; }; -} +}) From 3d76bff0ac6487b474e31051312efd68eea23a06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jan 2025 04:51:21 +0000 Subject: [PATCH 26/60] python312Packages.orange-canvas-core: 0.2.4 -> 0.2.5 --- .../development/python-modules/orange-canvas-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/orange-canvas-core/default.nix b/pkgs/development/python-modules/orange-canvas-core/default.nix index c79a8e1e9511..354e8e5d4f48 100644 --- a/pkgs/development/python-modules/orange-canvas-core/default.nix +++ b/pkgs/development/python-modules/orange-canvas-core/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "orange-canvas-core"; - version = "0.2.4"; + version = "0.2.5"; pyproject = true; src = fetchFromGitHub { owner = "biolab"; repo = "orange-canvas-core"; tag = version; - hash = "sha256-tLFWOXsAhqxFV0wdlAKestO/F/rDtdFnKDd0FXPeNpg="; + hash = "sha256-uh9wNqgLYRcnCSOdpeLx6ZTRC0cpq6lG/sqmrYLR+3g="; }; build-system = [ setuptools ]; From 59bb5daf312bbb48a3432d6866b7f0b7cbec0966 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 3 Jan 2025 05:13:12 +0000 Subject: [PATCH 27/60] komikku: 1.66.0 -> 1.67.0 Diff: https://codeberg.org/valos/Komikku/compare/v1.66.0...v1.67.0 Changelog: https://codeberg.org/valos/Komikku/releases/tag/v1.67.0 --- pkgs/by-name/ko/komikku/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix index 70f1f85009aa..cf61592b4f7b 100644 --- a/pkgs/by-name/ko/komikku/package.nix +++ b/pkgs/by-name/ko/komikku/package.nix @@ -23,16 +23,15 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.66.0"; - - format = "other"; + version = "1.67.0"; + pyproject = false; src = fetchFromGitea { domain = "codeberg.org"; owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-hrQZZ0pZhn+Ph7it6LPFtRMN9mvgFkG//zEi+pVb8n4="; + hash = "sha256-vWAYsImJseEQvgq7vreqS76M963zfuL56R87P3od9m4="; }; nativeBuildInputs = [ From 131c19f890c5698797536f7a76e844621700b153 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jan 2025 07:56:39 +0000 Subject: [PATCH 28/60] omnictl: 0.45.0 -> 0.45.1 --- pkgs/by-name/om/omnictl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/om/omnictl/package.nix b/pkgs/by-name/om/omnictl/package.nix index 7f9dce85e10a..2f96914b0702 100644 --- a/pkgs/by-name/om/omnictl/package.nix +++ b/pkgs/by-name/om/omnictl/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "omnictl"; - version = "0.45.0"; + version = "0.45.1"; src = fetchFromGitHub { owner = "siderolabs"; repo = "omni"; rev = "v${version}"; - hash = "sha256-FA2lGSeTbJXc/BEWOu43sV2xS9tTwQ+iKrDW2tFAsJ4="; + hash = "sha256-a9lp/XDet4CcMadMHj1ia4tdsK/Y8Sfd2f6/A2j1liQ="; }; vendorHash = "sha256-U/cserG37gM1XDN9HcPqnq4hPJSaOaLBoIs5OcsocYw="; From ba76eccef048c65f8ab7b51144b137f519991e56 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jan 2025 08:14:51 +0000 Subject: [PATCH 29/60] home-manager: 0-unstable-2024-12-23 -> 0-unstable-2025-01-02 --- pkgs/by-name/ho/home-manager/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index 6b24aca0cc08..58fc93c32659 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -19,14 +19,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2024-12-23"; + version = "0-unstable-2025-01-02"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "f1b1786ea77739dcd181b920d430e30fb1608b8a"; - hash = "sha256-f9UyHMTb+BwF6RDZ8eO9HOkSlKeeSPBlcYhMmV1UNIk="; + rev = "5f6aa268e419d053c3d5025da740e390b12ac936"; + hash = "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg="; }; nativeBuildInputs = [ From 573e4da1c43c7d8f687da05012af0c84d76b997c Mon Sep 17 00:00:00 2001 From: kilianar Date: Fri, 3 Jan 2025 11:42:42 +0100 Subject: [PATCH 30/60] stellarium: mark as broken on darwin --- pkgs/applications/science/astronomy/stellarium/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 54728665daea..1c41f924b898 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -123,5 +123,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ kilianar ]; + broken = stdenv.hostPlatform.isDarwin; }; }) From b4a6216f6eb5968e52c1de2f2cd2af25711780c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jan 2025 12:33:35 +0000 Subject: [PATCH 31/60] cargo-llvm-lines: 0.4.41 -> 0.4.42 --- pkgs/by-name/ca/cargo-llvm-lines/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-llvm-lines/package.nix b/pkgs/by-name/ca/cargo-llvm-lines/package.nix index 612775f92d1d..abecfad449aa 100644 --- a/pkgs/by-name/ca/cargo-llvm-lines/package.nix +++ b/pkgs/by-name/ca/cargo-llvm-lines/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-lines"; - version = "0.4.41"; + version = "0.4.42"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - hash = "sha256-ewxdjvo9WFVX4484uuEkerzcJ4fOy2Sm90tiPGNbrV0="; + hash = "sha256-qKdxnISussiyp1ylahS7qOdMfOGwJnlbWrgEHf/L2y0="; }; - cargoHash = "sha256-9jG5VgIlHYv1IFSjPy34dNk8RHjhgXi6daI+R0jgxMc="; + cargoHash = "sha256-IDFCzTAlC/ZYGwUSmmxyRmZy5belxvyfeWpTCPzJQ6o="; meta = with lib; { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; From ff49134fb8daad0ad6a1ea1e786a88d28b574c8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jan 2025 12:36:30 +0000 Subject: [PATCH 32/60] cargo-tally: 1.0.56 -> 1.0.57 --- pkgs/by-name/ca/cargo-tally/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-tally/package.nix b/pkgs/by-name/ca/cargo-tally/package.nix index c26c414ea0bc..57a9cc9ff5ad 100644 --- a/pkgs/by-name/ca/cargo-tally/package.nix +++ b/pkgs/by-name/ca/cargo-tally/package.nix @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.56"; + version = "1.0.57"; src = fetchCrate { inherit pname version; - hash = "sha256-IB1OoS9pdFHFewLfeu1cVCffLGtPvCJlVkIBZxtBkm4="; + hash = "sha256-0f+23kQZzmUeAjettZ3iRTATiv73sGpI13TzZFTU150="; }; - cargoHash = "sha256-uPlilomHib10/v2HKBjU/ln0B4QkKpFJPpKf37RO7Oo="; + cargoHash = "sha256-o4S13uvKYLUUmx6tHQpCm7U9AOtmg8P60NxdNsXy9Fc="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk_11_0.frameworks; From 6fb35933b5fe0f921a1ae728c036c18b9bd9dc52 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Tue, 31 Dec 2024 10:45:15 +0100 Subject: [PATCH 33/60] pdfposter: unbreak --- pkgs/by-name/pd/pdfposter/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pd/pdfposter/package.nix b/pkgs/by-name/pd/pdfposter/package.nix index f4f36d3291f7..e241327cf2de 100644 --- a/pkgs/by-name/pd/pdfposter/package.nix +++ b/pkgs/by-name/pd/pdfposter/package.nix @@ -12,6 +12,7 @@ let pypdf2 = super.pypdf2.overridePythonAttrs (oldAttrs: rec { version = "2.11.1"; format = "setuptools"; + pyproject = null; src = fetchPypi { pname = "PyPDF2"; inherit version; From db7b7fa9852ab3d8b9759425c10c5a7f8e4b6de4 Mon Sep 17 00:00:00 2001 From: Nicola Squartini Date: Fri, 3 Jan 2025 18:57:32 +0100 Subject: [PATCH 34/60] bitbox: add more meta-attributes --- pkgs/by-name/bi/bitbox/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/bi/bitbox/package.nix b/pkgs/by-name/bi/bitbox/package.nix index b59bad835f55..cb040646f516 100644 --- a/pkgs/by-name/bi/bitbox/package.nix +++ b/pkgs/by-name/bi/bitbox/package.nix @@ -81,9 +81,14 @@ stdenv.mkDerivation rec { meta = { description = "Companion app for the BitBox02 hardware wallet"; homepage = "https://bitbox.swiss/app/"; + downloadPage = "https://github.com/BitBoxSwiss/bitbox-wallet-app"; + changelog = "https://github.com/BitBoxSwiss/bitbox-wallet-app/blob/master/CHANGELOG.md#${ + builtins.replaceStrings [ "." ] [ "" ] version + }"; license = lib.licenses.asl20; - mainProgram = "bitbox"; maintainers = [ lib.maintainers.tensor5 ]; + mainProgram = "bitbox"; + sourceProvenance = [ lib.sourceTypes.fromSource ]; platforms = [ "x86_64-linux" ]; }; } From f72531b3e9572d9df5783b161d1f7c55159a90fc Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 3 Jan 2025 23:18:50 +0100 Subject: [PATCH 35/60] treewide: move fonts to pkgs/by-name --- .../an/ankacoder-condensed/package.nix} | 0 .../an/ankacoder/package.nix} | 0 pkgs/by-name/ar/arphic-ukai/package.nix | 42 ++++++++++ pkgs/by-name/ar/arphic-uming/package.nix | 42 ++++++++++ .../fi/fira-code-symbols/package.nix} | 0 .../fi/fira-code/package.nix} | 0 .../ha/hackgen-font/package.nix} | 0 .../ha/hackgen-nf-font/package.nix} | 0 .../in/inconsolata-lgc/package.nix} | 0 .../in/inconsolata/package.nix} | 0 .../in/input-fonts/package.nix} | 0 .../jo/joypixels/package.nix} | 0 .../na/navilu-font/package.nix} | 4 +- .../pa/paratype-pt-mono/package.nix} | 0 .../pa/paratype-pt-sans/package.nix} | 0 .../pa/paratype-pt-serif/package.nix} | 0 .../pr/profont/package.nix} | 4 +- pkgs/by-name/ta/tai-ahom/package.nix | 33 ++++++++ pkgs/data/fonts/arphic/default.nix | 82 ------------------- pkgs/data/fonts/tai-languages/default.nix | 38 --------- pkgs/top-level/all-packages.nix | 31 ------- 21 files changed, 121 insertions(+), 155 deletions(-) rename pkgs/{data/fonts/ankacoder/condensed.nix => by-name/an/ankacoder-condensed/package.nix} (100%) rename pkgs/{data/fonts/ankacoder/default.nix => by-name/an/ankacoder/package.nix} (100%) create mode 100644 pkgs/by-name/ar/arphic-ukai/package.nix create mode 100644 pkgs/by-name/ar/arphic-uming/package.nix rename pkgs/{data/fonts/fira-code/symbols.nix => by-name/fi/fira-code-symbols/package.nix} (100%) rename pkgs/{data/fonts/fira-code/default.nix => by-name/fi/fira-code/package.nix} (100%) rename pkgs/{data/fonts/hackgen/default.nix => by-name/ha/hackgen-font/package.nix} (100%) rename pkgs/{data/fonts/hackgen/nerdfont.nix => by-name/ha/hackgen-nf-font/package.nix} (100%) rename pkgs/{data/fonts/inconsolata/lgc.nix => by-name/in/inconsolata-lgc/package.nix} (100%) rename pkgs/{data/fonts/inconsolata/default.nix => by-name/in/inconsolata/package.nix} (100%) rename pkgs/{data/fonts/input-fonts/default.nix => by-name/in/input-fonts/package.nix} (100%) rename pkgs/{data/fonts/joypixels/default.nix => by-name/jo/joypixels/package.nix} (100%) rename pkgs/{data/fonts/navilu/default.nix => by-name/na/navilu-font/package.nix} (93%) rename pkgs/{data/fonts/paratype-pt/mono.nix => by-name/pa/paratype-pt-mono/package.nix} (100%) rename pkgs/{data/fonts/paratype-pt/sans.nix => by-name/pa/paratype-pt-sans/package.nix} (100%) rename pkgs/{data/fonts/paratype-pt/serif.nix => by-name/pa/paratype-pt-serif/package.nix} (100%) rename pkgs/{data/fonts/profont/default.nix => by-name/pr/profont/package.nix} (96%) create mode 100644 pkgs/by-name/ta/tai-ahom/package.nix delete mode 100644 pkgs/data/fonts/arphic/default.nix delete mode 100644 pkgs/data/fonts/tai-languages/default.nix diff --git a/pkgs/data/fonts/ankacoder/condensed.nix b/pkgs/by-name/an/ankacoder-condensed/package.nix similarity index 100% rename from pkgs/data/fonts/ankacoder/condensed.nix rename to pkgs/by-name/an/ankacoder-condensed/package.nix diff --git a/pkgs/data/fonts/ankacoder/default.nix b/pkgs/by-name/an/ankacoder/package.nix similarity index 100% rename from pkgs/data/fonts/ankacoder/default.nix rename to pkgs/by-name/an/ankacoder/package.nix diff --git a/pkgs/by-name/ar/arphic-ukai/package.nix b/pkgs/by-name/ar/arphic-ukai/package.nix new file mode 100644 index 000000000000..6df92965f5ef --- /dev/null +++ b/pkgs/by-name/ar/arphic-ukai/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenvNoCC, + fetchurl, + mkfontdir, + mkfontscale, +}: + +stdenvNoCC.mkDerivation rec { + pname = "arphic-ukai"; + version = "0.2.20080216.2"; + + src = fetchurl { + url = "mirror://ubuntu/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2"; + hash = "sha256-tJaNc1GfT4dH6FVI+4XSG2Zdob8bqQCnxJmXbmqK49I="; + }; + + nativeBuildInputs = [ + mkfontscale + mkfontdir + ]; + + installPhase = '' + runHook preInstall + + install -D -v ukai.ttc $out/share/fonts/truetype/arphic-ukai.ttc + cd $out/share/fonts + mkfontdir + mkfontscale + + runHook postInstall + ''; + + meta = with lib; { + description = "CJK Unicode font Kai style"; + homepage = "https://www.freedesktop.org/wiki/Software/CJKUnifonts/"; + + license = licenses.arphicpl; + maintainers = [ maintainers.changlinli ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/ar/arphic-uming/package.nix b/pkgs/by-name/ar/arphic-uming/package.nix new file mode 100644 index 000000000000..3d23d2e3c1ce --- /dev/null +++ b/pkgs/by-name/ar/arphic-uming/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenvNoCC, + fetchurl, + mkfontdir, + mkfontscale, +}: + +stdenvNoCC.mkDerivation rec { + pname = "arphic-uming"; + version = "0.2.20080216.2"; + + src = fetchurl { + url = "mirror://ubuntu/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2"; + hash = "sha256-48GeBOp6VltKz/bx5CSAhNLhB1LjBb991sdugIYNwds="; + }; + + nativeBuildInputs = [ + mkfontscale + mkfontdir + ]; + + installPhase = '' + runHook preInstall + + install -D -v uming.ttc $out/share/fonts/truetype/arphic-uming.ttc + cd $out/share/fonts + mkfontdir + mkfontscale + + runHook postInstall + ''; + + meta = with lib; { + description = "CJK Unicode font Ming style"; + homepage = "https://www.freedesktop.org/wiki/Software/CJKUnifonts/"; + + license = licenses.arphicpl; + maintainers = [ maintainers.changlinli ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/fira-code/symbols.nix b/pkgs/by-name/fi/fira-code-symbols/package.nix similarity index 100% rename from pkgs/data/fonts/fira-code/symbols.nix rename to pkgs/by-name/fi/fira-code-symbols/package.nix diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/by-name/fi/fira-code/package.nix similarity index 100% rename from pkgs/data/fonts/fira-code/default.nix rename to pkgs/by-name/fi/fira-code/package.nix diff --git a/pkgs/data/fonts/hackgen/default.nix b/pkgs/by-name/ha/hackgen-font/package.nix similarity index 100% rename from pkgs/data/fonts/hackgen/default.nix rename to pkgs/by-name/ha/hackgen-font/package.nix diff --git a/pkgs/data/fonts/hackgen/nerdfont.nix b/pkgs/by-name/ha/hackgen-nf-font/package.nix similarity index 100% rename from pkgs/data/fonts/hackgen/nerdfont.nix rename to pkgs/by-name/ha/hackgen-nf-font/package.nix diff --git a/pkgs/data/fonts/inconsolata/lgc.nix b/pkgs/by-name/in/inconsolata-lgc/package.nix similarity index 100% rename from pkgs/data/fonts/inconsolata/lgc.nix rename to pkgs/by-name/in/inconsolata-lgc/package.nix diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/by-name/in/inconsolata/package.nix similarity index 100% rename from pkgs/data/fonts/inconsolata/default.nix rename to pkgs/by-name/in/inconsolata/package.nix diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/by-name/in/input-fonts/package.nix similarity index 100% rename from pkgs/data/fonts/input-fonts/default.nix rename to pkgs/by-name/in/input-fonts/package.nix diff --git a/pkgs/data/fonts/joypixels/default.nix b/pkgs/by-name/jo/joypixels/package.nix similarity index 100% rename from pkgs/data/fonts/joypixels/default.nix rename to pkgs/by-name/jo/joypixels/package.nix diff --git a/pkgs/data/fonts/navilu/default.nix b/pkgs/by-name/na/navilu-font/package.nix similarity index 93% rename from pkgs/data/fonts/navilu/default.nix rename to pkgs/by-name/na/navilu-font/package.nix index e796bebd3bf1..4d9ba79067e9 100644 --- a/pkgs/data/fonts/navilu/default.nix +++ b/pkgs/by-name/na/navilu-font/package.nix @@ -1,11 +1,11 @@ { lib, - stdenv, + stdenvNoCC, fetchFromGitHub, fontforge, }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "navilu-font"; version = "1.2"; diff --git a/pkgs/data/fonts/paratype-pt/mono.nix b/pkgs/by-name/pa/paratype-pt-mono/package.nix similarity index 100% rename from pkgs/data/fonts/paratype-pt/mono.nix rename to pkgs/by-name/pa/paratype-pt-mono/package.nix diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/by-name/pa/paratype-pt-sans/package.nix similarity index 100% rename from pkgs/data/fonts/paratype-pt/sans.nix rename to pkgs/by-name/pa/paratype-pt-sans/package.nix diff --git a/pkgs/data/fonts/paratype-pt/serif.nix b/pkgs/by-name/pa/paratype-pt-serif/package.nix similarity index 100% rename from pkgs/data/fonts/paratype-pt/serif.nix rename to pkgs/by-name/pa/paratype-pt-serif/package.nix diff --git a/pkgs/data/fonts/profont/default.nix b/pkgs/by-name/pr/profont/package.nix similarity index 96% rename from pkgs/data/fonts/profont/default.nix rename to pkgs/by-name/pr/profont/package.nix index ed264c41f247..146baa6231d4 100644 --- a/pkgs/data/fonts/profont/default.nix +++ b/pkgs/by-name/pr/profont/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { sha256 = "12dbm87wvcpmn7nzgzwlk45cybp091diara8blqm6129ps27z6kb"; stripRoot = false; } - + /profont-x11; + + "/profont-x11"; srcOtb = fetchzip { @@ -25,7 +25,7 @@ stdenv.mkDerivation { sha256 = "18rfhfqrsj3510by0w1a7ak5as6r2cxh8xv02xc1y30mfa6g24x6"; stripRoot = false; } - + /profont-otb; + + "/profont-otb"; dontBuild = true; diff --git a/pkgs/by-name/ta/tai-ahom/package.nix b/pkgs/by-name/ta/tai-ahom/package.nix new file mode 100644 index 000000000000..b588cadc1292 --- /dev/null +++ b/pkgs/by-name/ta/tai-ahom/package.nix @@ -0,0 +1,33 @@ +{ + lib, + stdenvNoCC, + fetchurl, +}: + +stdenvNoCC.mkDerivation { + pname = "tai-ahom"; + version = "unstable-2015-07-06"; + + src = fetchurl { + url = "https://github.com/enabling-languages/tai-languages/raw/b57a3ea4589af69bb8e87c6c4bb7cd367b52f0b7/ahom/.fonts/ttf/.original/AhomUnicode_FromMartin.ttf"; + hash = "sha256-U1vcVf/VgXhvK1f2Iw2JKkd2EzJgz7KbHAwnUanX8n4="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -Dm644 $src $out/share/fonts/truetype/AhomUnicode.ttf + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/enabling-languages/tai-languages"; + description = "Unicode-compliant Tai Ahom font"; + maintainers = with maintainers; [ mathnerd314 ]; + license = licenses.ofl; # See font metadata + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/arphic/default.nix b/pkgs/data/fonts/arphic/default.nix deleted file mode 100644 index e658dcb713ff..000000000000 --- a/pkgs/data/fonts/arphic/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchurl, - mkfontdir, - mkfontscale, -}: - -let - version = "0.2.20080216.2"; -in -{ - arphic-ukai = stdenvNoCC.mkDerivation rec { - pname = "arphic-ukai"; - inherit version; - - src = fetchurl { - url = "mirror://ubuntu/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2"; - hash = "sha256-tJaNc1GfT4dH6FVI+4XSG2Zdob8bqQCnxJmXbmqK49I="; - }; - - nativeBuildInputs = [ - mkfontscale - mkfontdir - ]; - - installPhase = '' - runHook preInstall - - install -D -v ukai.ttc $out/share/fonts/truetype/arphic-ukai.ttc - cd $out/share/fonts - mkfontdir - mkfontscale - - runHook postInstall - ''; - - meta = with lib; { - description = "CJK Unicode font Kai style"; - homepage = "https://www.freedesktop.org/wiki/Software/CJKUnifonts/"; - - license = licenses.arphicpl; - maintainers = [ maintainers.changlinli ]; - platforms = platforms.all; - }; - }; - - arphic-uming = stdenvNoCC.mkDerivation rec { - pname = "arphic-uming"; - inherit version; - - src = fetchurl { - url = "mirror://ubuntu/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2"; - hash = "sha256-48GeBOp6VltKz/bx5CSAhNLhB1LjBb991sdugIYNwds="; - }; - - nativeBuildInputs = [ - mkfontscale - mkfontdir - ]; - - installPhase = '' - runHook preInstall - - install -D -v uming.ttc $out/share/fonts/truetype/arphic-uming.ttc - cd $out/share/fonts - mkfontdir - mkfontscale - - runHook postInstall - ''; - - meta = with lib; { - description = "CJK Unicode font Ming style"; - homepage = "https://www.freedesktop.org/wiki/Software/CJKUnifonts/"; - - license = licenses.arphicpl; - maintainers = [ maintainers.changlinli ]; - platforms = platforms.all; - }; - }; -} diff --git a/pkgs/data/fonts/tai-languages/default.nix b/pkgs/data/fonts/tai-languages/default.nix deleted file mode 100644 index 97acb4920610..000000000000 --- a/pkgs/data/fonts/tai-languages/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchurl, -}: - -{ - tai-ahom = stdenvNoCC.mkDerivation rec { - pname = "tai-ahom"; - version = "unstable-2015-07-06"; - - src = fetchurl { - url = "https://github.com/enabling-languages/tai-languages/raw/b57a3ea4589af69bb8e87c6c4bb7cd367b52f0b7/ahom/.fonts/ttf/.original/AhomUnicode_FromMartin.ttf"; - hash = "sha256-U1vcVf/VgXhvK1f2Iw2JKkd2EzJgz7KbHAwnUanX8n4="; - }; - - dontUnpack = true; - - installPhase = '' - runHook preInstall - - install -Dm644 $src $out/share/fonts/truetype/AhomUnicode.ttf - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/enabling-languages/tai-languages"; - description = "Unicode-compliant Tai Ahom font"; - maintainers = with maintainers; [ mathnerd314 ]; - license = licenses.ofl; # See font metadata - platforms = platforms.all; - }; - }; - - # TODO: package others (Khamti Shan, Tai Aiton, Tai Phake, and/or Assam Tai) - -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58f4ab07d90a..8cae33627c19 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1645,9 +1645,6 @@ with pkgs; arpack-mpi = arpack.override { useMpi = true; }; - inherit (callPackages ../data/fonts/arphic {}) - arphic-ukai arphic-uming; - asymptote = libsForQt5.callPackage ../tools/graphics/asymptote { }; atomicparsley = callPackage ../tools/video/atomicparsley { @@ -4380,8 +4377,6 @@ with pkgs; mytetra = libsForQt5.callPackage ../applications/office/mytetra { }; - navilu-font = callPackage ../data/fonts/navilu { stdenv = stdenvNoCC; }; - nerd-fonts = recurseIntoAttrs (callPackage ../data/fonts/nerd-fonts { }); netcdf-mpi = netcdf.override { @@ -12711,9 +12706,6 @@ with pkgs; andromeda-gtk-theme = libsForQt5.callPackage ../data/themes/andromeda-gtk-theme { }; - ankacoder = callPackage ../data/fonts/ankacoder { }; - ankacoder-condensed = callPackage ../data/fonts/ankacoder/condensed.nix { }; - ant-theme = callPackage ../data/themes/ant-theme/ant.nix { }; ant-bloody-theme = callPackage ../data/themes/ant-theme/ant-bloody.nix { }; @@ -12772,9 +12764,6 @@ with pkgs; inherit (nodePackages) svgo; }; - fira-code = callPackage ../data/fonts/fira-code { }; - fira-code-symbols = callPackage ../data/fonts/fira-code/symbols.nix { }; - flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme { inherit (plasma5Packages) breeze-icons; }; @@ -12816,22 +12805,10 @@ with pkgs; inherit (plasma5Packages) breeze-icons; }; - hackgen-font = callPackage ../data/fonts/hackgen { }; - - hackgen-nf-font = callPackage ../data/fonts/hackgen/nerdfont.nix { }; - - inconsolata = callPackage ../data/fonts/inconsolata { }; - - inconsolata-lgc = callPackage ../data/fonts/inconsolata/lgc.nix { }; - - input-fonts = callPackage ../data/fonts/input-fonts { }; - iosevka = callPackage ../data/fonts/iosevka { }; iosevka-bin = callPackage ../data/fonts/iosevka/bin.nix { }; iosevka-comfy = recurseIntoAttrs (callPackages ../data/fonts/iosevka/comfy.nix {}); - joypixels = callPackage ../data/fonts/joypixels { }; - kde-rounded-corners = kdePackages.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { }; kora-icon-theme = callPackage ../data/icons/kora-icon-theme { @@ -12917,10 +12894,6 @@ with pkgs; papis = with python3Packages; toPythonApplication papis; - paratype-pt-mono = callPackage ../data/fonts/paratype-pt/mono.nix { }; - paratype-pt-sans = callPackage ../data/fonts/paratype-pt/sans.nix { }; - paratype-pt-serif = callPackage ../data/fonts/paratype-pt/serif.nix { }; - plata-theme = callPackage ../data/themes/plata { inherit (mate) marco; }; @@ -12931,8 +12904,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - profont = callPackage ../data/fonts/profont { }; - qogir-kde = libsForQt5.callPackage ../data/themes/qogir-kde { }; ricochet-refresh = callPackage ../by-name/ri/ricochet-refresh/package.nix { @@ -12973,8 +12944,6 @@ with pkgs; source-han-serif-vf-otf = sourceHanPackages.serif-vf-otf; source-han-serif-vf-ttf = sourceHanPackages.serif-vf-ttf; - inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom; - tango-icon-theme = callPackage ../data/icons/tango-icon-theme { gtk = res.gtk2; }; From f3fe7bb95790e29fc5234d105e2470c880884a04 Mon Sep 17 00:00:00 2001 From: weriomat Date: Sat, 4 Jan 2025 00:15:50 +0100 Subject: [PATCH 36/60] pingvin-share: 1.7.1 -> 1.8.0 --- pkgs/servers/pingvin-share/backend.nix | 2 +- pkgs/servers/pingvin-share/default.nix | 4 ++-- pkgs/servers/pingvin-share/frontend.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/pingvin-share/backend.nix b/pkgs/servers/pingvin-share/backend.nix index 258ed2da3ef5..4a8330992cdd 100644 --- a/pkgs/servers/pingvin-share/backend.nix +++ b/pkgs/servers/pingvin-share/backend.nix @@ -31,7 +31,7 @@ buildNpmPackage { prisma ]; - npmDepsHash = "sha256-SBVkrrNKD3hCf1dT4ZWXYcQCat+wVQ9+ti1d0hfpWIw="; + npmDepsHash = "sha256-zzN4r2hednmm5DFnK/RRTKPq0vWiGhG+WyNTPNNP1vc="; makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; diff --git a/pkgs/servers/pingvin-share/default.nix b/pkgs/servers/pingvin-share/default.nix index f6169075f43e..dd46f4e0d383 100644 --- a/pkgs/servers/pingvin-share/default.nix +++ b/pkgs/servers/pingvin-share/default.nix @@ -5,12 +5,12 @@ }: let - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "stonith404"; repo = "pingvin-share"; rev = "v${version}"; - hash = "sha256-XchwPP573z4tzwAlSdWwi0aZwNlLcL1wGGgGyYgJAWg="; + hash = "sha256-cgB2cnpWdQFqdz9Lxyl87MOvhELge0YwwY0AoKqL8BU="; }; in diff --git a/pkgs/servers/pingvin-share/frontend.nix b/pkgs/servers/pingvin-share/frontend.nix index 810448aca363..b9248737fb7f 100644 --- a/pkgs/servers/pingvin-share/frontend.nix +++ b/pkgs/servers/pingvin-share/frontend.nix @@ -23,7 +23,7 @@ buildNpmPackage { buildInputs = [ vips ]; nativeBuildInputs = [ pkg-config ]; - npmDepsHash = "sha256-TC5yMvAXO3oKRhyVgGAiXT213vvv+cOxY4z6vQU1gX4="; + npmDepsHash = "sha256-wQIQHRVj8weUh/VOBdYVr8Q4ZE9u4rGJbQr0+NE6XG0="; makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; From 5462056d7e360d6e5456aece92642615a484cc8a Mon Sep 17 00:00:00 2001 From: Pascal Dietrich Date: Fri, 3 Jan 2025 19:06:02 +0100 Subject: [PATCH 37/60] empty-epsilon: 2024.08.09 -> 2024.12.08 Co-authored-by: Franz Pletz --- pkgs/by-name/em/empty-epsilon/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/em/empty-epsilon/package.nix b/pkgs/by-name/em/empty-epsilon/package.nix index c61e1bce9702..d4009323fb73 100644 --- a/pkgs/by-name/em/empty-epsilon/package.nix +++ b/pkgs/by-name/em/empty-epsilon/package.nix @@ -15,16 +15,16 @@ let version = { - seriousproton = "2024.08.09"; - emptyepsilon = "2024.08.09"; - basis-universal = "v1_15_update2"; + seriousproton = "2024.12.08"; + emptyepsilon = "2024.12.08"; + basis-universal = "1.15_final"; }; basis-universal = fetchFromGitHub { owner = "BinomialLLC"; repo = "basis_universal"; - rev = version.basis-universal; - hash = "sha256-2snzq/SnhWHIgSbUUgh24B6tka7EfkGO+nwKEObRkU4="; + tag = version.basis-universal; + hash = "sha256-pKvfVvdbPIdzdSOklicThS7xwt4i3/21bE6wg9f8kHY="; }; serious-proton = stdenv.mkDerivation { @@ -34,8 +34,8 @@ let src = fetchFromGitHub { owner = "daid"; repo = "SeriousProton"; - rev = "EE-${version.seriousproton}"; - hash = "sha256-B7BUe5rtN/eABJwkuSyn+h1lIHuV/tZUNcGXTyaWIr4="; + tag = "EE-${version.seriousproton}"; + hash = "sha256-k1YCB7EJIL+kdlHEU4cJjmLZZAZyxIPU0XlSn2t4C90="; }; nativeBuildInputs = [ cmake ]; @@ -69,8 +69,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "daid"; repo = "EmptyEpsilon"; - rev = "EE-${version.emptyepsilon}"; - hash = "sha256-DxaasUyJa8n0ha8RqAfEnqCVELs5Or0zvIOgcK75TnU="; + tag = "EE-${version.emptyepsilon}"; + hash = "sha256-JsHFwbt4VGsgaZz9uxEmwzZGfkYTNsIZTKkpvCCmI48="; }; nativeBuildInputs = [ cmake ]; From b6d859feaee1d1900458a3eea848c7933e78ef94 Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Mon, 4 Nov 2024 10:24:39 +0530 Subject: [PATCH 38/60] git-absorb: 0.6.15 -> 0.6.16 Diff: https://github.com/tummychow/git-absorb/compare/refs/tags/0.6.15...0.6.16 Signed-off-by: Muhammad Falak R Wani --- pkgs/applications/version-management/git-absorb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-absorb/default.nix b/pkgs/applications/version-management/git-absorb/default.nix index 7f598867b602..3c112daea5a1 100644 --- a/pkgs/applications/version-management/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-absorb/default.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage rec { pname = "git-absorb"; - version = "0.6.15"; + version = "0.6.16"; src = fetchFromGitHub { owner = "tummychow"; repo = "git-absorb"; tag = version; - hash = "sha256-7Y/gEym+29lTwJ7FbuvOqzbiMSzrY9f5IPhtvIJUKbU="; + hash = "sha256-5ZCCrq/mc9FAjl7AMbuQyRak5sL1dG3qWnrdNzUu4Ss="; }; nativeBuildInputs = [ installShellFiles ]; - cargoHash = "sha256-Y/0In33y4mVTaE9yoBZ/3tRWcsSKgGjTCSHdjScNEj0="; + cargoHash = "sha256-CzZgAjAIJryhFEJve3E62rg4QGRPSvBMuFZJzHGf09w="; postInstall = '' From 76771755b5a2396263a99cf4ed829b3b2e21af1e Mon Sep 17 00:00:00 2001 From: westpain Date: Tue, 24 Dec 2024 15:36:50 +0200 Subject: [PATCH 39/60] maintainers: add stellessia --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e55b7c07349f..e3359f8c5678 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21572,6 +21572,13 @@ githubId = 22163194; name = "Stel Abrego"; }; + stellessia = { + name = "Rachel Podya"; + email = "homicide@disroot.org"; + github = "stellessia"; + githubId = 81514356; + keys = [ { fingerprint = "38E8 7F79 AE86 CA98 F8BC 45F8 1060 00A0 5E5B DB90"; } ]; + }; stepbrobd = { name = "Yifei Sun"; email = "ysun@hey.com"; From ab4d78146739112d161b1e8fab7086d2e93bb920 Mon Sep 17 00:00:00 2001 From: westpain Date: Tue, 24 Dec 2024 14:42:16 +0200 Subject: [PATCH 40/60] materialgram: 5.7.0.1 -> 5.9.0.1 --- pkgs/by-name/ma/materialgram/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/materialgram/package.nix b/pkgs/by-name/ma/materialgram/package.nix index 651a60bb4b00..419b635f6832 100644 --- a/pkgs/by-name/ma/materialgram/package.nix +++ b/pkgs/by-name/ma/materialgram/package.nix @@ -11,13 +11,13 @@ telegram-desktop.override { unwrapped = telegram-desktop.unwrapped.overrideAttrs ( finalAttrs: previousAttrs: { pname = "materialgram-unwrapped"; - version = "5.7.0.1"; + version = "5.9.0.1"; src = fetchFromGitHub { owner = "kukuruzka165"; repo = "materialgram"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-YdLUwXMATla64KSYnXLXwLl0KktNoB/IuHIIY44R1VY="; + hash = "sha256-QmXwO8Dn+ATWGwN5smxOB2kxmJZETSMbqwFoR0t3luc="; fetchSubmodules = true; }; @@ -32,6 +32,7 @@ telegram-desktop.override { maintainers = with lib.maintainers; [ oluceps aleksana + stellessia ]; mainProgram = "materialgram"; }; From f93800ab5ba323dd978eb31f1faff747b8c87c29 Mon Sep 17 00:00:00 2001 From: GGG Date: Tue, 17 Dec 2024 21:49:14 -0300 Subject: [PATCH 41/60] am2rlauncher: upgrade to .NET 8 --- pkgs/by-name/am/am2rlauncher/deps.json | 102 ++++++------------ .../am/am2rlauncher/dotnet-8-upgrade.patch | 52 +++++++++ pkgs/by-name/am/am2rlauncher/package.nix | 81 +++++++++----- 3 files changed, 135 insertions(+), 100 deletions(-) create mode 100644 pkgs/by-name/am/am2rlauncher/dotnet-8-upgrade.patch diff --git a/pkgs/by-name/am/am2rlauncher/deps.json b/pkgs/by-name/am/am2rlauncher/deps.json index 5f81582e1b87..af9c725d3fc7 100644 --- a/pkgs/by-name/am/am2rlauncher/deps.json +++ b/pkgs/by-name/am/am2rlauncher/deps.json @@ -2,191 +2,151 @@ { "pname": "AtkSharp", "version": "3.24.24.34", - "sha256": "1jn1vgi9xm0jp7769k6sbdi8d273kigjrsh93i6s4c03hqxv7cqs" + "hash": "sha256-GrOzO4YDMKJNHAnqLF+c44iGYlvazGTOuRLUnuLbwco=" }, { "pname": "CairoSharp", "version": "3.24.24.34", - "sha256": "0pydn1k0cam1gclg9sc1sbnmbyzh28qlc5qanyxcylwghink3kgz" + "hash": "sha256-/80xbYSPU8+6twoXRjES8PtV7dKB6fQoe6EqBmawzV8=" }, { "pname": "Eto.Forms", "version": "2.7.1", - "sha256": "1hzbdnmn5znycfi0mvqa5k5mz9gasy58qzwa7fjmlkwj8ab87l9r" + "hash": "sha256-OdGDlkKST1qlO4p/jIrX6qVfyywK7wqiY97+Yqtt68M=" }, { "pname": "Eto.Platform.Gtk", "version": "2.7.1", - "sha256": "09iz85s728jy5qg7y30qvqw5rpsr3yxffrchk1avryk87ky1ysys" + "hash": "sha256-2msf/Dxo+rxVmJBl57ofWd9cON4YDH8eLl4icXRBPyY=" }, { "pname": "GdkSharp", "version": "3.24.24.34", - "sha256": "0r0x0yib7chwsyrbpvicrfwldwqx5lyqq4p86zaxpmzd6zdaj0x5" + "hash": "sha256-pQOp2jft19vVN+gSjD0tHfNGucss7ruy1xyys6IHHWQ=" }, { "pname": "GioSharp", "version": "3.24.24.34", - "sha256": "02hxvgjd4w9jpzbkk7qf9q9bkvyp5hfzwxfqp10vg5lpl9yl3xpx" + "hash": "sha256-/fZBfaKXlrdBuNh1/h0s1++5Ek4OnznXvzJx0uTbHQo=" }, { "pname": "GLibSharp", "version": "3.24.24.34", - "sha256": "0kvp033fgdwc8p2abfp5z9pzq66cvwbnjfvr4v4bkpy5s5h181kq" + "hash": "sha256-eAYUYNHF37nIJnk7aRffzBj8b/rluqXERYy358YAd08=" }, { "pname": "GtkSharp", "version": "3.24.24.34", - "sha256": "0028hzmmqyfx87qqmaf9cgb5psn7gkbmqvixcid67x1d6mzxjicb" + "hash": "sha256-i0XZfzUt9GNaZD1uXNd8x+pb1mPJqYrxQd15XOuHSAA=" }, { "pname": "LibGit2Sharp", "version": "0.27.0", - "sha256": "0n8crafpp4jq74km45wlm3jm0h96ggvqxy26wrz55azgjpk6p1gz" + "hash": "sha256-/4Vr5pXvq1J+5kb4jvd7JkFQ5aiUF1InOViSe53KDFk=" }, { "pname": "LibGit2Sharp.NativeBinaries", "version": "2.0.319", - "sha256": "0xm6np8y182v5246imnkw1fj2sx8x2nl3568kkm3razcgb0y5xlf" + "hash": "sha256-jvbiwXrsqzzqnMiUQa3oqGshXeDT1miIKFug4NG1pnY=" }, { "pname": "log4net", "version": "2.0.15", - "sha256": "1iq1rd0z0m15ln247jjrimj3avq50vh6njvw4x158r5v6nz093nb" + "hash": "sha256-y44EvjW7ZFRCJ3xLa+AGBW81ZI1ZykOEpSVU8EHLAcc=" }, { "pname": "Microsoft.NETCore.Platforms", - "version": "1.1.0", - "sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm" + "version": "2.0.0", + "hash": "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "5.0.0", - "sha256": "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc" + "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=" }, { "pname": "Microsoft.Win32.Registry", "version": "5.0.0", - "sha256": "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n" + "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=" }, { "pname": "Microsoft.Win32.SystemEvents", "version": "6.0.0", - "sha256": "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p" - }, - { - "pname": "NETStandard.Library", - "version": "2.0.3", - "sha256": "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y" + "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA=" }, { "pname": "PangoSharp", "version": "3.24.24.34", - "sha256": "1r0h14cklglfpv1lhv93cxmzi2w7d5s03gzpq3j5dmrz43flg9zw" - }, - { - "pname": "System.Buffers", - "version": "4.4.0", - "sha256": "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19" - }, - { - "pname": "System.Buffers", - "version": "4.5.1", - "sha256": "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3" + "hash": "sha256-/KdH3SA/11bkwPe/AXRph4v4a2cjbUjDvo4+OhkJEOQ=" }, { "pname": "System.ComponentModel.Annotations", "version": "5.0.0", - "sha256": "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j" + "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg=" }, { "pname": "System.Configuration.ConfigurationManager", "version": "4.5.0", - "sha256": "1frpy24mn6q7hgwayj98kkx89z861f5dmia4j6zc0a2ydgx8x02c" + "hash": "sha256-TICO+mteKMC+kUTF2ooLBv2E+pwoSa/4gwcbW4nwN7s=" }, { "pname": "System.Configuration.ConfigurationManager", "version": "6.0.0", - "sha256": "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw" + "hash": "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms=" }, { "pname": "System.Drawing.Common", "version": "6.0.0", - "sha256": "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz" - }, - { - "pname": "System.Memory", - "version": "4.5.0", - "sha256": "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30" - }, - { - "pname": "System.Memory", - "version": "4.5.4", - "sha256": "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y" - }, - { - "pname": "System.Numerics.Vectors", - "version": "4.4.0", - "sha256": "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.5.0", - "sha256": "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.5.3", - "sha256": "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln" + "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo=" }, { "pname": "System.Security.AccessControl", "version": "4.5.0", - "sha256": "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0" + "hash": "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM=" }, { "pname": "System.Security.AccessControl", "version": "5.0.0", - "sha256": "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r" + "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" }, { "pname": "System.Security.AccessControl", "version": "6.0.0", - "sha256": "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58" + "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg=" }, { "pname": "System.Security.Cryptography.ProtectedData", "version": "4.5.0", - "sha256": "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7" + "hash": "sha256-Z+X1Z2lErLL7Ynt2jFszku6/IgrngO3V1bSfZTBiFIc=" }, { "pname": "System.Security.Cryptography.ProtectedData", "version": "6.0.0", - "sha256": "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss" + "hash": "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY=" }, { "pname": "System.Security.Permissions", "version": "4.5.0", - "sha256": "192ww5rm3c9mirxgl1nzyrwd18am3izqls0hzm0fvcdjl5grvbhm" + "hash": "sha256-Fa6dX6Gyse1A/RBoin8cVaHQePbfBvp6jjWxUXPhXKQ=" }, { "pname": "System.Security.Permissions", "version": "6.0.0", - "sha256": "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw" + "hash": "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs=" }, { "pname": "System.Security.Principal.Windows", "version": "4.5.0", - "sha256": "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86" + "hash": "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY=" }, { "pname": "System.Security.Principal.Windows", "version": "5.0.0", - "sha256": "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8" + "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" }, { "pname": "System.Windows.Extensions", "version": "6.0.0", - "sha256": "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip" + "hash": "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM=" } ] diff --git a/pkgs/by-name/am/am2rlauncher/dotnet-8-upgrade.patch b/pkgs/by-name/am/am2rlauncher/dotnet-8-upgrade.patch new file mode 100644 index 000000000000..aa57704e697a --- /dev/null +++ b/pkgs/by-name/am/am2rlauncher/dotnet-8-upgrade.patch @@ -0,0 +1,52 @@ +diff --git a/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj b/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj +index e5e6191..ab9f228 100644 +--- a/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj ++++ b/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj +@@ -2,7 +2,7 @@ + + + WinExe +- net6.0 ++ net8.0 + icon64.ico + LatestMajor + latest +diff --git a/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj b/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj +index 2af5688..a91bb25 100644 +--- a/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj ++++ b/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj +@@ -2,7 +2,7 @@ + + + Exe +- net6.0-macos ++ net8.0-macos + osx-x64;osx-arm64 + 10.14 + LatestMajor +diff --git a/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj b/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj +index be49446..34a842f 100644 +--- a/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj ++++ b/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj +@@ -1,7 +1,7 @@ +  + + +- netstandard2.0 ++ net8.0 + latest + Resources\LauncherIcon.ico + Lojemiru, Miepee +diff --git a/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj b/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj +index 673ab7a..da3a019 100644 +--- a/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj ++++ b/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj +@@ -1,7 +1,7 @@ + + + +- netstandard2.0 ++ net8.0 + default + Debug;Release + AnyCPU diff --git a/pkgs/by-name/am/am2rlauncher/package.nix b/pkgs/by-name/am/am2rlauncher/package.nix index fb8d60d225f8..5e3b02984760 100644 --- a/pkgs/by-name/am/am2rlauncher/package.nix +++ b/pkgs/by-name/am/am2rlauncher/package.nix @@ -1,24 +1,25 @@ -{ lib -, buildDotnetModule -, writeShellScript -, glibc -, gtk3 -, libappindicator -, webkitgtk_4_0 -, e2fsprogs -, libnotify -, libgit2 -, openssl -, xdelta -, file -, openjdk -, patchelf -, fetchFromGitHub -, buildFHSEnv -, glib-networking -, wrapGAppsHook3 -, gsettings-desktop-schemas -, dotnetCorePackages +{ + lib, + buildDotnetModule, + writeShellScript, + glibc, + gtk3, + libappindicator, + webkitgtk_4_0, + e2fsprogs, + libnotify, + libgit2, + openssl, + xdelta, + file, + openjdk, + patchelf, + fetchFromGitHub, + buildFHSEnv, + glib-networking, + wrapGAppsHook3, + gsettings-desktop-schemas, + dotnetCorePackages, }: let am2r-run = buildFHSEnv { @@ -26,7 +27,8 @@ let multiArch = true; - multiPkgs = pkgs: with pkgs; [ + multiPkgs = + pkgs: with pkgs; [ (lib.getLib stdenv.cc.cc) xorg.libX11 xorg.libXext @@ -55,7 +57,7 @@ buildDotnetModule { hash = "sha256-/nHqo8jh3sOUngbpqdfiQjUWO/8Uzpc5jtW7Ep4q6Wg="; }; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; projectFile = "AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj"; nugetDeps = ./deps.json; @@ -74,16 +76,37 @@ buildDotnetModule { nativeBuildInputs = [ wrapGAppsHook3 ]; - buildInputs = [ gtk3 gsettings-desktop-schemas glib-networking ]; + buildInputs = [ + gtk3 + gsettings-desktop-schemas + glib-networking + ]; - patches = [ ./am2r-run-binary.patch ]; + patches = [ + ./am2r-run-binary.patch + ./dotnet-8-upgrade.patch + ]; - dotnetFlags = [ ''-p:DefineConstants="NOAPPIMAGE;NOAUTOUPDATE;PATCHOPENSSL"'' ]; + dotnetFlags = [ + ''-p:DefineConstants="NOAPPIMAGE;NOAUTOUPDATE;PATCHOPENSSL"'' + ]; + + makeWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.escapeShellArg ( + lib.makeBinPath [ + am2r-run + xdelta + file + openjdk + patchelf + ] + )) + ]; postFixup = '' - wrapProgram $out/bin/AM2RLauncher.Gtk \ - --prefix PATH : ${lib.makeBinPath [ am2r-run xdelta file openjdk patchelf ]} \ - mkdir -p $out/share/icons install -Dm644 $src/AM2RLauncher/distribution/linux/AM2RLauncher.png $out/share/icons/AM2RLauncher.png install -Dm644 $src/AM2RLauncher/distribution/linux/AM2RLauncher.desktop $out/share/applications/AM2RLauncher.desktop From aa268be09ae057fffc4a6cbcada68c6865ede8f0 Mon Sep 17 00:00:00 2001 From: GGG Date: Tue, 17 Dec 2024 21:53:13 -0300 Subject: [PATCH 42/60] avalonia-ilspy: format file --- .../misc/avalonia-ilspy/default.nix | 95 +++++++++++-------- 1 file changed, 56 insertions(+), 39 deletions(-) diff --git a/pkgs/applications/misc/avalonia-ilspy/default.nix b/pkgs/applications/misc/avalonia-ilspy/default.nix index 4413f853b011..72b558fe4d9a 100644 --- a/pkgs/applications/misc/avalonia-ilspy/default.nix +++ b/pkgs/applications/misc/avalonia-ilspy/default.nix @@ -1,23 +1,24 @@ -{ lib -, stdenv -, fetchFromGitHub -, buildDotnetModule -, dotnetCorePackages -, libX11 -, libICE -, libSM -, libXi -, libXcursor -, libXext -, libXrandr -, fontconfig -, glew -, makeDesktopItem -, copyDesktopItems -, icoutils -, bintools -, fixDarwinDylibNames -, autoSignDarwinBinariesHook +{ + lib, + stdenv, + fetchFromGitHub, + buildDotnetModule, + dotnetCorePackages, + libX11, + libICE, + libSM, + libXi, + libXcursor, + libXext, + libXrandr, + fontconfig, + glew, + makeDesktopItem, + copyDesktopItems, + icoutils, + bintools, + fixDarwinDylibNames, + autoSignDarwinBinariesHook, }: buildDotnetModule rec { @@ -36,11 +37,18 @@ buildDotnetModule rec { ./remove-broken-sources.patch ]; - nativeBuildInputs = [ - copyDesktopItems - icoutils - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ bintools fixDarwinDylibNames ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ]; + nativeBuildInputs = + [ + copyDesktopItems + icoutils + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + bintools + fixDarwinDylibNames + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + autoSignDarwinBinariesHook + ]; buildInputs = [ # Dependencies of nuget packages w/ native binaries @@ -61,18 +69,20 @@ buildDotnetModule rec { glew ]; - postInstall = '' - icotool --icon -x ILSpy/ILSpy.ico - for i in 16 32 48 256; do - size=''${i}x''${i} - install -Dm444 *_''${size}x32.png $out/share/icons/hicolor/$size/apps/ILSpy.png - done - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - install -Dm444 ILSpy/Info.plist $out/Applications/ILSpy.app/Contents/Info.plist - install -Dm444 ILSpy/ILSpy.icns $out/Applications/ILSpy.app/Contents/Resources/ILSpy.icns - mkdir -p $out/Applications/ILSpy.app/Contents/MacOS - ln -s $out/bin/ILSpy $out/Applications/ILSpy.app/Contents/MacOS/ILSpy - ''; + postInstall = + '' + icotool --icon -x ILSpy/ILSpy.ico + for i in 16 32 48 256; do + size=''${i}x''${i} + install -Dm444 *_''${size}x32.png $out/share/icons/hicolor/$size/apps/ILSpy.png + done + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + install -Dm444 ILSpy/Info.plist $out/Applications/ILSpy.app/Contents/Info.plist + install -Dm444 ILSpy/ILSpy.icns $out/Applications/ILSpy.app/Contents/Resources/ILSpy.icns + mkdir -p $out/Applications/ILSpy.app/Contents/MacOS + ln -s $out/bin/ILSpy $out/Applications/ILSpy.app/Contents/MacOS/ILSpy + ''; dotnet-sdk = dotnetCorePackages.sdk_6_0; dotnet-runtime = dotnetCorePackages.runtime_6_0; @@ -108,8 +118,15 @@ buildDotnetModule rec { lgpl21Only mspl ]; - sourceProvenance = with sourceTypes; [ fromSource binaryBytecode binaryNativeCode ]; - maintainers = with maintainers; [ AngryAnt emilytrau ]; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode + binaryNativeCode + ]; + maintainers = with maintainers; [ + AngryAnt + emilytrau + ]; mainProgram = "ILSpy"; }; } From 0506ebefc19364bbc1501ea688d300859dfd1147 Mon Sep 17 00:00:00 2001 From: GGG Date: Tue, 17 Dec 2024 22:02:52 -0300 Subject: [PATCH 43/60] avalonia-ilspy: upgrade to .NET 8 --- .../misc/avalonia-ilspy/default.nix | 7 +- .../misc/avalonia-ilspy/deps.json | 713 ++++++++++++------ .../avalonia-ilspy/dotnet-8-upgrade.patch | 64 ++ 3 files changed, 542 insertions(+), 242 deletions(-) create mode 100644 pkgs/applications/misc/avalonia-ilspy/dotnet-8-upgrade.patch diff --git a/pkgs/applications/misc/avalonia-ilspy/default.nix b/pkgs/applications/misc/avalonia-ilspy/default.nix index 72b558fe4d9a..69aeb11e2bbd 100644 --- a/pkgs/applications/misc/avalonia-ilspy/default.nix +++ b/pkgs/applications/misc/avalonia-ilspy/default.nix @@ -29,12 +29,14 @@ buildDotnetModule rec { owner = "icsharpcode"; repo = "AvaloniaILSpy"; rev = "v${version}"; - sha256 = "cCQy5cSpJNiVZqgphURcnraEM0ZyXGhzJLb5AThNfPQ="; + hash = "sha256-cCQy5cSpJNiVZqgphURcnraEM0ZyXGhzJLb5AThNfPQ="; }; patches = [ # Remove dead nuget package source ./remove-broken-sources.patch + # Upgrade project to .NET 8.0 + ./dotnet-8-upgrade.patch ]; nativeBuildInputs = @@ -84,8 +86,7 @@ buildDotnetModule rec { ln -s $out/bin/ILSpy $out/Applications/ILSpy.app/Contents/MacOS/ILSpy ''; - dotnet-sdk = dotnetCorePackages.sdk_6_0; - dotnet-runtime = dotnetCorePackages.runtime_6_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; projectFile = "ILSpy/ILSpy.csproj"; nugetDeps = ./deps.json; diff --git a/pkgs/applications/misc/avalonia-ilspy/deps.json b/pkgs/applications/misc/avalonia-ilspy/deps.json index 7259717dcfc1..c37cf06f99ab 100644 --- a/pkgs/applications/misc/avalonia-ilspy/deps.json +++ b/pkgs/applications/misc/avalonia-ilspy/deps.json @@ -2,1068 +2,1303 @@ { "pname": "Avalonia", "version": "0.10.13", - "sha256": "1df46dvjyax8jjdcvdavpzq5bwxacrw71j557mcm1401vv3r1vn3" + "hash": "sha256-w+6Qx94BkFBZPaXIcHhmqvNV8L9btc2alKgrL3czxLU=" }, { "pname": "Avalonia.Angle.Windows.Natives", "version": "2.1.0.2020091801", - "sha256": "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a" + "hash": "sha256-ahDcJNCqlNniItcat7owREQ0hfIwMWFNhnDu89lAVRI=" }, { "pname": "Avalonia.AvaloniaEdit", "version": "0.10.12.2", - "sha256": "1sn8k71xcfnjxgxfqzdrv1hy7h7pvdk820nyzkmrf02gi77mx7nw" + "hash": "sha256-3J5ez4lPAJfr/N4CgWbb98DjYdi5fez669I61sOZyOo=" }, { "pname": "Avalonia.Controls.DataGrid", "version": "0.10.13", - "sha256": "1yl402l5cwbv6gwy3p8r702ypp3p8w5wi8im25c2bjnv31889l8r" + "hash": "sha256-GdGEUBjbyiVYETWiyAtHd9zrBTgZ3eH5M3txVqgAhPo=" }, { "pname": "Avalonia.Desktop", "version": "0.10.13", - "sha256": "1y206hrfwyg8023z0m7dik1hlir1r18h8q0f0zqz3sabyy5k276w" + "hash": "sha256-3Bwxi/dL6fHxBw5gBFHIIUcKw4ztVPCHAOh57jI0QPg=" }, { "pname": "Avalonia.Diagnostics", "version": "0.10.13", - "sha256": "11khr3w7gwlm1bajfh5zhrsfcfd9kbw5mbgwnbjq7i5lq9glriid" + "hash": "sha256-LcZMX8K0xIPlsvytWviaqTnmdIa/QCfVCpXyd/jIcIY=" }, { "pname": "Avalonia.FreeDesktop", "version": "0.10.13", - "sha256": "18gygzg12facawvzmfgpja4rsagy670dv1dcrx4shfl7w8l998jp" + "hash": "sha256-V6KUKOKHOqhJz6yF3cAx/imdiZL3ufo3V0w5Ed5//qE=" }, { "pname": "Avalonia.Markup.Xaml.Loader", "version": "0.10.13", - "sha256": "187r64xpidliqbp9c3qar0grhn97ffvc0mp0gyrxxszrff9vf69k" + "hash": "sha256-Mxm3k3P5696zf+BWwLZzJ1mYH8gKD5buwpG2eDsx+aA=" }, { "pname": "Avalonia.Native", "version": "0.10.13", - "sha256": "18b2pykfcgw9pyjmdqq7i1n8j330n7xrwyldl9bpkvahswinvhza" + "hash": "sha256-6sNtI9dQ7XlXoo16nvuxYAyJbIgH41alv4k/5qa/YqE=" }, { "pname": "Avalonia.Remote.Protocol", "version": "0.10.13", - "sha256": "0j0kdh6dbii59v972azhwq69rmak63lp5f5jqz3pi94mifx4bayy" + "hash": "sha256-3qtFuouVpHjHx7K4cukwU9WcDObwK3HSTiXG1QxsE0g=" }, { "pname": "Avalonia.Skia", "version": "0.10.13", - "sha256": "0k5y0w164m03q278m4wr7zzf3vfq9nb0am9vmmprivpn1xwwa7ml" + "hash": "sha256-tB7FeQ/27phvrTtVBZZN2O3h/j+Zk4qOwANUYgIHvkw=" }, { "pname": "Avalonia.Win32", "version": "0.10.13", - "sha256": "0jyl1rrn1n07dnqn76ijwhxgkc45dmsfh2d811n4695ndaz85nkl" + "hash": "sha256-dNqCvmq2JENsCKgJ6HRthbD5OuQymmOxbQfYYHMO1Es=" }, { "pname": "Avalonia.X11", "version": "0.10.13", - "sha256": "1y8x9hjdlxg4q8q958i364cbak8xjh4nldp38cnxwjir814p0xwh" + "hash": "sha256-kHdwSUA5St4tQ+M2agmUHU21GDEjopIwwuR12iRMHfk=" }, { "pname": "HarfBuzzSharp", "version": "2.8.2-preview.178", - "sha256": "1p5nwzl7jpypsd6df7hgcf47r977anjlyv21wacmalsj6lvdgnvn" + "hash": "sha256-dtvXNjVSU1WZ4kFsT6VV56R8iGMPHtdM09dfeejnttw=" }, { "pname": "HarfBuzzSharp.NativeAssets.Linux", "version": "2.8.2-preview.178", - "sha256": "1402ylkxbgcnagcarqlfvg4gppy2pqs3bmin4n5mphva1g7bqb2p" + "hash": "sha256-Vyy8zgtqw1uLJTbWNTS+wt/7yNuO4qzYU5a91Sf1ApA=" }, { "pname": "HarfBuzzSharp.NativeAssets.macOS", "version": "2.8.2-preview.178", - "sha256": "0p8miaclnbfpacc1jaqxwfg0yfx9byagi4j4k91d9621vd19i8b2" + "hash": "sha256-YqGYQttBmNRCmkSS+JRfqTsPnuMdKxkYU9ctS5mKFV0=" }, { "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", "version": "2.8.2-preview.178", - "sha256": "1n9jay9sji04xly6n8bzz4591fgy8i65p21a8mv5ip9lsyj1c320" + "hash": "sha256-QAwWpNc03Vh2RSqIW0xE/rmQCvl/IWs87QREqZNXMtk=" }, { "pname": "HarfBuzzSharp.NativeAssets.Win32", "version": "2.8.2-preview.178", - "sha256": "1r5syii96wv8q558cvsqw3lr10cdw6677lyiy82p6i3if51v3mr7" + "hash": "sha256-J9exQ3FxRHMF8tHTc4zhjYGQ6eBYb4ZKwWhzk2L0uuQ=" }, { "pname": "ICSharpCode.Decompiler", "version": "7.1.0.6543", - "sha256": "1xrajs5dcd7aqsg9ibhdcy39yrd8737kknkmqf907n7fqs2jxr46" + "hash": "sha256-huQuhcbu2AOSw3XaOc84qGWfhmcNrpiexuo01oqWKvc=" }, { "pname": "ICSharpCode.Decompiler", "version": "7.2.1.6856", - "sha256": "19z68rgzl93lh1h8anbgzw119mhvcgr9nh5q2nxk6qihl2mx97ba" + "hash": "sha256-ap3Uq6AwYjO7FbhAm/JjG9YUAv9vWYVggHQk+l9G5qc=" }, { "pname": "JetBrains.Annotations", "version": "10.3.0", - "sha256": "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8" + "hash": "sha256-6I/8HtwvEK0JLgRcSrCzCtUfMylj88s5JNcl9ZDoLb8=" }, { "pname": "Microsoft.CodeAnalysis.Analyzers", "version": "2.9.6", - "sha256": "18mr1f0wpq0fir8vjnq0a8pz50zpnblr7sabff0yqx37c975934a" + "hash": "sha256-ioxUTmJndOyBc0vpk+my94PyL1IAW7lRjg7gy4ELuaI=" }, { "pname": "Microsoft.CodeAnalysis.Common", "version": "3.4.0", - "sha256": "12rn6gl4viycwk3pz5hp5df63g66zvba4hnkwr3f0876jj5ivmsw" + "hash": "sha256-XNcdi5TmIOBG5tNCotb+xrxhXCsXln/H5MzHTegzNos=" }, { "pname": "Microsoft.CodeAnalysis.CSharp", "version": "3.4.0", - "sha256": "0rhylcwa95bxawcgixk64knv7p7xrykdjcabmx3gknk8hvj1ai9y" + "hash": "sha256-PkUV5IZo2vlGr0sx2abP/dyz7SRm9vgYV32VpDijHmY=" }, { "pname": "Microsoft.CodeAnalysis.CSharp.Scripting", "version": "3.4.0", - "sha256": "1h2f0z9xnw987x8bydka1sd42ijqjx973md6v1gvpy1qc6ad244g" + "hash": "sha256-jxDRlGE4+Ltf2KbVcVKXWEZBmg5qNr9QPyhx29MHTsA=" }, { "pname": "Microsoft.CodeAnalysis.Scripting.Common", "version": "3.4.0", - "sha256": "195gqnpwqkg2wlvk8x6yzm7byrxfq9bki20xmhf6lzfsdw3z4mf2" + "hash": "sha256-wlXyB2/afWocrB2IOFfCrme/Tv3edDQ35eJNzK/Fr6Q=" }, { "pname": "Microsoft.CSharp", "version": "4.0.1", - "sha256": "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj" + "hash": "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8=" }, { "pname": "Microsoft.CSharp", "version": "4.3.0", - "sha256": "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb" + "hash": "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8=" }, { "pname": "Microsoft.DiaSymReader", "version": "1.4.0", - "sha256": "0li9shnm941jza40kqfkbbys77mrr55nvi9h3maq9fipq4qwx92d" + "hash": "sha256-TaTOMcE3uoRVHTDFbUvJuZ6j/VrT4QmI+jKQVC3UKVI=" }, { "pname": "Microsoft.DiaSymReader.Converter.Xml", "version": "1.1.0-beta2-22164-02", - "sha256": "1f8ha43xp0zy7kn1n98aaaapv6fdxl3a2qabg29fq74jzb16j9fp", + "hash": "sha256-1yVpwvqSHOySeEthoQbtzZl9lVIKJRvsPP6D2wdRELk=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.diasymreader.converter.xml/1.1.0-beta2-22164-02/microsoft.diasymreader.converter.xml.1.1.0-beta2-22164-02.nupkg" }, { "pname": "Microsoft.DiaSymReader.Native", "version": "17.0.0-beta1.21524.1", - "sha256": "0gash3xgzvcb78w2xqv003l0cld199zpfilnjbagwbr5ikdh6f3s" + "hash": "sha256-ejgD24wlL/7UkpZGd39KoVEG6ABg4y44Oovt//qAWj0=" }, { "pname": "Microsoft.DiaSymReader.PortablePdb", "version": "1.7.0-beta-21525-03", - "sha256": "0jb70rjgdif61jjc93pysfrr52hi5jlfmjdaqic7s0a3rfg0ahyk", + "hash": "sha256-00MFnstDAX1YxKrJ6qgsEYqSs9P+jsSkDMbF9mQGZ0k=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.diasymreader.portablepdb/1.7.0-beta-21525-03/microsoft.diasymreader.portablepdb.1.7.0-beta-21525-03.nupkg" }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.0.1", - "sha256": "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr" + "hash": "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.0", - "sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm" + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.1", - "sha256": "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj" + "hash": "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "2.0.0", - "sha256": "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0" + "hash": "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "2.1.2", - "sha256": "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141" + "hash": "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "5.0.0", - "sha256": "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc" + "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=" }, { "pname": "Microsoft.NETCore.Targets", "version": "1.0.1", - "sha256": "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p" + "hash": "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4=" }, { "pname": "Microsoft.NETCore.Targets", "version": "1.1.0", - "sha256": "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh" + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" }, { "pname": "Microsoft.NETCore.Targets", "version": "1.1.3", - "sha256": "05smkcyxir59rgrmp7d6327vvrlacdgldfxhmyr1azclvga1zfsq" + "hash": "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc=" }, { "pname": "Microsoft.VisualStudio.Composition", "version": "17.1.20", - "sha256": "028bcxrzqc0nng2l7fqqaa0z1k4wc541jfhcdwjvw9f45q6nf3fs" + "hash": "sha256-2g1nDS7EJb4lbww6GUhhnMzwgVIYu0PFsxYw/HNnCwk=" }, { "pname": "Microsoft.VisualStudio.Composition.Analyzers", "version": "17.1.20", - "sha256": "14fm8j1bvqh0bpfg3x814c1m747q99i4q3xplqb8db7l2xkn3v7a" + "hash": "sha256-6uxhZxf0rIYWprcPTGJK+JBTAyMB9fHcXQDivYJE1ZE=" }, { "pname": "Microsoft.VisualStudio.Validation", "version": "17.0.34", - "sha256": "09la67gw6xdss3as3ph0ql3b3zhblni2qmkma9gz53kx1hav9ygp" + "hash": "sha256-9/m0FQx9jvJfUnVWLKKlC/6xBsUA3qHV0Lp1w98xiiY=" }, { "pname": "Microsoft.Win32.Primitives", "version": "4.0.1", - "sha256": "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7" + "hash": "sha256-B4t5El/ViBdxALMcpZulewc4j/3SIXf71HhJWhm4Ctk=" + }, + { + "pname": "Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" }, { "pname": "Microsoft.Win32.Registry", "version": "4.0.0", - "sha256": "1spf4m9pikkc19544p29a47qnhcd885klncahz133hbnyqbkmz9k" + "hash": "sha256-M/06F/Z2wTHCh4pZOgtCjUGLD1FJXEJKCmzOeFMl7uo=" }, { "pname": "Microsoft.Win32.Registry", "version": "5.0.0", - "sha256": "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n" + "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=" }, { "pname": "Microsoft.Win32.SystemEvents", "version": "4.5.0", - "sha256": "0fnkv3ky12227zqg4zshx4kw2mvysq2ppxjibfw02cc3iprv4njq" + "hash": "sha256-WFqy842DMQG4W1H2ewXWflfBJ+lQf/LwP0KI4OfY0zo=" }, { "pname": "Mono.Cecil", "version": "0.11.3", - "sha256": "0xcx7pk9y2n1hr15c0l1balzi69kw5gy8dk7sb8jwqyyvm35q4j3" + "hash": "sha256-QxJcRt3eYy7R0mc25F/hM5n4qVqBAlZChsEKn+Y9nXU=" }, { "pname": "NETStandard.Library", - "version": "2.0.3", - "sha256": "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y" + "version": "1.6.0", + "hash": "sha256-ExWI1EKDCRishcfAeHVS/RoJphqSqohmJIC/wz3ZtVo=" + }, + { + "pname": "NETStandard.Library", + "version": "1.6.1", + "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw=" }, { "pname": "Newtonsoft.Json", "version": "9.0.1", - "sha256": "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r" + "hash": "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU=" }, { "pname": "NuGet.Client", "version": "4.2.0", - "sha256": "1s34w7yi0xcm0hi9g32xx9njy52hjkh4gbizldvpp48mkki6bfrl" + "hash": "sha256-NLtl4pwVkXt3oz+uR+CUUBQvbepdjJciBJV1EP3hZOg=" }, { "pname": "NuGet.Common", "version": "4.2.0", - "sha256": "0j8bk9nkaxcf52az2rxhx27rqn7hs9mmw0p48i0x7g8i9b40wvwc" + "hash": "sha256-jG8OyEoRvdNBROQCXmvS8Ficj+iwZ/GVKI51NW2aC0k=" }, { "pname": "NuGet.ContentModel", "version": "4.2.0", - "sha256": "1989zmdgwh13zwg9kafapdka6p46i50iw434fb8k22jp6amnwnvm" + "hash": "sha256-dVtuqzJXCjHRcmQQHkGJhlyjZrvKqZke/yNA/lr9CaU=" }, { "pname": "NuGet.Frameworks", "version": "4.2.0", - "sha256": "0dwzg8kq0fwdjzl00ag969sxakj3brppr4y7k37yx5w1slj7wsb3" + "hash": "sha256-Y2l+JNWBl+7PmMeTfG9eQ07VdTLpKQDol407gCd6nzc=" }, { "pname": "NuGet.Packaging", "version": "4.2.0", - "sha256": "1g83ry4x0zlcdcgwd7c8daxig4cx77jics6rlfasy223hyvss8p3" + "hash": "sha256-4yKtt4dDCK+Vo9loFuU5nZEXu2qIncYfa4x+0InPA70=" }, { "pname": "NuGet.Packaging.Core", "version": "4.2.0", - "sha256": "11dpszywsxb12ybx176z2703181xixzhxg3w3rc8ivw699ivsdfk" + "hash": "sha256-0zW9Y0qG74hYHny8Dn+PPaAwwBHfnNCXF2F1zf3Xt4U=" }, { "pname": "NuGet.Packaging.Core.Types", "version": "4.2.0", - "sha256": "031gzbs5sqb46c2rbqpybc9bw0i7ilidbbv2k7rdas3300cjp5kj" + "hash": "sha256-cpYrGQBjaNXymWKv1SKNJwK+Elv+4pUFM2RhXfT6Lww=" }, { "pname": "NuGet.Repositories", "version": "4.2.0", - "sha256": "0w18lj7q85grdd563p429cg0pg8hi9xmsrr4pzskha139vhfq0lp" + "hash": "sha256-lwLs4E4jKDj1vyRnXXuKEL0LHkuC3GFKa/kVhI+kKHA=" }, { "pname": "NuGet.RuntimeModel", "version": "4.2.0", - "sha256": "0k59ww2zk56bsqici62zn59h19wp4ai9v395hy5mq6wl6mz6qaax" + "hash": "sha256-XSlsfjWUG1yLhyWNnaIil6cAU7FfmMgi1suU+QXnqUw=" }, { "pname": "NuGet.Versioning", "version": "4.2.0", - "sha256": "1mx7b4hgdhl6g7yzp3lknmkxkyfjw372nxpsmvdznwhg214iz2d3" + "hash": "sha256-o4kfSRAPcvvbrvp2K87g0vnZZ7WTjvv9eYbC9iBZp9c=" }, { "pname": "runtime.any.System.Collections", "version": "4.3.0", - "sha256": "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0" + "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" }, { "pname": "runtime.any.System.Diagnostics.Tools", "version": "4.3.0", - "sha256": "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk" + "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I=" }, { "pname": "runtime.any.System.Diagnostics.Tracing", "version": "4.3.0", - "sha256": "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn" + "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" }, { "pname": "runtime.any.System.Globalization", "version": "4.3.0", - "sha256": "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x" + "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" + }, + { + "pname": "runtime.any.System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" }, { "pname": "runtime.any.System.IO", "version": "4.3.0", - "sha256": "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x" + "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" }, { "pname": "runtime.any.System.Reflection", "version": "4.3.0", - "sha256": "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly" + "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" }, { "pname": "runtime.any.System.Reflection.Extensions", "version": "4.3.0", - "sha256": "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33" + "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=" }, { "pname": "runtime.any.System.Reflection.Primitives", "version": "4.3.0", - "sha256": "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf" + "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" }, { "pname": "runtime.any.System.Resources.ResourceManager", "version": "4.3.0", - "sha256": "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl" + "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" }, { "pname": "runtime.any.System.Runtime", "version": "4.3.0", - "sha256": "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b" + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" }, { "pname": "runtime.any.System.Runtime.Handles", "version": "4.3.0", - "sha256": "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x" + "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" }, { "pname": "runtime.any.System.Runtime.InteropServices", "version": "4.3.0", - "sha256": "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19" + "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" }, { "pname": "runtime.any.System.Text.Encoding", "version": "4.3.0", - "sha256": "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3" + "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" }, { "pname": "runtime.any.System.Text.Encoding.Extensions", "version": "4.3.0", - "sha256": "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8" + "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=" }, { "pname": "runtime.any.System.Threading.Tasks", "version": "4.3.0", - "sha256": "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va" + "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" + }, + { + "pname": "runtime.any.System.Threading.Timer", + "version": "4.3.0", + "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs=" }, { "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d" + "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" }, { "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59" + "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" }, { "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa" + "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" }, { "pname": "runtime.native.System", "version": "4.0.0", - "sha256": "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf" + "hash": "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894=" }, { "pname": "runtime.native.System", "version": "4.3.0", - "sha256": "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4" + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" }, { "pname": "runtime.native.System.IO.Compression", "version": "4.3.0", - "sha256": "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d" + "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8=" + }, + { + "pname": "runtime.native.System.Net.Http", + "version": "4.0.1", + "hash": "sha256-5nWnTQrA1T6t9r8MqIiV4yTNu+IH0of2OX1qteoS+8E=" + }, + { + "pname": "runtime.native.System.Net.Http", + "version": "4.3.0", + "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" }, { "pname": "runtime.native.System.Security.Cryptography", "version": "4.0.0", - "sha256": "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9" + "hash": "sha256-6Q8eYzC32BbGIiTHoQaE6B3cD81vYQcH5SCswYRSp0w=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" }, { "pname": "runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97" + "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" }, { "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3" + "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" }, { "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf" + "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" + }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" }, { "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3" + "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" }, { "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn" + "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" }, { "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3" + "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" }, { "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy" + "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" }, { "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5" + "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" }, { "pname": "runtime.unix.Microsoft.Win32.Primitives", "version": "4.3.0", - "sha256": "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id" + "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" + }, + { + "pname": "runtime.unix.System.Console", + "version": "4.3.1", + "hash": "sha256-dxyn/1Px4FKLZ2QMUrkFpW619Y1lhPeTiGLWYM6IbpY=" }, { "pname": "runtime.unix.System.Diagnostics.Debug", "version": "4.3.0", - "sha256": "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5" + "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" }, { "pname": "runtime.unix.System.IO.FileSystem", "version": "4.3.0", - "sha256": "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix" + "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" + }, + { + "pname": "runtime.unix.System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" + }, + { + "pname": "runtime.unix.System.Net.Sockets", + "version": "4.3.0", + "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=" }, { "pname": "runtime.unix.System.Private.Uri", "version": "4.3.0", - "sha256": "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk" + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" }, { "pname": "runtime.unix.System.Runtime.Extensions", "version": "4.3.0", - "sha256": "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p" + "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" }, { "pname": "SkiaSharp", "version": "2.88.0-preview.178", - "sha256": "062g14s6b2bixanpwihj3asm3jwvfw15mhvzqv6901afrlgzx4nk" + "hash": "sha256-05L+H81OBZDMxn/DWgJ3m8tRtRoSRn6t6nGJZTQJTxg=" }, { "pname": "SkiaSharp.NativeAssets.Linux", "version": "2.88.0-preview.178", - "sha256": "07kga1j51l3l302nvf537zg5clf6rflinjy0xd6i06cmhpkf3ksw" + "hash": "sha256-XM/h5oWVGRBN68BLG6nLxlFW3j+juG0FGHTQUGRQbx4=" }, { "pname": "SkiaSharp.NativeAssets.macOS", "version": "2.88.0-preview.178", - "sha256": "14p95nxccs6yq4rn2h9zbb60k0232k6349zdpy31jcfr6gc99cgi" + "hash": "sha256-8bGU2DPZMRmGv+0nMswUQ4AJzFo/QWEzwd5oxrot6ZI=" }, { "pname": "SkiaSharp.NativeAssets.WebAssembly", "version": "2.88.0-preview.178", - "sha256": "09jmcg5k1vpsal8jfs90mwv0isf2y5wq3h4hd77rv6vffn5ic4sm" + "hash": "sha256-VRMWi3Vum53PaZDAgXnxwukINq8gaScRVfruMMtjVSY=" }, { "pname": "SkiaSharp.NativeAssets.Win32", "version": "2.88.0-preview.178", - "sha256": "0ficil702lv3fvwpngbqh5l85i05l5jafzyh4jprzshr2qbnd8nl" + "hash": "sha256-1KJmFxYZ6p+vJNB/p2ShBcSCaIF4PXv5dmNTAQ6NLDo=" + }, + { + "pname": "System.AppContext", + "version": "4.1.0", + "hash": "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs=" + }, + { + "pname": "System.AppContext", + "version": "4.3.0", + "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=" + }, + { + "pname": "System.Buffers", + "version": "4.0.0", + "hash": "sha256-+YUymoyS0O+xVyF2+LiAdZlMww8nofPN4ja9ylYqRo8=" }, { "pname": "System.Buffers", "version": "4.3.0", - "sha256": "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy" - }, - { - "pname": "System.Buffers", - "version": "4.4.0", - "sha256": "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19" - }, - { - "pname": "System.Buffers", - "version": "4.5.1", - "sha256": "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3" + "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" }, { "pname": "System.Collections", "version": "4.0.11", - "sha256": "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6" + "hash": "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0=" }, { "pname": "System.Collections", "version": "4.3.0", - "sha256": "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9" + "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" }, { "pname": "System.Collections.Concurrent", "version": "4.0.12", - "sha256": "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc" + "hash": "sha256-zIEM7AB4SyE9u6G8+o+gCLLwkgi6+3rHQVPdn/dEwB8=" + }, + { + "pname": "System.Collections.Concurrent", + "version": "4.3.0", + "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" }, { "pname": "System.Collections.Immutable", "version": "1.5.0", - "sha256": "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06" + "hash": "sha256-BliqYlL9ntbMXo5d7NUrKXwYN+PqdyqDIS5bp4qVr7Q=" }, { "pname": "System.Collections.Immutable", "version": "1.6.0", - "sha256": "1pbxzdz3pwqyybzv5ff2b7nrc281bhg7hq34w0fn1w3qfgrbwyw2" + "hash": "sha256-gnu+8nN48GAd4GRgeB5cAQmW7VnCubL/8h7zO377fd0=" }, { "pname": "System.Collections.Immutable", "version": "5.0.0", - "sha256": "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r" + "hash": "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8=" }, { "pname": "System.ComponentModel.Annotations", "version": "4.5.0", - "sha256": "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p" + "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso=" }, { "pname": "System.ComponentModel.Composition", "version": "6.0.0", - "sha256": "16zfx5mivkkykp76krw8x68izmjf79ldfmn26k9x3m55lmp9i77c" + "hash": "sha256-7JyYbqWl1NHTNMJW12g6TtYfkemI52nOnX7OHWvp7ps=" }, { "pname": "System.Composition", "version": "6.0.0", - "sha256": "1p7hysns39cc24af6dwd4m48bqjsrr3clvi4aws152mh2fgyg50z" + "hash": "sha256-H5TnnxOwihI0VyRuykbOWuKFSCWNN+MUEYyloa328Nw=" }, { "pname": "System.Composition.AttributedModel", "version": "6.0.0", - "sha256": "1mqrblb0l65hw39d0hnspqcv85didpn4wbiwhfgj4784wzqx2w6k" + "hash": "sha256-03DR8ecEHSKfgzwuTuxtsRW0Gb7aQtDS4LAYChZdGdc=" }, { "pname": "System.Composition.Convention", "version": "6.0.0", - "sha256": "02km3yb94p1c4s7liyhkmda0g71zm1rc8ijsfmy4bnlkq15xjw3b" + "hash": "sha256-a3DZS8CT2kV8dVpGxHKoP5wHVKsT+kiPJixckpYfdQo=" }, { "pname": "System.Composition.Hosting", "version": "6.0.0", - "sha256": "0big5nk8c44rxp6cfykhk7rxvn2cgwa99w6c3v2a36adc3lj36ky" + "hash": "sha256-fpoh6WBNmaHEHszwlBR/TNjd85lwesfM7ZkQhqYtLy4=" }, { "pname": "System.Composition.Runtime", "version": "6.0.0", - "sha256": "0vq5ik63yii1784gsa2f2kx9w6xllmm8b8rk0arid1jqdj1nyrlw" + "hash": "sha256-nGZvg2xYhhazAjOjhWqltBue+hROKP0IOiFGP8yMBW8=" }, { "pname": "System.Composition.TypedParts", "version": "6.0.0", - "sha256": "0y9pq3y60nyrpfy51f576a0qjjdh61mcv8vnik32pm4bz56h9q72" + "hash": "sha256-4uAETfmL1CvGjHajzWowsEmJgTKnuFC8u9lbYPzAN3k=" + }, + { + "pname": "System.Console", + "version": "4.0.0", + "hash": "sha256-jtZfT/TpJtLisV/y5Mk3IfCpE79zwhBYXtyGP9jC3Xo=" + }, + { + "pname": "System.Console", + "version": "4.3.0", + "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=" }, { "pname": "System.Diagnostics.Debug", "version": "4.0.11", - "sha256": "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz" + "hash": "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4=" }, { "pname": "System.Diagnostics.Debug", "version": "4.3.0", - "sha256": "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y" + "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" + }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "4.0.0", + "hash": "sha256-dYh9UoFesuGcHY+ewsI+z2WnNy+bwHPsHQ3t85cbzNg=" + }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "4.3.0", + "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" }, { "pname": "System.Diagnostics.Process", "version": "4.1.0", - "sha256": "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s" + "hash": "sha256-OgW6ogQ+oYADYS0PHmwXdhrOKQJpqXlwzSvmfjTLNBg=" }, { "pname": "System.Diagnostics.Tools", "version": "4.0.1", - "sha256": "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x" + "hash": "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U=" + }, + { + "pname": "System.Diagnostics.Tools", + "version": "4.3.0", + "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y=" }, { "pname": "System.Diagnostics.Tracing", "version": "4.1.0", - "sha256": "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394" + "hash": "sha256-JA0jJcLbU3zh52ub3zweob2EVHvxOqiC6SCYHrY5WbQ=" }, { "pname": "System.Diagnostics.Tracing", "version": "4.3.0", - "sha256": "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4" + "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" }, { "pname": "System.Drawing.Common", "version": "4.5.0", - "sha256": "0knqa0zsm91nfr34br8gx5kjqq4v81zdhqkacvs2hzc8nqk0ddhc" + "hash": "sha256-DLYGJraIfSj0Zmpi2H5Am2AsZ+kP5UVGdjakqj9Q2E4=" }, { "pname": "System.Dynamic.Runtime", "version": "4.0.11", - "sha256": "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9" + "hash": "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4=" }, { "pname": "System.Dynamic.Runtime", "version": "4.3.0", - "sha256": "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk" + "hash": "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU=" }, { "pname": "System.Globalization", "version": "4.0.11", - "sha256": "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d" + "hash": "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw=" }, { "pname": "System.Globalization", "version": "4.3.0", - "sha256": "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki" + "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" + }, + { + "pname": "System.Globalization.Calendars", + "version": "4.0.1", + "hash": "sha256-EJN3LbN+b0O9Dr2eg7kfThCYpne0iJ/H/GIyUTNVYC8=" + }, + { + "pname": "System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" + }, + { + "pname": "System.Globalization.Extensions", + "version": "4.0.1", + "hash": "sha256-zLtkPryJwqTGcJqMC6zoMMvMrT+aAL5GoumjmMtqUEI=" + }, + { + "pname": "System.Globalization.Extensions", + "version": "4.3.0", + "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" }, { "pname": "System.IO", "version": "4.1.0", - "sha256": "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp" + "hash": "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw=" }, { "pname": "System.IO", "version": "4.3.0", - "sha256": "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f" + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" }, { "pname": "System.IO.Compression", "version": "4.3.0", - "sha256": "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz" + "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA=" + }, + { + "pname": "System.IO.Compression.ZipFile", + "version": "4.0.1", + "hash": "sha256-An0Twb9JODl/nuVm6MR0kJ3aj4WxGpI/1/vVp5b94kA=" + }, + { + "pname": "System.IO.Compression.ZipFile", + "version": "4.3.0", + "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=" }, { "pname": "System.IO.FileSystem", "version": "4.0.1", - "sha256": "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1" + "hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0=" }, { "pname": "System.IO.FileSystem", "version": "4.3.0", - "sha256": "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw" + "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" }, { "pname": "System.IO.FileSystem.Primitives", "version": "4.0.1", - "sha256": "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612" + "hash": "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg=" }, { "pname": "System.IO.FileSystem.Primitives", "version": "4.3.0", - "sha256": "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c" + "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" }, { "pname": "System.Linq", "version": "4.1.0", - "sha256": "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5" + "hash": "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794=" }, { "pname": "System.Linq", "version": "4.3.0", - "sha256": "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7" + "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" }, { "pname": "System.Linq.Expressions", "version": "4.1.0", - "sha256": "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg" + "hash": "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4=" }, { "pname": "System.Linq.Expressions", "version": "4.3.0", - "sha256": "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv" + "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=" }, { "pname": "System.Memory", "version": "4.5.3", - "sha256": "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a" + "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk=" }, { - "pname": "System.Memory", - "version": "4.5.4", - "sha256": "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y" + "pname": "System.Net.Http", + "version": "4.1.0", + "hash": "sha256-y6PnGuObJvOkhl9CXNFJQcV3SXuEz5yRLOCxGGTEucQ=" }, { - "pname": "System.Numerics.Vectors", - "version": "4.4.0", - "sha256": "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba" + "pname": "System.Net.Http", + "version": "4.3.0", + "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q=" + }, + { + "pname": "System.Net.NameResolution", + "version": "4.3.0", + "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c=" + }, + { + "pname": "System.Net.Primitives", + "version": "4.0.11", + "hash": "sha256-2YSijNhCdw/ZU2yfH7vE+ReA8pgxRCXPnWr+ab36v4M=" + }, + { + "pname": "System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=" + }, + { + "pname": "System.Net.Sockets", + "version": "4.1.0", + "hash": "sha256-muK7oXIX7ykqhXskuUt0KX6Hzg5VogJhUS0JiOB2BY0=" + }, + { + "pname": "System.Net.Sockets", + "version": "4.3.0", + "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=" }, { "pname": "System.Numerics.Vectors", "version": "4.5.0", - "sha256": "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59" + "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" }, { "pname": "System.ObjectModel", "version": "4.0.12", - "sha256": "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj" + "hash": "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s=" }, { "pname": "System.ObjectModel", "version": "4.3.0", - "sha256": "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2" + "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=" }, { "pname": "System.Private.Uri", "version": "4.3.0", - "sha256": "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx" + "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" }, { "pname": "System.Reactive", "version": "5.0.0", - "sha256": "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik" + "hash": "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE=" }, { "pname": "System.Reflection", "version": "4.1.0", - "sha256": "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9" + "hash": "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs=" }, { "pname": "System.Reflection", "version": "4.3.0", - "sha256": "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m" + "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" }, { "pname": "System.Reflection.Emit", "version": "4.0.1", - "sha256": "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp" + "hash": "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk=" }, { "pname": "System.Reflection.Emit", "version": "4.3.0", - "sha256": "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74" + "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" }, { "pname": "System.Reflection.Emit", "version": "4.7.0", - "sha256": "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp" + "hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg=" }, { "pname": "System.Reflection.Emit.ILGeneration", "version": "4.0.1", - "sha256": "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0" + "hash": "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0=" }, { "pname": "System.Reflection.Emit.ILGeneration", "version": "4.3.0", - "sha256": "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q" - }, - { - "pname": "System.Reflection.Emit.ILGeneration", - "version": "4.7.0", - "sha256": "0l8jpxhpgjlf1nkz5lvp61r4kfdbhr29qi8aapcxn3izd9wd0j8r" + "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" }, { "pname": "System.Reflection.Emit.Lightweight", "version": "4.0.1", - "sha256": "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr" + "hash": "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g=" }, { "pname": "System.Reflection.Emit.Lightweight", "version": "4.3.0", - "sha256": "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c" + "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" }, { "pname": "System.Reflection.Extensions", "version": "4.0.1", - "sha256": "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn" + "hash": "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ=" }, { "pname": "System.Reflection.Extensions", "version": "4.3.0", - "sha256": "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq" + "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=" }, { "pname": "System.Reflection.Metadata", "version": "1.6.0", - "sha256": "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4" + "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=" }, { "pname": "System.Reflection.Metadata", "version": "5.0.0", - "sha256": "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss" + "hash": "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8=" }, { "pname": "System.Reflection.Primitives", "version": "4.0.1", - "sha256": "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28" + "hash": "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0=" }, { "pname": "System.Reflection.Primitives", "version": "4.3.0", - "sha256": "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276" + "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" }, { "pname": "System.Reflection.TypeExtensions", "version": "4.1.0", - "sha256": "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7" + "hash": "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4=" }, { "pname": "System.Reflection.TypeExtensions", "version": "4.3.0", - "sha256": "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1" + "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" }, { "pname": "System.Reflection.TypeExtensions", "version": "4.7.0", - "sha256": "04qw9km34pmzr2alckb3mqdb4fpqwlvzk59lg8c7jfidghcl4jqq" + "hash": "sha256-GEtCGXwtOnkYejSV+Tfl+DqyGq5jTUaVyL9eMupMHBM=" }, { "pname": "System.Resources.ResourceManager", "version": "4.0.1", - "sha256": "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi" + "hash": "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw=" }, { "pname": "System.Resources.ResourceManager", "version": "4.3.0", - "sha256": "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49" + "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" }, { "pname": "System.Runtime", "version": "4.1.0", - "sha256": "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m" + "hash": "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo=" }, { "pname": "System.Runtime", "version": "4.3.0", - "sha256": "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7" + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" }, { "pname": "System.Runtime", "version": "4.3.1", - "sha256": "03ch4d2acf6q037a4njxpll2kkx3dwzlg07yxr4z5m6j1kqgmm27" + "hash": "sha256-R9T68AzS1PJJ7v6ARz9vo88pKL1dWqLOANg4pkQjkA0=" }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "4.5.2", - "sha256": "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.5.3", - "sha256": "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln" + "hash": "sha256-8eUXXGWO2LL7uATMZye2iCpQOETn2jCcjUhG6coR5O8=" }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "4.6.0", - "sha256": "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m" + "hash": "sha256-FTjQeMuvqnKxpoVsVh/OlQ21NMaZiFtOdv7VdZ+Iv3Y=" }, { "pname": "System.Runtime.Extensions", "version": "4.1.0", - "sha256": "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z" + "hash": "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc=" }, { "pname": "System.Runtime.Extensions", "version": "4.3.0", - "sha256": "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60" + "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" }, { "pname": "System.Runtime.Extensions", "version": "4.3.1", - "sha256": "1bzkwqm1yhvm70yq2bx2s3mqfx2lr01sqsay8cl5n5xcbq07ynf6" + "hash": "sha256-xll/AF6sF1soQ15prAPIVHSH69CiL4E9OHVDHyrm868=" }, { "pname": "System.Runtime.Handles", "version": "4.0.1", - "sha256": "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g" + "hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w=" }, { "pname": "System.Runtime.Handles", "version": "4.3.0", - "sha256": "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8" + "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" }, { "pname": "System.Runtime.InteropServices", "version": "4.1.0", - "sha256": "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1" + "hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY=" }, { "pname": "System.Runtime.InteropServices", "version": "4.3.0", - "sha256": "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j" + "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" }, { - "pname": "System.Runtime.InteropServices.WindowsRuntime", + "pname": "System.Runtime.InteropServices.RuntimeInformation", + "version": "4.0.0", + "hash": "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4=" + }, + { + "pname": "System.Runtime.InteropServices.RuntimeInformation", "version": "4.3.0", - "sha256": "0bpsy91yqm2ryp5y9li8p6yh4yrxcvg9zvm569ifw25rpy67bgp9" + "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=" }, { "pname": "System.Runtime.Numerics", "version": "4.0.1", - "sha256": "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn" + "hash": "sha256-1pJt5ZGxLPTX1mjOi8qZPXyyOMkYV0NstoUCv91HYPg=" + }, + { + "pname": "System.Runtime.Numerics", + "version": "4.3.0", + "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" }, { "pname": "System.Runtime.Serialization.Primitives", "version": "4.1.1", - "sha256": "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k" + "hash": "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA=" }, { "pname": "System.Security.AccessControl", "version": "5.0.0", - "sha256": "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r" + "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" + }, + { + "pname": "System.Security.Claims", + "version": "4.3.0", + "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks=" }, { "pname": "System.Security.Cryptography.Algorithms", "version": "4.2.0", - "sha256": "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85" + "hash": "sha256-BelNIpEyToEp/VYKnje/q1P7KNEpQNtOzGPU18pLGpE=" + }, + { + "pname": "System.Security.Cryptography.Algorithms", + "version": "4.3.0", + "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" + }, + { + "pname": "System.Security.Cryptography.Cng", + "version": "4.2.0", + "hash": "sha256-7F+m3HnmBsgE4xWF8FeCGlaEgQM3drqA6HEaQr6MEoU=" + }, + { + "pname": "System.Security.Cryptography.Cng", + "version": "4.3.0", + "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" + }, + { + "pname": "System.Security.Cryptography.Csp", + "version": "4.0.0", + "hash": "sha256-WHyR6vVK3zaT4De7jgQFUar1P5fiX9ECwiVkJDFFm7M=" + }, + { + "pname": "System.Security.Cryptography.Csp", + "version": "4.3.0", + "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" }, { "pname": "System.Security.Cryptography.Encoding", "version": "4.0.0", - "sha256": "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4" + "hash": "sha256-ZO7ha39J5uHkIF2RoEKv/bW/bLbVvYMO4+rWyYsKHik=" + }, + { + "pname": "System.Security.Cryptography.Encoding", + "version": "4.3.0", + "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" + }, + { + "pname": "System.Security.Cryptography.OpenSsl", + "version": "4.0.0", + "hash": "sha256-mLijAozynzjiOMyh2P5BHcfVq3Ovd0T/phG08SIbXZs=" + }, + { + "pname": "System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" }, { "pname": "System.Security.Cryptography.Primitives", "version": "4.0.0", - "sha256": "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh" + "hash": "sha256-sEdPftfTxQd/8DpdpqUZC2XWC0SjVCPqAkEleLl17EQ=" + }, + { + "pname": "System.Security.Cryptography.Primitives", + "version": "4.3.0", + "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" + }, + { + "pname": "System.Security.Cryptography.X509Certificates", + "version": "4.1.0", + "hash": "sha256-sBUUhJP+yYDXvcjNMKqNpn8yzGUpVABwK9vVUvYKjzI=" + }, + { + "pname": "System.Security.Cryptography.X509Certificates", + "version": "4.3.0", + "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" + }, + { + "pname": "System.Security.Principal", + "version": "4.3.0", + "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "4.3.0", + "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=" }, { "pname": "System.Security.Principal.Windows", "version": "4.7.0", - "sha256": "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d" + "hash": "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg=" }, { "pname": "System.Security.Principal.Windows", "version": "5.0.0", - "sha256": "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8" + "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" }, { "pname": "System.Text.Encoding", "version": "4.0.11", - "sha256": "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw" + "hash": "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc=" }, { "pname": "System.Text.Encoding", "version": "4.3.0", - "sha256": "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr" + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" }, { "pname": "System.Text.Encoding.CodePages", "version": "4.5.1", - "sha256": "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w" + "hash": "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw=" }, { "pname": "System.Text.Encoding.Extensions", "version": "4.3.0", - "sha256": "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy" + "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" }, { "pname": "System.Text.RegularExpressions", "version": "4.1.0", - "sha256": "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7" + "hash": "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c=" }, { "pname": "System.Text.RegularExpressions", "version": "4.3.0", - "sha256": "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l" + "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0=" }, { "pname": "System.Threading", "version": "4.0.11", - "sha256": "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls" + "hash": "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac=" }, { "pname": "System.Threading", "version": "4.3.0", - "sha256": "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34" + "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" }, { "pname": "System.Threading.Tasks", "version": "4.0.11", - "sha256": "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5" + "hash": "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs=" }, { "pname": "System.Threading.Tasks", "version": "4.3.0", - "sha256": "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7" + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" }, { "pname": "System.Threading.Tasks.Dataflow", "version": "5.0.0", - "sha256": "028fimgwn5j9fv6m547c975a8b90d9qcnb89k5crjyspsnjcqbhy" + "hash": "sha256-Hi7MpNVXe5lZmQkty3BqIC2kyknskFLNdkkWy1+NDgk=" }, { "pname": "System.Threading.Tasks.Extensions", "version": "4.0.0", - "sha256": "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr" + "hash": "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE=" }, { "pname": "System.Threading.Tasks.Extensions", "version": "4.3.0", - "sha256": "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z" + "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=" }, { "pname": "System.Threading.Tasks.Extensions", "version": "4.5.3", - "sha256": "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.5.4", - "sha256": "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153" + "hash": "sha256-8TglbC6KBHlDeSfgr6d5dGn7wu8td4XERl2JUyo0+Tw=" }, { "pname": "System.Threading.Thread", "version": "4.0.0", - "sha256": "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc" + "hash": "sha256-7EtSJuKqcW107FYA5Ko9NFXEWUPIzNDtlfKaQV2pvb8=" }, { "pname": "System.Threading.ThreadPool", "version": "4.0.10", - "sha256": "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx" + "hash": "sha256-/fowWjM/0ZZFC1Rwu0i5N71iRxV2JOd3jQV2Jn0wuTk=" + }, + { + "pname": "System.Threading.ThreadPool", + "version": "4.3.0", + "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=" + }, + { + "pname": "System.Threading.Timer", + "version": "4.0.1", + "hash": "sha256-5lU6zt1O9JDSPr2KAHw4BYgysHnt0yyZrMNa5IIjxZY=" + }, + { + "pname": "System.Threading.Timer", + "version": "4.3.0", + "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=" }, { "pname": "System.ValueTuple", "version": "4.5.0", - "sha256": "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy" + "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=" }, { "pname": "System.Xml.ReaderWriter", "version": "4.0.11", - "sha256": "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5" + "hash": "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA=" + }, + { + "pname": "System.Xml.ReaderWriter", + "version": "4.3.0", + "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA=" }, { "pname": "System.Xml.ReaderWriter", "version": "4.3.1", - "sha256": "15f9vd7r0bxmyv754238bdckfg6sxaa3d4yx71hdzkz9k0mhjcky" + "hash": "sha256-fjIJK5jpz99gON2TNpTq2jw3WVtoCFLO9rUvkE/byZU=" }, { "pname": "System.Xml.XDocument", "version": "4.0.11", - "sha256": "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18" + "hash": "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg=" + }, + { + "pname": "System.Xml.XDocument", + "version": "4.3.0", + "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI=" }, { "pname": "Tmds.DBus", "version": "0.9.0", - "sha256": "0vvx6sg8lxm23g5jvm5wh2gfs95mv85vd52lkq7d1b89bdczczf3" + "hash": "sha256-w332WVsJrdAOnlSUtgvatSTtnoC81C3LG6J2ip42fW8=" } ] diff --git a/pkgs/applications/misc/avalonia-ilspy/dotnet-8-upgrade.patch b/pkgs/applications/misc/avalonia-ilspy/dotnet-8-upgrade.patch new file mode 100644 index 000000000000..60aa5abcb46f --- /dev/null +++ b/pkgs/applications/misc/avalonia-ilspy/dotnet-8-upgrade.patch @@ -0,0 +1,64 @@ +diff --git a/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj b/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj +index 397e0e5..dfa385c 100644 +--- a/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj ++++ b/ICSharpCode.Decompiler.PdbProvider.Cecil/ICSharpCode.Decompiler.PdbProvider.Cecil.csproj +@@ -1,7 +1,7 @@ +  + + +- netstandard2.0 ++ net8.0 + 7.2 + true + +diff --git a/ILSpy.Core/ILSpy.Core.csproj b/ILSpy.Core/ILSpy.Core.csproj +index cd6d5e2..d725817 100644 +--- a/ILSpy.Core/ILSpy.Core.csproj ++++ b/ILSpy.Core/ILSpy.Core.csproj +@@ -2,7 +2,7 @@ + + + +- netstandard2.0 ++ net8.0 + False + false + True +diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj +index 4deb56f..b9813ba 100644 +--- a/ILSpy/ILSpy.csproj ++++ b/ILSpy/ILSpy.csproj +@@ -1,7 +1,7 @@ +  + + +- net6.0 ++ net8.0 + WinExe + + true +diff --git a/SharpTreeView/SharpTreeView.csproj b/SharpTreeView/SharpTreeView.csproj +index d6f46c5..4183ffd 100644 +--- a/SharpTreeView/SharpTreeView.csproj ++++ b/SharpTreeView/SharpTreeView.csproj +@@ -1,6 +1,6 @@ +  + +- netstandard2.0 ++ net8.0 + False + false + True +diff --git a/TestPlugin/TestPlugin.csproj b/TestPlugin/TestPlugin.csproj +index 453a3ef..806f375 100644 +--- a/TestPlugin/TestPlugin.csproj ++++ b/TestPlugin/TestPlugin.csproj +@@ -2,7 +2,7 @@ + + + +- netstandard2.0 ++ net8.0 + Test.Plugin + + False From 9255bc2d41bcde82eac88d866fd3d4a504422955 Mon Sep 17 00:00:00 2001 From: GGG Date: Tue, 17 Dec 2024 22:36:30 -0300 Subject: [PATCH 44/60] clr-loader: upgrade to .NET 8 --- .../python-modules/clr-loader/default.nix | 21 ++++++++++--- .../python-modules/clr-loader/deps.json | 12 +++---- .../clr-loader/dotnet-8-upgrade.patch | 31 +++++++++++++++++++ 3 files changed, 53 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/python-modules/clr-loader/dotnet-8-upgrade.patch diff --git a/pkgs/development/python-modules/clr-loader/default.nix b/pkgs/development/python-modules/clr-loader/default.nix index 87316f6deeaa..9b34590b5909 100644 --- a/pkgs/development/python-modules/clr-loader/default.nix +++ b/pkgs/development/python-modules/clr-loader/default.nix @@ -19,31 +19,42 @@ let inherit version; hash = "sha256-AZNIrmtqg8ekBtFFN8J3zs96OlOyY+w0LIHe1YRaZ+4="; }; + patches = [ ./dotnet-8-upgrade.patch ]; # This buildDotnetModule is used only to get nuget sources, the actual # build is done in `buildPythonPackage` below. dotnet-build = buildDotnetModule { - inherit pname version src; + inherit + pname + version + src + patches + ; projectFile = [ "netfx_loader/ClrLoader.csproj" "example/example.csproj" ]; nugetDeps = ./deps.json; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; }; in buildPythonPackage { - inherit pname version src; + inherit + pname + version + src + patches + ; format = "pyproject"; - buildInputs = dotnetCorePackages.sdk_6_0.packages ++ dotnet-build.nugetDeps; + buildInputs = dotnetCorePackages.sdk_8_0.packages ++ dotnet-build.nugetDeps; nativeBuildInputs = [ setuptools setuptools-scm wheel - dotnetCorePackages.sdk_6_0 + dotnetCorePackages.sdk_8_0 ]; propagatedBuildInputs = [ cffi ]; diff --git a/pkgs/development/python-modules/clr-loader/deps.json b/pkgs/development/python-modules/clr-loader/deps.json index ba094f13d934..f787d633257a 100644 --- a/pkgs/development/python-modules/clr-loader/deps.json +++ b/pkgs/development/python-modules/clr-loader/deps.json @@ -2,31 +2,31 @@ { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.0", - "sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm" + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" }, { "pname": "Microsoft.NETFramework.ReferenceAssemblies", "version": "1.0.0", - "sha256": "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9" + "hash": "sha256-6faPQ4jaFY3OGGVk3lZKW+DEZaIOBZ/wHqbiDTsRR1k=" }, { "pname": "Microsoft.NETFramework.ReferenceAssemblies.net461", "version": "1.0.0", - "sha256": "00vkn4c6i0rn1l9pv912y0wgb9h6ks76qah8hvk441nari8fqbm1" + "hash": "sha256-oS7sUMzKBkLmhggqbI6eBqb1OPAipH0TDTaDaBixcwM=" }, { "pname": "Microsoft.NETFramework.ReferenceAssemblies.net47", "version": "1.0.0", - "sha256": "00v56phfn01ahf4fq7zanz6hjyzpp00hkkk4a190l0dywrv387i6" + "hash": "sha256-Jh40dua+AQpSUGTOCQG493sJzbfqH+yIgyoA6+A1ZQM=" }, { "pname": "NETStandard.Library", "version": "2.0.3", - "sha256": "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y" + "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=" }, { "pname": "NXPorts", "version": "1.0.0", - "sha256": "02zva596c3vsnlhi1b1391vbfl8a6142dvm61r8j1c70b07916lj" + "hash": "sha256-kpqQDljgsCBRDqbuJkgwClG3dkgjrBAhtXoPZlJR+ws=" } ] diff --git a/pkgs/development/python-modules/clr-loader/dotnet-8-upgrade.patch b/pkgs/development/python-modules/clr-loader/dotnet-8-upgrade.patch new file mode 100644 index 000000000000..d261dfc9e3cc --- /dev/null +++ b/pkgs/development/python-modules/clr-loader/dotnet-8-upgrade.patch @@ -0,0 +1,31 @@ +diff --git a/example/example.csproj b/example/example.csproj +index fd6d566..ed76d15 100644 +--- a/example/example.csproj ++++ b/example/example.csproj +@@ -1,6 +1,6 @@ +  + +- net60;netstandard20 ++ net8.0;netstandard2.0 + true + + +diff --git a/tests/test_common.py b/tests/test_common.py +index 8a9e36d..8370024 100644 +--- a/tests/test_common.py ++++ b/tests/test_common.py +@@ -8,12 +8,12 @@ from pathlib import Path + + @pytest.fixture(scope="session") + def example_netstandard(tmpdir_factory): +- return build_example(tmpdir_factory, "netstandard20") ++ return build_example(tmpdir_factory, "netstandard2.0") + + + @pytest.fixture(scope="session") + def example_netcore(tmpdir_factory): +- return build_example(tmpdir_factory, "net60") ++ return build_example(tmpdir_factory, "net8.0") + + + def build_example(tmpdir_factory, framework): From 4d1c3d85347cc703cf4e21fa5238f86114684842 Mon Sep 17 00:00:00 2001 From: GGG Date: Tue, 17 Dec 2024 22:59:38 -0300 Subject: [PATCH 45/60] dafny: upgrade to .NET 8 --- pkgs/by-name/da/dafny/package.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/da/dafny/package.nix b/pkgs/by-name/da/dafny/package.nix index 54f88b7b36c6..6ff063fdc4b5 100644 --- a/pkgs/by-name/da/dafny/package.nix +++ b/pkgs/by-name/da/dafny/package.nix @@ -65,11 +65,18 @@ buildDotnetModule rec { # frameworks, you must specify the framework for the published # application." substituteInPlace Source/DafnyRuntime/DafnyRuntime.csproj \ - --replace-warn TargetFrameworks TargetFramework \ - --replace-warn "netstandard2.0;net452" net6.0 + --replace-fail TargetFrameworks TargetFramework \ + --replace-fail "netstandard2.0;net452" net8.0 + + for f in Source/**/*.csproj ; do + [[ "$f" == "Source/DafnyRuntime/DafnyRuntime.csproj" ]] && continue; + + substituteInPlace $f \ + --replace-fail net6.0 net8.0 + done ''; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; nativeBuildInputs = [ jdk11 ]; nugetDeps = ./deps.json; From 59d969cf96b389c2e97c4894836590d8042ace6a Mon Sep 17 00:00:00 2001 From: GGG Date: Tue, 17 Dec 2024 23:19:17 -0300 Subject: [PATCH 46/60] formula: format file --- pkgs/by-name/fo/formula/package.nix | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/fo/formula/package.nix b/pkgs/by-name/fo/formula/package.nix index df3141e0184e..441724118885 100644 --- a/pkgs/by-name/fo/formula/package.nix +++ b/pkgs/by-name/fo/formula/package.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, buildDotnetModule, dotnetCorePackages, unstableGitUpdater }: +{ + lib, + stdenv, + fetchFromGitHub, + buildDotnetModule, + dotnetCorePackages, + unstableGitUpdater, +}: buildDotnetModule rec { pname = "formula-dotnet"; @@ -15,13 +22,17 @@ buildDotnetModule rec { nugetDeps = ./nuget.json; projectFile = "Src/CommandLine/CommandLine.csproj"; - postFixup = if stdenv.hostPlatform.isLinux then '' - mv $out/bin/CommandLine $out/bin/formula - '' else lib.optionalString stdenv.hostPlatform.isDarwin '' - makeWrapper ${dotnetCorePackages.runtime_6_0}/bin/dotnet $out/bin/formula \ - --add-flags "$out/lib/formula-dotnet/CommandLine.dll" \ - --prefix DYLD_LIBRARY_PATH : $out/lib/formula-dotnet/runtimes/macos/native - ''; + postFixup = + if stdenv.hostPlatform.isLinux then + '' + mv $out/bin/CommandLine $out/bin/formula + '' + else + lib.optionalString stdenv.hostPlatform.isDarwin '' + makeWrapper ${dotnetCorePackages.runtime_6_0}/bin/dotnet $out/bin/formula \ + --add-flags "$out/lib/formula-dotnet/CommandLine.dll" \ + --prefix DYLD_LIBRARY_PATH : $out/lib/formula-dotnet/runtimes/macos/native + ''; passthru.updateScript = unstableGitUpdater { url = meta.homepage; }; From 9429734a01f51a590db7fd90e615d551540956a9 Mon Sep 17 00:00:00 2001 From: GGG Date: Tue, 17 Dec 2024 23:40:55 -0300 Subject: [PATCH 47/60] formula: upgrade to .NET 8 --- .../by-name/fo/formula/dotnet-8-upgrade.patch | 65 ++++++ pkgs/by-name/fo/formula/nuget.json | 212 +++++++++--------- pkgs/by-name/fo/formula/package.nix | 14 +- 3 files changed, 179 insertions(+), 112 deletions(-) create mode 100644 pkgs/by-name/fo/formula/dotnet-8-upgrade.patch diff --git a/pkgs/by-name/fo/formula/dotnet-8-upgrade.patch b/pkgs/by-name/fo/formula/dotnet-8-upgrade.patch new file mode 100644 index 000000000000..45c654635a89 --- /dev/null +++ b/pkgs/by-name/fo/formula/dotnet-8-upgrade.patch @@ -0,0 +1,65 @@ +diff --git a/Src/CommandLine/CommandLine.csproj b/Src/CommandLine/CommandLine.csproj +index 2b6a4fe..5eee8c7 100644 +--- a/Src/CommandLine/CommandLine.csproj ++++ b/Src/CommandLine/CommandLine.csproj +@@ -2,7 +2,7 @@ + + + Exe +- net6.0 ++ net8.0 + AnyCPU;x64 + + +diff --git a/Src/Core/Core.csproj b/Src/Core/Core.csproj +index 8e79a00..db64e3a 100644 +--- a/Src/Core/Core.csproj ++++ b/Src/Core/Core.csproj +@@ -2,7 +2,7 @@ + + + Library +- net6.0 ++ net8.0 + + + AnyCPU;x64 +diff --git a/Src/Extensions/FormulaCodeGeneratorTask/FormulaCodeGeneratorTaskDotNet.csproj b/Src/Extensions/FormulaCodeGeneratorTask/FormulaCodeGeneratorTaskDotNet.csproj +index daa042d..9290c12 100644 +--- a/Src/Extensions/FormulaCodeGeneratorTask/FormulaCodeGeneratorTaskDotNet.csproj ++++ b/Src/Extensions/FormulaCodeGeneratorTask/FormulaCodeGeneratorTaskDotNet.csproj +@@ -2,7 +2,7 @@ + + + Library +- net6.0 ++ net8.0 + AnyCPU;x64 + + +diff --git a/Src/Kernel/InteractiveKernel/InteractiveKernel.csproj b/Src/Kernel/InteractiveKernel/InteractiveKernel.csproj +index ed3cde5..6c669cd 100644 +--- a/Src/Kernel/InteractiveKernel/InteractiveKernel.csproj ++++ b/Src/Kernel/InteractiveKernel/InteractiveKernel.csproj +@@ -17,7 +17,7 @@ + + + Exe +- net6.0 ++ net8.0 + enable + dotnet-formula + Microsoft.Jupyter.VUISIS.Formula +diff --git a/Src/Tests/Tests.csproj b/Src/Tests/Tests.csproj +index 8828a49..eebe401 100644 +--- a/Src/Tests/Tests.csproj ++++ b/Src/Tests/Tests.csproj +@@ -1,7 +1,7 @@ + + + +- net6.0 ++ net8.0 + + false + diff --git a/pkgs/by-name/fo/formula/nuget.json b/pkgs/by-name/fo/formula/nuget.json index 007951a96833..30605ef4480f 100644 --- a/pkgs/by-name/fo/formula/nuget.json +++ b/pkgs/by-name/fo/formula/nuget.json @@ -2,531 +2,531 @@ { "pname": "Antlr4.Runtime.Standard", "version": "4.7.2", - "sha256": "1pmrpsgqjfj0nzr1zqzk1m2fm0ynd4nklwq3dhvww08yjg5s0586" + "hash": "sha256-BhWgy5MeAc43bANzOi1p1oPqRA3z4x/yt0A6iZ++ud4=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.0", - "sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm" + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" }, { "pname": "Microsoft.NETCore.Targets", "version": "1.1.0", - "sha256": "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh" + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" }, { "pname": "Microsoft.Win32.Primitives", "version": "4.3.0", - "sha256": "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq" + "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" }, { "pname": "Microsoft.Z3.x64", "version": "4.8.7", - "sha256": "1wxlw29xm5x8vwji2s7gwk39wb88dkbpg76l9s9gq0hqpghwlmdz" + "hash": "sha256-v1XK4bsYAvySTtScd9dsCC2exuTvaBEl36iX2pPgtPM=" }, { "pname": "NETStandard.Library", "version": "1.6.1", - "sha256": "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8" + "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw=" }, { "pname": "runtime.any.System.Collections", "version": "4.3.0", - "sha256": "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0" + "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" }, { "pname": "runtime.any.System.Diagnostics.Tools", "version": "4.3.0", - "sha256": "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk" + "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I=" }, { "pname": "runtime.any.System.Diagnostics.Tracing", "version": "4.3.0", - "sha256": "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn" + "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" }, { "pname": "runtime.any.System.Globalization", "version": "4.3.0", - "sha256": "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x" + "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" }, { "pname": "runtime.any.System.Globalization.Calendars", "version": "4.3.0", - "sha256": "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201" + "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" }, { "pname": "runtime.any.System.IO", "version": "4.3.0", - "sha256": "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x" + "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" }, { "pname": "runtime.any.System.Reflection", "version": "4.3.0", - "sha256": "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly" + "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" }, { "pname": "runtime.any.System.Reflection.Extensions", "version": "4.3.0", - "sha256": "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33" + "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=" }, { "pname": "runtime.any.System.Reflection.Primitives", "version": "4.3.0", - "sha256": "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf" + "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" }, { "pname": "runtime.any.System.Resources.ResourceManager", "version": "4.3.0", - "sha256": "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl" + "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" }, { "pname": "runtime.any.System.Runtime", "version": "4.3.0", - "sha256": "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b" + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" }, { "pname": "runtime.any.System.Runtime.Handles", "version": "4.3.0", - "sha256": "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x" + "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" }, { "pname": "runtime.any.System.Runtime.InteropServices", "version": "4.3.0", - "sha256": "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19" + "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" }, { "pname": "runtime.any.System.Text.Encoding", "version": "4.3.0", - "sha256": "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3" + "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" }, { "pname": "runtime.any.System.Text.Encoding.Extensions", "version": "4.3.0", - "sha256": "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8" + "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=" }, { "pname": "runtime.any.System.Threading.Tasks", "version": "4.3.0", - "sha256": "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va" + "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" }, { "pname": "runtime.any.System.Threading.Timer", "version": "4.3.0", - "sha256": "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086" + "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs=" }, { "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d" + "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" }, { "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59" + "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" }, { "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa" + "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" }, { "pname": "runtime.native.System", "version": "4.3.0", - "sha256": "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4" + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" }, { "pname": "runtime.native.System.IO.Compression", "version": "4.3.0", - "sha256": "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d" + "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8=" }, { "pname": "runtime.native.System.Net.Http", "version": "4.3.0", - "sha256": "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk" + "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" }, { "pname": "runtime.native.System.Security.Cryptography.Apple", "version": "4.3.0", - "sha256": "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q" + "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" }, { "pname": "runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97" + "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" }, { "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3" + "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" }, { "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf" + "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" }, { "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", "version": "4.3.0", - "sha256": "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi" + "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" }, { "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3" + "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" }, { "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn" + "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" }, { "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3" + "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" }, { "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy" + "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" }, { "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5" + "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" }, { "pname": "runtime.unix.Microsoft.Win32.Primitives", "version": "4.3.0", - "sha256": "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id" + "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" }, { "pname": "runtime.unix.System.Console", "version": "4.3.0", - "sha256": "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80" + "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190=" }, { "pname": "runtime.unix.System.Diagnostics.Debug", "version": "4.3.0", - "sha256": "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5" + "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" }, { "pname": "runtime.unix.System.IO.FileSystem", "version": "4.3.0", - "sha256": "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix" + "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" }, { "pname": "runtime.unix.System.Net.Primitives", "version": "4.3.0", - "sha256": "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4" + "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" }, { "pname": "runtime.unix.System.Net.Sockets", "version": "4.3.0", - "sha256": "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12" + "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=" }, { "pname": "runtime.unix.System.Private.Uri", "version": "4.3.0", - "sha256": "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk" + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" }, { "pname": "runtime.unix.System.Runtime.Extensions", "version": "4.3.0", - "sha256": "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p" + "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" }, { "pname": "System.AppContext", "version": "4.3.0", - "sha256": "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya" + "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=" }, { "pname": "System.Buffers", "version": "4.3.0", - "sha256": "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy" + "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" }, { "pname": "System.Collections", "version": "4.3.0", - "sha256": "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9" + "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" }, { "pname": "System.Collections.Concurrent", "version": "4.3.0", - "sha256": "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8" + "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" }, { "pname": "System.Console", "version": "4.3.0", - "sha256": "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay" + "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=" }, { "pname": "System.Diagnostics.Debug", "version": "4.3.0", - "sha256": "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y" + "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" }, { "pname": "System.Diagnostics.DiagnosticSource", "version": "4.3.0", - "sha256": "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq" + "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" }, { "pname": "System.Diagnostics.Tools", "version": "4.3.0", - "sha256": "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1" + "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y=" }, { "pname": "System.Diagnostics.Tracing", "version": "4.3.0", - "sha256": "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4" + "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" }, { "pname": "System.Globalization", "version": "4.3.0", - "sha256": "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki" + "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" }, { "pname": "System.Globalization.Calendars", "version": "4.3.0", - "sha256": "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq" + "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" }, { "pname": "System.Globalization.Extensions", "version": "4.3.0", - "sha256": "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls" + "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" }, { "pname": "System.IO", "version": "4.3.0", - "sha256": "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f" + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" }, { "pname": "System.IO.Compression", "version": "4.3.0", - "sha256": "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz" + "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA=" }, { "pname": "System.IO.Compression.ZipFile", "version": "4.3.0", - "sha256": "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar" + "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=" }, { "pname": "System.IO.FileSystem", "version": "4.3.0", - "sha256": "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw" + "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" }, { "pname": "System.IO.FileSystem.Primitives", "version": "4.3.0", - "sha256": "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c" + "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" }, { "pname": "System.Linq", "version": "4.3.0", - "sha256": "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7" + "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" }, { "pname": "System.Linq.Expressions", "version": "4.3.0", - "sha256": "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv" + "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=" }, { "pname": "System.Net.Http", "version": "4.3.0", - "sha256": "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j" + "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q=" }, { "pname": "System.Net.NameResolution", "version": "4.3.0", - "sha256": "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq" + "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c=" }, { "pname": "System.Net.Primitives", "version": "4.3.0", - "sha256": "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii" + "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=" }, { "pname": "System.Net.Sockets", "version": "4.3.0", - "sha256": "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla" + "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=" }, { "pname": "System.ObjectModel", "version": "4.3.0", - "sha256": "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2" + "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=" }, { "pname": "System.Private.Uri", "version": "4.3.0", - "sha256": "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx" + "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" }, { "pname": "System.Reflection", "version": "4.3.0", - "sha256": "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m" + "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" }, { "pname": "System.Reflection.Emit", "version": "4.3.0", - "sha256": "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74" + "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" }, { "pname": "System.Reflection.Emit.ILGeneration", "version": "4.3.0", - "sha256": "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q" + "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" }, { "pname": "System.Reflection.Emit.Lightweight", "version": "4.3.0", - "sha256": "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c" + "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" }, { "pname": "System.Reflection.Extensions", "version": "4.3.0", - "sha256": "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq" + "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=" }, { "pname": "System.Reflection.Primitives", "version": "4.3.0", - "sha256": "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276" + "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" }, { "pname": "System.Reflection.TypeExtensions", "version": "4.3.0", - "sha256": "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1" + "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" }, { "pname": "System.Resources.ResourceManager", "version": "4.3.0", - "sha256": "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49" + "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" }, { "pname": "System.Runtime", "version": "4.3.0", - "sha256": "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7" + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" }, { "pname": "System.Runtime.Extensions", "version": "4.3.0", - "sha256": "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60" + "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" }, { "pname": "System.Runtime.Handles", "version": "4.3.0", - "sha256": "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8" + "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" }, { "pname": "System.Runtime.InteropServices", "version": "4.3.0", - "sha256": "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j" + "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" }, { "pname": "System.Runtime.InteropServices.RuntimeInformation", "version": "4.3.0", - "sha256": "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii" + "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=" }, { "pname": "System.Runtime.Numerics", "version": "4.3.0", - "sha256": "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z" + "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" }, { "pname": "System.Security.Claims", "version": "4.3.0", - "sha256": "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn" + "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks=" }, { "pname": "System.Security.Cryptography.Algorithms", "version": "4.3.0", - "sha256": "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml" + "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" }, { "pname": "System.Security.Cryptography.Cng", "version": "4.3.0", - "sha256": "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv" + "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" }, { "pname": "System.Security.Cryptography.Csp", "version": "4.3.0", - "sha256": "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1" + "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" }, { "pname": "System.Security.Cryptography.Encoding", "version": "4.3.0", - "sha256": "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32" + "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" }, { "pname": "System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc" + "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" }, { "pname": "System.Security.Cryptography.Primitives", "version": "4.3.0", - "sha256": "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby" + "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" }, { "pname": "System.Security.Cryptography.X509Certificates", "version": "4.3.0", - "sha256": "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h" + "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" }, { "pname": "System.Security.Principal", "version": "4.3.0", - "sha256": "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf" + "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk=" }, { "pname": "System.Security.Principal.Windows", "version": "4.3.0", - "sha256": "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr" + "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=" }, { "pname": "System.Text.Encoding", "version": "4.3.0", - "sha256": "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr" + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" }, { "pname": "System.Text.Encoding.Extensions", "version": "4.3.0", - "sha256": "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy" + "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" }, { "pname": "System.Text.RegularExpressions", "version": "4.3.0", - "sha256": "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l" + "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0=" }, { "pname": "System.Threading", "version": "4.3.0", - "sha256": "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34" + "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" }, { "pname": "System.Threading.Tasks", "version": "4.3.0", - "sha256": "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7" + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" }, { "pname": "System.Threading.Tasks.Extensions", "version": "4.3.0", - "sha256": "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z" + "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=" }, { "pname": "System.Threading.ThreadPool", "version": "4.3.0", - "sha256": "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1" + "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=" }, { "pname": "System.Threading.Timer", "version": "4.3.0", - "sha256": "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56" + "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=" }, { "pname": "System.Xml.ReaderWriter", "version": "4.3.0", - "sha256": "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1" + "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA=" }, { "pname": "System.Xml.XDocument", "version": "4.3.0", - "sha256": "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd" + "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI=" } ] diff --git a/pkgs/by-name/fo/formula/package.nix b/pkgs/by-name/fo/formula/package.nix index 441724118885..08fde7877db4 100644 --- a/pkgs/by-name/fo/formula/package.nix +++ b/pkgs/by-name/fo/formula/package.nix @@ -7,7 +7,7 @@ unstableGitUpdater, }: -buildDotnetModule rec { +buildDotnetModule (finalAttrs: { pname = "formula-dotnet"; version = "2.0"; @@ -15,10 +15,12 @@ buildDotnetModule rec { owner = "VUISIS"; repo = "formula-dotnet"; rev = "8ee2e6abfd4ce038e1d9cb9c8602dec1ed6c0163"; - sha256 = "sha256-2ulv//YV3OqrfFltgUCeDe4rOPC0qqJ+80/D2lIoih8="; + hash = "sha256-2ulv//YV3OqrfFltgUCeDe4rOPC0qqJ+80/D2lIoih8="; }; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + patches = [ ./dotnet-8-upgrade.patch ]; + + dotnet-sdk = dotnetCorePackages.sdk_8_0; nugetDeps = ./nuget.json; projectFile = "Src/CommandLine/CommandLine.csproj"; @@ -29,12 +31,12 @@ buildDotnetModule rec { '' else lib.optionalString stdenv.hostPlatform.isDarwin '' - makeWrapper ${dotnetCorePackages.runtime_6_0}/bin/dotnet $out/bin/formula \ + makeWrapper ${dotnetCorePackages.runtime_8_0}/bin/dotnet $out/bin/formula \ --add-flags "$out/lib/formula-dotnet/CommandLine.dll" \ --prefix DYLD_LIBRARY_PATH : $out/lib/formula-dotnet/runtimes/macos/native ''; - passthru.updateScript = unstableGitUpdater { url = meta.homepage; }; + passthru.updateScript = unstableGitUpdater { url = finalAttrs.meta.homepage; }; meta = with lib; { description = "Formal Specifications for Verification and Synthesis"; @@ -44,4 +46,4 @@ buildDotnetModule rec { platforms = platforms.unix; mainProgram = "formula"; }; -} +}) From 1d9621816f3b921de17eb0f4de3a29e9832133b7 Mon Sep 17 00:00:00 2001 From: GGG Date: Tue, 17 Dec 2024 23:52:34 -0300 Subject: [PATCH 48/60] ilspycmd: format file and switch to finalAttrs --- pkgs/development/tools/ilspycmd/default.nix | 44 ++++++++++++--------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/pkgs/development/tools/ilspycmd/default.nix b/pkgs/development/tools/ilspycmd/default.nix index 8527fb7dfdfc..c25155dbdfda 100644 --- a/pkgs/development/tools/ilspycmd/default.nix +++ b/pkgs/development/tools/ilspycmd/default.nix @@ -1,13 +1,14 @@ -{ lib -, stdenv -, fetchFromGitHub -, buildDotnetModule -, dotnetCorePackages -, powershell -, autoSignDarwinBinariesHook -, glibcLocales +{ + lib, + stdenv, + fetchFromGitHub, + buildDotnetModule, + dotnetCorePackages, + powershell, + autoSignDarwinBinariesHook, + glibcLocales, }: -buildDotnetModule rec { +buildDotnetModule (finalAttrs: rec { pname = "ilspycmd"; version = "8.0"; @@ -18,9 +19,13 @@ buildDotnetModule rec { hash = "sha256-ERBYXgpBRXISfqBSBEydEQuD/5T1dvJ+wNg2U5pKip4="; }; - nativeBuildInputs = [ - powershell - ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ]; + nativeBuildInputs = + [ + powershell + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + autoSignDarwinBinariesHook + ]; # https://github.com/NixOS/nixpkgs/issues/38991 # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) @@ -35,18 +40,21 @@ buildDotnetModule rec { # see: https://github.com/tunnelvisionlabs/ReferenceAssemblyAnnotator/issues/94 linkNugetPackages = true; - meta = with lib; { + meta = { description = "Tool for decompiling .NET assemblies and generating portable PDBs"; mainProgram = "ilspycmd"; homepage = "https://github.com/icsharpcode/ILSpy"; - changelog = "https://github.com/icsharpcode/ILSpy/releases/tag/${src.rev}"; - license = with licenses; [ + changelog = "https://github.com/icsharpcode/ILSpy/releases/tag/${finalAttrs.src.rev}"; + license = with lib.licenses; [ mit # third party dependencies mspl asl20 ]; - sourceProvenance = with sourceTypes; [ fromSource binaryBytecode ]; - maintainers = with maintainers; [ emilytrau ]; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode + ]; + maintainers = with lib.maintainers; [ emilytrau ]; }; -} +}) From 2a05f934fcdd6b0269ccfea0efda55e59c4ca634 Mon Sep 17 00:00:00 2001 From: GGG Date: Tue, 17 Dec 2024 23:56:29 -0300 Subject: [PATCH 49/60] ilspycmd: 8.0 -> 9.0-preview3 --- pkgs/development/tools/ilspycmd/default.nix | 7 +- pkgs/development/tools/ilspycmd/deps.json | 514 +++++++++----------- 2 files changed, 240 insertions(+), 281 deletions(-) diff --git a/pkgs/development/tools/ilspycmd/default.nix b/pkgs/development/tools/ilspycmd/default.nix index c25155dbdfda..099345427f3e 100644 --- a/pkgs/development/tools/ilspycmd/default.nix +++ b/pkgs/development/tools/ilspycmd/default.nix @@ -10,13 +10,13 @@ }: buildDotnetModule (finalAttrs: rec { pname = "ilspycmd"; - version = "8.0"; + version = "9.0-preview3"; src = fetchFromGitHub { owner = "icsharpcode"; repo = "ILSpy"; rev = "v${version}"; - hash = "sha256-ERBYXgpBRXISfqBSBEydEQuD/5T1dvJ+wNg2U5pKip4="; + hash = "sha256-7cPXFaEKr76GtqcNsKx7tstRUeTpSTF8ggxbyEnQa9M="; }; nativeBuildInputs = @@ -31,8 +31,7 @@ buildDotnetModule (finalAttrs: rec { # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) env.LOCALE_ARCHIVE = lib.optionalString stdenv.hostPlatform.isLinux "${glibcLocales}/lib/locale/locale-archive"; - dotnet-sdk = dotnetCorePackages.sdk_6_0; - dotnet-runtime = dotnetCorePackages.runtime_6_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; projectFile = "ICSharpCode.ILSpyCmd/ICSharpCode.ILSpyCmd.csproj"; nugetDeps = ./deps.json; diff --git a/pkgs/development/tools/ilspycmd/deps.json b/pkgs/development/tools/ilspycmd/deps.json index 2a26f262857a..53cc16e082dd 100644 --- a/pkgs/development/tools/ilspycmd/deps.json +++ b/pkgs/development/tools/ilspycmd/deps.json @@ -1,367 +1,327 @@ [ { "pname": "K4os.Compression.LZ4", - "version": "1.3.5", - "sha256": "1nv9inhz0n25lhkw9xgp6g5xbqmcdccdhx6mwrli0pdp6hjmlh9k" + "version": "1.3.8", + "hash": "sha256-OmT3JwO4qpkZDL7XqiFqZCyxySj64s9t+mXcN1T+IyA=" }, { "pname": "McMaster.Extensions.CommandLineUtils", - "version": "3.1.0", - "sha256": "075n1mfsxwz514r94l8i3ax0wp43c3xb4f9w25a96h6xxnj0k2hd" + "version": "4.1.1", + "hash": "sha256-K10ukfRqcRIKJT7PFxc7NFpKWRT+FIDg8IJAR8HA5Eo=" + }, + { + "pname": "McMaster.Extensions.Hosting.CommandLine", + "version": "4.1.1", + "hash": "sha256-Qz4rSwi0vE5CmwGolmASB92/XZsKlz/QC+pdRITVKHA=" }, { "pname": "Microsoft.Build.Tasks.Git", - "version": "1.1.1", - "sha256": "1bb5p4zlnfn88skkvymxfsn0jybqncl4356hwnic9jxdq2d4fz1w" + "version": "8.0.0", + "hash": "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA=" + }, + { + "pname": "Microsoft.Extensions.Configuration", + "version": "8.0.0", + "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "6.0.0", + "hash": "sha256-Evg+Ynj2QUa6Gz+zqF+bUyfGD0HI5A2fHmxZEXbn3HA=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "8.0.0", + "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Binder", + "version": "8.0.2", + "hash": "sha256-aGB0VuoC34YadAEqrwoaXLc5qla55pswDV2xLSmR7SE=" + }, + { + "pname": "Microsoft.Extensions.Configuration.CommandLine", + "version": "8.0.0", + "hash": "sha256-fmPC/o8S+weTtQJWykpnGHm6AKVU21xYE/CaHYU7zgg=" + }, + { + "pname": "Microsoft.Extensions.Configuration.EnvironmentVariables", + "version": "8.0.0", + "hash": "sha256-+bjFZvqCsMf2FRM2olqx/fub+QwfM1kBhjGVOT5HC48=" + }, + { + "pname": "Microsoft.Extensions.Configuration.FileExtensions", + "version": "8.0.1", + "hash": "sha256-iRA8L7BX/fe5LHCVOhzBSk30GfshP7V2Qj2nxpEvStA=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Json", + "version": "8.0.1", + "hash": "sha256-J8EK/yhsfTpeSUY8F81ZTBV9APHiPUliN7d+n2OX9Ig=" + }, + { + "pname": "Microsoft.Extensions.Configuration.UserSecrets", + "version": "8.0.1", + "hash": "sha256-yGvWfwBhyFudcIv96pKWaQ1MIMOiv5LHSCn+9J7Doz0=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection", + "version": "8.0.1", + "hash": "sha256-O9g0jWS+jfGoT3yqKwZYJGL+jGSIeSbwmvomKDC3hTU=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "6.0.0", + "hash": "sha256-SZke0jNKIqJvvukdta+MgIlGsrP2EdPkkS8lfLg7Ju4=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "8.0.2", + "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY=" + }, + { + "pname": "Microsoft.Extensions.Diagnostics", + "version": "8.0.1", + "hash": "sha256-CraHNCaVlMiYx6ff9afT6U7RC/MoOCXM3pn2KrXkiLc=" + }, + { + "pname": "Microsoft.Extensions.Diagnostics.Abstractions", + "version": "8.0.1", + "hash": "sha256-d5DVXhA8qJFY9YbhZjsTqs5w5kDuxF5v+GD/WZR1QL0=" + }, + { + "pname": "Microsoft.Extensions.FileProviders.Abstractions", + "version": "6.0.0", + "hash": "sha256-uBjWjHKEXjZ9fDfFxMjOou3lhfTNhs1yO+e3fpWreLk=" + }, + { + "pname": "Microsoft.Extensions.FileProviders.Abstractions", + "version": "8.0.0", + "hash": "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU=" + }, + { + "pname": "Microsoft.Extensions.FileProviders.Physical", + "version": "8.0.0", + "hash": "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc=" + }, + { + "pname": "Microsoft.Extensions.FileSystemGlobbing", + "version": "8.0.0", + "hash": "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU=" + }, + { + "pname": "Microsoft.Extensions.Hosting", + "version": "8.0.1", + "hash": "sha256-FFLo6em0N2vaWg6//vaQhxoOgT9LLH5Y2KWkCeX5xQ4=" + }, + { + "pname": "Microsoft.Extensions.Hosting.Abstractions", + "version": "6.0.0", + "hash": "sha256-ksIPO6RhfbYx/i3su4J3sDhoL+TDnITKsgIpEqnpktc=" + }, + { + "pname": "Microsoft.Extensions.Hosting.Abstractions", + "version": "8.0.1", + "hash": "sha256-/bIVL9uvBQhV/KQmjA1ZjR74sMfaAlBb15sVXsGDEVA=" + }, + { + "pname": "Microsoft.Extensions.Logging", + "version": "8.0.1", + "hash": "sha256-vkfVw4tQEg86Xg18v6QO0Qb4Ysz0Njx57d1XcNuj6IU=" + }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "6.0.0", + "hash": "sha256-QNqcQ3x+MOK7lXbWkCzSOWa/2QyYNbdM/OEEbWN15Sw=" + }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "8.0.2", + "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc=" + }, + { + "pname": "Microsoft.Extensions.Logging.Configuration", + "version": "8.0.1", + "hash": "sha256-E2JbJG2EXlv2HUWLi17kIkAL6RC9rC2E18C3gAyOuaE=" + }, + { + "pname": "Microsoft.Extensions.Logging.Console", + "version": "8.0.1", + "hash": "sha256-2thhF1JbDNj3Bx2fcH7O26uHGNeMd9MYah6N60lIpIU=" + }, + { + "pname": "Microsoft.Extensions.Logging.Debug", + "version": "8.0.1", + "hash": "sha256-gKFqBg5lbjy5VBEcAuoQ/SsXAxvrYdBYOu9dV60eJKg=" + }, + { + "pname": "Microsoft.Extensions.Logging.EventLog", + "version": "8.0.1", + "hash": "sha256-1UkEOwl3Op2b3jTvpI10hHxIe9FqeVVy+VB1tZp6Lc8=" + }, + { + "pname": "Microsoft.Extensions.Logging.EventSource", + "version": "8.0.1", + "hash": "sha256-EINT/PgfB4Dvf+1JBzL1plPT35ezT7kyS8y/XMMgYxA=" + }, + { + "pname": "Microsoft.Extensions.Options", + "version": "8.0.2", + "hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys=" + }, + { + "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", + "version": "8.0.0", + "hash": "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI=" + }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "6.0.0", + "hash": "sha256-AgvysszpQ11AiTBJFkvSy8JnwIWTj15Pfek7T7ThUc4=" + }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "8.0.0", + "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo=" }, { "pname": "Microsoft.NETCore.App.Ref", - "version": "6.0.0", - "sha256": "1skgkralqkg2srvgvrmbsmya67f37gzk40lg28j8nz5mg8k8g0ia" + "version": "8.0.0", + "hash": "sha256-yTkWSH0P4IsKl+fAX9tapyug3omJQ4wxMWcMYhBc20M=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.0", - "sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm" - }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "1.1.0", - "sha256": "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh" + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" }, { "pname": "Microsoft.SourceLink.Common", - "version": "1.1.1", - "sha256": "0xkdqs7az2cprar7jzjlgjpd64l6f8ixcmwmpkdm03fyb4s5m0bg" + "version": "8.0.0", + "hash": "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc=" }, { "pname": "Microsoft.SourceLink.GitHub", - "version": "1.1.1", - "sha256": "099y35f2npvva3jk1zp8hn0vb9pwm2l0ivjasdly6y2idv53s5yy" + "version": "8.0.0", + "hash": "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0=" }, { "pname": "Mono.Cecil", - "version": "0.11.4", - "sha256": "1yxa7mh432s7g7p9r7scqxvxjk5ypwc567qdbf0gmk8fbf0d3f8y" + "version": "0.11.6", + "hash": "sha256-0qI4MqqpSLqaAazEK1cm40xfmVlY8bMNRcDnxws6ctU=" }, { "pname": "NETStandard.Library", "version": "2.0.3", - "sha256": "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y" + "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=" }, { - "pname": "runtime.any.System.Collections", - "version": "4.3.0", - "sha256": "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0" + "pname": "Newtonsoft.Json", + "version": "13.0.3", + "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" }, { - "pname": "runtime.any.System.Globalization", - "version": "4.3.0", - "sha256": "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x" + "pname": "NuGet.Common", + "version": "6.11.1", + "hash": "sha256-UyZtDyTuymC+sKSX+ripOI6MmJZn11loVapVs4uzaGo=" }, { - "pname": "runtime.any.System.IO", - "version": "4.3.0", - "sha256": "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x" + "pname": "NuGet.Configuration", + "version": "6.11.1", + "hash": "sha256-JH2UCpjYg8pkqxQ4j4BrWiTKhGzgfn55NMr32wf6+FQ=" }, { - "pname": "runtime.any.System.Reflection", - "version": "4.3.0", - "sha256": "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly" + "pname": "NuGet.Frameworks", + "version": "6.11.1", + "hash": "sha256-p25Oa7wJjwF+2puIhBkZZkKSuk4jGq7xikYSCdfp9Vc=" }, { - "pname": "runtime.any.System.Reflection.Primitives", - "version": "4.3.0", - "sha256": "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf" + "pname": "NuGet.Packaging", + "version": "6.11.1", + "hash": "sha256-1yY3p5hQwbUgYCyHnBcuGWiiIib1ppPYt2ntxwXSJW0=" }, { - "pname": "runtime.any.System.Resources.ResourceManager", - "version": "4.3.0", - "sha256": "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl" + "pname": "NuGet.Protocol", + "version": "6.11.1", + "hash": "sha256-/zFvBV83Q5oMNu68BjmrHtZMAxf/YkDJV8HSsl5GjsY=" }, { - "pname": "runtime.any.System.Runtime", - "version": "4.3.0", - "sha256": "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b" - }, - { - "pname": "runtime.any.System.Runtime.Handles", - "version": "4.3.0", - "sha256": "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x" - }, - { - "pname": "runtime.any.System.Runtime.InteropServices", - "version": "4.3.0", - "sha256": "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19" - }, - { - "pname": "runtime.any.System.Text.Encoding", - "version": "4.3.0", - "sha256": "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3" - }, - { - "pname": "runtime.any.System.Text.Encoding.Extensions", - "version": "4.3.0", - "sha256": "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8" - }, - { - "pname": "runtime.any.System.Threading.Tasks", - "version": "4.3.0", - "sha256": "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va" - }, - { - "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "sha256": "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d" - }, - { - "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "sha256": "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59" - }, - { - "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "sha256": "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa" - }, - { - "pname": "runtime.native.System", - "version": "4.3.0", - "sha256": "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4" - }, - { - "pname": "runtime.native.System.IO.Compression", - "version": "4.3.0", - "sha256": "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d" - }, - { - "pname": "runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "sha256": "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97" - }, - { - "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "sha256": "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3" - }, - { - "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "sha256": "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf" - }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "sha256": "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3" - }, - { - "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "sha256": "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn" - }, - { - "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "sha256": "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3" - }, - { - "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "sha256": "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy" - }, - { - "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "sha256": "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5" - }, - { - "pname": "runtime.unix.System.Diagnostics.Debug", - "version": "4.3.0", - "sha256": "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5" - }, - { - "pname": "runtime.unix.System.Private.Uri", - "version": "4.3.0", - "sha256": "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk" - }, - { - "pname": "runtime.unix.System.Runtime.Extensions", - "version": "4.3.0", - "sha256": "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p" + "pname": "NuGet.Versioning", + "version": "6.11.1", + "hash": "sha256-fl8lyChMjV7Sp8keAP7CdXZh7ARN/mU39T3gG74jDWY=" }, { "pname": "System.Buffers", "version": "4.5.1", - "sha256": "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3" - }, - { - "pname": "System.Collections", - "version": "4.3.0", - "sha256": "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9" + "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" }, { "pname": "System.Collections.Immutable", "version": "6.0.0", - "sha256": "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c" - }, - { - "pname": "System.Collections.Immutable", - "version": "7.0.0", - "sha256": "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm" + "hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs=" }, { "pname": "System.ComponentModel.Annotations", "version": "5.0.0", - "sha256": "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j" - }, - { - "pname": "System.Composition", - "version": "6.0.0", - "sha256": "1p7hysns39cc24af6dwd4m48bqjsrr3clvi4aws152mh2fgyg50z" + "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg=" }, { "pname": "System.Composition.AttributedModel", + "version": "8.0.0", + "hash": "sha256-n3aXiBAFIlQicSRLiNtLh++URSUxRBLggsjJ8OMNRpo=" + }, + { + "pname": "System.Diagnostics.EventLog", + "version": "8.0.1", + "hash": "sha256-zvqd72pwgcGoa1nH3ZT1C0mP9k53vFLJ69r5MCQ1saA=" + }, + { + "pname": "System.Formats.Asn1", "version": "6.0.0", - "sha256": "1mqrblb0l65hw39d0hnspqcv85didpn4wbiwhfgj4784wzqx2w6k" - }, - { - "pname": "System.Composition.Convention", - "version": "6.0.0", - "sha256": "02km3yb94p1c4s7liyhkmda0g71zm1rc8ijsfmy4bnlkq15xjw3b" - }, - { - "pname": "System.Composition.Hosting", - "version": "6.0.0", - "sha256": "0big5nk8c44rxp6cfykhk7rxvn2cgwa99w6c3v2a36adc3lj36ky" - }, - { - "pname": "System.Composition.Runtime", - "version": "6.0.0", - "sha256": "0vq5ik63yii1784gsa2f2kx9w6xllmm8b8rk0arid1jqdj1nyrlw" - }, - { - "pname": "System.Composition.TypedParts", - "version": "6.0.0", - "sha256": "0y9pq3y60nyrpfy51f576a0qjjdh61mcv8vnik32pm4bz56h9q72" - }, - { - "pname": "System.Diagnostics.Debug", - "version": "4.3.0", - "sha256": "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y" - }, - { - "pname": "System.Globalization", - "version": "4.3.0", - "sha256": "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki" - }, - { - "pname": "System.IO", - "version": "4.3.0", - "sha256": "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f" - }, - { - "pname": "System.IO.Compression", - "version": "4.3.0", - "sha256": "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz" - }, - { - "pname": "System.IO.FileSystem.Primitives", - "version": "4.3.0", - "sha256": "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c" + "hash": "sha256-KaMHgIRBF7Nf3VwOo+gJS1DcD+41cJDPWFh+TDQ8ee8=" }, { "pname": "System.Memory", "version": "4.5.4", - "sha256": "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y" + "hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E=" }, { "pname": "System.Numerics.Vectors", "version": "4.4.0", - "sha256": "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba" - }, - { - "pname": "System.Private.Uri", - "version": "4.3.0", - "sha256": "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx" - }, - { - "pname": "System.Reflection", - "version": "4.3.0", - "sha256": "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m" + "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U=" }, { "pname": "System.Reflection.Metadata", "version": "6.0.0", - "sha256": "1x0b289r9yjzdqypi2x3dc8sa66s3b6bpc7l2f8hxrzl6czdg4al" + "hash": "sha256-VJHXPjP05w6RE/Swu8wa2hilEWuji3g9bl/6lBMSC/Q=" }, { "pname": "System.Reflection.Metadata", - "version": "7.0.0", - "sha256": "1wilasn2qmj870h2bhw348lspamm7pbinpb4m89icg113510l00v" - }, - { - "pname": "System.Reflection.Primitives", - "version": "4.3.0", - "sha256": "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276" - }, - { - "pname": "System.Resources.ResourceManager", - "version": "4.3.0", - "sha256": "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49" - }, - { - "pname": "System.Runtime", - "version": "4.3.0", - "sha256": "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7" + "version": "8.0.1", + "hash": "sha256-Swip1XuTs/r2m4RKuG5BXXxcaNGRh+jbMnjFRNdL87U=" }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "6.0.0", - "sha256": "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc" + "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" }, { - "pname": "System.Runtime.Extensions", - "version": "4.3.0", - "sha256": "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60" + "pname": "System.Security.Cryptography.Pkcs", + "version": "6.0.4", + "hash": "sha256-2e0aRybote+OR66bHaNiYpF//4fCiaO3zbR2e9GABUI=" }, { - "pname": "System.Runtime.Handles", - "version": "4.3.0", - "sha256": "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8" + "pname": "System.Security.Cryptography.ProtectedData", + "version": "4.4.0", + "hash": "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE=" }, { - "pname": "System.Runtime.InteropServices", - "version": "4.3.0", - "sha256": "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j" - }, - { - "pname": "System.Runtime.Loader", - "version": "4.3.0", - "sha256": "07fgipa93g1xxgf7193a6vw677mpzgr0z0cfswbvqqb364cva8dk" - }, - { - "pname": "System.Text.Encoding", - "version": "4.3.0", - "sha256": "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr" - }, - { - "pname": "System.Text.Encoding.Extensions", - "version": "4.3.0", - "sha256": "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy" - }, - { - "pname": "System.Threading", - "version": "4.3.0", - "sha256": "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34" - }, - { - "pname": "System.Threading.Tasks", - "version": "4.3.0", - "sha256": "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7" + "pname": "TomsToolbox.Composition.Analyzer", + "version": "2.20.0", + "hash": "sha256-xjWXdkXF8X9nDdzLNA2H1WcpPZV4NDiKf//TeQbLUtc=" }, { "pname": "TunnelVisionLabs.ReferenceAssemblyAnnotator", "version": "1.0.0-alpha.160", - "sha256": "1wvfa3098a984kydjgjvx43gncnr89fw20if2gqvz8kqn9pxqjbq" + "hash": "sha256-eEncb7J4or/xEy4CwV1C2TL7BulbPtn8JCgplMBQbvM=" } ] From c9e58193d87d9a5a3571febc30f53689f4f69940 Mon Sep 17 00:00:00 2001 From: GGG Date: Wed, 18 Dec 2024 00:05:07 -0300 Subject: [PATCH 50/60] inklecate: upgrade to .NET 8 --- .../in/inklecate/dotnet-8-upgrade.patch | 65 +++++++++++++++++++ pkgs/by-name/in/inklecate/package.nix | 16 +++-- 2 files changed, 74 insertions(+), 7 deletions(-) create mode 100644 pkgs/by-name/in/inklecate/dotnet-8-upgrade.patch diff --git a/pkgs/by-name/in/inklecate/dotnet-8-upgrade.patch b/pkgs/by-name/in/inklecate/dotnet-8-upgrade.patch new file mode 100644 index 000000000000..c16d94d476e6 --- /dev/null +++ b/pkgs/by-name/in/inklecate/dotnet-8-upgrade.patch @@ -0,0 +1,65 @@ +diff --git a/InkTestBed/InkTestBed.csproj b/InkTestBed/InkTestBed.csproj +index d729fee..ea3e9e6 100644 +--- a/InkTestBed/InkTestBed.csproj ++++ b/InkTestBed/InkTestBed.csproj +@@ -2,7 +2,7 @@ + + + Exe +- net6.0 ++ net8.0 + true + InkTestBed + InkTestBed +diff --git a/compiler/ink_compiler.csproj b/compiler/ink_compiler.csproj +index a6dd06b..c4708cc 100644 +--- a/compiler/ink_compiler.csproj ++++ b/compiler/ink_compiler.csproj +@@ -1,7 +1,7 @@ +  + + +- net6.0 ++ net8.0 + Ink + ink_compiler + +diff --git a/ink-engine-runtime/ink-engine-runtime.csproj b/ink-engine-runtime/ink-engine-runtime.csproj +index caba6df..777c109 100644 +--- a/ink-engine-runtime/ink-engine-runtime.csproj ++++ b/ink-engine-runtime/ink-engine-runtime.csproj +@@ -1,7 +1,7 @@ +  + + +- net6.0 ++ net8.0 + Ink.Runtime + ink-engine-runtime + +diff --git a/inklecate/inklecate.csproj b/inklecate/inklecate.csproj +index 0a02264..cf7b254 100644 +--- a/inklecate/inklecate.csproj ++++ b/inklecate/inklecate.csproj +@@ -2,7 +2,7 @@ + + + Exe +- net6.0 ++ net8.0 + Ink + inklecate + +diff --git a/tests/tests.csproj b/tests/tests.csproj +index 8d3bd6b..a9731c5 100644 +--- a/tests/tests.csproj ++++ b/tests/tests.csproj +@@ -1,7 +1,7 @@ +  + + +- net6.0 ++ net8.0 + tests + ink-tests + diff --git a/pkgs/by-name/in/inklecate/package.nix b/pkgs/by-name/in/inklecate/package.nix index 26f3c153e113..3c635a6060c1 100644 --- a/pkgs/by-name/in/inklecate/package.nix +++ b/pkgs/by-name/in/inklecate/package.nix @@ -1,8 +1,9 @@ -{ lib -, stdenv -, buildDotnetModule -, dotnetCorePackages -, fetchFromGitHub +{ + lib, + stdenv, + buildDotnetModule, + dotnetCorePackages, + fetchFromGitHub, }: buildDotnetModule rec { @@ -16,14 +17,15 @@ buildDotnetModule rec { hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA=="; }; + patches = [ ./dotnet-8-upgrade.patch ]; + buildInputs = [ (lib.getLib stdenv.cc.cc) ]; projectFile = "inklecate/inklecate.csproj"; nugetDeps = ./deps.json; executables = [ "inklecate" ]; - dotnet-sdk = dotnetCorePackages.sdk_6_0; - dotnet-runtime = dotnetCorePackages.runtime_6_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; meta = with lib; { description = "Compiler for ink, inkle's scripting language"; From 6cd4d4a971ef131d1a436b858eb12fee25c04b67 Mon Sep 17 00:00:00 2001 From: GGG Date: Wed, 18 Dec 2024 00:29:13 -0300 Subject: [PATCH 51/60] knossosnet: upgrade to .NET 8 --- pkgs/by-name/kn/knossosnet/deps.json | 5 --- .../kn/knossosnet/dotnet-8-upgrade.patch | 39 +++++++++++++++++++ pkgs/by-name/kn/knossosnet/package.nix | 4 +- .../kn/knossosnet/targetframework.patch | 12 ------ 4 files changed, 41 insertions(+), 19 deletions(-) create mode 100644 pkgs/by-name/kn/knossosnet/dotnet-8-upgrade.patch delete mode 100644 pkgs/by-name/kn/knossosnet/targetframework.patch diff --git a/pkgs/by-name/kn/knossosnet/deps.json b/pkgs/by-name/kn/knossosnet/deps.json index cdcba8706613..a5b62c2eb37b 100644 --- a/pkgs/by-name/kn/knossosnet/deps.json +++ b/pkgs/by-name/kn/knossosnet/deps.json @@ -504,11 +504,6 @@ "version": "4.7.1", "hash": "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U=" }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "6.0.0", - "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" - }, { "pname": "System.Runtime.Extensions", "version": "4.3.0", diff --git a/pkgs/by-name/kn/knossosnet/dotnet-8-upgrade.patch b/pkgs/by-name/kn/knossosnet/dotnet-8-upgrade.patch new file mode 100644 index 000000000000..5ed204921613 --- /dev/null +++ b/pkgs/by-name/kn/knossosnet/dotnet-8-upgrade.patch @@ -0,0 +1,39 @@ +diff --git a/IonKiwi.lz4/IonKiwi.lz4.csproj b/IonKiwi.lz4/IonKiwi.lz4.csproj +index 312984f..804be5c 100644 +--- a/IonKiwi.lz4/IonKiwi.lz4.csproj ++++ b/IonKiwi.lz4/IonKiwi.lz4.csproj +@@ -1,7 +1,7 @@ +  + + +- net60 ++ net8.0 + true + IonKiwi.lz4.managed + 1.0.7 +diff --git a/Knossos.NET/Knossos.NET.csproj b/Knossos.NET/Knossos.NET.csproj +index 501faaa..4b563f1 100644 +--- a/Knossos.NET/Knossos.NET.csproj ++++ b/Knossos.NET/Knossos.NET.csproj +@@ -1,7 +1,7 @@ +  + + WinExe +- net6.0 ++ net8.0 + enable + + copyused +diff --git a/VP.NET/VP.NET.csproj b/VP.NET/VP.NET.csproj +index 11fa155..2eef420 100644 +--- a/VP.NET/VP.NET.csproj ++++ b/VP.NET/VP.NET.csproj +@@ -1,7 +1,7 @@ + + + +- net6.0 ++ net8.0 + enable + enable + diff --git a/pkgs/by-name/kn/knossosnet/package.nix b/pkgs/by-name/kn/knossosnet/package.nix index 90667c645c27..a29b3135c981 100644 --- a/pkgs/by-name/kn/knossosnet/package.nix +++ b/pkgs/by-name/kn/knossosnet/package.nix @@ -17,9 +17,9 @@ buildDotnetModule rec { hash = "sha256-vlSiM6kskV4wfBZF7Rv5ICyqKG0Zhz/iU8kflYOaf0U="; }; - patches = [ ./targetframework.patch ]; + patches = [ ./dotnet-8-upgrade.patch ]; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; nugetDeps = ./deps.json; executables = [ "Knossos.NET" ]; diff --git a/pkgs/by-name/kn/knossosnet/targetframework.patch b/pkgs/by-name/kn/knossosnet/targetframework.patch deleted file mode 100644 index 2802a18053c4..000000000000 --- a/pkgs/by-name/kn/knossosnet/targetframework.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur Knossos.NET-0.1.4/IonKiwi.lz4/IonKiwi.lz4.csproj Knossos.NET-0.1.4.new/IonKiwi.lz4/IonKiwi.lz4.csproj ---- Knossos.NET-0.1.4/IonKiwi.lz4/IonKiwi.lz4.csproj 2023-10-18 15:17:20.000000000 -0400 -+++ Knossos.NET-0.1.4.new/IonKiwi.lz4/IonKiwi.lz4.csproj 2024-01-03 17:39:56.809971086 -0500 -@@ -1,7 +1,7 @@ -  - - -- net60 -+ net6.0 - true - IonKiwi.lz4.managed - 1.0.7 From 38a5cfb2fbeca92a7ad46e7f7d119f1ed58440b7 Mon Sep 17 00:00:00 2001 From: GGG Date: Thu, 19 Dec 2024 14:42:55 -0300 Subject: [PATCH 52/60] formula: simplify postFixup --- pkgs/by-name/fo/formula/package.nix | 20 +++++++++----------- pkgs/development/tools/ilspycmd/default.nix | 6 +++--- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/fo/formula/package.nix b/pkgs/by-name/fo/formula/package.nix index 08fde7877db4..951ae976f468 100644 --- a/pkgs/by-name/fo/formula/package.nix +++ b/pkgs/by-name/fo/formula/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + stdenvNoCC, fetchFromGitHub, buildDotnetModule, dotnetCorePackages, @@ -25,16 +25,14 @@ buildDotnetModule (finalAttrs: { projectFile = "Src/CommandLine/CommandLine.csproj"; postFixup = - if stdenv.hostPlatform.isLinux then - '' - mv $out/bin/CommandLine $out/bin/formula - '' - else - lib.optionalString stdenv.hostPlatform.isDarwin '' - makeWrapper ${dotnetCorePackages.runtime_8_0}/bin/dotnet $out/bin/formula \ - --add-flags "$out/lib/formula-dotnet/CommandLine.dll" \ - --prefix DYLD_LIBRARY_PATH : $out/lib/formula-dotnet/runtimes/macos/native - ''; + lib.optionalString stdenvNoCC.isLinux '' + mv $out/bin/CommandLine $out/bin/formula + '' + + lib.optionalString stdenvNoCC.isDarwin '' + makeWrapper ${dotnetCorePackages.runtime_8_0}/bin/dotnet $out/bin/formula \ + --add-flags "$out/lib/formula-dotnet/CommandLine.dll" \ + --prefix DYLD_LIBRARY_PATH : $out/lib/formula-dotnet/runtimes/macos/native + ''; passthru.updateScript = unstableGitUpdater { url = finalAttrs.meta.homepage; }; diff --git a/pkgs/development/tools/ilspycmd/default.nix b/pkgs/development/tools/ilspycmd/default.nix index 099345427f3e..61918c6b7a95 100644 --- a/pkgs/development/tools/ilspycmd/default.nix +++ b/pkgs/development/tools/ilspycmd/default.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + stdenvNoCC, fetchFromGitHub, buildDotnetModule, dotnetCorePackages, @@ -23,13 +23,13 @@ buildDotnetModule (finalAttrs: rec { [ powershell ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + ++ lib.optionals (stdenvNoCC.hostPlatform.isDarwin && stdenvNoCC.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ]; # https://github.com/NixOS/nixpkgs/issues/38991 # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) - env.LOCALE_ARCHIVE = lib.optionalString stdenv.hostPlatform.isLinux "${glibcLocales}/lib/locale/locale-archive"; + env.LOCALE_ARCHIVE = lib.optionalString stdenvNoCC.hostPlatform.isLinux "${glibcLocales}/lib/locale/locale-archive"; dotnet-sdk = dotnetCorePackages.sdk_8_0; From 7bf295f2f8446944d8cb92f7ac41d343113e1523 Mon Sep 17 00:00:00 2001 From: GGG Date: Thu, 19 Dec 2024 14:45:23 -0300 Subject: [PATCH 53/60] ilspycmd: simplify hostPlatform checks --- pkgs/by-name/fo/formula/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fo/formula/package.nix b/pkgs/by-name/fo/formula/package.nix index 951ae976f468..7913d9ec8a7e 100644 --- a/pkgs/by-name/fo/formula/package.nix +++ b/pkgs/by-name/fo/formula/package.nix @@ -25,10 +25,10 @@ buildDotnetModule (finalAttrs: { projectFile = "Src/CommandLine/CommandLine.csproj"; postFixup = - lib.optionalString stdenvNoCC.isLinux '' + lib.optionalString stdenvNoCC.hostPlatform.isLinux '' mv $out/bin/CommandLine $out/bin/formula '' - + lib.optionalString stdenvNoCC.isDarwin '' + + lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' makeWrapper ${dotnetCorePackages.runtime_8_0}/bin/dotnet $out/bin/formula \ --add-flags "$out/lib/formula-dotnet/CommandLine.dll" \ --prefix DYLD_LIBRARY_PATH : $out/lib/formula-dotnet/runtimes/macos/native From ea961ad641d1e11147628359b2971faf9311d1df Mon Sep 17 00:00:00 2001 From: GGG Date: Tue, 24 Dec 2024 01:00:46 -0300 Subject: [PATCH 54/60] alttpr-opentracker: 1.8.5 -> 1.8.6 --- pkgs/by-name/al/alttpr-opentracker/deps.json | 902 +++++++++--------- .../by-name/al/alttpr-opentracker/package.nix | 22 +- .../alttpr-opentracker/remove-project.patch | 14 - 3 files changed, 443 insertions(+), 495 deletions(-) delete mode 100644 pkgs/by-name/al/alttpr-opentracker/remove-project.patch diff --git a/pkgs/by-name/al/alttpr-opentracker/deps.json b/pkgs/by-name/al/alttpr-opentracker/deps.json index f9dbc7f4f0fa..b488799ce141 100644 --- a/pkgs/by-name/al/alttpr-opentracker/deps.json +++ b/pkgs/by-name/al/alttpr-opentracker/deps.json @@ -1,1052 +1,1022 @@ [ { "pname": "Autofac", - "version": "6.3.0", - "sha256": "0zg0lsqzb8hh7l97mfd2z3fxdab86sbmxkaprzi41v0hs1x3jd9b" + "version": "7.1.0", + "hash": "sha256-9UJoNg/6AV0I2xieMevylwfPu8A0qcpIWPJZFgzT6wA=" }, { "pname": "Avalonia", - "version": "0.10.12", - "sha256": "1hb6v8sm7gd8aswdv0slnk8cvvxs5ac82knc3pzvxj0js2n4lnv2" + "version": "0.10.22", + "hash": "sha256-5EY2FMhtry/RJGXuHzMvdiGEnnDN5OP+M3cEdxR/n7c=" }, { "pname": "Avalonia.Angle.Windows.Natives", "version": "2.1.0.2020091801", - "sha256": "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a" + "hash": "sha256-ahDcJNCqlNniItcat7owREQ0hfIwMWFNhnDu89lAVRI=" + }, + { + "pname": "Avalonia.BuildServices", + "version": "0.0.29", + "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY=" }, { "pname": "Avalonia.Controls.DataGrid", - "version": "0.10.12", - "sha256": "1r8qi0kgd9rqbacnriy5sa684d12vxi45a6n2a4w7ydxr97zv5nm" + "version": "0.10.22", + "hash": "sha256-8p4qWuy8BeXaUVM6H8hWJ2ajl7tgbBAWN3EoiKPmphM=" }, { "pname": "Avalonia.Desktop", - "version": "0.10.12", - "sha256": "17ng7vvmynnmll7fb8zkjlhcn0ksg7p4v6kw207yq72acgvyn96g" + "version": "0.10.22", + "hash": "sha256-p4fEyykjYwaOgTSBNtK0+v+VvIypg818R4mBWnGzmHI=" }, { "pname": "Avalonia.Diagnostics", - "version": "0.10.12", - "sha256": "17skzs05iv5ljgnqm36zrbhrh3x20xf5hgni543i02zffj2015ki" + "version": "0.10.22", + "hash": "sha256-CIS6A47DmbNt/AQGoDWfBs/+7/0busUFCdvX0Su+m9Y=" }, { "pname": "Avalonia.FreeDesktop", - "version": "0.10.12", - "sha256": "00920pdiv8wlpym0s80nz8lfmw515ikrr5f2a6sr4kmjwfd9cffj" + "version": "0.10.22", + "hash": "sha256-IAyKCqAUMLpm1r39AI7KzeC36dNe87oJwkk7gxJj5Y0=" }, { "pname": "Avalonia.Markup.Xaml.Loader", - "version": "0.10.12", - "sha256": "18glwqn4a8p3rz5zsp1xyrm5xwv853056nykf7mdcv1lglh74fsm" + "version": "0.10.22", + "hash": "sha256-XRl10uLLt57zNxXL9CXWWTlcXEtX2znOVg5VqfyngZc=" }, { "pname": "Avalonia.Native", - "version": "0.10.12", - "sha256": "1j6gxg0n55923rbw2p7z6yh27i81xrzpqarb268d3hd6hgjycwc1" + "version": "0.10.22", + "hash": "sha256-I+4YCsFXcXOYccSWwO9nxFsk4wITafkSkj/55uO5rSo=" }, { "pname": "Avalonia.ReactiveUI", - "version": "0.10.12", - "sha256": "04ga7f8bmz3bqp4dsc4fzrphfq61zf62hlz4nbazf1igx0jzdygy" + "version": "0.10.22", + "hash": "sha256-czEyKZml1wJSLWULT124pPOKkJr5gCMT9eu4qaCJl9A=" }, { "pname": "Avalonia.Remote.Protocol", - "version": "0.10.12", - "sha256": "0ghrb8yf4qahwlpa2appk7q0m0n01q0s65nx1xj1plpi4jr6vvw2" + "version": "0.10.22", + "hash": "sha256-dEZCLrgO5ogFJ+yAu030NDAWLs98KrLpMcMx2AX8+ig=" }, { "pname": "Avalonia.Skia", - "version": "0.10.12", - "sha256": "1qj0sw4780za3p6hbwvx1p3b6px3s5vp3ml3vvyak1bajvifz969" + "version": "0.10.22", + "hash": "sha256-4ty55BXtpeytJtGCnCyD4PBXk/fQPVmwXvr1S3MBseI=" }, { "pname": "Avalonia.Win32", - "version": "0.10.12", - "sha256": "1af174qca95gxf04zhxm716mi1dazfz7k3995i1nyaz7hygs3p04" + "version": "0.10.22", + "hash": "sha256-AHUqjeqvJkHKuRSvHma+MbfgnNs1/YmVZkyFHoU7SQQ=" }, { "pname": "Avalonia.X11", - "version": "0.10.12", - "sha256": "1jjg4lhg0a95laffwm7imgs92q06whrfkaszm7svgfv1ryazv71q" + "version": "0.10.22", + "hash": "sha256-PIvSUg01ggYr8w8IONoYo0cgnqwze2v+t0WvVMOEe8o=" }, { "pname": "Avalonia.Xaml.Behaviors", - "version": "0.10.12", - "sha256": "0j897knwxpl6sss8v2wrhy4bw4nw4jqc04n8b8d4s76jaqcr3z2h" + "version": "0.10.19", + "hash": "sha256-I4qs8Rl9pyRVGvsh5n0V+H+CTdg/sqOSomFL5z7BoXY=" }, { "pname": "Avalonia.Xaml.Interactions", - "version": "0.10.12", - "sha256": "0nyqg66sg7garc2k729k3dqixbb3asvsjd2kxympfx9q6xyz6vrh" + "version": "0.10.19", + "hash": "sha256-XLM3Ov0f3S78K1RIZv6tNPpl/ai5yi34Z78zwgGNzgE=" }, { "pname": "Avalonia.Xaml.Interactivity", - "version": "0.10.12", - "sha256": "13qbmz39bf29wvq82b1irci8y50fjhhj563cdwd235nm633sixqb" + "version": "0.10.19", + "hash": "sha256-ZxX8FIGg2+H70c/81hnILW2RVhSNSUXIZhZcWpQE3FE=" }, { "pname": "Castle.Core", - "version": "4.4.1", - "sha256": "13dja1jxl5zwhi0ghkgvgmqdrixn57f9hk52jy5vpaaakzr550r7" - }, - { - "pname": "Citrus.Avalonia", - "version": "1.6.1", - "sha256": "1hl98dmgmm6ml5gl70v7vg577n7vn6bjxaq82sgnql5g623pg18x" + "version": "5.1.1", + "hash": "sha256-oVkQB+ON7S6Q27OhXrTLaxTL0kWB58HZaFFuiw4iTrE=" }, { "pname": "DotNet.Bundle", "version": "0.9.13", - "sha256": "0awzvk62hgszm9b8ar87y862aj8nlm77d7hgfmp84mxny0ag03jl" + "hash": "sha256-VA7wFPC2V4JudQ+edk6lFkklDPIHZYVWql8/KMzcnys=" }, { "pname": "DynamicData", - "version": "7.4.11", - "sha256": "1vrrwkmqrdzr4ncjihfzik5ykmy1234iyp2q5qk8spz6y0gwq2h8" + "version": "7.1.1", + "hash": "sha256-cFskEA5n9Q6wS+nt4nR1jaiC+TzirBu8pHL9g/jErJM=" }, { "pname": "DynamicData", - "version": "7.4.9", - "sha256": "0ssgh42fi5m6xyw36f4km04ls9nq4w8cpbck8gh7g8n3ixz05rrw" + "version": "7.14.2", + "hash": "sha256-UyCC3hPCEm8RoK+d66vqagY4Yi0GzRwO1qoKcAhPZx4=" }, { "pname": "ExpectedObjects", "version": "3.5.4", - "sha256": "1mklg6dx8biaaf9jxp09rddsw66l42r4fpsgnmm6szn6fj2n888k" + "hash": "sha256-EyFkhXTGfm1qtU9fR7Ig1BiuW8sJ3C6TUyou1Jt5dNY=" + }, + { + "pname": "FluentAssertions", + "version": "6.12.0", + "hash": "sha256-LGlPe+G7lBwj5u3ttQZiKX2+C195ddRAHPuDkY6x0BE=" + }, + { + "pname": "Fody", + "version": "6.8.0", + "hash": "sha256-2laYscz0i0LalGTAup7dsh6XlYRZSojYpp8XOwZJJfg=" }, { "pname": "HarfBuzzSharp", - "version": "2.8.2-preview.178", - "sha256": "1p5nwzl7jpypsd6df7hgcf47r977anjlyv21wacmalsj6lvdgnvn" + "version": "2.8.2.1-preview.108", + "hash": "sha256-H2C71GTwKMoTNq2GrNbusLUS7+ca53MYfWYV70i/RHc=" }, { "pname": "HarfBuzzSharp.NativeAssets.Linux", - "version": "2.8.2-preview.178", - "sha256": "1402ylkxbgcnagcarqlfvg4gppy2pqs3bmin4n5mphva1g7bqb2p" + "version": "2.8.2.1-preview.108", + "hash": "sha256-ROYaZH1MZVKZ+6ToHq+GCf3FC5rz9Z7RWOEJlf1+m5s=" }, { "pname": "HarfBuzzSharp.NativeAssets.macOS", - "version": "2.8.2-preview.178", - "sha256": "0p8miaclnbfpacc1jaqxwfg0yfx9byagi4j4k91d9621vd19i8b2" + "version": "2.8.2.1-preview.108", + "hash": "sha256-WgIgnHLOJw52XKccDwmsptTBjTcWgT7dL064yHmmZ5s=" }, { "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", - "version": "2.8.2-preview.178", - "sha256": "1n9jay9sji04xly6n8bzz4591fgy8i65p21a8mv5ip9lsyj1c320" + "version": "2.8.2.1-preview.108", + "hash": "sha256-pXSDS81Y185RZVqA5ALPGsuOcB1GSTn+VpdbPcpYeJY=" }, { "pname": "HarfBuzzSharp.NativeAssets.Win32", - "version": "2.8.2-preview.178", - "sha256": "1r5syii96wv8q558cvsqw3lr10cdw6677lyiy82p6i3if51v3mr7" + "version": "2.8.2.1-preview.108", + "hash": "sha256-YZaC40YqLKiOrVECbKivJsEqkydZgQfLrENXLJOt3lg=" }, { "pname": "JetBrains.Annotations", - "version": "2021.3.0", - "sha256": "01ssylllbwpana2w3iybi533zlvcsbhzjc8kr0g4kg307kjbfn8v" + "version": "2023.2.0", + "hash": "sha256-Um10fSmO+21I7f+lbzzVq5e8GBijJ9amTvOlt362p1s=" }, { "pname": "Microsoft.CodeAnalysis.Analyzers", - "version": "3.3.3", - "sha256": "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6" + "version": "3.3.4", + "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE=" }, { "pname": "Microsoft.CodeAnalysis.Common", - "version": "4.0.1", - "sha256": "0axjv1nhk1z9d4c51d9yxdp09l8yqqnqaifhqcwnxnv0r4y5cka9" + "version": "4.7.0", + "hash": "sha256-nDDpCy8WQADxo7LzWkDupuxs0GCjvuhX8EeKpjTnRP4=" }, { "pname": "Microsoft.CodeAnalysis.CSharp", - "version": "4.0.1", - "sha256": "1h6jfifg7pw2vacpdds4v4jqnaydg9b108irf315wzx6rh8yv9cb" + "version": "4.7.0", + "hash": "sha256-0FoP+zHqbhLhyjTPx8I7MCfHqCbmhwE8aRCVe4eC49M=" }, { "pname": "Microsoft.CodeAnalysis.CSharp.Scripting", - "version": "4.0.1", - "sha256": "0ncbld51ja7hp6p2cabw0dx4km2syiz0z58al62h21cpbjfnls5p" + "version": "4.7.0", + "hash": "sha256-528s2qnDVHswC9DvE1+Rp9Jx83n3Y5RJvtA20x3pZgA=" }, { "pname": "Microsoft.CodeAnalysis.NetAnalyzers", - "version": "6.0.0", - "sha256": "06zy947m5lrbwb684g42ijb07r5jsqycvfnphc6cqfdrfnzqv6k9" + "version": "8.0.0", + "hash": "sha256-Z6MIb9lJskYOEiBZR36pwFI5wWekajx5WJvVA2a/f9Y=" }, { "pname": "Microsoft.CodeAnalysis.Scripting.Common", - "version": "4.0.1", - "sha256": "0zhrlk30js7dp6i76zd7zilaxq26gwsl3pk85p919039786sqs9p" + "version": "4.7.0", + "hash": "sha256-eESDYyoGmGB6fbgDJvCaFPbwB2Cq9SFpP5nhYxK9bEw=" }, { "pname": "Microsoft.CodeCoverage", - "version": "17.0.0", - "sha256": "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a" - }, - { - "pname": "Microsoft.CSharp", - "version": "4.0.1", - "sha256": "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj" + "version": "17.7.2", + "hash": "sha256-FfKMhyVEAiRd3VDkotnFHnSmlYGQTh4ZqkEF2+8sriY=" }, { "pname": "Microsoft.CSharp", "version": "4.7.0", - "sha256": "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j" + "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0=" }, { "pname": "Microsoft.NET.Test.Sdk", - "version": "17.0.0", - "sha256": "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "1.0.1", - "sha256": "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr" + "version": "17.7.2", + "hash": "sha256-EMtV5zcucAcJMGIb/KSqIQnK7PA6aJCgZSobc+5t6SE=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.0", - "sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "6.0.1", - "sha256": "13v33cm88px9wymlxidzgy2ljaq33h1xna3lgdggmy7w4bbdkddh" - }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "1.0.1", - "sha256": "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p" + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" }, { "pname": "Microsoft.NETCore.Targets", "version": "1.1.0", - "sha256": "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh" - }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "5.0.0", - "sha256": "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6" + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" }, { "pname": "Microsoft.TestPlatform.ObjectModel", - "version": "17.0.0", - "sha256": "1bh5scbvl6ndldqv20sl34h4y257irm9ziv2wyfc3hka6912fhn7" + "version": "17.7.2", + "hash": "sha256-uOe3ELE7iAusTBgxhsx78d4lBw28eDTew13ZnW2bsnU=" }, { "pname": "Microsoft.TestPlatform.TestHost", - "version": "17.0.0", - "sha256": "06mn31cgpp7d8lwdyjanh89prc66j37dchn74vrd9s588rq0y70r" + "version": "17.7.2", + "hash": "sha256-pox8kez5tgXX4mAiu9qybrlI7oURzPm7YsCd42N4+us=" }, { "pname": "Microsoft.Win32.Primitives", "version": "4.3.0", - "sha256": "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq" + "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" }, { "pname": "Microsoft.Win32.SystemEvents", - "version": "6.0.0", - "sha256": "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p" + "version": "7.0.0", + "hash": "sha256-i6JojctqrqfJ4Wa+BDtaKZEol26jYq5DTQHar2M9B64=" }, { "pname": "NETStandard.Library", "version": "1.6.1", - "sha256": "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8" + "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw=" }, { "pname": "Newtonsoft.Json", "version": "13.0.1", - "sha256": "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb" + "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=" }, { "pname": "Newtonsoft.Json", - "version": "9.0.1", - "sha256": "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r" + "version": "13.0.3", + "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" }, { "pname": "NSubstitute", - "version": "4.3.0", - "sha256": "026kx6fab9r1a0m8p9hlznp73qhh44k4i0352szvchsis6vlj9gm" + "version": "5.1.0", + "hash": "sha256-ORpubFd6VoRjA9ZeyZdJPY/xnQXM90O6McMswt8VVG4=" }, { "pname": "NuGet.Frameworks", - "version": "5.0.0", - "sha256": "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr" + "version": "6.5.0", + "hash": "sha256-ElqfN4CcKxT3hP2qvxxObb4mnBlYG89IMxO0Sm5oZ2g=" }, { "pname": "Packaging.Targets", "version": "0.1.220", - "sha256": "0ci4jkkqk70vwzf2sgc44a8dap70afp6yhvj967shy7anffxb511" + "hash": "sha256-IZTVnbPqeKiPSXJDb65T4FzVkCKEPS3c5xucieeUJDI=" + }, + { + "pname": "ReactiveMarbles.ObservableEvents.SourceGenerator", + "version": "1.2.3", + "hash": "sha256-tR/LT14DaLrNsTxSX+9XwH572cigRV22+uB6JSmdt7M=" + }, + { + "pname": "ReactiveProperty", + "version": "9.3.1", + "hash": "sha256-2gCpFE9rMDbDlyNi1Fncbr5Bb3u5GDM8VUECrX4PId4=" + }, + { + "pname": "ReactiveProperty.Core", + "version": "9.3.1", + "hash": "sha256-dYZ1daWZVVKWHpprLtiJo6n8DRCsORgNHswFy2D39SU=" }, { "pname": "ReactiveUI", "version": "13.2.10", - "sha256": "0x4pk45wipzsjzkv23as8l0sdds665l9404gaix8c0z2n24s76gg" + "hash": "sha256-75mjibDiA4Z6VI8AkmgxRremAUVaDbHnl/rfyAuZl3Q=" }, { "pname": "ReactiveUI", - "version": "17.1.17", - "sha256": "1v0w88mk8bh68lcj968q61zyx6l07himild605c2xi5lb6a42z71" + "version": "19.4.1", + "hash": "sha256-cN00n2bjSc8p1mpYxF3S9KopdU0XrLVI0g8pAjehHfw=" + }, + { + "pname": "ReactiveUI.Fody", + "version": "19.4.1", + "hash": "sha256-SYqDw5ghH0wddNJOa1Dc/haE0NSOMa8I4d1EKjoVgsg=" + }, + { + "pname": "runtime.any.System.Collections", + "version": "4.3.0", + "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" + }, + { + "pname": "runtime.any.System.Diagnostics.Tools", + "version": "4.3.0", + "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I=" + }, + { + "pname": "runtime.any.System.Diagnostics.Tracing", + "version": "4.3.0", + "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" + }, + { + "pname": "runtime.any.System.Globalization", + "version": "4.3.0", + "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" + }, + { + "pname": "runtime.any.System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" + }, + { + "pname": "runtime.any.System.IO", + "version": "4.3.0", + "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" + }, + { + "pname": "runtime.any.System.Reflection", + "version": "4.3.0", + "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" + }, + { + "pname": "runtime.any.System.Reflection.Extensions", + "version": "4.3.0", + "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=" + }, + { + "pname": "runtime.any.System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" + }, + { + "pname": "runtime.any.System.Resources.ResourceManager", + "version": "4.3.0", + "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" + }, + { + "pname": "runtime.any.System.Runtime", + "version": "4.3.0", + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" + }, + { + "pname": "runtime.any.System.Runtime.Handles", + "version": "4.3.0", + "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" + }, + { + "pname": "runtime.any.System.Runtime.InteropServices", + "version": "4.3.0", + "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" + }, + { + "pname": "runtime.any.System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" + }, + { + "pname": "runtime.any.System.Text.Encoding.Extensions", + "version": "4.3.0", + "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=" + }, + { + "pname": "runtime.any.System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" + }, + { + "pname": "runtime.any.System.Threading.Timer", + "version": "4.3.0", + "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs=" }, { "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d" + "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" }, { "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59" + "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" }, { "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa" + "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" }, { "pname": "runtime.native.System", "version": "4.3.0", - "sha256": "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4" + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" }, { "pname": "runtime.native.System.IO.Compression", "version": "4.3.0", - "sha256": "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d" + "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8=" }, { "pname": "runtime.native.System.Net.Http", "version": "4.3.0", - "sha256": "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk" + "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" }, { "pname": "runtime.native.System.Security.Cryptography.Apple", "version": "4.3.0", - "sha256": "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q" + "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" }, { "pname": "runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97" + "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" }, { "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3" + "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" }, { "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf" + "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" }, { "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", "version": "4.3.0", - "sha256": "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi" + "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" }, { "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3" + "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" }, { "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn" + "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" }, { "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3" + "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" }, { "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy" + "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" }, { "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5" + "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" + }, + { + "pname": "runtime.unix.Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" + }, + { + "pname": "runtime.unix.System.Console", + "version": "4.3.0", + "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190=" + }, + { + "pname": "runtime.unix.System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" + }, + { + "pname": "runtime.unix.System.IO.FileSystem", + "version": "4.3.0", + "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" + }, + { + "pname": "runtime.unix.System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" + }, + { + "pname": "runtime.unix.System.Net.Sockets", + "version": "4.3.0", + "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=" + }, + { + "pname": "runtime.unix.System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" + }, + { + "pname": "runtime.unix.System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" }, { "pname": "Serilog", "version": "2.10.0", - "sha256": "08bih205i632ywryn3zxkhb15dwgyaxbhmm1z3b5nmby9fb25k7v" + "hash": "sha256-+8wilkt+VVvW+KFWuLryj7cSFpz9D+sz92KYWICAcSE=" + }, + { + "pname": "Serilog", + "version": "3.0.1", + "hash": "sha256-cfcZXT2eQ4K6RQ0twDYPN5jkDpG9dYqpmHJX4zWrL+o=" }, { "pname": "Serilog.Sinks.Debug", "version": "2.0.0", - "sha256": "1i7j870l47gan3gpnnlzkccn5lbm7518cnkp25a3g5gp9l0dbwpw" + "hash": "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ=" }, { "pname": "Serilog.Sinks.File", "version": "5.0.0", - "sha256": "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q" + "hash": "sha256-GKy9hwOdlu2W0Rw8LiPyEwus+sDtSOTl8a5l9uqz+SQ=" }, { "pname": "SkiaSharp", - "version": "2.88.0-preview.178", - "sha256": "062g14s6b2bixanpwihj3asm3jwvfw15mhvzqv6901afrlgzx4nk" + "version": "2.88.1-preview.108", + "hash": "sha256-5r0MDLe804yedcgOgCDsZ6PvsLA9gZqimo/V16AZVQc=" }, { "pname": "SkiaSharp.NativeAssets.Linux", - "version": "2.88.0-preview.178", - "sha256": "07kga1j51l3l302nvf537zg5clf6rflinjy0xd6i06cmhpkf3ksw" + "version": "2.88.1-preview.108", + "hash": "sha256-10t3pmhdfwRnpabAXIBAnjhZkhKxOTb6XfxqgZkUTqY=" }, { "pname": "SkiaSharp.NativeAssets.macOS", - "version": "2.88.0-preview.178", - "sha256": "14p95nxccs6yq4rn2h9zbb60k0232k6349zdpy31jcfr6gc99cgi" + "version": "2.88.1-preview.108", + "hash": "sha256-JTiKU3h2UMjQBEOYOq3rIRsjwqynXab0S0tAqk/Dl+0=" }, { "pname": "SkiaSharp.NativeAssets.WebAssembly", - "version": "2.88.0-preview.178", - "sha256": "09jmcg5k1vpsal8jfs90mwv0isf2y5wq3h4hd77rv6vffn5ic4sm" + "version": "2.88.1-preview.108", + "hash": "sha256-rZ1Snmz+0daTtt4uPavCYRriRnWg+QlyVidNxCV+CSk=" }, { "pname": "SkiaSharp.NativeAssets.Win32", - "version": "2.88.0-preview.178", - "sha256": "0ficil702lv3fvwpngbqh5l85i05l5jafzyh4jprzshr2qbnd8nl" + "version": "2.88.1-preview.108", + "hash": "sha256-9noqwRicVwd920EvHzGVcDvgU5j6Zaj54LoWnC9d6RU=" }, { "pname": "Splat", "version": "10.0.1", - "sha256": "18fzrn7xwjzxj4v3drs8djd3yf14bnq5n9n8vdnwfa1zk5jqpsb9" + "hash": "sha256-aemLZZk/KMdt28gmW7BdJDg/mmxI5zY2kf1L3o/N36E=" }, { "pname": "Splat", - "version": "14.1.17", - "sha256": "1akhj04sbxhhfj6zdlr5c0sh696747b0x46g3ayv4yl15kwq6pz5" + "version": "14.6.37", + "hash": "sha256-UPRwJetwHR31Z7sw7c0dojnvlFAmDNQEF7RXssiMQuY=" + }, + { + "pname": "Splat", + "version": "14.7.1", + "hash": "sha256-RzNQU8tTstC1MBZL6D11Ivq69pmPvl+A9eT9zXhdSOc=" + }, + { + "pname": "Splat.Autofac", + "version": "14.7.1", + "hash": "sha256-6Lg4C24wDMddJn5HrC9uyFuWrE12gPzayrcxyqvvI0w=" }, { "pname": "System.AppContext", "version": "4.3.0", - "sha256": "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya" + "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=" }, { "pname": "System.Buffers", "version": "4.3.0", - "sha256": "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy" + "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" }, { "pname": "System.Buffers", "version": "4.5.1", - "sha256": "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3" - }, - { - "pname": "System.Collections", - "version": "4.0.11", - "sha256": "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6" + "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" }, { "pname": "System.Collections", "version": "4.3.0", - "sha256": "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9" + "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" }, { "pname": "System.Collections.Concurrent", "version": "4.3.0", - "sha256": "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8" + "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" }, { "pname": "System.Collections.Immutable", - "version": "5.0.0", - "sha256": "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r" - }, - { - "pname": "System.Collections.NonGeneric", - "version": "4.3.0", - "sha256": "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k" - }, - { - "pname": "System.Collections.Specialized", - "version": "4.3.0", - "sha256": "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20" - }, - { - "pname": "System.ComponentModel", - "version": "4.3.0", - "sha256": "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb" + "version": "7.0.0", + "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk=" }, { "pname": "System.ComponentModel.Annotations", "version": "4.5.0", - "sha256": "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p" + "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso=" }, { "pname": "System.ComponentModel.Annotations", "version": "5.0.0", - "sha256": "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j" + "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg=" }, { - "pname": "System.ComponentModel.Primitives", - "version": "4.3.0", - "sha256": "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0" - }, - { - "pname": "System.ComponentModel.TypeConverter", - "version": "4.3.0", - "sha256": "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x" + "pname": "System.Configuration.ConfigurationManager", + "version": "4.4.0", + "hash": "sha256-+8wGYllXnIxRzy9dLhZFB88GoPj8ivYXS0KUfcivT8I=" }, { "pname": "System.Console", "version": "4.3.0", - "sha256": "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay" - }, - { - "pname": "System.Diagnostics.Debug", - "version": "4.0.11", - "sha256": "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz" + "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=" }, { "pname": "System.Diagnostics.Debug", "version": "4.3.0", - "sha256": "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y" + "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" }, { "pname": "System.Diagnostics.DiagnosticSource", "version": "4.3.0", - "sha256": "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq" + "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" }, { "pname": "System.Diagnostics.DiagnosticSource", + "version": "4.7.1", + "hash": "sha256-l2TM1pfyRF70Xmzoz1dAqWkB8+/K6b8t5Tj7aF1UO9Y=" + }, + { + "pname": "System.Diagnostics.EventLog", "version": "6.0.0", - "sha256": "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5" - }, - { - "pname": "System.Diagnostics.Tools", - "version": "4.0.1", - "sha256": "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x" + "hash": "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM=" }, { "pname": "System.Diagnostics.Tools", "version": "4.3.0", - "sha256": "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1" - }, - { - "pname": "System.Diagnostics.TraceSource", - "version": "4.3.0", - "sha256": "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766" + "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y=" }, { "pname": "System.Diagnostics.Tracing", "version": "4.3.0", - "sha256": "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4" + "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" }, { "pname": "System.Drawing.Common", - "version": "6.0.0", - "sha256": "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz" - }, - { - "pname": "System.Dynamic.Runtime", - "version": "4.0.11", - "sha256": "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9" - }, - { - "pname": "System.Dynamic.Runtime", - "version": "4.3.0", - "sha256": "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk" - }, - { - "pname": "System.Globalization", - "version": "4.0.11", - "sha256": "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d" + "version": "7.0.0", + "hash": "sha256-t4FBgTMhuOA5FA23fg0WQOGuH0njV7hJXST/Ln/Znks=" }, { "pname": "System.Globalization", "version": "4.3.0", - "sha256": "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki" + "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" }, { "pname": "System.Globalization.Calendars", "version": "4.3.0", - "sha256": "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq" + "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" }, { "pname": "System.Globalization.Extensions", "version": "4.3.0", - "sha256": "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls" - }, - { - "pname": "System.IO", - "version": "4.1.0", - "sha256": "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp" + "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" }, { "pname": "System.IO", "version": "4.3.0", - "sha256": "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f" + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" }, { "pname": "System.IO.Compression", "version": "4.3.0", - "sha256": "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz" + "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA=" }, { "pname": "System.IO.Compression.ZipFile", "version": "4.3.0", - "sha256": "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar" - }, - { - "pname": "System.IO.FileSystem", - "version": "4.0.1", - "sha256": "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1" + "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=" }, { "pname": "System.IO.FileSystem", "version": "4.3.0", - "sha256": "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw" - }, - { - "pname": "System.IO.FileSystem.Primitives", - "version": "4.0.1", - "sha256": "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612" + "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" }, { "pname": "System.IO.FileSystem.Primitives", "version": "4.3.0", - "sha256": "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c" - }, - { - "pname": "System.Linq", - "version": "4.1.0", - "sha256": "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5" + "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" }, { "pname": "System.Linq", "version": "4.3.0", - "sha256": "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7" - }, - { - "pname": "System.Linq.Expressions", - "version": "4.1.0", - "sha256": "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg" + "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" }, { "pname": "System.Linq.Expressions", "version": "4.3.0", - "sha256": "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv" + "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=" }, { "pname": "System.Memory", "version": "4.5.3", - "sha256": "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a" - }, - { - "pname": "System.Memory", - "version": "4.5.4", - "sha256": "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y" + "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk=" }, { "pname": "System.Net.Http", "version": "4.3.0", - "sha256": "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j" + "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q=" + }, + { + "pname": "System.Net.NameResolution", + "version": "4.3.0", + "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c=" }, { "pname": "System.Net.Primitives", "version": "4.3.0", - "sha256": "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii" + "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=" }, { "pname": "System.Net.Sockets", "version": "4.3.0", - "sha256": "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla" + "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=" }, { "pname": "System.Numerics.Vectors", "version": "4.5.0", - "sha256": "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59" - }, - { - "pname": "System.ObjectModel", - "version": "4.0.12", - "sha256": "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj" + "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" }, { "pname": "System.ObjectModel", "version": "4.3.0", - "sha256": "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2" + "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=" + }, + { + "pname": "System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" }, { "pname": "System.Reactive", "version": "5.0.0", - "sha256": "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik" + "hash": "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE=" }, { - "pname": "System.Reflection", - "version": "4.1.0", - "sha256": "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9" + "pname": "System.Reactive", + "version": "6.0.0", + "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y=" }, { "pname": "System.Reflection", "version": "4.3.0", - "sha256": "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m" - }, - { - "pname": "System.Reflection.Emit", - "version": "4.0.1", - "sha256": "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp" + "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" }, { "pname": "System.Reflection.Emit", "version": "4.3.0", - "sha256": "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74" + "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" }, { "pname": "System.Reflection.Emit", "version": "4.7.0", - "sha256": "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp" - }, - { - "pname": "System.Reflection.Emit.ILGeneration", - "version": "4.0.1", - "sha256": "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0" + "hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg=" }, { "pname": "System.Reflection.Emit.ILGeneration", "version": "4.3.0", - "sha256": "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q" - }, - { - "pname": "System.Reflection.Emit.Lightweight", - "version": "4.0.1", - "sha256": "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr" + "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" }, { "pname": "System.Reflection.Emit.Lightweight", "version": "4.3.0", - "sha256": "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c" - }, - { - "pname": "System.Reflection.Extensions", - "version": "4.0.1", - "sha256": "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn" + "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" }, { "pname": "System.Reflection.Extensions", "version": "4.3.0", - "sha256": "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq" + "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=" }, { "pname": "System.Reflection.Metadata", "version": "1.6.0", - "sha256": "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4" + "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=" }, { "pname": "System.Reflection.Metadata", - "version": "5.0.0", - "sha256": "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss" - }, - { - "pname": "System.Reflection.Primitives", - "version": "4.0.1", - "sha256": "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28" + "version": "7.0.0", + "hash": "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI=" }, { "pname": "System.Reflection.Primitives", "version": "4.3.0", - "sha256": "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276" - }, - { - "pname": "System.Reflection.TypeExtensions", - "version": "4.1.0", - "sha256": "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7" + "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" }, { "pname": "System.Reflection.TypeExtensions", "version": "4.3.0", - "sha256": "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1" - }, - { - "pname": "System.Resources.ResourceManager", - "version": "4.0.1", - "sha256": "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi" + "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" }, { "pname": "System.Resources.ResourceManager", "version": "4.3.0", - "sha256": "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49" - }, - { - "pname": "System.Runtime", - "version": "4.1.0", - "sha256": "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m" + "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" }, { "pname": "System.Runtime", "version": "4.3.0", - "sha256": "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7" - }, - { - "pname": "System.Runtime", - "version": "4.3.1", - "sha256": "03ch4d2acf6q037a4njxpll2kkx3dwzlg07yxr4z5m6j1kqgmm27" + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "4.6.0", - "sha256": "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "5.0.0", - "sha256": "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x" + "hash": "sha256-FTjQeMuvqnKxpoVsVh/OlQ21NMaZiFtOdv7VdZ+Iv3Y=" }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "6.0.0", - "sha256": "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc" - }, - { - "pname": "System.Runtime.Extensions", - "version": "4.1.0", - "sha256": "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z" + "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" }, { "pname": "System.Runtime.Extensions", "version": "4.3.0", - "sha256": "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60" - }, - { - "pname": "System.Runtime.Handles", - "version": "4.0.1", - "sha256": "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g" + "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" }, { "pname": "System.Runtime.Handles", "version": "4.3.0", - "sha256": "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8" - }, - { - "pname": "System.Runtime.InteropServices", - "version": "4.1.0", - "sha256": "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1" + "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" }, { "pname": "System.Runtime.InteropServices", "version": "4.3.0", - "sha256": "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j" + "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" }, { "pname": "System.Runtime.InteropServices.RuntimeInformation", "version": "4.3.0", - "sha256": "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii" + "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=" }, { "pname": "System.Runtime.Numerics", "version": "4.3.0", - "sha256": "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z" - }, - { - "pname": "System.Runtime.Serialization.Primitives", - "version": "4.1.1", - "sha256": "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k" + "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" }, { "pname": "System.Runtime.Serialization.Primitives", "version": "4.3.0", - "sha256": "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf" + "hash": "sha256-zu5m1M9usend+i9sbuD6Xbizdo8Z6N5PEF9DAtEVewc=" + }, + { + "pname": "System.Security.Claims", + "version": "4.3.0", + "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks=" }, { "pname": "System.Security.Cryptography.Algorithms", "version": "4.3.0", - "sha256": "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml" + "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" }, { "pname": "System.Security.Cryptography.Cng", "version": "4.3.0", - "sha256": "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv" + "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" }, { "pname": "System.Security.Cryptography.Csp", "version": "4.3.0", - "sha256": "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1" + "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" }, { "pname": "System.Security.Cryptography.Encoding", "version": "4.3.0", - "sha256": "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32" + "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" }, { "pname": "System.Security.Cryptography.OpenSsl", "version": "4.3.0", - "sha256": "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc" + "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" }, { "pname": "System.Security.Cryptography.Primitives", "version": "4.3.0", - "sha256": "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby" + "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" + }, + { + "pname": "System.Security.Cryptography.ProtectedData", + "version": "4.4.0", + "hash": "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE=" }, { "pname": "System.Security.Cryptography.X509Certificates", "version": "4.3.0", - "sha256": "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h" + "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" + }, + { + "pname": "System.Security.Principal", + "version": "4.3.0", + "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk=" }, { "pname": "System.Security.Principal.Windows", - "version": "5.0.0", - "sha256": "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8" + "version": "4.3.0", + "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=" }, { - "pname": "System.Text.Encoding", - "version": "4.0.11", - "sha256": "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw" + "pname": "System.Security.Principal.Windows", + "version": "4.7.0", + "hash": "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg=" }, { "pname": "System.Text.Encoding", "version": "4.3.0", - "sha256": "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr" - }, - { - "pname": "System.Text.Encoding.CodePages", - "version": "6.0.0", - "sha256": "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww" - }, - { - "pname": "System.Text.Encoding.Extensions", - "version": "4.0.11", - "sha256": "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs" + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" }, { "pname": "System.Text.Encoding.Extensions", "version": "4.3.0", - "sha256": "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy" - }, - { - "pname": "System.Text.RegularExpressions", - "version": "4.1.0", - "sha256": "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7" + "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" }, { "pname": "System.Text.RegularExpressions", "version": "4.3.0", - "sha256": "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l" - }, - { - "pname": "System.Threading", - "version": "4.0.11", - "sha256": "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls" + "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0=" }, { "pname": "System.Threading", "version": "4.3.0", - "sha256": "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34" - }, - { - "pname": "System.Threading.Tasks", - "version": "4.0.11", - "sha256": "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5" + "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" }, { "pname": "System.Threading.Tasks", "version": "4.3.0", - "sha256": "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.0.0", - "sha256": "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr" + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" }, { "pname": "System.Threading.Tasks.Extensions", "version": "4.3.0", - "sha256": "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z" + "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=" }, { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.5.4", - "sha256": "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153" + "pname": "System.Threading.ThreadPool", + "version": "4.3.0", + "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=" }, { "pname": "System.Threading.Timer", "version": "4.3.0", - "sha256": "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56" + "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=" }, { "pname": "System.ValueTuple", "version": "4.5.0", - "sha256": "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy" - }, - { - "pname": "System.Xml.ReaderWriter", - "version": "4.0.11", - "sha256": "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5" + "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=" }, { "pname": "System.Xml.ReaderWriter", "version": "4.3.0", - "sha256": "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1" - }, - { - "pname": "System.Xml.XDocument", - "version": "4.0.11", - "sha256": "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18" + "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA=" }, { "pname": "System.Xml.XDocument", "version": "4.3.0", - "sha256": "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd" - }, - { - "pname": "System.Xml.XmlDocument", - "version": "4.3.0", - "sha256": "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi" + "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI=" }, { "pname": "ThemeEditor.Controls.ColorPicker", - "version": "0.10.12", - "sha256": "17kh28fkywqmz5yams8wzr50ihkv52y24gk8bz9fxl6kfzmgk0ky" + "version": "0.10.17", + "hash": "sha256-SoamofgQCfZFGJjTyD7KL8a+cIFzTmaDCIbHlfbz/qw=" }, { "pname": "Tmds.DBus", - "version": "0.10.1", - "sha256": "1wafa009cjj1rziias2n00ap0g8kdg2iig5sjlrxj2kld24lgbli" + "version": "0.9.0", + "hash": "sha256-w332WVsJrdAOnlSUtgvatSTtnoC81C3LG6J2ip42fW8=" }, { "pname": "WebSocketSharp-netstandard", "version": "1.0.1", - "sha256": "0q89wiqpli72333zsa04d1vzq9xj0583hn5mih9sdd84myksz5b0" + "hash": "sha256-YJWvp68EtaYTjLVYOFABsif8d2gEKP3HGOJEenHkCWE=" }, { "pname": "xunit", - "version": "2.4.1", - "sha256": "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20" + "version": "2.5.1", + "hash": "sha256-SxDG/dFHk+7F4x4PYXRyw8PwuqcmH7Mhz9PHA2sVuYg=" }, { "pname": "xunit.abstractions", "version": "2.0.3", - "sha256": "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh" + "hash": "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM=" }, { "pname": "xunit.analyzers", - "version": "0.10.0", - "sha256": "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j" + "version": "1.3.0", + "hash": "sha256-+l50DUYCEdnrHg6cKUfsNx8m0BRwAVdqURCQb0aZLLQ=" }, { "pname": "xunit.assert", - "version": "2.4.1", - "sha256": "1imynzh80wxq2rp9sc4gxs4x1nriil88f72ilhj5q0m44qqmqpc6" + "version": "2.5.1", + "hash": "sha256-2U83B5QOaEgVUXBQ5/juqEqrKxeyo5LKTKQ/JCFUy/E=" }, { "pname": "xunit.core", - "version": "2.4.1", - "sha256": "1nnb3j4kzmycaw1g76ii4rfqkvg6l8gqh18falwp8g28h802019a" + "version": "2.5.1", + "hash": "sha256-igzHINMd6V01nEg6Hc3YpXdL4MT0ZlCY1RwlxQEO5Xg=" }, { "pname": "xunit.extensibility.core", - "version": "2.4.1", - "sha256": "103qsijmnip2pnbhciqyk2jyhdm6snindg5z2s57kqf5pcx9a050" + "version": "2.5.1", + "hash": "sha256-1wAQJZljPyQhhvaKuE0XV6OyFGxxyFtTWMCQd57mctw=" }, { "pname": "xunit.extensibility.execution", - "version": "2.4.1", - "sha256": "1pbilxh1gp2ywm5idfl0klhl4gb16j86ib4x83p8raql1dv88qia" + "version": "2.5.1", + "hash": "sha256-sgje8DfOxpdV4xXcGB5llrzr9rTlPPIQIr/PjP2A0p8=" }, { "pname": "xunit.runner.console", - "version": "2.4.1", - "sha256": "13ykz9anhz72xc4q6byvdfwrp54hlcbl6zsfapwfhnzyvfgb9w13" + "version": "2.5.1", + "hash": "sha256-CLf7tVyeslvtAqlFlp7Mr/lHq+C3p1duLzXGiHdZigM=" }, { "pname": "xunit.runner.visualstudio", - "version": "2.4.3", - "sha256": "0j1d0rbcm7pp6dypi61sjxp8l22sv261252z55b243l39jgv2rp3" + "version": "2.5.1", + "hash": "sha256-HbQNZB/4Kjv7UxP5cWAteiNiRErsqnWhCemcBiQ95Hg=" } ] diff --git a/pkgs/by-name/al/alttpr-opentracker/package.nix b/pkgs/by-name/al/alttpr-opentracker/package.nix index ed54af5d83bb..3b8406650896 100644 --- a/pkgs/by-name/al/alttpr-opentracker/package.nix +++ b/pkgs/by-name/al/alttpr-opentracker/package.nix @@ -17,29 +17,21 @@ }: buildDotnetModule rec { pname = "opentracker"; - version = "1.8.5"; + version = "1.8.6"; src = fetchFromGitHub { owner = "trippsc2"; - repo = pname; + repo = "opentracker"; tag = version; - hash = "sha512-nWkPgVYdnBJibyJRdLPe3O3RioDPbzumSritRejmr4CeiPb7aUTON7HjivcV/GKor1guEYu+TJ+QxYrqO/eppg=="; + hash = "sha256-4EBn3BX5tX+yPUjoNFQSls9CwTCd6MpvcBoUKwRndRo="; }; - patches = [./remove-project.patch]; - - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; nugetDeps = ./deps.json; - projectFile = "OpenTracker.sln"; - executables = ["OpenTracker"]; - - doCheck = true; - disabledTests = [ - "OpenTracker.UnitTests.Models.Nodes.Factories.SLightWorldConnectionFactoryTests.GetNodeConnections_ShouldReturnExpectedValue" - "OpenTracker.UnitTests.Models.Sections.Factories.ItemSectionFactoryTests.GetItemSection_ShouldReturnExpected" - ]; + projectFile = "src/OpenTracker/OpenTracker.csproj"; + executables = [ "OpenTracker" ]; nativeBuildInputs = [ autoPatchelfHook @@ -86,6 +78,6 @@ buildDotnetModule rec { license = licenses.mit; maintainers = [ ]; mainProgram = "OpenTracker"; - platforms = ["x86_64-linux"]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/by-name/al/alttpr-opentracker/remove-project.patch b/pkgs/by-name/al/alttpr-opentracker/remove-project.patch deleted file mode 100644 index 22a2068512e0..000000000000 --- a/pkgs/by-name/al/alttpr-opentracker/remove-project.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/OpenTracker.sln b/OpenTracker.sln -index 0a8c438..77124e1 100644 ---- a/OpenTracker.sln -+++ b/OpenTracker.sln -@@ -4,9 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 - VisualStudioVersion = 16.0.29806.167 - MinimumVisualStudioVersion = 10.0.40219.1 - Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTracker", "OpenTracker\OpenTracker.csproj", "{9D32A24F-7FF0-4632-B663-5AD2D64A6C87}" -- ProjectSection(ProjectDependencies) = postProject -- {732A9A56-32B4-4149-B3A5-F2A4F48293D3} = {732A9A56-32B4-4149-B3A5-F2A4F48293D3} -- EndProjectSection - EndProject - Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTracker.Models", "OpenTracker.Models\OpenTracker.Models.csproj", "{5DB05A1F-56E3-4035-8898-5CFB22DB3568}" - EndProject From a88130c925c3fe135842b4b7de8cb696c8ee1605 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Wed, 1 Jan 2025 12:22:28 -0800 Subject: [PATCH 55/60] firebase-tools: fixes for node 22 --- .../fi/firebase-tools/001-override-nan.patch | 54 +++++++++++++++++++ pkgs/by-name/fi/firebase-tools/package.nix | 15 +++++- 2 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/fi/firebase-tools/001-override-nan.patch diff --git a/pkgs/by-name/fi/firebase-tools/001-override-nan.patch b/pkgs/by-name/fi/firebase-tools/001-override-nan.patch new file mode 100644 index 000000000000..5da013133fb1 --- /dev/null +++ b/pkgs/by-name/fi/firebase-tools/001-override-nan.patch @@ -0,0 +1,54 @@ +diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json +index da429c128..9c69ec8cb 100644 +--- a/npm-shrinkwrap.json ++++ b/npm-shrinkwrap.json +@@ -14637,9 +14637,10 @@ + } + }, + "node_modules/nan": { +- "version": "2.17.0", +- "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", +- "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==", ++ "version": "2.22.0", ++ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", ++ "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", ++ "license": "MIT", + "optional": true + }, + "node_modules/nanoid": { +@@ -31852,9 +31853,9 @@ + } + }, + "nan": { +- "version": "2.17.0", +- "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", +- "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==", ++ "version": "2.22.0", ++ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", ++ "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", + "optional": true + }, + "nanoid": { +@@ -33672,7 +33673,7 @@ + "optional": true, + "requires": { + "install-artifact-from-github": "^1.3.1", +- "nan": "^2.17.0", ++ "nan": "^2.22.0", + "node-gyp": "^9.3.0" + } + }, +diff --git a/package.json b/package.json +index a4284d841..90a0524f2 100644 +--- a/package.json ++++ b/package.json +@@ -98,6 +98,9 @@ + "src/test/**/*" + ] + }, ++ "overrides" : { ++ "nan": "^2.22.0" ++ }, + "dependencies": { + "@electric-sql/pglite": "^0.2.0", + "@google-cloud/cloud-sql-connector": "^1.3.3", diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix index c76310cec6d3..3193cfb77260 100644 --- a/pkgs/by-name/fi/firebase-tools/package.nix +++ b/pkgs/by-name/fi/firebase-tools/package.nix @@ -5,8 +5,8 @@ fetchFromGitHub, python3, xcbuild, + fetchpatch, }: - let version = "13.29.1"; src = fetchFromGitHub { @@ -20,7 +20,18 @@ buildNpmPackage { pname = "firebase-tools"; inherit version src; - npmDepsHash = "sha256-3+XeXK3VGIs4Foi9iW9Kho/Y0JsTQZ7p+582MPgdH1A="; + npmDepsHash = "sha256-lQmoemIxzy2biu80UTR2eA+KJBeXWPh0xZRs/1of0eo="; + + patches = [ + # Use modern version of `ajv` instead of the four year old default in 13.29.1 + (fetchpatch { + name = "bump-ajv.patch"; + url = "https://github.com/firebase/firebase-tools/commit/b684155d827e7d1e8390e22511c0e1b5c46812ef.patch"; + hash = "sha256-yv2AknT85Eyurc1ZFbbF5S9Sj/VEaVnHXBcXI10OWpw="; + }) + # Fix embedded nan version to support node 22 + ./001-override-nan.patch + ]; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json From 4789876b3b0eac0b0c7b117292d3bdb3647cefda Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Jan 2025 14:17:31 +0000 Subject: [PATCH 56/60] tone: 0.2.3 -> 0.2.4 --- pkgs/by-name/to/tone/deps.json | 8 ++++---- pkgs/by-name/to/tone/package.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/to/tone/deps.json b/pkgs/by-name/to/tone/deps.json index af126d75bdd0..586dfac16f49 100644 --- a/pkgs/by-name/to/tone/deps.json +++ b/pkgs/by-name/to/tone/deps.json @@ -141,8 +141,8 @@ }, { "pname": "Sandreas.AudioMetadata", - "version": "0.2.5", - "hash": "sha256-4FrW1QV4okSEswTpgj/dhFurR/2AHyTgqDgMBjRproI=" + "version": "0.2.7", + "hash": "sha256-GYD+nAURuU99/3JH/4QTthhzAVsau/qpcvih4eiJxtk=" }, { "pname": "Sandreas.Files", @@ -241,7 +241,7 @@ }, { "pname": "z440.atl.core", - "version": "6.9.0", - "hash": "sha256-lme55hhVwZ9Y/wVmekA0gVIsw3RUoyYuL9gMEHXuWMU=" + "version": "6.11.0", + "hash": "sha256-V1r1ftZ/Ud0pw/qwnqpJodRaGi9FyG3uIy3ykJUvxjg=" } ] diff --git a/pkgs/by-name/to/tone/package.nix b/pkgs/by-name/to/tone/package.nix index 64b737ad6c0d..a85045ebb079 100644 --- a/pkgs/by-name/to/tone/package.nix +++ b/pkgs/by-name/to/tone/package.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "tone"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "sandreas"; repo = "tone"; tag = "v${version}"; - hash = "sha256-NBFAPEeUKZgyfNlvcOBS1IpktEnI+fOd9WLj0ByzpLY="; + hash = "sha256-DX54NSlqAZzVQObm9qjUsYatjxjHKGcSLHH1kVD4Row="; }; projectFile = "tone/tone.csproj"; From 3a209347c2920bcbf11a5a37c69ed6d365f1438d Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Fri, 3 Jan 2025 08:11:04 +0800 Subject: [PATCH 57/60] fritzing: 1.0.2 -> 1.0.4 --- .../science/electronics/fritzing/default.nix | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index 1821ac63a4eb..f0d98e7a823c 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -21,33 +21,33 @@ let # SHA256 of the fritzing-parts HEAD on the master branch, # which contains the latest stable parts definitions - partsSha = "015626e6cafb1fc7831c2e536d97ca2275a83d32"; + partsSha = "76235099ed556e52003de63522fdd74e61d53a36"; parts = fetchFromGitHub { owner = "fritzing"; repo = "fritzing-parts"; rev = partsSha; - hash = "sha256-5jw56cqxpT/8bf1q551WG53J6Lw5pH0HEtRUoNNMc+A="; + hash = "sha256-1QVcPbRBOSYnNFsp7B2OyPXYuPaINRv9yEqGZFd662Y="; }; # Header-only library svgpp = fetchFromGitHub { owner = "svgpp"; repo = "svgpp"; - rev = "v1.3.0"; - hash = "sha256-kJEVnMYnDF7bThDB60bGXalYgpn9c5/JCZkRSK5GoE4="; + tag = "v1.3.1"; + hash = "sha256-nW0ns06XWfUi22nOKZzFKgAOHVIlQqChW8HxUDOFMh4="; }; in stdenv.mkDerivation { pname = "fritzing"; - version = "1.0.2"; + version = "1.0.4"; src = fetchFromGitHub { owner = "fritzing"; repo = "fritzing-app"; - rev = "dbdbe34c843677df721c7b3fc3e32c0f737e7e95"; - hash = "sha256-Xi5sPU2RGkqh7T+EOvwxJJKKYDhJfccyEZ8LBBTb2s4="; + rev = "a8c6ef7cf66f7a42b9b233d6137f1b70a9573a25"; + hash = "sha256-a/bWAUeDPj3g8BECOlXuqyCi4JgGLLs1605m380Drt0="; }; nativeBuildInputs = [ @@ -56,6 +56,7 @@ stdenv.mkDerivation { qttools wrapQtAppsHook ]; + buildInputs = [ qtbase @@ -90,12 +91,14 @@ stdenv.mkDerivation { cp -a ${parts}/* parts/ ''; - env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [ - "-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}" - "-I${svgpp}/include" - "-I${clipper}/include/polyclipping" - ]; - env.NIX_LDFLAGS = "-lquazip1-qt${lib.versions.major qtbase.version}"; + env = { + NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [ + "-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}" + "-I${svgpp}/include" + "-I${clipper}/include/polyclipping" + ]; + NIX_LDFLAGS = "-lquazip1-qt${lib.versions.major qtbase.version}"; + }; qmakeFlags = [ "phoenix.pro" @@ -116,18 +119,18 @@ stdenv.mkDerivation { -folder "$out/share/fritzing" ''; - meta = with lib; { + meta = { description = "Open source prototyping tool for Arduino-based projects"; - homepage = "https://fritzing.org/"; - license = with licenses; [ + homepage = "https://fritzing.org"; + license = with lib.licenses; [ gpl3 cc-by-sa-30 ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ robberer muscaln ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; mainProgram = "Fritzing"; }; } From 01cd8f28a7939d44061b37abee4680ec2ec59c06 Mon Sep 17 00:00:00 2001 From: Fede Barcelona Date: Fri, 3 Jan 2025 12:32:23 +0100 Subject: [PATCH 58/60] terraform-providers.sysdig: init at 1.42.0 --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b9d78d1fb230..f7e5b4f206b0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1236,6 +1236,15 @@ "spdx": "MPL-2.0", "vendorHash": "sha256-YdWs2orKhbwAZSQYC73t4e/vvVxk8LrBPG9ZC38VcZE=" }, + "sysdig": { + "hash": "sha256-TvZ7x4dWOERkqTWtjmbILdcWy12kqsV+OzLJ4siQ7mA=", + "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig", + "owner": "sysdiglabs", + "repo": "terraform-provider-sysdig", + "rev": "v1.42.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-nfVS4EXpPoriXyPpBK8k5OU9MTWxxrvTIwsF2uyQE/0=" + }, "tailscale": { "hash": "sha256-b2ZzXvlzlE+zv3Ufu4M5mcuLhyDkBbMznyM7NbiXAQs=", "homepage": "https://registry.terraform.io/providers/tailscale/tailscale", From 9f2d119bb1016d62a1ae4c3c97120b67436e3673 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 4 Jan 2025 02:32:55 +0000 Subject: [PATCH 59/60] qt6Packages.stdenv: lift out of scope This of course caused warnings for every package using `qt6Package.callPackage`. I trusted eval to flag up warnings but the new CI apparently currently swallows them. Fixes: 2b969610d645c8a38865aade14daedbdb824f1cd --- pkgs/top-level/qt6-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 9181e9b53edb..51e303ca3857 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -27,7 +27,6 @@ makeScopeWithSplicing' { inherit (self) callPackage; noExtraAttrs = set: lib.attrsets.removeAttrs set [ "extend" "override" "overrideScope" "overrideDerivation" ]; in (noExtraAttrs qt6) // { - stdenv = lib.warn "qt6Packages.stdenv is deprecated. Use stdenv instead." stdenv; # LIBRARIES accounts-qt = callPackage ../development/libraries/accounts-qt { }; @@ -125,4 +124,6 @@ makeScopeWithSplicing' { xwaylandvideobridge = kdePackages.callPackage ../tools/wayland/xwaylandvideobridge { }; }); +} // { + stdenv = lib.warn "qt6Packages.stdenv is deprecated. Use stdenv instead." stdenv; # Added for 25.05 } From f54ce21a530cf2c50ed7a1a0447ede64f85e6b65 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 4 Jan 2025 02:54:38 +0000 Subject: [PATCH 60/60] qt6Packages.stdenv: condition on `config.allowAliases` Should fix the warnings for good. Fixes: 9f2d119bb1016d62a1ae4c3c97120b67436e3673 --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/qt6-packages.nix | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2044c4005557..c1246415e951 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10482,7 +10482,7 @@ with pkgs; qt6 = recurseIntoAttrs (callPackage ../development/libraries/qt-6 { }); qt6Packages = recurseIntoAttrs (import ./qt6-packages.nix { - inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget kdePackages; + inherit lib config __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget kdePackages; inherit stdenv; }); diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 51e303ca3857..0834419e13bd 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -5,6 +5,7 @@ # this file. { lib +, config , __splicedPackages , makeScopeWithSplicing' , generateSplicesForMkScope @@ -124,6 +125,6 @@ makeScopeWithSplicing' { xwaylandvideobridge = kdePackages.callPackage ../tools/wayland/xwaylandvideobridge { }; }); -} // { +} // lib.optionalAttrs config.allowAliases { stdenv = lib.warn "qt6Packages.stdenv is deprecated. Use stdenv instead." stdenv; # Added for 25.05 }