diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 295b321f9cd8..3042ef3d89ba 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -287,7 +287,7 @@ - The Perl implementation of the `switch-to-configuration` program is removed. All switchable systems now use the Rust rewrite. Any prior usage of `system.switch.enableNg` must now be removed. If you have any outstanding issues with the new implementation, please open an issue on GitHub. -- The Pocket ID module ([`services.pocket-id`][#opt-services.pocket-id.enable]) and package (`pocket-id`) has been updated to 1.0.0. Some environment variables have been changed or removed, see the [migration guide](https://pocket-id.org/docs/setup/migrate-to-v1/). +- The Pocket ID module ([`services.pocket-id`](#opt-services.pocket-id.enable)) and package (`pocket-id`) has been updated to 1.0.0. Some environment variables have been changed or removed, see the [migration guide](https://pocket-id.org/docs/setup/migrate-to-v1/). - The Postfix module has been updated and likely requires configuration changes: - The `services.postfix.sslCert` and `sslKey` options were removed and you now need to configure diff --git a/nixos/tests/haproxy.nix b/nixos/tests/haproxy.nix index 4b7f26765752..24c355788a38 100644 --- a/nixos/tests/haproxy.nix +++ b/nixos/tests/haproxy.nix @@ -8,9 +8,6 @@ services.haproxy = { enable = true; config = '' - global - limited-quic - defaults mode http timeout connect 10s diff --git a/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix b/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix index 171d6038515f..a744b9c40bc7 100644 --- a/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix +++ b/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix @@ -13,7 +13,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "harper"; publisher = "elijah-potter"; version = harper.version; - hash = "sha256-ldXQKAJX8YQVjtGjKRom14fNuA6ZwDwpPusbjS+4G+I="; + hash = "sha256-Mu1l/3twbdpqIV8ePNfR7No23Ib/8hkB2CfE59BZP9M="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix index c65b04e5ac36..2c74b044c326 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix @@ -10,13 +10,13 @@ buildMozillaMach rec { pname = "firefox-devedition"; binaryName = "firefox-devedition"; - version = "145.0b9"; + version = "146.0b9"; applicationName = "Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "36000021b8f30eb5e80ce3b2e4ae05499e8b8cbdec93ba97dfb9c8f107cbe80202a13c4923491c01c8c245fc1810bb6fc82a46a06817ab7e70a47c04385b306e"; + sha512 = "6fac88325150620388f49ffe1ba0385216184b98e0faa54e01804292563798a032a8cef375dbc78a41b9ba3e18d1e9258aca5e090bc827f2e7e842f76ee34c25"; }; # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix index 0bf1c7e2f237..36e856235d2a 100644 --- a/pkgs/by-name/be/beeper/package.nix +++ b/pkgs/by-name/be/beeper/package.nix @@ -9,10 +9,10 @@ }: let pname = "beeper"; - version = "4.2.229"; + version = "4.2.269"; src = fetchurl { url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage"; - hash = "sha256-AW976i1JO2nKqm7QV35lYFPftClOpEz+0/Zaec4sly8="; + hash = "sha256-2IASocz5dgO3KXSvm4i8wyFClEF/4oRtOJZAsfg0mJA="; }; appimageContents = appimageTools.extract { inherit pname version src; diff --git a/pkgs/by-name/be/beets/package.nix b/pkgs/by-name/be/beets/package.nix index 0d8837e0c0d8..e6b2b42c61b4 100644 --- a/pkgs/by-name/be/beets/package.nix +++ b/pkgs/by-name/be/beets/package.nix @@ -1,5 +1,10 @@ { - python3, + ffmpeg, + python3Packages, }: -python3.pkgs.toPythonApplication python3.pkgs.beets +python3Packages.toPythonApplication ( + python3Packages.beets.override { + inherit ffmpeg; + } +) diff --git a/pkgs/by-name/de/debian-devscripts/package.nix b/pkgs/by-name/de/debian-devscripts/package.nix index 5fb6d5906758..6a4e0902a5c9 100644 --- a/pkgs/by-name/de/debian-devscripts/package.nix +++ b/pkgs/by-name/de/debian-devscripts/package.nix @@ -30,14 +30,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "debian-devscripts"; - version = "2.25.26"; + version = "2.25.27"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "devscripts"; tag = "v${finalAttrs.version}"; - hash = "sha256-tO2IKC7ThHOrN6VZUPqPg8ezgv3Tq2U5GtESgNsmrYA="; + hash = "sha256-pTRJAiwEvfStsOOTwh6vP6kiiYppL5XG9QcCcHNaHp8="; }; patches = [ diff --git a/pkgs/by-name/en/envoy/package.nix b/pkgs/by-name/en/envoy/package.nix index 78fa316439da..9611303664ab 100644 --- a/pkgs/by-name/en/envoy/package.nix +++ b/pkgs/by-name/en/envoy/package.nix @@ -49,8 +49,8 @@ let depsHash else { - x86_64-linux = "sha256-AqXGk6IZ85TFNO7v8KFJOe8Caf1x4xQh/VuhaUq9rB4="; - aarch64-linux = "sha256-l70j1UcVNHGrzzvcqdeLDJUuaLkoLNM2yWCHKY4EShs="; + x86_64-linux = "sha256-cUpCkmJmFyd2mTImMKt5Cgi+A4bAWAXLYjJjMnV6haQ="; + aarch64-linux = "sha256-f1FbdFDunlF7uhCpkb5AqmKN5uimuKnFYBzXjIcRabk="; } .${stdenv.system} or (throw "unsupported system ${stdenv.system}"); @@ -173,6 +173,44 @@ buildBazelPackage rec { rm -r $bazelOut/external/local_jdk rm -r $bazelOut/external/bazel_gazelle_go_repository_tools/bin + # Drop prebuilt JDK toolchains and non-Linux java tool bundles; we force @local_jdk anyway. + shopt -s nullglob + rm -rf $bazelOut/external/remotejdk* + for dir in $bazelOut/external/remote_java_tools*; do + base=$(basename "$dir") + if [[ "$base" != remote_java_tools_linux ]]; then + rm -rf "$dir" + fi + done + rm -rf $bazelOut/external/android_tools $bazelOut/external/android_gmaven_r8 + find $bazelOut/external/repository_cache -maxdepth 1 -type f \ + \( -iname '*remotejdk*' -o -iname '*remote_java_tools*' -o -iname '*android*' \) -delete + + # Prune repository_cache entries for unused remote JDK/tool bundles. + keep_patterns=() + case ${stdenv.hostPlatform.system} in + x86_64-linux) + keep_patterns+=("remotejdk8_linux" "remotejdk11_linux" "remotejdk17_linux" "remotejdk21_linux" "remote_java_tools_linux") + ;; + aarch64-linux) + keep_patterns+=("remotejdk8_linux_aarch64" "remotejdk11_linux_aarch64" "remotejdk17_linux_aarch64" "remotejdk21_linux_aarch64" "remote_java_tools_linux") + ;; + esac + + find $bazelOut/external/repository_cache -type f \( -iname '*remotejdk*' -o -iname '*remote_java_tools*' -o -iname '*android*' \) | while read f; do + keep=false + for pat in $keep_patterns; do + if [[ $(basename "$f") == *"$pat"* ]]; then + keep=true + break + fi + done + if ! $keep; then + rm -f "$f" + fi + done + shopt -u nullglob + # CMake 4.1 drops compatibility with <3.5; bump libevent's floor to avoid configure failure. sed -i 's/cmake_minimum_required(VERSION 3\\.1.2 FATAL_ERROR)/cmake_minimum_required(VERSION 3.5 FATAL_ERROR)/' \ $bazelOut/external/com_github_libevent_libevent/CMakeLists.txt diff --git a/pkgs/by-name/go/gojq/package.nix b/pkgs/by-name/go/gojq/package.nix index bc9946df3589..682afc5fef85 100644 --- a/pkgs/by-name/go/gojq/package.nix +++ b/pkgs/by-name/go/gojq/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "gojq"; - version = "0.12.17"; + version = "0.12.18"; src = fetchFromGitHub { owner = "itchyny"; repo = "gojq"; rev = "v${finalAttrs.version}"; - hash = "sha256-zJkeghN3btF/fZZeuClHV1ndB/2tTTMljEukMYe7UWU="; + hash = "sha256-9oqyNG8kaM4LmMWOZ2aQqabx97xw6Bt1PgjhVuPU+YE="; }; - vendorHash = "sha256-ZC0byawZLBwId5GcAgHXRdEOMUSAv4wDNHFHLrbhB+I="; + vendorHash = "sha256-NxhoCbDRduegRcBoZbNi2CB7QRXvqpLv7cAL2mEy9tM="; ldflags = [ "-s" diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix index 67a6bbe0ffc9..ad0e4f3f9728 100644 --- a/pkgs/by-name/ha/haproxy/package.nix +++ b/pkgs/by-name/ha/haproxy/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (sslLibrary == "aws-lc") [ "USE_OPENSSL_AWSLC=true" ] - ++ lib.optionals (sslLibrary == "openssl") [ + ++ lib.optionals (sslLibrary == "openssl" && lib.versionOlder openssl.version "3.5.2") [ "USE_QUIC_OPENSSL_COMPAT=yes" ] ++ lib.optionals (sslLibrary == "wolfssl") [ diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index 037379706c85..9a3b8247e90e 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "harper"; - version = "0.71.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${finalAttrs.version}"; - hash = "sha256-Hf086Ub0nVGET4qELDMddOErGAhK8B6ohbI5JhnU6z8="; + hash = "sha256-U0k6DODMW9OK+sR9kt8JzpmV32d9py9Pehv/0h8SqDg="; }; buildAndTestSubdir = "harper-ls"; - cargoHash = "sha256-hS8fLWD3OTfEAa+4saeB9pK3zS/EQSnoQSUGIkVWocw="; + cargoHash = "sha256-TyqUKAlrcoqsDBS2Y3jzUFNNRazSBsCf6una0znc+yw="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/nw/nwg-clipman/package.nix b/pkgs/by-name/nw/nwg-clipman/package.nix index 30e97da20f82..8770b6098145 100644 --- a/pkgs/by-name/nw/nwg-clipman/package.nix +++ b/pkgs/by-name/nw/nwg-clipman/package.nix @@ -13,14 +13,14 @@ python3Packages.buildPythonPackage rec { pname = "nwg-clipman"; - version = "0.2.7"; + version = "0.2.8"; pyproject = true; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-clipman"; tag = "v${version}"; - hash = "sha256-EBxt1OSwddlMIwEqc89rzak3jhPwOhZ61Rz5l2LU2kY="; + hash = "sha256-GVA842yCSSO2vDD51AObEQNhDVuRIdH1c6BF1tv2Q8E="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/op/openjk/package.nix b/pkgs/by-name/op/openjk/package.nix index eb21e40db584..bd40403d56e7 100644 --- a/pkgs/by-name/op/openjk/package.nix +++ b/pkgs/by-name/op/openjk/package.nix @@ -71,6 +71,8 @@ stdenv.mkDerivation { outputs = [ "out" + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ "openjo" "openja" ]; @@ -83,40 +85,80 @@ stdenv.mkDerivation { "-DBuildJK2SPEngine:BOOL=ON" "-DBuildJK2SPGame:BOOL=ON" "-DBuildJK2SPRdVanilla:BOOL=ON" + ] + # Otherwise will fall with `not found ` + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "-DUseInternalJPEG:BOOL=OFF" + "-DUseInternalPNG:BOOL=OFF" ]; - postInstall = '' - mkdir -p $out/bin $openja/bin $openjo/bin - mkdir -p $openja/share/applications $openjo/share/applications - mkdir -p $openja/share/icons/hicolor/128x128/apps $openjo/share/icons/hicolor/128x128/apps - mkdir -p $openja/opt $openjo/opt - mv $out/opt/JediAcademy $openja/opt/ - mv $out/opt/JediOutcast $openjo/opt/ - jaPrefix=$openja/opt/JediAcademy - joPrefix=$openjo/opt/JediOutcast + postInstall = + if stdenv.hostPlatform.isLinux then + '' + mkdir -p $out/bin $openja/bin $openjo/bin + mkdir -p $openja/share/applications $openjo/share/applications + mkdir -p $openja/share/icons/hicolor/128x128/apps $openjo/share/icons/hicolor/128x128/apps + mkdir -p $openja/opt $openjo/opt + mv $out/opt/JediAcademy $openja/opt/ + mv $out/opt/JediOutcast $openjo/opt/ + jaPrefix=$openja/opt/JediAcademy + joPrefix=$openjo/opt/JediOutcast - makeWrapper $jaPrefix/openjk.* $openja/bin/jamp --chdir "$jaPrefix" - makeWrapper $jaPrefix/openjk_sp.* $openja/bin/jasp --chdir "$jaPrefix" - makeWrapper $jaPrefix/openjkded.* $openja/bin/openjkded --chdir "$jaPrefix" - makeWrapper $joPrefix/openjo_sp.* $openjo/bin/josp --chdir "$joPrefix" + makeWrapper $jaPrefix/openjk.* $openja/bin/jamp --chdir "$jaPrefix" + makeWrapper $jaPrefix/openjk_sp.* $openja/bin/jasp --chdir "$jaPrefix" + makeWrapper $jaPrefix/openjkded.* $openja/bin/openjkded --chdir "$jaPrefix" + makeWrapper $joPrefix/openjo_sp.* $openjo/bin/josp --chdir "$joPrefix" - cp $src/shared/icons/OpenJK_Icon_128.png $openjo/share/icons/hicolor/128x128/apps - cp $src/shared/icons/OpenJK_Icon_128.png $openja/share/icons/hicolor/128x128/apps - ln -s ${jamp}/share/applications/* $openja/share/applications - ln -s ${jasp}/share/applications/* $openja/share/applications - ln -s ${josp}/share/applications/* $openjo/share/applications - ln -s $openja/bin/* $out/bin - ln -s $openjo/bin/* $out/bin - rm -rf $out/opt + cp $src/shared/icons/OpenJK_Icon_128.png $openjo/share/icons/hicolor/128x128/apps + cp $src/shared/icons/OpenJK_Icon_128.png $openja/share/icons/hicolor/128x128/apps + ln -s ${jamp}/share/applications/* $openja/share/applications + ln -s ${jasp}/share/applications/* $openja/share/applications + ln -s ${josp}/share/applications/* $openjo/share/applications + ln -s $openja/bin/* $out/bin + ln -s $openjo/bin/* $out/bin + rm -rf $out/opt + '' + else if stdenv.hostPlatform.isDarwin then + '' + mkdir -p $out/Applications $out/bin + mv $out/opt/JediOutcast/openjo_sp.*.app $out/Applications/openjo_sp.app + mv $out/opt/JediAcademy/openjk.*.app $out/Applications/openjk.app + mv $out/opt/JediAcademy/openjk_sp.*.app $out/Applications/openjk_sp.app + mv $out/opt/JediAcademy/openjkded.* $out/bin/openjkded + rm -rf $out/opt + + makeWrapper $out/Applications/openjk.app/Contents/MacOS/openjk.* $out/bin/openjk \ + --chdir $out/Applications/openjk.app/Contents/MacOS/ + + makeWrapper $out/Applications/openjk_sp.app/Contents/MacOS/openjk_sp.* $out/bin/openjk_sp \ + --chdir $out/Applications/openjk_sp.app/Contents/MacOS/ + + makeWrapper $out/Applications/openjo_sp.app/Contents/MacOS/openjo_sp.* $out/bin/openjo_sp \ + --chdir $out/Applications/openjo_sp.app/Contents/MacOS/ + '' + else + throw "unsupported system"; + + # CMake is copying libraries, but their links are needed + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + for app in openjk openjk_sp openjo_sp; do + pushd $out/Applications/$app.app/Contents/Frameworks/ + + rm *.dylib + ln -s ${SDL2}/lib/libSDL2.dylib libSDL2-2.0.0.dylib + ln -s ${zlib}/lib/libz.dylib libz.dylib + + popd + done ''; passthru.updateScript = unstableGitUpdater { }; - meta = with lib; { + meta = { description = "Open-source engine for Star Wars Jedi Academy game"; homepage = "https://github.com/JACoders/OpenJK"; - license = licenses.gpl2Only; - platforms = platforms.linux; - maintainers = [ ]; + license = lib.licenses.gpl2Only; + platforms = with lib.platforms; linux ++ darwin; + maintainers = with lib.maintainers; [ r4v3n6101 ]; }; } diff --git a/pkgs/by-name/sg/sgt-puzzles/package.nix b/pkgs/by-name/sg/sgt-puzzles/package.nix index f41848add13c..f9813627dcaf 100644 --- a/pkgs/by-name/sg/sgt-puzzles/package.nix +++ b/pkgs/by-name/sg/sgt-puzzles/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sgt-puzzles"; - version = "20251120.28032bd"; + version = "20251127.a4f68b6"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${finalAttrs.version}.tar.gz"; - hash = "sha256-aD4EOuquUpjtmKVClzIKbO+6LD2T3vqgSDf7D/wPYrE="; + hash = "sha256-NaRLonSMOKZaZjttBDnM2VV1oa21rLDISvSyV8F9tQ0="; }; sgt-puzzles-menu = fetchurl { diff --git a/pkgs/by-name/si/sigil/package.nix b/pkgs/by-name/si/sigil/package.nix index e15163489769..5e4cedcb7d21 100644 --- a/pkgs/by-name/si/sigil/package.nix +++ b/pkgs/by-name/si/sigil/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "sigil"; - version = "2.6.2"; + version = "2.7.0"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; tag = version; - hash = "sha256-3+ODd0/kkXfAchsErLjy6FDHoyVP9VyxbINKMn3N/PM="; + hash = "sha256-cKnWAVLScPZYNAFOiXaoHSXMl3YNOh6zmEryILaOR4w="; }; pythonPath = with python3Packages; [ lxml ]; diff --git a/pkgs/by-name/sk/skippy-xd/package.nix b/pkgs/by-name/sk/skippy-xd/package.nix index 66b449bf2ca0..fe32e56117e1 100644 --- a/pkgs/by-name/sk/skippy-xd/package.nix +++ b/pkgs/by-name/sk/skippy-xd/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "skippy-xd"; - version = "2025.10.05"; + version = "2025.11.30"; src = fetchFromGitHub { owner = "felixfung"; repo = "skippy-xd"; tag = "v${finalAttrs.version}"; - hash = "sha256-WrB633mhZwoP+54mjSE+3gSU/VsdBZVITfD0dkYaoa8="; + hash = "sha256-aN1ZJnN8xH5ggH3lknrIrz2MxrVreElUKhL8RjvZBO0="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ta/taze/package.nix b/pkgs/by-name/ta/taze/package.nix index 6ad11e238957..602332bcf7f6 100644 --- a/pkgs/by-name/ta/taze/package.nix +++ b/pkgs/by-name/ta/taze/package.nix @@ -13,19 +13,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "taze"; - version = "19.9.0"; + version = "19.9.2"; src = fetchFromGitHub { owner = "antfu-collective"; repo = "taze"; tag = "v${finalAttrs.version}"; - hash = "sha256-Xpi5Wc8YP3hUSbEnfEM6uNvdlNiVMRz0oqZAJCBkLHQ="; + hash = "sha256-6VH1j2v9gySalq6OXL1WzEApcaoE1VxHdrZtYv2xKZk="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-g1LGiCb2NESywYN4tTVf8sXbuJla2whCm5amvPsdmRc="; + hash = "sha256-SV8dHPydTOz/cbOY3p4npp0uMjh3hSXH9ZNk4BtHb4w="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/te/tetragon/package.nix b/pkgs/by-name/te/tetragon/package.nix index c19b2e55f29c..448ad44a3e93 100644 --- a/pkgs/by-name/te/tetragon/package.nix +++ b/pkgs/by-name/te/tetragon/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tetragon"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "cilium"; repo = "tetragon"; tag = "v${finalAttrs.version}"; - hash = "sha256-riuSByvMpbukA+pwbzecnyUvZGtPR6lLEA1s2oBnI+A="; + hash = "sha256-A6a7yjxenB/7sfdfoIaJAxdkw0ouNinZtahNMRAytwA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ze/zenn-cli/package.nix b/pkgs/by-name/ze/zenn-cli/package.nix index ae11b2769124..5fd35e6cc3d5 100644 --- a/pkgs/by-name/ze/zenn-cli/package.nix +++ b/pkgs/by-name/ze/zenn-cli/package.nix @@ -2,70 +2,43 @@ lib, stdenv, fetchFromGitHub, - fetchurl, - autoPatchelfHook, makeWrapper, nodejs, - pnpm_9, + pnpm_10, testers, }: -let - go-turbo-version = "1.7.4"; - go-turbo-srcs = { - x86_64-linux = fetchurl { - url = "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-${go-turbo-version}.tgz"; - hash = "sha256-bwi+jthoDe+SEvCPPNNNv9AR8n5IA1fc4I8cnfC095Y="; - }; - aarch64-linux = fetchurl { - url = "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-${go-turbo-version}.tgz"; - hash = "sha256-j3mUd3x16tYR3QQweIB07IbCKYuKPeEkKkUHhrpHzyc="; - }; - }; - go-turbo = stdenv.mkDerivation { - pname = "go-turbo"; - version = go-turbo-version; - src = - go-turbo-srcs.${stdenv.hostPlatform.system} - or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - nativeBuildInputs = [ autoPatchelfHook ]; - dontBuild = true; - installPhase = '' - install -Dm755 bin/go-turbo -t $out/bin - ''; - }; -in - stdenv.mkDerivation (finalAttrs: { pname = "zenn-cli"; - version = "0.2.1"; + version = "0.2.10"; src = fetchFromGitHub { owner = "zenn-dev"; repo = "zenn-editor"; tag = finalAttrs.version; - hash = "sha256-LFbC3GXYLCgBOYBdNJRdESGb37DuGBCEL8ak1Qf9DVA="; - # turborepo requires .git directory - leaveDotGit = true; + hash = "sha256-H46wFDSxG5Fg9HuJOLulBXoXR+osf4gJEa+ZMUMWT5Q="; }; nativeBuildInputs = [ nodejs - pnpm_9.configHook + pnpm_10.configHook makeWrapper ]; - pnpmDeps = pnpm_9.fetchDeps { - inherit (finalAttrs) pname version src; + pnpmWorkspaces = [ "zenn-cli..." ]; + + pnpmDeps = pnpm_10.fetchDeps { + inherit (finalAttrs) + pname + version + src + pnpmWorkspaces + ; fetcherVersion = 1; - hash = "sha256-AjdXclrNl1AHJ4LXq9I5Rk6KGyDaWXW187o2uLwRy/o="; + hash = "sha256-QEOGL/FK0Vq8opPu7NeTTrk/rwWlMgisx+A7edMN9fw="; }; preBuild = '' echo VITE_EMBED_SERVER_ORIGIN="https://embed.zenn.studio" > packages/zenn-cli/.env - '' - # replace go-turbo since the existing one can't be executed - + lib.optionalString stdenv.hostPlatform.isLinux '' - cp ${go-turbo}/bin/go-turbo node_modules/.pnpm/turbo-linux-*/node_modules/turbo-linux*/bin/go-turbo ''; buildPhase = '' @@ -79,11 +52,14 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p $out/{bin,lib/node_modules/zenn-cli} - cp -r packages/zenn-cli/{dist,LICENSE,package.json,README.md} $out/lib/node_modules/zenn-cli + mkdir -p $out/{bin,lib/packages} + rm -r node_modules packages/zenn-cli/node_modules + pnpm install --filter=zenn-cli --prod --ignore-scripts + cp -r node_modules $out/lib + cp -r packages/zenn-cli $out/lib/packages/zenn-cli makeWrapper "${lib.getExe nodejs}" "$out/bin/zenn" \ - --add-flags "$out/lib/node_modules/zenn-cli/dist/server/zenn.js" + --add-flags "$out/lib/packages/zenn-cli/dist/server/zenn.js" runHook postInstall ''; diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 5057871ca8ff..1e644bd325ba 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "42.8.0"; + version = "42.9.0"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "aioesphomeapi"; tag = "v${version}"; - hash = "sha256-33QldAjCuuZr/aqAN3chq57lKzfE8n0ZXybtrAoW4tc="; + hash = "sha256-wcDK84oAz+h8M0DEMpNxSq7/Un5AOfmdBtWueD8bfBo="; }; build-system = [ diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index 82fa73040591..73b44e34abd1 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "13.21.0"; + version = "13.22.0"; pyproject = true; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "aioshelly"; tag = version; - hash = "sha256-ux4zxyl+XW5Fhkwz9mHi6TKRQ5x8SO3L2UzfVb0OeJk="; + hash = "sha256-SrnmEh+Re/DM3IM5rn/80D/ZqJeeWsn3kPtBJTGrYl0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index c7d59b403351..8d0ca94e5f6e 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "cohere"; - version = "5.20.0"; + version = "5.20.1"; pyproject = true; src = fetchFromGitHub { owner = "cohere-ai"; repo = "cohere-python"; tag = version; - hash = "sha256-Y0IxKKq1D7tRzbNSjWDuLYEpRChRA89t91BstvE8Tng="; + hash = "sha256-oX3TSFR/Z33SpolWsEIGt7zH/6hJJE5p/j6oEdBfX6I="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/gguf/default.nix b/pkgs/development/python-modules/gguf/default.nix index d1bdd9313a7b..15b619f8374d 100644 --- a/pkgs/development/python-modules/gguf/default.nix +++ b/pkgs/development/python-modules/gguf/default.nix @@ -1,40 +1,62 @@ { lib, + stdenv, buildPythonPackage, - fetchPypi, - pythonOlder, - numpy, + fetchFromGitHub, + + # build-system poetry-core, + + # dependencies + numpy, + pyside6, pyyaml, sentencepiece, tqdm, + + # check inputs + pytestCheckHook, }: + buildPythonPackage rec { pname = "gguf"; version = "0.17.1"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-Nq1xqtkAo+dfyU6+lupgKfA6TkS+difvetPQPox7y1M="; + src = fetchFromGitHub { + owner = "ggml-org"; + repo = "llama.cpp"; + tag = "gguf-v${version}"; + hash = "sha256-XjDMDca4pyc72WQee4h3R6Iq9M0LzO+6ukV6CBWQO1M="; }; + sourceRoot = "${src.name}/gguf-py"; + + build-system = [ poetry-core ]; + dependencies = [ numpy - poetry-core + pyside6 pyyaml - sentencepiece tqdm + ] + # Sentencepiece is optional and its inclusion crashes darwin + # See https://github.com/NixOS/nixpkgs/issues/466092 + ++ lib.optionals stdenv.hostPlatform.isLinux [ + sentencepiece ]; + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "gguf" ]; - meta = with lib; { + meta = { description = "Module for writing binary files in the GGUF format"; homepage = "https://ggml.ai/"; - license = licenses.mit; - maintainers = with maintainers; [ mitchmindtree ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + mitchmindtree + sarahec + ]; }; } diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index 6fab59b00440..f68b9bcc1efa 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "9.1.0"; + version = "9.1.1"; pyproject = true; src = fetchFromGitHub { owner = "allenporter"; repo = "python-google-nest-sdm"; tag = version; - hash = "sha256-BvyflbmtgLSRaAc465bN+5AcPwum0UBsSAWzwvelwIk="; + hash = "sha256-qbw5KryI/h+uBddFrYBCQHXxFAhXR1SHdkuIeUKxbVw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/volkswagencarnet/default.nix b/pkgs/development/python-modules/volkswagencarnet/default.nix index e9c4725b62a2..fa6b44ec23ac 100644 --- a/pkgs/development/python-modules/volkswagencarnet/default.nix +++ b/pkgs/development/python-modules/volkswagencarnet/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "volkswagencarnet"; - version = "5.1.6"; + version = "5.1.8"; pyproject = true; src = fetchFromGitHub { owner = "robinostlund"; repo = "volkswagencarnet"; tag = "v${version}"; - hash = "sha256-GLsL9bvgLlfqiQdaIszthXXG/o4lKB4vAz5TMFfoGs8="; + hash = "sha256-LH8w+sIInez5hUM/rj1C8ew/RlfKTPKh0ZgLt6cRcnY="; }; postPatch = '' diff --git a/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix b/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix index 3ec638f64bef..3f287955fb3d 100644 --- a/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix +++ b/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix @@ -10,13 +10,13 @@ buildHomeAssistantComponent rec { owner = "robinostlund"; domain = "volkswagencarnet"; - version = "5.1.7"; + version = "5.2.0"; src = fetchFromGitHub { owner = "robinostlund"; repo = "homeassistant-volkswagencarnet"; tag = "v${version}"; - hash = "sha256-c3fj15TUboX/HRBLb3EENBkZIwluza8Q6MKbU4+BB/E="; + hash = "sha256-NAWE489MUyXwRtW7rOGOEz9BFF+BwqS0MWNYtunfOIo="; }; dependencies = [ volkswagencarnet ]; diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index 774117d941fd..5411328f4b87 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -74,7 +74,7 @@ let inPCSystems = lib.any (system: stdenv.hostPlatform.system == system) (lib.attrNames pcSystems); gnulib = fetchgit { - url = "https://https.git.savannah.gnu.org/git/gnulib.git"; + url = "https://git.savannah.gnu.org/git/gnulib.git"; # NOTE: keep in sync with bootstrap.conf! rev = "9f48fb992a3d7e96610c4ce8be969cff2d61a01b"; hash = "sha256-mzbF66SNqcSlI+xmjpKpNMwzi13yEWoc1Fl7p4snTto="; @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { version = "2.12"; src = fetchgit { - url = "https://https.git.savannah.gnu.org/git/grub.git"; + url = "https://git.savannah.gnu.org/git/grub.git"; tag = "grub-${version}"; hash = "sha256-lathsBb2f7urh8R86ihpTdwo3h1hAHnRiHd5gCLVpBc="; };