diff --git a/.github/workflows/manual-nixos-v2.yml b/.github/workflows/manual-nixos-v2.yml index 2681ee4ac488..38c32e280075 100644 --- a/.github/workflows/manual-nixos-v2.yml +++ b/.github/workflows/manual-nixos-v2.yml @@ -19,7 +19,15 @@ permissions: {} jobs: nixos: name: nixos-manual-build - runs-on: ubuntu-24.04 + strategy: + fail-fast: false + matrix: + system: + - x86_64-linux + - aarch64-linux + runs-on: >- + ${{ (matrix.system == 'x86_64-linux' && 'ubuntu-24.04') + || (matrix.system == 'aarch64-linux' && 'ubuntu-24.04-arm') }} steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: @@ -36,15 +44,13 @@ jobs: name: nixpkgs-ci authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" - - name: Building NixOS manual - run: | - export NIX_PATH=nixpkgs=$(pwd) - nix-build --option restrict-eval true nixos/release.nix -A manual.x86_64-linux -o result-x86_64-linux - nix-build --option restrict-eval true nixos/release.nix -A manual.aarch64-linux -o result-aarch64-linux + - name: Build NixOS manual + id: build-manual + run: NIX_PATH=nixpkgs=$(pwd) nix-build --option restrict-eval true nixos/release.nix -A manual.${{ matrix.system }} - name: Upload NixOS manual - uses: actions/upload-artifact@3850ca5b6c832f17a0f754f6293181ebbf4e161d # v3.2.5 + uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1 with: - name: nixos-manual-result - path: result-** + name: nixos-manual-${{ matrix.system }} + path: result/ if-no-files-found: error diff --git a/doc/packages/index.md b/doc/packages/index.md index 89d7e477e76f..35bb6c1fe4ff 100644 --- a/doc/packages/index.md +++ b/doc/packages/index.md @@ -14,6 +14,7 @@ fish.section.md fuse.section.md geant4.section.md ibus.section.md +inkscape.section.md kakoune.section.md krita.section.md linux.section.md diff --git a/doc/packages/inkscape.section.md b/doc/packages/inkscape.section.md new file mode 100644 index 000000000000..192c059cd2a0 --- /dev/null +++ b/doc/packages/inkscape.section.md @@ -0,0 +1,29 @@ +# Inkscape {#sec-inkscape} + +[Inkscape](https://inkscape.org) is a powerful vector graphics editor. + +## Plugins {#inkscape-plugins} +Inkscape plugins are collected in the [`inkscape-extensions`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) package set. +To enable them, use an override on `inkscape-with-extensions`: + +```nix +inkscape-with-extensions.override { + inkscapeExtensions = with inkscape-extensions; [ + inkstitch + ]; +} +``` + +Similarly, this works in the shell: + +```bash +$ nix-shell -p 'inkscape-with-extensions.override { inkscapeExtensions = with inkscape-extensions; [inkstitch]; }' +[nix-shell:~]$ # Ink/Stitch is now available via the extension menu +[nix-shell:~]$ inkscape +``` + +All available extension can be enabled by passing `inkscapeExtensions = null;`. + +::: {.note} +Loading the Inkscape extensions stand-alone (without using `override`) does not affect Inkscape at all. +::: diff --git a/doc/redirects.json b/doc/redirects.json index a229e00a1ec7..934c49877b97 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -17,6 +17,9 @@ "ex-testEqualArrayOrMap-test-function-add-cowbell": [ "index.html#ex-testEqualArrayOrMap-test-function-add-cowbell" ], + "inkscape-plugins": [ + "index.html#inkscape-plugins" + ], "neovim": [ "index.html#neovim" ], @@ -62,6 +65,9 @@ "sec-build-helper-extendMkDerivation": [ "index.html#sec-build-helper-extendMkDerivation" ], + "sec-inkscape": [ + "index.html#sec-inkscape" + ], "sec-language-cosmic": [ "index.html#sec-language-cosmic" ], diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index a286cc63c73b..e7c4a05a8e47 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -218,6 +218,8 @@ - `python3Packages.beancount` was updated to 3.1.0. Previous major version remains available as `python3Packages.beancount_2`. +- `wastebin` has been updated to 3.0.0. See the [Changelog](https://github.com/matze/wastebin/blob/master/CHANGELOG.md#300) for breaking changes to the configuration. + - `binwalk` was updated to 3.1.0, which has been rewritten in rust. The python module is no longer available. See the release notes of [3.1.0](https://github.com/ReFirmLabs/binwalk/releases/tag/v3.1.0) for more information. diff --git a/nixos/modules/services/misc/homepage-dashboard.nix b/nixos/modules/services/misc/homepage-dashboard.nix index 7d8bf8ddfd37..72861fdbbe87 100644 --- a/nixos/modules/services/misc/homepage-dashboard.nix +++ b/nixos/modules/services/misc/homepage-dashboard.nix @@ -227,12 +227,14 @@ in Restart = "on-failure"; }; + enableStrictShellChecks = true; + # Related: # * https://github.com/NixOS/nixpkgs/issues/346016 ("homepage-dashboard: cache dir is not cleared upon version upgrade") # * https://github.com/gethomepage/homepage/discussions/4560 ("homepage NixOS package does not clear cache on upgrade leaving broken state") # * https://github.com/vercel/next.js/discussions/58864 ("Feature Request: Allow configuration of cache dir") preStart = '' - rm -rf "$NIXPKGS_HOMEPAGE_CACHE_DIR"/* + rm -rf "''${NIXPKGS_HOMEPAGE_CACHE_DIR:?}"/* ''; }; diff --git a/pkgs/applications/audio/pipecontrol/default.nix b/pkgs/applications/audio/pipecontrol/default.nix index 63b8160868f8..120ae1bb80bb 100644 --- a/pkgs/applications/audio/pipecontrol/default.nix +++ b/pkgs/applications/audio/pipecontrol/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "pipecontrol"; - version = "0.2.11"; + version = "0.2.12"; src = fetchFromGitHub { owner = "portaloffreedom"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jMP8hPv0Rv/OIVIzR/5R8LmEcyzwtcof9Ire86WtISc="; + sha256 = "sha256-WvQFmoEaxnkI61wPldSnMAoPAxNtI399hdHb/9bkPqc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix index a951974fd126..96460633f4d7 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix @@ -8,12 +8,12 @@ git, }: let - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "Saghen"; repo = "blink.cmp"; tag = "v${version}"; - hash = "sha256-aY+bBP3DOdr+yA0HKKUBR/87g096NXH9h4EUrIJY92Y="; + hash = "sha256-iIHV2M+cbXVb/XsFhEMyNDu2TvTlBb2R6DVGmvbQpn4="; }; blink-fuzzy-lib = rustPlatform.buildRustPackage { inherit version src; diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 3579a3a0b625..95597a6ee411 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -11,6 +11,7 @@ git, cairo, libxcb, + xcb-imdkit, xcb-util-cursor, xcbutilkeysyms, xcbutil, @@ -66,6 +67,7 @@ stdenv.mkDerivation rec { check libstartup_notification libxcb + xcb-imdkit xcb-util-cursor xcbutilkeysyms xcbutil @@ -74,6 +76,8 @@ stdenv.mkDerivation rec { which ]; + mesonFlags = [ "-Dimdkit=true" ]; + doCheck = false; meta = with lib; { diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index b492f036cd9a..365aefcc4543 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { hash = "sha256-hZHOg1wUR8Kpd6017fWzhMmG+/WQxSOCnsiyIvUcpbU="; }) (fetchpatch { + # error: 'is_regular' was not declared in this scope name = "boost_is_regular.patch"; url = "https://github.com/astroidmail/astroid/commit/abd84171dc6c4e639f3e86649ddc7ff211077244.patch"; hash = "sha256-IY60AnWm18ZwrCFsOvBg76UginpMo7gXBf8GT87FqW4="; @@ -101,7 +102,5 @@ stdenv.mkDerivation rec { ]; license = licenses.gpl3Plus; platforms = platforms.linux; - # error: 'is_regular' was not declared in this scope - broken = true; }; } diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index d50dbf09c5d2..d613cc647432 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -58,7 +58,7 @@ assert withQt -> qt6 != null; stdenv.mkDerivation rec { pname = "wireshark-${if withQt then "qt" else "cli"}"; - version = "4.4.4"; + version = "4.4.5"; outputs = [ "out" @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { repo = "wireshark"; owner = "wireshark"; rev = "v${version}"; - hash = "sha256-8Xpi66UI7S1k1IQ/nWAnnX5EXR29tOCO8XqrzY9Frmw="; + hash = "sha256-NO8tc5Av5Gl3yzkxK9KJAZwIjkrXEnIGmbLBPYKRm0E="; }; patches = [ diff --git a/pkgs/applications/science/electronics/openroad/default.nix b/pkgs/applications/science/electronics/openroad/default.nix index e6278d57f160..1e5cb3416f6d 100644 --- a/pkgs/applications/science/electronics/openroad/default.nix +++ b/pkgs/applications/science/electronics/openroad/default.nix @@ -9,7 +9,7 @@ git, python3, swig, - boost, + boost186, # 1.87.0 broken https://github.com/boostorg/asio/issues/442 cbc, # for clp cimg, clp, # for or-tools @@ -44,20 +44,16 @@ let in mkDerivation rec { pname = "openroad"; - version = "2.0-unstable-2024-12-31"; + version = "2.0-unstable-2025-03-01"; src = fetchFromGitHub { owner = "The-OpenROAD-Project"; repo = "OpenROAD"; - rev = "21cf29eda317e0c7777fbfaa3f384ec9fab1a0f9"; + rev = "e794373d44ac5421f0633d8dda7e5c59e8fe79bf"; fetchSubmodules = true; - hash = "sha256-cRETSW8cG/Q0hgxaFJjtnBqsIU0r6/kCRy1+5gJfC9o="; + hash = "sha256-a/X4FHkbiqHeblse2ZkLT56gYP+LCrAIZVCdsWF59jM="; }; - patches = [ - ./swig43-compat.patch # https://github.com/The-OpenROAD-Project/OpenROAD/issues/6451 - ]; - nativeBuildInputs = [ bison cmake @@ -70,7 +66,7 @@ mkDerivation rec { ]; buildInputs = [ - boost + boost186 cbc cimg clp @@ -99,12 +95,15 @@ mkDerivation rec { postPatch = '' patchShebangs --build etc/find_messages.py + # Disable two tests that are failing curently. + sed 's/^.*partition_gcd/# \0/g' -i src/par/test/CMakeLists.txt ''; cmakeFlags = [ "-DENABLE_TESTS=ON" "-DUSE_SYSTEM_BOOST=ON" "-DUSE_SYSTEM_ABC=OFF" + "-DABC_SKIP_TESTS=ON" # it attempts to download gtest "-DUSE_SYSTEM_OPENSTA=OFF" "-DOPENROAD_VERSION=${version}_${src.rev}" "-DCMAKE_RULE_MESSAGES=OFF" @@ -119,8 +118,6 @@ mkDerivation rec { # to see if there are any breaking changes in unstable that should be vendored as well. doCheck = true; checkPhase = '' - # Disable two tests that are failing curently. - sed 's/^.*partition_gcd/# \0/g' -i src/par/test/CTestTestfile.cmake make test ../test/regression ''; diff --git a/pkgs/applications/science/electronics/openroad/swig43-compat.patch b/pkgs/applications/science/electronics/openroad/swig43-compat.patch deleted file mode 100644 index 9bc49991e8e6..000000000000 --- a/pkgs/applications/science/electronics/openroad/swig43-compat.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/src/odb/src/swig/python/dbtypes.i -+++ b/src/odb/src/swig/python/dbtypes.i -@@ -271,7 +271,7 @@ WRAP_OBJECT_RETURN_REF(odb::dbViaParams, params_return) - swig_type_info *tf = SWIG_TypeQuery("odb::dbShape" "*"); - for(std::vector::iterator it = $1->begin(); it != $1->end(); it++) { - PyObject *o = SWIG_NewInstanceObj(&(*it), tf, 0); -- $result = SWIG_Python_AppendOutput($result, o); -+ $result = SWIG_AppendOutput($result, o); - } - } - -@@ -283,14 +283,14 @@ WRAP_OBJECT_RETURN_REF(odb::dbViaParams, params_return) - auto layer = it->second; - PyObject *layer_swig = SWIG_NewInstanceObj(layer, tf, 0); - PyObject *tuple = PyTuple_Pack(2, PyFloat_FromDouble(value), layer_swig); -- $result = SWIG_Python_AppendOutput($result, tuple); -+ $result = SWIG_AppendOutput($result, tuple); - } - } - - %typemap(argout) std::vector &OUTPUT { - for(auto it = $1->begin(); it != $1->end(); it++) { - PyObject *obj = PyInt_FromLong((long)*it); -- $result = SWIG_Python_AppendOutput($result, obj); -+ $result = SWIG_AppendOutput($result, obj); - } - } - diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix index 753386fef4ea..5c41bc86d719 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix @@ -14,13 +14,13 @@ let mkHyprlandPlugin, }: let - version = "0.47.0"; + version = "0.48.0"; hyprland-plugins-src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland-plugins"; - rev = "refs/tags/v${version}"; - hash = "sha256-zys4H2zSSIw54ecnYnBh2NUKZQraWD4B7qftuClrXho="; + tag = "v${version}"; + hash = "sha256-q6v3nkJZdu45bwCuymQ+q3U7uwfA+M3GqsvZ0TgNsi4="; }; in mkHyprlandPlugin hyprland { diff --git a/pkgs/by-name/ad/adminneo/package.nix b/pkgs/by-name/ad/adminneo/package.nix index 7f09f1ff73d5..e770d10153e7 100644 --- a/pkgs/by-name/ad/adminneo/package.nix +++ b/pkgs/by-name/ad/adminneo/package.nix @@ -10,13 +10,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "adminneo"; - version = "4.17"; + version = "4.17.2"; src = fetchFromGitHub { owner = "adminneo-org"; repo = "adminneo"; tag = "v${finalAttrs.version}"; - hash = "sha256-WVNeox5xygQjD5ekmcwZX9AnfhBq6YpHBLC2+WZJzvI="; + hash = "sha256-erz/kkaywkuT4k3wg8a48p2pTEqzsr3pHDrtNDtrq2I="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix index cc5a4b05dbc2..0c4a9e76d424 100644 --- a/pkgs/by-name/az/azahar/package.nix +++ b/pkgs/by-name/az/azahar/package.nix @@ -12,6 +12,7 @@ fmt, ffmpeg_6-headless, gamemode, + glslang, httplib, inih, lib, @@ -31,27 +32,23 @@ soundtouch, stdenv, vulkan-headers, - vulkan-loader, xorg, zstd, - enableSdl2Frontend ? true, + enableSDL2 ? true, SDL2, enableQt ? true, - qt6, enableQtTranslations ? enableQt, + qt6, enableCubeb ? true, cubeb, - useDiscordRichPresence ? false, + useDiscordRichPresence ? true, rapidjson, }: let inherit (lib) - optional optionals cmakeBool - optionalString getLib - makeLibraryPath ; in stdenv.mkDerivation (finalAttrs: { @@ -81,6 +78,7 @@ stdenv.mkDerivation (finalAttrs: { enet fmt ffmpeg_6-headless + glslang httplib inih libGL @@ -110,10 +108,10 @@ stdenv.mkDerivation (finalAttrs: { qtwayland ] ) - ++ optionals enableSdl2Frontend [ SDL2 ] ++ optionals enableQtTranslations [ qt6.qttools ] + ++ optionals enableSDL2 [ SDL2 ] ++ optionals enableCubeb [ cubeb ] - ++ optional useDiscordRichPresence rapidjson; + ++ optionals useDiscordRichPresence [ rapidjson ]; patches = [ # Fix boost errors @@ -143,35 +141,18 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "libgamemode.so.0" "${getLib gamemode}/lib/libgamemode.so.0" ''; - postInstall = - let - libs = makeLibraryPath [ vulkan-loader ]; - in - optionalString enableSdl2Frontend '' - for binfile in azahar azahar-room - do - wrapProgram "$out/bin/$binfile" \ - --prefix LD_LIBRARY_PATH : ${libs} - done - ''; - - cmakeFlags = - [ - (cmakeBool "CITRA_USE_PRECOMPILED_HEADERS" false) - (cmakeBool "USE_SYSTEM_LIBS" true) - (cmakeBool "DISABLE_SYSTEM_DYNARMIC" true) - (cmakeBool "DISABLE_SYSTEM_GLSLANG" true) - (cmakeBool "DISABLE_SYSTEM_LODEPNG" true) - (cmakeBool "DISABLE_SYSTEM_VMA" true) - (cmakeBool "DISABLE_SYSTEM_XBYAK" true) - (cmakeBool "ENABLE_QT" enableQt) - (cmakeBool "ENABLE_SDL2_FRONTEND" enableSdl2Frontend) - (cmakeBool "ENABLE_CUBEB" enableCubeb) - (cmakeBool "USE_DISCORD_PRESENCE" useDiscordRichPresence) - ] - ++ optionals enableQt [ - (cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslations) - ]; + cmakeFlags = [ + (cmakeBool "USE_SYSTEM_LIBS" true) + (cmakeBool "DISABLE_SYSTEM_DYNARMIC" true) + (cmakeBool "DISABLE_SYSTEM_LODEPNG" true) + (cmakeBool "DISABLE_SYSTEM_VMA" true) + (cmakeBool "DISABLE_SYSTEM_XBYAK" true) + (cmakeBool "ENABLE_QT" enableQt) + (cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslations) + (cmakeBool "ENABLE_SDL2" enableSDL2) + (cmakeBool "ENABLE_CUBEB" enableCubeb) + (cmakeBool "USE_DISCORD_PRESENCE" useDiscordRichPresence) + ]; meta = { description = "An open-source 3DS emulator project based on Citra"; @@ -179,6 +160,5 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ arthsmn ]; mainProgram = "azahar"; - platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/br/brev-cli/package.nix b/pkgs/by-name/br/brev-cli/package.nix index ba7099c14194..56b073b39a32 100644 --- a/pkgs/by-name/br/brev-cli/package.nix +++ b/pkgs/by-name/br/brev-cli/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.306"; + version = "0.6.307"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EzLEaLNbFyVaFMwjCvwyScdh62HG+3ZiCjVBnWzaLzk="; + sha256 = "sha256-GGrhe+fdu6wiZCWo6tn6qdRgRGLnJmsuGmg9M6iFF5w="; }; vendorHash = "sha256-DMkBRya1Dxn8mcpuG/vtIt+v/9iVmb58iNe3fPY/xv4="; diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix index a9b9f7f2f5ad..e82557f33b24 100644 --- a/pkgs/by-name/ca/cargo-binstall/package.nix +++ b/pkgs/by-name/ca/cargo-binstall/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.12.0"; + version = "1.12.2"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-EAJUscywbxYucqZEJ147FiNOHTO5umAwm5YHKC0g6yw="; + hash = "sha256-mGb6ZHi6XGYiVe0NHcBx7MWtcSDK2/wXpM4j0GiczEk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-jOrnfJUxyrBfAKW/khc3w5eFauuCjN6c5GMns1eGUag="; + cargoHash = "sha256-rtDV1wAoUfZOTBSvCjqhGlyDVXJiZ+Wopgu21zJWDfw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-llvm-cov/package.nix b/pkgs/by-name/ca/cargo-llvm-cov/package.nix index a2fc16b7021f..1ad5df27c772 100644 --- a/pkgs/by-name/ca/cargo-llvm-cov/package.nix +++ b/pkgs/by-name/ca/cargo-llvm-cov/package.nix @@ -45,7 +45,7 @@ let }; in -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage (finalAttrs: { inherit pname version; # Use `fetchFromGitHub` instead of `fetchCrate` because the latter does not @@ -59,7 +59,7 @@ rustPlatform.buildRustPackage { # Upstream doesn't include the lockfile so we need to add it back postUnpack = '' - cp ${cargoLock} source/Cargo.lock + cp ${cargoLock} ${finalAttrs.src.name}/Cargo.lock ''; useFetchCargoVendor = true; @@ -103,4 +103,4 @@ rustPlatform.buildRustPackage { # The profiler runtime is (currently) disabled on non-Linux platforms broken = !(stdenv.hostPlatform.isLinux && !stdenv.targetPlatform.isRedox); }; -} +}) diff --git a/pkgs/by-name/cd/cdogs-sdl/package.nix b/pkgs/by-name/cd/cdogs-sdl/package.nix index 10fb8f13f28a..068f34472e34 100644 --- a/pkgs/by-name/cd/cdogs-sdl/package.nix +++ b/pkgs/by-name/cd/cdogs-sdl/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cdogs-sdl"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { repo = "cdogs-sdl"; owner = "cxong"; rev = version; - sha256 = "sha256-uZPCki9G62nSrf8YfdyCfY1qgWlPT9BB2FqPicw32FM="; + sha256 = "sha256-I4v13CPdA2KYwhlIJjz+qgKe2EoXUtV6iWeadrg4Usc="; }; postPatch = '' diff --git a/pkgs/by-name/co/codeberg-cli/package.nix b/pkgs/by-name/co/codeberg-cli/package.nix index a2ef11f6fb43..c95d906d22c9 100644 --- a/pkgs/by-name/co/codeberg-cli/package.nix +++ b/pkgs/by-name/co/codeberg-cli/package.nix @@ -10,18 +10,18 @@ }: rustPlatform.buildRustPackage rec { pname = "codeberg-cli"; - version = "0.4.7"; + version = "0.4.9"; src = fetchFromGitea { domain = "codeberg.org"; owner = "Aviac"; repo = "codeberg-cli"; rev = "v${version}"; - hash = "sha256-GFUBMriBHKWjgT10Vvpa8FMqB6CvksSPoFBBr3uwrrg="; + hash = "sha256-uifLgXwKcdZ8Q2GjVIa/EA5iq+T9pm821aKsXPbPL34="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ZOPfCrWlJXL+XipEngLSIqryEAou5A8mTtZgA5gabc4="; + cargoHash = "sha256-nKI0bIKocTjodZ6O1VTTTrlzeeueaH6crF9jdTnx5lI="; nativeBuildInputs = [ pkg-config installShellFiles diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix index 389ca1560a9b..92f8bc2b56e4 100644 --- a/pkgs/by-name/co/cosmic-session/package.nix +++ b/pkgs/by-name/co/cosmic-session/package.nix @@ -8,19 +8,20 @@ stdenv, xdg-desktop-portal-cosmic, }: -rustPlatform.buildRustPackage rec { + +rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-session"; - version = "1.0.0-alpha.2"; + version = "1.0.0-alpha.6"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-session"; - rev = "epoch-${version}"; - hash = "sha256-rkzcu5lXKVQ5RfilcKQjTzeKZv+FpqrtARZgGGlYKK4="; + tag = "epoch-${finalAttrs.version}"; + hash = "sha256-2EKkVdZ7uNNJ/E/3knmeH3EBa+tkYmIxP3t9d6yacww="; }; useFetchCargoVendor = true; - cargoHash = "sha256-rK0tWckPvp31BT+K0pfs/mk/Z4XkwlOIwJEZwpYphJE="; + cargoHash = "sha256-iYObxjWJUKgZKGTkqtYgQK4758k0EYZGhIAM/oLxxso="; postPatch = '' substituteInPlace Justfile \ @@ -41,21 +42,25 @@ rustPlatform.buildRustPackage rec { "--set" "prefix" (placeholder "out") + "--set" + "cosmic_dconf_profile" + "cosmic" ]; env.XDP_COSMIC = "${xdg-desktop-portal-cosmic}/libexec/xdg-desktop-portal-cosmic"; passthru.providedSessions = [ "cosmic" ]; - meta = with lib; { + meta = { homepage = "https://github.com/pop-os/cosmic-session"; description = "Session manager for the COSMIC desktop environment"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; mainProgram = "cosmic-session"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ a-kenji nyabinary + thefossguy ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/cr/cramfsprogs/include-sysmacros.patch b/pkgs/by-name/cr/cramfsprogs/include-sysmacros.patch deleted file mode 100644 index 7c115a66ac90..000000000000 --- a/pkgs/by-name/cr/cramfsprogs/include-sysmacros.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/mkcramfs.c b/mkcramfs.c -index a2ef018959d..bec83c112d1 100644 ---- a/mkcramfs.c -+++ b/mkcramfs.c -@@ -22,6 +22,7 @@ - * If you change the disk format of cramfs, please update fs/cramfs/README. - */ - -+#include - #include - #include - #include diff --git a/pkgs/by-name/cr/cramfsprogs/package.nix b/pkgs/by-name/cr/cramfsprogs/package.nix index f626203c0bfa..46f24eae1326 100644 --- a/pkgs/by-name/cr/cramfsprogs/package.nix +++ b/pkgs/by-name/cr/cramfsprogs/package.nix @@ -1,23 +1,21 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cramfsprogs"; - version = "1.1"; + version = "2.1-unstable-2025-01-27"; - src = fetchurl { - url = "mirror://debian/pool/main/c/cramfs/cramfs_${version}.orig.tar.gz"; - sha256 = "0s13sabykbkbp0pcw8clxddwzxckyq7ywm2ial343ip7qjiaqg0k"; + src = fetchFromGitHub { + owner = "npitre"; + repo = "cramfs-tools"; + rev = "13ad7ee1df5ce42cf9758053186554d7cb15e2cc"; + sha256 = "sha256-JlDOowJYJJNB1opNabJgYfdt0khQFsdDvzbtY/bJwRI="; }; - # CramFs is unmaintained upstream: https://tracker.debian.org/pkg/cramfs. - # So patch the "missing include" bug ourselves. - patches = [ ./include-sysmacros.patch ]; - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; @@ -30,9 +28,12 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools to create, check, and extract content of CramFs images"; - homepage = "https://packages.debian.org/jessie/cramfsprogs"; + homepage = "https://github.com/npitre/cramfs-tools"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ pamplemousse ]; + maintainers = with maintainers; [ + pamplemousse + blitz + ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/dd/ddm/0001-Make-findPath-its-calls-behave-well-with-store.patch b/pkgs/by-name/dd/ddm/0001-Make-findPath-its-calls-behave-well-with-store.patch new file mode 100644 index 000000000000..3dcc79124ec3 --- /dev/null +++ b/pkgs/by-name/dd/ddm/0001-Make-findPath-its-calls-behave-well-with-store.patch @@ -0,0 +1,58 @@ +From 3b1bcc92389e8468cd3790dfd223cb653b5f753f Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Sun, 16 Mar 2025 19:56:39 +0100 +Subject: [PATCH] Make findPath & its calls behave well with store + +- images is a cache of downloaded card images. + put that into ~/.cache/ddm/images and allow it to be created. +- campaigns, cubes & constructed are user-downloaded files that set up possible game styles. + create & populate them for the game, and tell it to not try to create them on its own. +--- + index.js | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/index.js b/index.js +index 738bfca..3ac32e8 100755 +--- a/index.js ++++ b/index.js +@@ -75,16 +75,16 @@ app.on('ready', () => { + const isDir = fs.statSync(fullPath).isDirectory(); + if (containsDanger(fullPath)) throw new Error ("Dangerous files detected"); + if (isDir) return fullPath; +- } catch (err) { throw new Error("Bad path Error 1", err); } ++ } catch (err) { throw new Error(`Bad path Error 1: ${err.message}`, err); } + + else try { //dev +- const fullPath = path.join(__dirname, folderName); ++ const fullPath = path.join(allowFolderCreation ? (process.env.HOME + "/.cache/ddm") : __dirname, folderName); + if (!fs.existsSync(fullPath) && allowFolderCreation) fs.mkdirSync(fullPath, {recursive: true}); + const isDir = fs.statSync(fullPath).isDirectory(); + console.log(fullPath) + if (containsDanger(fullPath)) throw new Error (`DDM refused entry to path: ${fullPath}`); + if (isDir) return fullPath; +- } catch (err) { throw new Error("Bad path Error 2", err); } ++ } catch (err) { throw new Error(`Bad path Error 2: ${err.message}`, err); } + + } + +@@ -108,7 +108,7 @@ app.on('ready', () => { + + try { + if (!["campaigns", "cubes", "constructed"].includes(folderName)) throw new Error(`bad folder name ${folderName}`); +- const folderPath = findPath(folderName, true); ++ const folderPath = findPath(folderName, false); + if (!fs.existsSync(folderPath)) fs.mkdirSync(folderPath); + const files = fs.readdirSync(folderPath); + if (folderName === "campaigns" ) return files.filter(file => fs.statSync (path.join(folderPath, file)).isDirectory()); +@@ -127,7 +127,7 @@ app.on('ready', () => { + + ipcMain.handle('open-local-folder', async (event, folderName) => { + if (!["campaigns", "cubes", "constructed"].includes(folderName)) throw new Error(`bad folder name ${constructed}`); +- const folderPath = findPath(folderName, true); ++ const folderPath = findPath(folderName, false); + try { shell.openPath(folderPath); } + catch (error) { console.error(error); } + }); +-- +2.48.1 + diff --git a/pkgs/by-name/dd/ddm/package.nix b/pkgs/by-name/dd/ddm/package.nix index ca3cc7af51ec..5443a7b4beec 100644 --- a/pkgs/by-name/dd/ddm/package.nix +++ b/pkgs/by-name/dd/ddm/package.nix @@ -2,6 +2,7 @@ stdenvNoCC, lib, requireFile, + asar, copyDesktopItems, electron, makeDesktopItem, @@ -10,21 +11,23 @@ campaigns ? [ ], cubes ? [ ], + constructed ? [ ], }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "ddm"; - version = "3.0.2"; + version = "4.0.0"; src = requireFile { name = "DungeonDuelMonsters-linux-x64.zip"; - hash = "sha256-APIFQC5k6J0K5Q/e5poW8wKGL67NUbqKTJL4Ohd1K18="; + hash = "sha256-Ycy5Cbd4NR/TptVnl5wV154uA0JU0UzIRHTAi/xm0cs="; url = "https://mikaygo.itch.io/ddm"; }; strictDeps = true; nativeBuildInputs = [ + asar copyDesktopItems makeWrapper unzip @@ -39,14 +42,18 @@ stdenvNoCC.mkDerivation (finalAttrs: { mkdir -p $out/{bin,share/icons/hicolor/512x512/apps,share/ddm} - mv -t $out/share/ddm/ ./resources/app/* + asar extract ./resources/app.asar $out/share/ddm/ + + patch -d $out/share/ddm/ -p1 < ${./0001-Make-findPath-its-calls-behave-well-with-store.patch} + ln -s $out/share/ddm/icon.png $out/share/icons/hicolor/512x512/apps/ddm.png makeWrapper ${lib.getExe electron} $out/bin/ddm \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags "$out/share/ddm" - # Install externally-downloaded campaign packs & cube lists + # Install externally-downloaded campaign packs and cube & constructed lists + mkdir $out/share/ddm/{campaigns,cubes,constructed} '' + lib.concatMapStringsSep "\n" (campaignZip: '' unzip "${campaignZip}" -d $out/share/ddm/campaigns/ @@ -54,6 +61,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { + lib.concatMapStringsSep "\n" (cubeFile: '' cp "${cubeFile}" $out/share/ddm/cubes/ '') cubes + + lib.concatMapStringsSep "\n" (constructedFile: '' + cp "${constructedFile}" $out/share/ddm/constructed/ + '') constructed + '' runHook postInstall diff --git a/pkgs/by-name/de/dep-tree/package.nix b/pkgs/by-name/de/dep-tree/package.nix index 51da169f80a6..3b63c653b10e 100644 --- a/pkgs/by-name/de/dep-tree/package.nix +++ b/pkgs/by-name/de/dep-tree/package.nix @@ -32,7 +32,7 @@ let }; }; pname = "dep-tree"; - version = "0.23.3"; + version = "0.23.4"; in buildGoModule { inherit pname version; @@ -41,7 +41,7 @@ buildGoModule { owner = "gabotechs"; repo = pname; rev = "v${version}"; - hash = "sha256-xS/8ech4ZhkMMyXbMQmCg+4oKg/jULhqgiNooYf5y8k="; + hash = "sha256-m+afcnwVvPrD+S7c/kfE8mqlD7kO+VPI6sSXCCjXWZM="; }; vendorHash = "sha256-KoVOjZq+RrJ2gzLnANHPPtbEY1ztC0rIXWD9AXAxqMg="; diff --git a/pkgs/by-name/dn/dnsproxy/package.nix b/pkgs/by-name/dn/dnsproxy/package.nix index 61e586a834ea..724c016a474d 100644 --- a/pkgs/by-name/dn/dnsproxy/package.nix +++ b/pkgs/by-name/dn/dnsproxy/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.75.0"; + version = "0.75.2"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = "dnsproxy"; rev = "v${version}"; - hash = "sha256-kaGMudHELG7ggYXvAL1Yz03ZXDnzrVNj+9QN8jDnS3g="; + hash = "sha256-lxrb6DIYompvLX3R7HI63C7ZbNW76J28Xnt7AHTVwmQ="; }; - vendorHash = "sha256-d1WrUfE31Gvgz8tw7cVdPhWf4OHsuuyEHDSn9bETCjI="; + vendorHash = "sha256-PIj91tN9LbNaBE5gLTYD7p9dgcRaFe1i7PnWNJ5H580="; ldflags = [ "-s" diff --git a/pkgs/by-name/do/dotnet-ef/package.nix b/pkgs/by-name/do/dotnet-ef/package.nix index 07584ad7db11..aaca7b41c30c 100644 --- a/pkgs/by-name/do/dotnet-ef/package.nix +++ b/pkgs/by-name/do/dotnet-ef/package.nix @@ -2,9 +2,9 @@ buildDotnetGlobalTool { pname = "dotnet-ef"; - version = "9.0.2"; + version = "9.0.3"; - nugetHash = "sha256-aevR1w8IDXrRLnrR5ax2BaAjGpjOWuBKJ9TzI43p7mc="; + nugetHash = "sha256-oRBN6Qh5PuVofmboqCpFJR3hUD+MruRYp4whjd9Yu9g="; meta = { description = "The Entity Framework Core tools help with design-time development tasks."; diff --git a/pkgs/by-name/ev/evil-winrm/Gemfile.lock b/pkgs/by-name/ev/evil-winrm/Gemfile.lock index e85197171d00..63d93e828e22 100644 --- a/pkgs/by-name/ev/evil-winrm/Gemfile.lock +++ b/pkgs/by-name/ev/evil-winrm/Gemfile.lock @@ -2,30 +2,32 @@ GEM remote: https://rubygems.org/ specs: base64 (0.2.0) - bigdecimal (3.1.8) + bigdecimal (3.1.9) builder (3.3.0) - erubi (1.13.0) - ffi (1.17.0) - fileutils (1.7.2) + erubi (1.13.1) + ffi (1.17.1) + fileutils (1.7.3) gssapi (1.3.1) ffi (>= 1.0.1) gyoku (1.4.0) builder (>= 2.1.2) rexml (~> 3.0) - httpclient (2.8.3) + httpclient (2.9.0) + mutex_m little-plugger (1.1.4) - logger (1.6.1) + logger (1.6.6) logging (2.4.0) little-plugger (~> 1.1) multi_json (~> 1.14) multi_json (1.15.0) + mutex_m (0.3.0) nori (2.7.1) bigdecimal - rexml (3.3.8) + rexml (3.4.1) rubyntlm (0.6.5) base64 - rubyzip (2.3.2) - stringio (3.1.1) + rubyzip (2.4.1) + stringio (3.1.5) winrm (2.3.9) builder (>= 2.1.2) erubi (~> 1.8) @@ -53,4 +55,4 @@ DEPENDENCIES winrm-fs BUNDLED WITH - 2.2.24 + 2.6.2 diff --git a/pkgs/by-name/ev/evil-winrm/gemset.nix b/pkgs/by-name/ev/evil-winrm/gemset.nix index e8323a6341e7..7eb90702fa47 100644 --- a/pkgs/by-name/ev/evil-winrm/gemset.nix +++ b/pkgs/by-name/ev/evil-winrm/gemset.nix @@ -14,10 +14,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; + sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g"; type = "gem"; }; - version = "3.1.8"; + version = "3.1.9"; }; builder = { groups = [ "default" ]; @@ -34,30 +34,30 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qnd6ff4az22ysnmni3730c41b979xinilahzg86bn7gv93ip9pw"; + sha256 = "1naaxsqkv5b3vklab5sbb9sdpszrjzlfsbqpy7ncbnw510xi10m0"; type = "gem"; }; - version = "1.13.0"; + version = "1.13.1"; }; ffi = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; + sha256 = "0fgwn1grxf4zxmyqmb9i4z2hr111585n9jnk17y6y7hhs7dv1xi6"; type = "gem"; }; - version = "1.17.0"; + version = "1.17.1"; }; fileutils = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0c86k3027r896wsgvjgdx27kg5d2x4479bc6ni93w9hq88rgp81n"; + sha256 = "1nmmbvqxssmn9cav5x5sxcw9ab3vqpskdy3nbmsqfjk99f2iw9sp"; type = "gem"; }; - version = "1.7.2"; + version = "1.7.3"; }; gssapi = { dependencies = [ "ffi" ]; @@ -85,14 +85,15 @@ version = "1.4.0"; }; httpclient = { + dependencies = [ "mutex_m" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + sha256 = "1j4qwj1nv66v3n9s4xqf64x2galvjm630bwa5xngicllwic5jr2b"; type = "gem"; }; - version = "2.8.3"; + version = "2.9.0"; }; little-plugger = { groups = [ "default" ]; @@ -109,10 +110,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; + sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.6"; }; logging = { dependencies = [ @@ -138,6 +139,16 @@ }; version = "1.15.0"; }; + mutex_m = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0l875dw0lk7b2ywa54l0wjcggs94vb7gs8khfw9li75n2sn09jyg"; + type = "gem"; + }; + version = "0.3.0"; + }; nori = { dependencies = [ "bigdecimal" ]; groups = [ "default" ]; @@ -154,10 +165,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0rr145mvjgc4n28lfy0gw87aw3ab680h83bdi5i102ik8mixk3zn"; + sha256 = "1jmbf6lf7pcyacpb939xjjpn1f84c3nw83dy3p1lwjx0l2ljfif7"; type = "gem"; }; - version = "3.3.8"; + version = "3.4.1"; }; rubyntlm = { dependencies = [ "base64" ]; @@ -175,20 +186,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + sha256 = "05an0wz87vkmqwcwyh5rjiaavydfn5f4q1lixcsqkphzvj7chxw5"; type = "gem"; }; - version = "2.3.2"; + version = "2.4.1"; }; stringio = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07mfqb40b2wh53k33h91zva78f9zwcdnl85jiq74wnaw2wa6wiak"; + sha256 = "1j1mgvrgkxhadi6nb6pz1kcff7gsb5aivj1vfhsia4ssa5hj9adw"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.5"; }; winrm = { dependencies = [ diff --git a/pkgs/by-name/ev/evil-winrm/package.nix b/pkgs/by-name/ev/evil-winrm/package.nix index 81acdce03071..6662e55906e1 100644 --- a/pkgs/by-name/ev/evil-winrm/package.nix +++ b/pkgs/by-name/ev/evil-winrm/package.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , makeWrapper , bundlerEnv +, bundlerUpdateScript }: stdenv.mkDerivation rec { @@ -36,6 +37,8 @@ stdenv.mkDerivation rec { cp evil-winrm.rb $out/bin/evil-winrm ''; + passthru.updateScript = bundlerUpdateScript "evil-winrm"; + meta = with lib; { description = "WinRM shell for hacking/pentesting"; mainProgram = "evil-winrm"; diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix index 71abdde081f4..20c3cd6617b6 100644 --- a/pkgs/by-name/ex/exploitdb/package.nix +++ b/pkgs/by-name/ex/exploitdb/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2025-03-22"; + version = "2025-03-23"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-Ce7mKyJbf0T620wQCX2IVmgdqT7QXq/y2t1HwpSAhF4="; + hash = "sha256-ga1dRfOPZr6bQmI9nEfrN6bfCBQ9+fMIF4bnMTMM2J4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/fa/fanbox-dl/package.nix b/pkgs/by-name/fa/fanbox-dl/package.nix index 4f1b0eb3e822..d3d0e7050960 100644 --- a/pkgs/by-name/fa/fanbox-dl/package.nix +++ b/pkgs/by-name/fa/fanbox-dl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "fanbox-dl"; - version = "0.27.2"; + version = "0.27.3"; src = fetchFromGitHub { owner = "hareku"; repo = "fanbox-dl"; rev = "v${version}"; - hash = "sha256-qsuYsAXlMuNvGxtrisqqr2E9OgiXsYneBx+CnVOyU2g="; + hash = "sha256-el9+pusnqui7G+x05lJsLjnZ4OymvBVSCa7ReJTgqLw="; }; - vendorHash = "sha256-l/mgjCqRzidJ1QxH8bKGa7ZnRZVOqkuNifgEyFVU7fA="; + vendorHash = "sha256-BZebo50HEKIk1z0LJg8kE1adovyAk67L6jsiaNcpeDY="; # pings websites during testing doCheck = false; diff --git a/pkgs/by-name/fi/firmware-updater/package.nix b/pkgs/by-name/fi/firmware-updater/package.nix index 56fd6f9f8eef..ec75a2e8eb65 100644 --- a/pkgs/by-name/fi/firmware-updater/package.nix +++ b/pkgs/by-name/fi/firmware-updater/package.nix @@ -5,13 +5,13 @@ fetchFromGitHub, }: -flutter.buildFlutterApplication { +flutter.buildFlutterApplication rec { pname = "firmware-updater"; version = "0-unstable-2024-20-11"; pubspecLock = lib.importJSON ./pubspec.lock.json; - sourceRoot = "./source/apps/firmware_updater"; + sourceRoot = "${src.name}/apps/firmware_updater"; gitHashes = { fwupd = "sha256-l/+HrrJk1mE2Mrau+NmoQ7bu9qhHU6wX68+m++9Hjd4="; diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index eaa5ae612c62..846ff4c7eb11 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -17,17 +17,17 @@ let in buildGoModule rec { pname = "forgejo-runner"; - version = "6.2.2"; + version = "6.3.0"; src = fetchFromGitea { domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${version}"; - hash = "sha256-vyJ5Fr38YvR8jjw/Tnih6c+GoctnVpgiaX7Bl+YNti0="; + hash = "sha256-fBpNWxQtej75/oVaHat/H/4Ge9rbjf6FZ/Dw+LBZjcI="; }; - vendorHash = "sha256-KITZV8U4Hhdg9nXYd83p0joYOXulCsJ0sakiP2Q8gi0="; + vendorHash = "sha256-mHvAkVdUAyS4KP6S61IRF2j37XgNMgCFbyZ+WpqqjjA="; ldflags = [ "-s" diff --git a/pkgs/by-name/ga/gatus/package.nix b/pkgs/by-name/ga/gatus/package.nix index a5201493364f..050d1db2b80c 100644 --- a/pkgs/by-name/ga/gatus/package.nix +++ b/pkgs/by-name/ga/gatus/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gatus"; - version = "5.16.0"; + version = "5.17.0"; src = fetchFromGitHub { owner = "TwiN"; repo = "gatus"; rev = "v${version}"; - hash = "sha256-xfuq/+jZy8mfXU16WXaI7e+AEr+3bICvna2OQZHu73M="; + hash = "sha256-/YOC13ut1k48vx/LapcShNfi83LxbC62yxKuanlUI9k="; }; - vendorHash = "sha256-MMKfypk6nPiaPvarYcZ1TdHcu9RKKLoXpz5qoZC3C4Y="; + vendorHash = "sha256-gr/GmZaaNwp/jQwnDiU/kfDWaciQloxP9vNlVTwMQjE="; subPackages = [ "." ]; diff --git a/pkgs/by-name/gi/gitleaks/package.nix b/pkgs/by-name/gi/gitleaks/package.nix index e71b1b73a078..baab91b9de33 100644 --- a/pkgs/by-name/gi/gitleaks/package.nix +++ b/pkgs/by-name/gi/gitleaks/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.24.0"; + version = "8.24.2"; src = fetchFromGitHub { owner = "zricethezav"; repo = "gitleaks"; tag = "v${version}"; - hash = "sha256-4LkM65njb2L8aCLBmKo18gNXX93zXCGh/e/+xdS+wek="; + hash = "sha256-5Bx+suC24r2v9WaBzhkGJTAnh1TeQyjkVj+YVCviYOc="; }; - vendorHash = "sha256-J9cQUXVDqSTykoUOCaKGgyYzkcv7Uss6tNra42Sofw8="; + vendorHash = "sha256-MSF9N9kXsIM2WKsjKAVztYypwGPng2EElHx7p6vADqc="; ldflags = [ "-s" diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix index 826b124403f5..3886d04d19c8 100644 --- a/pkgs/by-name/gl/glooctl/package.nix +++ b/pkgs/by-name/gl/glooctl/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.18.10"; + version = "1.18.13"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-q3/BU5KyC8V4osTsL6S9KRGXl4Sf41TuzyNdhxmsESE="; + hash = "sha256-qn4hQKl3E36q7HsgOVWz+eRceKGysyy5rHXzQnOc7JY="; }; vendorHash = "sha256-lcnsmeZ2XobBE95KqIhUZCKmevg2WEGuZC4qUVkdafM="; diff --git a/pkgs/by-name/go/go-crx3/package.nix b/pkgs/by-name/go/go-crx3/package.nix new file mode 100644 index 000000000000..f69c3d7a508c --- /dev/null +++ b/pkgs/by-name/go/go-crx3/package.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "go-crx3"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "mmadfox"; + repo = "go-crx3"; + tag = "v${finalAttrs.version}"; + hash = "sha256-J3v3/Rz6rPTJnIEahWvJO6KGIC6idqJ/39wPC4zApbE="; + }; + + vendorHash = "sha256-LEIB/VZA3rqTeH9SesZ/jrfVddl6xtmoRWHP+RwGmCk="; + + ldflags = [ + "-s" + "-w" + ]; + + checkFlags = [ + # requires network access + "-skip=^TestDownloadFromWebStore$" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd crx3 \ + --bash <($out/bin/crx3 completion bash) \ + --fish <($out/bin/crx3 completion fish) \ + --zsh <($out/bin/crx3 completion zsh) + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/crx3 --help >/dev/null + + runHook postInstallCheck + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Chrome browser extension tools"; + homepage = "https://github.com/mmadfox/go-crx3"; + changelog = "https://github.com/mmadfox/go-crx3/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ defelo ]; + mainProgram = "crx3"; + }; +}) diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix index 2959f3f41f8d..69fb5537baf2 100644 --- a/pkgs/by-name/go/golangci-lint/package.nix +++ b/pkgs/by-name/go/golangci-lint/package.nix @@ -7,13 +7,13 @@ buildGo124Module rec { pname = "golangci-lint"; - version = "1.64.7"; + version = "1.64.8"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-nxJ+b491qdtT2pSznYPhKZtLZENsmQj8zYCd3KRSqRc="; + hash = "sha256-H7IdXAleyzJeDFviISitAVDNJmiwrMysYcGm6vAoWso="; }; vendorHash = "sha256-i7ec4U4xXmRvHbsDiuBjbQ0xP7xRuilky3gi+dT1H10="; diff --git a/pkgs/by-name/hp/hplip/package.nix b/pkgs/by-name/hp/hplip/package.nix index 024369818c48..619478ad6b00 100644 --- a/pkgs/by-name/hp/hplip/package.nix +++ b/pkgs/by-name/hp/hplip/package.nix @@ -43,7 +43,7 @@ let }; plugin = fetchurl { - url = "https://developers.hp.com/sites/default/files/${pname}-${version}-plugin.run"; + url = "https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${pname}-${version}-plugin.run"; hash = "sha256-Hzxr3SVmGoouGBU2VdbwbwKMHZwwjWnI7P13Z6LQxao="; }; @@ -79,9 +79,20 @@ assert || throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}"; python311Packages.buildPythonApplication { - inherit pname version src; + inherit pname version; format = "other"; + srcs = [ src ] ++ lib.optional withPlugin plugin; + + unpackCmd = lib.optionalString withPlugin '' + if ! [[ "$curSrc" =~ -plugin\.run$ ]]; then return 1; fi # fallback to regular unpackCmdHooks + + # Unpack plugin shar + sh "$curSrc" --noexec --keep + ''; + + sourceRoot = "${pname}-${version}"; + buildInputs = [ libjpeg @@ -247,8 +258,7 @@ python311Packages.buildPythonApplication { done '' + lib.optionalString withPlugin '' - sh ${plugin} --noexec --keep - cd plugin_tmp + pushd $NIX_BUILD_TOP/plugin_tmp cp plugin.spec $out/share/hplip/ @@ -284,6 +294,8 @@ python311Packages.buildPythonApplication { mkdir -p $out/var/lib/hp cp ${hplipState} $out/var/lib/hp/hplip.state + + popd ''; # The installed executables are just symlinks into $out/share/hplip, diff --git a/pkgs/by-name/hx/hxtools/package.nix b/pkgs/by-name/hx/hxtools/package.nix index cbb1950674b3..393ecbb93591 100644 --- a/pkgs/by-name/hx/hxtools/package.nix +++ b/pkgs/by-name/hx/hxtools/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "hxtools"; - version = "20231224"; + version = "20250309"; src = fetchurl { url = "https://inai.de/files/hxtools/hxtools-${finalAttrs.version}.tar.zst"; - hash = "sha256-TyT9bsp9qqGKQsSyWCfd2lH8ULjqJ5puMTw2TgWHV5c="; + hash = "sha256-2ItcEiMe0GzgJ3MxZ28wjmXGSbZtc7BHpkpKIAodAwA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hy/hyprcursor/package.nix b/pkgs/by-name/hy/hyprcursor/package.nix index 05e8cc9c7911..5ba0612fefe9 100644 --- a/pkgs/by-name/hy/hyprcursor/package.nix +++ b/pkgs/by-name/hy/hyprcursor/package.nix @@ -14,13 +14,13 @@ }: gcc14Stdenv.mkDerivation (finalAttrs: { pname = "hyprcursor"; - version = "0.1.11"; + version = "0.1.12"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprcursor"; tag = "v${finalAttrs.version}"; - hash = "sha256-LOTmvTIxmaWtXF8OP6b6oENSdG/quWxhsO3dJQACBUw="; + hash = "sha256-IvneQb4YFlEXWjXaKeA0y6lL7Z6JqTAvSAlcMDWnjK4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hy/hyprland/info.json b/pkgs/by-name/hy/hyprland/info.json index 32a0404a26a5..f01f9233f05e 100644 --- a/pkgs/by-name/hy/hyprland/info.json +++ b/pkgs/by-name/hy/hyprland/info.json @@ -1,7 +1,7 @@ { - "branch": "v0.47.2-b", - "commit_hash": "882f7ad7d2bbfc7440d0ccaef93b1cdd78e8e3ff", - "commit_message": "version: bump to 0.47.2", - "date": "2025-02-02", - "tag": "v0.47.2" + "branch": "main", + "commit_hash": "5ee35f914f921e5696030698e74fb5566a804768", + "commit_message": "version: bump to 0.48.0", + "date": "2025-03-23", + "tag": "v0.48.0" } diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index eca4e58f5761..59b7302af842 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -86,14 +86,14 @@ assert assertMsg (!hidpiXWayland) customStdenv.mkDerivation (finalAttrs: { pname = "hyprland" + optionalString debug "-debug"; - version = "0.47.2"; + version = "0.48.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland"; fetchSubmodules = true; tag = "v${finalAttrs.version}"; - hash = "sha256-dSKR1VpjpdJVZ5dmLgIvAu3K+DYrSbohZkqxSQhjw8U="; + hash = "sha256-QfXnNrQSa9xDrlzl/dJvsFgMmPECveyU/7cKJ2YyIzI="; }; postPatch = '' @@ -176,7 +176,7 @@ customStdenv.mkDerivation (finalAttrs: { (optionals withSystemd [ systemd ]) ]; - mesonBuildType = if debug then "debugoptimized" else "release"; + mesonBuildType = if debug then "debug" else "release"; dontStrip = debug; strictDeps = true; @@ -186,6 +186,8 @@ customStdenv.mkDerivation (finalAttrs: { "xwayland" = enableXWayland; "legacy_renderer" = legacyRenderer; "systemd" = withSystemd; + "uwsm" = false; + "hyprpm" = false; }) (mapAttrsToList mesonBool { # PCH provides no benefits when building with Nix diff --git a/pkgs/by-name/is/isrcsubmit/package.nix b/pkgs/by-name/is/isrcsubmit/package.nix index a679ecea7340..f22aa5f4f5d8 100644 --- a/pkgs/by-name/is/isrcsubmit/package.nix +++ b/pkgs/by-name/is/isrcsubmit/package.nix @@ -2,30 +2,47 @@ lib, fetchFromGitHub, python3Packages, + nix-update-script, + withKeyring ? true, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "isrcsubmit"; - version = "2.1.0"; + version = "2.1.0-unstable-2023-08-10"; src = fetchFromGitHub { owner = "JonnyJD"; repo = "musicbrainz-isrcsubmit"; - rev = "v${version}"; - sha256 = "1lqs4jl2xv1zxmf0xsihk9rxzx2awq87g51vd7y3cq1vhj1icxqa"; + rev = "8f4c3b9f9b8f983443d58fba381baaa3a74edad7"; + hash = "sha256-6SJt0wtXC49Eh6g7DBy73MeCueF7CRuCvYC27es1qAM="; }; - propagatedBuildInputs = with python3Packages; [ - musicbrainzngs - discid - ]; + postPatch = '' + # Change binary name to isrcsubmit so that `import isrcsubmit` in the wrapper doesn't fail + substituteInPlace setup.py --replace-fail "'isrcsubmit.py=isrcsubmit:main'," "'isrcsubmit=isrcsubmit:main'," + # Set default argument for main, which is set `if __name__ == '__main__'` upstream + substituteInPlace isrcsubmit.py --replace-fail "main(argv):" "main(argv=sys.argv):" + ''; - meta = with lib; { - # drutil is required on Darwin, which does not seem to be available in nixpkgs - broken = true; # 2022-11-16 + dependencies = + with python3Packages; + [ + musicbrainzngs + discid + ] + ++ lib.optional withKeyring [ + keyring + ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = { description = "Script to submit ISRCs from disc to MusicBrainz"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; homepage = "http://jonnyjd.github.io/musicbrainz-isrcsubmit/"; maintainers = [ ]; + mainProgram = "isrcsubmit"; }; } diff --git a/pkgs/by-name/ka/kata-runtime/package.nix b/pkgs/by-name/ka/kata-runtime/package.nix index 403ea76d21ba..fa06ba0ea733 100644 --- a/pkgs/by-name/ka/kata-runtime/package.nix +++ b/pkgs/by-name/ka/kata-runtime/package.nix @@ -37,7 +37,7 @@ buildGoModule rec { hash = "sha256-Ir+/ZZJHm6E+044wczU3UvL+Py9Wprgw2QKJaYyDrKU="; }; - sourceRoot = "source/src/runtime"; + sourceRoot = "${src.name}/src/runtime"; vendorHash = null; diff --git a/pkgs/by-name/lc/lcevcdec/package.nix b/pkgs/by-name/lc/lcevcdec/package.nix index e27c62ca9358..174c2557a506 100644 --- a/pkgs/by-name/lc/lcevcdec/package.nix +++ b/pkgs/by-name/lc/lcevcdec/package.nix @@ -2,7 +2,6 @@ cmake, copyPkgconfigItems, fetchFromGitHub, - fetchpatch, fmt, git, gitUpdater, @@ -19,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "lcevcdec"; - version = "3.2.1"; + version = "3.3.5"; outputs = [ "out" @@ -31,17 +30,9 @@ stdenv.mkDerivation (finalAttrs: { owner = "v-novaltd"; repo = "LCEVCdec"; tag = finalAttrs.version; - hash = "sha256-Nf0YntB1A3AH0MTXlfUHhxYbzZqeB0EH9Fe9Xrqdsts="; + hash = "sha256-PcV31lLABv7SGzrD/+rR9j1Z9/uZrp1hFPdW0EZwOqc="; }; - patches = [ - # fix for build with GCC 14 - (fetchpatch { - url = "https://github.com/v-novaltd/LCEVCdec/commit/43ef5a17ec1ced77f834136945b3cbfe2e46b9b4.patch"; - hash = "sha256-8OgPh6v+nmRIUB6flR93qOjvaL8fUJdqIe48ZA+8Pr0="; - }) - ]; - postPatch = '' substituteInPlace cmake/tools/version_files.py \ diff --git a/pkgs/by-name/lg/lgogdownloader/package.nix b/pkgs/by-name/lg/lgogdownloader/package.nix index 2dfee512b8a8..4136ae04bcd7 100644 --- a/pkgs/by-name/lg/lgogdownloader/package.nix +++ b/pkgs/by-name/lg/lgogdownloader/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lgogdownloader"; - version = "3.16"; + version = "3.17"; src = fetchFromGitHub { owner = "Sude-"; repo = "lgogdownloader"; tag = "v${finalAttrs.version}"; - hash = "sha256-coPUPercfpB8LilBn5Uww9rEM+X9QAgzDECtQ1Ui/hg="; + hash = "sha256-rERcwPVuioZT4lqw4SUaM0TQIks6ggA5x8fuI+1GAsk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/lighttpd/package.nix b/pkgs/by-name/li/lighttpd/package.nix index 798a330dda69..5abe45061795 100644 --- a/pkgs/by-name/li/lighttpd/package.nix +++ b/pkgs/by-name/li/lighttpd/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { pname = "lighttpd"; - version = "1.4.77"; + version = "1.4.78"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz"; - sha256 = "sha256-rK+r2/oiZ9i2RS0D2F/dKmZSXz8Fo2p5tmRcAX8VYs4="; + sha256 = "sha256-PAc56Lx1yen8HPqJ4cME3UsOSruHrcZGodILxqLbKj4="; }; separateDebugInfo = true; diff --git a/pkgs/by-name/lo/louvre/package.nix b/pkgs/by-name/lo/louvre/package.nix index 3fa3286b7182..561fb1af2ed6 100644 --- a/pkgs/by-name/lo/louvre/package.nix +++ b/pkgs/by-name/lo/louvre/package.nix @@ -24,13 +24,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "louvre"; - version = "2.14.1-1"; + version = "2.16.0-1"; src = fetchFromGitHub { owner = "CuarzoSoftware"; repo = "Louvre"; rev = "v${finalAttrs.version}"; - hash = "sha256-fZ9lH7kfp++YONI3Kr4fJX1SsemhoJGdgz6eEeHKA6Q="; + hash = "sha256-zw/n/Q1wwTiwhk6Q3xrMl2pEFBAk/BqSa/p0LTDbGBA="; }; sourceRoot = "${finalAttrs.src.name}/src"; diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index 719b3ad7f5b4..d8194599d9d5 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -174,11 +174,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "microsoft-edge"; - version = "134.0.3124.51"; + version = "134.0.3124.68"; src = fetchurl { url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-i7C6Q4uCBZnIyd2LA+Kws5/WxHZaoz/UxgN9AtZCtuo="; + hash = "sha256-zjN8ssVeR3yyw+e6tVzcrrYkLToo8Rmm4GjcG9iQMpk="; }; # With strictDeps on, some shebangs were not being patched correctly diff --git a/pkgs/by-name/mo/moq/package.nix b/pkgs/by-name/mo/moq/package.nix index dad45fddff90..6d2b85be6675 100644 --- a/pkgs/by-name/mo/moq/package.nix +++ b/pkgs/by-name/mo/moq/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "moq"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "matryer"; repo = "moq"; rev = "v${version}"; - sha256 = "sha256-Y81EPb0h66lx3ISJsfb6iUqek/Ztni8ZITHtn5h34jU="; + sha256 = "sha256-Yk0lGu6wHF5OBFx/yZPJr3h3DVMvyBV8pi5eSxl7hpw="; }; vendorHash = "sha256-Mwx2Z2oVFepNr911zERuoM79NlpXu13pVpXPJox86BA="; diff --git a/pkgs/by-name/ni/nibtools/package.nix b/pkgs/by-name/ni/nibtools/package.nix index 84b80b412a79..9671ba282b7a 100644 --- a/pkgs/by-name/ni/nibtools/package.nix +++ b/pkgs/by-name/ni/nibtools/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation { pname = "nibtools"; - version = "0-unstable-2024-02-22"; + version = "0-unstable-2024-11-30"; src = fetchFromGitHub { owner = "OpenCBM"; repo = "nibtools"; - rev = "1d69f64eec55031c346a2ce115227479f9579a8a"; - hash = "sha256-+hnkj0uevURkRboTH8WbSt82pZTdWL4ii2PKr6NO0Cg="; + rev = "91344e0ee357780a90ad7fe3a0a0721a2e11f265"; + hash = "sha256-0skAavJe01b+4Z7LEfS2qIhqkwj8XhOwmflhYPEynw4="; }; NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; @@ -41,11 +41,11 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with lib; { + meta = { description = "disk transfer utility for imaging and converting commodore 64 disk images"; homepage = "https://github.com/OpenCBM/nibtools/"; - license = licenses.gpl2; - maintainers = with maintainers; [ matthewcroughan ]; - platforms = platforms.all; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ matthewcroughan ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/ni/nitrokey-start-firmware/package.nix b/pkgs/by-name/ni/nitrokey-start-firmware/package.nix index f4b20b56ea71..8bad7ed5fbc2 100644 --- a/pkgs/by-name/ni/nitrokey-start-firmware/package.nix +++ b/pkgs/by-name/ni/nitrokey-start-firmware/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; - sourceRoot = "source/src"; + sourceRoot = "${finalAttrs.src.name}/src"; postPatch = '' patchShebangs configure diff --git a/pkgs/by-name/ni/nitrokey-storage-firmware/package.nix b/pkgs/by-name/ni/nitrokey-storage-firmware/package.nix index 51d448ee808c..e998049715d9 100644 --- a/pkgs/by-name/ni/nitrokey-storage-firmware/package.nix +++ b/pkgs/by-name/ni/nitrokey-storage-firmware/package.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation { inherit pname version src; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; postPatch = '' substituteInPlace Makefile \ diff --git a/pkgs/by-name/ni/nitrokey-trng-rs232-firmware/package.nix b/pkgs/by-name/ni/nitrokey-trng-rs232-firmware/package.nix index dea4e7e1dbf9..73ab0d7ebfa4 100644 --- a/pkgs/by-name/ni/nitrokey-trng-rs232-firmware/package.nix +++ b/pkgs/by-name/ni/nitrokey-trng-rs232-firmware/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkgsCross.avr.stdenv.cc ]; - sourceRoot = "source/src"; + sourceRoot = "${finalAttrs.src.name}/src"; makeFlags = [ "all" ]; diff --git a/pkgs/by-name/ni/nix-playground/package.nix b/pkgs/by-name/ni/nix-playground/package.nix index 28116d8ef445..371cd1598931 100644 --- a/pkgs/by-name/ni/nix-playground/package.nix +++ b/pkgs/by-name/ni/nix-playground/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-playground"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; src = fetchFromGitHub { owner = "LaunchPlatform"; repo = "nix-playground"; tag = version; - hash = "sha256-+X21Fub8G7vx+HjuExUojYy7duY5enbakBCxXbOb3GM="; + hash = "sha256-WiQlqQHW4RNvk79cs3B6+Tg1STYXj2tq2+Pvu82saxk="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/op/opensearch/package.nix b/pkgs/by-name/op/opensearch/package.nix index 3fadc5b5672a..040421bec198 100644 --- a/pkgs/by-name/op/opensearch/package.nix +++ b/pkgs/by-name/op/opensearch/package.nix @@ -12,11 +12,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opensearch"; - version = "2.19.0"; + version = "2.19.1"; src = fetchurl { url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${finalAttrs.version}/opensearch-${finalAttrs.version}-linux-x64.tar.gz"; - hash = "sha256-RVuQAYLvKnGT1EPZaq6lX1NOwPkbG61tLqzbrqYB8W4="; + hash = "sha256-skOqp9jc67h4gfcPcWE5A8Nt2gd/2Q7hHqN3QS1tVp8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ot/otf2/package.nix b/pkgs/by-name/ot/otf2/package.nix new file mode 100644 index 000000000000..4f13a14dd229 --- /dev/null +++ b/pkgs/by-name/ot/otf2/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + fetchurl, + versionCheckHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "otf2"; + version = "3.0.3"; + + src = fetchurl { + url = "http://perftools.pages.jsc.fz-juelich.de/cicd/otf2/tags/otf2-${finalAttrs.version}/otf2-${finalAttrs.version}.tar.gz"; + hash = "sha256-GKOQX3kXNAOH4+3I5XZvMasa9B9OzFZl2mx2nKIcTug="; + }; + + configureFlags = [ + "--enable-backend-test-runs" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + doCheck = true; + doInstallCheck = true; + + versionCheckProgram = [ "${placeholder "out"}/bin/otf2-config" ]; + + meta = { + homepage = "https://www.vi-hps.org/projects/score-p"; + changelog = "https://perftools.pages.jsc.fz-juelich.de/cicd/otf2/tags/otf2-${finalAttrs.version}/ChangeLog.txt"; + description = "Open Trace Format 2 library"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ lesuisse ]; + }; +}) diff --git a/pkgs/by-name/pc/pcloud/package.nix b/pkgs/by-name/pc/pcloud/package.nix index 351a2e6af053..9add368f7738 100644 --- a/pkgs/by-name/pc/pcloud/package.nix +++ b/pkgs/by-name/pc/pcloud/package.nix @@ -39,13 +39,13 @@ let pname = "pcloud"; - version = "1.14.10"; - code = "XZLHKH5Z2KieO7jdb34LVHFY8okPD8bpqXM7"; + version = "1.14.11"; + code = "XZQRe85ZLPTV99jSGRkmdR9ET2xzqHYeABBX"; # Archive link's codes: https://www.pcloud.com/release-notes/linux.html src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=pcloud-${version}.zip"; - hash = "sha256-yIsUScXGmIoZc1Mawq/SVrpJWMYFn1G/ovukLWMYVa8="; + hash = "sha256-fqC6cQYfmtwBfnXsKNXbHQ1jB6xPXleCcfi2DV5AtLw="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/pr/proksi/package.nix b/pkgs/by-name/pr/proksi/package.nix new file mode 100644 index 000000000000..f60a31829f2e --- /dev/null +++ b/pkgs/by-name/pr/proksi/package.nix @@ -0,0 +1,83 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + yq, + pkg-config, + cmake, + openssl, + zstd, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "proksi"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "luizfonseca"; + repo = "proksi"; + tag = "proksi-v${finalAttrs.version}"; + hash = "sha256-zwLF6yL/EqyBtZ+hHXLJRe2UaZyhSzotEFYlpoLXKZ4="; + }; + + postPatch = '' + tomlq -ti 'del(.bench)' crates/proksi/Cargo.toml + ''; + + useFetchCargoVendor = true; + cargoHash = "sha256-vFZUcHh/gI4fdlM6LcN+6kjweLUnPNYNq6Y+XxWoSl8="; + + nativeBuildInputs = [ + pkg-config + cmake # required for libz-ng-sys + yq # for `tomlq` + ]; + + buildInputs = [ + openssl + zstd + ]; + + cargoBuildFlags = [ "--package=proksi" ]; + cargoTestFlags = finalAttrs.cargoBuildFlags; + + checkFlags = [ + # requires network access + "--skip=services::discovery::test::test_domain_addr" + + # these tests don't fail themselves, however they invoke clap which tries to parse configuration + # from the command line, which would normally be empty, but here it includes the `--skip` flags + # above which clap doesn't recognize and thus rejects + "--skip=config::tests::" + ]; + + env = { + OPENSSL_NO_VENDOR = true; + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "proksi-v(.*)" + ]; + }; + + meta = { + description = "Batteries-included CDN, reverse proxy and Load Balancer using Cloudflare Pingora"; + homepage = "https://github.com/luizfonseca/proksi"; + changelog = "https://github.com/luizfonseca/proksi/blob/proksi-v${finalAttrs.version}/CHANGELOG.md"; + license = with lib.licenses; [ + mit + asl20 + ]; + maintainers = with lib.maintainers; [ defelo ]; + mainProgram = "proksi"; + }; +}) diff --git a/pkgs/by-name/ps/ps3netsrv/package.nix b/pkgs/by-name/ps/ps3netsrv/package.nix index 4f01cfae445c..7c12ded94862 100644 --- a/pkgs/by-name/ps/ps3netsrv/package.nix +++ b/pkgs/by-name/ps/ps3netsrv/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { hash = "sha256-ynFuCD+tp8E/DDdB/HU9BCmwKcmQy6NBx26MKnP4W0o="; }; - sourceRoot = "./source/${pname}"; + sourceRoot = "${src.name}/${pname}"; buildInputs = [ meson diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix index 36d77901822a..ffbd140a6627 100644 --- a/pkgs/by-name/ps/pscale/package.nix +++ b/pkgs/by-name/ps/pscale/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.221.0"; + version = "0.230.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-wWcBQG6GRub14TL6IEgQ9YJkFp3vVPj0TfpJJgyuECY="; + sha256 = "sha256-aWml3iTcci1V8RkiCrvv+E7zmW5JJCDzDNv2RaDhjAg="; }; - vendorHash = "sha256-ZTBW6YCWNVh/PQV43JXHR9dTm7Qq7uL6vRm/A49gYp4="; + vendorHash = "sha256-soDM7IfgTKWZnFNfGSlKH4aScGr1A26OZrgqiJ5UAlA="; ldflags = [ "-s" diff --git a/pkgs/by-name/ri/riemann_c_client/package.nix b/pkgs/by-name/ri/riemann_c_client/package.nix index e4b2898d77ed..3933346a85ef 100644 --- a/pkgs/by-name/ri/riemann_c_client/package.nix +++ b/pkgs/by-name/ri/riemann_c_client/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { homepage = "https://git.madhouse-project.org/algernon/riemann-c-client"; description = "C client library for the Riemann monitoring system"; mainProgram = "riemann-client"; - license = licenses.lgpl3Plus; + license = licenses.eupl12; maintainers = with maintainers; [ pradeepchhetri ]; platforms = platforms.linux; }; diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix index bdafe35baa3b..02f49f8a8a23 100644 --- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix +++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix @@ -12,15 +12,15 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2025-03-10"; + version = "2025-03-17"; useFetchCargoVendor = true; - cargoHash = "sha256-t2cA2JWV+l2cfTUrIpPojNmrElVty2JJAi8+XdxquTs="; + cargoHash = "sha256-XiTq3Qpk996Rmp9KUSeKnzSggkx/1ntLd5Xgx3lVaek="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - hash = "sha256-MmYdZyVwKa3YHzqoHdHw9/jZXkDE/5M3M+7363t4Pkc="; + hash = "sha256-fqc6tqBGq83Q1SY37EDKf085WKtsSzf0vKgsqla8r3s="; }; cargoBuildFlags = [ diff --git a/pkgs/by-name/si/sish/package.nix b/pkgs/by-name/si/sish/package.nix index 632c27bd7a9f..64ff70b09b27 100644 --- a/pkgs/by-name/si/sish/package.nix +++ b/pkgs/by-name/si/sish/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "sish"; - version = "2.16.1"; + version = "2.17.0"; src = fetchFromGitHub { owner = "antoniomika"; repo = "sish"; tag = "v${version}"; - hash = "sha256-p/7NulUvDUnTCD1H1LRe6OHB7coloIwXiOnOvFbmLhM="; + hash = "sha256-HsN/NQ82tHqdh295fSkJ8SW5oqKF8TJ4ck1VwmNZtk8="; }; - vendorHash = "sha256-AtGxRW2OtWBKxLHBqeL+D4PFLgT8APMwuK6NZCBTpao="; + vendorHash = "sha256-8QNqq/FV8/eZcDnYiRayxsoDTPU+WgDYdURM0Mgzt8s="; ldflags = [ "-s" diff --git a/pkgs/by-name/sk/skyscraper/package.nix b/pkgs/by-name/sk/skyscraper/package.nix index 81b0f882facd..a4098eb944c7 100644 --- a/pkgs/by-name/sk/skyscraper/package.nix +++ b/pkgs/by-name/sk/skyscraper/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "skyscraper"; - version = "3.16.0"; + version = "3.16.1"; src = fetchFromGitHub { owner = "Gemba"; repo = "skyscraper"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-r+9qhkLKhjtYZUqUM5zvzqo7nxvIKtQN5oC/VACDbBM="; + hash = "sha256-9brCKUIXuBC4T9655HUI/BZ6g0ABdAWf7QrE5Y0kSzw="; }; strictDeps = true; diff --git a/pkgs/by-name/sl/slacky/package.nix b/pkgs/by-name/sl/slacky/package.nix index 873b2154aa2e..65bfa61b1ee0 100644 --- a/pkgs/by-name/sl/slacky/package.nix +++ b/pkgs/by-name/sl/slacky/package.nix @@ -7,14 +7,14 @@ makeDesktopItem, nix-update-script, }: -buildNpmPackage rec { +buildNpmPackage (finalAttrs: { pname = "slacky"; version = "0.0.5"; src = fetchFromGitHub { owner = "andirsun"; repo = "Slacky"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-nDxmzZqi7xEe4hnY6iXJg+613lSKElWxvF3w8bRDW90="; }; @@ -58,10 +58,10 @@ buildNpmPackage rec { meta = { description = "Unofficial Slack desktop client for arm64 Linux"; homepage = "https://github.com/andirsun/Slacky"; - changelog = "https://github.com/andirsun/Slacky/releases/tag/v${version}"; + changelog = "https://github.com/andirsun/Slacky/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ awwpotato ]; platforms = [ "aarch64-linux" ]; mainProgram = "slacky"; }; -} +}) diff --git a/pkgs/by-name/sp/spotube/package.nix b/pkgs/by-name/sp/spotube/package.nix index f1803cde2c6e..09625fbd415f 100644 --- a/pkgs/by-name/sp/spotube/package.nix +++ b/pkgs/by-name/sp/spotube/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "spotube"; - version = "4.0.0"; + version = "4.0.2"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system}; @@ -84,28 +84,29 @@ stdenv.mkDerivation (finalAttrs: { passthru.sources = let fetchArtifact = - { filename, hash }: + { suffix, hash }: fetchurl { - url = "https://github.com/KRTirtho/spotube/releases/download/v${finalAttrs.version}/${filename}"; + name = "Spotube-${finalAttrs.version}-${suffix}"; + url = "https://github.com/KRTirtho/spotube/releases/download/v${finalAttrs.version}/Spotube-${suffix}"; inherit hash; }; in { "aarch64-linux" = fetchArtifact { - filename = "Spotube-linux-aarch64.deb"; - hash = "sha256-q+0ah6C83zVdrWWMmaBvZebRQP0Ie83Ewp7hjnp2NPw="; + suffix = "linux-aarch64.deb"; + hash = "sha256-zoJ0WPui6KdUyML47RbEBNySTZ8FvStYAOj1mndjh1s="; }; "x86_64-linux" = fetchArtifact { - filename = "Spotube-linux-x86_64.deb"; - hash = "sha256-pk+xi7y0Qilmzk70T4u747zzFn4urZ6Kwuiqq+/q8uM="; + suffix = "linux-x86_64.deb"; + hash = "sha256-SM/lWUhXe20FCgneegn5As5a53YBsoDIMfIYhRBHWjI="; }; "x86_64-darwin" = fetchArtifact { - filename = "Spotube-macos-universal.dmg"; - hash = "sha256-ielRdH+D1QdrKH4OxQFdw6rpzURBs/dRf/synS/Vrdk="; + suffix = "macos-universal.dmg"; + hash = "sha256-0eNeMpC8usPfbuh2aj43n6KLysRQ55yLdOT7Z5faVLU="; }; "aarch64-darwin" = fetchArtifact { - filename = "Spotube-macos-universal.dmg"; - hash = "sha256-ielRdH+D1QdrKH4OxQFdw6rpzURBs/dRf/synS/Vrdk="; + suffix = "macos-universal.dmg"; + hash = "sha256-0eNeMpC8usPfbuh2aj43n6KLysRQ55yLdOT7Z5faVLU="; }; }; diff --git a/pkgs/by-name/sq/sqlcl/package.nix b/pkgs/by-name/sq/sqlcl/package.nix index b8a33f1bac29..637aac13ab83 100644 --- a/pkgs/by-name/sq/sqlcl/package.nix +++ b/pkgs/by-name/sq/sqlcl/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sqlcl"; - version = "24.4.1.042.1221"; + version = "24.4.3.070.2106"; src = fetchurl { url = "https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-${finalAttrs.version}.zip"; - hash = "sha256-IHiIWBz+V1au1KQzM5AslMkbFNCq7jgGLJeIYBkwSVk="; + hash = "sha256-7/8J+XY2Uk/CUWimrTf8/ikjZQT2+4/jNdhs8K1sWjI="; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/by-name/sr/srgn/package.nix b/pkgs/by-name/sr/srgn/package.nix index 22d472ce9800..3202fdc692e8 100644 --- a/pkgs/by-name/sr/srgn/package.nix +++ b/pkgs/by-name/sr/srgn/package.nix @@ -6,17 +6,17 @@ }: rustPlatform.buildRustPackage rec { pname = "srgn"; - version = "0.13.4"; + version = "0.13.5"; src = fetchFromGitHub { owner = "alexpovel"; repo = "srgn"; rev = "srgn-v${version}"; - hash = "sha256-KshZ7QnY4TXng9KCcIzdt0E4R83cTEr6fGo9p/riCPU="; + hash = "sha256-S6Wc79LY6WKtjDw/Ob3v4ETRI8Zxjrx9BDNKn79M1j4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-g3ShEKslU01zDLCNHQZ+ZxF1ErCh7jSRELD2wtxWRSs="; + cargoHash = "sha256-4BravWJRtZxC34JjbH26HY7mDdDFPryQZC4e4jOZ1fQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sw/swaylock/package.nix b/pkgs/by-name/sw/swaylock/package.nix index 6f2b7dc8b0e9..148eedd90b9f 100644 --- a/pkgs/by-name/sw/swaylock/package.nix +++ b/pkgs/by-name/sw/swaylock/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "swaylock"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaylock"; tag = "v${version}"; - hash = "sha256-bzsgjRyyQudf3odrvJ5wdM49VjUgWxfoaU876A2sYus="; + hash = "sha256-VZxUyASWyg+UMTTYeuyRIO+++ZKL0nAqjNS6nJ756yk="; }; strictDeps = true; diff --git a/pkgs/by-name/te/templ/package.nix b/pkgs/by-name/te/templ/package.nix index 304e3ecbd4ee..061563b73c6c 100644 --- a/pkgs/by-name/te/templ/package.nix +++ b/pkgs/by-name/te/templ/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "templ"; - version = "0.3.833"; + version = "0.3.850"; src = fetchFromGitHub { owner = "a-h"; repo = "templ"; rev = "v${version}"; - hash = "sha256-4K1MpsM3OuamXRYOllDsxxgpMRseFGviC4RJzNA7Cu8="; + hash = "sha256-kH7nVXL6pINqOBPK5E5j9scw38lvnhyiQqMOe0MwUy8="; }; - vendorHash = "sha256-OPADot7Lkn9IBjFCfbrqs3es3F6QnWNjSOHxONjG4MM="; + vendorHash = "sha256-JVOsjBn1LV8p6HHelfAO1Qcqi/tPg1S3xBffo+0aplE="; subPackages = [ "cmd/templ" ]; diff --git a/pkgs/by-name/ti/time-decode/package.nix b/pkgs/by-name/ti/time-decode/package.nix index eeaa7ba5bebb..f7582b35cf51 100644 --- a/pkgs/by-name/ti/time-decode/package.nix +++ b/pkgs/by-name/ti/time-decode/package.nix @@ -6,38 +6,37 @@ python3.pkgs.buildPythonApplication rec { pname = "time-decode"; - version = "7.0.2"; + version = "9.0.0"; pyproject = true; src = fetchFromGitHub { owner = "digitalsleuth"; repo = "time_decode"; tag = "v${version}"; - hash = "sha256-K60xIQ6TWPYlsR6YjIquey5Ioaw4oAId59CPlQNK4yk="; + hash = "sha256-kydH5WN2PELq6YnoSBFRsyVnxL+0r09WxXuqFANXuNs="; }; - nativeBuildInputs = with python3.pkgs; [ - setuptools - ]; + nativeBuildInputs = with python3.pkgs; [ setuptools ]; propagatedBuildInputs = with python3.pkgs; [ colorama - python-dateutil + juliandate pyqt6 + python-dateutil + pytz + tzdata ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ - "time_decode" - ]; + pythonImportsCheck = [ "time_decode" ]; meta = with lib; { description = "Timestamp and date decoder"; homepage = "https://github.com/digitalsleuth/time_decode"; changelog = "https://github.com/digitalsleuth/time_decode/releases/tag/v${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "time-decode"; }; diff --git a/pkgs/by-name/ve/versitygw/package.nix b/pkgs/by-name/ve/versitygw/package.nix index a0c46e8b68f6..6420508bb7a7 100644 --- a/pkgs/by-name/ve/versitygw/package.nix +++ b/pkgs/by-name/ve/versitygw/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "versitygw"; - version = "1.0.11"; + version = "1.0.12"; src = fetchFromGitHub { owner = "versity"; repo = "versitygw"; tag = "v${version}"; - hash = "sha256-K0w9BoKqwVsEoxCuRvmKtuHYyCzZhVt/OZQ3vElHPdE="; + hash = "sha256-wKD06yyXxV41Lbr2scvTR+fhd4uy6EIlArAVoNxMbzU="; }; - vendorHash = "sha256-xFj4IGCCDhgIbBA1qIm9J06BUNYJiQQZYPSe6Uthm6w="; + vendorHash = "sha256-rgZJn3WvsoV4QfLpceAxVWuBncQGdH5oKnR12FqhyCE="; doCheck = false; # Require access to online S3 services diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix index 2b42375bae07..17ba8a23d8ad 100644 --- a/pkgs/by-name/vi/vintagestory/package.nix +++ b/pkgs/by-name/vi/vintagestory/package.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.20.5"; + version = "1.20.6"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz"; - hash = "sha256-qpTWZ1nG4yrYgVvonZ3btIwhCK6S+aipq4H3b9FE3vI="; + hash = "sha256-/4ITVd/vdQaM9uWgpp1//XF2W+HgEBKkZlGvW2csECk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vp/vpp/package.nix b/pkgs/by-name/vp/vpp/package.nix index 03a741a5398f..e51004b0b77d 100644 --- a/pkgs/by-name/vp/vpp/package.nix +++ b/pkgs/by-name/vp/vpp/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { patchShebangs ../vpp-api/ ''; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; enableParallelBuilding = true; env.NIX_CFLAGS_COMPILE = "-Wno-error -Wno-array-bounds -Wno-maybe-uninitialized"; diff --git a/pkgs/by-name/wa/wastebin/package.nix b/pkgs/by-name/wa/wastebin/package.nix index eb0da83a3907..3b8e300d2696 100644 --- a/pkgs/by-name/wa/wastebin/package.nix +++ b/pkgs/by-name/wa/wastebin/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "wastebin"; - version = "2.7.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "matze"; repo = "wastebin"; rev = version; - hash = "sha256-O0nWjRiQBDclfbeulGjCZANXwQypV8uHHR5syuki5xE="; + hash = "sha256-DuIT4jIxk+L7c+rWIzrNjNEs2Lv5mYqLeCAaBMsBCBg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-WMofTTkJCcx+6vicrYfxJWTo1YCzheeGOE7LC5JQ8mM="; + cargoHash = "sha256-Ui4Bns5A25VrNer6wpD0agYJQwxuIYWSOO26u1K8Vmc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/xa/xar/package.nix b/pkgs/by-name/xa/xar/package.nix index 801dcd2cc3da..a89b8104b8f8 100644 --- a/pkgs/by-name/xa/xar/package.nix +++ b/pkgs/by-name/xa/xar/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { # We do not use or modify files outside of the xar subdirectory. patchFlags = [ "-p2" ]; - sourceRoot = "source/xar"; + sourceRoot = "${finalAttrs.src.name}/xar"; outputs = [ "out" diff --git a/pkgs/by-name/xd/xdg-terminal-exec/package.nix b/pkgs/by-name/xd/xdg-terminal-exec/package.nix index 99c68b70fd00..276840d57dbd 100644 --- a/pkgs/by-name/xd/xdg-terminal-exec/package.nix +++ b/pkgs/by-name/xd/xdg-terminal-exec/package.nix @@ -7,13 +7,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "xdg-terminal-exec"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "Vladimir-csp"; repo = "xdg-terminal-exec"; rev = "v${finalAttrs.version}"; - hash = "sha256-5rmYSvFQDFXaa6k9lqy6mOm7d8GJD137uUAIqhrFl2c="; + hash = "sha256-mA/azPl4pB7vW1dB+Are5WbIf/eLmU91iwjC/V0+Xh8="; }; nativeBuildInputs = [ scdoc ]; diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix index 9d63a1c773d5..34b189174fb5 100644 --- a/pkgs/by-name/ya/yabai/package.nix +++ b/pkgs/by-name/ya/yabai/package.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "yabai"; - version = "7.1.11"; + version = "7.1.13"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system} @@ -66,32 +66,20 @@ stdenv.mkDerivation (finalAttrs: { # See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information. "aarch64-darwin" = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz"; - hash = "sha256-WyoVGuCotiGpSxpq9hXSTnto4k945FeL+4+DlBp6MhA="; + hash = "sha256-1/fPBLbC6wcgQAX/soCCVeIUXXm124RnxTJJc/7ayzo="; }; "x86_64-darwin" = fetchFromGitHub { owner = "koekeishiya"; repo = "yabai"; rev = "v${finalAttrs.version}"; - hash = "sha256-r2uPzozDPH97k3IiweU7Hefhnzm9/TJfC+5p/GiJ+T0="; + hash = "sha256-6yCMd7+RBqRj3OjnAwm3Ex4CVKVFPWyWdeMqXFaHZlM="; }; }; updateScript = writeShellScript "update-yabai" '' - set -o errexit - export PATH="${ - lib.makeBinPath [ - curl - jq - common-updater-scripts - ] - }" - NEW_VERSION=$(curl --silent https://api.github.com/repos/koekeishiya/yabai/releases/latest | jq '.tag_name | ltrimstr("v")' --raw-output) - if [[ "${finalAttrs.version}" = "$NEW_VERSION" ]]; then - echo "The new version same as the old version." - exit 0 - fi + NEW_VERSION=$(${lib.getExe curl} --silent https://api.github.com/repos/koekeishiya/yabai/releases/latest | ${lib.getExe jq} '.tag_name | ltrimstr("v")' --raw-output) for platform in ${lib.escapeShellArgs finalAttrs.meta.platforms}; do - update-source-version "yabai" "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform" + ${lib.getExe' common-updater-scripts "update-source-version"} "yabai" "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform" done ''; }; diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 57f61d9740a7..7de37ef6d685 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -123,11 +123,17 @@ rustPlatform.buildRustPackage (finalAttrs: { "script/patches/use-cross-platform-livekit.patch" ]; - # Dynamically link WebRTC instead of static - postPatch = '' - substituteInPlace $cargoDepsCopy/webrtc-sys-*/build.rs \ - --replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc" - ''; + postPatch = + # Dynamically link WebRTC instead of static + '' + substituteInPlace $cargoDepsCopy/webrtc-sys-*/build.rs \ + --replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc" + '' + # nixpkgs ships cargo-about 0.7, which is a seamless upgrade from 0.6 + + '' + substituteInPlace script/generate-licenses \ + --replace-fail 'CARGO_ABOUT_VERSION="0.6"' 'CARGO_ABOUT_VERSION="0.7"' + ''; useFetchCargoVendor = true; cargoHash = "sha256-xJaiHngsm74RdcEUXaDrc/Hwy4ywZrEiJt7JYTc/NpM="; diff --git a/pkgs/games/0ad/data.nix b/pkgs/by-name/ze/zeroad-data/package.nix similarity index 100% rename from pkgs/games/0ad/data.nix rename to pkgs/by-name/ze/zeroad-data/package.nix diff --git a/pkgs/games/0ad/fix-build-script.patch b/pkgs/by-name/ze/zeroad-unwrapped/fix-build-script.patch similarity index 100% rename from pkgs/games/0ad/fix-build-script.patch rename to pkgs/by-name/ze/zeroad-unwrapped/fix-build-script.patch diff --git a/pkgs/games/0ad/game.nix b/pkgs/by-name/ze/zeroad-unwrapped/package.nix similarity index 100% rename from pkgs/games/0ad/game.nix rename to pkgs/by-name/ze/zeroad-unwrapped/package.nix diff --git a/pkgs/games/0ad/rootdir_env.patch b/pkgs/by-name/ze/zeroad-unwrapped/rootdir_env.patch similarity index 100% rename from pkgs/games/0ad/rootdir_env.patch rename to pkgs/by-name/ze/zeroad-unwrapped/rootdir_env.patch diff --git a/pkgs/games/0ad/wrapper.nix b/pkgs/by-name/ze/zeroad/package.nix similarity index 100% rename from pkgs/games/0ad/wrapper.nix rename to pkgs/by-name/ze/zeroad/package.nix diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index 33d4af936305..9ef513c325a6 100644 --- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -22,15 +22,15 @@ libgee, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "elementary-mail"; version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "mail"; - rev = version; - sha256 = "sha256-6T/OTiuDVAPBqp8BPawf/MVEuWTPrLa3/N1Blvt/7Q8="; + tag = finalAttrs.version; + hash = "sha256-6T/OTiuDVAPBqp8BPawf/MVEuWTPrLa3/N1Blvt/7Q8="; }; nativeBuildInputs = [ @@ -64,16 +64,15 @@ stdenv.mkDerivation rec { ) ''; - passthru = { - updateScript = nix-update-script { }; - }; + passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Mail app designed for elementary OS"; homepage = "https://github.com/elementary/mail"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ ethancedwards8 ] ++ teams.pantheon.members; + changelog = "https://github.com/elementary/mail/releases/tag/${finalAttrs.version}"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ethancedwards8 ] ++ lib.teams.pantheon.members; mainProgram = "io.elementary.mail"; }; -} +}) diff --git a/pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix index 29cf6c6be691..5a3e7192def2 100644 --- a/pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix +++ b/pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix @@ -11,28 +11,28 @@ let commonPackages = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-7JQ6RIV2MP62co7llxdJaHfHxZ1dovwMT0OZ8hqZTOIDBzvhsw5ZVZNIRO+YIPSRcN8sOJDbo9j0NZ6CwNBDEg=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-fYMkzeTDQC6UjLHMh1JDzKYXWvW3OZQ5HTAweiYasSypdxtYrFtGvMdnxjjaFEpNJER4fwfu9MWxIymARm7QgQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-0B8cvn3YHXRu3o8/I7zRvkvtu0wWis4LW7SV/+H90egLHZPaOfovoGNCvhbHjoTXCghv7S1xqqm4hMgoM6VLGw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-OurybReC2ZIBbIplQvtMCtjnEMp43xHp6rE8J37LLdax5H1XBP5o5uU5B54Y1H+SHf3nzPrgeIBlNFvfTyTWxA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-WM7Vx5qhHEoHVSlzwLHcJhKdlGgva0JWQB9sIdPPfxrb41pOYbTZd5NkU6iUx4rOCeVDz4qFKiluFt5GSR2Pow=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-YQJi7qj+OivviA7f1jCEH1+VIL7EEtC53gGqo07Sf+j86lcEDZyKSWfmk+rdRU2j/4vZ0lLf1jcio/mpJl0txQ=="; }) (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-RuW6CgFdHTLjSuPlkXv1HVAOHhuaLlmMi31SjfuhvkiAXoXeDYV9VkNGAD6vv7pg1BPsuFfibhk4R6GYjjaW/A=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-/qHuLGJzGlMwxGtsIFJVLWHVy08e/h8IDOiRlOjqluSAwcqCrC8ds0kL+o7eurQJp1YyPQgdkT73/dmmcsEagw=="; }) (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-bUaQhF05n2j74fvvQmXlJZmqJfb/YXltOHps8XQZ2HKp5EOY3e6ijEFqXnD1R91ZRghqy2ADwUp5qVarOaMdXA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-EQMhyJBOpIlH1PwyV6FL1Yjfh9v6SFltGdVsiJfkBFd8b99VlTfqobiqDum/GJRw4m8PXo+bkaNz8o/Jd2ebZQ=="; }) ]; @@ -40,118 +40,118 @@ let linux-arm = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-qY9/zo3KRmK2ArwHghHuL7R/a6BUvDq874D4+EK78k1sU/vHc5sl5vkkxEu7vRrwG0UUXurvxwXve3cGPjB6dg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-Cieasw2gZJ+iZS8lqQVIwhsDEem5ReGEZ0LkRPZ7dybi9fHCK6LT2B46muLsUikx2HBPezMV2mN7ZGw/l3lIdQ=="; }) ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-vgkB8yUmJw1w/n0uP4FhvFOZDWIkPNJAfakhvn5yVZMh5VqnCCHyfCLb9edXtFWmpC+SMEyCT0bqSHTcLMZfNQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-gQ/sJVpO4ruqIMG4clnWzp7CWzOlrXklBYA/DlBHUYlms/SZcqUBV4vva1Sk9L8zln2RAagokBWQYoO9pStYHQ=="; }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-c9EJZR2W+xHmCLrS59Bdkp2/Fw4DSAVzwBt1uuNAQ9XXt/f2REt/osXj/EkbOCyQAnxQ4J5v26BG1lpxkZ1IVw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-tVvw3o2ilquZQKFvm24rrBEXR0pscFY5qUakJ30tl29JfNaUIotJUG2fWZ/kD96wCqnACVB5zp2D2wi/STQhcg=="; }) ]; linux-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-kMS00bMWu+Coioesh6AGeBekk/nKt/UMCwsC+xsvScdGjGJ1Tjv8BMsNwAshMGEwdlbB6EqJyO1J4CPPPK5yVg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-ZcqAA6krkkydoMtk3J2syxpt2r7bzR+iqc+IMFWG4yKfALGHIkuz9XoYTnhAki+rwtL0A/BaDpEc3xA3PpOR9Q=="; }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-qJBeqbHV0876+3iAeBt0bIigrcZYIAqU2cay50LnTUmTYFN2GJdhRFwQIKjHtH8O0vxQaP9Y5tGfe7U9Re6YPQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-/XqJkXi9hfn7wP7psJBfzFlML/pkWs52ZkxLaQwwXBt3YcbAccCKPz4TPenB/wJ3tN174lxrL5zIvD5+HawAPQ=="; }) ]; linux-musl-arm = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-DoJiWclBLGaS+xcf8R0lrYex7c9DnUB/2OOthOnHeUdeuvlEr7CyKf5tAeBbO5yGTyMFP4UnhLtDmA3j1NXYpw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-vXwLf5c8GVhgOPGu9nxSwFVMvCtZULVvbMguMXoLDBfWvHSER/0whkDgWdJVsTGEFiCkhET984EQR+jKj8u3Tw=="; }) ]; linux-musl-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-eVTyfSgkeihFFPfkX0HsRWbgVE6JTQxBfZbke79J5Aw6r6kWS3FR+GkloTRmsw50hEhxsNug8B/3a/v+Hq2qxg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-oGf1jMjRs4H+HKrbkPSnBCYLYcmM/aMGAp4PC48cwq4b5EkYWL4t9RUcf02oOkO/ZH0Y3aeZmEau6RBp3VqsPw=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-U6G5uLB4Gt+QSRVt9tHGpgK9u/h0Kg8gbR3lfmC/TJmPEGd+7pMdG76IxEIi4kF6FLrHMphriD1vtKbfCIKQBA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-VvZndNtHe8lNC5Y0A1fbrESCYNKvpf26qyyNJ3RYh/NmpjVGXsGXqHUodLkhlVf2c9JTbQ1fIKCHw8H+V7YGeg=="; }) ]; linux-musl-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-1YWLHPYBEXma5rFvZFu500hxmDTs/wSC++zYZ1oUkMbtas9Tzsi+F28bkH0n98QwDoxjAet9vub90XIpQIUm5A=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-O5mWnNxmW3sfzYzuF1Oajvxb4dF4t+F0MdxVWfgyNkxzlKDgSwPiJ4Xg8hElN+istQJiYFw2Bhy9siqTEaCGWg=="; }) (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-3k1Oh2b70m3yQh1T05Xl42is8gw/p+7tMGtXmj93PDorqZe7kjGT8l2kNBBCjLsCzBu7PW6Y+88zTzi1yyh/Zw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-HwLZs4+in99u3TEsFZM66Kgzqqqp/gZxvFPNWChGdcGkewAzIo24k5odFXUjaV4rxjEe1rMS0D8nsxspJiv/qA=="; }) ]; osx-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-HwBS0FRJFpEqrTELxYh/zKEHH9/q/DbrBVzrHZ9RdHRX2Ft15oioe33oInecTO/+Vh5AEXF8n1afc34RCPJluw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-B/eqU8l6X24aA6NW3ipNhsJchu2iLkOGr+w0YNmkwiHlwW2N0TWF5O9necwlyQ00guGt3ziyBtPjvm973+VaKQ=="; }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-ITbXjFbm5fN66SYHuNeukyBo2cHlXqGvp/1aajSyK348QDtBnD7mH7r7jQHzKBwHsFJrcGGFju/vf08/ENi3ZA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-jByRZh3dn2XWkdn9Wfkq4dX9zpTewMkEoRU7UxM1WTsXqwYl5EaSOb+u2C+b8eKTrwLi5D5hUJR8/h1ZmowE3g=="; }) ]; osx-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-bp432DB0NVMIlz9LRohJkF4gc+AJlW/+6nEveEuFmZlIjPxN2KaQvu7QYOHkb8z/J9G4jXJyyrKjNs9AlcGXzg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-nQ7ny7gnwIvjj2f8wEgdfdVusCtH9Av9AeSxZWgmLEKWqlcE1h0JhPhRQx68cuU7aLlUZ3I8fMRkkPk8ZWPryg=="; }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-fVNRllQBrnS3t6LX/RMGBcJc0CnBTAxtS77qA4jX52bso5EB5MfPbCi4BxZxWzjEMf8pSSevX1RXvUGhdJldHA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-Iu1L4i7aNaY+h+ZEMBKJrqBmLnPjexOIKNAwh2GJlPP/ybXAKLm+3+F1MhRZ/XllEyZpxDCb4KsJd735nOTsuA=="; }) ]; win-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-ugo0QgUPcj4wN42lR5jEZZSahxDp7caQhT4MGHHxzEu10U+dSuEiG0Wf+YuiHsrcrFUEeFhgLcdkUw2S/Anppg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-4ESnA9qlBd+Mil9+Aq9bC7/iLyr2RMdOcpTZdb4JfvzEyGlS/eO/jgx96TG7DExbhdvts+7Bip44r+bSVhukUQ=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-IDQ3HJxDYMV6SYnkSWGfy0eEH3MmP4YonaRVBxDmxLT0Rytv8ZJoWPbDWs52RXeI8y3dAhjYD84ZaOeREwQ9YQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-JfRI6RnrnPdMDVktXNG2xihQyfKjkk3JyNadkUuGaPO8sY6zH8/ETluFV4iA1VwXira9wmaz3s+c8w4GRdtqbA=="; }) ]; win-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-VWg5J5BNzoDeIZ491JkY6anNjuKQaUr5TgCszNnCp3jPPiDVSeCf3Mhk4EZ1fKC/trNcEYgW785b9URshQhTvQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-K6cqb1rspwgKAhSrUhw35r6peEfv/zZ//jQtlzIx/IS03z/xXUYYUSdI612dlkwAcB5Fc9xOhuvVX2n3fKfykg=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-TEMZtKCvJhq7P/CCIzISYvxDaW1o1jcseepquCbrYSsrLCKJ7WNE2zStqu5HNh4VqiszQ1BWjLTdbTPKjdptWw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-QiElAQWko8o3XcVi7d+OKMbe9LVHu9oZ+yrQHMmia8j/eT2IJh0qTd6tLwXP6zdQ4XIKWsU2KXO/UbJAN1w//w=="; }) ]; win-x86 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-vx4NS+RHj+ZEvhqJMhMvfKTWAL799sKjFaR0PY20C2hSXxdMyxi5rIR/XGgdPwF0PcXMul36KVWFssKA9y3NNw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-GQujUNYZiu7URKlNquKouh71dzVwllx7fpQnQc6LTYljDeEUKJYub8cWL1XpE7nagtHQEpk7cgGkOi8Mj2uJ1A=="; }) ]; }; @@ -160,361 +160,361 @@ let linux-arm = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-NYnDi9YcfGAZ1qXK6knwsldUTR+92tw7Q6MXq7Sted3rNXRWc6xy/zezOrFP8OjAdn8Slz5PUHFDz9BdGiOuLg=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-yHOu2Pa3I00ufGOKdhGvzMvbeTbbSTEpovFmV1eiPlAs331lZjneCnxf5/jdGpY3bA2ZyzkIIvCdQCONG5vgxg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-2tYWNqQJibUOWHwjkTsxfwRd+u8BphDEdxNVBU8HLjcoSZbONXsKHx+RgBS4J52mRBVM65BArJzZ8toIenEaHA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-9WlHGvn2LER6YnMZUXlhjYdZedtpglBnOJXnAm1T6fDXE7SXdNoKanyIMurp7CIcSzIUnTxtlpYFSWPo2ELMtQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-E6FcxsPYNxn1E60s6jnxFTRxm2thvgE4Iy/rt4mgNk/+mQ+zmwLnZiDiVCAnxD6Cl/7OWRPCp4Yy6csl4PVN4w=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-9+JnLRfcTbGcdHvFkMSH9RonNMg018RN1b3gmV8EGUk5euQdFekozbrDv0/gcgHtczkJU76o2FYnmTnfTgtR0A=="; }) (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-FNAL8V9jD16HGrYatWUxN/IjaipGYC0WJ5tMPgC+ZseDNnDU1XT7hE9AW6ZGnJRkB6pEBSl/D+sCurrLPWFNWw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-xAJuJZzQSjTgJxhHo5mXdsf2IJyP0hTJEUUlqd+HOmkYMUurgjhyzN9U1j7oHX54rZ0a7MNMqbaLLXJVduJdBA=="; }) ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-5xXwUnVyIedqRN2/u6mJTYQ2aEmL5UjAILayabKaVfbfjSDKyrtNEZlrHYxGASh9nkPRP/TesYDkPnOOXCdW6w=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-N7tOTYXkPMYFqvLXbBKMPvjcCRdRMiCRYS6wV/x1JNSbrSSBMF84Ev7jbXrSpQVi0j+Do4Z2pxrOnLDU8JZ+Hw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-4Y0KWHx7QySSb9oTuqpQ0rFEwmbW7DC8BMYzXE9wYkCCg1ErXZxdrNCWhuYj/lp7T9AYsFC3DFvbzAZidGj4/A=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-nJxaKLr14lGnGigfS0IIqReXhJkeb6rCntUkPY+x9cjuBAtz8YUe9f2WHAenk6snYqWbRqR861I+/IASnHZLxw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-w3WGynXeGdTuap8DrGOh84JUHNpwKJKnMt9U9MZx+zBpaB+76TV3JqL78w7fJWoA0UbAuUsmXXc45FwiEsYhvA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-ZGTkoeYsP8WdgJ4S8vBRF+UeiLjUk52M6JAqq40cTsjKl8ivQq7zfrqFyGRdfFnC9376GF3Lsg+Z2fbNWRb7Lw=="; }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-2rGKD4/VJ5Xn9F4oBB6vV7QNeKi4+QEf5DPii5WmSD9K3Z+iDq06JFH5zejgzWy6O+rczaPtm7f3DOl3XxHZyw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-ghYZEwoP73mW/X8+SlKmhBrpbXap2NzPfRsqEsDR0q4MX6KuGMNiMyBJ7I32mUpbj8bxYOWBktv2Ghy5v4Rdxg=="; }) ]; linux-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-PFumrKSdBGAKYEaEENnEy4PpZSZp8t8RYWkgUyY7QkZ+ZcqYEWc9dvzvoMlscVKb4/NoYrB2REkNtCu+zb+vcA=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-L7IYzdd29Njp3cpZVVSgHsspUlhGqFljg3hwxLiAJjNw2hMwZM1SIhdK14IxFC1zTpwrUlcpsbXTrDVZRwMLZA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-Zfwi2Gesww6LjQwXT1jqHNIqhj2fLb0woea3RLKec9JvynzazLPu6G40GzrsZ4wLl00EX1aLbjUCJOp3VsO93g=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-zbgLSb7iVnFEfaqlkj0mBozpr7EZy/gQXlH+MLmjKqeUu8URiA5P+qDwSxkSBy3tjHdypydtRwr3yzSI5Y14oQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-+q8UP3DgyTEGgAbYjhbTOZ2u7TzLENugBm3TWjotZiKEKR4xXn+ZifmVbQ2NZ/eTBNbdi6Fi+TQUAvCCjAwU/w=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-8ub8FpQ+KFKdhscpMQmlGwH2GsgF3I8aNEyvFoyeGPJvqD3cXIijZK26aTjH848E4tJV4AO7tJEFk7TdKXnwxQ=="; }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-YXCvPERukDSzy+drLG+9f3haR61XsRLM6hjk6eutb0LCew5pAc3Yh/DYR+W9qCmPwkzlkGYuyfDyo/FaLU4HEQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-qiCczti3W/bhI50Tp5r9NOOlDoCjtaBo498wNzIfRhEt/nzBe8Q1Fnr4w9w1WiW1wIFQPwAI8UEHFN+CPkwlqw=="; }) ]; linux-musl-arm = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-7TCyhwPin4fR7Nf6ggP/ngDaZtjQEdkowM6NJUa5wAsLvz1l/WcIDaWDvaZKyrNnfrvlWecKbjOx0PxOgVOoJw=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-dqGfk7Dp3LW7+o4wQPbVqi0brEJuubJzlsbvCDEF3ISapgmo4IVdaIFIdajEeK0CYDv9ro6CpKLOAILXhfT9QA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-N8fL0vrL6dbaDB0ogelbF3fEEOLGkQf95xSOEdq/Pi+S8esNNwrfrZfjlHZ1dOc0EUXZDgxvrJwTc5FazKYBdg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-klCs8GuMTDnn99J3NuUhGgfrZ8USjXFvUmb29YovrXbIYEBEWwHAu8dkK9mupBiSXkXale8Fgve2SZ2lic49dg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-RX/Fj9yHn9lXeHN87JgR0aAWCNQKcdk1omYs4yE6Gtbk7ORl1CXkq6VHy8UT9ULUC0wIo3+7OX36ciVU5nRXsQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-Z8ABfKzezrD8oQnTFa0s9tQASL+wsHrrXSLQDu4djyiclc1N18kBRCcj1hBwa4V6Qs+daZqZl5f64B+eTZDlmw=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-Hj9OwrnKZJbo2leR/Df+BfmntQCdnZbXoaZMtTpNzN7npHptiVaOv7bQ51hIC+qNp8MbvPeMbaN6rC2d1IR3iA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-KflBz+weDQwzryX2ManDUioAra06ojwq8NgAUEpKiuPdFO2w5aLxNLs35ayMxQg27HxmiUYzgFU2XyzY2EqsYg=="; }) ]; linux-musl-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-lrDg2jv7Qyu7aD4COB0pwRGy7DgYgYRjDw6QRuRsbuMghTkyGYzEaQB78JwBqBYwqrXKQ+a+8qvQbpuRXpF42A=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-5IHjU+if8HXHLcC+eYJkkIj02GIwO2DQMY1uXM+P4PisHwD6bDkojHDH6Eo51LnwGZkKttMSUZ5FU+oI2SJXeQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-goUOx6hlUIgfru/Nl4luQOW1NW7RjXFcnT1sQWfZfMcof72yG785+TvAjGsxbZAafT7Hqqle+KjVizkZvw8jnQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-244dky5rKXLRbqUrR0CSgjkdNoQCQJTMCe3B5chtMEZBkk0UCsQ3la0i6QoaGgHOVnyZAfDLGty5Xahl9Zxkyg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-joQATwpqLurBgrYw9GgJvyh4rOHK74x39RWTGnEimEAIhe+99uCO/OM8JcSzucfXnu3+lZwM/8Ki85kBpsJ5kw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-1s7p86jY7ahEa1TvjVk+sJFqF6sRDirl05nJ3JVKZ9vOVdZjO9SHZkdZzOS6o91T179Yve6vS4ejXIn16LVWDg=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-evYMyp8jNrr3+g1k52MqugUgrhyMR6RFVdMX0j9lBW+jWzRKmCJ4AEEWgYVLfX/p6XN60Vq5F+AvsxLmV6vCxA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-toF1P9FT+YMxulAzCc7k0Ig2K4y7Bz4pzJ4woQwCbx23AUIzHj+SR9u0MCnYY53McAkZ6Xrd7iebFdzCILLQRA=="; }) ]; linux-musl-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-H+At/cuv8JLoP6XSmSSXWwn5fZ3ZJVjHbqXmi56ANSyyJxOll2/yjbY2H4WmyKQdBL0qJdr5zdf0XSqnqPdbdg=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-ZcVz2V5BVwsm6JLLvd0ZUwkF6qd02/EM6HRCjcG66xjmClffLqVyz0FyDhgFf4sjub2o+y0VVphMwpKaVjeEKQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-fFvpxLMzN9K0tIPI4W+9LVC3WP0svv5KOPzhKSj5QOXTvOKsJTo8WMHKjjElg3kLTz9TqgtpQbgRcfzwqyOgaA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-7+0KqOJXhUv7HXGhIOrh+W/Wg1p9okac+fMu6D1IG//dpA/dTh52gFRa39s/Di7p3czUG9Fw9CAg3ayLc9FAVw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-pEHWmu67oLGKeg/fP3dzrt//L8/icvlSGueBufScK7/sITr9ecIolcqPqBRAYG740QM/p9hrTQhCVUppmhjjhA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-kzhqF4a3QgdUIUShjH2y+uzZGFqjiRxcX4dEjBNBz9uTLw39ESAUzc9/0OzBqeQf34bndcdWg3RCjl++DSO4IQ=="; }) (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-h3qfi/9UNZtgLOmuwa/AUDwjzutwrJ/CDUOcKeFjCut8vo5lNEBQ40AdCRDkwfMPRtZynnrRbHunsiADqEbAnA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-FxEfJnXNNTZGdoIkXnlbECdH4Ey/aFQTTkKLwUtIULbW7STri3KLmU0rc5htalma/u0TMoaKjoNFfM8FKhbKXw=="; }) ]; osx-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-QzdaJymI2UF8sLTmGIV5KkWF6wEhX+T45L8uju5/oEDuufPLr7Up3d5uxf+5uh8+aqH8fwlu48Tt//LsYzKEaA=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-ia6NWtmLd+Vaini/F85LdVzHb+yl4RRYbMdqvoRYHuIOhz7m84NEf1rqnukkV6W0CDZBWcJXCEhxN1H1jlvBfA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-2sb6VbprC5U83LBpd5DOPhvbBY1DtFBSvhCh3ppDAx4Gzcka4QAJZcYH9JRKt5EtTybdb0Pce6dRxRZ7aQqW4Q=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-OrJWaFXVGFuABTnlHpzLE/oSlYTGCpgVQ2XipZO4IdQwLN2t21xdrmYlhNBKFBO92dQyikoIjAROjlcrWE1jfA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-Y+8kJD2C8l4mejEFP5QneRsgQm/otzX+Dl4nVZLTbi05O/NEJkUmA/oWlluxE5Oe0ZyGi5/sfACcgzQ3E6nGVg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-GMyWth75S1zN/YC8vFuCFzjGcoXB6YTwnVp0sv8bGhyeAamjMt/qB4qCPkrrw/Lt6DF1D2K1J8k3Fsr1Qlp96w=="; }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-hhj3jdVtsAh9jkMQWWuhpKA1za64OUsGD/mGiFl2KNpi1HGhxxHPwfT32ElX5GrqhmCs7l5iUszGBqK2uVYPBw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-v/g5FTqPmNdTYPWUFmOsJvf/VoxYe4Uzi9AxoW1xfoCfG5rqdkYfI8aIZzPLVXMAzDl5+ksVQOJIlrXujidBCg=="; }) ]; osx-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-ZUDP2dv59marjwXPSwIkZh7qtSsYlkFvyFSU2LvlVz9qUX5cPGJROdLgmIDj45vr9EcSDWUzyiDuuSR9o6Uxxw=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-WcJsD6RRe45HnJ4cUOvW0FEGgC3JyCioPLHBivJMcDaXcphlSsJpeJWH3jQ34YBcmJyirZHcA696nert1mQLKg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-jWwOXYCQQLUMSKog2tK6ZJbnDhE4t0jeyc1vUjHfDHmEo3HQdHtrRf7fvJGroqMHK7novNOiGUllJ6qTAWnYFQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-DM/5ZZI9lEF3d2fpj3Yy/w+9aptB2kRtIrcc2DQpVAZXAiMxpZz0mc7+EgkBsV8y7SijBi1i4E/gsfcmuxUxOg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-DmTYpekFmL0mhyEBGU5yw2DScIf7LNKE3S2A/UwWSqpWTTdSZwHd4avbyVQPtD5IayqjeAGxmrVY02X281l9Wg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-d0g9fHBn3W0RTBggWPWaUGb0VkhCLmeDfRtf00vRAKvBLqwaVv5uHMlpSCNktT+2dq3tIEJshtvHmtCGOUOiZA=="; }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-nnT44goUsGrlCdNODhKEjS4F2GtcdSVCTpPkGWJaKaxcKngClTk99f9H3d4EbDugNKGNsQQwro3Yo+DFizwc/Q=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-uUT3ZDtdu5F2R2G05QomGeraLrPz56NuFg+pfBnloIMihQ1mKLnPrOCXZ8z6F4U/WPEs50B0lrk8ck7RNvYpDA=="; }) ]; win-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-Owmxgn5CZxwfhK6VUWjGAS1V00/9mrPb/VseFBsQXn2A/5brX83+jAhxVaXqEd6+k8j45DGJ4eutlBO6JPCDaA=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-UpRM0FNAeRnxPXakMWmn64Hw4gTnFDksUEmaW5Q+uiq+lTHy27bGsa9/qo1GT07WlwlrnSGEL4Os89UQi7fpCw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-hcYIHXVYDFIIVEqf8gRLr2CEeJrqRJjY+I2jMeRg0JIk6cxQ6aNb6364QOVRckOrREiuGuHi1d2/zD/DiSWvFw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-v5zXnXy+J5ll82nnFl1ra3QQ+YrUKnBavGG6cuzutJ0HVyQ50i1ggv/yiQbisZB+DCNn97mSg+RBfe8ybsV5VA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-YMP3AD/o8ZFRu1hoFnVbxgG8PEGDNUg6ENCu38GhJp/MDVNOT1r3G+0iuoI2lHvyhPv2qzCT6m26hZxqVHQxAg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-skTKyHmXHtPv0SQMSNdq9/tFRNNS3er9yMIaMnaXl6PDQo1FnO7xQ8Akt+VyRvkVCNat0dNeM0EQ0CEOb92kKw=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-CFq8TbbTQeexS+e9YZiujvMDQkbSkGCxgCN7h2aqEQAXRSRy9kgApAuzLlQov2wLrSqXGLyp1BwpQFejBoqmtQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-b0LeHwc+HxwFR6PHFpJPGy3pAhyXwpJe4+Bm0l9HOWTpaTZsbMh9tp4WxnvsZi8NRkTcyLqJJ3HuiojM1+kArQ=="; }) ]; win-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-zEiRA0vBh3H/siaL9g6mbzIvUr7UO6cg6EDHeV8ODiaV2qx5Bk/B8XR8OK3/gl61mSTn6mU2ObAG08aMpsyKnA=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-aEhd15xrWBEM1eta0rE+9qRuUERxISKnqlTktCuwAHJQGt3zn9HN8bmjIKw1EoegqvjxQxjVSnt7KY9g8oHZhA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-jFasdaZcNTwFwclOKhNpsV09IyqoQXQ4iaOQIXQr3UAm3YQwrNtWguemHu1CrrivSBDBGjUkX1INmO1robymWQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-yiZROfX2xzEI6pJFjL0IvXnc2YYxgSghNW107ZNx2VRE9glMEUVyvS2UkfoPJgt+9ID75FG2t/gW5jGdlgRoDQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-rgNo4vT50WUb3YwZZ81oJnUvD6kJVn7PGinLDTpQC+ayBi0wdJ6m8uRXpCTZ+yt4Rz6KR68LYWotMGdzAKfwuQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-ML1iK4UD1IJ93oPSLNGKsP5tPIrWK6mUOPMBE5Ilcf3JesVVUN7gPvtUfFgcPzkUbB5LC8gTZpnw+0OCPURNiw=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-3eN6DUdMKPHC46ANhDQv3Rg4saLj9zX7IvogtwQPQHP097z6m8mDhbMuuH+Fqa3VkxDc4pnDzEUnbXC/pvW+iQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-cX9SJnO4M2ybHKwnwNTcyuCaO2ddwMo7nBIHzE/tpM/4Yn8i9ujlzDBFWb/6QLfopkcTEwbXNvIV+8096TM3oA=="; }) ]; win-x86 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-/OT3JlrxpuMsBeQMn4Gsj2y9r2d+gwsSC87cvvA4hRCbw3+PHBndvFfO5Aquj0O9MPNXiFhz/J7JRYDw47uIUA=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-/rW+Iyj8J2xe+EgOkvtIBG+ZBW3BW2QrU9tSGPXV+eH9U9DPn4zqIA/lY559A0v128XSGW4s39YKFMsd5LGtAQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-B/bP6DvMvk8YGbomVkdRy0tJuZsN/eLSQYy5INxaSINbNjaNjkg3Og6ZmL02Nt5PQtzz/bcAhPedrtGwEcIslA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-LCeX8NNZVbXLdCbPQ7/w8BB70TpUrn2QNc6Ur2BMTYoLJ8vf04PwjAYubRstscxr1ZTH8GSZMhWex3Wi2Pk1sg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-xQzXl7a5PmXx8PA26a3+ixE5JiEXJeIhcYv7dMulfixcWkRmTIiENIOHb8BrggTYHNo8ebRydSwg2EZYkfyCSw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-XGQika67R1l8sZu89nEEgL6MasIjKdWCWTnpgoGGvEHPnYLXUKU5KhPDrUpuj8pQTyXfze0pQ2YdFFUoOtaJHQ=="; }) (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-oYeNNsXVwEbxlxYvla26qHjxoH/9CQRQMIrGKZHibznwXq4R6Q8yKS0+Z1zPGyYf4BC/01kjZ8pzwohfMS7DfQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-aaT/dlm95IEGlM9iVu8FQbIC7lBZuwWRuzIlvyDGm4gsPDaH7OQgkhdhLO+yho7xri65NVI040Zzyz/x9elvbA=="; }) ]; }; in rec { - release_10_0 = "10.0.0-preview.1"; + release_10_0 = "10.0.0-preview.2"; aspnetcore_10_0 = buildAspNetCore { - version = "10.0.0-preview.1.25120.3"; + version = "10.0.0-preview.2.25164.1"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/33517412-d354-4852-a9e2-d6c7c83297e9/361cd00f354832d42bcdf19fd2094a36/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-arm.tar.gz"; - hash = "sha512-JTw+GHBZVBIchD02fjssu4/8RmSfLg2yVbNYMxY+XexrXfQcSXAQIoGvaM+NkSIi2xaN454hca85sMwWO8F+tw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/72b23af4-a627-463c-886b-3f574dc446d0/5369bc93033911562cfd5d8cda4cd2a3/aspnetcore-runtime-10.0.0-preview.2.25164.1-linux-arm.tar.gz"; + hash = "sha512-zuvxkIUVkXXmAATbqI5GmCN8BwjfXdY7IlF3xwyR32vhEKRunuaTAB4nkzBQ2GN8/ItznR5RDQncpWIDHIZszA=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/0b4a8c7d-9b85-49d4-82b0-e2f45f1f61ac/4286d964b1600e1f3ee5d56f7c3b65cd/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-arm64.tar.gz"; - hash = "sha512-T5lvSP0hW2O4Ta8kpKsI3Vtod9q2vvDmw17JRRUrblsi3LqdUKwRmNWHYxPwvNDIAKpajMg+x2R+d0ZvdNrCLg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/7eb1b280-570f-460e-8805-5d55cb06493b/8091831bf8764e9a78eab4ae8bc41d5b/aspnetcore-runtime-10.0.0-preview.2.25164.1-linux-arm64.tar.gz"; + hash = "sha512-IWHlPzBBPye+moGnrtrOEq1SPZ5os11qBR5BdwHSOLE1NWniJ4Rap2qciJt+zRtee6/TpnjivylDja5UDpcNCg=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/de4894a9-20d4-4c58-a748-a2594d097279/bb332c7d3bbec4a642bee7ddc01b86f9/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-x64.tar.gz"; - hash = "sha512-v11PXB36Y+k39NDmuAAoNDej31xVsuQmw++wuNyXlLpwT11EaKzBMPDzuBrOPj1G7hGUW7xfNLvSnXtUw2Yw/A=="; + url = "https://download.visualstudio.microsoft.com/download/pr/495feb02-b2fd-4849-9803-43c5d758e72b/60fa3840af9bb27595f6f7b4b818f89c/aspnetcore-runtime-10.0.0-preview.2.25164.1-linux-x64.tar.gz"; + hash = "sha512-3hTauXgTO57JedNxxfvQHnixBswzDBaNYhbsipewzP7rDU9EOGGHSZdg22A0g9wAFiedxMs/lL+wQsxj0lKW+g=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/5cdd9ee9-cf13-4db5-bb3e-a09183be4ef2/3236e065b593cc2bb0bffc0c976f8e87/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-musl-arm.tar.gz"; - hash = "sha512-RleXs7jRVS6aRgkkgfHIFoJ78BxTLLi3quEQhwpOyfElAK25Htr7y78a5GM4pIUYRdVt4hJ01cbCtsyzldlRTw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/8bf44e44-7677-4766-8486-c6b2891a4c0c/a616e598413adafe4ad43d5d5be6f8bf/aspnetcore-runtime-10.0.0-preview.2.25164.1-linux-musl-arm.tar.gz"; + hash = "sha512-63zgdkzIi6AL3JV7mLgRBXNNpZZCMplvrqqE5PEytmXDF3Y2oKJ5TSt6AeN9lj6S1Zu+am7jcXoB6AVNdEDUjA=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/eedaffd0-7baf-49e2-9291-c9f57233d639/34f0f6b835f35306649977fe772e510c/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-musl-arm64.tar.gz"; - hash = "sha512-dwmkoFoOVqSlhQiQURWduEDAqNMHK7k2B2sccMicLxoLVHg+ZNdiotDdYba7UUTbrK1We6RpkhlsQQFKUbrczw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/b32bcf9d-2390-42bd-88f1-709747ac6bbc/ad9bee446b2682530b9e9af62770ddbf/aspnetcore-runtime-10.0.0-preview.2.25164.1-linux-musl-arm64.tar.gz"; + hash = "sha512-zcF5IytWiO8HmT16eMVIHyVvjO/oFvyRPjhAj63sm18BCpBijW/QTRLhjMw1G2JSpWYXYVShEd9rbaFDCaoNQQ=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/4fe69b65-885c-4235-9aa6-5758e6ac76a0/90be90ae3aab95d59b60f5889c5c6062/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-musl-x64.tar.gz"; - hash = "sha512-AVVkrZaLCRbxIqrrzHG9aACsSAF5y3Qj3KRUULnmHScSB6hr5afMDBYosef6SQYTOBnUe+qhgMp1wEEBr87puA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/c87f5ec8-9569-4894-be65-8f3cf322c251/b655d57fd66869687306e1e7fe31cce9/aspnetcore-runtime-10.0.0-preview.2.25164.1-linux-musl-x64.tar.gz"; + hash = "sha512-eT46PEnCIehUOFCFiyc/byDf2BzYMVJfNNa+KhzuVJS60hDHPMBy2UfJP8gg/yrXCbCiJGK/P+LJIzGeAHhNGQ=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/87990395-a0a2-472f-a255-cc2639a9f5cb/06dd746d44a37da5325ab260dfa4e5f0/aspnetcore-runtime-10.0.0-preview.1.25120.3-osx-arm64.tar.gz"; - hash = "sha512-Q7JCQqV9pnNb7yb0oDmqHJvHlx9NLYuiiowBnaEzIH8YDWchROThIuJ0p9oRxl74ky6VRNZz1Qa54l7B3nQGFg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/351a56ca-b55b-4c5f-be20-1081edb848d7/de67ebf7b8859d4efde0c849de061a4e/aspnetcore-runtime-10.0.0-preview.2.25164.1-osx-arm64.tar.gz"; + hash = "sha512-nk5txKoZR/3iS9efbi2RxD3+EzB8wgN/g+gEjf95VkXbBDloTnUN1vnOwwSJnl57K19NlhMJNF0PbjKoTQD7fg=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/c7e3044f-0976-4051-ac6a-019982f4f4c7/58a188f7893c276ca2ab0f3b95c94756/aspnetcore-runtime-10.0.0-preview.1.25120.3-osx-x64.tar.gz"; - hash = "sha512-WDO9Z/HH4rFqO6yrZslMIKPO4u2WGceVTmvhZLgCQ47vYC1K2vBXoTxym241f/KekjxL4WuFKDYTKEi5DCLtYg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/dd3d568c-e94c-4ea0-b95b-e1d4ae804ed7/68ac36aa68bbeb472c042af07e0e95f4/aspnetcore-runtime-10.0.0-preview.2.25164.1-osx-x64.tar.gz"; + hash = "sha512-6JlBZ3Veyju2kfQxTaa3AiF9KFrFj6h0DstlepriFHijQariEXQCORCnhOJoPlNt9UWJU8SM2IHGUeIoR76LMA=="; }; }; }; runtime_10_0 = buildNetRuntime { - version = "10.0.0-preview.1.25080.5"; + version = "10.0.0-preview.2.25163.2"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/a2280fc3-6358-4f89-8671-3d3535b3e14d/1e3ec98a6c92c9494e7012b80565b886/dotnet-runtime-10.0.0-preview.1.25080.5-linux-arm.tar.gz"; - hash = "sha512-jpHpZerOOsG0cvjZ0sulFTdgbLCumyJF3efy+dlfhmCADLYJpxUrPv6x4BZjBwyARU5hgIkMy4HWUz/MiR0STg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/f54c9c06-3809-49c7-a47e-dc9e63bce7d4/9d64e0d3a360e8846432efb907c87cea/dotnet-runtime-10.0.0-preview.2.25163.2-linux-arm.tar.gz"; + hash = "sha512-/orwyaw9OeVZFVlQzsv6J0UFIfjl+qRGQ43j3MjEv1H7E1MjysO6W7BF/BNCN3auZq5O2dag3zMelZoO00F5pA=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/67154807-282d-4a26-9fe6-16e561b763e9/1d556e1d17d9157dcbdcf09f1c523df8/dotnet-runtime-10.0.0-preview.1.25080.5-linux-arm64.tar.gz"; - hash = "sha512-hA0in8GTIgk+1aGMEjtaMi6SytJpJr23Ce44IHaGSp6JpN0OzBPl5IVCsXMuvRm6ZcrRwbY7lCaNOOeLvmtrdQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/a228c7bc-8b4f-4f52-a517-ed143f8a7b75/006334cb7587884a9aabe63bd298e61b/dotnet-runtime-10.0.0-preview.2.25163.2-linux-arm64.tar.gz"; + hash = "sha512-BcpaAhJgD6LHnDUmxnOCLXntiWXlEyY+6pBPLQn830IwWDIZYbyTD9uQgU7kHvQlRaOyfAgcyXMe5GAsUUh5xQ=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/527fa5e3-8b4b-482e-9c1f-c3cbf8cc0edc/259b1cf466fa1da69dafb26ef142b4cc/dotnet-runtime-10.0.0-preview.1.25080.5-linux-x64.tar.gz"; - hash = "sha512-twTf7Qg9NiMCTulupsuP9tXX4db0OiextHUKiRk/ZKlmoyEbcfnne8dgFTLbmS3zjDTR0VQvBgCCrgENUyQ3qg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/005ab929-04e3-4c38-8134-0b57f86f82e2/bee77f190ace377f3a164814ae5cf34b/dotnet-runtime-10.0.0-preview.2.25163.2-linux-x64.tar.gz"; + hash = "sha512-pkzMyYCfpbL0zLF4lkv/qSuEnEPdKyw5gddT5z8rBaK24YmowqUPxnZSut9mljMTREwI6iLkzRj+h5cElXE0Hg=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/0bb2df4f-2569-41d3-9543-f23cfbb25ce8/a64254fbc283ce409edb78d001561517/dotnet-runtime-10.0.0-preview.1.25080.5-linux-musl-arm.tar.gz"; - hash = "sha512-uQfZdISWYmbCZzL7thQeu5FL6CJYn+2tJq3ZaArW4Nx9AGhQckHA+64SSp9KlXGDgIA4fiHegYM/xzmb4b3WiA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/b07dae9d-0407-4ddf-9792-1a902edf93ac/caacc56b747e8096b126aef4e26802a9/dotnet-runtime-10.0.0-preview.2.25163.2-linux-musl-arm.tar.gz"; + hash = "sha512-EpjURujLJ3aNvdUSV2zdZSba0pp2du50i8kvpkQwdgzb6BfKbGLEhyqyAIuEVYDUcJVxpZxsPzMmUKyu6GQ1Rg=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/6ecc182b-eb3a-4d4f-ab75-5c6c565d643a/70922b6f9f596549975d0c6c7672d558/dotnet-runtime-10.0.0-preview.1.25080.5-linux-musl-arm64.tar.gz"; - hash = "sha512-LMP3cV722ZhttzN2vL58bNu596WLQ+e+BRwu1Ff378JIo8Tch3OEZ62ZqCyjhe6lPryK8RwYkA9fmAyLdtmkdQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/207578e7-0ba7-4785-997e-339ac96dbb07/9380485cffaaca7cb6bd9a6b4bd4306f/dotnet-runtime-10.0.0-preview.2.25163.2-linux-musl-arm64.tar.gz"; + hash = "sha512-Y8xhpb1TsTJ/1n1XsEhBwKjnlQtdUx/HiQNS5WqioJsIOoCMyLm+Gv1CQmQ3HVH8Myl5H9wEeYiM7vrdpS4nIw=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/a580cb7d-1394-4571-9779-b62520571fa5/0ddc6d2478352d792caef0a21c8682e8/dotnet-runtime-10.0.0-preview.1.25080.5-linux-musl-x64.tar.gz"; - hash = "sha512-k2OKXnZrWFmuWOw7pd2BpgoObi5CZdCbG9ceQphyFt7x6Uqhw5jjPSC69rfAIYGM7hERc7V3H/DOK89WzJZMAQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/7ee3d1e8-df5d-4233-9a69-6b2d6e9efcfa/f1988a54e940a1a6decc08b8771cdd24/dotnet-runtime-10.0.0-preview.2.25163.2-linux-musl-x64.tar.gz"; + hash = "sha512-2Rv7WDmzA3fQmElRHIZoIwvlH64NBeB9dhKX2kDJlNgA3lzm/F9zB8vfXPbn+n3XIOyrg1TslDbGYs1P4UhR3Q=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/a51a8de7-b1c0-4453-913b-b7421273ce3f/fef20f679bb688529545845a64f7ba2d/dotnet-runtime-10.0.0-preview.1.25080.5-osx-arm64.tar.gz"; - hash = "sha512-dOphwWoG+GxniNRsTXVyb23Vf75MRZPv9SqLFHL9+AWr5hgwhz/T70F4p1I499z994e3HjmoQV7Q9s4ExLoeQA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/2542cacb-b45a-4071-b75d-da8faf0be4dc/2d36ccebaa81348d4cfb4dd6af8ed685/dotnet-runtime-10.0.0-preview.2.25163.2-osx-arm64.tar.gz"; + hash = "sha512-NJsqnzTfzRq4GUhO4JzDLvYcMWKalSAlbWQ5FuS9XROE88uvjQMWvejJDNjurGGhcMxIa+OWC5USrHnlZ+5UtQ=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/c0eb2952-c1e2-4d70-bdd6-96e7ff3f1350/efad700ef7526e474ed91611c1765272/dotnet-runtime-10.0.0-preview.1.25080.5-osx-x64.tar.gz"; - hash = "sha512-bqHaR7YOU2GWT/95ufo9zMCHyXc9NCw03vfuiY6vben0baZmRIR9mBYV3t85aYYQ+FDdZPIJvUQQ4FX1Czt+CQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/e209e166-f1ed-4d03-8218-70b46e38b2cc/c0cbc2088f7fda9b584dca195e4fb455/dotnet-runtime-10.0.0-preview.2.25163.2-osx-x64.tar.gz"; + hash = "sha512-o5je7K9AF4HK3skZ9IdqqRTZPDjwganB8bhQ4uv+SVKRn5Cr1yPY+qXPN6FJsoHjkXQrqOc2E+Kx5CdnVdjYHg=="; }; }; }; sdk_10_0_1xx = buildNetSdk { - version = "10.0.100-preview.1.25120.13"; + version = "10.0.100-preview.2.25164.34"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/421388aa-682e-4ac0-b001-235c68ac75c6/2823384aea24f8fb43d0e8cf14b4c479/dotnet-sdk-10.0.100-preview.1.25120.13-linux-arm.tar.gz"; - hash = "sha512-06dnE4VQJryxMbl1lnUOJqQxgL6fh1gRIIo7G32IyB6WzHael99Mc5ejuqzjCY+EioNF32VgcDrOdl24shCS2A=="; + url = "https://download.visualstudio.microsoft.com/download/pr/c1d0c660-7cbd-400a-97cd-508289238f07/ce3b3a3546e5356d4c32f0e5f4d03038/dotnet-sdk-10.0.100-preview.2.25164.34-linux-arm.tar.gz"; + hash = "sha512-CEFosilqVJ/LoZDWnNVlzEjvpeowy/5htb7Z5BWsrkOkFrU92OW/FqWYvu7RsLqW27e8VUouDizgDHY0oaWh8A=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/1889d4a2-7d5a-4048-b53f-b47ec6f73bbe/f550d0103110905cc472afa3ecf4223e/dotnet-sdk-10.0.100-preview.1.25120.13-linux-arm64.tar.gz"; - hash = "sha512-ZFthirf7zOOPgrLKml+raxF0LcnKU/S7ZWVNvoOF4Xia7QNBYkNq+ZjFnkGLUDFgfnGFbcOISHF6dPjzKS4MSw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/a7eebbc3-e249-4266-94e8-b48a519630fa/86780770348edc13c7ad5476645b4aff/dotnet-sdk-10.0.100-preview.2.25164.34-linux-arm64.tar.gz"; + hash = "sha512-BJE4E2b1DWoiEfkl9cWy4TZPOzpFB2xwbazTr6aFbdle+2uszMiHRxi943Q553YU/yv9WAw8LpdzfULbMR215g=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/ed3f7a1c-0aeb-4bff-8f93-db1b48c13dbc/dbd62e4564414b7de38e32ca47a0e9e3/dotnet-sdk-10.0.100-preview.1.25120.13-linux-x64.tar.gz"; - hash = "sha512-mGh8uJhZ/hhHoMrmx1LOIwkjHl7ybuUoWJOltXlPv9Ud34UQ3rX3AOopjO/9nLwPnybJx7TZAESoK90rmKv8xA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/c526dc3b-5240-4449-ba07-ed9a3610fe09/442f1cf6e4e832eea0b045f9e108c8b7/dotnet-sdk-10.0.100-preview.2.25164.34-linux-x64.tar.gz"; + hash = "sha512-Zk5WGIJ8T55dUVDNftf4xARPha576Nx3mo2GNNzJYrWecxepUz5XsmgzNLEwT3tm5ZteaOGlARR6wU4fIvRrxA=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/0a51b91a-f741-4903-8d01-29d81817c839/549fb11b7fc5bd0859adbf47f229dcbb/dotnet-sdk-10.0.100-preview.1.25120.13-linux-musl-arm.tar.gz"; - hash = "sha512-NhxG/rBTUNB8lpyIzBqCEVLLIVNdVEgXx7rFSRS4TVJuPlqmQvucxdwzHvAIuyBROIQa0iLsO5oGuNCHQfrpXQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/665e8b2a-9823-46f5-9469-005f1e9e52c4/a291524f20b417d0179b1d44fa345342/dotnet-sdk-10.0.100-preview.2.25164.34-linux-musl-arm.tar.gz"; + hash = "sha512-gs/H+ppkkeYlit8z64GwvLG2n1lg1jG/vR6ctZ4LVVDC/9JiBGHkZDDRIVuMygl6Z6whXg96nJZYANMHpbuNcA=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/8044b967-d629-406b-accd-6fccc09e9ae0/9d67c958431f0eb0f45b3c0f1bff81bc/dotnet-sdk-10.0.100-preview.1.25120.13-linux-musl-arm64.tar.gz"; - hash = "sha512-kWgHEHze5WH1MNOT2Awfw75VCZQ28yTvA9KpJ5Kzyrffn8PMyHxYqtVSAjL4B94sQlivSiTrE3FcNgzc9U76Pg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/e637ed7f-4651-4e2f-853f-4e81354659ae/b9022529e8dac680f4abf5da4a20b755/dotnet-sdk-10.0.100-preview.2.25164.34-linux-musl-arm64.tar.gz"; + hash = "sha512-wUGbcT1VEYNf/m5h7/4Xgq9ahCn6vVF9PYQNIZdSJlaByxp6FaHwa2xaiQ3VDnRhs7Du6gok1cIGa/rz1S7sQg=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/ece436cd-7c74-4c96-8d7b-bbca4f3f2dad/d50fac6150ce404dbb6ba7d779545f7c/dotnet-sdk-10.0.100-preview.1.25120.13-linux-musl-x64.tar.gz"; - hash = "sha512-NaLOk7p/OaCP0XcRiqDM/oyQBVuN+Y0+E0BkSpHD6pCvwCAb/7DOtUiCMT/dnTqwGsI9b4zLPvBnChr4Jc0yVw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/bcc19fec-7eac-4ff7-a8b5-e5a2150ce497/cc4b1c4d475f054a57ac78c333be567c/dotnet-sdk-10.0.100-preview.2.25164.34-linux-musl-x64.tar.gz"; + hash = "sha512-eJh2U171Zmnb/mORN4/PQNwrj0rfE3vduLNYojQD7K/lvby7DHcVz7DSbtBhrbIFIK0asSUF+WTcgIsrEC9llA=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/22d09ef4-cec4-48e7-be48-e105c9037dd4/33763054cbe2bbefd7d59c1d66e67122/dotnet-sdk-10.0.100-preview.1.25120.13-osx-arm64.tar.gz"; - hash = "sha512-XpjbKsqs+z6Rq1b9NppCJYcGDNTN87ZBG8UhTVm5hRQsRZ9lDqa2O2r48f/9L1451oWxeVCBSosTHlezDhwvSA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/d53c9666-d853-41f0-9063-3343a366022e/769c062074b7d520dbc46f0103b1fd8f/dotnet-sdk-10.0.100-preview.2.25164.34-osx-arm64.tar.gz"; + hash = "sha512-VeySisULCzR4OHGn2GYqrb+UQ8uSF7kF/ER+a0beF5piIr/fwlpr3T6Au4InvN3wiLQeYdWl0earkx/II31ajQ=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/8462c34b-dc1e-4793-aab0-449bd1419d1c/bac3f5d229638e0d8600b9d4b304c26e/dotnet-sdk-10.0.100-preview.1.25120.13-osx-x64.tar.gz"; - hash = "sha512-X2C9WgE+Wc+2dLfS6TM7TojYvIZF6NGMynUeNWKGmG83HZ8hdnX3A8hcUVFZ4PdO9U1g5cf3F8HuRpp2hKV/XQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/c382791c-4480-465d-9bfe-c311a41f9945/2acdfbcc4a3762cf516868177d92296b/dotnet-sdk-10.0.100-preview.2.25164.34-osx-x64.tar.gz"; + hash = "sha512-zFc9wPnYRiDwyQ3XTwU455ell9rtI2XC8xGhYrD72S0DGml8icgGrbqKwiPD4/NxnebSJD6gRGRsYsu4uhgocw=="; }; }; inherit commonPackages hostPackages targetPackages; diff --git a/pkgs/development/compilers/dotnet/10/deps.json b/pkgs/development/compilers/dotnet/10/deps.json index 119379ca0e80..99d89b05a4dd 100644 --- a/pkgs/development/compilers/dotnet/10/deps.json +++ b/pkgs/development/compilers/dotnet/10/deps.json @@ -1,50 +1,50 @@ [ { "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm", - "sha256": "d38531cbaa10ee29e2d7fdcbfdb3475ab98656cf61eb7e8cac7776b591f14087", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/10.0.0-alpha.1.25073.13/runtime.linux-arm64.microsoft.netcore.ilasm.10.0.0-alpha.1.25073.13.nupkg", - "version": "10.0.0-alpha.1.25073.13" + "sha256": "7a65c4fa06064df37a3be4bb0c578dc3ef947c13fec953317cffe3f0666387d7", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/10.0.0-preview.2.25111.15/runtime.linux-arm64.microsoft.netcore.ilasm.10.0.0-preview.2.25111.15.nupkg", + "version": "10.0.0-preview.2.25111.15" }, { "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm", - "sha256": "723a02d68af031016f2f714614a6c2fb71bd11213a8b47748c2d35a61a5b62c0", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/10.0.0-alpha.1.25073.13/runtime.linux-arm64.microsoft.netcore.ildasm.10.0.0-alpha.1.25073.13.nupkg", - "version": "10.0.0-alpha.1.25073.13" + "sha256": "77f4e85fe201e9b4ce5dbcadf0a47bc54ff49ea65cdfa3ea03e5d4fc529a59e5", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/10.0.0-preview.2.25111.15/runtime.linux-arm64.microsoft.netcore.ildasm.10.0.0-preview.2.25111.15.nupkg", + "version": "10.0.0-preview.2.25111.15" }, { - "hash": "sha256-E7StxfoPJuDc5I7z/QKuiqHT4kthGQ2EvI2o408NhHw=", + "hash": "sha256-X3wHrhQhjEZoK0i0R61hL6DTtztx3SWbfnxXDR6JI/c=", "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/10.0.0-alpha.1.25073.13/runtime.linux-x64.microsoft.netcore.ilasm.10.0.0-alpha.1.25073.13.nupkg", - "version": "10.0.0-alpha.1.25073.13" + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/10.0.0-preview.2.25111.15/runtime.linux-x64.microsoft.netcore.ilasm.10.0.0-preview.2.25111.15.nupkg", + "version": "10.0.0-preview.2.25111.15" }, { - "hash": "sha256-U3FiCdmLIJxvd7dy2A2Tn2XVjOE/ZfUt88VavrfGoqY=", + "hash": "sha256-vJOv0C5cd4ICR3O1t3+KDKrCuAS1xIc/habWN24uQSQ=", "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/10.0.0-alpha.1.25073.13/runtime.linux-x64.microsoft.netcore.ildasm.10.0.0-alpha.1.25073.13.nupkg", - "version": "10.0.0-alpha.1.25073.13" + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/10.0.0-preview.2.25111.15/runtime.linux-x64.microsoft.netcore.ildasm.10.0.0-preview.2.25111.15.nupkg", + "version": "10.0.0-preview.2.25111.15" }, { "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm", - "sha256": "11c7151ad97cb1af9b3f4ea0f19424090b9c52eae70cc6f4f2a89e456c060753", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/10.0.0-alpha.1.25073.13/runtime.osx-arm64.microsoft.netcore.ilasm.10.0.0-alpha.1.25073.13.nupkg", - "version": "10.0.0-alpha.1.25073.13" + "sha256": "d3f8456003cfa7a6d32b1472103a19de76c0a1b34cdffef73f8e7efe4868cb6a", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/10.0.0-preview.2.25111.15/runtime.osx-arm64.microsoft.netcore.ilasm.10.0.0-preview.2.25111.15.nupkg", + "version": "10.0.0-preview.2.25111.15" }, { "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm", - "sha256": "6b61e2867d03df14c7093cdbe96b059f4fb6384678d75244cb0107d5f6a8dc90", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/10.0.0-alpha.1.25073.13/runtime.osx-arm64.microsoft.netcore.ildasm.10.0.0-alpha.1.25073.13.nupkg", - "version": "10.0.0-alpha.1.25073.13" + "sha256": "fe9c228d42dea6a2c96f36db3220b64bd55ab647feb5e39f4e80327b6dc78e85", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/10.0.0-preview.2.25111.15/runtime.osx-arm64.microsoft.netcore.ildasm.10.0.0-preview.2.25111.15.nupkg", + "version": "10.0.0-preview.2.25111.15" }, { "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm", - "sha256": "f3e226d57403e870edd98516dbed0f540a9a1b7d9442edc2059245a7ef00ffdc", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/10.0.0-alpha.1.25073.13/runtime.osx-x64.microsoft.netcore.ilasm.10.0.0-alpha.1.25073.13.nupkg", - "version": "10.0.0-alpha.1.25073.13" + "sha256": "e2387270b965f57b29b83eea85eba5703d1c6a19d3679d9a9a1ee676a3dd2e07", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/10.0.0-preview.2.25111.15/runtime.osx-x64.microsoft.netcore.ilasm.10.0.0-preview.2.25111.15.nupkg", + "version": "10.0.0-preview.2.25111.15" }, { "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm", - "sha256": "712c9f21199f1707a890a190b30dfb5e7e24a918751209d45f4ce2ca80b0d7c6", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/10.0.0-alpha.1.25073.13/runtime.osx-x64.microsoft.netcore.ildasm.10.0.0-alpha.1.25073.13.nupkg", - "version": "10.0.0-alpha.1.25073.13" + "sha256": "d6a073b4ae19c68eddede138afffd8922b0d32291c31edb5d7ce09b714a79e1e", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/10.0.0-preview.2.25111.15/runtime.osx-x64.microsoft.netcore.ildasm.10.0.0-preview.2.25111.15.nupkg", + "version": "10.0.0-preview.2.25111.15" } ] diff --git a/pkgs/development/compilers/dotnet/10/release-info.json b/pkgs/development/compilers/dotnet/10/release-info.json index cbd52e03f7fd..1e3415dc4e8d 100644 --- a/pkgs/development/compilers/dotnet/10/release-info.json +++ b/pkgs/development/compilers/dotnet/10/release-info.json @@ -1,5 +1,5 @@ { - "tarballHash": "sha256-JJMGyXFJPJYOD9c+V6M8ZkHXjvbBgfeUSqRatuMhhWQ=", - "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.10.0.100-preview.1.25078.1.centos.9-x64.tar.gz", - "artifactsHash": "sha256-q8wMaUmbcDbvCKjm1oliz7/HGqf5X4rnympuG18HzgE=" + "tarballHash": "sha256-pTGkjxQ4T0PhpBkb+R+qKuA7n66JVi+V6VB18W5RfR0=", + "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.10.0.100-preview.2.25113.1.centos.9-x64.tar.gz", + "artifactsHash": "sha256-1vm1bsHMe9ynKBhJE7Xkwnjc2JYVT/lK/EaKywycnXE=" } diff --git a/pkgs/development/compilers/dotnet/10/release.json b/pkgs/development/compilers/dotnet/10/release.json index a76ab39b388c..31c9d7306625 100644 --- a/pkgs/development/compilers/dotnet/10/release.json +++ b/pkgs/development/compilers/dotnet/10/release.json @@ -1,10 +1,10 @@ { - "release": "10.0.0-preview.1", + "release": "10.0.0-preview.2", "channel": "10.0", - "tag": "v10.0.0-preview.1.25080.5", - "sdkVersion": "10.0.100-preview.1.25121.1", - "runtimeVersion": "10.0.0-preview.1.25080.5", - "aspNetCoreVersion": "10.0.0-preview.1.25120.3", + "tag": "v10.0.0-preview.2.25163.2", + "sdkVersion": "10.0.100-preview.2.25164.1", + "runtimeVersion": "10.0.0-preview.2.25163.2", + "aspNetCoreVersion": "10.0.0-preview.2.25164.1", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "cd6837f843092ac26057787149a098851e8dc9c9" + "sourceVersion": "7c509c46e0f6df3473129f2dcb7ae7710c200c3e" } diff --git a/pkgs/development/compilers/dotnet/9/default.nix b/pkgs/development/compilers/dotnet/9/default.nix index c9ec2ae9a930..1dbae65eb168 100644 --- a/pkgs/development/compilers/dotnet/9/default.nix +++ b/pkgs/development/compilers/dotnet/9/default.nix @@ -4,7 +4,6 @@ releaseManifestFile = ./release.json; releaseInfoFile = ./release-info.json; bootstrapSdkFile = ./bootstrap-sdk.nix; - allowPrerelease = true; depsFile = ./deps.json; fallbackTargetPackages = dotnetCorePackages.sdk_9_0-bin.targetPackages; } diff --git a/pkgs/development/compilers/dotnet/combine-packages.nix b/pkgs/development/compilers/dotnet/combine-packages.nix index 4c9e868dc4f5..d040faab1069 100644 --- a/pkgs/development/compilers/dotnet/combine-packages.nix +++ b/pkgs/development/compilers/dotnet/combine-packages.nix @@ -20,50 +20,57 @@ assert lib.assertMsg ((builtins.length dotnetPackages) > 0) '' `with dotnetCorePackages; combinePackages [ sdk_9_0 aspnetcore_8_0 ];`''; -mkWrapper "sdk" (buildEnv { - name = "dotnet-combined"; - paths = dotnetPackages; - pathsToLink = map (x: "/share/dotnet/${x}") [ - "host" - "packs" - "sdk" - "sdk-manifests" - "shared" - "templates" - ]; - ignoreCollisions = true; - nativeBuildInputs = [ makeWrapper ]; - postBuild = - '' - mkdir -p "$out"/share/dotnet - cp "${cli}"/share/dotnet/dotnet $out/share/dotnet - cp -R "${cli}"/nix-support "$out"/ - mkdir "$out"/bin - ln -s "$out"/share/dotnet/dotnet "$out"/bin/dotnet - '' - + lib.optionalString (cli ? man) '' - ln -s ${cli.man} $man - ''; - passthru = { - pname = "dotnet"; - version = "combined"; - inherit (cli) icu; +mkWrapper "sdk" ( + (buildEnv { + name = "dotnet-combined"; + paths = dotnetPackages; + pathsToLink = map (x: "/share/dotnet/${x}") [ + "host" + "packs" + "sdk" + "sdk-manifests" + "shared" + "templates" + ]; + ignoreCollisions = true; + nativeBuildInputs = [ makeWrapper ]; + postBuild = + '' + mkdir -p "$out"/share/dotnet + cp "${cli}"/share/dotnet/dotnet $out/share/dotnet + cp -R "${cli}"/nix-support "$out"/ + mkdir "$out"/bin + ln -s "$out"/share/dotnet/dotnet "$out"/bin/dotnet + '' + + lib.optionalString (cli ? man) '' + ln -s ${cli.man} $man + ''; + passthru = { + pname = "dotnet"; + version = "combined"; + inherit (cli) icu; - versions = lib.catAttrs "version" dotnetPackages; - packages = lib.concatLists (lib.catAttrs "packages" dotnetPackages); - targetPackages = lib.zipAttrsWith (_: lib.concatLists) ( - lib.catAttrs "targetPackages" dotnetPackages - ); - }; + versions = lib.catAttrs "version" dotnetPackages; + packages = lib.concatLists (lib.catAttrs "packages" dotnetPackages); + targetPackages = lib.zipAttrsWith (_: lib.concatLists) ( + lib.catAttrs "targetPackages" dotnetPackages + ); + }; - meta = { - description = "${cli.meta.description or "dotnet"} (combined)"; - inherit (cli.meta) - homepage - license - mainProgram - maintainers - platforms - ; - }; -}) + meta = { + description = "${cli.meta.description or "dotnet"} (combined)"; + inherit (cli.meta) + homepage + license + mainProgram + maintainers + platforms + ; + }; + }).overrideAttrs + { + propagatedSandboxProfile = toString ( + lib.unique (lib.concatLists (lib.catAttrs "__propagatedSandboxProfile" dotnetPackages)) + ); + } +) diff --git a/pkgs/development/compilers/dotnet/update.nix b/pkgs/development/compilers/dotnet/update.nix index 1a8112c3da2c..fc939045c0f6 100644 --- a/pkgs/development/compilers/dotnet/update.nix +++ b/pkgs/development/compilers/dotnet/update.nix @@ -91,7 +91,7 @@ writeScript "update-dotnet-vmr.sh" '' ( curl -fsSL https://api.github.com/repos/dotnet/dotnet/releases | \ - jq -r "$query" \ + jq -er "$query" \ ) | ( read tagName read releaseUrl @@ -140,7 +140,7 @@ writeScript "update-dotnet-vmr.sh" '' artifactsHash=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url "$artifactsUrl")") - sdkVersion=$(jq -r .tools.dotnet global.json) + sdkVersion=$(jq -er .tools.dotnet global.json) # below needs to be run in nixpkgs because toOutputPath uses relative paths cd - diff --git a/pkgs/development/compilers/dotnet/update.sh b/pkgs/development/compilers/dotnet/update.sh index 415efcd13598..be3e5c6f9086 100755 --- a/pkgs/development/compilers/dotnet/update.sh +++ b/pkgs/development/compilers/dotnet/update.sh @@ -10,14 +10,14 @@ release () { local content="$1" local version="$2" - jq -r '.releases[] | select(."release-version" == "'"$version"'")' <<< "$content" + jq -er '.releases[] | select(."release-version" == "'"$version"'")' <<< "$content" } release_files () { local release="$1" local expr="$2" - jq -r '[('"$expr"').files[] | select(.name | test("^.*.tar.gz$"))]' <<< "$release" + jq -er '[('"$expr"').files[] | select(.name | test("^.*.tar.gz$"))]' <<< "$release" } release_platform_attr () { @@ -25,7 +25,7 @@ release_platform_attr () { local platform="$2" local attr="$3" - jq -r '.[] | select((.rid == "'"$platform"'") and (.name | contains("composite") | not)) | ."'"$attr"'"' <<< "$release_files" + jq -er '.[] | select((.rid == "'"$platform"'") and (.name | contains("composite") | not)) | ."'"$attr"'"' <<< "$release_files" } platform_sources () { @@ -53,7 +53,7 @@ platform_sources () { nuget_index="$(curl -fsSL "https://api.nuget.org/v3/index.json")" get_nuget_resource() { - jq -r '.resources[] | select(."@type" == "'"$1"'")."@id"' <<<"$nuget_index" + jq -er '.resources[] | select(."@type" == "'"$1"'")."@id"' <<<"$nuget_index" } nuget_package_base_url="$(get_nuget_resource "PackageBaseAddress/3.0.0")" @@ -256,12 +256,12 @@ update() { content=$(curl -fsSL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$major_minor"/releases.json) if [[ -n $sdk ]]; then major_minor_patch=$( - jq -r --arg version "$sem_version" ' + jq -er --arg version "$sem_version" ' .releases[] | select(.sdks[].version == $version) | ."release-version"' <<< "$content") else - major_minor_patch=$([ "$patch_specified" == true ] && echo "$sem_version" || jq -r '."latest-release"' <<< "$content") + major_minor_patch=$([ "$patch_specified" == true ] && echo "$sem_version" || jq -er '."latest-release"' <<< "$content") fi local major_minor_underscore=${major_minor/./_} @@ -269,13 +269,13 @@ update() { local -a sdk_versions release_content=$(release "$content" "$major_minor_patch") - aspnetcore_version=$(jq -r '."aspnetcore-runtime".version' <<< "$release_content") - runtime_version=$(jq -r '.runtime.version' <<< "$release_content") + aspnetcore_version=$(jq -er '."aspnetcore-runtime".version' <<< "$release_content") + runtime_version=$(jq -er '.runtime.version' <<< "$release_content") if [[ -n $sdk ]]; then sdk_versions=("$sem_version") else - mapfile -t sdk_versions < <(jq -r '.sdks[] | .version' <<< "$release_content" | sort -rn) + mapfile -t sdk_versions < <(jq -er '.sdks[] | .version' <<< "$release_content" | sort -rn) fi # If patch was not specified, check if the package is already the latest version @@ -291,7 +291,7 @@ update() { }); (x: builtins.deepSeq x x) [ runtime_${major_minor_underscore}.version sdk_${major_minor_underscore}.version - ]" --argstr output "$output" | jq --raw-output0 .[]) + ]" --argstr output "$output" | jq -e --raw-output0 .[]) if [[ "${versions[0]}" == "$major_minor_patch" && "${versions[1]}" == "${sdk_versions[0]}" ]]; then echo "Nothing to update." return @@ -303,8 +303,8 @@ update() { runtime_files="$(release_files "$release_content" .runtime)" local channel_version support_phase - channel_version=$(jq -r '."channel-version"' <<< "$content") - support_phase=$(jq -r '."support-phase"' <<< "$content") + channel_version=$(jq -er '."channel-version"' <<< "$content") + support_phase=$(jq -er '."support-phase"' <<< "$content") local aspnetcore_sources runtime_sources aspnetcore_sources="$(platform_sources "$aspnetcore_files")" diff --git a/pkgs/development/compilers/dotnet/versions/10.0.nix b/pkgs/development/compilers/dotnet/versions/10.0.nix index 1c5b9d85a271..7cf033bca556 100644 --- a/pkgs/development/compilers/dotnet/versions/10.0.nix +++ b/pkgs/development/compilers/dotnet/versions/10.0.nix @@ -11,28 +11,28 @@ let commonPackages = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-7JQ6RIV2MP62co7llxdJaHfHxZ1dovwMT0OZ8hqZTOIDBzvhsw5ZVZNIRO+YIPSRcN8sOJDbo9j0NZ6CwNBDEg=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-fYMkzeTDQC6UjLHMh1JDzKYXWvW3OZQ5HTAweiYasSypdxtYrFtGvMdnxjjaFEpNJER4fwfu9MWxIymARm7QgQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-0B8cvn3YHXRu3o8/I7zRvkvtu0wWis4LW7SV/+H90egLHZPaOfovoGNCvhbHjoTXCghv7S1xqqm4hMgoM6VLGw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-OurybReC2ZIBbIplQvtMCtjnEMp43xHp6rE8J37LLdax5H1XBP5o5uU5B54Y1H+SHf3nzPrgeIBlNFvfTyTWxA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-WM7Vx5qhHEoHVSlzwLHcJhKdlGgva0JWQB9sIdPPfxrb41pOYbTZd5NkU6iUx4rOCeVDz4qFKiluFt5GSR2Pow=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-YQJi7qj+OivviA7f1jCEH1+VIL7EEtC53gGqo07Sf+j86lcEDZyKSWfmk+rdRU2j/4vZ0lLf1jcio/mpJl0txQ=="; }) (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-RuW6CgFdHTLjSuPlkXv1HVAOHhuaLlmMi31SjfuhvkiAXoXeDYV9VkNGAD6vv7pg1BPsuFfibhk4R6GYjjaW/A=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-/qHuLGJzGlMwxGtsIFJVLWHVy08e/h8IDOiRlOjqluSAwcqCrC8ds0kL+o7eurQJp1YyPQgdkT73/dmmcsEagw=="; }) (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-bUaQhF05n2j74fvvQmXlJZmqJfb/YXltOHps8XQZ2HKp5EOY3e6ijEFqXnD1R91ZRghqy2ADwUp5qVarOaMdXA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-EQMhyJBOpIlH1PwyV6FL1Yjfh9v6SFltGdVsiJfkBFd8b99VlTfqobiqDum/GJRw4m8PXo+bkaNz8o/Jd2ebZQ=="; }) ]; @@ -40,118 +40,118 @@ let linux-arm = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-qY9/zo3KRmK2ArwHghHuL7R/a6BUvDq874D4+EK78k1sU/vHc5sl5vkkxEu7vRrwG0UUXurvxwXve3cGPjB6dg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-Cieasw2gZJ+iZS8lqQVIwhsDEem5ReGEZ0LkRPZ7dybi9fHCK6LT2B46muLsUikx2HBPezMV2mN7ZGw/l3lIdQ=="; }) ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-vgkB8yUmJw1w/n0uP4FhvFOZDWIkPNJAfakhvn5yVZMh5VqnCCHyfCLb9edXtFWmpC+SMEyCT0bqSHTcLMZfNQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-gQ/sJVpO4ruqIMG4clnWzp7CWzOlrXklBYA/DlBHUYlms/SZcqUBV4vva1Sk9L8zln2RAagokBWQYoO9pStYHQ=="; }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-c9EJZR2W+xHmCLrS59Bdkp2/Fw4DSAVzwBt1uuNAQ9XXt/f2REt/osXj/EkbOCyQAnxQ4J5v26BG1lpxkZ1IVw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-tVvw3o2ilquZQKFvm24rrBEXR0pscFY5qUakJ30tl29JfNaUIotJUG2fWZ/kD96wCqnACVB5zp2D2wi/STQhcg=="; }) ]; linux-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-kMS00bMWu+Coioesh6AGeBekk/nKt/UMCwsC+xsvScdGjGJ1Tjv8BMsNwAshMGEwdlbB6EqJyO1J4CPPPK5yVg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-ZcqAA6krkkydoMtk3J2syxpt2r7bzR+iqc+IMFWG4yKfALGHIkuz9XoYTnhAki+rwtL0A/BaDpEc3xA3PpOR9Q=="; }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-qJBeqbHV0876+3iAeBt0bIigrcZYIAqU2cay50LnTUmTYFN2GJdhRFwQIKjHtH8O0vxQaP9Y5tGfe7U9Re6YPQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-/XqJkXi9hfn7wP7psJBfzFlML/pkWs52ZkxLaQwwXBt3YcbAccCKPz4TPenB/wJ3tN174lxrL5zIvD5+HawAPQ=="; }) ]; linux-musl-arm = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-DoJiWclBLGaS+xcf8R0lrYex7c9DnUB/2OOthOnHeUdeuvlEr7CyKf5tAeBbO5yGTyMFP4UnhLtDmA3j1NXYpw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-vXwLf5c8GVhgOPGu9nxSwFVMvCtZULVvbMguMXoLDBfWvHSER/0whkDgWdJVsTGEFiCkhET984EQR+jKj8u3Tw=="; }) ]; linux-musl-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-eVTyfSgkeihFFPfkX0HsRWbgVE6JTQxBfZbke79J5Aw6r6kWS3FR+GkloTRmsw50hEhxsNug8B/3a/v+Hq2qxg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-oGf1jMjRs4H+HKrbkPSnBCYLYcmM/aMGAp4PC48cwq4b5EkYWL4t9RUcf02oOkO/ZH0Y3aeZmEau6RBp3VqsPw=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-U6G5uLB4Gt+QSRVt9tHGpgK9u/h0Kg8gbR3lfmC/TJmPEGd+7pMdG76IxEIi4kF6FLrHMphriD1vtKbfCIKQBA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-VvZndNtHe8lNC5Y0A1fbrESCYNKvpf26qyyNJ3RYh/NmpjVGXsGXqHUodLkhlVf2c9JTbQ1fIKCHw8H+V7YGeg=="; }) ]; linux-musl-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-1YWLHPYBEXma5rFvZFu500hxmDTs/wSC++zYZ1oUkMbtas9Tzsi+F28bkH0n98QwDoxjAet9vub90XIpQIUm5A=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-O5mWnNxmW3sfzYzuF1Oajvxb4dF4t+F0MdxVWfgyNkxzlKDgSwPiJ4Xg8hElN+istQJiYFw2Bhy9siqTEaCGWg=="; }) (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-3k1Oh2b70m3yQh1T05Xl42is8gw/p+7tMGtXmj93PDorqZe7kjGT8l2kNBBCjLsCzBu7PW6Y+88zTzi1yyh/Zw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-HwLZs4+in99u3TEsFZM66Kgzqqqp/gZxvFPNWChGdcGkewAzIo24k5odFXUjaV4rxjEe1rMS0D8nsxspJiv/qA=="; }) ]; osx-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-HwBS0FRJFpEqrTELxYh/zKEHH9/q/DbrBVzrHZ9RdHRX2Ft15oioe33oInecTO/+Vh5AEXF8n1afc34RCPJluw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-B/eqU8l6X24aA6NW3ipNhsJchu2iLkOGr+w0YNmkwiHlwW2N0TWF5O9necwlyQ00guGt3ziyBtPjvm973+VaKQ=="; }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-ITbXjFbm5fN66SYHuNeukyBo2cHlXqGvp/1aajSyK348QDtBnD7mH7r7jQHzKBwHsFJrcGGFju/vf08/ENi3ZA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-jByRZh3dn2XWkdn9Wfkq4dX9zpTewMkEoRU7UxM1WTsXqwYl5EaSOb+u2C+b8eKTrwLi5D5hUJR8/h1ZmowE3g=="; }) ]; osx-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-bp432DB0NVMIlz9LRohJkF4gc+AJlW/+6nEveEuFmZlIjPxN2KaQvu7QYOHkb8z/J9G4jXJyyrKjNs9AlcGXzg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-nQ7ny7gnwIvjj2f8wEgdfdVusCtH9Av9AeSxZWgmLEKWqlcE1h0JhPhRQx68cuU7aLlUZ3I8fMRkkPk8ZWPryg=="; }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-fVNRllQBrnS3t6LX/RMGBcJc0CnBTAxtS77qA4jX52bso5EB5MfPbCi4BxZxWzjEMf8pSSevX1RXvUGhdJldHA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-Iu1L4i7aNaY+h+ZEMBKJrqBmLnPjexOIKNAwh2GJlPP/ybXAKLm+3+F1MhRZ/XllEyZpxDCb4KsJd735nOTsuA=="; }) ]; win-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-ugo0QgUPcj4wN42lR5jEZZSahxDp7caQhT4MGHHxzEu10U+dSuEiG0Wf+YuiHsrcrFUEeFhgLcdkUw2S/Anppg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-4ESnA9qlBd+Mil9+Aq9bC7/iLyr2RMdOcpTZdb4JfvzEyGlS/eO/jgx96TG7DExbhdvts+7Bip44r+bSVhukUQ=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-IDQ3HJxDYMV6SYnkSWGfy0eEH3MmP4YonaRVBxDmxLT0Rytv8ZJoWPbDWs52RXeI8y3dAhjYD84ZaOeREwQ9YQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-JfRI6RnrnPdMDVktXNG2xihQyfKjkk3JyNadkUuGaPO8sY6zH8/ETluFV4iA1VwXira9wmaz3s+c8w4GRdtqbA=="; }) ]; win-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-VWg5J5BNzoDeIZ491JkY6anNjuKQaUr5TgCszNnCp3jPPiDVSeCf3Mhk4EZ1fKC/trNcEYgW785b9URshQhTvQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-K6cqb1rspwgKAhSrUhw35r6peEfv/zZ//jQtlzIx/IS03z/xXUYYUSdI612dlkwAcB5Fc9xOhuvVX2n3fKfykg=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-TEMZtKCvJhq7P/CCIzISYvxDaW1o1jcseepquCbrYSsrLCKJ7WNE2zStqu5HNh4VqiszQ1BWjLTdbTPKjdptWw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-QiElAQWko8o3XcVi7d+OKMbe9LVHu9oZ+yrQHMmia8j/eT2IJh0qTd6tLwXP6zdQ4XIKWsU2KXO/UbJAN1w//w=="; }) ]; win-x86 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-vx4NS+RHj+ZEvhqJMhMvfKTWAL799sKjFaR0PY20C2hSXxdMyxi5rIR/XGgdPwF0PcXMul36KVWFssKA9y3NNw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-GQujUNYZiu7URKlNquKouh71dzVwllx7fpQnQc6LTYljDeEUKJYub8cWL1XpE7nagtHQEpk7cgGkOi8Mj2uJ1A=="; }) ]; }; @@ -160,361 +160,361 @@ let linux-arm = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-NYnDi9YcfGAZ1qXK6knwsldUTR+92tw7Q6MXq7Sted3rNXRWc6xy/zezOrFP8OjAdn8Slz5PUHFDz9BdGiOuLg=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-yHOu2Pa3I00ufGOKdhGvzMvbeTbbSTEpovFmV1eiPlAs331lZjneCnxf5/jdGpY3bA2ZyzkIIvCdQCONG5vgxg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-2tYWNqQJibUOWHwjkTsxfwRd+u8BphDEdxNVBU8HLjcoSZbONXsKHx+RgBS4J52mRBVM65BArJzZ8toIenEaHA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-9WlHGvn2LER6YnMZUXlhjYdZedtpglBnOJXnAm1T6fDXE7SXdNoKanyIMurp7CIcSzIUnTxtlpYFSWPo2ELMtQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-E6FcxsPYNxn1E60s6jnxFTRxm2thvgE4Iy/rt4mgNk/+mQ+zmwLnZiDiVCAnxD6Cl/7OWRPCp4Yy6csl4PVN4w=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-9+JnLRfcTbGcdHvFkMSH9RonNMg018RN1b3gmV8EGUk5euQdFekozbrDv0/gcgHtczkJU76o2FYnmTnfTgtR0A=="; }) (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-FNAL8V9jD16HGrYatWUxN/IjaipGYC0WJ5tMPgC+ZseDNnDU1XT7hE9AW6ZGnJRkB6pEBSl/D+sCurrLPWFNWw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-xAJuJZzQSjTgJxhHo5mXdsf2IJyP0hTJEUUlqd+HOmkYMUurgjhyzN9U1j7oHX54rZ0a7MNMqbaLLXJVduJdBA=="; }) ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-5xXwUnVyIedqRN2/u6mJTYQ2aEmL5UjAILayabKaVfbfjSDKyrtNEZlrHYxGASh9nkPRP/TesYDkPnOOXCdW6w=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-N7tOTYXkPMYFqvLXbBKMPvjcCRdRMiCRYS6wV/x1JNSbrSSBMF84Ev7jbXrSpQVi0j+Do4Z2pxrOnLDU8JZ+Hw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-4Y0KWHx7QySSb9oTuqpQ0rFEwmbW7DC8BMYzXE9wYkCCg1ErXZxdrNCWhuYj/lp7T9AYsFC3DFvbzAZidGj4/A=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-nJxaKLr14lGnGigfS0IIqReXhJkeb6rCntUkPY+x9cjuBAtz8YUe9f2WHAenk6snYqWbRqR861I+/IASnHZLxw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-w3WGynXeGdTuap8DrGOh84JUHNpwKJKnMt9U9MZx+zBpaB+76TV3JqL78w7fJWoA0UbAuUsmXXc45FwiEsYhvA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-ZGTkoeYsP8WdgJ4S8vBRF+UeiLjUk52M6JAqq40cTsjKl8ivQq7zfrqFyGRdfFnC9376GF3Lsg+Z2fbNWRb7Lw=="; }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-2rGKD4/VJ5Xn9F4oBB6vV7QNeKi4+QEf5DPii5WmSD9K3Z+iDq06JFH5zejgzWy6O+rczaPtm7f3DOl3XxHZyw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-ghYZEwoP73mW/X8+SlKmhBrpbXap2NzPfRsqEsDR0q4MX6KuGMNiMyBJ7I32mUpbj8bxYOWBktv2Ghy5v4Rdxg=="; }) ]; linux-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-PFumrKSdBGAKYEaEENnEy4PpZSZp8t8RYWkgUyY7QkZ+ZcqYEWc9dvzvoMlscVKb4/NoYrB2REkNtCu+zb+vcA=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-L7IYzdd29Njp3cpZVVSgHsspUlhGqFljg3hwxLiAJjNw2hMwZM1SIhdK14IxFC1zTpwrUlcpsbXTrDVZRwMLZA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-Zfwi2Gesww6LjQwXT1jqHNIqhj2fLb0woea3RLKec9JvynzazLPu6G40GzrsZ4wLl00EX1aLbjUCJOp3VsO93g=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-zbgLSb7iVnFEfaqlkj0mBozpr7EZy/gQXlH+MLmjKqeUu8URiA5P+qDwSxkSBy3tjHdypydtRwr3yzSI5Y14oQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-+q8UP3DgyTEGgAbYjhbTOZ2u7TzLENugBm3TWjotZiKEKR4xXn+ZifmVbQ2NZ/eTBNbdi6Fi+TQUAvCCjAwU/w=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-8ub8FpQ+KFKdhscpMQmlGwH2GsgF3I8aNEyvFoyeGPJvqD3cXIijZK26aTjH848E4tJV4AO7tJEFk7TdKXnwxQ=="; }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-YXCvPERukDSzy+drLG+9f3haR61XsRLM6hjk6eutb0LCew5pAc3Yh/DYR+W9qCmPwkzlkGYuyfDyo/FaLU4HEQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-qiCczti3W/bhI50Tp5r9NOOlDoCjtaBo498wNzIfRhEt/nzBe8Q1Fnr4w9w1WiW1wIFQPwAI8UEHFN+CPkwlqw=="; }) ]; linux-musl-arm = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-7TCyhwPin4fR7Nf6ggP/ngDaZtjQEdkowM6NJUa5wAsLvz1l/WcIDaWDvaZKyrNnfrvlWecKbjOx0PxOgVOoJw=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-dqGfk7Dp3LW7+o4wQPbVqi0brEJuubJzlsbvCDEF3ISapgmo4IVdaIFIdajEeK0CYDv9ro6CpKLOAILXhfT9QA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-N8fL0vrL6dbaDB0ogelbF3fEEOLGkQf95xSOEdq/Pi+S8esNNwrfrZfjlHZ1dOc0EUXZDgxvrJwTc5FazKYBdg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-klCs8GuMTDnn99J3NuUhGgfrZ8USjXFvUmb29YovrXbIYEBEWwHAu8dkK9mupBiSXkXale8Fgve2SZ2lic49dg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-RX/Fj9yHn9lXeHN87JgR0aAWCNQKcdk1omYs4yE6Gtbk7ORl1CXkq6VHy8UT9ULUC0wIo3+7OX36ciVU5nRXsQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-Z8ABfKzezrD8oQnTFa0s9tQASL+wsHrrXSLQDu4djyiclc1N18kBRCcj1hBwa4V6Qs+daZqZl5f64B+eTZDlmw=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-Hj9OwrnKZJbo2leR/Df+BfmntQCdnZbXoaZMtTpNzN7npHptiVaOv7bQ51hIC+qNp8MbvPeMbaN6rC2d1IR3iA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-KflBz+weDQwzryX2ManDUioAra06ojwq8NgAUEpKiuPdFO2w5aLxNLs35ayMxQg27HxmiUYzgFU2XyzY2EqsYg=="; }) ]; linux-musl-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-lrDg2jv7Qyu7aD4COB0pwRGy7DgYgYRjDw6QRuRsbuMghTkyGYzEaQB78JwBqBYwqrXKQ+a+8qvQbpuRXpF42A=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-5IHjU+if8HXHLcC+eYJkkIj02GIwO2DQMY1uXM+P4PisHwD6bDkojHDH6Eo51LnwGZkKttMSUZ5FU+oI2SJXeQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-goUOx6hlUIgfru/Nl4luQOW1NW7RjXFcnT1sQWfZfMcof72yG785+TvAjGsxbZAafT7Hqqle+KjVizkZvw8jnQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-244dky5rKXLRbqUrR0CSgjkdNoQCQJTMCe3B5chtMEZBkk0UCsQ3la0i6QoaGgHOVnyZAfDLGty5Xahl9Zxkyg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-joQATwpqLurBgrYw9GgJvyh4rOHK74x39RWTGnEimEAIhe+99uCO/OM8JcSzucfXnu3+lZwM/8Ki85kBpsJ5kw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-1s7p86jY7ahEa1TvjVk+sJFqF6sRDirl05nJ3JVKZ9vOVdZjO9SHZkdZzOS6o91T179Yve6vS4ejXIn16LVWDg=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-evYMyp8jNrr3+g1k52MqugUgrhyMR6RFVdMX0j9lBW+jWzRKmCJ4AEEWgYVLfX/p6XN60Vq5F+AvsxLmV6vCxA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-toF1P9FT+YMxulAzCc7k0Ig2K4y7Bz4pzJ4woQwCbx23AUIzHj+SR9u0MCnYY53McAkZ6Xrd7iebFdzCILLQRA=="; }) ]; linux-musl-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-H+At/cuv8JLoP6XSmSSXWwn5fZ3ZJVjHbqXmi56ANSyyJxOll2/yjbY2H4WmyKQdBL0qJdr5zdf0XSqnqPdbdg=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-ZcVz2V5BVwsm6JLLvd0ZUwkF6qd02/EM6HRCjcG66xjmClffLqVyz0FyDhgFf4sjub2o+y0VVphMwpKaVjeEKQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-fFvpxLMzN9K0tIPI4W+9LVC3WP0svv5KOPzhKSj5QOXTvOKsJTo8WMHKjjElg3kLTz9TqgtpQbgRcfzwqyOgaA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-7+0KqOJXhUv7HXGhIOrh+W/Wg1p9okac+fMu6D1IG//dpA/dTh52gFRa39s/Di7p3czUG9Fw9CAg3ayLc9FAVw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-pEHWmu67oLGKeg/fP3dzrt//L8/icvlSGueBufScK7/sITr9ecIolcqPqBRAYG740QM/p9hrTQhCVUppmhjjhA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-kzhqF4a3QgdUIUShjH2y+uzZGFqjiRxcX4dEjBNBz9uTLw39ESAUzc9/0OzBqeQf34bndcdWg3RCjl++DSO4IQ=="; }) (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-h3qfi/9UNZtgLOmuwa/AUDwjzutwrJ/CDUOcKeFjCut8vo5lNEBQ40AdCRDkwfMPRtZynnrRbHunsiADqEbAnA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-FxEfJnXNNTZGdoIkXnlbECdH4Ey/aFQTTkKLwUtIULbW7STri3KLmU0rc5htalma/u0TMoaKjoNFfM8FKhbKXw=="; }) ]; osx-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-QzdaJymI2UF8sLTmGIV5KkWF6wEhX+T45L8uju5/oEDuufPLr7Up3d5uxf+5uh8+aqH8fwlu48Tt//LsYzKEaA=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-ia6NWtmLd+Vaini/F85LdVzHb+yl4RRYbMdqvoRYHuIOhz7m84NEf1rqnukkV6W0CDZBWcJXCEhxN1H1jlvBfA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-2sb6VbprC5U83LBpd5DOPhvbBY1DtFBSvhCh3ppDAx4Gzcka4QAJZcYH9JRKt5EtTybdb0Pce6dRxRZ7aQqW4Q=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-OrJWaFXVGFuABTnlHpzLE/oSlYTGCpgVQ2XipZO4IdQwLN2t21xdrmYlhNBKFBO92dQyikoIjAROjlcrWE1jfA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-Y+8kJD2C8l4mejEFP5QneRsgQm/otzX+Dl4nVZLTbi05O/NEJkUmA/oWlluxE5Oe0ZyGi5/sfACcgzQ3E6nGVg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-GMyWth75S1zN/YC8vFuCFzjGcoXB6YTwnVp0sv8bGhyeAamjMt/qB4qCPkrrw/Lt6DF1D2K1J8k3Fsr1Qlp96w=="; }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-hhj3jdVtsAh9jkMQWWuhpKA1za64OUsGD/mGiFl2KNpi1HGhxxHPwfT32ElX5GrqhmCs7l5iUszGBqK2uVYPBw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-v/g5FTqPmNdTYPWUFmOsJvf/VoxYe4Uzi9AxoW1xfoCfG5rqdkYfI8aIZzPLVXMAzDl5+ksVQOJIlrXujidBCg=="; }) ]; osx-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-ZUDP2dv59marjwXPSwIkZh7qtSsYlkFvyFSU2LvlVz9qUX5cPGJROdLgmIDj45vr9EcSDWUzyiDuuSR9o6Uxxw=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-WcJsD6RRe45HnJ4cUOvW0FEGgC3JyCioPLHBivJMcDaXcphlSsJpeJWH3jQ34YBcmJyirZHcA696nert1mQLKg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-jWwOXYCQQLUMSKog2tK6ZJbnDhE4t0jeyc1vUjHfDHmEo3HQdHtrRf7fvJGroqMHK7novNOiGUllJ6qTAWnYFQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-DM/5ZZI9lEF3d2fpj3Yy/w+9aptB2kRtIrcc2DQpVAZXAiMxpZz0mc7+EgkBsV8y7SijBi1i4E/gsfcmuxUxOg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-DmTYpekFmL0mhyEBGU5yw2DScIf7LNKE3S2A/UwWSqpWTTdSZwHd4avbyVQPtD5IayqjeAGxmrVY02X281l9Wg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-d0g9fHBn3W0RTBggWPWaUGb0VkhCLmeDfRtf00vRAKvBLqwaVv5uHMlpSCNktT+2dq3tIEJshtvHmtCGOUOiZA=="; }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-nnT44goUsGrlCdNODhKEjS4F2GtcdSVCTpPkGWJaKaxcKngClTk99f9H3d4EbDugNKGNsQQwro3Yo+DFizwc/Q=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-uUT3ZDtdu5F2R2G05QomGeraLrPz56NuFg+pfBnloIMihQ1mKLnPrOCXZ8z6F4U/WPEs50B0lrk8ck7RNvYpDA=="; }) ]; win-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-Owmxgn5CZxwfhK6VUWjGAS1V00/9mrPb/VseFBsQXn2A/5brX83+jAhxVaXqEd6+k8j45DGJ4eutlBO6JPCDaA=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-UpRM0FNAeRnxPXakMWmn64Hw4gTnFDksUEmaW5Q+uiq+lTHy27bGsa9/qo1GT07WlwlrnSGEL4Os89UQi7fpCw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-hcYIHXVYDFIIVEqf8gRLr2CEeJrqRJjY+I2jMeRg0JIk6cxQ6aNb6364QOVRckOrREiuGuHi1d2/zD/DiSWvFw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-v5zXnXy+J5ll82nnFl1ra3QQ+YrUKnBavGG6cuzutJ0HVyQ50i1ggv/yiQbisZB+DCNn97mSg+RBfe8ybsV5VA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-YMP3AD/o8ZFRu1hoFnVbxgG8PEGDNUg6ENCu38GhJp/MDVNOT1r3G+0iuoI2lHvyhPv2qzCT6m26hZxqVHQxAg=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-skTKyHmXHtPv0SQMSNdq9/tFRNNS3er9yMIaMnaXl6PDQo1FnO7xQ8Akt+VyRvkVCNat0dNeM0EQ0CEOb92kKw=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-CFq8TbbTQeexS+e9YZiujvMDQkbSkGCxgCN7h2aqEQAXRSRy9kgApAuzLlQov2wLrSqXGLyp1BwpQFejBoqmtQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-b0LeHwc+HxwFR6PHFpJPGy3pAhyXwpJe4+Bm0l9HOWTpaTZsbMh9tp4WxnvsZi8NRkTcyLqJJ3HuiojM1+kArQ=="; }) ]; win-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-zEiRA0vBh3H/siaL9g6mbzIvUr7UO6cg6EDHeV8ODiaV2qx5Bk/B8XR8OK3/gl61mSTn6mU2ObAG08aMpsyKnA=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-aEhd15xrWBEM1eta0rE+9qRuUERxISKnqlTktCuwAHJQGt3zn9HN8bmjIKw1EoegqvjxQxjVSnt7KY9g8oHZhA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-jFasdaZcNTwFwclOKhNpsV09IyqoQXQ4iaOQIXQr3UAm3YQwrNtWguemHu1CrrivSBDBGjUkX1INmO1robymWQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-yiZROfX2xzEI6pJFjL0IvXnc2YYxgSghNW107ZNx2VRE9glMEUVyvS2UkfoPJgt+9ID75FG2t/gW5jGdlgRoDQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-rgNo4vT50WUb3YwZZ81oJnUvD6kJVn7PGinLDTpQC+ayBi0wdJ6m8uRXpCTZ+yt4Rz6KR68LYWotMGdzAKfwuQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-ML1iK4UD1IJ93oPSLNGKsP5tPIrWK6mUOPMBE5Ilcf3JesVVUN7gPvtUfFgcPzkUbB5LC8gTZpnw+0OCPURNiw=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-3eN6DUdMKPHC46ANhDQv3Rg4saLj9zX7IvogtwQPQHP097z6m8mDhbMuuH+Fqa3VkxDc4pnDzEUnbXC/pvW+iQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-cX9SJnO4M2ybHKwnwNTcyuCaO2ddwMo7nBIHzE/tpM/4Yn8i9ujlzDBFWb/6QLfopkcTEwbXNvIV+8096TM3oA=="; }) ]; win-x86 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; - version = "10.0.0-preview.1.25120.3"; - hash = "sha512-/OT3JlrxpuMsBeQMn4Gsj2y9r2d+gwsSC87cvvA4hRCbw3+PHBndvFfO5Aquj0O9MPNXiFhz/J7JRYDw47uIUA=="; + version = "10.0.0-preview.2.25164.1"; + hash = "sha512-/rW+Iyj8J2xe+EgOkvtIBG+ZBW3BW2QrU9tSGPXV+eH9U9DPn4zqIA/lY559A0v128XSGW4s39YKFMsd5LGtAQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-B/bP6DvMvk8YGbomVkdRy0tJuZsN/eLSQYy5INxaSINbNjaNjkg3Og6ZmL02Nt5PQtzz/bcAhPedrtGwEcIslA=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-LCeX8NNZVbXLdCbPQ7/w8BB70TpUrn2QNc6Ur2BMTYoLJ8vf04PwjAYubRstscxr1ZTH8GSZMhWex3Wi2Pk1sg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-xQzXl7a5PmXx8PA26a3+ixE5JiEXJeIhcYv7dMulfixcWkRmTIiENIOHb8BrggTYHNo8ebRydSwg2EZYkfyCSw=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-XGQika67R1l8sZu89nEEgL6MasIjKdWCWTnpgoGGvEHPnYLXUKU5KhPDrUpuj8pQTyXfze0pQ2YdFFUoOtaJHQ=="; }) (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.1.25080.5"; - hash = "sha512-oYeNNsXVwEbxlxYvla26qHjxoH/9CQRQMIrGKZHibznwXq4R6Q8yKS0+Z1zPGyYf4BC/01kjZ8pzwohfMS7DfQ=="; + version = "10.0.0-preview.2.25163.2"; + hash = "sha512-aaT/dlm95IEGlM9iVu8FQbIC7lBZuwWRuzIlvyDGm4gsPDaH7OQgkhdhLO+yho7xri65NVI040Zzyz/x9elvbA=="; }) ]; }; in rec { - release_10_0 = "10.0.0-preview.1"; + release_10_0 = "10.0.0-preview.2"; aspnetcore_10_0 = buildAspNetCore { - version = "10.0.0-preview.1.25120.3"; + version = "10.0.0-preview.2.25164.1"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/33517412-d354-4852-a9e2-d6c7c83297e9/361cd00f354832d42bcdf19fd2094a36/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-arm.tar.gz"; - hash = "sha512-JTw+GHBZVBIchD02fjssu4/8RmSfLg2yVbNYMxY+XexrXfQcSXAQIoGvaM+NkSIi2xaN454hca85sMwWO8F+tw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/72b23af4-a627-463c-886b-3f574dc446d0/5369bc93033911562cfd5d8cda4cd2a3/aspnetcore-runtime-10.0.0-preview.2.25164.1-linux-arm.tar.gz"; + hash = "sha512-zuvxkIUVkXXmAATbqI5GmCN8BwjfXdY7IlF3xwyR32vhEKRunuaTAB4nkzBQ2GN8/ItznR5RDQncpWIDHIZszA=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/0b4a8c7d-9b85-49d4-82b0-e2f45f1f61ac/4286d964b1600e1f3ee5d56f7c3b65cd/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-arm64.tar.gz"; - hash = "sha512-T5lvSP0hW2O4Ta8kpKsI3Vtod9q2vvDmw17JRRUrblsi3LqdUKwRmNWHYxPwvNDIAKpajMg+x2R+d0ZvdNrCLg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/7eb1b280-570f-460e-8805-5d55cb06493b/8091831bf8764e9a78eab4ae8bc41d5b/aspnetcore-runtime-10.0.0-preview.2.25164.1-linux-arm64.tar.gz"; + hash = "sha512-IWHlPzBBPye+moGnrtrOEq1SPZ5os11qBR5BdwHSOLE1NWniJ4Rap2qciJt+zRtee6/TpnjivylDja5UDpcNCg=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/de4894a9-20d4-4c58-a748-a2594d097279/bb332c7d3bbec4a642bee7ddc01b86f9/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-x64.tar.gz"; - hash = "sha512-v11PXB36Y+k39NDmuAAoNDej31xVsuQmw++wuNyXlLpwT11EaKzBMPDzuBrOPj1G7hGUW7xfNLvSnXtUw2Yw/A=="; + url = "https://download.visualstudio.microsoft.com/download/pr/495feb02-b2fd-4849-9803-43c5d758e72b/60fa3840af9bb27595f6f7b4b818f89c/aspnetcore-runtime-10.0.0-preview.2.25164.1-linux-x64.tar.gz"; + hash = "sha512-3hTauXgTO57JedNxxfvQHnixBswzDBaNYhbsipewzP7rDU9EOGGHSZdg22A0g9wAFiedxMs/lL+wQsxj0lKW+g=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/5cdd9ee9-cf13-4db5-bb3e-a09183be4ef2/3236e065b593cc2bb0bffc0c976f8e87/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-musl-arm.tar.gz"; - hash = "sha512-RleXs7jRVS6aRgkkgfHIFoJ78BxTLLi3quEQhwpOyfElAK25Htr7y78a5GM4pIUYRdVt4hJ01cbCtsyzldlRTw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/8bf44e44-7677-4766-8486-c6b2891a4c0c/a616e598413adafe4ad43d5d5be6f8bf/aspnetcore-runtime-10.0.0-preview.2.25164.1-linux-musl-arm.tar.gz"; + hash = "sha512-63zgdkzIi6AL3JV7mLgRBXNNpZZCMplvrqqE5PEytmXDF3Y2oKJ5TSt6AeN9lj6S1Zu+am7jcXoB6AVNdEDUjA=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/eedaffd0-7baf-49e2-9291-c9f57233d639/34f0f6b835f35306649977fe772e510c/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-musl-arm64.tar.gz"; - hash = "sha512-dwmkoFoOVqSlhQiQURWduEDAqNMHK7k2B2sccMicLxoLVHg+ZNdiotDdYba7UUTbrK1We6RpkhlsQQFKUbrczw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/b32bcf9d-2390-42bd-88f1-709747ac6bbc/ad9bee446b2682530b9e9af62770ddbf/aspnetcore-runtime-10.0.0-preview.2.25164.1-linux-musl-arm64.tar.gz"; + hash = "sha512-zcF5IytWiO8HmT16eMVIHyVvjO/oFvyRPjhAj63sm18BCpBijW/QTRLhjMw1G2JSpWYXYVShEd9rbaFDCaoNQQ=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/4fe69b65-885c-4235-9aa6-5758e6ac76a0/90be90ae3aab95d59b60f5889c5c6062/aspnetcore-runtime-10.0.0-preview.1.25120.3-linux-musl-x64.tar.gz"; - hash = "sha512-AVVkrZaLCRbxIqrrzHG9aACsSAF5y3Qj3KRUULnmHScSB6hr5afMDBYosef6SQYTOBnUe+qhgMp1wEEBr87puA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/c87f5ec8-9569-4894-be65-8f3cf322c251/b655d57fd66869687306e1e7fe31cce9/aspnetcore-runtime-10.0.0-preview.2.25164.1-linux-musl-x64.tar.gz"; + hash = "sha512-eT46PEnCIehUOFCFiyc/byDf2BzYMVJfNNa+KhzuVJS60hDHPMBy2UfJP8gg/yrXCbCiJGK/P+LJIzGeAHhNGQ=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/87990395-a0a2-472f-a255-cc2639a9f5cb/06dd746d44a37da5325ab260dfa4e5f0/aspnetcore-runtime-10.0.0-preview.1.25120.3-osx-arm64.tar.gz"; - hash = "sha512-Q7JCQqV9pnNb7yb0oDmqHJvHlx9NLYuiiowBnaEzIH8YDWchROThIuJ0p9oRxl74ky6VRNZz1Qa54l7B3nQGFg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/351a56ca-b55b-4c5f-be20-1081edb848d7/de67ebf7b8859d4efde0c849de061a4e/aspnetcore-runtime-10.0.0-preview.2.25164.1-osx-arm64.tar.gz"; + hash = "sha512-nk5txKoZR/3iS9efbi2RxD3+EzB8wgN/g+gEjf95VkXbBDloTnUN1vnOwwSJnl57K19NlhMJNF0PbjKoTQD7fg=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/c7e3044f-0976-4051-ac6a-019982f4f4c7/58a188f7893c276ca2ab0f3b95c94756/aspnetcore-runtime-10.0.0-preview.1.25120.3-osx-x64.tar.gz"; - hash = "sha512-WDO9Z/HH4rFqO6yrZslMIKPO4u2WGceVTmvhZLgCQ47vYC1K2vBXoTxym241f/KekjxL4WuFKDYTKEi5DCLtYg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/dd3d568c-e94c-4ea0-b95b-e1d4ae804ed7/68ac36aa68bbeb472c042af07e0e95f4/aspnetcore-runtime-10.0.0-preview.2.25164.1-osx-x64.tar.gz"; + hash = "sha512-6JlBZ3Veyju2kfQxTaa3AiF9KFrFj6h0DstlepriFHijQariEXQCORCnhOJoPlNt9UWJU8SM2IHGUeIoR76LMA=="; }; }; }; runtime_10_0 = buildNetRuntime { - version = "10.0.0-preview.1.25080.5"; + version = "10.0.0-preview.2.25163.2"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/a2280fc3-6358-4f89-8671-3d3535b3e14d/1e3ec98a6c92c9494e7012b80565b886/dotnet-runtime-10.0.0-preview.1.25080.5-linux-arm.tar.gz"; - hash = "sha512-jpHpZerOOsG0cvjZ0sulFTdgbLCumyJF3efy+dlfhmCADLYJpxUrPv6x4BZjBwyARU5hgIkMy4HWUz/MiR0STg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/f54c9c06-3809-49c7-a47e-dc9e63bce7d4/9d64e0d3a360e8846432efb907c87cea/dotnet-runtime-10.0.0-preview.2.25163.2-linux-arm.tar.gz"; + hash = "sha512-/orwyaw9OeVZFVlQzsv6J0UFIfjl+qRGQ43j3MjEv1H7E1MjysO6W7BF/BNCN3auZq5O2dag3zMelZoO00F5pA=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/67154807-282d-4a26-9fe6-16e561b763e9/1d556e1d17d9157dcbdcf09f1c523df8/dotnet-runtime-10.0.0-preview.1.25080.5-linux-arm64.tar.gz"; - hash = "sha512-hA0in8GTIgk+1aGMEjtaMi6SytJpJr23Ce44IHaGSp6JpN0OzBPl5IVCsXMuvRm6ZcrRwbY7lCaNOOeLvmtrdQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/a228c7bc-8b4f-4f52-a517-ed143f8a7b75/006334cb7587884a9aabe63bd298e61b/dotnet-runtime-10.0.0-preview.2.25163.2-linux-arm64.tar.gz"; + hash = "sha512-BcpaAhJgD6LHnDUmxnOCLXntiWXlEyY+6pBPLQn830IwWDIZYbyTD9uQgU7kHvQlRaOyfAgcyXMe5GAsUUh5xQ=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/527fa5e3-8b4b-482e-9c1f-c3cbf8cc0edc/259b1cf466fa1da69dafb26ef142b4cc/dotnet-runtime-10.0.0-preview.1.25080.5-linux-x64.tar.gz"; - hash = "sha512-twTf7Qg9NiMCTulupsuP9tXX4db0OiextHUKiRk/ZKlmoyEbcfnne8dgFTLbmS3zjDTR0VQvBgCCrgENUyQ3qg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/005ab929-04e3-4c38-8134-0b57f86f82e2/bee77f190ace377f3a164814ae5cf34b/dotnet-runtime-10.0.0-preview.2.25163.2-linux-x64.tar.gz"; + hash = "sha512-pkzMyYCfpbL0zLF4lkv/qSuEnEPdKyw5gddT5z8rBaK24YmowqUPxnZSut9mljMTREwI6iLkzRj+h5cElXE0Hg=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/0bb2df4f-2569-41d3-9543-f23cfbb25ce8/a64254fbc283ce409edb78d001561517/dotnet-runtime-10.0.0-preview.1.25080.5-linux-musl-arm.tar.gz"; - hash = "sha512-uQfZdISWYmbCZzL7thQeu5FL6CJYn+2tJq3ZaArW4Nx9AGhQckHA+64SSp9KlXGDgIA4fiHegYM/xzmb4b3WiA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/b07dae9d-0407-4ddf-9792-1a902edf93ac/caacc56b747e8096b126aef4e26802a9/dotnet-runtime-10.0.0-preview.2.25163.2-linux-musl-arm.tar.gz"; + hash = "sha512-EpjURujLJ3aNvdUSV2zdZSba0pp2du50i8kvpkQwdgzb6BfKbGLEhyqyAIuEVYDUcJVxpZxsPzMmUKyu6GQ1Rg=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/6ecc182b-eb3a-4d4f-ab75-5c6c565d643a/70922b6f9f596549975d0c6c7672d558/dotnet-runtime-10.0.0-preview.1.25080.5-linux-musl-arm64.tar.gz"; - hash = "sha512-LMP3cV722ZhttzN2vL58bNu596WLQ+e+BRwu1Ff378JIo8Tch3OEZ62ZqCyjhe6lPryK8RwYkA9fmAyLdtmkdQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/207578e7-0ba7-4785-997e-339ac96dbb07/9380485cffaaca7cb6bd9a6b4bd4306f/dotnet-runtime-10.0.0-preview.2.25163.2-linux-musl-arm64.tar.gz"; + hash = "sha512-Y8xhpb1TsTJ/1n1XsEhBwKjnlQtdUx/HiQNS5WqioJsIOoCMyLm+Gv1CQmQ3HVH8Myl5H9wEeYiM7vrdpS4nIw=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/a580cb7d-1394-4571-9779-b62520571fa5/0ddc6d2478352d792caef0a21c8682e8/dotnet-runtime-10.0.0-preview.1.25080.5-linux-musl-x64.tar.gz"; - hash = "sha512-k2OKXnZrWFmuWOw7pd2BpgoObi5CZdCbG9ceQphyFt7x6Uqhw5jjPSC69rfAIYGM7hERc7V3H/DOK89WzJZMAQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/7ee3d1e8-df5d-4233-9a69-6b2d6e9efcfa/f1988a54e940a1a6decc08b8771cdd24/dotnet-runtime-10.0.0-preview.2.25163.2-linux-musl-x64.tar.gz"; + hash = "sha512-2Rv7WDmzA3fQmElRHIZoIwvlH64NBeB9dhKX2kDJlNgA3lzm/F9zB8vfXPbn+n3XIOyrg1TslDbGYs1P4UhR3Q=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/a51a8de7-b1c0-4453-913b-b7421273ce3f/fef20f679bb688529545845a64f7ba2d/dotnet-runtime-10.0.0-preview.1.25080.5-osx-arm64.tar.gz"; - hash = "sha512-dOphwWoG+GxniNRsTXVyb23Vf75MRZPv9SqLFHL9+AWr5hgwhz/T70F4p1I499z994e3HjmoQV7Q9s4ExLoeQA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/2542cacb-b45a-4071-b75d-da8faf0be4dc/2d36ccebaa81348d4cfb4dd6af8ed685/dotnet-runtime-10.0.0-preview.2.25163.2-osx-arm64.tar.gz"; + hash = "sha512-NJsqnzTfzRq4GUhO4JzDLvYcMWKalSAlbWQ5FuS9XROE88uvjQMWvejJDNjurGGhcMxIa+OWC5USrHnlZ+5UtQ=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/c0eb2952-c1e2-4d70-bdd6-96e7ff3f1350/efad700ef7526e474ed91611c1765272/dotnet-runtime-10.0.0-preview.1.25080.5-osx-x64.tar.gz"; - hash = "sha512-bqHaR7YOU2GWT/95ufo9zMCHyXc9NCw03vfuiY6vben0baZmRIR9mBYV3t85aYYQ+FDdZPIJvUQQ4FX1Czt+CQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/e209e166-f1ed-4d03-8218-70b46e38b2cc/c0cbc2088f7fda9b584dca195e4fb455/dotnet-runtime-10.0.0-preview.2.25163.2-osx-x64.tar.gz"; + hash = "sha512-o5je7K9AF4HK3skZ9IdqqRTZPDjwganB8bhQ4uv+SVKRn5Cr1yPY+qXPN6FJsoHjkXQrqOc2E+Kx5CdnVdjYHg=="; }; }; }; sdk_10_0_1xx = buildNetSdk { - version = "10.0.100-preview.1.25120.13"; + version = "10.0.100-preview.2.25164.34"; srcs = { linux-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/421388aa-682e-4ac0-b001-235c68ac75c6/2823384aea24f8fb43d0e8cf14b4c479/dotnet-sdk-10.0.100-preview.1.25120.13-linux-arm.tar.gz"; - hash = "sha512-06dnE4VQJryxMbl1lnUOJqQxgL6fh1gRIIo7G32IyB6WzHael99Mc5ejuqzjCY+EioNF32VgcDrOdl24shCS2A=="; + url = "https://download.visualstudio.microsoft.com/download/pr/c1d0c660-7cbd-400a-97cd-508289238f07/ce3b3a3546e5356d4c32f0e5f4d03038/dotnet-sdk-10.0.100-preview.2.25164.34-linux-arm.tar.gz"; + hash = "sha512-CEFosilqVJ/LoZDWnNVlzEjvpeowy/5htb7Z5BWsrkOkFrU92OW/FqWYvu7RsLqW27e8VUouDizgDHY0oaWh8A=="; }; linux-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/1889d4a2-7d5a-4048-b53f-b47ec6f73bbe/f550d0103110905cc472afa3ecf4223e/dotnet-sdk-10.0.100-preview.1.25120.13-linux-arm64.tar.gz"; - hash = "sha512-ZFthirf7zOOPgrLKml+raxF0LcnKU/S7ZWVNvoOF4Xia7QNBYkNq+ZjFnkGLUDFgfnGFbcOISHF6dPjzKS4MSw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/a7eebbc3-e249-4266-94e8-b48a519630fa/86780770348edc13c7ad5476645b4aff/dotnet-sdk-10.0.100-preview.2.25164.34-linux-arm64.tar.gz"; + hash = "sha512-BJE4E2b1DWoiEfkl9cWy4TZPOzpFB2xwbazTr6aFbdle+2uszMiHRxi943Q553YU/yv9WAw8LpdzfULbMR215g=="; }; linux-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/ed3f7a1c-0aeb-4bff-8f93-db1b48c13dbc/dbd62e4564414b7de38e32ca47a0e9e3/dotnet-sdk-10.0.100-preview.1.25120.13-linux-x64.tar.gz"; - hash = "sha512-mGh8uJhZ/hhHoMrmx1LOIwkjHl7ybuUoWJOltXlPv9Ud34UQ3rX3AOopjO/9nLwPnybJx7TZAESoK90rmKv8xA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/c526dc3b-5240-4449-ba07-ed9a3610fe09/442f1cf6e4e832eea0b045f9e108c8b7/dotnet-sdk-10.0.100-preview.2.25164.34-linux-x64.tar.gz"; + hash = "sha512-Zk5WGIJ8T55dUVDNftf4xARPha576Nx3mo2GNNzJYrWecxepUz5XsmgzNLEwT3tm5ZteaOGlARR6wU4fIvRrxA=="; }; linux-musl-arm = { - url = "https://download.visualstudio.microsoft.com/download/pr/0a51b91a-f741-4903-8d01-29d81817c839/549fb11b7fc5bd0859adbf47f229dcbb/dotnet-sdk-10.0.100-preview.1.25120.13-linux-musl-arm.tar.gz"; - hash = "sha512-NhxG/rBTUNB8lpyIzBqCEVLLIVNdVEgXx7rFSRS4TVJuPlqmQvucxdwzHvAIuyBROIQa0iLsO5oGuNCHQfrpXQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/665e8b2a-9823-46f5-9469-005f1e9e52c4/a291524f20b417d0179b1d44fa345342/dotnet-sdk-10.0.100-preview.2.25164.34-linux-musl-arm.tar.gz"; + hash = "sha512-gs/H+ppkkeYlit8z64GwvLG2n1lg1jG/vR6ctZ4LVVDC/9JiBGHkZDDRIVuMygl6Z6whXg96nJZYANMHpbuNcA=="; }; linux-musl-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/8044b967-d629-406b-accd-6fccc09e9ae0/9d67c958431f0eb0f45b3c0f1bff81bc/dotnet-sdk-10.0.100-preview.1.25120.13-linux-musl-arm64.tar.gz"; - hash = "sha512-kWgHEHze5WH1MNOT2Awfw75VCZQ28yTvA9KpJ5Kzyrffn8PMyHxYqtVSAjL4B94sQlivSiTrE3FcNgzc9U76Pg=="; + url = "https://download.visualstudio.microsoft.com/download/pr/e637ed7f-4651-4e2f-853f-4e81354659ae/b9022529e8dac680f4abf5da4a20b755/dotnet-sdk-10.0.100-preview.2.25164.34-linux-musl-arm64.tar.gz"; + hash = "sha512-wUGbcT1VEYNf/m5h7/4Xgq9ahCn6vVF9PYQNIZdSJlaByxp6FaHwa2xaiQ3VDnRhs7Du6gok1cIGa/rz1S7sQg=="; }; linux-musl-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/ece436cd-7c74-4c96-8d7b-bbca4f3f2dad/d50fac6150ce404dbb6ba7d779545f7c/dotnet-sdk-10.0.100-preview.1.25120.13-linux-musl-x64.tar.gz"; - hash = "sha512-NaLOk7p/OaCP0XcRiqDM/oyQBVuN+Y0+E0BkSpHD6pCvwCAb/7DOtUiCMT/dnTqwGsI9b4zLPvBnChr4Jc0yVw=="; + url = "https://download.visualstudio.microsoft.com/download/pr/bcc19fec-7eac-4ff7-a8b5-e5a2150ce497/cc4b1c4d475f054a57ac78c333be567c/dotnet-sdk-10.0.100-preview.2.25164.34-linux-musl-x64.tar.gz"; + hash = "sha512-eJh2U171Zmnb/mORN4/PQNwrj0rfE3vduLNYojQD7K/lvby7DHcVz7DSbtBhrbIFIK0asSUF+WTcgIsrEC9llA=="; }; osx-arm64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/22d09ef4-cec4-48e7-be48-e105c9037dd4/33763054cbe2bbefd7d59c1d66e67122/dotnet-sdk-10.0.100-preview.1.25120.13-osx-arm64.tar.gz"; - hash = "sha512-XpjbKsqs+z6Rq1b9NppCJYcGDNTN87ZBG8UhTVm5hRQsRZ9lDqa2O2r48f/9L1451oWxeVCBSosTHlezDhwvSA=="; + url = "https://download.visualstudio.microsoft.com/download/pr/d53c9666-d853-41f0-9063-3343a366022e/769c062074b7d520dbc46f0103b1fd8f/dotnet-sdk-10.0.100-preview.2.25164.34-osx-arm64.tar.gz"; + hash = "sha512-VeySisULCzR4OHGn2GYqrb+UQ8uSF7kF/ER+a0beF5piIr/fwlpr3T6Au4InvN3wiLQeYdWl0earkx/II31ajQ=="; }; osx-x64 = { - url = "https://download.visualstudio.microsoft.com/download/pr/8462c34b-dc1e-4793-aab0-449bd1419d1c/bac3f5d229638e0d8600b9d4b304c26e/dotnet-sdk-10.0.100-preview.1.25120.13-osx-x64.tar.gz"; - hash = "sha512-X2C9WgE+Wc+2dLfS6TM7TojYvIZF6NGMynUeNWKGmG83HZ8hdnX3A8hcUVFZ4PdO9U1g5cf3F8HuRpp2hKV/XQ=="; + url = "https://download.visualstudio.microsoft.com/download/pr/c382791c-4480-465d-9bfe-c311a41f9945/2acdfbcc4a3762cf516868177d92296b/dotnet-sdk-10.0.100-preview.2.25164.34-osx-x64.tar.gz"; + hash = "sha512-zFc9wPnYRiDwyQ3XTwU455ell9rtI2XC8xGhYrD72S0DGml8icgGrbqKwiPD4/NxnebSJD6gRGRsYsu4uhgocw=="; }; }; inherit commonPackages hostPackages targetPackages; diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix index d6b92ecdb547..f7f42bfad9ad 100644 --- a/pkgs/development/compilers/dotnet/vmr.nix +++ b/pkgs/development/compilers/dotnet/vmr.nix @@ -156,7 +156,8 @@ stdenv.mkDerivation rec { postPatch = '' # set the sdk version in global.json to match the bootstrap sdk - jq '(.tools.dotnet=$dotnet)' global.json --arg dotnet "$(${bootstrapSdk}/bin/dotnet --version)" > global.json~ + sdk_version=$(HOME=$(mktemp -d) ${bootstrapSdk}/bin/dotnet --version) + jq '(.tools.dotnet=$dotnet)' global.json --arg dotnet "$sdk_version" > global.json~ mv global.json{~,} patchShebangs $(find -name \*.sh -type f -executable) @@ -312,7 +313,6 @@ stdenv.mkDerivation rec { src/aspnetcore/Directory.Build.props '' + '' - # stop passing -sdk without a path # stop using xcrun # add -module-cache-path to fix swift errors, see sandboxProfile @@ -322,22 +322,21 @@ stdenv.mkDerivation rec { src/runtime/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt \ --replace-fail ' -sdk ''${CMAKE_OSX_SYSROOT}' "" \ --replace-fail 'xcrun swiftc' 'swiftc -module-cache-path "$ENV{HOME}/.cache/module-cache"' - '' - + lib.optionalString (lib.versionAtLeast version "9") ( - '' - # fix: strip: error: unknown argument '-n' - substituteInPlace \ - src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets \ - src/runtime/src/native/managed/native-library.targets \ - --replace-fail ' -no_code_signature_warning' "" - # ld: library not found for -ld_classic - substituteInPlace \ - src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets \ - '' - + lib.optionalString (lib.versionOlder version "10") " src/runtime/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj \\\n" - + " --replace-fail 'Include=\"-ld_classic\"' \"\"\n" - ) + # fix: strip: error: unknown argument '-n' + substituteInPlace \ + src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets \ + '' + + lib.optionalString (lib.versionAtLeast version "9") " src/runtime/src/native/managed/native-library.targets \\\n" + + '' + --replace-fail ' -no_code_signature_warning' "" + + # ld: library not found for -ld_classic + substituteInPlace \ + src/runtime/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets \ + '' + + lib.optionalString (lib.versionOlder version "10") " src/runtime/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj \\\n" + + " --replace-fail 'Include=\"-ld_classic\"' \"\"\n" + lib.optionalString (lib.versionOlder version "9") '' # [...]/build.proj(123,5): error : Did not find PDBs for the following SDK files: # [...]/build.proj(123,5): error : sdk/8.0.102/System.Resources.Extensions.dll diff --git a/pkgs/development/compilers/dotnet/wrapper.nix b/pkgs/development/compilers/dotnet/wrapper.nix index 2ac14b665fea..655bd017a782 100644 --- a/pkgs/development/compilers/dotnet/wrapper.nix +++ b/pkgs/development/compilers/dotnet/wrapper.nix @@ -76,7 +76,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { installCheckPhase = '' runHook preInstallCheck - $out/bin/dotnet --info + HOME=$(mktemp -d) $out/bin/dotnet --info runHook postInstallCheck ''; @@ -282,14 +282,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { in unwrapped.passthru.tests or { } // { - version = testers.testVersion ( - { - package = finalAttrs.finalPackage; - } - // lib.optionalAttrs (type != "sdk") { - command = "dotnet --info"; - } - ); + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "HOME=$(mktemp -d) dotnet " + (if type == "sdk" then "--version" else "--info"); + }; } // lib.optionalAttrs (type == "sdk") ({ console = lib.recurseIntoAttrs { diff --git a/pkgs/development/coq-modules/Vpl/default.nix b/pkgs/development/coq-modules/Vpl/default.nix index 7a6b9d2ec3d6..f3075e20e737 100644 --- a/pkgs/development/coq-modules/Vpl/default.nix +++ b/pkgs/development/coq-modules/Vpl/default.nix @@ -14,7 +14,7 @@ mkCoqDerivation { release."0.5".sha256 = "sha256-mSD/xSweeK9WMxWDdX/vzN96iXo74RkufjuNvtzsP9o="; - sourceRoot = "source/coq"; + setSourceRoot = "sourceRoot=$(echo */coq)"; meta = { description = "Coq interface to VPL abstract domain of convex polyhedra"; diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 63423b756681..efa365f517ff 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -245,8 +245,8 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; postUnpack = '' - patchShebangs source/doc/*.py - patchShebangs source/doc/input-filter-h.sh + patchShebangs ${finalAttrs.src.name}/doc/*.py + patchShebangs ${finalAttrs.src.name}/doc/input-filter-h.sh ''; postInstall = '' diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index 6acf4f1c60a1..e82952780c4d 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "quazip"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "stachenov"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JPpkYvndjDcHVChAyWhpb/XiUPu/qHqDZFh5XmonXMs="; + sha256 = "sha256-AOamvy2UgN8n7EZ8EidWkVzRICzEXMmvZsB18UwxIVo="; }; buildInputs = [ diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index 91cf70ffc4ab..fa7196b09f9f 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -67,7 +67,7 @@ let pname = "indi-3rdparty-${pname}"; inherit src version; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; cmakeFlags = [ diff --git a/pkgs/development/python-modules/aio-pika/default.nix b/pkgs/development/python-modules/aio-pika/default.nix index ad0f385e2048..63858b74e239 100644 --- a/pkgs/development/python-modules/aio-pika/default.nix +++ b/pkgs/development/python-modules/aio-pika/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aio-pika"; - version = "9.5.4"; + version = "9.5.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "mosquito"; repo = "aio-pika"; tag = version; - hash = "sha256-/73bFhhcailC05hn0xW49oFVS6Ezaiohh3ykYOjhQOI="; + hash = "sha256-Gs01y1VRVgk5i4JI+fqtRo6mOyzBzHM/2hJPVenc+3g="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index fc4c9a6d3941..b27fce427cf3 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "aiogram"; - version = "3.18.0"; + version = "3.19.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "aiogram"; repo = "aiogram"; tag = "v${version}"; - hash = "sha256-3JyMkLixemKZN9XSpN/4SdpdYfR3WqGUKQ9Bfy6bB+Q="; + hash = "sha256-xdDQjH/HUVNJgSxjrqXNgc+hOKuiusAH00PRMRD+8Dw="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/aiosql/default.nix b/pkgs/development/python-modules/aiosql/default.nix index 8ed71cdc4825..4528d603b2a3 100644 --- a/pkgs/development/python-modules/aiosql/default.nix +++ b/pkgs/development/python-modules/aiosql/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiosql"; - version = "13.2"; + version = "13.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "nackjicholson"; repo = "aiosql"; tag = version; - hash = "sha256-GJeYh3xPKrfm2oPsNTrQXnYW75Bx8PN5/brJFslOcTw="; + hash = "sha256-FCCS91nH/HPhez+bJE7+JoFW4hKkXMdY4bAaEOZ06jU="; }; sphinxRoot = "docs/source"; diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index 5d477a3ec13c..ab4e3d41a0ed 100644 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.41.19"; + version = "3.41.21"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "atlassian-api"; repo = pname; tag = version; - hash = "sha256-i++I3sloBp0v+kB1mmS/CSlSpjOvaFYDTBh+FZr2NS0="; + hash = "sha256-m8B6t9tTlef8cdsh/wnsc0iyNLsB0RYjUhq/bA9MeII="; }; propagatedBuildInputs = [ @@ -48,7 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Atlassian REST API Wrapper"; homepage = "https://github.com/atlassian-api/atlassian-python-api"; - changelog = "https://github.com/atlassian-api/atlassian-python-api/releases/tag/${version}"; + changelog = "https://github.com/atlassian-api/atlassian-python-api/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ arnoldfarkas ]; }; diff --git a/pkgs/development/python-modules/avwx-engine/default.nix b/pkgs/development/python-modules/avwx-engine/default.nix index 5c26a89ac345..2fadafe4fc22 100644 --- a/pkgs/development/python-modules/avwx-engine/default.nix +++ b/pkgs/development/python-modules/avwx-engine/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "avwx-engine"; - version = "1.9.3"; + version = "1.9.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "avwx-rest"; repo = "avwx-engine"; tag = version; - hash = "sha256-+g1q5B+s0V4UGFS6IV0aIMkfNQLTDNckCNA/bPd9+50="; + hash = "sha256-x8qb9nAAl7F+w0lHHQtLYwMZYdZ9WhAxJ63jdjlyfhQ="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix index cb49963d25bc..edd936983d4b 100644 --- a/pkgs/development/python-modules/biliass/default.nix +++ b/pkgs/development/python-modules/biliass/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-IrzFjjMNuD5UgdccHxIxZoeZpM1PGtVQRTWHOocnmAU="; }; - sourceRoot = "source/packages/biliass"; + sourceRoot = "${src.name}/packages/biliass"; cargoRoot = "rust"; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 84c374f0912c..99dbaa6bfd34 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.37.17"; + version = "1.37.18"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-kjhXUrThwsdffKfZW1lr7duAbh8DpValQWc2Gsm0PeM="; + hash = "sha256-MOz436qEhGn1UnnkEkj/RrHs9eLuezspLj7DkzLi+Q4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 329b8bd41de4..d28e06f87e5f 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.37.17"; + version = "1.37.18"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-ucOh6PtX+3C0mqU4DKvvqzLsAo2KHY9ayD3YNsW0Kag="; + hash = "sha256-k3ybeH5PeEAZ8yH6HYilBZZcJfQl6BC95F4jt8pWQoI="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/ciscoconfparse2/default.nix b/pkgs/development/python-modules/ciscoconfparse2/default.nix index 799f9f0cc700..99186c91a851 100644 --- a/pkgs/development/python-modules/ciscoconfparse2/default.nix +++ b/pkgs/development/python-modules/ciscoconfparse2/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "ciscoconfparse2"; - version = "0.8.6"; + version = "0.8.7"; pyproject = true; src = fetchFromGitHub { owner = "mpenning"; repo = "ciscoconfparse2"; tag = version; - hash = "sha256-ICv8H64aVC8Q/rl4lnSmBQ7CsaV3KtlIf/g3WZTJL9s="; + hash = "sha256-8LyGta+b18mSWbdwmnOmgbjyHmQi0dehABTXKs0RloI="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/dbt-adapters/default.nix b/pkgs/development/python-modules/dbt-adapters/default.nix index 9dd2125d0d37..9f44ccce7461 100644 --- a/pkgs/development/python-modules/dbt-adapters/default.nix +++ b/pkgs/development/python-modules/dbt-adapters/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "dbt-adapters"; - version = "1.14.0"; + version = "1.14.1"; pyproject = true; # missing tags on GitHub src = fetchPypi { pname = "dbt_adapters"; inherit version; - hash = "sha256-byBmlP3Gf8/olHl34L2SyMb4ZnKK5Gi1fZ3li2Acd+g="; + hash = "sha256-C6IyW/3wDwhLY103Py2J45K+JXynnEcoBoOiYSiCxhs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/django-two-factor-auth/default.nix b/pkgs/development/python-modules/django-two-factor-auth/default.nix index 0f9b2a2ec6ab..7cd848fdd492 100644 --- a/pkgs/development/python-modules/django-two-factor-auth/default.nix +++ b/pkgs/development/python-modules/django-two-factor-auth/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "django-two-factor-auth"; - version = "1.15.5"; + version = "1.17.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = "django-two-factor-auth"; tag = version; - hash = "sha256-Sr7L3ioeofyADHb1NSgs0GmVbzX7rro7yhhG9Gq6GJE="; + hash = "sha256-gg5QpPQbYnQr7KkCXFZ9Gnz48Cf4Nm67uV6JuyxK18c="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/getmac/default.nix b/pkgs/development/python-modules/getmac/default.nix index 7810c15024a5..9e6149fa77ac 100644 --- a/pkgs/development/python-modules/getmac/default.nix +++ b/pkgs/development/python-modules/getmac/default.nix @@ -7,27 +7,30 @@ pytest-mock, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "getmac"; version = "0.9.5"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "GhostofGoes"; - repo = pname; + repo = "getmac"; tag = version; hash = "sha256-ZbTCbbASs7+ChmgcDePXSbiHOst6/eCkq9SiKgYhFyM="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ py - pytestCheckHook pytest-benchmark pytest-mock + pytestCheckHook ]; disabledTests = [ @@ -42,14 +45,16 @@ buildPythonPackage rec { "test_initialize_method_cache_valid_types" ]; + pytestFlagsArray = [ "--benchmark-disable" ]; + pythonImportsCheck = [ "getmac" ]; meta = with lib; { description = "Python package to get the MAC address of network interfaces and hosts on the local network"; - mainProgram = "getmac"; homepage = "https://github.com/GhostofGoes/getmac"; - changelog = "https://github.com/GhostofGoes/getmac/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/GhostofGoes/getmac/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ]; + mainProgram = "getmac"; }; } diff --git a/pkgs/development/python-modules/huey/default.nix b/pkgs/development/python-modules/huey/default.nix index e4368a49d191..4a2534cebe84 100644 --- a/pkgs/development/python-modules/huey/default.nix +++ b/pkgs/development/python-modules/huey/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "huey"; - version = "2.5.2"; + version = "2.5.3"; format = "pyproject"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "coleifer"; repo = pname; tag = version; - hash = "sha256-0X4gUIFqkE4GLW5Eqbolpk7KZdsvjkRxD20YmLPG11A="; + hash = "sha256-Avy5aMYoeIhO7Q83s2W4o6RBMaVFdRBqa7HGNIGNOqE="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - changelog = "https://github.com/coleifer/huey/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/coleifer/huey/blob/${src.tag}/CHANGELOG.md"; description = "Little task queue for python"; homepage = "https://github.com/coleifer/huey"; license = licenses.mit; diff --git a/pkgs/development/python-modules/hyrule/default.nix b/pkgs/development/python-modules/hyrule/default.nix index 3b5477200b69..ead2930ea4f5 100644 --- a/pkgs/development/python-modules/hyrule/default.nix +++ b/pkgs/development/python-modules/hyrule/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "hyrule"; - version = "0.8.0"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "hylang"; repo = "hyrule"; tag = version; - hash = "sha256-FJ7iu+ohbe4nhADka2OC+JHAmwZkkJgFVLyHD0Fms1E="; + hash = "sha256-HSs5YUbhdaOgpBaxXe9LibJN4G3UJvEvEdnYt6ORQBo="; }; build-system = [ setuptools ]; @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utility library for the Hy programming language"; homepage = "https://github.com/hylang/hyrule"; - changelog = "https://github.com/hylang/hyrule/releases/tag/${version}"; + changelog = "https://github.com/hylang/hyrule/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/juliandate/default.nix b/pkgs/development/python-modules/juliandate/default.nix new file mode 100644 index 000000000000..68032d721d2a --- /dev/null +++ b/pkgs/development/python-modules/juliandate/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "juliandate"; + version = "1.0.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "seanredmond"; + repo = "juliandate"; + tag = "v${version}"; + hash = "sha256-pOWyrPBFqKmG9oKbXY/L14LblIcc8KfZSqZAEQP29V8="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "juliandate" ]; + + meta = { + description = "Conversions between Julian Dates and Julian/Gregorian calendar dates"; + homepage = "https://github.com/seanredmond/juliandate"; + changelog = "https://github.com/seanredmond/juliandate/blob/v${src.tag}/HISTORY.MD"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 8f105ec21806..3ebac723d412 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1142,8 +1142,8 @@ rec { "sha256-0hUuTUVv6+WqpPn+TJVgsl5bIuw0WejLarVu/hv1trk="; mypy-boto3-route53-recovery-control-config = - buildMypyBoto3Package "route53-recovery-control-config" "1.37.0" - "sha256-VW984jFkCzfG2w2XP5fa5eiUjs31yTQbX5jyKuFIS20="; + buildMypyBoto3Package "route53-recovery-control-config" "1.37.18" + "sha256-biOC1fq0Fduxbh07i/LZWTeX+FPvWmrU7asljtW3fKg="; mypy-boto3-route53-recovery-readiness = buildMypyBoto3Package "route53-recovery-readiness" "1.37.0" @@ -1174,8 +1174,8 @@ rec { "sha256-c0vXkW5sR7JkdzvsS/rMFme9EwY1x5eZAbRWYKew0v4="; mypy-boto3-sagemaker = - buildMypyBoto3Package "sagemaker" "1.37.16" - "sha256-fEvGy0Zp2ouvVGXi+yFpX1RTNVacb53UFXxv0rfNBd0="; + buildMypyBoto3Package "sagemaker" "1.37.18" + "sha256-kgcGaU90+TvFcxPCotm8dutYkk/GL2qTOtmMyxNzkgs="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.37.0" diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix index ce77a9b19867..33db37bc9c3f 100644 --- a/pkgs/development/python-modules/polars/default.nix +++ b/pkgs/development/python-modules/polars/default.nix @@ -177,7 +177,7 @@ buildPythonPackage rec { requiredSystemFeatures = [ "big-parallel" ]; - sourceRoot = "source/py-polars"; + sourceRoot = "${src.name}/py-polars"; postPatch = '' for f in * ; do [[ "$f" == "tests" ]] || \ diff --git a/pkgs/development/python-modules/pyais/default.nix b/pkgs/development/python-modules/pyais/default.nix index 09cc27820743..62aaf30a6f59 100644 --- a/pkgs/development/python-modules/pyais/default.nix +++ b/pkgs/development/python-modules/pyais/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyais"; - version = "2.9.0"; + version = "2.9.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "M0r13n"; repo = "pyais"; tag = "v${version}"; - hash = "sha256-rL2loTPNdCvhy/n3PTJOGjFxJX5yG+thXJBOqUDrjkU="; + hash = "sha256-iwfkdWFAPbdDNvwz449zAUpLcly0ZaTpmjJxJoyX+oA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index f9c520426b3d..c47f4653f556 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.72"; + version = "0.2.73"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-zWgI6cNSm3hXZXrrQsSpr4BsSPA7JawQOz2hwmnybDI="; + hash = "sha256-KpbrcCjG8F/Ktka7puh/7rSpEMSf5LvMH+Yd//UbhjQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pykakasi/default.nix b/pkgs/development/python-modules/pykakasi/default.nix index c2555281a6b0..55af4374ad8a 100644 --- a/pkgs/development/python-modules/pykakasi/default.nix +++ b/pkgs/development/python-modules/pykakasi/default.nix @@ -41,14 +41,12 @@ buildPythonPackage rec { ]; disabledTests = [ - # We don't care about benchmarks - "test_benchmark" - "pytest_benchmark_update_machine_info" - "pytest_benchmark_update_json" # Assertion error "test_aozora" ]; + pytestFlagsArray = [ "--benchmark-disable" ]; + pythonImportsCheck = [ "pykakasi" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pymongo-inmemory/default.nix b/pkgs/development/python-modules/pymongo-inmemory/default.nix index b17502b730db..032f473cdf55 100644 --- a/pkgs/development/python-modules/pymongo-inmemory/default.nix +++ b/pkgs/development/python-modules/pymongo-inmemory/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pymongo-inmemory"; - version = "0.4.2"; + version = "0.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "kaizendorks"; repo = "pymongo_inmemory"; tag = "v${version}"; - hash = "sha256-FDHHf9x62EqNcHjDF2vH8w8WG/15efEe+fDqGiiOe4A="; + hash = "sha256-iYUU2XoTEfgUm+816wHveu6dPEo6nzhlZNXyuRw42T0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pynmeagps/default.nix b/pkgs/development/python-modules/pynmeagps/default.nix index 3f28c0771596..629dbc39f29a 100644 --- a/pkgs/development/python-modules/pynmeagps/default.nix +++ b/pkgs/development/python-modules/pynmeagps/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pynmeagps"; - version = "1.0.45"; + version = "1.0.46"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "semuconsulting"; repo = "pynmeagps"; tag = "v${version}"; - hash = "sha256-LAWve4Qrc7Kf4b/2+oNTZUnDQWMleuxeeBN/A3jR+rs="; + hash = "sha256-xTgUGr1ZFmQQBGTbD5rtIkg7uQZoAa+8+bUNHYDc3iA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index e274f1ba5114..6e9f0cf7299c 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.16.3"; + version = "1.16.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; tag = "v${version}"; - hash = "sha256-tcwYtFfJHX4Z63P8syGbC30wW1hQEBlw10KIFKiv2Dc="; + hash = "sha256-J3AjTMLgKDUeCzRLRkUk3bvqBCHqBl+p3EyLmlojYhU="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index d07acb4b3df7..1dfea81f95cd 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "renault-api"; - version = "0.2.9"; + version = "0.2.10"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = "renault-api"; tag = "v${version}"; - hash = "sha256-Y+KFC/g0zJ1Ng3LnMsStN2jOsnjKLzYLyvM+fDmzdGQ="; + hash = "sha256-d+1H4hu8Mqj2oKrS5C1QnoIJePlQdBKLCHTfcNcZBWI="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/sciform/default.nix b/pkgs/development/python-modules/sciform/default.nix new file mode 100644 index 000000000000..1c46270df1a1 --- /dev/null +++ b/pkgs/development/python-modules/sciform/default.nix @@ -0,0 +1,47 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + setuptools-scm, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "sciform"; + version = "0.39.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jagerber48"; + repo = "sciform"; + tag = version; + hash = "sha256-5rgTnvckR9bGDgcVZEie+swpc5MEwKQuFHa7zvHiqr8="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sciform" + ]; + + meta = { + description = "A package for formatting numbers into scientific formatted strings"; + homepage = "https://sciform.readthedocs.io/en/stable/"; + downloadPage = "https://github.com/jagerber48/sciform"; + changelog = "https://github.com/jagerber48/sciform/blob/${src.tag}/CHANGELOG.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/skrl/default.nix b/pkgs/development/python-modules/skrl/default.nix index 1c1325653ee5..75185cae8be2 100644 --- a/pkgs/development/python-modules/skrl/default.nix +++ b/pkgs/development/python-modules/skrl/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "skrl"; - version = "1.4.1"; + version = "1.4.2"; pyproject = true; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Toni-SM"; repo = pname; tag = version; - hash = "sha256-5Poc079E+6jpNsm/WUFBXqsIKWZpIIAW0fmoWLVEZDg="; + hash = "sha256-ONCRZ5Gpvg61dhi7GVxtvXIJiyZY9Fmk2qexMXVuj3A="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/slack-bolt/default.nix b/pkgs/development/python-modules/slack-bolt/default.nix index 96751666f30f..0fd22c66f47b 100644 --- a/pkgs/development/python-modules/slack-bolt/default.nix +++ b/pkgs/development/python-modules/slack-bolt/default.nix @@ -40,14 +40,14 @@ buildPythonPackage rec { pname = "slack-bolt"; - version = "1.22.0"; + version = "1.23.0"; pyproject = true; src = fetchFromGitHub { owner = "slackapi"; repo = "bolt-python"; tag = "v${version}"; - hash = "sha256-3+tp/R5ESdyvlvNS5W/Er7EgYalUjgVjsp3wO+Cwi/c="; + hash = "sha256-Aq7vLkrTeBVsY+xVwQhFmSqq8ik0yHEmPANtKyJZKTw="; }; postPatch = '' diff --git a/pkgs/development/tools/analysis/rr/zen_workaround.nix b/pkgs/development/tools/analysis/rr/zen_workaround.nix index 79898dcfcf64..4ca50b7eb1f7 100644 --- a/pkgs/development/tools/analysis/rr/zen_workaround.nix +++ b/pkgs/development/tools/analysis/rr/zen_workaround.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { pname = "rr-zen_workaround"; inherit (rr) src version; - sourceRoot = "source/third-party/zen-pmu-workaround"; + sourceRoot = "${rr.src.name}/third-party/zen-pmu-workaround"; hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 59fdbc570dc2..8c5ee0d17400 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.39.2"; + version = "1.39.3"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - hash = "sha256-OmDchq0ngdDbgDUyrz/jRwrCI1FJNKeq7ZLMOK4B+z0="; + hash = "sha256-iMM9bLIfWkbxSMNhoDmH7qSxgtlTVJwoNed0OY0Mmds="; }; outputs = [ diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix deleted file mode 100644 index 963b3c471217..000000000000 --- a/pkgs/games/0ad/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - fmt, - wxGTK, - stdenv, - newScope, -}: -let - callPackage = newScope self; - - self = { - zeroad-unwrapped = callPackage ./game.nix { inherit fmt wxGTK stdenv; }; - - zeroad-data = callPackage ./data.nix { inherit stdenv; }; - - zeroad = callPackage ./wrapper.nix { }; - }; - -in -self diff --git a/pkgs/games/xpilot/bloodspilot-client.nix b/pkgs/games/xpilot/bloodspilot-client.nix index 96e4b0d8a73b..b87907a3a7f3 100644 --- a/pkgs/games/xpilot/bloodspilot-client.nix +++ b/pkgs/games/xpilot/bloodspilot-client.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { sha256 = "1qwl95av5an2zl01m7saj6fyy49xpixga7gbn4lwbpgpqs1rbwxj"; }; + patches = [ ./bloodspilot-sdl-window-fix.patch ]; + buildInputs = [ libX11 SDL diff --git a/pkgs/games/xpilot/bloodspilot-sdl-window-fix.patch b/pkgs/games/xpilot/bloodspilot-sdl-window-fix.patch new file mode 100644 index 000000000000..8ce71780a0f6 --- /dev/null +++ b/pkgs/games/xpilot/bloodspilot-sdl-window-fix.patch @@ -0,0 +1,95 @@ +--- a/src/client/sdl/scrap.c 2012-09-02 11:25:23.000000000 +0200 ++++ b/src/client/sdl/scrap.c 2025-03-23 12:01:51.968751308 +0100 +@@ -71,13 +71,13 @@ + #if defined(X11_SCRAP) + /* * */ + static Display *SDL_Display; +-static Window SDL_Window; ++static Window BloodsPilot_SDL_Window; + static void (*Lock_Display) (void); + static void (*Unlock_Display) (void); + + #elif defined(WIN_SCRAP) + /* * */ +-static HWND SDL_Window; ++static HWND BloodsPilot_SDL_Window; + + #elif defined(QNX_SCRAP) + /* * */ +@@ -274,7 +274,7 @@ + /* * */ + if (info.subsystem == SDL_SYSWM_X11) { + SDL_Display = info.info.x11.display; +- SDL_Window = info.info.x11.window; ++ BloodsPilot_SDL_Window = info.info.x11.window; + Lock_Display = info.info.x11.lock_func; + Unlock_Display = info.info.x11.unlock_func; + +@@ -290,7 +290,7 @@ + + #elif defined(WIN_SCRAP) + /* * */ +- SDL_Window = info.window; ++ BloodsPilot_SDL_Window = info.window; + retval = 0; + + #elif defined(QNX_SCRAP) +@@ -310,12 +310,12 @@ + #if defined(X11_SCRAP) + /* * */ + Lock_Display(); +- retval = (XGetSelectionOwner(SDL_Display, XA_PRIMARY) != SDL_Window); ++ retval = (XGetSelectionOwner(SDL_Display, XA_PRIMARY) != BloodsPilot_SDL_Window); + Unlock_Display(); + + #elif defined(WIN_SCRAP) + /* * */ +- retval = (GetClipboardOwner() != SDL_Window); ++ retval = (GetClipboardOwner() != BloodsPilot_SDL_Window); + + #elif defined(QNX_SCRAP) + /* * */ +@@ -346,14 +346,14 @@ + (unsigned char *) dst, dstlen); + free(dst); + if (lost_scrap()) +- XSetSelectionOwner(SDL_Display, XA_PRIMARY, SDL_Window, ++ XSetSelectionOwner(SDL_Display, XA_PRIMARY, BloodsPilot_SDL_Window, + CurrentTime); + Unlock_Display(); + } + + #elif defined(WIN_SCRAP) + /* * */ +- if (OpenClipboard(SDL_Window)) { ++ if (OpenClipboard(BloodsPilot_SDL_Window)) { + HANDLE hMem; + + hMem = GlobalAlloc((GMEM_MOVEABLE | GMEM_DDESHARE), dstlen); +@@ -441,7 +441,7 @@ + Lock_Display(); + owner = XGetSelectionOwner(SDL_Display, XA_PRIMARY); + Unlock_Display(); +- if ((owner == None) || (owner == SDL_Window)) { ++ if ((owner == None) || (owner == BloodsPilot_SDL_Window)) { + owner = DefaultRootWindow(SDL_Display); + selection1 = XA_CUT_BUFFER0; + } +@@ -449,7 +449,7 @@ + int selection_response = 0; + SDL_Event event; + +- owner = SDL_Window; ++ owner = BloodsPilot_SDL_Window; + Lock_Display(); + selection1 = XInternAtom(SDL_Display, "SDL_SELECTION", False); + XConvertSelection(SDL_Display, XA_PRIMARY, format, +@@ -485,7 +485,7 @@ + + #elif defined(WIN_SCRAP) + /* * */ +- if (IsClipboardFormatAvailable(format) && OpenClipboard(SDL_Window)) { ++ if (IsClipboardFormatAvailable(format) && OpenClipboard(BloodsPilot_SDL_Window)) { + HANDLE hMem; + char *src; + diff --git a/pkgs/games/xpilot/bloodspilot-server-strcpy-fix.patch b/pkgs/games/xpilot/bloodspilot-server-strcpy-fix.patch new file mode 100644 index 000000000000..58b060808159 --- /dev/null +++ b/pkgs/games/xpilot/bloodspilot-server-strcpy-fix.patch @@ -0,0 +1,40 @@ +Fortify catches a possible strcpy overcopy, throw more space at it + +--- a/src/server/contact.c 2010-05-24 14:51:41.000000000 +0200 ++++ b/src/server/contact.c 2025-03-23 12:15:36.426805646 +0100 +@@ -58,11 +58,11 @@ + + struct queued_player { + struct queued_player *next; +- char real_name[MAX_CHARS]; +- char nick_name[MAX_CHARS]; +- char disp_name[MAX_CHARS]; +- char host_name[MAX_CHARS]; +- char host_addr[24]; ++ char real_name[MAX_CHARS + 32]; ++ char nick_name[MAX_CHARS + 32]; ++ char disp_name[MAX_CHARS + 32]; ++ char host_name[MAX_CHARS + 32]; ++ char host_addr[1056]; + int32_t port; + team_t *team; + uint32_t version; +@@ -271,12 +271,12 @@ + uint32_t my_magic; + uint16_t port; + char ch; +- char real_name[MAX_CHARS]; +- char disp_name[MAX_CHARS]; +- char nick_name[MAX_CHARS]; +- char host_name[MAX_CHARS]; +- char host_addr[24]; +- char str[MSG_LEN]; ++ char real_name[MAX_CHARS + 32 ]; ++ char disp_name[MAX_CHARS + 32 ]; ++ char nick_name[MAX_CHARS + 32 ]; ++ char host_name[MAX_CHARS + 32 ]; ++ char host_addr[1056]; ++ char str[MSG_LEN + 32]; + + /* + * Someone connected to us, now try and decipher the message :) diff --git a/pkgs/games/xpilot/bloodspilot-server.nix b/pkgs/games/xpilot/bloodspilot-server.nix index 2e3ac840ea67..a54b111a8117 100644 --- a/pkgs/games/xpilot/bloodspilot-server.nix +++ b/pkgs/games/xpilot/bloodspilot-server.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { patches = [ ./server-gcc5.patch + ./bloodspilot-server-strcpy-fix.patch ]; meta = with lib; { diff --git a/pkgs/games/xpilot/default.nix b/pkgs/games/xpilot/default.nix index 8e011af62f29..11ccbc8d5a74 100644 --- a/pkgs/games/xpilot/default.nix +++ b/pkgs/games/xpilot/default.nix @@ -4,6 +4,7 @@ fetchurl, libX11, libSM, + libXext, SDL, libGLU, libGL, @@ -23,6 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libSM + libXext SDL SDL_ttf SDL_image @@ -33,7 +35,10 @@ stdenv.mkDerivation rec { libXxf86misc ]; - patches = [ ./xpilot-ng-gcc-14-fix.patch ]; + patches = [ + ./xpilot-ng-gcc-14-fix.patch + ./xpilot-ng-sdl-window-fix.patch + ]; meta = with lib; { description = "Multiplayer X11 space combat game"; diff --git a/pkgs/games/xpilot/xpilot-ng-sdl-window-fix.patch b/pkgs/games/xpilot/xpilot-ng-sdl-window-fix.patch new file mode 100644 index 000000000000..d1dfa7b16c2a --- /dev/null +++ b/pkgs/games/xpilot/xpilot-ng-sdl-window-fix.patch @@ -0,0 +1,96 @@ +XPilot-NG uses SDL_Window (now an SDL type name) as a variable name + +--- a/src/client/sdl/scrap.c 2025-03-23 11:48:45.045699445 +0100 ++++ b.src/client/sdl/scrap.c 2025-03-23 11:48:48.773699690 +0100 +@@ -57,13 +57,13 @@ + #if defined(X11_SCRAP) + /* * */ + static Display *SDL_Display; +-static Window SDL_Window; ++static Window XPilot_SDL_Window; + static void (*Lock_Display)(void); + static void (*Unlock_Display)(void); + + #elif defined(WIN_SCRAP) + /* * */ +-static HWND SDL_Window; ++static HWND XPilot_SDL_Window; + + #elif defined(QNX_SCRAP) + /* * */ +@@ -285,7 +285,7 @@ + if ( info.subsystem == SDL_SYSWM_X11 ) + { + SDL_Display = info.info.x11.display; +- SDL_Window = info.info.x11.window; ++ XPilot_SDL_Window = info.info.x11.window; + Lock_Display = info.info.x11.lock_func; + Unlock_Display = info.info.x11.unlock_func; + +@@ -302,7 +302,7 @@ + + #elif defined(WIN_SCRAP) + /* * */ +- SDL_Window = info.window; ++ XPilot_SDL_Window = info.window; + retval = 0; + + #elif defined(QNX_SCRAP) +@@ -323,12 +323,12 @@ + #if defined(X11_SCRAP) + /* * */ + Lock_Display(); +- retval = ( XGetSelectionOwner(SDL_Display, XA_PRIMARY) != SDL_Window ); ++ retval = ( XGetSelectionOwner(SDL_Display, XA_PRIMARY) != XPilot_SDL_Window ); + Unlock_Display(); + + #elif defined(WIN_SCRAP) + /* * */ +- retval = ( GetClipboardOwner() != SDL_Window ); ++ retval = ( GetClipboardOwner() != XPilot_SDL_Window ); + + #elif defined(QNX_SCRAP) + /* * */ +@@ -360,13 +360,13 @@ + XA_CUT_BUFFER0, format, 8, PropModeReplace, (unsigned char *)dst, dstlen); + free(dst); + if ( lost_scrap() ) +- XSetSelectionOwner(SDL_Display, XA_PRIMARY, SDL_Window, CurrentTime); ++ XSetSelectionOwner(SDL_Display, XA_PRIMARY, XPilot_SDL_Window, CurrentTime); + Unlock_Display(); + } + + #elif defined(WIN_SCRAP) + /* * */ +- if ( OpenClipboard(SDL_Window) ) ++ if ( OpenClipboard(XPilot_SDL_Window) ) + { + HANDLE hMem; + +@@ -461,7 +461,7 @@ + Lock_Display(); + owner = XGetSelectionOwner(SDL_Display, XA_PRIMARY); + Unlock_Display(); +- if ( (owner == None) || (owner == SDL_Window) ) ++ if ( (owner == None) || (owner == XPilot_SDL_Window) ) + { + owner = DefaultRootWindow(SDL_Display); + selection1 = XA_CUT_BUFFER0; +@@ -471,7 +471,7 @@ + int selection_response = 0; + SDL_Event event; + +- owner = SDL_Window; ++ owner = XPilot_SDL_Window; + Lock_Display(); + selection1 = XInternAtom(SDL_Display, "SDL_SELECTION", False); + XConvertSelection(SDL_Display, XA_PRIMARY, format, +@@ -511,7 +511,7 @@ + + #elif defined(WIN_SCRAP) + /* * */ +- if ( IsClipboardFormatAvailable(format) && OpenClipboard(SDL_Window) ) ++ if ( IsClipboardFormatAvailable(format) && OpenClipboard(XPilot_SDL_Window) ) + { + HANDLE hMem; + char *src; diff --git a/pkgs/kde/third-party/koi/default.nix b/pkgs/kde/third-party/koi/default.nix index a735b799ee23..3a7e8ceda25d 100644 --- a/pkgs/kde/third-party/koi/default.nix +++ b/pkgs/kde/third-party/koi/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; # See https://github.com/baduhai/Koi/blob/master/development/Nix%20OS/dev.nix - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; nativeBuildInputs = [ cmake wrapQtAppsHook diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix index a4a5cb497524..98dc93a20d27 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix @@ -21,7 +21,7 @@ let baseAttrs = finalAttrs: { releaseName = "ICU"; - sourceRoot = "source/icu/icu4c/source"; + sourceRoot = "${finalAttrs.src.name}/icu/icu4c/source"; patches = [ # Skip MessageFormatTest test, which is known to crash sometimes and should be suppressed if it does. diff --git a/pkgs/os-specific/darwin/apple-source-releases/locale/package.nix b/pkgs/os-specific/darwin/apple-source-releases/locale/package.nix index e9b58462f2c8..77955a309e8a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/locale/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/locale/package.nix @@ -6,7 +6,7 @@ stdenvNoCC, }: -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "locale"; version = "118"; @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation { hash = "sha256-KzaAlqXqfJW2s31qmA0D7qteaZY57Va2o86aZrwyR74="; }; - sourceRoot = "source/usr-share-locale.tproj"; + sourceRoot = "${finalAttrs.src.name}/usr-share-locale.tproj"; postPatch = '' # bmake expects `Makefile` not `BSDmakefile`. @@ -60,4 +60,4 @@ stdenvNoCC.mkDerivation { ]; maintainers = lib.teams.darwin.members; }; -} +}) diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix index 2b3af84648a6..a23e0e669559 100644 --- a/pkgs/servers/mir/default.nix +++ b/pkgs/servers/mir/default.nix @@ -5,8 +5,8 @@ let in { mir = common { - version = "2.20.0"; - hash = "sha256-Dmo/aEATbbVoZd3fWIO0uHkwnAiATih33XS2MF/azoY="; + version = "2.20.1"; + hash = "sha256-c+0xMW6GspTpRsPX7D/9mdqHRBRsrcChl6TkFkHT6hg="; }; mir_2_15 = common { diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index a38031739e98..7da47f1501d9 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -91,6 +91,10 @@ import ./versions.nix ( ++ optional postgresqlSupport "--with-postgresql" ++ optional ipmiSupport "--with-openipmi=${openipmi.dev}"; + env.NIX_CFLAGS_COMPILE = lib.optionalString ( + lib.versions.major version <= "5" + ) "-Wno-error=incompatible-pointer-types"; + prePatch = '' find database -name data.sql -exec sed -i 's|/usr/bin/||g' {} + ''; diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 3c7622bf6587..36c8ff67ad31 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -16,8 +16,8 @@ generic: { }; v50 = generic { - version = "5.0.41"; - hash = "sha256-pPvw0lPoK1IpsXc5c8Qu9zFhx2oHJz2bwiX80vrYa58="; - vendorHash = "sha256-qLDoNnEFiSrWXbLtYlmQaqY8Rv6JaG8WbMYBlry5Evc="; + version = "5.0.46"; + hash = "sha256-p6OZALpOQG6v70Y20cC2bdlzTINz3JBd9qGWZACfcl4="; + vendorHash = "sha256-NgSi6usIbss3WEZCYht46WjxcrdOO3qv8KwwUZwtkk0="; }; } diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 23954dc67596..490d1a7049d9 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -2,17 +2,20 @@ lib, stdenv, fetchFromGitHub, + installShellFiles, autoconf, automake, libtool, pkg-config, which, + libavif, + libjxl, + librsvg, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, - imagemagick, Foundation, }: @@ -27,6 +30,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-9RkN0yZnHf5cx6tsp3P6jsi0/xtplWxMm3hYCPjWj0M="; }; + outputs = [ + "bin" + "dev" + "man" + "out" + ]; + nativeBuildInputs = [ autoconf automake @@ -37,12 +47,15 @@ stdenv.mkDerivation rec { libxml2 docbook_xml_dtd_412 docbook_xsl + installShellFiles ]; buildInputs = [ glib - imagemagick - ] ++ lib.optional stdenv.hostPlatform.isDarwin Foundation; + libavif + libjxl + librsvg + ]; patches = [ ./xmlcatalog_patch.patch ]; @@ -56,8 +69,9 @@ stdenv.mkDerivation rec { "--with-xml-catalog=${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml" ]; - # https://github.com/NixOS/nixpkgs/pull/240893#issuecomment-1635347507 - NIX_LDFLAGS = [ "-lwebp" ]; + postInstall = '' + installShellCompletion --cmd chafa tools/completions/zsh-completion.zsh + ''; meta = with lib; { description = "Terminal graphics for the 21st century"; diff --git a/pkgs/tools/networking/curl-impersonate/chrome/default.nix b/pkgs/tools/networking/curl-impersonate/chrome/default.nix index ac85af4de081..dce29e548661 100644 --- a/pkgs/tools/networking/curl-impersonate/chrome/default.nix +++ b/pkgs/tools/networking/curl-impersonate/chrome/default.nix @@ -95,13 +95,13 @@ stdenv.mkDerivation rec { postUnpack = lib.concatStringsSep "\n" ( - lib.mapAttrsToList (name: dep: "ln -sT ${dep.outPath} source/${name}") ( + lib.mapAttrsToList (name: dep: "ln -sT ${dep.outPath} ${src.name}/${name}") ( lib.filterAttrs (n: v: v ? outPath) passthru.deps ) ) + '' - curltar=$(realpath -s source/curl-*.tar.gz) + curltar=$(realpath -s ${src.name}/curl-*.tar.gz) pushd "$(mktemp -d)" diff --git a/pkgs/tools/networking/curl-impersonate/firefox/default.nix b/pkgs/tools/networking/curl-impersonate/firefox/default.nix index 73b4458ec8db..e0d178466ea2 100644 --- a/pkgs/tools/networking/curl-impersonate/firefox/default.nix +++ b/pkgs/tools/networking/curl-impersonate/firefox/default.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { dontUseNinjaCheck = true; postUnpack = lib.concatStringsSep "\n" ( - lib.mapAttrsToList (name: dep: "ln -sT ${dep.outPath} source/${name}") ( + lib.mapAttrsToList (name: dep: "ln -sT ${dep.outPath} ${src.name}/${name}") ( lib.filterAttrs (n: v: v ? outPath) passthru.deps ) ); diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 84ea0c1fe404..012240b02f8e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1735,6 +1735,11 @@ mapAliases { ### Z ### + zeroadPackages = recurseIntoAttrs { + zeroad = lib.warnOnInstantiate "'zeroadPackages.zeroad' has been renamed to 'zeroad'" zeroad; # Added 2025-03-22 + zeroad-data = lib.warnOnInstantiate "'zeroadPackages.zeroad-data' has been renamed to 'zeroad-data'" zeroad-data; # Added 2025-03-22 + zeroad-unwrapped = lib.warnOnInstantiate "'zeroadPackages.zeroad-unwrapped' has been renamed to 'zeroad-unwrapped'" zeroad-unwrapped; # Added 2025-03-22 + }; zeromq4 = zeromq; # Added 2024-11-03 zfsStable = zfs; # Added 2024-02-26 zfsUnstable = zfs_unstable; # Added 2024-02-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2eb1824f7375..876c3e28645c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16484,12 +16484,10 @@ with pkgs; yquake2-the-reckoning yquake2-all-games; - zeroadPackages = recurseIntoAttrs (callPackage ../games/0ad { + zeroad-unwrapped = callPackage ../by-name/ze/zeroad-unwrapped/package.nix { wxGTK = wxGTK32; fmt = fmt_9; - }); - - zeroad = zeroadPackages.zeroad; + }; ### DESKTOP ENVIRONMENTS diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ca4b2f5c334..f2e076406130 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6966,6 +6966,8 @@ self: super: with self; { jug = callPackage ../development/python-modules/jug { }; + juliandate = callPackage ../development/python-modules/juliandate { }; + julius = callPackage ../development/python-modules/julius { }; junitparser = callPackage ../development/python-modules/junitparser { }; @@ -12793,7 +12795,9 @@ self: super: with self; { pyqt-builder = callPackage ../development/python-modules/pyqt-builder { }; - pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix { }; + pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix { + inherit (pkgs) mesa; + }; pyqt5-stubs = callPackage ../development/python-modules/pyqt5-stubs { }; @@ -14913,6 +14917,8 @@ self: super: with self; { scienceplots = callPackage ../development/python-modules/scienceplots { }; + sciform = callPackage ../development/python-modules/sciform { }; + scim2-client = callPackage ../development/python-modules/scim2-client { }; scim2-filter-parser = callPackage ../development/python-modules/scim2-filter-parser { }; diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index b321a80017f4..28664c0ae2eb 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -3133,14 +3133,15 @@ version = "7.1.1"; }; rbs = { + dependencies = ["logger"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dgj5n7rj83981fvrhswfwsh88x42p7r00nvd80hkxmdcjvda2h6"; + sha256 = "0drs9n5qn9pifmb752kali7r2sv0laclvchahc670phlv21awdqf"; type = "gem"; }; - version = "2.8.4"; + version = "3.9.0"; }; rchardet = { groups = ["default"]; @@ -3443,15 +3444,15 @@ version = "0.8.2"; }; ruby-lsp = { - dependencies = ["language_server-protocol" "prism" "sorbet-runtime"]; + dependencies = ["language_server-protocol" "prism" "rbs" "sorbet-runtime"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1548gmj14xrc91lp7yzn0q23g6cjn8r7xfdlv2qarzi9k2a92l5m"; + sha256 = "0rmqhp7v4k3xdz6d9sbb0xjyk2519zrk8lr3hpyrv9xa9jyxn6hn"; type = "gem"; }; - version = "0.15.0"; + version = "0.23.12"; }; ruby-lxc = { groups = ["default"];