diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 044ab6eefcdf..104ff8fcb170 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -55,6 +55,10 @@ adding `pkg-config`, `xfce4-dev-tools`, and `wrapGAppsHook3` to your `nativeBuildInputs` and `--enable-maintainer-mode` to your `configureFlags`. +- `albert` has been updated to the version 34.0.5. This release redesigns the query system to support stateful asynchronous handlers and infinite scrolling, and adds internationalized tokenization. + This update introduces several breaking changes: the Python plugin interface is now v5.0, the `PATH` plugin has been renamed to `Commandline`, and the QStylesheets-based widgets box model frontend has been removed. + For more information read the [changelog for 34.0.0](https://albertlauncher.github.io/2026/01/19/albert-v34.0.0-released/). + - `cargo-codspeed` has been updated from `3.0.5` to `4.2.0`. Version `4.0.0` includes breaking changes. For more information read the [changelog for 4.0.0](https://github.com/CodSpeedHQ/codspeed-rust/releases/tag/v4.0.0). - `corepack_latest` has been removed, as Corepack is no longer distributed with Node.js. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9576f2c6adf0..f4f2f8e6b9ff 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -28037,6 +28037,11 @@ githubId = 13259982; name = "Vanessa McHale"; }; + vmfunc = { + github = "vmfunc"; + githubId = 59031302; + name = "vmfunc"; + }; vncsb = { email = "viniciusbernardino1@hotmail.com"; github = "vncsb"; diff --git a/nixos/modules/services/networking/nm-file-secret-agent.nix b/nixos/modules/services/networking/nm-file-secret-agent.nix index 7078b998d575..f1cac3dd279d 100644 --- a/nixos/modules/services/networking/nm-file-secret-agent.nix +++ b/nixos/modules/services/networking/nm-file-secret-agent.nix @@ -24,6 +24,7 @@ let // lib.optionalAttrs (i.matchSetting != null) { match_setting = i.matchSetting; } + // lib.optionalAttrs (i.trim != null) { trim = i.trim; } ) cfg.ensureProfiles.secrets.entries; }; nmFileSecretAgentConfigFile = toml.generate "config.toml" nmFileSecretAgentConfig; @@ -108,6 +109,11 @@ in description = "file from which the secret value is read"; type = lib.types.str; }; + trim = lib.mkOption { + description = "whether leading and trailing whitespace should be stripped from the files content before being passed to NetworkManager"; + type = lib.types.nullOr lib.types.bool; + default = null; + }; }; } ); diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0539ea3e8ba5..eed80d2a358d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -959,13 +959,13 @@ "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0=" }, "newrelic_newrelic": { - "hash": "sha256-SfUTt9Ag6pBC9a8rJERBCbccKgJYdNiI1UXoptZoYdw=", + "hash": "sha256-R9xV26gr+jJnNm8hLl6xMdjSEm/U45Ph+IBAB8S4t5A=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.78.0", + "rev": "v3.79.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-RyGnUzRkIR0XoEPc/cc+40QACAJhvOMENzJc1T0Yz40=" + "vendorHash": "sha256-fh0QEWSwdoWKED/39OBT5kMADbsUDvhJUYMfWR9P5os=" }, "ns1-terraform_ns1": { "hash": "sha256-pKdybFzTuuD6D76Uhuz+fLN+EmpDxUwjIWXYK6DRKOY=", @@ -1031,13 +1031,13 @@ "vendorHash": "sha256-ofzbDmivXgH1i1Gjhpyp0bk3FDs5SnxwoRuNAWyMqyI=" }, "opentelekomcloud_opentelekomcloud": { - "hash": "sha256-Pco5/kiFOyqwjktDFgHgCtq/kVKshzZyp9cjT+mJYJs=", + "hash": "sha256-14JxQBGvqU6K8PxkZFK7rEetCjN5lKLGXwAOnHSaZ2E=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.36.57", + "rev": "v1.36.58", "spdx": "MPL-2.0", - "vendorHash": "sha256-v7t3W7v38xw7M8r9rdx+9cTUT6FFY4x5ujkVYD7qThw=" + "vendorHash": "sha256-gUilhKLjGR1P4JkQ6zkBJQUvrUcVSJlO1yzJdu3hBFA=" }, "opsgenie_opsgenie": { "hash": "sha256-Y67kcg/ovvZc22l1CBz0Mqu7DAIit5F0jQNfQrl2EGI=", diff --git a/pkgs/build-support/setup-hooks/cygwin-dll-link.sh b/pkgs/build-support/setup-hooks/cygwin-dll-link.sh index d5724794921d..a9309925e658 100644 --- a/pkgs/build-support/setup-hooks/cygwin-dll-link.sh +++ b/pkgs/build-support/setup-hooks/cygwin-dll-link.sh @@ -1,8 +1,11 @@ +# shellcheck shell=bash + addLinkDLLPaths() { - addToSearchPath "LINK_DLL_FOLDERS" "$1/lib" - addToSearchPath "LINK_DLL_FOLDERS" "$1/bin" + addToSearchPath "LINK_DLL_FOLDERS" "$1/lib" + addToSearchPath "LINK_DLL_FOLDERS" "$1/bin" } +# shellcheck disable=SC2154 addEnvHooks "$targetOffset" addLinkDLLPaths addOutputDLLPaths() { @@ -15,36 +18,37 @@ addOutputDLLPaths() { postInstallHooks+=(addOutputDLLPaths) _dllDeps() { - "$OBJDUMP" -p "$1" \ - | sed -n 's/.*DLL Name: \(.*\)/\1/p' \ - | sort -u + "$OBJDUMP" -p "$1" \ + | sed -n 's/.*DLL Name: \(.*\)/\1/p' \ + | sort -u } _linkDeps() { - local target="$1" dir="$2" check="$3" - echo 'target:' "$target" - local dll - _dllDeps "$target" | while read dll; do - echo ' dll:' "$dll" - if [[ -e "$dir/$dll" ]]; then continue; fi - # Locate the DLL - it should be an *executable* file on $LINK_DLL_FOLDERS. - local dllPath="$(PATH="$(dirname "$target"):$LINK_DLL_FOLDERS" type -P "$dll")" - if [[ -z "$dllPath" ]]; then - if [[ -z "$check" || -n "${allowedImpureDLLsMap[$dll]}" ]]; then - continue - fi - echo unable to find $dll in $LINK_DLL_FOLDERS >&2 - exit 1 - fi - echo ' linking to:' "$dllPath" - CYGWIN+=\ winsymlinks:nativestrict ln -sr "$dllPath" "$dir" - # That DLL might have its own (transitive) dependencies, - # so add also all DLLs from its directory to be sure. - _linkDeps "$dllPath" "$dir" "" - done + local target="$1" dir="$2" check="$3" + echo 'target:' "$target" + local dll + _dllDeps "$target" | while read -r dll; do + echo ' dll:' "$dll" + if [[ -e "$dir/$dll" ]]; then continue; fi + # Locate the DLL - it should be an *executable* file on $LINK_DLL_FOLDERS. + local dllPath + if ! dllPath="$(PATH="$(dirname "$target"):$LINK_DLL_FOLDERS" type -P "$dll")"; then + if [[ -z "$check" || -n "${allowedImpureDLLsMap[$dll]}" ]]; then + continue + fi + echo unable to find "$dll" in "$LINK_DLL_FOLDERS" >&2 + exit 1 + fi + echo ' linking to:' "$dllPath" + CYGWIN+=\ winsymlinks:nativestrict ln -sr "$dllPath" "$dir" + # That DLL might have its own (transitive) dependencies, + # so add also all DLLs from its directory to be sure. + _linkDeps "$dllPath" "$dir" "" + done } linkDLLs() { + # shellcheck disable=SC2154 if [ ! -d "$prefix" ]; then return; fi ( set -e diff --git a/pkgs/by-name/ab/abcm2ps/package.nix b/pkgs/by-name/ab/abcm2ps/package.nix index 04e1bc40be09..c86060ee167a 100644 --- a/pkgs/by-name/ab/abcm2ps/package.nix +++ b/pkgs/by-name/ab/abcm2ps/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchfossil, - fetchpatch2, docutils, pkg-config, freetype, @@ -12,24 +11,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "abcm2ps"; - version = "8.14.17"; + version = "8.14.18"; src = fetchfossil { url = "https://chiselapp.com/user/moinejf/repository/abcm2ps"; rev = "v${finalAttrs.version}"; - hash = "sha256-YA36wfj7owKu/KyWgCj6U8EJEh831cFtQj4/JtH6kVg="; + hash = "sha256-2nmKjLEZ9dTk+oE16gBm9iheVlLvQFvcdc5FPcxaq6M="; }; - patches = [ - # fix build with C23 - # 'bool' is a keyword with '-std=c23' onwards - # error: 'bool' cannot be used here - (fetchpatch2 { - url = "https://salsa.debian.org/debian/abcm2ps/-/raw/f741931567bb8cac8c9ed8e73b7ba838e4c17eb3/debian/patches/c23.diff"; - hash = "sha256-+2LuHqY5+nWykCYGEOazDeJAf9sggPNp2yiqMQRepfM="; - }) - ]; - configureFlags = [ "--INSTALL=install" ]; diff --git a/pkgs/by-name/al/albert/package.nix b/pkgs/by-name/al/albert/package.nix index e6a9f06ee7eb..8515d41ddf8b 100644 --- a/pkgs/by-name/al/albert/package.nix +++ b/pkgs/by-name/al/albert/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "albert"; - version = "33.0.1"; + version = "34.0.5"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; tag = "v${finalAttrs.version}"; - hash = "sha256-zHLyvFzLR7Ryk6eoD+Lp+w4bIj7MAeREK0YzRXYnx6c="; + hash = "sha256-DwFU3hb63Lf9Etr/I1lQ0SpkHfB1hRI+8V0ILk5a2C0="; fetchSubmodules = true; }; @@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + kdePackages.qcoro kdePackages.qtkeychain libqalculate libarchive diff --git a/pkgs/by-name/an/anonymousPro/package.nix b/pkgs/by-name/an/anonymous-pro-fonts/package.nix similarity index 82% rename from pkgs/by-name/an/anonymousPro/package.nix rename to pkgs/by-name/an/anonymous-pro-fonts/package.nix index 2936a9f0e402..652889132e9d 100644 --- a/pkgs/by-name/an/anonymousPro/package.nix +++ b/pkgs/by-name/an/anonymous-pro-fonts/package.nix @@ -4,13 +4,13 @@ fetchzip, }: -stdenvNoCC.mkDerivation rec { - pname = "anonymouspro"; +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "anonymous-pro-fonts"; version = "1.002"; src = fetchzip { url = "https://www.marksimonson.com/assets/content/fonts/AnonymousPro-${ - lib.replaceStrings [ "." ] [ "_" ] version + lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version }.zip"; hash = "sha256-FhyzV4By8XKN9EyukAknzml/7lUuV6Evnt6Ht3H6TUU="; }; @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec { runHook preInstall install -Dm644 *.ttf -t $out/share/fonts/truetype - install -Dm644 *.txt -t $out/share/doc/${pname}-${version} + install -Dm644 *.txt -t $out/share/doc/AnonymousPro-${finalAttrs.version} runHook postInstall ''; @@ -38,4 +38,4 @@ stdenvNoCC.mkDerivation rec { license = lib.licenses.ofl; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/an/antidote/package.nix b/pkgs/by-name/an/antidote/package.nix index df3014837a5b..84c045b187b9 100644 --- a/pkgs/by-name/an/antidote/package.nix +++ b/pkgs/by-name/an/antidote/package.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.9.11"; + version = "1.10.2"; pname = "antidote"; src = fetchFromGitHub { owner = "mattmc3"; repo = "antidote"; tag = "v${finalAttrs.version}"; - hash = "sha256-5vSScLtC8gbHW3rwPZL7ENwwblN7h2QovvWlewlRHAY="; + hash = "sha256-ZgdrVtDtskJeW/hqxkOOln3Ch2ILsYZatJpq/YN1A8o="; }; dontPatch = true; diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix index 64ac4b96483d..30876ddfce4a 100644 --- a/pkgs/by-name/ar/arrow-cpp/package.nix +++ b/pkgs/by-name/ar/arrow-cpp/package.nix @@ -304,6 +304,10 @@ stdenv.mkDerivation (finalAttrs: { # Failing with "run-test.sh: line 88: 63682 Abort trap: 6" "arrow-flight-internals-test" "arrow-flight-sql-test" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + # https://github.com/apache/arrow/issues/41505 + "TestAzuriteGeneric.Empty" ]; in '' diff --git a/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix b/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix index 5485302c5b60..40503484be57 100644 --- a/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix +++ b/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix @@ -1,15 +1,20 @@ { lib, bign-handheld-thumbnailer, + cargo, fetchFromGitHub, glib, + meson, + ninja, nix-update-script, pkg-config, rustPlatform, + rustc, + stdenv, testers, }: -rustPlatform.buildRustPackage (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "bign-handheld-thumbnailer"; version = "1.2.0"; @@ -20,14 +25,28 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-+iWf5ybCUHlZz3Ybw3bwLKzlsmiVwep2alVDvL9bG2A="; }; - cargoHash = "sha256-vfTbfg1CAbc//UZtI5trw6znqnNGy6AiCSQNE68vch8="; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-vfTbfg1CAbc//UZtI5trw6znqnNGy6AiCSQNE68vch8="; + }; strictDeps = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + cargo + meson + ninja + pkg-config + rustPlatform.cargoSetupHook + rustc + ]; buildInputs = [ glib ]; + mesonFlags = [ + "-Dupdate_mime_database=false" + ]; + passthru = { tests.version = testers.testVersion { package = bign-handheld-thumbnailer; diff --git a/pkgs/by-name/bl/blackshades/package.nix b/pkgs/by-name/bl/blackshades/package.nix index b26ecf1b0b17..7b38f01cfbc5 100644 --- a/pkgs/by-name/bl/blackshades/package.nix +++ b/pkgs/by-name/bl/blackshades/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-W6ltmWCw7jfiTiNlh60YVF7mz//8s+bgu4F9gy5cDgw="; }; - postUnpack = '' + postConfigure = '' ln -s ${ zig_0_14.fetchDeps { inherit (finalAttrs) diff --git a/pkgs/by-name/bl/blightmud/package.nix b/pkgs/by-name/bl/blightmud/package.nix index a07ceb831dc5..4b46277fb7ae 100644 --- a/pkgs/by-name/bl/blightmud/package.nix +++ b/pkgs/by-name/bl/blightmud/package.nix @@ -35,6 +35,10 @@ rustPlatform.buildRustPackage (finalAttrs: { ++ lib.optionals (withTTS && stdenv.hostPlatform.isLinux) [ speechd-minimal ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]; + env = lib.optionalAttrs (!stdenv.cc.isClang) { + NIX_CFLAGS_COMPILE = "-std=gnu17"; + }; + checkFlags = let # Most of Blightmud's unit tests pass without trouble in the isolated diff --git a/pkgs/by-name/bo/bold/package.nix b/pkgs/by-name/bo/bold/package.nix index b6892bc699a0..405fd0972745 100644 --- a/pkgs/by-name/bo/bold/package.nix +++ b/pkgs/by-name/bo/bold/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - postPatch = '' + postConfigure = '' ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p ''; diff --git a/pkgs/by-name/bo/bork/package.nix b/pkgs/by-name/bo/bork/package.nix index c2de996fe2af..76f48aa2607e 100644 --- a/pkgs/by-name/bo/bork/package.nix +++ b/pkgs/by-name/bo/bork/package.nix @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation { zigBuildFlags = [ "--release=fast" ]; - postPatch = '' + postConfigure = '' ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p ''; diff --git a/pkgs/by-name/ca/carp/package.nix b/pkgs/by-name/ca/carp/package.nix deleted file mode 100644 index 5325019c7785..000000000000 --- a/pkgs/by-name/ca/carp/package.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ - lib, - fetchFromGitHub, - fetchpatch, - makeWrapper, - clang, - haskellPackages, -}: - -haskellPackages.mkDerivation rec { - pname = "carp"; - version = "0.5.5"; - - src = fetchFromGitHub { - owner = "carp-lang"; - repo = "Carp"; - rev = "v${version}"; - sha256 = "sha256-B7SBzjegFzL2gGivIJE6BZcLD3f0Bsh8yndjScG2TZI="; - }; - - patches = [ - # Compat with GHC 9.2 / Stackage LTS 20, can be dropped at the next release - # https://github.com/carp-lang/Carp/pull/1449 - (fetchpatch { - name = "carp-lts-20.patch"; - url = "https://github.com/carp-lang/Carp/commit/25f50c92a57cc91b6cb4ec48df658439f936b641.patch"; - sha256 = "14yjv0hcvw1qyjmrhksrj6chac3n14d1f1gcaxldfa05llrbfqk0"; - }) - ]; - - # -Werror breaks build with GHC >= 9.0 - # https://github.com/carp-lang/Carp/issues/1386 - postPatch = '' - substituteInPlace CarpHask.cabal --replace "-Werror" "" - ''; - - buildTools = [ makeWrapper ]; - - executableHaskellDepends = with haskellPackages; [ - HUnit - blaze-markup - blaze-html - split - ansi-terminal - cmark - edit-distance - hashable - open-browser - optparse-applicative - ]; - - isExecutable = true; - - # The carp executable must know where to find its core libraries and other - # files. Set the environment variable CARP_DIR so that it points to the root - # of the Carp repo. See: - # https://github.com/carp-lang/Carp/blob/master/docs/Install.md#setting-the-carp_dir - # - # Also, clang must be available run-time because carp is compiled to C which - # is then compiled with clang. - postInstall = '' - wrapProgram $out/bin/carp \ - --set CARP_DIR $src \ - --prefix PATH : ${clang}/bin - wrapProgram $out/bin/carp-header-parse \ - --set CARP_DIR $src \ - --prefix PATH : ${clang}/bin - ''; - - description = "Statically typed lisp, without a GC, for real-time applications"; - homepage = "https://github.com/carp-lang/Carp"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ jluttine ]; - # Not actively maintained at the moment - broken = true; - - # Windows not (yet) supported. - platforms = with lib.platforms; unix ++ darwin; -} diff --git a/pkgs/by-name/ca/cava/package.nix b/pkgs/by-name/ca/cava/package.nix index 39419c786b6d..51cc64eced1f 100644 --- a/pkgs/by-name/ca/cava/package.nix +++ b/pkgs/by-name/ca/cava/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cava"; - version = "0.10.6"; + version = "0.10.7"; src = fetchFromGitHub { owner = "karlstav"; repo = "cava"; - rev = finalAttrs.version; - hash = "sha256-dWPW9vd9LdGALt7Po4nZnW5HkivtZcIUBlXEFurq2os="; + tag = finalAttrs.version; + hash = "sha256-eOGUDGGlja5Cq8XTJFRqyP6qyaoxOJm09vZrlk4KS9k="; }; buildInputs = [ diff --git a/pkgs/by-name/cl/cloc/package.nix b/pkgs/by-name/cl/cloc/package.nix index 520ad324e978..b9faaaa2fa16 100644 --- a/pkgs/by-name/cl/cloc/package.nix +++ b/pkgs/by-name/cl/cloc/package.nix @@ -7,7 +7,7 @@ }: let - version = "2.06"; + version = "2.08"; in stdenv.mkDerivation { pname = "cloc"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { owner = "AlDanial"; repo = "cloc"; rev = "v${version}"; - sha256 = "sha256-u/qIkoN8xFA/aggjbSfVHbhUvRo6fWqcJWSMO/Q0hQo="; + sha256 = "sha256-FRby6mhaeTPU0G0rEDszfrTMcrNviFmjbJ8jJnjaZN4="; }; setSourceRoot = '' diff --git a/pkgs/by-name/co/comodoro/package.nix b/pkgs/by-name/co/comodoro/package.nix index 1ab5f9f99035..0faa8a3a2192 100644 --- a/pkgs/by-name/co/comodoro/package.nix +++ b/pkgs/by-name/co/comodoro/package.nix @@ -11,21 +11,25 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "comodoro"; - version = "0.0.10"; + version = "0.1.2"; src = fetchFromGitHub { owner = "soywod"; repo = "comodoro"; rev = "v${finalAttrs.version}"; - hash = "sha256-Y9SuxqI8wvoF0+X6CLNDlSFCwlSU8R73NYF/LjACP18="; + hash = "sha256-FnNNJ6WHR8KCsW+1hPIYddxQlUvpPc+SRbaxAcdVEUk="; }; - cargoHash = "sha256-HzutYDphJdhNJ/jwyA5KVYr6fIutf73rYzKxrzVki9k="; + cargoHash = "sha256-2Drty/dj9HCG86rPt4RgexU83vKMnGFETbOT11Puy/0="; nativeBuildInputs = lib.optional (installManPages || installShellCompletions) installShellFiles; buildNoDefaultFeatures = true; - buildFeatures = lib.optional withTcp "tcp"; + buildFeatures = [ + "hook-command" + "hook-notify" + ] + ++ lib.optional withTcp "tcp"; postInstall = lib.optionalString installManPages '' diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index c68775de7da8..309de26f8bce 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -8,6 +8,7 @@ yq, protobuf, installShellFiles, + makeBinaryWrapper, librusty_v8 ? callPackage ./librusty_v8.nix { inherit (callPackage ./fetchers.nix { }) fetchLibrustyV8; }, @@ -67,6 +68,7 @@ rustPlatform.buildRustPackage (finalAttrs: { # required by deno_kv crate protobuf installShellFiles + makeBinaryWrapper ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ lld ]; @@ -215,6 +217,9 @@ rustPlatform.buildRustPackage (finalAttrs: { postInstall = '' # Remove non-essential binaries like denort and test_server find $out/bin/* -not -name "deno" -delete + + # Do what `deno x --install-alias` would do (it doesn't work with Nix-packaged Deno) + makeBinaryWrapper $out/bin/deno $out/bin/dx --add-flags "x" '' + lib.optionalString canExecute '' installShellCompletion --cmd deno \ diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix index 6a88569550ba..0579c318570d 100644 --- a/pkgs/by-name/do/doublecmd/package.nix +++ b/pkgs/by-name/do/doublecmd/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; - version = "1.1.32"; + version = "1.2.1"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; tag = "v${finalAttrs.version}"; - hash = "sha256-9HhFUzj9cSH49Y5mG4V6BDcr5tlQiBd5OW9xlUWrVmI="; + hash = "sha256-/R13Fwn3019uy+UUtih/CLiXHpFBSKKKKVYdOp29eXs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix index 214565596c21..e2248b3dc513 100644 --- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix +++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix @@ -1,7 +1,7 @@ { mkDprintPlugin }: mkDprintPlugin { description = "Biome (JS/TS/JSON) wrapper plugin"; - hash = "sha256-C25GgxvZVRhmjEdoMkDy8mV9wD/Gu9OK7fCs4kQiQdk="; + hash = "sha256-LaByLZ0y+/kqo2+Yfk0WD6/DMUaS9vkkqnTCQwKwujY="; initConfig = { configExcludes = [ "**/node_modules" ]; configKey = "biome"; @@ -17,6 +17,6 @@ mkDprintPlugin { }; pname = "dprint-plugin-biome"; updateUrl = "https://plugins.dprint.dev/dprint/biome/latest.json"; - url = "https://plugins.dprint.dev/biome-0.11.12.wasm"; - version = "0.11.12"; + url = "https://plugins.dprint.dev/biome-0.11.13.wasm"; + version = "0.11.13"; } diff --git a/pkgs/by-name/du/duckdb/versions.json b/pkgs/by-name/du/duckdb/versions.json index 17ef05c73cd5..c570a27d61ca 100644 --- a/pkgs/by-name/du/duckdb/versions.json +++ b/pkgs/by-name/du/duckdb/versions.json @@ -1,6 +1,6 @@ { - "version": "1.4.3", - "rev": "d1dc88f950d456d72493df452dabdcd13aa413dd", - "hash": "sha256-zYiyY/8mYCyKuSQYNxepGbZPVgdCgULLmhZlWAAW0QA=", - "python_hash": "sha256-qq8y1rdNixQ6oqjKtmIj8IG52gypmP3Qu9ldojPr+Cg=" + "version": "1.4.4", + "rev": "6ddac802ffa9bcfbcc3f5f0d71de5dff9b0bc250", + "hash": "sha256-h9Mldv29u47DnFOCN28HBHWz8daFGE/Nj1JcnNhhQ5Q=", + "python_hash": "sha256-860KbaM7Ojp4Qwm5x5WPQg176XKOYayk8pLVaUAuC4M=" } diff --git a/pkgs/by-name/ed/eduke32/package.nix b/pkgs/by-name/ed/eduke32/package.nix index c5b324ae13dc..afd2cb120202 100644 --- a/pkgs/by-name/ed/eduke32/package.nix +++ b/pkgs/by-name/ed/eduke32/package.nix @@ -27,14 +27,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "eduke32"; - version = "0-unstable-2025-10-17"; + version = "0-unstable-2026-02-03"; src = fetchFromGitLab { domain = "voidpoint.io"; owner = "terminx"; repo = "eduke32"; - rev = "227c11dee0abaa57bbc22b06f0002e064efa7191"; - hash = "sha256-bWty/eOq5dWltNREo9ba68pWDpBxOIfjJK1EtZ27l1U="; + rev = "ba6b7bb1d50d7db820ec03d9bbd66404fab5c543"; + hash = "sha256-hD8j2YahEWLNgeATL7ZPwU0ovjwMSmzYdDYgMHKQLTw="; deepClone = true; leaveDotGit = true; postFetch = '' diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix index b050554f54cc..909fe9d18880 100644 --- a/pkgs/by-name/ex/exploitdb/package.nix +++ b/pkgs/by-name/ex/exploitdb/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "exploitdb"; - version = "2026-02-03"; + version = "2026-02-05"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; tag = finalAttrs.version; - hash = "sha256-NEav9U7rqPRtDTZPRIP7UTa/cbbRRz5G2YOWZmAabO8="; + hash = "sha256-ec5XB+L/4qRErK/0VOsidkor52aBjuR87ja3V7C3YSw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/fa/fabs/package.nix b/pkgs/by-name/fa/fabs/package.nix deleted file mode 100644 index dd314063a0ca..000000000000 --- a/pkgs/by-name/fa/fabs/package.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - lib, - fetchFromGitHub, - perl, - python3, - sqlite, -}: - -python3.pkgs.buildPythonApplication rec { - pname = "fabs"; - version = "1.1"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "openafs-contrib"; - repo = "fabs"; - rev = "v${version}"; - hash = "sha256-ejAcCwrOWGX0zsMw224f9GTWlozNYC0gU6LdTk0XqH0="; - }; - - nativeBuildInputs = [ - perl - ]; - - propagatedBuildInputs = with python3.pkgs; [ - alembic - python-dateutil - pyyaml - setuptools - sqlalchemy - ]; - - outputs = [ - "out" - "man" - ]; - - preBuild = '' - export PREFIX=$out - ''; - - LOCALSTATEDIR = "/var"; - LOCKDIR = "/run/lock/fabs"; - - preInstall = '' - mkdir -p "$out/etc" - cp -t "$out/etc" -r etc/fabs - ''; - - # remove once sqlalchemy backend no longer uses deprecated methods - SQLALCHEMY_SILENCE_UBER_WARNING = 1; - - nativeCheckInputs = [ - python3.pkgs.pytestCheckHook - sqlite - ]; - - meta = { - outputsToInstall = [ - "out" - "man" - ]; - mainProgram = "fabsys"; - description = "Flexible AFS Backup System for the OpenAFS distributed file system"; - homepage = "https://github.com/openafs-contrib/fabs"; - license = with lib.licenses; [ isc ]; - maintainers = with lib.maintainers; [ spacefrogg ]; - broken = lib.versionAtLeast python3.pkgs.sqlalchemy.version "2.0"; - badPlatforms = [ - "x86_64-darwin" - "aarch64-darwin" - ]; - }; -} diff --git a/pkgs/by-name/fa/fancy-cat/package.nix b/pkgs/by-name/fa/fancy-cat/package.nix index 09e69e28712d..f9edf039d3e9 100644 --- a/pkgs/by-name/fa/fancy-cat/package.nix +++ b/pkgs/by-name/fa/fancy-cat/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { libz ]; - postPatch = '' + postConfigure = '' ln -s ${callPackage ./build.zig.zon.nix { }} $ZIG_GLOBAL_CACHE_DIR/p ''; diff --git a/pkgs/by-name/fl/flow-control/package.nix b/pkgs/by-name/fl/flow-control/package.nix index 159ad3f3a4ca..a6030765597d 100644 --- a/pkgs/by-name/fl/flow-control/package.nix +++ b/pkgs/by-name/fl/flow-control/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { tag = "v${finalAttrs.version}"; hash = "sha256-868FK3wr/fjXzrQJ4YVDBvzNuX818lufEx/K0fvJdWo="; }; - postPatch = '' + postConfigure = '' ln -s ${ callPackage ./build.zig.zon.nix { zig = zig_0_15; diff --git a/pkgs/by-name/fo/forgejo-mcp/package.nix b/pkgs/by-name/fo/forgejo-mcp/package.nix index 78fa7334837c..7bd1c675419c 100644 --- a/pkgs/by-name/fo/forgejo-mcp/package.nix +++ b/pkgs/by-name/fo/forgejo-mcp/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "forgejo-mcp"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromCodeberg { owner = "goern"; repo = "forgejo-mcp"; tag = "v${finalAttrs.version}"; - hash = "sha256-9H4UQIKRsmKifE9CGvtlkmwMfdsmczUmPckNVJwJqco="; + hash = "sha256-9++EewwF2zxdYCwDdNVX/7liiHZNR1rmM0Z7w5r4v5k="; }; - vendorHash = "sha256-AfQGVq6xeNC+01FdPGqDWvIVXMEp7B6SjAnbswuDdu0="; + vendorHash = "sha256-THdbGlinpH6ZtVveFEN/wy8ITG6pC+Zs6Leyx+2/hqI="; ldflags = [ "-s" diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index 16fde0536cb1..21988b9c6d40 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -49,14 +49,14 @@ let in buildGoModule (finalAttrs: { pname = "forgejo-runner"; - version = "12.6.3"; + version = "12.6.4"; src = fetchFromGitea { domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${finalAttrs.version}"; - hash = "sha256-YBPUxKFHB6eqYyDAFBEbVVTLe5tfHwtLYfR+uCU73hc="; + hash = "sha256-v+b1YGUoIwzSGYUq/aUc5DceKUqWm0LA1Fd1/X/rf5w="; }; vendorHash = "sha256-MrumzEpSuLVmtrySnlI7Nb7GqxmW8Yk9agsaH4HA6QU="; diff --git a/pkgs/by-name/fr/freenet/package.nix b/pkgs/by-name/fr/freenet/package.nix index 0fd742f85905..5b09efaafd89 100644 --- a/pkgs/by-name/fr/freenet/package.nix +++ b/pkgs/by-name/fr/freenet/package.nix @@ -36,13 +36,13 @@ let in stdenv.mkDerivation rec { pname = "freenet"; - version = "01504"; + version = "01505"; src = fetchFromGitHub { owner = "hyphanet"; repo = "fred"; tag = "build${version}"; - hash = "sha256-a+yRsJ4+gi2UiVeWLsbTgFbzekCSnOJO++9fLVWX0C0="; + hash = "sha256-0ffYQ+8hZqFLjMk6A2rapKZsz/lZNpbG6K0wDqBSdY8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ge/geant4/datasets.nix b/pkgs/by-name/ge/geant4/datasets.nix index 304c070a206c..87e9a9d62c6a 100644 --- a/pkgs/by-name/ge/geant4/datasets.nix +++ b/pkgs/by-name/ge/geant4/datasets.nix @@ -59,15 +59,15 @@ builtins.listToAttrs ( { pname = "G4EMLOW"; - version = "8.6.1"; - sha256 = "sha256-SpNYjSYIDOHTNrlPdvravkkF+48cuiQVeVAj1s2PSoo="; + version = "8.8"; + sha256 = "sha256-tgz9YxdvXRYQfiols1sjUVUDLRc110lnDKUP7eEmJM8="; envvar = "LE"; } { pname = "G4PhotonEvaporation"; - version = "6.1"; - sha256 = "sha256-X/wfmagdUMkCAYbVmHSvc8U7okwYQrO4KzGIIjuyRvI="; + version = "6.1.2"; + sha256 = "sha256-AhScCrkdiO4k54UyVYd345oGi5/N0ZkTYQH/WOY150I="; envvar = "LEVELGAMMA"; } @@ -87,8 +87,8 @@ builtins.listToAttrs ( { pname = "G4PARTICLEXS"; - version = "4.1"; - sha256 = "sha256-B64eBI6ayOf5H2aWSX3VW9UMzIItl68aC56SMhKm19E="; + version = "4.2"; + sha256 = "sha256-xSu/hqqlibeKuoCxarCt8QQeowDeU5WGW5f87m61WFE="; envvar = "PARTICLEXS"; } @@ -101,8 +101,8 @@ builtins.listToAttrs ( { pname = "G4INCL"; - version = "1.2"; - sha256 = "sha256-+ICxYHPuCpLXSU8ydqbVLU3h02d6DUx8WHADlu0OGn4="; + version = "1.3"; + sha256 = "sha256-5LPb5SrO9TU2RU4iRDCRIShDghvSNiju2EbSmVmfO/k="; envvar = "INCL"; } @@ -136,8 +136,8 @@ builtins.listToAttrs ( { pname = "G4CHANNELING"; - version = "1.0"; - sha256 = "sha256-ID48aZhMoJrNGBodMamw76+tS8EubGCPCwXmlRINZ/I="; + version = "2.0"; + sha256 = "sha256-ZiFZKIZE4Ht51/4JHvvrulK1lUaz3G9dKFuXatEvLQY="; envvar = "CHANNELING"; } diff --git a/pkgs/by-name/ge/geant4/package.nix b/pkgs/by-name/ge/geant4/package.nix index f62e4c0c4db6..f31bc82a0cf8 100644 --- a/pkgs/by-name/ge/geant4/package.nix +++ b/pkgs/by-name/ge/geant4/package.nix @@ -17,7 +17,7 @@ libxpm, motif, python3, - qt5, + qt6, soxt, xercesc, zlib, @@ -38,12 +38,12 @@ let in stdenv.mkDerivation (finalAttrs: { - version = "11.3.2"; + version = "11.4.0"; pname = "geant4"; src = fetchurl { url = "https://cern.ch/geant4-data/releases/geant4-v${finalAttrs.version}.tar.gz"; - hash = "sha256-iSrt10JSYqUKw9PHEX2BwMDaS0CMaIDbr1R4uTAeSIw="; + hash = "sha256-rWTJa4s9cSXnRruX9fVXee1ZRoGmpdY8JwJefJzvWPo="; }; # Fix broken paths in a .pc @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - propagatedNativeBuildInputs = lib.optionals enableQt [ qt5.wrapQtAppsHook ]; + propagatedNativeBuildInputs = lib.optionals enableQt [ qt6.wrapQtAppsHook ]; dontWrapQtApps = true; # no binaries buildInputs = @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { libx11 ] ++ lib.optionals enableXM [ motif ] - ++ lib.optionals enableQt [ qt5.qtbase ]; + ++ lib.optionals enableQt [ qt6.qtbase ]; postFixup = '' substituteInPlace "$out"/bin/geant4.sh \ diff --git a/pkgs/by-name/gi/git-sim/package.nix b/pkgs/by-name/gi/git-sim/package.nix index 9fe4ab882feb..373a2fb31115 100644 --- a/pkgs/by-name/gi/git-sim/package.nix +++ b/pkgs/by-name/gi/git-sim/package.nix @@ -11,15 +11,9 @@ packageOverrides ? self: super: { }, }: let - defaultOverrides = [ - (self: super: { - av = self.av_13; - }) - ]; - python = python3.override { self = python; - packageOverrides = lib.composeManyExtensions (defaultOverrides ++ [ packageOverrides ]); + packageOverrides = lib.composeManyExtensions [ packageOverrides ]; }; version = "0.3.5"; diff --git a/pkgs/by-name/gp/gptfdisk/package.nix b/pkgs/by-name/gp/gptfdisk/package.nix index 84dc03d3003d..d64d89b922c8 100644 --- a/pkgs/by-name/gp/gptfdisk/package.nix +++ b/pkgs/by-name/gp/gptfdisk/package.nix @@ -7,6 +7,7 @@ icu, ncurses, nixosTests, + installShellFiles, }: stdenv.mkDerivation (finalAttrs: { @@ -20,6 +21,10 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-Kr7WG8bSuexJiXPARAuLgEt6ctcUQGm1qSCbKtaTooI="; }; + nativeBuildInputs = [ + installShellFiles + ]; + postPatch = '' patchShebangs gdisk_test.sh '' @@ -47,15 +52,18 @@ stdenv.mkDerivation (finalAttrs: { ]; installPhase = '' - mkdir -p $out/sbin - mkdir -p $out/share/man/man8 for prog in gdisk sgdisk fixparts cgdisk do - install -v -m755 $prog $out/sbin - install -v -m644 $prog.8 $out/share/man/man8 + installBin $prog + installManPage $prog.8 done ''; + outputs = [ + "out" + "man" + ]; + passthru.tests = lib.optionalAttrs stdenv.hostPlatform.isx86 { installer-simpleLabels = nixosTests.installer.simpleLabels; }; diff --git a/pkgs/by-name/he/hevi/package.nix b/pkgs/by-name/he/hevi/package.nix index 91c72dda0583..b1a6bae5167b 100644 --- a/pkgs/by-name/he/hevi/package.nix +++ b/pkgs/by-name/he/hevi/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { zig ]; - postPatch = '' + postConfigure = '' ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p ''; diff --git a/pkgs/by-name/he/heynote/package.nix b/pkgs/by-name/he/heynote/package.nix index 4f26a0393107..f83fd9aae82d 100644 --- a/pkgs/by-name/he/heynote/package.nix +++ b/pkgs/by-name/he/heynote/package.nix @@ -7,11 +7,11 @@ }: let pname = "heynote"; - version = "2.7.2"; + version = "2.8.0"; src = fetchurl { url = "https://github.com/heyman/heynote/releases/download/v${version}/Heynote_${version}_x86_64.AppImage"; - sha256 = "sha256-MEMZAWmLGdLZxBb/XPEJl8l3RriCfUH4Ogqs4GL0lAw="; + sha256 = "sha256-XZMG7MDNcJqO//PvACczL+ydy729rh860KmtONhrUQE="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/ho/homebridge/package.nix b/pkgs/by-name/ho/homebridge/package.nix index c57be458bbf2..b73996a2bdb6 100644 --- a/pkgs/by-name/ho/homebridge/package.nix +++ b/pkgs/by-name/ho/homebridge/package.nix @@ -7,16 +7,16 @@ buildNpmPackage (finalAttrs: { pname = "homebridge"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = "homebridge"; repo = "homebridge"; tag = "v${finalAttrs.version}"; - hash = "sha256-E21HowCRD78MZW3+um6vN5/NLncF/bt9v/Tw+RYe5xM="; + hash = "sha256-6w2SDnP7P89j3/oLR77D0ubOzDb93krrRJQsDrhPTR4="; }; - npmDepsHash = "sha256-Da64zHwvX0W1viNhy4afr60onlWqbizaVox9Un6c65Y="; + npmDepsHash = "sha256-m6ZLwDyWEwll7PYRHREThj+SvkfCNgODrpo8DTk6j8w="; # Homebridge's clean phase attempts to install rimraf directly, which fails in nix builds # rimraf is already in the declared dependencies, so we just don't need to do it. diff --git a/pkgs/by-name/in/infamousPlugins/package.nix b/pkgs/by-name/in/infamousplugins/package.nix similarity index 98% rename from pkgs/by-name/in/infamousPlugins/package.nix rename to pkgs/by-name/in/infamousplugins/package.nix index 483fdaddfd72..89bad210bd0f 100644 --- a/pkgs/by-name/in/infamousPlugins/package.nix +++ b/pkgs/by-name/in/infamousplugins/package.nix @@ -16,7 +16,7 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "infamousPlugins"; + pname = "infamousplugins"; version = "0.3.2"; src = fetchFromGitHub { diff --git a/pkgs/by-name/in/inkcut/package.nix b/pkgs/by-name/in/inkcut/package.nix index d10fdd048c99..7340d8c04da5 100644 --- a/pkgs/by-name/in/inkcut/package.nix +++ b/pkgs/by-name/in/inkcut/package.nix @@ -1,10 +1,9 @@ { lib, - fetchpatch, python3, fetchFromGitHub, - qt5, cups, + qt6, }: python3.pkgs.buildPythonApplication rec { @@ -24,7 +23,9 @@ python3.pkgs.buildPythonApplication rec { --replace-fail ", 'lpr', " ", '${cups}/bin/lpr', " ''; - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + nativeBuildInputs = [ qt6.wrapQtAppsHook ]; + + buildInputs = [ qt6.qtbase ]; build-system = with python3.pkgs; [ setuptools ]; @@ -37,7 +38,7 @@ python3.pkgs.buildPythonApplication rec { pyserial pycups qtconsole - pyqt5 + pyqt6 ]; # QtApplication.instance() does not work during tests? diff --git a/pkgs/by-name/in/intiface-central/package.nix b/pkgs/by-name/in/intiface-central/package.nix index 1b557af51573..7d0f211678ca 100644 --- a/pkgs/by-name/in/intiface-central/package.nix +++ b/pkgs/by-name/in/intiface-central/package.nix @@ -1,7 +1,8 @@ { lib, + stdenv, fetchFromGitHub, - flutter332, + flutter338, corrosion, rustPlatform, cargo, @@ -12,6 +13,9 @@ copyDesktopItems, makeDesktopItem, runCommand, + writeText, + pkg-config, + dbus, }: let @@ -23,16 +27,52 @@ let pname = "intiface-central"; - version = "2.6.8-unstable-2025-09-14"; + version = "3.0.0"; src = fetchFromGitHub { owner = "intiface"; repo = "intiface-central"; - rev = "17877c623ad7e47fccfbb0acd6d191d672dc5053"; - hash = "sha256-sXvV3T/3Po2doDWXxiiJhAbQidwPPTS5300tEbgP83g="; + tag = "v${version}"; + hash = "sha256-yKWaXkSjg7LMIKIeRfviu4SmStxl9BSXncJSxXJeU0Y="; + }; + + rustDep = rustPlatform.buildRustPackage { + inherit pname version src; + + sourceRoot = "${src.name}/rust"; + + preBuild = '' + chmod +w ../.. + ln -s ${buttplug} ../../buttplug + ''; + + cargoHash = "sha256-HpmGmMMocLQ5/DJq8PJ5u04DipSlrReJ/3l76L9j8Yk="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + dbus + udev + ]; + + passthru.libraryPath = "lib/librust_lib_intiface_central.so"; + }; + + buttplug_dart = fetchFromGitHub { + owner = "buttplugio"; + repo = "buttplug_dart"; + tag = "v1.0.0-beta1"; + hash = "sha256-cJJU/DRTuQawdfi0aMyi7Vfmv4GtUj7nEBRNYEuZ8JQ="; + }; + + buttplug = fetchFromGitHub { + owner = "buttplugio"; + repo = "buttplug"; + tag = "intiface_engine-4.0.0"; + hash = "sha256-F3mMQviTeyw9Wlrf8vcbJ9oGTYoKCIpPbj2jayQlpeg="; }; in -flutter332.buildFlutterApplication { +flutter338.buildFlutterApplication { inherit pname version src; patches = [ @@ -41,13 +81,45 @@ flutter332.buildFlutterApplication { pubspecLock = lib.importJSON ./pubspec.lock.json; + gitHashes.buttplug = "sha256-nm9TdEL9+80hCbaPnpAJTQ0w1t40vWYcxyilQTwvEBU="; + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - sourceRoot = "${src.name}/intiface-engine-flutter-bridge"; - hash = "sha256-S+TonMTj3xb9oVo17hfjbl448pEvR+3sTTI8ePFjYXk="; + sourceRoot = "${src.name}/rust"; + hash = rustDep.cargoHash; }; - cargoRoot = "intiface-engine-flutter-bridge"; + cargoRoot = "rust"; + + customSourceBuilders = { + rust_lib_intiface_central = + { version, src, ... }: + stdenv.mkDerivation { + pname = "rust_lib_intiface_central"; + inherit version src; + inherit (src) passthru; + + postPatch = + let + fakeCargokitCmake = writeText "FakeCargokit.cmake" '' + function(apply_cargokit target manifest_dir lib_name any_symbol_name) + set("''${target}_cargokit_lib" ${rustDep}/${rustDep.passthru.libraryPath} PARENT_SCOPE) + endfunction() + ''; + in + '' + cp ${fakeCargokitCmake} rust_builder/cargokit/cmake/cargokit.cmake + ''; + + installPhase = '' + runHook preInstall + + cp -r . "$out" + + runHook postInstall + ''; + }; + }; preConfigure = '' export CMAKE_PREFIX_PATH="${corrosion}:$CMAKE_PREFIX_PATH" @@ -68,6 +140,12 @@ flutter332.buildFlutterApplication { env.ZLIB_ROOT = zlib-root; + preBuild = '' + chmod +w .. + ln -s ${buttplug_dart} ../buttplug_dart + ln -s ${buttplug} ../buttplug + ''; + # without this, only the splash screen will be shown and the logs will contain the # line `Failed to load dynamic library 'lib/libintiface_engine_flutter_bridge.so'` extraWrapProgramArgs = "--chdir $out/app/intiface-central"; diff --git a/pkgs/by-name/in/intiface-central/pubspec.lock.json b/pkgs/by-name/in/intiface-central/pubspec.lock.json index 9e5b366d4c88..983ededca624 100644 --- a/pkgs/by-name/in/intiface-central/pubspec.lock.json +++ b/pkgs/by-name/in/intiface-central/pubspec.lock.json @@ -4,31 +4,31 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f", + "sha256": "c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d", "url": "https://pub.dev" }, "source": "hosted", - "version": "82.0.0" + "version": "91.0.0" }, "analyzer": { "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "f4c21c94eb4623b183c1014a470196b3910701bea9b926e6c91270d756e6fc60", + "sha256": "f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.4.1" + "version": "8.4.1" }, "archive": { "dependency": "transitive", "description": { "name": "archive", - "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.6.1" + "version": "4.0.7" }, "args": { "dependency": "transitive", @@ -54,11 +54,11 @@ "dependency": "direct main", "description": { "name": "bloc", - "sha256": "52c10575f4445c61dd9e0cafcc6356fdd827c4c64dd7945ef3c4105f6b6ac189", + "sha256": "a48653a82055a900b88cd35f92429f068c5a8057ae9b136d197b3d56c57efb81", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.0.0" + "version": "9.2.0" }, "boolean_selector": { "dependency": "transitive", @@ -84,71 +84,51 @@ "dependency": "transitive", "description": { "name": "build", - "sha256": "cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0", + "sha256": "c1668065e9ba04752570ad7e038288559d1e2ca5c6d0131c0f5f55e39e777413", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "4.0.3" }, "build_cli_annotations": { "dependency": "transitive", "description": { "name": "build_cli_annotations", - "sha256": "b59d2769769efd6c9ff6d4c4cede0be115a566afc591705c2040b707534b1172", + "sha256": "e563c2e01de8974566a1998410d3f6f03521788160a02503b0b1f1a46c7b3d95", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.1" }, "build_config": { "dependency": "transitive", "description": { "name": "build_config", - "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33", + "sha256": "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "1.2.0" }, "build_daemon": { "dependency": "transitive", "description": { "name": "build_daemon", - "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa", + "sha256": "bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.4" - }, - "build_resolvers": { - "dependency": "transitive", - "description": { - "name": "build_resolvers", - "sha256": "b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.4" + "version": "4.1.1" }, "build_runner": { "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "74691599a5bc750dc96a6b4bfd48f7d9d66453eab04c7f4063134800d6a5c573", + "sha256": "110c56ef29b5eb367b4d17fc79375fa8c18a6cd7acd92c05bb3986c17a079057", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.14" - }, - "build_runner_core": { - "dependency": "transitive", - "description": { - "name": "build_runner_core", - "sha256": "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "8.0.0" + "version": "2.10.4" }, "built_collection": { "dependency": "transitive", @@ -164,21 +144,22 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4", + "sha256": "426cf75afdb23aa74bd4e471704de3f9393f3c7b04c1e2d9c6f1073ae0b8b139", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.5" + "version": "8.12.1" }, "buttplug": { "dependency": "direct main", "description": { - "name": "buttplug", - "sha256": "781dbb86547ec08322b1d219c2078d676f472ed796fe993a0a8e9152073fc678", - "url": "https://pub.dev" + "path": ".", + "ref": "6d91665", + "resolved-ref": "6d91665a3e5faa389e9a626c9b0bb79c6f126d57", + "url": "https://github.com/buttplugio/buttplug_dart.git" }, - "source": "hosted", - "version": "0.0.4" + "source": "git", + "version": "1.0.0" }, "characters": { "dependency": "transitive", @@ -194,11 +175,11 @@ "dependency": "transitive", "description": { "name": "checked_yaml", - "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.3" + "version": "2.0.4" }, "cli_util": { "dependency": "transitive", @@ -224,11 +205,11 @@ "dependency": "transitive", "description": { "name": "code_builder", - "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e", + "sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.10.1" + "version": "4.11.0" }, "collection": { "dependency": "transitive", @@ -264,11 +245,11 @@ "dependency": "transitive", "description": { "name": "crypto", - "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", + "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.6" + "version": "3.0.7" }, "cupertino_icons": { "dependency": "direct main", @@ -284,11 +265,11 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "27eb0ae77836989a3bc541ce55595e8ceee0992807f14511552a898ddd0d88ac", + "sha256": "a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.1.3" }, "dbus": { "dependency": "transitive", @@ -304,21 +285,21 @@ "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "77f757b789ff68e4eaf9c56d1752309bd9f7ad557cb105b938a7f8eb89e59110", + "sha256": "4df8babf73058181227e18b08e6ea3520cf5fc5d796888d33b7cb0f33f984b7c", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.1.2" + "version": "12.3.0" }, "device_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "device_info_plus_platform_interface", - "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2", + "sha256": "e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.2" + "version": "7.0.3" }, "discord_rich_presence": { "dependency": "direct main", @@ -350,16 +331,6 @@ "source": "hosted", "version": "2.0.7" }, - "fake_async": { - "dependency": "transitive", - "description": { - "name": "fake_async", - "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.3" - }, "ffi": { "dependency": "direct main", "description": { @@ -374,11 +345,11 @@ "dependency": "direct dev", "description": { "name": "ffigen", - "sha256": "3a80687577e7e51ba915114742f389a128e8aa241c52ce69a0f70aecb8e14365", + "sha256": "b7803707faeec4ce3c1b0c2274906504b796e3b70ad573577e72333bd1c9b3ba", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.0.1" + "version": "20.1.1" }, "file": { "dependency": "transitive", @@ -410,71 +381,41 @@ "dependency": "direct main", "description": { "name": "flutter_bloc", - "sha256": "1046d719fbdf230330d3443187cc33cc11963d15c9089f6cc56faa42a4c5f0cc", + "sha256": "cf51747952201a455a1c840f8171d273be009b932c75093020f9af64f2123e38", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.1.0" + "version": "9.1.1" }, "flutter_foreground_task": { "dependency": "direct main", "description": { "name": "flutter_foreground_task", - "sha256": "4962ffefe4352435900eb25734925f1ad002abf48e13c1ca22c9c63391be4f94", + "sha256": "48ea45056155a99fb30b15f14f4039a044d925bc85f381ed0b2d3b00a60b99de", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.7.0" + "version": "9.2.0" }, "flutter_launcher_icons": { "dependency": "direct dev", "description": { "name": "flutter_launcher_icons", - "sha256": "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea", + "sha256": "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.13.1" + "version": "0.14.4" }, "flutter_lints": { "dependency": "direct dev", "description": { "name": "flutter_lints", - "sha256": "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1", + "sha256": "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.2" - }, - "flutter_local_notifications": { - "dependency": "direct main", - "description": { - "name": "flutter_local_notifications", - "sha256": "674173fd3c9eda9d4c8528da2ce0ea69f161577495a9cc835a2a4ecd7eadeb35", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "17.2.4" - }, - "flutter_local_notifications_linux": { - "dependency": "transitive", - "description": { - "name": "flutter_local_notifications_linux", - "sha256": "c49bd06165cad9beeb79090b18cd1eb0296f4bf4b23b84426e37dd7c027fc3af", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.1" - }, - "flutter_local_notifications_platform_interface": { - "dependency": "transitive", - "description": { - "name": "flutter_local_notifications_platform_interface", - "sha256": "85f8d07fe708c1bdcf45037f2c0109753b26ae077e9d9e899d55971711a4ea66", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.2.0" + "version": "6.0.0" }, "flutter_loggy": { "dependency": "direct main", @@ -490,11 +431,11 @@ "dependency": "direct main", "description": { "name": "flutter_markdown", - "sha256": "04c4722cc36ec5af38acc38ece70d22d3c2123c61305d555750a091517bbe504", + "sha256": "08fb8315236099ff8e90cb87bb2b935e0a724a3af1623000a9cec930468e0f27", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.23" + "version": "0.7.7+1" }, "flutter_multi_slider": { "dependency": "direct main", @@ -510,27 +451,31 @@ "dependency": "direct main", "description": { "name": "flutter_rust_bridge", - "sha256": "02720226035257ad0b571c1256f43df3e1556a499f6bcb004849a0faaa0e87f0", + "sha256": "37ef40bc6f863652e865f0b2563ea07f0d3c58d8efad803cc01933a4b2ee067e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.82.6" + "version": "2.11.1" + }, + "flutter_settings_ui": { + "dependency": "direct main", + "description": { + "name": "flutter_settings_ui", + "sha256": "dcc506fab724192594e5c232b6214a941abd6e7b5151626635b89258fadbc17c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" }, "flutter_spinkit": { "dependency": "direct main", "description": { "name": "flutter_spinkit", - "sha256": "d2696eed13732831414595b98863260e33e8882fc069ee80ec35d4ac9ddb0472", + "sha256": "77850df57c00dc218bfe96071d576a8babec24cf58b2ed121c83cca4a2fdce7f", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.2.1" - }, - "flutter_test": { - "dependency": "direct dev", - "description": "flutter", - "source": "sdk", - "version": "0.0.0" + "version": "5.2.2" }, "flutter_web_plugins": { "dependency": "transitive", @@ -538,25 +483,35 @@ "source": "sdk", "version": "0.0.0" }, - "frontend_server_client": { - "dependency": "transitive", + "freezed": { + "dependency": "direct dev", "description": { - "name": "frontend_server_client", - "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "name": "freezed", + "sha256": "13065f10e135263a4f5a4391b79a8efc5fb8106f8dd555a9e49b750b45393d77", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "3.2.3" + }, + "freezed_annotation": { + "dependency": "direct main", + "description": { + "name": "freezed_annotation", + "sha256": "7294967ff0a6d98638e7acb774aac3af2550777accd8149c90af5b014e6d44d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" }, "get_it": { "dependency": "transitive", "description": { "name": "get_it", - "sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1", + "sha256": "ae78de7c3f2304b8d81f2bb6e320833e5e81de942188542328f074978cc0efa9", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.7.0" + "version": "8.3.0" }, "github": { "dependency": "direct main", @@ -592,11 +547,11 @@ "dependency": "transitive", "description": { "name": "http", - "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f", + "sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.6.0" }, "http_multi_server": { "dependency": "transitive", @@ -622,21 +577,21 @@ "dependency": "transitive", "description": { "name": "image", - "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d", + "sha256": "492bd52f6c4fbb6ee41f781ff27765ce5f627910e1e0cbecfa3d9add5562604c", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.3.0" + "version": "4.7.2" }, "intl": { "dependency": "direct main", "description": { "name": "intl", - "sha256": "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d", + "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.18.1" + "version": "0.20.2" }, "io": { "dependency": "transitive", @@ -658,16 +613,6 @@ "source": "hosted", "version": "0.14.2" }, - "js": { - "dependency": "transitive", - "description": { - "name": "js", - "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.7" - }, "json_annotation": { "dependency": "direct main", "description": { @@ -682,51 +627,21 @@ "dependency": "direct dev", "description": { "name": "json_serializable", - "sha256": "c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c", + "sha256": "c5b2ee75210a0f263c6c7b9eeea80553dbae96ea1bf57f02484e806a3ffdffa3", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.9.5" - }, - "leak_tracker": { - "dependency": "transitive", - "description": { - "name": "leak_tracker", - "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "10.0.9" - }, - "leak_tracker_flutter_testing": { - "dependency": "transitive", - "description": { - "name": "leak_tracker_flutter_testing", - "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.9" - }, - "leak_tracker_testing": { - "dependency": "transitive", - "description": { - "name": "leak_tracker_testing", - "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.1" + "version": "6.11.2" }, "lints": { "dependency": "transitive", "description": { "name": "lints", - "sha256": "cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290", + "sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.0" + "version": "6.0.0" }, "logging": { "dependency": "transitive", @@ -762,11 +677,11 @@ "dependency": "transitive", "description": { "name": "matcher", - "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", + "sha256": "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.17" + "version": "0.12.18" }, "material_color_utilities": { "dependency": "transitive", @@ -779,14 +694,14 @@ "version": "0.11.1" }, "meta": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "meta", - "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", + "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.16.0" + "version": "1.17.0" }, "mime": { "dependency": "transitive", @@ -802,21 +717,11 @@ "dependency": "direct dev", "description": { "name": "msix", - "sha256": "c50d6bd1aafe0d071a3c1e5a5ccb056404502935cb0a549e3178c4aae16caf33", + "sha256": "f88033fcb9e0dd8de5b18897cbebbd28ea30596810f4a7c86b12b0c03ace87e5", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.16.8" - }, - "multicast_dns": { - "dependency": "direct main", - "description": { - "name": "multicast_dns", - "sha256": "de72ada5c3db6fdd6ad4ae99452fe05fb403c4bb37c67ceb255ddd37d2b5b1eb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.3" + "version": "3.16.12" }, "nested": { "dependency": "transitive", @@ -832,21 +737,21 @@ "dependency": "direct main", "description": { "name": "network_info_plus", - "sha256": "4601b815b1c6a46d84839f65cd774a7d999738471d910fae00d813e9e98b04e1", + "sha256": "2866dadcbee2709e20d67737a1556f5675b8b0cdcf2c1659ba74bc21bffede4f", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.0+1" + "version": "7.0.0" }, "network_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "network_info_plus_platform_interface", - "sha256": "881f5029c5edaf19c616c201d3d8b366c5b1384afd5c1da5a49e4345de82fb8b", + "sha256": "7e7496a8a9d8136859b8881affc613c4a21304afeb6c324bcefc4bd0aff6b94b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.3" + "version": "2.0.2" }, "nm": { "dependency": "transitive", @@ -869,24 +774,24 @@ "version": "2.2.0" }, "package_info_plus": { - "dependency": "direct main", + "dependency": "transitive", "description": { "name": "package_info_plus", - "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191", + "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.3.0" + "version": "9.0.0" }, "package_info_plus_platform_interface": { "dependency": "transitive", "description": { "name": "package_info_plus_platform_interface", - "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c", + "sha256": "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.0" + "version": "3.2.1" }, "path": { "dependency": "direct main", @@ -912,21 +817,21 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9", + "sha256": "f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.17" + "version": "2.2.22" }, "path_provider_foundation": { "dependency": "transitive", "description": { "name": "path_provider_foundation", - "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942", + "sha256": "6d13aece7b3f5c5a9731eaf553ff9dcbc2eff41087fd2df587fd0fed9a3eb0c4", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.5.1" }, "path_provider_linux": { "dependency": "transitive", @@ -972,21 +877,21 @@ "dependency": "direct main", "description": { "name": "permission_handler", - "sha256": "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849", + "sha256": "bc917da36261b00137bbc8896bf1482169cd76f866282368948f032c8c1caae1", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.4.0" + "version": "12.0.1" }, "permission_handler_android": { "dependency": "transitive", "description": { "name": "permission_handler_android", - "sha256": "d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc", + "sha256": "1e3bc410ca1bf84662104b100eb126e066cb55791b7451307f9708d4007350e6", "url": "https://pub.dev" }, "source": "hosted", - "version": "12.1.0" + "version": "13.0.1" }, "permission_handler_apple": { "dependency": "transitive", @@ -1032,11 +937,11 @@ "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", + "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.0" + "version": "7.0.1" }, "platform": { "dependency": "transitive", @@ -1062,21 +967,31 @@ "dependency": "transitive", "description": { "name": "pool", - "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.1" + "version": "1.5.2" + }, + "posix": { + "dependency": "transitive", + "description": { + "name": "posix", + "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.3" }, "provider": { "dependency": "transitive", "description": { "name": "provider", - "sha256": "489024f942069c2920c844ee18bb3d467c69e48955a4f32d1677f71be103e310", + "sha256": "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.4" + "version": "6.1.5+1" }, "pub_semver": { "dependency": "transitive", @@ -1089,7 +1004,7 @@ "version": "2.2.0" }, "pubspec_parse": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "pubspec_parse", "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082", @@ -1098,16 +1013,6 @@ "source": "hosted", "version": "1.5.0" }, - "puppeteer": { - "dependency": "transitive", - "description": { - "name": "puppeteer", - "sha256": "7a990c68d33882b642214c351f66492d9a738afa4226a098ab70642357337fa2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.16.0" - }, "quiver": { "dependency": "transitive", "description": { @@ -1118,85 +1023,124 @@ "source": "hosted", "version": "3.2.2" }, + "rust_lib_intiface_central": { + "dependency": "direct main", + "description": { + "path": "rust_builder", + "relative": true + }, + "source": "path", + "version": "0.0.1" + }, "rxdart": { "dependency": "direct main", "description": { "name": "rxdart", - "sha256": "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb", + "sha256": "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.27.7" + "version": "0.28.0" }, "screen_retriever": { "dependency": "direct main", "description": { "name": "screen_retriever", - "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90", + "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.9" + "version": "0.2.0" + }, + "screen_retriever_linux": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_linux", + "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_macos": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_macos", + "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_platform_interface": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_platform_interface", + "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_windows": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_windows", + "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" }, "sentry": { "dependency": "direct main", "description": { "name": "sentry", - "sha256": "d9f3dcf1ecdd600cf9ce134f622383adde5423ecfdaf0ca9b20fbc1c44849337", + "sha256": "9b2fe138df1a104f6e41d8ebf2b1e4fe39d4370d2200eb4eea29913d38b8b33b", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.6.0" + "version": "9.9.1" }, "sentry_flutter": { "dependency": "direct main", "description": { "name": "sentry_flutter", - "sha256": "37deb4ef8837d10b5c1f527ec18591f8d2d2da9c34f19b3d97ccbbe7f84077c0", + "sha256": "698e0d47c0cf7362ad3b8034f6af5e9f3b2175d7a0cf58f78a967c29b43072b7", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.6.0" - }, - "settings_ui": { - "dependency": "direct main", - "description": { - "name": "settings_ui", - "sha256": "d9838037cb554b24b4218b2d07666fbada3478882edefae375ee892b6c820ef3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" + "version": "9.9.1" }, "shared_preferences": { "dependency": "direct main", "description": { "name": "shared_preferences", - "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5", + "sha256": "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.3" + "version": "2.5.4" }, "shared_preferences_android": { "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac", + "sha256": "83af5c682796c0f7719c2bbf74792d113e40ae97981b8f266fa84574573556bc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.10" + "version": "2.4.18" }, "shared_preferences_foundation": { "dependency": "transitive", "description": { "name": "shared_preferences_foundation", - "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03", + "sha256": "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.4" + "version": "2.5.6" }, "shared_preferences_linux": { "dependency": "transitive", @@ -1248,25 +1192,15 @@ "source": "hosted", "version": "1.4.2" }, - "shelf_static": { - "dependency": "transitive", - "description": { - "name": "shelf_static", - "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.3" - }, "shelf_web_socket": { "dependency": "transitive", "description": { "name": "shelf_web_socket", - "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "3.0.0" }, "sky_engine": { "dependency": "transitive", @@ -1278,21 +1212,21 @@ "dependency": "transitive", "description": { "name": "source_gen", - "sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b", + "sha256": "07b277b67e0096c45196cbddddf2d8c6ffc49342e88bf31d460ce04605ddac75", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.0" + "version": "4.1.1" }, "source_helper": { "dependency": "transitive", "description": { "name": "source_helper", - "sha256": "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c", + "sha256": "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.5" + "version": "1.3.8" }, "source_span": { "dependency": "transitive", @@ -1304,16 +1238,6 @@ "source": "hosted", "version": "1.10.1" }, - "sprintf": { - "dependency": "transitive", - "description": { - "name": "sprintf", - "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.0.0" - }, "stack_trace": { "dependency": "transitive", "description": { @@ -1368,41 +1292,11 @@ "dependency": "transitive", "description": { "name": "test_api", - "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", + "sha256": "19a78f63e83d3a61f00826d09bc2f60e191bf3504183c001262be6ac75589fb8", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.4" - }, - "timezone": { - "dependency": "transitive", - "description": { - "name": "timezone", - "sha256": "2236ec079a174ce07434e89fcd3fcda430025eb7692244139a9cf54fdcf1fc7d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.9.4" - }, - "timing": { - "dependency": "transitive", - "description": { - "name": "timing", - "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.2" - }, - "tuple": { - "dependency": "direct main", - "description": { - "name": "tuple", - "sha256": "a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" + "version": "0.7.8" }, "typed_data": { "dependency": "transitive", @@ -1418,51 +1312,51 @@ "dependency": "direct main", "description": { "name": "url_launcher", - "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603", + "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.1" + "version": "6.3.2" }, "url_launcher_android": { "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79", + "sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.16" + "version": "6.3.28" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb", + "sha256": "cfde38aa257dae62ffe79c87fab20165dfdf6988c1d31b58ebf59b9106062aad", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.3" + "version": "6.3.6" }, "url_launcher_linux": { "dependency": "transitive", "description": { "name": "url_launcher_linux", - "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935", + "sha256": "d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.1" + "version": "3.2.2" }, "url_launcher_macos": { "dependency": "transitive", "description": { "name": "url_launcher_macos", - "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2", + "sha256": "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.2" + "version": "3.2.5" }, "url_launcher_platform_interface": { "dependency": "transitive", @@ -1478,41 +1372,41 @@ "dependency": "transitive", "description": { "name": "url_launcher_web", - "sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9", + "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "2.4.1" }, "url_launcher_windows": { "dependency": "transitive", "description": { "name": "url_launcher_windows", - "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", + "sha256": "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.4" + "version": "3.1.5" }, "uuid": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "uuid", - "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", + "sha256": "a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.1" + "version": "4.5.2" }, "vector_math": { "dependency": "transitive", "description": { "name": "vector_math", - "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.4" + "version": "2.2.0" }, "version": { "dependency": "direct main", @@ -1524,25 +1418,15 @@ "source": "hosted", "version": "3.0.2" }, - "vm_service": { - "dependency": "transitive", - "description": { - "name": "vm_service", - "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "15.0.0" - }, "watcher": { "dependency": "transitive", "description": { "name": "watcher", - "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", + "sha256": "f52385d4f73589977c80797e60fe51014f7f2b957b5e9a62c3f6ada439889249", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.1" + "version": "1.2.0" }, "web": { "dependency": "transitive", @@ -1554,45 +1438,55 @@ "source": "hosted", "version": "1.1.1" }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, "web_socket_channel": { "dependency": "direct main", "description": { "name": "web_socket_channel", - "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b", + "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "3.0.3" }, "win32": { "dependency": "transitive", "description": { "name": "win32", - "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f", + "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.12.0" + "version": "5.15.0" }, "win32_registry": { "dependency": "transitive", "description": { "name": "win32_registry", - "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852", + "sha256": "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.5" + "version": "2.1.0" }, "window_manager": { "dependency": "direct main", "description": { "name": "window_manager", - "sha256": "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf", + "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.9" + "version": "0.5.1" }, "xdg_directories": { "dependency": "transitive", @@ -1608,11 +1502,11 @@ "dependency": "transitive", "description": { "name": "xml", - "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.5.0" + "version": "6.6.1" }, "yaml": { "dependency": "transitive", @@ -1628,15 +1522,15 @@ "dependency": "transitive", "description": { "name": "yaml_edit", - "sha256": "fb38626579fb345ad00e674e2af3a5c9b0cc4b9bfb8fd7f7ff322c7c9e62aef5", + "sha256": "ec709065bb2c911b336853b67f3732dd13e0336bd065cc2f1061d7610ddf45e3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.2" + "version": "2.2.3" } }, "sdks": { - "dart": ">=3.7.0 <4.0.0", - "flutter": ">=3.27.0" + "dart": ">=3.9.0 <4.0.0", + "flutter": ">=3.35.0" } } diff --git a/pkgs/by-name/in/invidious/package.nix b/pkgs/by-name/in/invidious/package.nix index d01f5bf3406a..8f0ea00f3e22 100644 --- a/pkgs/by-name/in/invidious/package.nix +++ b/pkgs/by-name/in/invidious/package.nix @@ -51,6 +51,7 @@ crystal.buildCrystalPackage rec { # This always uses the latest commit which invalidates the cache even if # the assets were not changed assetCommitTemplate = ''{{ "#{`git rev-list HEAD --max-count=1 --abbrev-commit -- assets`.strip}" }}''; + tagTemplate = ''{{ "#{`git tag --points-at HEAD`.strip}" }}''; inherit (versions.invidious) commit date; in @@ -63,7 +64,8 @@ crystal.buildCrystalPackage rec { --replace-fail ${lib.escapeShellArg branchTemplate} '"master"' \ --replace-fail ${lib.escapeShellArg commitTemplate} '"${commit}"' \ --replace-fail ${lib.escapeShellArg versionTemplate} '"${date}"' \ - --replace-fail ${lib.escapeShellArg assetCommitTemplate} '"${commit}"' + --replace-fail ${lib.escapeShellArg assetCommitTemplate} '"${commit}"' \ + --replace-fail ${lib.escapeShellArg tagTemplate} '"v${version}"' # Patch the assets and locales paths to be absolute substituteInPlace src/invidious.cr \ diff --git a/pkgs/by-name/in/invidious/versions.json b/pkgs/by-name/in/invidious/versions.json index 01843afce6dc..cf592f33e7b1 100644 --- a/pkgs/by-name/in/invidious/versions.json +++ b/pkgs/by-name/in/invidious/versions.json @@ -1,11 +1,11 @@ { "invidious": { - "hash": "sha256-tVytYxFcHnGhI5mdZhZk9NBp++8q9PGdYbl8H6j7dAE=", - "version": "2.20250913.0", - "date": "2025.09.13", - "commit": "cf019e3b" + "hash": "sha256-tACx4+HqouftDalZlrurS75gYvS02qnmxQoL91YfTjg=", + "version": "2.20260207.0", + "date": "2026.02.07", + "commit": "118d6356" }, "videojs": { "hash": "sha256-jED3zsDkPN8i6GhBBJwnsHujbuwlHdsVpVqa1/pzSH4=" } -} +} \ No newline at end of file diff --git a/pkgs/by-name/in/inxi/package.nix b/pkgs/by-name/in/inxi/package.nix index dad1b5acad3c..edb89c59524d 100644 --- a/pkgs/by-name/in/inxi/package.nix +++ b/pkgs/by-name/in/inxi/package.nix @@ -5,6 +5,7 @@ perl, perlPackages, makeWrapper, + installShellFiles, ps, dnsutils, # dig is recommended for multiple categories withRecommends ? false, # Install (almost) all recommended tools (see --recommends) @@ -72,19 +73,29 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-GpXfLLJhM4L9TB8Qw38uaCCwtCmBYg9nrVC001kDckc="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + installShellFiles + makeWrapper + ]; buildInputs = [ perl ]; installPhase = '' - mkdir -p $out/bin - cp inxi $out/bin/ + runHook preInstall + + installBin inxi wrapProgram $out/bin/inxi \ --set PERL5LIB "${perlPackages.makePerlPath (with perlPackages; [ CpanelJSONXS ])}" \ ${prefixPath programs} - mkdir -p $out/share/man/man1 - cp inxi.1 $out/share/man/man1/ + installManPage inxi.1 + + runHook postInstall ''; + outputs = [ + "out" + "man" + ]; + meta = { description = "Full featured CLI system information tool"; longDescription = '' diff --git a/pkgs/by-name/io/ioping/package.nix b/pkgs/by-name/io/ioping/package.nix index 5847a7a261b9..125a3ab42eb2 100644 --- a/pkgs/by-name/io/ioping/package.nix +++ b/pkgs/by-name/io/ioping/package.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=$(out)" ]; + outputs = [ + "out" + "man" + ]; + meta = { description = "Disk I/O latency measuring tool"; maintainers = with lib.maintainers; [ raskin ]; diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix index 03f3d594b5e7..b044091fe682 100644 --- a/pkgs/by-name/la/ladybird/package.nix +++ b/pkgs/by-name/la/ladybird/package.nix @@ -36,13 +36,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2026-01-31"; + version = "0-unstable-2026-02-07"; src = fetchFromGitHub { owner = "LadybirdBrowser"; repo = "ladybird"; - rev = "ea855d2baff7087e86996d1c687427204b453cb5"; - hash = "sha256-egLY8z+puxYADFLi5wOPpNCRKhQ35kid0JK7sX5+PTo="; + rev = "ba5c254fdef7d88e1c0dcb74a362da16ffc4a153"; + hash = "sha256-Bp+32jd86cScT5PV+hzKXp7WED7OSrpnnzTSb7Etefw="; }; postPatch = '' diff --git a/pkgs/by-name/li/linuxwave/package.nix b/pkgs/by-name/li/linuxwave/package.nix index 328365d834bb..973924615c96 100644 --- a/pkgs/by-name/li/linuxwave/package.nix +++ b/pkgs/by-name/li/linuxwave/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-OuD5U/T3GuCQrzdhx01NXPSXD7pUAvLnNsznttJogz8="; }; - postPatch = '' + postConfigure = '' ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p ''; diff --git a/pkgs/by-name/lo/log4cxx/package.nix b/pkgs/by-name/lo/log4cxx/package.nix index 553094b2ab19..3db873cfcb7b 100644 --- a/pkgs/by-name/lo/log4cxx/package.nix +++ b/pkgs/by-name/lo/log4cxx/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "log4cxx"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { url = "mirror://apache/logging/log4cxx/${finalAttrs.version}/apache-log4cxx-${finalAttrs.version}.tar.gz"; - hash = "sha256-R9doxXZcVyHPJ9Ug+H7ycikboPTg0yHHJzXVrshwGKc="; + hash = "sha256-GHyFg29bLyf7Ho13x/Hyk5cl8fZJi3QrDdVpujCWX9I="; }; postPatch = '' diff --git a/pkgs/by-name/ls/lsr/package.nix b/pkgs/by-name/ls/lsr/package.nix index 01c70c41c696..a2f56978f956 100644 --- a/pkgs/by-name/ls/lsr/package.nix +++ b/pkgs/by-name/ls/lsr/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-VeB0R/6h9FXSzBfx0IgpGlBz16zQScDSiU7ZvTD/Cds="; }; - postPatch = '' + postConfigure = '' ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p ''; diff --git a/pkgs/by-name/ly/ly/package.nix b/pkgs/by-name/ly/ly/package.nix index 7b937ad12d5e..3d25d1a48cb3 100644 --- a/pkgs/by-name/ly/ly/package.nix +++ b/pkgs/by-name/ly/ly/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ (lib.optionals x11Support [ libxcb ]); - postPatch = '' + postConfigure = '' ln -s ${ callPackage ./deps.nix { inherit zig; diff --git a/pkgs/by-name/ma/magic-vlsi/package.nix b/pkgs/by-name/ma/magic-vlsi/package.nix index 51ddcae2e638..77d4ea616d2c 100644 --- a/pkgs/by-name/ma/magic-vlsi/package.nix +++ b/pkgs/by-name/ma/magic-vlsi/package.nix @@ -15,17 +15,18 @@ tcsh, tk, fixDarwinDylibNames, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "magic-vlsi"; - version = "8.3.597"; + version = "8.3.602"; src = fetchFromGitHub { owner = "RTimothyEdwards"; repo = "magic"; tag = finalAttrs.version; - hash = "sha256-aFT/uTs/nMb8srf0Hjit03qM7+x1yZasIrSv8cjLS88="; + hash = "sha256-jNcuTdBHyVUEvdavIaB2LfMBKhHZkCxFOYyA2kBezqc="; leaveDotGit = true; }; @@ -105,6 +106,8 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-std=gnu89 -Wno-implicit-function-declaration"; env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-headerpad_max_install_names"; + passthru.updateScript = nix-update-script { }; + meta = { description = "VLSI layout tool written in Tcl"; homepage = "http://opencircuitdesign.com/magic/"; diff --git a/pkgs/by-name/ma/manim-slides/package.nix b/pkgs/by-name/ma/manim-slides/package.nix index ec66070ce3e4..5b37008c726a 100644 --- a/pkgs/by-name/ma/manim-slides/package.nix +++ b/pkgs/by-name/ma/manim-slides/package.nix @@ -1,14 +1,6 @@ { python3Packages, }: - -let - pythonPackages = python3Packages.overrideScope ( - self: super: { - av = self.av_13; - } - ); -in -(pythonPackages.toPythonApplication pythonPackages.manim-slides).overridePythonAttrs (oldAttrs: { +(python3Packages.toPythonApplication python3Packages.manim-slides).overridePythonAttrs (oldAttrs: { dependencies = oldAttrs.dependencies ++ oldAttrs.optional-dependencies.pyqt6-full; }) diff --git a/pkgs/by-name/ma/manim/package.nix b/pkgs/by-name/ma/manim/package.nix index 631cbbf2ffeb..1e42bcb75ff5 100644 --- a/pkgs/by-name/ma/manim/package.nix +++ b/pkgs/by-name/ma/manim/package.nix @@ -1,12 +1,4 @@ { python3Packages, }: - -let - pythonPackages = python3Packages.overrideScope ( - self: super: { - av = self.av_13; - } - ); -in -pythonPackages.toPythonApplication pythonPackages.manim +python3Packages.toPythonApplication python3Packages.manim diff --git a/pkgs/by-name/ma/matrix-continuwuity/package.nix b/pkgs/by-name/ma/matrix-continuwuity/package.nix index 15449b7f7e73..b690feadbf80 100644 --- a/pkgs/by-name/ma/matrix-continuwuity/package.nix +++ b/pkgs/by-name/ma/matrix-continuwuity/package.nix @@ -72,17 +72,17 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-continuwuity"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitea { domain = "forgejo.ellis.link"; owner = "continuwuation"; repo = "continuwuity"; tag = "v${finalAttrs.version}"; - hash = "sha256-9gDVhBuWBiXkzOxx0DyJFRV32QFwkKKpORb4I4xtdKw="; + hash = "sha256-E2BJh0ynzUm3gHJXM0qKIgTyEEMD02PG+uPPdr/MKaQ="; }; - cargoHash = "sha256-seJ9zaFMfSm/77n33SJ60/Ux1ovWUbkyi5M8x3kuBhU="; + cargoHash = "sha256-yPQxEZwMQv7HqlQzQxwGrUzZOL21cfNymkNdkOA4GIk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/mi/mill/package.nix b/pkgs/by-name/mi/mill/package.nix index f64f6d063255..1955923f9f77 100644 --- a/pkgs/by-name/mi/mill/package.nix +++ b/pkgs/by-name/mi/mill/package.nix @@ -4,23 +4,41 @@ jre, lib, makeWrapper, - sourcesJSON ? ./sources.json, stdenvNoCC, zlib, + writeScript, + stdenv, + curl, + libxml2, + common-updater-scripts, }: -stdenvNoCC.mkDerivation (finalAttrs: { +let + suffixMap = { + aarch64-darwin = "native-mac-aarch64"; + x86_64-darwin = "native-mac-amd64"; + aarch64-linux = "native-linux-aarch64"; + x86_64-linux = "native-linux-amd64"; + }; + suffix = + suffixMap.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); +in +stdenvNoCC.mkDerivation rec { pname = "mill"; - version = "1.0.6"; + version = "1.1.1"; - src = - let - source = (lib.importJSON sourcesJSON)."${stdenvNoCC.hostPlatform.system}"; - in - fetchurl { - url = "https://repo1.maven.org/maven2/com/lihaoyi/mill-dist-${source.artifact-suffix}/${finalAttrs.version}/mill-dist-${source.artifact-suffix}-${finalAttrs.version}.exe"; - inherit (source) hash; - }; + src = fetchurl { + url = "https://repo1.maven.org/maven2/com/lihaoyi/mill-dist-${suffix}/${version}/mill-dist-${suffix}-${version}.exe"; + sha256 = + { + aarch64-darwin = "sha256-ItoUsQ2Hu6aCrVS9GGf/m6DrQyCwJqtvWT8cTJSnZw4="; + x86_64-darwin = "sha256-9NLsUK3H3L27a+OO2kAyApezQpkHAJqvgYgQEXT6y9U="; + aarch64-linux = "sha256-VaBjRHMBKB83dHACQor9R0Gk/7tCpw1ITkxqWJb9+KI="; + x86_64-linux = "sha256-BMc7sGPlTzcED5RjrTNlrBWyr89cNiKfnh3plJ24dZ4="; + } + .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; buildInputs = [ zlib ]; nativeBuildInputs = [ @@ -47,6 +65,40 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = writeScript "${pname}-updater" '' + #!${stdenv.shell} + set -eu -o pipefail + PATH=${ + lib.makeBinPath [ + curl + libxml2 # xmllint + common-updater-scripts + ] + }:$PATH + metadataUrl="https://repo1.maven.org/maven2/com/lihaoyi/mill-dist/maven-metadata.xml" + latestVersion="$(curl -sS $metadataUrl | xmllint --xpath '/metadata/versioning/release/text()' -)" + + ${lib.strings.concatStrings ( + builtins.map ( + platform: + let + suffix = suffixMap.${platform} or (throw "Platform not in suffixMap: ${platform}"); + in + '' + { + dlUrl="https://repo1.maven.org/maven2/com/lihaoyi/mill-dist-${suffix}/$latestVersion/mill-dist-${suffix}-$latestVersion.exe" + + prefetch="$(nix-prefetch-url $dlUrl)" + hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri $prefetch) + + + update-source-version mill "$latestVersion" "$hash" --system=${platform} --ignore-same-version + } + '' + ) meta.platforms + )} + ''; + meta = { homepage = "https://com-lihaoyi.github.io/mill/"; license = lib.licenses.mit; @@ -70,4 +122,4 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; -}) +} diff --git a/pkgs/by-name/mi/mill/sources.json b/pkgs/by-name/mi/mill/sources.json deleted file mode 100644 index 36d38ea9f45f..000000000000 --- a/pkgs/by-name/mi/mill/sources.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "aarch64-darwin": { - "artifact-suffix": "native-mac-aarch64", - "hash": "sha256-KMlBQfSytFddA1eNJAx0yiuusgkVe1xkRoHw+03Q9rg=" - }, - "x86_64-darwin": { - "artifact-suffix": "native-mac-amd64", - "hash": "sha256-8CkXOfhJv/71vTgJqoEQ0TMW+r8kvdH1ff7l/Pbz0ZU=" - }, - "aarch64-linux": { - "artifact-suffix": "native-linux-aarch64", - "hash": "sha256-d/dSBStPdz4D/Jwe8UuqQRt6FZILwHrKXsSVyO6Ky4c=" - }, - "x86_64-linux": { - "artifact-suffix": "native-linux-amd64", - "hash": "sha256-iP7KHx+RA+2EQC5tRoBybe7MHXkEbxg00mDqE7IiCoY=" - } -} diff --git a/pkgs/by-name/mi/mistral-inference/package.nix b/pkgs/by-name/mi/mistral-inference/package.nix new file mode 100644 index 000000000000..5169738be0b0 --- /dev/null +++ b/pkgs/by-name/mi/mistral-inference/package.nix @@ -0,0 +1 @@ +{ python3Packages }: with python3Packages; toPythonApplication mistral-inference diff --git a/pkgs/by-name/na/navicat-premium/package.nix b/pkgs/by-name/na/navicat-premium/package.nix index 256433776093..29da868bf46a 100644 --- a/pkgs/by-name/na/navicat-premium/package.nix +++ b/pkgs/by-name/na/navicat-premium/package.nix @@ -35,12 +35,12 @@ stdenv.mkDerivation (finalAttrs: { src = { x86_64-linux = fetchurl { - url = "https://web.archive.org/web/20260105022310/https://dn.navicat.com/download/navicat17-premium-en-x86_64.AppImage"; - hash = "sha256-1H5YTzeEQ+JSI2/qRPcuCGkfvI58gufjMks89MqEOB4="; + url = "https://web.archive.org/web/20260203040321/https://dn.navicat.com/download/navicat17-premium-en-x86_64.AppImage"; + hash = "sha256-bIIqDwhajE7+S/Mx7lUn3FC1ZvRbk5mwxYwsmELBlRc="; }; aarch64-linux = fetchurl { - url = "https://web.archive.org/web/20260105022653/https://dn.navicat.com/download/navicat17-premium-en-aarch64.AppImage"; - hash = "sha256-PL7L0FE3XjFD5l/72CuyTe+yrN/JOy9qvrxNk0B8FKc="; + url = "https://web.archive.org/web/20260203040711/https://dn.navicat.com/download/navicat17-premium-en-aarch64.AppImage"; + hash = "sha256-2WOSwezm/utHaKUktrsWAfoXzCVMz+lfa1wyx0NtXMs="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/od/odiff/package.nix b/pkgs/by-name/od/odiff/package.nix index 9341e8a6fd19..4aca5a474e5f 100644 --- a/pkgs/by-name/od/odiff/package.nix +++ b/pkgs/by-name/od/odiff/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-gCF+CInczBJfDyZgxEQor5C/OSxKciCu9gbZanaE/nA="; }; - postPatch = '' + postConfigure = '' ln -s ${callPackage ./build.zig.zon.nix { }} $ZIG_GLOBAL_CACHE_DIR/p ''; diff --git a/pkgs/by-name/ox/oxfmt/package.nix b/pkgs/by-name/ox/oxfmt/package.nix index 881f4036eb26..b4bc90854a61 100644 --- a/pkgs/by-name/ox/oxfmt/package.nix +++ b/pkgs/by-name/ox/oxfmt/package.nix @@ -21,13 +21,13 @@ # A pure Rust build would lack the Prettier plugin functionality. stdenv.mkDerivation (finalAttrs: { pname = "oxfmt"; - version = "0.23.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "oxc-project"; repo = "oxc"; tag = "oxfmt_v${finalAttrs.version}"; - hash = "sha256-kMCGKbc7qaY0KUOR+67mLvKW4J5CuvYUmC6Aj9xlzSk="; + hash = "sha256-EAM1DxA/TqnIRN5Tlvg5/jvbyOUtSuwQ4RCBeO9esCw="; }; # Remove patchedDependencies from both workspace and lockfile @@ -39,14 +39,14 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-cesj9jwWHIFxpFV62QDgYl22EUE8qVjIbb2nRObAyLo="; + hash = "sha256-okwkhcT6mekIvo52T8eSrXUcp/LQhcEYvHyIc5CLdrE="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 2; - hash = "sha256-cPswWCksQ5TyR9M2Maj5mg9I+UltR0WN3U4ClBvwG68="; + hash = "sha256-GOsSTfM93VgGhVlgzXhJIJG9MSf306cEnRru/aTA+oY="; prePnpmInstall = finalAttrs.postPatch; }; diff --git a/pkgs/by-name/pi/piliplus/package.nix b/pkgs/by-name/pi/piliplus/package.nix index 28dfadb46e38..aae5315a4359 100644 --- a/pkgs/by-name/pi/piliplus/package.nix +++ b/pkgs/by-name/pi/piliplus/package.nix @@ -13,7 +13,7 @@ let srcInfo = lib.importJSON ./src-info.json; description = "Third-party Bilibili client developed in Flutter"; - version = "1.1.5.7"; + version = "1.1.6"; in flutter338.buildFlutterApplication { pname = "piliplus"; diff --git a/pkgs/by-name/pi/piliplus/pubspec.lock.json b/pkgs/by-name/pi/piliplus/pubspec.lock.json index 31ad395f3e84..8c0a5df83b22 100644 --- a/pkgs/by-name/pi/piliplus/pubspec.lock.json +++ b/pkgs/by-name/pi/piliplus/pubspec.lock.json @@ -235,11 +235,11 @@ "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "b4d854962a32fd9f8efc0b76f98214790b833af8b2e9b2df6bfc927c0415a072", + "sha256": "ac78098de97893812b7aff1154f29008fa2464cad9e8e7044d39bc905dad4fbc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.10.5" + "version": "2.11.0" }, "built_collection": { "dependency": "transitive", @@ -437,11 +437,11 @@ "dependency": "transitive", "description": { "name": "cross_file", - "sha256": "701dcfc06da0882883a2657c445103380e53e647060ad8d9dfb710c100996608", + "sha256": "28bb3ae56f117b5aec029d702a90f57d285cd975c3c5c281eaca38dbc47c5937", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.5+1" + "version": "0.3.5+2" }, "crypto": { "dependency": "direct main", @@ -477,21 +477,21 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "8a0aa2b9bae196552b71575efc94580e447546c26c7120577bb6f81fbd33b52e", + "sha256": "15a7db352c8fc6a4d2bc475ba901c25b39fe7157541da4c16eacce6f8be83e49", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.4" + "version": "3.1.5" }, "dbus": { "dependency": "transitive", "description": { "name": "dbus", - "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c", + "sha256": "d0c98dcd4f5169878b6cf8f6e0a52403a9dff371a3e2f019697accbf6f44a270", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.11" + "version": "0.7.12" }, "device_info_plus": { "dependency": "direct main", @@ -806,11 +806,11 @@ "dependency": "transitive", "description": { "name": "flutter_inappwebview_internal_annotations", - "sha256": "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd", + "sha256": "e30fba942e3debea7b7e6cdd4f0f59ce89dd403a9865193e3221293b6d1544c6", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.3.0" }, "flutter_inappwebview_ios": { "dependency": "transitive", @@ -1066,11 +1066,11 @@ "dependency": "transitive", "description": { "name": "hooks", - "sha256": "5d309c86e7ce34cd8e37aa71cb30cb652d3829b900ab145e4d9da564b31d59f7", + "sha256": "7a08a0d684cb3b8fb604b78455d5d352f502b68079f7b80b831c62220ab0a4f6", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.0" + "version": "1.0.1" }, "html": { "dependency": "direct main", @@ -1196,11 +1196,11 @@ "dependency": "transitive", "description": { "name": "image_picker_ios", - "sha256": "956c16a42c0c708f914021666ffcd8265dde36e673c9fa68c81f7d085d9774ad", + "sha256": "b9c4a438a9ff4f60808c9cf0039b93a42bb6c2211ef6ebb647394b2b3fa84588", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.13+3" + "version": "0.8.13+6" }, "image_picker_linux": { "dependency": "transitive", @@ -1276,11 +1276,11 @@ "dependency": "direct main", "description": { "name": "json_annotation", - "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "sha256": "805fa86df56383000f640384b282ce0cb8431f1a7a2396de92fb66186d8c57df", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.9.0" + "version": "4.10.0" }, "leak_tracker": { "dependency": "transitive", @@ -1316,11 +1316,11 @@ "dependency": "transitive", "description": { "name": "lints", - "sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0", + "sha256": "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.0" + "version": "6.1.0" }, "list_counter": { "dependency": "transitive", @@ -1553,11 +1553,11 @@ "dependency": "transitive", "description": { "name": "objective_c", - "sha256": "7fd0c4d8ac8980011753b9bdaed2bf15111365924cdeeeaeb596214ea2b03537", + "sha256": "100a1c87616ab6ed41ec263b083c0ef3261ee6cd1dc3b0f35f8ddfa4f996fe52", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.2.4" + "version": "9.3.0" }, "octo_image": { "dependency": "transitive", @@ -1773,11 +1773,11 @@ "dependency": "direct main", "description": { "name": "pretty_qr_code", - "sha256": "2291db3f68d70a3dcd46c6bd599f30991ae4c02f27f36215fbb3f4865a609259", + "sha256": "474f8a4512113fba06f14a6ec9bbf42353b4e651d7a520e3096f2a9b6bbe7a8a", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.5.0" + "version": "3.6.0" }, "protobuf": { "dependency": "direct main", @@ -1943,11 +1943,11 @@ "dependency": "transitive", "description": { "name": "sentry", - "sha256": "fa14b2177d2cd4489ec78817ec4e52affe1be9f595718de970a5e4ed2bccc530", + "sha256": "80b2a6667db8e0bb148ad70b2af242eb6aa8da9b56b56e72332a4221d93bc01d", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.10.0" + "version": "9.12.0" }, "share_plus": { "dependency": "direct main", @@ -2079,11 +2079,11 @@ "dependency": "transitive", "description": { "name": "source_span", - "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", + "sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.10.1" + "version": "1.10.2" }, "sqflite": { "dependency": "transitive", diff --git a/pkgs/by-name/pi/piliplus/src-info.json b/pkgs/by-name/pi/piliplus/src-info.json index 2d7dc7ffd30b..01f3569c6955 100644 --- a/pkgs/by-name/pi/piliplus/src-info.json +++ b/pkgs/by-name/pi/piliplus/src-info.json @@ -1,6 +1,6 @@ { - "rev": "bce73d9f164e8e26930c4461e95485245e8f15e2", - "revCount": 4584, - "commitDate": 1769586366, - "hash": "sha256-qUK7H/jKjVI5TmS/tXRk6KppXIYLC8JG7/ZyJdxpbyo=" + "rev": "4ac855d393d7676b02747ee2727c15ad4efc6623", + "revCount": 4626, + "commitDate": 1770453817, + "hash": "sha256-nHqvYy6/Oy/er2fyXaYIfExCAbkXeD4gSBSr1omuIoc=" } diff --git a/pkgs/by-name/pr/primecount/package.nix b/pkgs/by-name/pr/primecount/package.nix index e5381b4e5ad6..efc9baf9a372 100644 --- a/pkgs/by-name/pr/primecount/package.nix +++ b/pkgs/by-name/pr/primecount/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "primecount"; - version = "8.0"; + version = "8.2"; src = fetchFromGitHub { owner = "kimwalisch"; repo = "primecount"; rev = "v${finalAttrs.version}"; - hash = "sha256-EogWQWbAlLlhaIMZck9fzqv9XPJRbSe2zUtKU6xCZvU="; + hash = "sha256-Otf3+Gaq3g0JXnU/G+++eQCBHPOmed3YpUdp1G8ky2Y="; }; outputs = [ diff --git a/pkgs/by-name/pr/primesieve/package.nix b/pkgs/by-name/pr/primesieve/package.nix index b4d24f891a32..a275167e425a 100644 --- a/pkgs/by-name/pr/primesieve/package.nix +++ b/pkgs/by-name/pr/primesieve/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "primesieve"; - version = "12.12"; + version = "12.13"; src = fetchFromGitHub { owner = "kimwalisch"; repo = "primesieve"; rev = "v${finalAttrs.version}"; - hash = "sha256-6cYQDQ7lbs0zqLAO/aBIGw47idFaz9VVSm3nqGLDTAM="; + hash = "sha256-BO+hhTSF2KdkC8ctwHZQQeI/biF1yEDyR4lCi4QOB/I="; }; outputs = [ diff --git a/pkgs/by-name/pr/prometheus/package.nix b/pkgs/by-name/pr/prometheus/package.nix index 0018ed929d5f..7388b7a2bf94 100644 --- a/pkgs/by-name/pr/prometheus/package.nix +++ b/pkgs/by-name/pr/prometheus/package.nix @@ -138,7 +138,13 @@ buildGoModule (finalAttrs: { ''; preBuild = '' - if [[ -d vendor ]]; then GOARCH= make -o assets plugins; fi + # CC and LD required to fix cross-compilation + # go generate -tags plugins ./plugins + # /nix/store/...-go-1.25.5/share/go/pkg/tool/linux_amd64/link: running riscv64-unknown-linux-gnu-gcc failed: exit status 1 + # /nix/store/...-riscv64-unknown-linux-gnu-gcc-wrapper-15.2.0/bin/riscv64-unknown-linux-gnu-gcc -m64 -s -o $WORK/b001/exe/generate -rdynamic /build/go-link-1349994969/go.o + # riscv64-unknown-linux-gnu-gcc: error: unrecognized command-line option '-m64' + # Above log is due to https://github.com/golang/go/blob/b194f5d24a71e34f147c90e4351d80ac75be55de/src/cmd/cgo/gcc.go#L1763 + if [[ -d vendor ]]; then GOARCH= CC="$CC_FOR_BUILD" LD="$CC_FOR_BUILD" make -o assets plugins; fi # Recreate the `make assets-compress` target here - workaround permissions # errors diff --git a/pkgs/by-name/re/redmine/0001-python3.patch b/pkgs/by-name/re/redmine/0001-python3.patch deleted file mode 100644 index c88645b85a28..000000000000 --- a/pkgs/by-name/re/redmine/0001-python3.patch +++ /dev/null @@ -1,275 +0,0 @@ ---- a/lib/redmine/scm/adapters/mercurial/redminehelper.py -+++ b/lib/redmine/scm/adapters/mercurial/redminehelper.py -@@ -45,17 +45,20 @@ Output example of rhmanifest:: - - - """ --import re, time, cgi, urllib -+import re, time, html, urllib - from mercurial import cmdutil, commands, node, error, hg, registrar - - cmdtable = {} - command = registrar.command(cmdtable) if hasattr(registrar, 'command') else cmdutil.command(cmdtable) - --_x = cgi.escape --_u = lambda s: cgi.escape(urllib.quote(s)) -+_x = lambda s: html.escape(s.decode('utf-8')).encode('utf-8') -+_u = lambda s: html.escape(urllib.parse.quote(s)).encode('utf-8') -+ -+def unquoteplus(*args, **kwargs): -+ return urllib.parse.unquote_to_bytes(*args, **kwargs).replace(b'+', b' ') - - def _changectx(repo, rev): -- if isinstance(rev, str): -+ if isinstance(rev, bytes): - rev = repo.lookup(rev) - if hasattr(repo, 'changectx'): - return repo.changectx(rev) -@@ -70,10 +73,10 @@ def _tip(ui, repo): - except TypeError: # Mercurial < 1.1 - return repo.changelog.count() - 1 - tipctx = _changectx(repo, tiprev()) -- ui.write('\n' -+ ui.write(b'\n' - % (tipctx.rev(), _x(node.hex(tipctx.node())))) - --_SPECIAL_TAGS = ('tip',) -+_SPECIAL_TAGS = (b'tip',) - - def _tags(ui, repo): - # see mercurial/commands.py:tags -@@ -84,7 +87,7 @@ def _tags(ui, repo): - r = repo.changelog.rev(n) - except error.LookupError: - continue -- ui.write('\n' -+ ui.write(b'\n' - % (r, _x(node.hex(n)), _u(t))) - - def _branches(ui, repo): -@@ -104,136 +107,148 @@ def _branches(ui, repo): - return repo.branchheads(branch) - def lookup(rev, n): - try: -- return repo.lookup(rev) -+ return repo.lookup(str(rev).encode('utf-8')) - except RuntimeError: - return n - for t, n, r in sorted(iterbranches(), key=lambda e: e[2], reverse=True): - if lookup(r, n) in branchheads(t): -- ui.write('\n' -+ ui.write(b'\n' - % (r, _x(node.hex(n)), _u(t))) - - def _manifest(ui, repo, path, rev): - ctx = _changectx(repo, rev) -- ui.write('\n' -+ ui.write(b'\n' - % (ctx.rev(), _u(path))) - - known = set() -- pathprefix = (path.rstrip('/') + '/').lstrip('/') -+ pathprefix = (path.decode('utf-8').rstrip('/') + '/').lstrip('/') - for f, n in sorted(ctx.manifest().iteritems(), key=lambda e: e[0]): -- if not f.startswith(pathprefix): -+ fstr = f.decode('utf-8') -+ if not fstr.startswith(pathprefix): - continue -- name = re.sub(r'/.*', '/', f[len(pathprefix):]) -+ name = re.sub(r'/.*', '/', fstr[len(pathprefix):]) - if name in known: - continue - known.add(name) - - if name.endswith('/'): -- ui.write('\n' -+ ui.write(b'\n' - % _x(urllib.quote(name[:-1]))) - else: - fctx = repo.filectx(f, fileid=n) - tm, tzoffset = fctx.date() -- ui.write('\n' -+ ui.write(b'\n' - % (_u(name), fctx.rev(), _x(node.hex(fctx.node())), - tm, fctx.size(), )) - -- ui.write('\n') -+ ui.write(b'\n') - --@command('rhannotate', -- [('r', 'rev', '', 'revision'), -- ('u', 'user', None, 'list the author (long with -v)'), -- ('n', 'number', None, 'list the revision number (default)'), -- ('c', 'changeset', None, 'list the changeset'), -+@command(b'rhannotate', -+ [(b'r', b'rev', b'', b'revision'), -+ (b'u', b'user', None, b'list the author (long with -v)'), -+ (b'n', b'number', None, b'list the revision number (default)'), -+ (b'c', b'changeset', None, b'list the changeset'), - ], -- 'hg rhannotate [-r REV] [-u] [-n] [-c] FILE...') -+ b'hg rhannotate [-r REV] [-u] [-n] [-c] FILE...') - def rhannotate(ui, repo, *pats, **opts): -- rev = urllib.unquote_plus(opts.pop('rev', None)) -+ rev = unquoteplus(opts.pop('rev', b'')) - opts['rev'] = rev -- return commands.annotate(ui, repo, *map(urllib.unquote_plus, pats), **opts) -+ return commands.annotate(ui, repo, *map(unquoteplus, pats), **opts) - --@command('rhcat', -- [('r', 'rev', '', 'revision')], -- 'hg rhcat ([-r REV] ...) FILE...') -+@command(b'rhcat', -+ [(b'r', b'rev', b'', b'revision')], -+ b'hg rhcat ([-r REV] ...) FILE...') - def rhcat(ui, repo, file1, *pats, **opts): -- rev = urllib.unquote_plus(opts.pop('rev', None)) -+ rev = unquoteplus(opts.pop('rev', b'')) - opts['rev'] = rev -- return commands.cat(ui, repo, urllib.unquote_plus(file1), *map(urllib.unquote_plus, pats), **opts) -+ return commands.cat(ui, repo, unquoteplus(file1), *map(unquoteplus, pats), **opts) - --@command('rhdiff', -- [('r', 'rev', [], 'revision'), -- ('c', 'change', '', 'change made by revision')], -- 'hg rhdiff ([-c REV] | [-r REV] ...) [FILE]...') -+@command(b'rhdiff', -+ [(b'r', b'rev', [], b'revision'), -+ (b'c', b'change', b'', b'change made by revision')], -+ b'hg rhdiff ([-c REV] | [-r REV] ...) [FILE]...') - def rhdiff(ui, repo, *pats, **opts): - """diff repository (or selected files)""" - change = opts.pop('change', None) - if change: # add -c option for Mercurial<1.1 - base = _changectx(repo, change).parents()[0].rev() -- opts['rev'] = [str(base), change] -+ opts['rev'] = [base, change] - opts['nodates'] = True -- return commands.diff(ui, repo, *map(urllib.unquote_plus, pats), **opts) -- --@command('rhlog', -- [ -- ('r', 'rev', [], 'show the specified revision'), -- ('b', 'branch', [], -- 'show changesets within the given named branch'), -- ('l', 'limit', '', -- 'limit number of changes displayed'), -- ('d', 'date', '', -- 'show revisions matching date spec'), -- ('u', 'user', [], -- 'revisions committed by user'), -- ('', 'from', '', -- ''), -- ('', 'to', '', -- ''), -- ('', 'rhbranch', '', -- ''), -- ('', 'template', '', -- 'display with template')], -- 'hg rhlog [OPTION]... [FILE]') -+ return commands.diff(ui, repo, *map(unquoteplus, pats), **opts) -+ -+@command(b'rhlog', -+ [ -+ (b'r', b'rev', [], b'show the specified revision'), -+ (b'b', b'branch', [], -+ b'show changesets within the given named branch'), -+ (b'l', b'limit', b'', -+ b'limit number of changes displayed'), -+ (b'd', b'date', b'', -+ b'show revisions matching date spec'), -+ (b'u', b'user', [], -+ b'revisions committed by user'), -+ (b'', b'from', b'', -+ b''), -+ (b'', b'to', b'', -+ b''), -+ (b'', b'rhbranch', b'', -+ b''), -+ (b'', b'template', b'', -+ b'display with template')], -+ b'hg rhlog [OPTION]... [FILE]') -+ - def rhlog(ui, repo, *pats, **opts): - rev = opts.pop('rev') - bra0 = opts.pop('branch') -- from_rev = urllib.unquote_plus(opts.pop('from', None)) -- to_rev = urllib.unquote_plus(opts.pop('to' , None)) -- bra = urllib.unquote_plus(opts.pop('rhbranch', None)) -- from_rev = from_rev.replace('"', '\\"') -- to_rev = to_rev.replace('"', '\\"') -- if hg.util.version() >= '1.6': -- opts['rev'] = ['"%s":"%s"' % (from_rev, to_rev)] -+ from_rev = unquoteplus(opts.pop('from', b'')) -+ to_rev = unquoteplus(opts.pop('to' , b'')) -+ bra = unquoteplus(opts.pop('rhbranch', b'')) -+ from_rev = from_rev.replace(b'"', b'\\"') -+ to_rev = to_rev.replace(b'"', b'\\"') -+ if (from_rev != b'') or (to_rev != b''): -+ if from_rev != b'': -+ quotefrom = b'"%s"' % (from_rev) -+ else: -+ quotefrom = from_rev -+ if to_rev != b'': -+ quoteto = b'"%s"' % (to_rev) -+ else: -+ quoteto = to_rev -+ opts['rev'] = [b'%s:%s' % (quotefrom, quoteto)] - else: -- opts['rev'] = ['%s:%s' % (from_rev, to_rev)] -- opts['branch'] = [bra] -- return commands.log(ui, repo, *map(urllib.unquote_plus, pats), **opts) -- --@command('rhmanifest', -- [('r', 'rev', '', 'show the specified revision')], -- 'hg rhmanifest [-r REV] [PATH]') --def rhmanifest(ui, repo, path='', **opts): -+ opts['rev'] = rev -+ if (bra != b''): -+ opts['branch'] = [bra] -+ return commands.log(ui, repo, *map(unquoteplus, pats), **opts) -+ -+ -+@command(b'rhmanifest', -+ [(b'r', b'rev', b'', b'show the specified revision')], -+ b'hg rhmanifest -r REV [PATH]') -+def rhmanifest(ui, repo, path=b'', **opts): - """output the sub-manifest of the specified directory""" -- ui.write('\n') -- ui.write('\n') -- ui.write('\n' % _u(repo.root)) -+ ui.write(b'\n') -+ ui.write(b'\n') -+ ui.write(b'\n' % _u(repo.root)) - try: -- _manifest(ui, repo, urllib.unquote_plus(path), urllib.unquote_plus(opts.get('rev'))) -+ _manifest(ui, repo, unquoteplus(path), unquoteplus(opts.get('rev'))) - finally: -- ui.write('\n') -- ui.write('\n') -+ ui.write(b'\n') -+ ui.write(b'\n') - --@command('rhsummary',[], 'hg rhsummary') -+@command(b'rhsummary',[], b'hg rhsummary') - def rhsummary(ui, repo, **opts): - """output the summary of the repository""" -- ui.write('\n') -- ui.write('\n') -- ui.write('\n' % _u(repo.root)) -+ ui.write(b'\n') -+ ui.write(b'\n') -+ ui.write(b'\n' % _u(repo.root)) - try: - _tip(ui, repo) - _tags(ui, repo) - _branches(ui, repo) - # TODO: bookmarks in core (Mercurial>=1.8) - finally: -- ui.write('\n') -- ui.write('\n') -+ ui.write(b'\n') -+ ui.write(b'\n') - diff --git a/pkgs/by-name/re/redmine/Gemfile b/pkgs/by-name/re/redmine/Gemfile index 8345cc8a7a6a..9f7647787801 100644 --- a/pkgs/by-name/re/redmine/Gemfile +++ b/pkgs/by-name/re/redmine/Gemfile @@ -1,27 +1,34 @@ source 'https://rubygems.org' -ruby '>= 3.1.0', '< 3.4.0' +ruby '>= 3.2.0', '< 3.5.0' gem 'rails', '7.2.3' gem 'rouge', '~> 4.5' gem 'mini_mime', '~> 1.1.0' gem "actionpack-xml_parser" -gem 'roadie-rails', '~> 3.2.0' +gem 'roadie-rails', '~> 3.3.0' gem 'marcel' gem 'mail', '~> 2.8.1' gem 'nokogiri', '~> 1.18.3' gem 'i18n', '~> 1.14.1' gem 'rbpdf', '~> 1.21.4' gem 'addressable' -gem 'rubyzip', '~> 2.3.0' +gem 'rubyzip', '~> 2.4.0' gem 'propshaft', '~> 1.1.0' gem 'rack', '>= 3.1.3' +gem "stimulus-rails", "~> 1.3" +gem "importmap-rails", "~> 2.0" +gem 'commonmarker', '~> 2.3.0' +gem "doorkeeper", "~> 5.8.2" +gem "bcrypt", require: false +gem "doorkeeper-i18n", "~> 5.2" +gem "requestjs-rails", "~> 0.0.13" # Ruby Standard Gems -gem 'csv', '~> 3.2.8' -gem 'net-imap', '~> 0.4.20' +gem 'csv', '~> 3.3.2' +gem 'net-imap', '~> 0.5.7' gem 'net-pop', '~> 0.1.2' -gem 'net-smtp', '~> 0.4.0' +gem 'net-smtp', '~> 0.5.0' # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin] @@ -41,20 +48,16 @@ end # Optional gem for exporting the gantt to a PNG file group :minimagick do - gem 'mini_magick', '~> 5.0.1' -end - -# Optional CommonMark support, not for JRuby -group :common_mark do - gem "commonmarker", '~> 0.23.8' - gem 'deckar01-task_list', '2.3.2' + gem 'mini_magick', '~> 5.2.0' end # Include database gems for the database adapters NixOS supports gem 'mysql2', '~> 0.5.0' gem "with_advisory_lock" +gem 'trilogy', '~> 2.9.0' +gem "with_advisory_lock" gem 'pg', '~> 1.5.3' -gem 'sqlite3', '~> 1.7.0' +gem 'sqlite3', '~> 2.5.0' group :development, :test do gem 'debug' @@ -64,6 +67,7 @@ group :development do gem 'listen', '~> 3.3' gem 'yard', require: false gem 'svg_sprite', require: false + gem 'bullet' end group :test do @@ -76,13 +80,15 @@ group :test do gem "capybara", ">= 3.39" gem 'selenium-webdriver', '>= 4.11.0' # RuboCop - gem 'rubocop', '~> 1.68.0', require: false - gem 'rubocop-ast', '~> 1.40.0', require: false - gem 'rubocop-performance', '~> 1.22.0', require: false - gem 'rubocop-rails', '~> 2.27.0', require: false + gem 'rubocop', '~> 1.76.0', require: false + gem 'rubocop-performance', '~> 1.25.0', require: false + gem 'rubocop-rails', '~> 2.32.0', require: false gem 'bundle-audit', require: false - # `bin/rails test` fails at startup with minitest >= 6.0 - gem 'minitest', '< 6.0' + # for testing oauth provider capabilities + gem 'oauth2' + gem 'rest-client' + # Lock minitest to 5.x until a Rails release includes support for minitest 6.0 + gem 'minitest', '~> 5.27' end gem "webrick" diff --git a/pkgs/by-name/re/redmine/Gemfile.lock b/pkgs/by-name/re/redmine/Gemfile.lock index 8dac12b98b4a..4b962c0cd4cd 100644 --- a/pkgs/by-name/re/redmine/Gemfile.lock +++ b/pkgs/by-name/re/redmine/Gemfile.lock @@ -81,9 +81,13 @@ GEM public_suffix (>= 2.0.2, < 8.0) ast (2.4.3) base64 (0.3.0) + bcrypt (3.1.21) benchmark (0.5.0) bigdecimal (4.0.1) builder (3.3.0) + bullet (8.1.0) + activesupport (>= 3.0.0) + uniform_notifier (~> 1.11) bundle-audit (0.2.0) bundler-audit bundler-audit (0.9.3) @@ -100,40 +104,63 @@ GEM xpath (~> 3.2) cgi (0.5.1) chunky_png (1.4.0) - commonmarker (0.23.12) + commonmarker (2.3.2) + rb_sys (~> 0.9) concurrent-ruby (1.3.6) connection_pool (3.0.2) crass (1.0.6) css_parser (1.21.1) addressable - csv (3.2.9) + csv (3.3.5) date (3.5.1) debug (1.11.1) irb (~> 1.10) reline (>= 0.3.8) - deckar01-task_list (2.3.2) - html-pipeline docile (1.4.1) + domain_name (0.6.20240107) + doorkeeper (5.8.2) + railties (>= 5) + doorkeeper-i18n (5.2.8) + doorkeeper (>= 5.2) drb (2.2.3) erb (6.0.1) erubi (1.13.1) + faraday (2.14.0) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-net_http (3.4.2) + net-http (~> 0.5) ffi (1.17.3) globalid (1.3.0) activesupport (>= 6.1) + hashie (5.1.0) + logger html-pipeline (2.13.2) activesupport (>= 2) nokogiri (>= 1.4) htmlentities (4.4.2) + http-accept (1.7.0) + http-cookie (1.1.0) + domain_name (~> 0.5) i18n (1.14.8) concurrent-ruby (~> 1.0) + importmap-rails (2.2.3) + actionpack (>= 6.0.0) + activesupport (>= 6.0.0) + railties (>= 6.0.0) io-console (0.8.2) irb (1.16.0) pp (>= 0.6.0) rdoc (>= 4.0.0) reline (>= 0.4.2) - json (2.18.0) + json (2.18.1) + jwt (3.1.2) + base64 language_server-protocol (3.17.0.5) - listen (3.9.0) + lint_roller (1.1.0) + listen (3.10.0) + logger rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) logger (1.7.0) @@ -147,15 +174,25 @@ GEM net-smtp marcel (1.1.0) matrix (0.4.3) - mini_magick (5.0.1) + mime-types (3.7.0) + logger + mime-types-data (~> 3.2025, >= 3.2025.0507) + mime-types-data (3.2026.0203) + mini_magick (5.2.0) + benchmark + logger mini_mime (1.1.5) mini_portile2 (2.8.9) minitest (5.27.0) mocha (3.0.1) ruby2_keywords (>= 0.0.5) + multi_xml (0.8.1) + bigdecimal (>= 3.1, < 5) mysql2 (0.5.7) bigdecimal - net-imap (0.4.23) + net-http (0.9.1) + uri (>= 0.11.1) + net-imap (0.5.13) date net-protocol net-ldap (0.17.1) @@ -163,20 +200,30 @@ GEM net-protocol net-protocol (0.2.2) timeout - net-smtp (0.4.0.1) + net-smtp (0.5.1) net-protocol + netrc (0.11.0) nio4r (2.7.5) nokogiri (1.18.10) mini_portile2 (~> 2.8.2) racc (~> 1.4) + oauth2 (2.0.18) + faraday (>= 0.17.3, < 4.0) + jwt (>= 1.0, < 4.0) + logger (~> 1.2) + multi_xml (~> 0.5) + rack (>= 1.2, < 4) + snaky_hash (~> 2.0, >= 2.0.3) + version_gem (~> 1.1, >= 1.1.9) parallel (1.27.0) - parser (3.3.10.0) + parser (3.3.10.1) ast (~> 2.4.1) racc pg (1.5.9) pp (0.6.3) prettyprint prettyprint (0.2.0) + prism (1.9.0) propshaft (1.1.0) actionpack (>= 7.0.0) activesupport (>= 7.0.0) @@ -186,7 +233,7 @@ GEM date stringio public_suffix (7.0.2) - puma (7.1.0) + puma (7.2.0) nio4r (~> 2.0) racc (1.8.1) rack (3.2.4) @@ -230,26 +277,36 @@ GEM zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.3.1) + rake-compiler-dock (1.11.0) rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) + rb_sys (0.9.124) + rake-compiler-dock (= 1.11.0) rbpdf (1.21.4) htmlentities rbpdf-font (~> 1.19.0) rbpdf-font (1.19.1) - rdoc (7.0.3) + rdoc (7.1.0) erb psych (>= 4.0.0) tsort regexp_parser (2.11.3) reline (0.6.3) io-console (~> 0.5) + requestjs-rails (0.0.14) + railties (>= 7.1.0) + rest-client (2.1.0) + http-accept (>= 1.7.0, < 2.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) rexml (3.4.4) roadie (5.2.1) css_parser (~> 1.4) nokogiri (~> 1.15) - roadie-rails (3.2.0) - railties (>= 5.1, < 8.0) + roadie-rails (3.3.0) + railties (>= 5.1, < 8.1) roadie (~> 5.0) rotp (6.3.0) rouge (4.7.0) @@ -257,34 +314,38 @@ GEM chunky_png (~> 1.0) rqrcode_core (~> 2.0) rqrcode_core (2.1.0) - rubocop (1.68.0) + rubocop (1.76.2) json (~> 2.3) - language_server-protocol (>= 3.17.0) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.1.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 2.4, < 3.0) - rubocop-ast (>= 1.32.2, < 2.0) + regexp_parser (>= 2.9.3, < 3.0) + rubocop-ast (>= 1.45.1, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.40.0) - parser (>= 3.3.1.0) - rubocop-performance (1.22.1) - rubocop (>= 1.48.1, < 2.0) - rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.27.0) + unicode-display_width (>= 2.4.0, < 4.0) + rubocop-ast (1.49.0) + parser (>= 3.3.7.2) + prism (~> 1.7) + rubocop-performance (1.25.0) + lint_roller (~> 1.1) + rubocop (>= 1.75.0, < 2.0) + rubocop-ast (>= 1.38.0, < 2.0) + rubocop-rails (2.32.0) activesupport (>= 4.2.0) + lint_roller (~> 1.1) rack (>= 1.1) - rubocop (>= 1.52.0, < 2.0) - rubocop-ast (>= 1.31.1, < 2.0) + rubocop (>= 1.75.0, < 2.0) + rubocop-ast (>= 1.44.0, < 2.0) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) - rubyzip (2.3.2) + rubyzip (2.4.1) sanitize (6.1.3) crass (~> 1.0.2) nokogiri (>= 1.12.0) securerandom (0.4.1) - selenium-webdriver (4.39.0) + selenium-webdriver (4.40.0) base64 (~> 0.2) logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) @@ -296,8 +357,13 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.13.2) simplecov_json_formatter (0.1.4) - sqlite3 (1.7.3) + snaky_hash (2.0.3) + hashie (>= 0.1.0, < 6) + version_gem (>= 1.1.8, < 3) + sqlite3 (2.5.0) mini_portile2 (~> 2.8.0) + stimulus-rails (1.3.4) + railties (>= 6.0.0) stringio (3.2.0) svg_optimizer (0.3.0) nokogiri @@ -307,18 +373,24 @@ GEM thor thor (1.5.0) timeout (0.6.0) + trilogy (2.9.0) tsort (0.2.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.6.0) + unicode-display_width (3.2.0) + unicode-emoji (~> 4.1) + unicode-emoji (4.2.0) + uniform_notifier (1.18.0) + uri (1.1.1) useragent (0.16.11) + version_gem (1.1.9) webrick (1.9.2) websocket (1.2.11) websocket-driver (0.8.0) base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - with_advisory_lock (7.0.2) + with_advisory_lock (7.5.0) activerecord (>= 7.2) zeitwerk (>= 2.7) xpath (3.2.0) @@ -332,28 +404,33 @@ PLATFORMS DEPENDENCIES actionpack-xml_parser addressable + bcrypt + bullet bundle-audit capybara (>= 3.39) - commonmarker (~> 0.23.8) - csv (~> 3.2.8) + commonmarker (~> 2.3.0) + csv (~> 3.3.2) debug - deckar01-task_list (= 2.3.2) + doorkeeper (~> 5.8.2) + doorkeeper-i18n (~> 5.2) ffi html-pipeline (~> 2.13.2) i18n (~> 1.14.1) + importmap-rails (~> 2.0) listen (~> 3.3) mail (~> 2.8.1) marcel - mini_magick (~> 5.0.1) + mini_magick (~> 5.2.0) mini_mime (~> 1.1.0) - minitest (< 6.0) + minitest (~> 5.27) mocha (>= 2.0.1) mysql2 (~> 0.5.0) - net-imap (~> 0.4.20) + net-imap (~> 0.5.7) net-ldap (~> 0.17.0) net-pop (~> 0.1.2) - net-smtp (~> 0.4.0) + net-smtp (~> 0.5.0) nokogiri (~> 1.18.3) + oauth2 pg (~> 1.5.3) propshaft (~> 1.1.0) puma @@ -361,20 +438,23 @@ DEPENDENCIES rails (= 7.2.3) rails-dom-testing (>= 2.3.0) rbpdf (~> 1.21.4) - roadie-rails (~> 3.2.0) + requestjs-rails (~> 0.0.13) + rest-client + roadie-rails (~> 3.3.0) rotp (>= 5.0.0) rouge (~> 4.5) rqrcode - rubocop (~> 1.68.0) - rubocop-ast (~> 1.40.0) - rubocop-performance (~> 1.22.0) - rubocop-rails (~> 2.27.0) - rubyzip (~> 2.3.0) + rubocop (~> 1.76.0) + rubocop-performance (~> 1.25.0) + rubocop-rails (~> 2.32.0) + rubyzip (~> 2.4.0) sanitize (~> 6.0) selenium-webdriver (>= 4.11.0) simplecov (~> 0.22.0) - sqlite3 (~> 1.7.0) + sqlite3 (~> 2.5.0) + stimulus-rails (~> 1.3) svg_sprite + trilogy (~> 2.9.0) tzinfo-data webrick with_advisory_lock diff --git a/pkgs/by-name/re/redmine/gemset.nix b/pkgs/by-name/re/redmine/gemset.nix index fe778b7c357c..4938f8069f3f 100644 --- a/pkgs/by-name/re/redmine/gemset.nix +++ b/pkgs/by-name/re/redmine/gemset.nix @@ -197,8 +197,8 @@ "tzinfo" ]; groups = [ - "common_mark" "default" + "development" "test" ]; platforms = [ ]; @@ -238,8 +238,8 @@ }; base64 = { groups = [ - "common_mark" "default" + "development" "test" ]; platforms = [ ]; @@ -250,10 +250,21 @@ }; version = "0.3.0"; }; + bcrypt = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1krd99p9828n07rcjjms56jaqv7v6s9pn7y6bppcfhhaflyn2r2r"; + type = "gem"; + }; + version = "3.1.21"; + }; benchmark = { groups = [ - "common_mark" "default" + "development" + "minimagick" "test" ]; platforms = [ ]; @@ -266,8 +277,8 @@ }; bigdecimal = { groups = [ - "common_mark" "default" + "development" "test" ]; platforms = [ ]; @@ -288,6 +299,20 @@ }; version = "3.3.0"; }; + bullet = { + dependencies = [ + "activesupport" + "uniform_notifier" + ]; + groups = [ "development" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1zwq7g98c1mdigahb50c980a0fcc4ib1m9ivmgf3f8gc6qk7wjv0"; + type = "gem"; + }; + version = "8.1.0"; + }; bundle-audit = { dependencies = [ "bundler-audit" ]; groups = [ "test" ]; @@ -354,19 +379,20 @@ version = "1.4.0"; }; commonmarker = { - groups = [ "common_mark" ]; + dependencies = [ "rb_sys" ]; + groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1k9wa8fnfz08lyn86vpqhdv4jffznlxcx6p6qr11rdf7qy4jybfs"; + sha256 = "04g73hpmrn92jcj1cfblg4aq2k6sijd6i4xa4n0y0p2fbxry715z"; type = "gem"; }; - version = "0.23.12"; + version = "2.3.2"; }; concurrent-ruby = { groups = [ - "common_mark" "default" + "development" "test" ]; platforms = [ ]; @@ -379,8 +405,8 @@ }; connection_pool = { groups = [ - "common_mark" "default" + "development" "test" ]; platforms = [ ]; @@ -417,10 +443,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1fp986v5xfpzcj9v3dyvdd26fcnmbbzjwcp66pz34hv6g86z66a9"; + sha256 = "0gz7r2kazwwwyrwi95hbnhy54kwkfac5swh2gy5p5vw36fn38lbf"; type = "gem"; }; - version = "3.2.9"; + version = "3.3.5"; }; date = { groups = [ @@ -453,17 +479,6 @@ }; version = "1.11.1"; }; - deckar01-task_list = { - dependencies = [ "html-pipeline" ]; - groups = [ "common_mark" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "01c8vv0xwbhlyhiagj93b1hlm2n0rmj4sw62nbc0jhyj90jhj6as"; - type = "gem"; - }; - version = "2.3.2"; - }; docile = { groups = [ "default" @@ -477,10 +492,45 @@ }; version = "1.4.1"; }; + domain_name = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0cyr2xm576gqhqicsyqnhanni47408w2pgvrfi8pd13h2li3nsaz"; + type = "gem"; + }; + version = "0.6.20240107"; + }; + doorkeeper = { + dependencies = [ "railties" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1lsh9lzrglqlwm9icmn0ggrwjc9iy9308f9m59z1w2srmyp0fgd7"; + type = "gem"; + }; + version = "5.8.2"; + }; + doorkeeper-i18n = { + dependencies = [ "doorkeeper" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0lpmvaglypxlmaiqv4sjrf1b1sc8f589cv7xq3rr4j26vw0lf1g4"; + type = "gem"; + }; + version = "5.2.8"; + }; drb = { groups = [ - "common_mark" "default" + "development" "test" ]; platforms = [ ]; @@ -515,6 +565,38 @@ }; version = "1.13.1"; }; + faraday = { + dependencies = [ + "faraday-net_http" + "json" + "logger" + ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ka175ci0q9ylpcy651pjj580diplkaskycn4n7jcmbyv7jwz6c6"; + type = "gem"; + }; + version = "2.14.0"; + }; + faraday-net_http = { + dependencies = [ "net-http" ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0v4hfmc7d4lrqqj2wl366rm9551gd08zkv2ppwwnjlnkc217aizi"; + type = "gem"; + }; + version = "3.4.2"; + }; ffi = { groups = [ "default" @@ -556,15 +638,26 @@ }; version = "1.3.0"; }; + hashie = { + dependencies = [ "logger" ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0w1qrab701d3a63aj2qavwc2fpcqmkzzh1w2x93c88zkjqc4frn2"; + type = "gem"; + }; + version = "5.1.0"; + }; html-pipeline = { dependencies = [ "activesupport" "nokogiri" ]; - groups = [ - "common_mark" - "default" - ]; + groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; @@ -583,11 +676,38 @@ }; version = "4.4.2"; }; + http-accept = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "09m1facypsdjynfwrcv19xcb1mqg8z6kk31g8r33pfxzh838c9n6"; + type = "gem"; + }; + version = "1.7.0"; + }; + http-cookie = { + dependencies = [ "domain_name" ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "06dvmngd4hwrr6k774i1h6c50h2l8nww9f1id0wvrvi72l6yd99q"; + type = "gem"; + }; + version = "1.1.0"; + }; i18n = { dependencies = [ "concurrent-ruby" ]; groups = [ - "common_mark" "default" + "development" "test" ]; platforms = [ ]; @@ -598,6 +718,21 @@ }; version = "1.14.8"; }; + importmap-rails = { + dependencies = [ + "actionpack" + "activesupport" + "railties" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0smixr7l97pky55k0kz9rxmmyk2032kp7xdqixaz2z699lmbw0bi"; + type = "gem"; + }; + version = "2.2.3"; + }; io-console = { groups = [ "default" @@ -639,10 +774,24 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01fmiz052cvnxgdnhb3qwcy88xbv7l3liz0fkvs5qgqqwjp0c1di"; + sha256 = "11prr7nrxh1y4rfsqa51gy4ixx63r18cz9mdnmk0938va1ajf4gy"; type = "gem"; }; - version = "2.18.0"; + version = "2.18.1"; + }; + jwt = { + dependencies = [ "base64" ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0dfm4bhl4fzn076igh0bmh2v1vphcrxdv6ldc46hdd3bkbqr2sdg"; + type = "gem"; + }; + version = "3.1.2"; }; language_server-protocol = { groups = [ @@ -657,8 +806,22 @@ }; version = "3.17.0.5"; }; + lint_roller = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "11yc0d84hsnlvx8cpk4cbj6a4dz9pk0r1k29p0n1fz9acddq831c"; + type = "gem"; + }; + version = "1.1.0"; + }; listen = { dependencies = [ + "logger" "rb-fsevent" "rb-inotify" ]; @@ -666,15 +829,16 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0rwwsmvq79qwzl6324yc53py02kbrcww35si720490z5w0j497nv"; + sha256 = "1ln9c0vx165hkfbn2817qw4m6i77xcxh6q0r5v6fqfhlcbdq5qf6"; type = "gem"; }; - version = "3.9.0"; + version = "3.10.0"; }; logger = { groups = [ - "common_mark" "default" + "development" + "minimagick" "test" ]; platforms = [ ]; @@ -738,15 +902,49 @@ }; version = "0.4.3"; }; + mime-types = { + dependencies = [ + "logger" + "mime-types-data" + ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0mjyxl7c0xzyqdqa8r45hqg7jcw2prp3hkp39mdf223g4hfgdsyw"; + type = "gem"; + }; + version = "3.7.0"; + }; + mime-types-data = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0bradmf21c9g4z6f3hvqmnf6i2sbgp0630y2j5rq8a7h79lksdal"; + type = "gem"; + }; + version = "3.2026.0203"; + }; mini_magick = { + dependencies = [ + "benchmark" + "logger" + ]; groups = [ "minimagick" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ig7gl9q0qf5c54f9gvg8mqzi15dy6p71q25j80mb4bdnj9v6sz6"; + sha256 = "0jiz4jqsrmgnkyvpmsq2vicmvdqa6q2ibzx93lnj8f0xvfzzymr7"; type = "gem"; }; - version = "5.0.1"; + version = "5.2.0"; }; mini_mime = { groups = [ @@ -763,7 +961,6 @@ }; mini_portile2 = { groups = [ - "common_mark" "default" "development" "test" @@ -778,8 +975,8 @@ }; minitest = { groups = [ - "common_mark" "default" + "development" "test" ]; platforms = [ ]; @@ -801,6 +998,20 @@ }; version = "3.0.1"; }; + multi_xml = { + dependencies = [ "bigdecimal" ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0nnzdswa9l6w8k5ndgbv5al9f0jkg14dqwzyic4fjd5c1cls1nxd"; + type = "gem"; + }; + version = "0.8.1"; + }; mysql2 = { dependencies = [ "bigdecimal" ]; groups = [ "default" ]; @@ -812,6 +1023,20 @@ }; version = "0.5.7"; }; + net-http = { + dependencies = [ "uri" ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "15k96fj6qwbaiv6g52l538ass95ds1qwgynqdridz29yqrkhpfi5"; + type = "gem"; + }; + version = "0.9.1"; + }; net-imap = { dependencies = [ "date" @@ -821,10 +1046,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lw9yv95w55k5rb3bdifm6b1g0c2g0a1ly11wwviyyx4829wjv5q"; + sha256 = "1c9p0r2z6j14g0vi323r6x4cs6w87xjvphlkxf7x63h2wsscgc7d"; type = "gem"; }; - version = "0.4.23"; + version = "0.5.13"; }; net-ldap = { groups = [ "ldap" ]; @@ -864,10 +1089,23 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0csspzqrg7s2v2wdp6vqqs1rra6w5ilpgnps5h52ig6rp7x2i389"; + sha256 = "0dh7nzjp0fiaqq1jz90nv4nxhc2w359d7c199gmzq965cfps15pd"; type = "gem"; }; - version = "0.4.0.1"; + version = "0.5.1"; + }; + netrc = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; + type = "gem"; + }; + version = "0.11.0"; }; nio4r = { groups = [ @@ -888,7 +1126,6 @@ "racc" ]; groups = [ - "common_mark" "default" "development" "test" @@ -901,6 +1138,25 @@ }; version = "1.18.10"; }; + oauth2 = { + dependencies = [ + "faraday" + "jwt" + "logger" + "multi_xml" + "rack" + "snaky_hash" + "version_gem" + ]; + groups = [ "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "11rj80dgjz05x5xx93y4bfk9rcn7fl56srj8fgqn7ffzf3j13kxs"; + type = "gem"; + }; + version = "2.0.18"; + }; parallel = { groups = [ "default" @@ -926,10 +1182,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1mmb59323ldv6vxfmy98azgsla9k3di3fasvpb28hnn5bkx8fdff"; + sha256 = "1256ws3w3gnfqj7r3yz2i9y1y7k38fhjphxpybkyb4fds8jsgxh6"; type = "gem"; }; - version = "3.3.10.0"; + version = "3.3.10.1"; }; pg = { groups = [ "default" ]; @@ -970,6 +1226,19 @@ }; version = "0.2.0"; }; + prism = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "11ggfikcs1lv17nhmhqyyp6z8nq5pkfcj6a904047hljkxm0qlvv"; + type = "gem"; + }; + version = "1.9.0"; + }; propshaft = { dependencies = [ "actionpack" @@ -1023,14 +1292,13 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1pa9zpr51kqnsq549p6apvnr95s9flx6bnwqii24s8jg2b5i0p74"; + sha256 = "1a3jd9qakasizrf7dkq5mqv51fjf02r2chybai2nskjaa6mz93mz"; type = "gem"; }; - version = "7.1.0"; + version = "7.2.0"; }; racc = { groups = [ - "common_mark" "default" "development" "test" @@ -1192,6 +1460,16 @@ }; version = "13.3.1"; }; + rake-compiler-dock = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1hpq52ab86s70yv5hk56f0z14izhh59af95nlv73bsrksln1zdga"; + type = "gem"; + }; + version = "1.11.0"; + }; rb-fsevent = { groups = [ "default" @@ -1219,6 +1497,17 @@ }; version = "0.11.1"; }; + rb_sys = { + dependencies = [ "rake-compiler-dock" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1rvshyirm32lzf2sggcrhvz5hi828s3rznmkchvzgshjgdapcd2i"; + type = "gem"; + }; + version = "0.9.124"; + }; rbpdf = { dependencies = [ "htmlentities" @@ -1257,10 +1546,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1yc1xa3wckwwan518qii22jagqzlr5bypflx3nkvpdqr3ncd1qyz"; + sha256 = "0qvky4s2fx5xbaz1brxanalqbcky3c7xbqd6dicpih860zgrjj29"; type = "gem"; }; - version = "7.0.3"; + version = "7.1.0"; }; regexp_parser = { groups = [ @@ -1290,6 +1579,33 @@ }; version = "0.6.3"; }; + requestjs-rails = { + dependencies = [ "railties" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0bcswqkc3n90brf4ir3xdk8wfhq19ics7zzfmlvg36rvk6c42jdv"; + type = "gem"; + }; + version = "0.0.14"; + }; + rest-client = { + dependencies = [ + "http-accept" + "http-cookie" + "mime-types" + "netrc" + ]; + groups = [ "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1qs74yzl58agzx9dgjhcpgmzfn61fqkk33k1js2y5yhlvc5l19im"; + type = "gem"; + }; + version = "2.1.0"; + }; rexml = { groups = [ "default" @@ -1326,10 +1642,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0gs3axi7nsmsh3y7ix1n9wn4ccsxgv2dpgwy9yzgvsfggy2k99ch"; + sha256 = "0phadjq9xyx91535y2xn09jywhgzj8ljpm3yywyznqjrcdxgd020"; type = "gem"; }; - version = "3.2.0"; + version = "3.3.0"; }; rotp = { groups = [ "default" ]; @@ -1379,6 +1695,7 @@ dependencies = [ "json" "language_server-protocol" + "lint_roller" "parallel" "parser" "rainbow" @@ -1391,24 +1708,31 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ay1lrz3ffrznjfr65c6xvkinb6m4l7h68cd9qbrf7nq0j2m1pq7"; + sha256 = "0csnyhcjrxjiiz849rc8rjdqg9w5ixwi2wcj7ii3vghbp9rg2i5f"; type = "gem"; }; - version = "1.68.0"; + version = "1.76.2"; }; rubocop-ast = { - dependencies = [ "parser" ]; - groups = [ "test" ]; + dependencies = [ + "parser" + "prism" + ]; + groups = [ + "default" + "test" + ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1rdjvc8jz05svc017akwsf2n91bmyj016m5qsg2dyz2i115hxyhp"; + sha256 = "1zbikzd6237fvlzjfxdlhwi2vbmavg1cc81y6cyr581365nnghs9"; type = "gem"; }; - version = "1.40.0"; + version = "1.49.0"; }; rubocop-performance = { dependencies = [ + "lint_roller" "rubocop" "rubocop-ast" ]; @@ -1416,14 +1740,15 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0yd616imfjvlpwsk7lw5kq9h4iz6qkmf10xlaib6b47fy5x77ncy"; + sha256 = "1h9flnqk2f3llwf8g0mk0fvzzznfj7hsil3qg88m803pi9b06zbg"; type = "gem"; }; - version = "1.22.1"; + version = "1.25.0"; }; rubocop-rails = { dependencies = [ "activesupport" + "lint_roller" "rack" "rubocop" "rubocop-ast" @@ -1432,10 +1757,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1zplyab5n8gh7zzbwrrxrkzb2406afrjm6a3a3zdx72k17swx9n3"; + sha256 = "1404nfa0gw3p0xzmv4b9zg9v1da0nwc4m7796pl73zi2hwy65k4z"; type = "gem"; }; - version = "2.27.0"; + version = "2.32.0"; }; ruby-progressbar = { groups = [ @@ -1471,10 +1796,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + sha256 = "05an0wz87vkmqwcwyh5rjiaavydfn5f4q1lixcsqkphzvj7chxw5"; type = "gem"; }; - version = "2.3.2"; + version = "2.4.1"; }; sanitize = { dependencies = [ @@ -1492,8 +1817,8 @@ }; securerandom = { groups = [ - "common_mark" "default" + "development" "test" ]; platforms = [ ]; @@ -1516,10 +1841,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "09m8gd0wafvvrrk7mh6rxskfx9rghbqwdhxshvrflwllsdiiwjlq"; + sha256 = "0nsys7ghl99zn2n4zjw3bi697qqnm6pmmi7aaafln79whnlpmvqn"; type = "gem"; }; - version = "4.39.0"; + version = "4.40.0"; }; simplecov = { dependencies = [ @@ -1562,16 +1887,44 @@ }; version = "0.1.4"; }; + snaky_hash = { + dependencies = [ + "hashie" + "version_gem" + ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0mnllrwhs7psw6xxs8x5yx85k12qjfdgs8zs0bxm70bfascx58r5"; + type = "gem"; + }; + version = "2.0.3"; + }; sqlite3 = { dependencies = [ "mini_portile2" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "073hd24qwx9j26cqbk0jma0kiajjv9fb8swv9rnz8j4mf0ygcxzs"; + sha256 = "0sqshkafxa1r34yj4yxisd4kddmjq9jrhx6azqy3z71nwqv01yl7"; type = "gem"; }; - version = "1.7.3"; + version = "2.5.0"; + }; + stimulus-rails = { + dependencies = [ "railties" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "01nbcxyi1mhikq8yjl0g9swy1cpzx146pli6w16gcfpkl7zpcmkn"; + type = "gem"; + }; + version = "1.3.4"; }; stringio = { groups = [ @@ -1640,6 +1993,16 @@ }; version = "0.6.0"; }; + trilogy = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0zq6yrp1074yd5lflz7yqzpicpcg4bxrl7sxw5c4g2m67dk3pmm2"; + type = "gem"; + }; + version = "2.9.0"; + }; tsort = { groups = [ "default" @@ -1657,8 +2020,8 @@ tzinfo = { dependencies = [ "concurrent-ruby" ]; groups = [ - "common_mark" "default" + "development" "test" ]; platforms = [ ]; @@ -1670,6 +2033,7 @@ version = "2.0.6"; }; unicode-display_width = { + dependencies = [ "unicode-emoji" ]; groups = [ "default" "test" @@ -1677,10 +2041,49 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj"; + sha256 = "0hiwhnqpq271xqari6mg996fgjps42sffm9cpk6ljn8sd2srdp8c"; type = "gem"; }; - version = "2.6.0"; + version = "3.2.0"; + }; + unicode-emoji = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03zqn207zypycbz5m9mn7ym763wgpk7hcqbkpx02wrbm1wank7ji"; + type = "gem"; + }; + version = "4.2.0"; + }; + uniform_notifier = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "17ffzyq6482yn27r7rz2k3zslf9jigbz383d90c68vznarapi1s7"; + type = "gem"; + }; + version = "1.18.0"; + }; + uri = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ijpbj7mdrq7rhpq2kb51yykhrs2s54wfs6sm9z3icgz4y6sb7rp"; + type = "gem"; + }; + version = "1.1.1"; }; useragent = { groups = [ "default" ]; @@ -1692,6 +2095,19 @@ }; version = "0.16.11"; }; + version_gem = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "195r5qylwxwqbllnpli9c2pzin0lky6h3fw912h88g2lmri0j6hc"; + type = "gem"; + }; + version = "1.1.9"; + }; webrick = { groups = [ "default" ]; platforms = [ ]; @@ -1748,10 +2164,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "001sswk3d1n8nf4pzxxc4rvxw47q05m0harl50ys25b18nxqai6z"; + sha256 = "1gqm78w1va32w6kbhpm86pvn9g28d2g7d9j9jrxys42sscg2znys"; type = "gem"; }; - version = "7.0.2"; + version = "7.5.0"; }; xpath = { dependencies = [ "nokogiri" ]; diff --git a/pkgs/by-name/re/redmine/package.nix b/pkgs/by-name/re/redmine/package.nix index e9b687fde063..cbe8b0dbfd60 100644 --- a/pkgs/by-name/re/redmine/package.nix +++ b/pkgs/by-name/re/redmine/package.nix @@ -1,4 +1,5 @@ { + defaultGemConfig, lib, stdenvNoCC, fetchurl, @@ -6,10 +7,15 @@ ruby_3_3, makeWrapper, nixosTests, + openssl, + rustc, + cargo, + rustPlatform, + buildRubyGem, }: let - version = "6.0.8"; + version = "6.1.1"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -23,6 +29,38 @@ let "minimagick" "test" ]; + gemConfig = defaultGemConfig // { + trilogy = attrs: { + buildInputs = [ openssl ]; + }; + commonmarker = attrs: { + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (buildRubyGem { inherit (attrs) gemName version source; }) + name + src + unpackPhase + nativeBuildInputs + ; + hash = "sha256-rUNsf7DUVueD9revOR6Mab36XnVEmjL4bVv6TIMMqjM="; + }; + dontBuild = false; + nativeBuildInputs = [ + cargo + rustc + rustPlatform.cargoSetupHook + rustPlatform.bindgenHook + ]; + disallowedReferences = [ + rustc.unwrapped + ]; + preInstall = '' + export CARGO_HOME="$PWD/../.cargo/" + ''; + postInstall = '' + find $out -type f -name .rustc_info.json -delete + ''; + }; + }; }; in stdenvNoCC.mkDerivation (finalAttrs: { @@ -31,7 +69,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.redmine.org/releases/redmine-${finalAttrs.version}.tar.gz"; - hash = "sha256-5DCIUq/2Yylqn3fTEwL00BjgQwXtAwq9R5gtXdoDzEY="; + hash = "sha256-Hy5t0GlwYvxzNwH4i1BB3A38a1NiVet5AvIfsJcOYD4="; }; nativeBuildInputs = [ makeWrapper ]; @@ -41,10 +79,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { rubyEnv.bundler ]; - # taken from https://www.redmine.org/issues/33784 - # can be dropped when the upstream bug is closed and the fix is present in the upstream release - patches = [ ./0001-python3.patch ]; - buildPhase = '' mv config config.dist mv themes themes.dist diff --git a/pkgs/by-name/re/refine/package.nix b/pkgs/by-name/re/refine/package.nix index 9a9c8b424af8..41d622f59b8d 100644 --- a/pkgs/by-name/re/refine/package.nix +++ b/pkgs/by-name/re/refine/package.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "refine"; - version = "0.6.3"; + version = "0.7.0"; pyproject = false; # uses meson src = fetchFromGitLab { @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "TheEvilSkeleton"; repo = "Refine"; tag = finalAttrs.version; - hash = "sha256-0FxnohwqAu7UW1e0kBNk8rFv2q736qlmFFhce2BNLdQ="; + hash = "sha256-5rHct0GXsdjeG+wXxtDKXWBTCphhOCojuR2ExXrZyWA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ri/river-classic/package.nix b/pkgs/by-name/ri/river-classic/package.nix index 7385f480bd47..802fa35f1da5 100644 --- a/pkgs/by-name/ri/river-classic/package.nix +++ b/pkgs/by-name/ri/river-classic/package.nix @@ -59,8 +59,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional xwaylandSupport libx11; - dontConfigure = true; - zigBuildFlags = [ "--system" "${finalAttrs.deps}" diff --git a/pkgs/by-name/ri/rivercarro/package.nix b/pkgs/by-name/ri/rivercarro/package.nix index c88e5ec61589..775b4c510430 100644 --- a/pkgs/by-name/ri/rivercarro/package.nix +++ b/pkgs/by-name/ri/rivercarro/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { zig ]; - postPatch = '' + postConfigure = '' ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p ''; diff --git a/pkgs/by-name/rs/rsop/package.nix b/pkgs/by-name/rs/rsop/package.nix index c2d74046d4ad..035aa5a9025d 100644 --- a/pkgs/by-name/rs/rsop/package.nix +++ b/pkgs/by-name/rs/rsop/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rsop"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromCodeberg { owner = "heiko"; repo = "rsop"; rev = "rsop/v${finalAttrs.version}"; - hash = "sha256-eP3jh5TIhMHDWnttnYvBre/tfzxajLNGtInWNiFAPiw="; + hash = "sha256-UEXSYfbbnEV0GL0Q6wFNoERWp3jjEZ2ia/UhOGo1dn8="; }; - cargoHash = "sha256-vmxqpOABd7S/htX8bbThyvfOSBY9f1CjX0gY9NQVHss="; + cargoHash = "sha256-Sa9ZRUsTLXLYQJYmGhkMqnWTHey5shy/w0l90xa+ck8="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/se/ser2net/package.nix b/pkgs/by-name/se/ser2net/package.nix index 03ea731c0db4..67897882bb2f 100644 --- a/pkgs/by-name/se/ser2net/package.nix +++ b/pkgs/by-name/se/ser2net/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ser2net"; - version = "4.6.6"; + version = "4.6.7"; src = fetchFromGitHub { owner = "cminyard"; repo = "ser2net"; rev = "v${finalAttrs.version}"; - hash = "sha256-TL6btl8Q8hpIBfzHdJ+TLdF+r9zQRLytzVx810R7yYI="; + hash = "sha256-Axo3qa+QoBqFOLkxA6ZnEYu0M1p9LSM9h/oS8JsdwOY="; }; passthru = { diff --git a/pkgs/by-name/sh/sherpa/package.nix b/pkgs/by-name/sh/sherpa/package.nix index bbb66ba611e7..95b51148c39e 100644 --- a/pkgs/by-name/sh/sherpa/package.nix +++ b/pkgs/by-name/sh/sherpa/package.nix @@ -2,13 +2,11 @@ lib, stdenv, fetchFromGitLab, - autoconf, - gfortran, cmake, + gfortran, libzip, - pkg-config, lhapdf, - autoPatchelfHook, + patchelf, }: stdenv.mkDerivation (finalAttrs: { @@ -27,19 +25,20 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ - autoconf - gfortran cmake - pkg-config + gfortran ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ patchelf ]; buildInputs = [ libzip lhapdf ]; - enableParallelBuilding = true; + cmakeFlags = [ + # Needed to initialize a valid SHERPA_LIBRARY_PATH + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/by-name/si/sif/package.nix b/pkgs/by-name/si/sif/package.nix new file mode 100644 index 000000000000..6d231958f6d2 --- /dev/null +++ b/pkgs/by-name/si/sif/package.nix @@ -0,0 +1,42 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule { + pname = "sif"; + version = "0-unstable-2026-01-11"; + + src = fetchFromGitHub { + owner = "vmfunc"; + repo = "sif"; + tag = "automated-release-c988e54"; + hash = "sha256-/9LRmSrji/8SCD9aHx82HwBfBRPVKzOnogw+uvDI+WI="; + }; + + vendorHash = "sha256-ztKXnOjZS/jMxsRjtF0rIZ3lKv4YjMdZd6oQFRuAtR4="; + + subPackages = [ "cmd/sif" ]; + + env.CGO_ENABLED = 0; + + ldflags = [ + "-s" + "-w" + ]; + + # network-dependent tests + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Modular pentesting toolkit written in Go"; + homepage = "https://github.com/vmfunc/sif"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ vmfunc ]; + mainProgram = "sif"; + }; +} diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix index 4ad96cee25ff..e419031456b5 100644 --- a/pkgs/by-name/su/super-productivity/package.nix +++ b/pkgs/by-name/su/super-productivity/package.nix @@ -18,7 +18,7 @@ let in buildNpmPackage rec { pname = "super-productivity"; - version = "17.1.2"; + version = "17.1.5"; inherit nodejs; @@ -26,7 +26,7 @@ buildNpmPackage rec { owner = "johannesjo"; repo = "super-productivity"; tag = "v${version}"; - hash = "sha256-n0WUg3DH+pVggd5KP0HL3qkOco8b5fAGwVsrq1bU3Sw="; + hash = "sha256-ECUn+0RFNYc5QgJYXMYQ0fWZ39WVErCNCIIkrual1P4="; postFetch = '' find $out -name package-lock.json -exec ${lib.getExe npm-lockfile-fix} -r {} \; @@ -69,7 +69,7 @@ buildNpmPackage rec { dontInstall = true; outputHashMode = "recursive"; - hash = "sha256-it4vCA6Bs6qaJXMr2qhQcuAdHsMPz/c05RSiGpU+svk="; + hash = "sha256-tDQd3HVktivwyPaLF88fLLDwU6H7yX03DWrpFVkdDXk="; } ); diff --git a/pkgs/by-name/su/superhtml/package.nix b/pkgs/by-name/su/superhtml/package.nix index 2ade74c68c09..e903bede55d6 100644 --- a/pkgs/by-name/su/superhtml/package.nix +++ b/pkgs/by-name/su/superhtml/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { zig ]; - postPatch = '' + postConfigure = '' ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p ''; diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix index 10bea78cd5f8..0f8f15d93b56 100644 --- a/pkgs/by-name/te/television/package.nix +++ b/pkgs/by-name/te/television/package.nix @@ -20,16 +20,16 @@ let television = rustPlatform.buildRustPackage (finalAttrs: { pname = "television"; - version = "0.15.0"; + version = "0.15.2"; src = fetchFromGitHub { owner = "alexpasmantier"; repo = "television"; tag = finalAttrs.version; - hash = "sha256-WjIvsLO+LIDNEx2fEn0oe6YwrQYMhmRqWTomIoSH3Co="; + hash = "sha256-IE5l6j7sWRBcnujmCh78H5dGIAZtr5Nl62f2F5aQX1g="; }; - cargoHash = "sha256-AI7B4z8C+q3xcaB+BpPb0IIyZeDpWxx2qZVWPJkG/sY="; + cargoHash = "sha256-WHRSjq7J6qugWHiKlvVeLCmkg+M81AXbghavM1sVsLE="; strictDeps = true; nativeBuildInputs = [ diff --git a/pkgs/by-name/tr/trivy/package.nix b/pkgs/by-name/tr/trivy/package.nix index 4ed0f45e95c9..7946b892bab2 100644 --- a/pkgs/by-name/tr/trivy/package.nix +++ b/pkgs/by-name/tr/trivy/package.nix @@ -5,17 +5,17 @@ buildGoModule, fetchFromGitHub, installShellFiles, - testers, - trivy, + versionCheckHook, }: -buildGoModule rec { + +buildGoModule (finalAttrs: { pname = "trivy"; version = "0.69.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "trivy"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-auCbZmVr7LzYrw+IOpXBZPUs2YmcPAzr5fo12vSyHeM="; }; @@ -29,13 +29,15 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X=github.com/aquasecurity/trivy/pkg/version/app.ver=${version}" + "-X=github.com/aquasecurity/trivy/pkg/version/app.ver=${finalAttrs.version}" ]; env.GOEXPERIMENT = "jsonv2"; nativeBuildInputs = [ installShellFiles ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + # Tests require network access doCheck = false; @@ -48,16 +50,10 @@ buildGoModule rec { doInstallCheck = true; - passthru.tests.version = testers.testVersion { - package = trivy; - command = "trivy --version"; - version = "Version: ${version}"; - }; - meta = { description = "Simple and comprehensive vulnerability scanner for containers, suitable for CI"; homepage = "https://github.com/aquasecurity/trivy"; - changelog = "https://github.com/aquasecurity/trivy/releases/tag/v${version}"; + changelog = "https://github.com/aquasecurity/trivy/releases/tag/${finalAttrs.src.tag}"; longDescription = '' Trivy is a simple and comprehensive vulnerability scanner for containers and other artifacts. A software vulnerability is a glitch, flaw, or @@ -72,4 +68,4 @@ buildGoModule rec { jk ]; }; -} +}) diff --git a/pkgs/by-name/tt/ttl/package.nix b/pkgs/by-name/tt/ttl/package.nix index 81ac5a0af257..24db025bd2ce 100644 --- a/pkgs/by-name/tt/ttl/package.nix +++ b/pkgs/by-name/tt/ttl/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ttl"; - version = "0.15.3"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lance0"; repo = "ttl"; tag = "v${finalAttrs.version}"; - hash = "sha256-T2LeaqMXnYw0fBDwqbXvNnJ2TyLBsf0FzOpDqZICjOw="; + hash = "sha256-sMYkmCwgV6Yeg+NInjVeUyGa2DflYwFL+ky5Epyay9E="; }; - cargoHash = "sha256-tJUaQxW7NRZrWIajCO5E5oGPXDloQW0GVQ3HPpbYBhM="; + cargoHash = "sha256-ogen+VIEXLt4PnSwfOjuKiC0WcFbEJsh5w72hkqLBj8="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/tu/turbovnc/package.nix b/pkgs/by-name/tu/turbovnc/package.nix index 5b9f6f5810f4..1e055bc4f99c 100644 --- a/pkgs/by-name/tu/turbovnc/package.nix +++ b/pkgs/by-name/tu/turbovnc/package.nix @@ -46,19 +46,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "turbovnc"; - version = "3.2.1"; + version = "3.3"; src = fetchFromGitHub { owner = "TurboVNC"; repo = "turbovnc"; rev = finalAttrs.version; - hash = "sha256-J+J4QRf21QLScgtwwSZCXoy0+6bwZFeXm4k4zk0h5Rs="; + hash = "sha256-nAlE4yJW6isst+aJ4Ryy23Cr9KF78nY769ucdQfSHXw="; }; # Notes: # * SSH support does not require `openssh` on PATH, because turbovnc # uses a built-in SSH client ("JSch fork"), as commented on e.g.: - # https://github.com/TurboVNC/turbovnc/releases/tag/3.2.1beta1 + # https://github.com/TurboVNC/turbovnc/releases/tag/3.3beta1 # # TODO: # * Build outputs that are unclear: @@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: { # use system libs # TurboVNC >= 3.1.4 no longer needs overrides to use system libraries # instead of bundling them, see - # https://github.com/TurboVNC/turbovnc/releases/tag/3.2.1beta1: + # https://github.com/TurboVNC/turbovnc/releases/tag/3.3beta1: # > The TVNC_SYSTEMLIBS and TVNC_SYSTEMX11 CMake variables have been removed, # > and the build system now behaves as if those variables are always on. # > A new CMake variable (TVNC_ZLIBNG) can be used on x86 platforms diff --git a/pkgs/by-name/ty/typ2docx/package.nix b/pkgs/by-name/ty/typ2docx/package.nix new file mode 100644 index 000000000000..6ce59f42b672 --- /dev/null +++ b/pkgs/by-name/ty/typ2docx/package.nix @@ -0,0 +1,88 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + fetchurl, + rustPlatform, + + pkg-config, + openssl, + + pandoc, +}: +python3Packages.buildPythonApplication rec { + pname = "typ2docx"; + version = "0.8.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "sghng"; + repo = "typ2docx"; + tag = "v${version}"; + hash = "sha256-8Jb13qiS+dpyfJS4m2T6STzORs1VzRKwC8GGgEwiVtU="; + }; + + lockFile = fetchurl { + url = "https://github.com/sghng/typ2docx/releases/download/v${version}/Cargo.lock"; + hash = "sha256-irWv7+uqNyyq42JVLSy9WQz78ynYVsYuQ8fk5nardWw="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit + pname + version + src + postPatch + ; + hash = "sha256-Gvdj9izGCem0A3Cy7RBzNzJ57lxk5GRP8I2C2T6RsbY="; + }; + + postPatch = '' + ln -s ${lockFile} Cargo.lock + ''; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + pkg-config + ]; + + build-system = with python3Packages; [ + uv-build + ]; + + dependencies = with python3Packages; [ + pdf2docx + pdfservices-sdk + pypdf + rich + saxonche + typer + ]; + + buildInputs = [ + openssl + ]; + + makeWrapperArgs = [ + "--prefix" + "PATH" + ":" + "${lib.makeBinPath [ pandoc ]}" + "--prefix" + "PYTHONPATH" + ":" + "$PYTHONPATH" + ]; + + passthru.updateScript = ./update.sh; + + meta = { + description = "Convert Math-Rich Typst Project to Microsoft Word Format"; + homepage = "https://github.com/sghng/typ2docx"; + changelog = "https://github.com/sghng/typ2docx/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hhr2020 ]; + mainProgram = "typ2docx"; + }; +} diff --git a/pkgs/by-name/ty/typ2docx/update.sh b/pkgs/by-name/ty/typ2docx/update.sh new file mode 100755 index 000000000000..59e165d7a738 --- /dev/null +++ b/pkgs/by-name/ty/typ2docx/update.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts nix-update jq gnused + +set -eou pipefail + +currentVersion=$(nix eval --raw -f . typ2docx.version) +latestVersion=$(curl --fail --silent ${GITHUB_TOKEN:+-H "Authorization: Bearer $GITHUB_TOKEN"} https://api.github.com/repos/sghng/typ2docx/releases/latest | jq --raw-output .tag_name | sed 's/^v//') +echo "latest version: $latestVersion" +echo "current version: $currentVersion" + +if [[ "$latestVersion" == "$currentVersion" ]]; then + echo "package is up-to-date" + exit 0 +fi + +update-source-version typ2docx $latestVersion --source-key=lockFile --ignore-same-version +nix-update typ2docx --version skip diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix index 8ec3c76768b9..f607343dbe10 100644 --- a/pkgs/by-name/va/vacuum-go/package.nix +++ b/pkgs/by-name/va/vacuum-go/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "vacuum-go"; - version = "0.23.5"; + version = "0.23.8"; src = fetchFromGitHub { owner = "daveshanley"; repo = "vacuum"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZRMhnmhuTCr3ulWLh4+yu1oyuyAFFoyuNNFTrzSW15I="; + hash = "sha256-YrYp9CL/ouFMC2agA6PT/OWKEDTRYR1uiR2JpQnS3wk="; }; - vendorHash = "sha256-kpW1i6LJUFMJArSHYMI4taTfAcfDH+E39GOBOKZFu+c="; + vendorHash = "sha256-86ie9wLBXnc4s5GAUiE0CiDkLl717GEN5PggXosMdRs="; env.CGO_ENABLED = 0; ldflags = [ diff --git a/pkgs/by-name/vi/vivify/package.nix b/pkgs/by-name/vi/vivify/package.nix index 66bb1ded08b5..08ebe3c821b0 100644 --- a/pkgs/by-name/vi/vivify/package.nix +++ b/pkgs/by-name/vi/vivify/package.nix @@ -13,18 +13,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "vivify"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "jannis-baum"; repo = "Vivify"; tag = "v${finalAttrs.version}"; - hash = "sha256-h36kI8Pglo6Mvngg1whjMVjI0bv0v0+yPJCZTZ0BpUA="; + hash = "sha256-LjVxSf2rddg9DyAY6MAVFzuoxIT4d1a/8Wv8DukxeYM="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-RPi1yS1eKSwe/w0gzLhr0BGL00tHzpWAnaN3BEs7IWc="; + hash = "sha256-61NXUEpXIFJXRuIZgLAkDqsk6WvV7WU2Qm24ID0oDtw="; }; installPhase = '' diff --git a/pkgs/by-name/vv/vvvvvv/package.nix b/pkgs/by-name/vv/vvvvvv/package.nix index 5ebedb3fc7d7..765a671a02eb 100644 --- a/pkgs/by-name/vv/vvvvvv/package.nix +++ b/pkgs/by-name/vv/vvvvvv/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "vvvvvv"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "TerryCavanagh"; repo = "VVVVVV"; rev = version; - hash = "sha256-SYXuA7RJ0x4d1Lyvmk/R2nofEt5k7OJ91X6w3sGQOhg="; + hash = "sha256-IEspPNsKGWgukqmnb6nDORRetQp9jvUzJ/mSOTLGdmQ="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/wg/wget/package.nix b/pkgs/by-name/wg/wget/package.nix index 0debae3460e7..f49dbaa45108 100644 --- a/pkgs/by-name/wg/wget/package.nix +++ b/pkgs/by-name/wg/wget/package.nix @@ -67,6 +67,12 @@ stdenv.mkDerivation (finalAttrs: { "--without-included-regex" ]; + outputs = [ + "out" + "man" + "info" + ]; + preBuild = '' # avoid runtime references to build-only depends make -C src version.c diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json index 96a3a0a23ee2..456b7e375b34 100644 --- a/pkgs/by-name/wi/windsurf/info.json +++ b/pkgs/by-name/wi/windsurf/info.json @@ -1,20 +1,20 @@ { "aarch64-darwin": { - "version": "1.9544.26", + "version": "1.9544.35", "vscodeVersion": "1.106.0", - "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/c378df247aa57450376bd5346440192e1549717d/Windsurf-darwin-arm64-1.9544.26.zip", - "sha256": "1809bae6f96738a84f200f6f8d6cd4715094bc706cae85a7524191827407c733" + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/cb270b70c3a55fd43530de48988912a8d9cccb20/Windsurf-darwin-arm64-1.9544.35.zip", + "sha256": "84a0e84b5270e5f258ce968aa6bef1de649d90e35085109adb6aa30173dd74bd" }, "x86_64-darwin": { - "version": "1.9544.26", + "version": "1.9544.35", "vscodeVersion": "1.106.0", - "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/c378df247aa57450376bd5346440192e1549717d/Windsurf-darwin-x64-1.9544.26.zip", - "sha256": "14a0a46ff1ab0fec7fbc9eae3b550e00df1523b0b7a973ae595c5911f970a8ed" + "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/cb270b70c3a55fd43530de48988912a8d9cccb20/Windsurf-darwin-x64-1.9544.35.zip", + "sha256": "72d94091ea83b0c97ff7d8d372d096e4323c9fdadbd9276b6fc4b3f43d43fc96" }, "x86_64-linux": { - "version": "1.9544.26", + "version": "1.9544.35", "vscodeVersion": "1.106.0", - "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/c378df247aa57450376bd5346440192e1549717d/Windsurf-linux-x64-1.9544.26.tar.gz", - "sha256": "8f5b5eed328f27875d7536dc09b4d6729bf10ea38b8a043e221c9434bda01170" + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/cb270b70c3a55fd43530de48988912a8d9cccb20/Windsurf-linux-x64-1.9544.35.tar.gz", + "sha256": "8e5a0e41e5caca80072db812b170ad3918923c10c0bdbce1fa851ae403034aa8" } } diff --git a/pkgs/by-name/xr/xremap/package.nix b/pkgs/by-name/xr/xremap/package.nix index 4b4ec597410e..07c12135f812 100644 --- a/pkgs/by-name/xr/xremap/package.nix +++ b/pkgs/by-name/xr/xremap/package.nix @@ -43,13 +43,13 @@ assert ( ); rustPlatform.buildRustPackage (finalAttrs: { pname = "xremap${variant.suffix or ""}"; - version = "0.14.11"; + version = "0.14.12"; src = fetchFromGitHub { owner = "xremap"; repo = "xremap"; tag = "v${finalAttrs.version}"; - hash = "sha256-UNiyUujijIAsEvCRuMZ1MVNwoY/v5Sbo3/2r8vdA6HM="; + hash = "sha256-2pNCdrmpqLTDH2CQBbjSh8OPa8mddp+Zsyq2Sc69Fuk="; }; nativeBuildInputs = [ pkg-config ]; @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildNoDefaultFeatures = true; buildFeatures = variant.features; - cargoHash = "sha256-roa2Akc1XuSGGkBK++qYvmTgVwzA5xNlrf0TdTUoEdM="; + cargoHash = "sha256-ZNItWM+nWhFrvYswn5D9HtW83MWKOSR67KJn7Q+OEM0="; passthru = lib.mapAttrs (name: lib.const (xremap.override { withVariant = name; })) variants; diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix index fa259674fa24..36aac994b024 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix @@ -45,13 +45,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "lomiri-ui-toolkit"; - version = "1.3.5902"; + version = "1.3.5903"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-ui-toolkit"; rev = finalAttrs.version; - hash = "sha256-sNOWDx7pyYuO+Pi7YsPRbT1ChU/EhfHBuGW92H3EEKI="; + hash = "sha256-NdEYXv1LVblUgOu/P8z+vYnd/jNDS+/LFsh63ojJ2KA="; }; outputs = [ diff --git a/pkgs/development/compilers/dart/default.nix b/pkgs/development/compilers/dart/default.nix index 9851edf92549..87831cc8fa4a 100644 --- a/pkgs/development/compilers/dart/default.nix +++ b/pkgs/development/compilers/dart/default.nix @@ -8,25 +8,43 @@ runCommand, cctools, darwin, - sources ? import ./sources.nix { inherit fetchurl; }, - version ? sources.versionUsed, }: -assert sources != null && (builtins.isAttrs sources); stdenv.mkDerivation (finalAttrs: { pname = "dart"; - inherit version; - - nativeBuildInputs = [ unzip ]; + version = "3.10.9"; src = - sources."${version}-${stdenv.hostPlatform.system}" - or (throw "unsupported version/system: ${version}/${stdenv.hostPlatform.system}"); + let + selectSystem = + attrs: + attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + system = selectSystem { + x86_64-linux = "linux-x64"; + aarch64-linux = "linux-arm64"; + x86_64-darwin = "macos-x64"; + aarch64-darwin = "macos-arm64"; + }; + hash = selectSystem { + x86_64-linux = "sha256-1DudOiG4LvKjfTGUW5nmuI9fjcROwZG0c/1inXjQuZQ="; + aarch64-linux = "sha256-Z8mPnmppTtPLNiY0Ny1pRzBAs3EoNtQsr82zxWwKBOs="; + x86_64-darwin = "sha256-pd37vWDOIKGdek/CuUSH7sVyiKqlLOW6GLT4IkzkwYA="; + aarch64-darwin = "sha256-99gMhvkzSJmYEsGuD3kBN1e3l685Xyy6cNICegC+Vk4="; + }; + in + fetchurl { + url = "https://storage.googleapis.com/dart-archive/channels/${ + if lib.strings.hasSuffix ".beta" finalAttrs.version then "beta" else "stable" + }/release/${finalAttrs.version}/sdk/dartsdk-${system}-release.zip"; + inherit hash; + }; + + nativeBuildInputs = [ unzip ]; installPhase = '' runHook preInstall - rm LICENSE + rm LICENSE README revision cp -R . $out '' + lib.optionalString (stdenv.hostPlatform.isLinux) '' diff --git a/pkgs/development/compilers/dart/sources.nix b/pkgs/development/compilers/dart/sources.nix deleted file mode 100644 index 7ca6da8b86b1..000000000000 --- a/pkgs/development/compilers/dart/sources.nix +++ /dev/null @@ -1,23 +0,0 @@ -let - version = "3.10.7"; -in -{ fetchurl }: -{ - versionUsed = version; - "${version}-x86_64-darwin" = fetchurl { - url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip"; - hash = "sha256-EES4leNoHZWFs/nQUJTzN+cCKGzxiANpLJrkXb1UKdA="; - }; - "${version}-aarch64-darwin" = fetchurl { - url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip"; - hash = "sha256-ovQkvU5BpqXHUlUebUKKranJUERhZPsAsfO3N+4jzKs="; - }; - "${version}-aarch64-linux" = fetchurl { - url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip"; - hash = "sha256-gb3NiChgaYFxPFE+PUN37u3sQxxGvzXzJ3xquvLXvVE="; - }; - "${version}-x86_64-linux" = fetchurl { - url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip"; - hash = "sha256-ik7qz012kOAzidYygkG8aaG2HLmA8j1Q9i66y1kg7HQ="; - }; -} diff --git a/pkgs/development/compilers/dart/update.sh b/pkgs/development/compilers/dart/update.sh index e8cfc3b432a6..afc3e2cc6c89 100755 --- a/pkgs/development/compilers/dart/update.sh +++ b/pkgs/development/compilers/dart/update.sh @@ -12,10 +12,10 @@ fi MY_PATH=$(dirname $(realpath "$0")) -update-source-version dart $latestVersion --file=$MY_PATH/sources.nix +update-source-version dart $latestVersion --file=$MY_PATH/default.nix systems=$(nix eval --json -f . dart.meta.platforms | jq --raw-output '.[]') for system in $systems; do hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix eval --raw -f . dart.src.url --system "$system"))) - update-source-version dart $latestVersion $hash --file=$MY_PATH/sources.nix --system=$system --ignore-same-version --ignore-same-hash + update-source-version dart $latestVersion $hash --file=$MY_PATH/default.nix --system=$system --ignore-same-version --ignore-same-hash done diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index 846173c1fe2a..c8b2026c5f88 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -50,30 +50,19 @@ let ; dart = - let - dartChannel = if lib.strings.hasSuffix ".beta" dartVersion then "beta" else "stable"; - in - dart.override { + (dart.overrideAttrs (_: { + # This overrideAttrs is used to replace the version in src.url version = dartVersion; - sources = { - "${dartVersion}-x86_64-linux" = fetchzip { - url = "https://storage.googleapis.com/dart-archive/channels/${dartChannel}/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip"; - hash = dartHash.x86_64-linux; + __intentionallyOverridingVersion = true; + })).overrideAttrs + (oldAttrs: { + src = fetchzip { + inherit (oldAttrs.src) url; + hash = + dartHash.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; - "${dartVersion}-aarch64-linux" = fetchzip { - url = "https://storage.googleapis.com/dart-archive/channels/${dartChannel}/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip"; - hash = dartHash.aarch64-linux; - }; - "${dartVersion}-x86_64-darwin" = fetchzip { - url = "https://storage.googleapis.com/dart-archive/channels/${dartChannel}/release/${dartVersion}/sdk/dartsdk-macos-x64-release.zip"; - hash = dartHash.x86_64-darwin; - }; - "${dartVersion}-aarch64-darwin" = fetchzip { - url = "https://storage.googleapis.com/dart-archive/channels/${dartChannel}/release/${dartVersion}/sdk/dartsdk-macos-arm64-release.zip"; - hash = dartHash.aarch64-darwin; - }; - }; - }; + }); src = let source = fetchFromGitHub { diff --git a/pkgs/development/cuda-modules/packages/cuda_nvcc.nix b/pkgs/development/cuda-modules/packages/cuda_nvcc.nix index 843736314013..5abce2729b4a 100644 --- a/pkgs/development/cuda-modules/packages/cuda_nvcc.nix +++ b/pkgs/development/cuda-modules/packages/cuda_nvcc.nix @@ -168,7 +168,7 @@ buildRedist (finalAttrs: { # The cospi|sinpi|rsqrt function signatures in include/common/math_functions.h do not match # glibc 2.42's. # Indeed, there they are declared with noexcept(true) which is not the case in cuda_nvcc. - + lib.optionals (lib.versionAtLeast glibc.version "2.42") '' + + lib.optionalString (lib.versionAtLeast glibc.version "2.42") '' nixLog "Patching math_functions.h signatures to match glibc's ones" substituteInPlace "''${!outputInclude:?}/include/crt/math_functions.h" \ --replace-fail \ diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix index 1767262c629f..0fcbae274a7a 100644 --- a/pkgs/development/python-modules/aioautomower/default.nix +++ b/pkgs/development/python-modules/aioautomower/default.nix @@ -14,31 +14,28 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, python-dateutil, syrupy, time-machine, tzlocal, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aioautomower"; - version = "2.7.2"; + version = "2.7.3"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "Thomas55555"; repo = "aioautomower"; - tag = "v${version}"; - hash = "sha256-fRfcdE76BJE7GHobZU7mYmmtnN4gBxNd5KofdE0Sm0Y="; + tag = "v${finalAttrs.version}"; + hash = "sha256-O1z0dhVtKfIOr7TrXFiPElC11isD4aDDLmzc0+OX+B8="; }; postPatch = '' # Upstream doesn't set a version substituteInPlace pyproject.toml \ - --replace-fail 'version = "0.0.0"' 'version = "${version}"' + --replace-fail 'version = "0.0.0"' 'version = "${finalAttrs.version}"' ''; build-system = [ @@ -78,8 +75,8 @@ buildPythonPackage rec { meta = { description = "Module to communicate with the Automower Connect API"; homepage = "https://github.com/Thomas55555/aioautomower"; - changelog = "https://github.com/Thomas55555/aioautomower/releases/tag/${src.tag}"; + changelog = "https://github.com/Thomas55555/aioautomower/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/av_13/default.nix b/pkgs/development/python-modules/av_13/default.nix deleted file mode 100644 index 479385a05dba..000000000000 --- a/pkgs/development/python-modules/av_13/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ - buildPythonPackage, - cython, - fetchFromGitHub, - fetchurl, - ffmpeg_7-headless, - lib, - linkFarm, - numpy, - pillow, - pkg-config, - pytestCheckHook, - setuptools, -}: - -buildPythonPackage rec { - pname = "av"; - version = "13.1.0"; # nixpkgs-update: no auto update - pyproject = true; - - src = fetchFromGitHub { - owner = "PyAV-Org"; - repo = "PyAV"; - tag = "v${version}"; - hash = "sha256-x2a9SC4uRplC6p0cD7fZcepFpRidbr6JJEEOaGSWl60="; - }; - - build-system = [ - cython - setuptools - ]; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ ffmpeg_7-headless ]; - - preCheck = - let - testSamples = linkFarm "pyav-test-samples" ( - lib.mapAttrs (_: fetchurl) (lib.importTOML ../av/test-samples.toml) - ); - in - '' - # ensure we import the built version - rm -r av - ln -s ${testSamples} tests/assets - ''; - - nativeCheckInputs = [ - numpy - pillow - pytestCheckHook - ]; - - __darwinAllowLocalNetworking = true; - - pythonImportsCheck = [ - "av" - "av.audio" - "av.buffer" - "av.bytesource" - "av.codec" - "av.container" - "av._core" - "av.datasets" - "av.descriptor" - "av.dictionary" - "av.error" - "av.filter" - "av.format" - "av.frame" - "av.logging" - "av.option" - "av.packet" - "av.plane" - "av.stream" - "av.subtitles" - "av.utils" - "av.video" - ]; - - passthru.skipBulkUpdate = true; - - meta = { - changelog = "https://github.com/PyAV-Org/PyAV/blob/${src.tag}/CHANGELOG.rst"; - description = "Pythonic bindings for FFmpeg"; - homepage = "https://github.com/PyAV-Org/PyAV"; - license = lib.licenses.bsd2; - mainProgram = "pyav"; - maintainers = [ lib.maintainers.dotlambda ]; - }; -} diff --git a/pkgs/development/python-modules/banks/default.nix b/pkgs/development/python-modules/banks/default.nix index 213b90d4e75d..d4feaeaaf940 100644 --- a/pkgs/development/python-modules/banks/default.nix +++ b/pkgs/development/python-modules/banks/default.nix @@ -5,6 +5,7 @@ deprecated, eval-type-backport, fetchFromGitHub, + filetype, griffe, hatchling, jinja2, @@ -16,16 +17,16 @@ redis, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "banks"; - version = "2.3.0"; + version = "2.4.0"; pyproject = true; src = fetchFromGitHub { owner = "masci"; repo = "banks"; - tag = "v${version}"; - hash = "sha256-6+BQS9srj2VT2XcGe9g5Ios6g/vk3GcOXgCWEKq6YHI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-rIN90R/olhBvOUlgh9KUV/1MxO814g561gTJam98Ny0="; }; SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; @@ -35,6 +36,7 @@ buildPythonPackage rec { dependencies = [ deprecated eval-type-backport + filetype griffe jinja2 platformdirs @@ -52,15 +54,15 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies); pythonImportsCheck = [ "banks" ]; meta = { description = "Module that provides tools and functions to build prompts text and chat messages from generic blueprints"; homepage = "https://github.com/masci/banks"; - changelog = "https://github.com/masci/banks/releases/tag/${src.tag}"; + changelog = "https://github.com/masci/banks/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/enamlx/default.nix b/pkgs/development/python-modules/enamlx/default.nix index 4d0a7421af5d..c694361e8db6 100644 --- a/pkgs/development/python-modules/enamlx/default.nix +++ b/pkgs/development/python-modules/enamlx/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, enaml, pyqtgraph, - pyqt5, pythonocc-core, typing-extensions, }: @@ -25,7 +24,6 @@ buildPythonPackage rec { enaml # Until https://github.com/inkcut/inkcut/issues/105 perhaps pyqtgraph - pyqt5 pythonocc-core typing-extensions ]; diff --git a/pkgs/development/python-modules/magicgui/default.nix b/pkgs/development/python-modules/magicgui/default.nix index f671756010c2..15482f676b2c 100644 --- a/pkgs/development/python-modules/magicgui/default.nix +++ b/pkgs/development/python-modules/magicgui/default.nix @@ -8,6 +8,9 @@ napari, # a reverse-dependency, for tests psygnal, pyside2, + pyside6, + pyqt6, + pyqt5, pytestCheckHook, superqt, typing-extensions, @@ -33,11 +36,17 @@ buildPythonPackage rec { dependencies = [ typing-extensions superqt - pyside2 psygnal docstring-parser ]; + optional-dependencies = { + pyside2 = [ pyside2 ]; + pyside6 = [ pyside6 ]; + pyqt6 = [ pyqt6 ]; + pyqt5 = [ pyqt5 ]; + }; + nativeCheckInputs = [ pytestCheckHook ]; doCheck = false; # Reports "Fatal Python error" diff --git a/pkgs/development/python-modules/manim/default.nix b/pkgs/development/python-modules/manim/default.nix index 3e5cdfc308b7..560975af90a0 100644 --- a/pkgs/development/python-modules/manim/default.nix +++ b/pkgs/development/python-modules/manim/default.nix @@ -188,13 +188,13 @@ in buildPythonPackage rec { pname = "manim"; pyproject = true; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "ManimCommunity"; repo = "manim"; tag = "v${version}"; - hash = "sha256-VkMmIQNLUg6Epttze23vaAA8QOdlnAPQZ7UKpkFRzIk="; + hash = "sha256-sM2IQdrqWVopo5Yzjmv6/KTHkgb/7Fma+plAc+gGwaM="; }; build-system = [ @@ -236,6 +236,10 @@ buildPythonPackage rec { audioop-lts ]; + pythonRelaxDeps = [ + "skia-pathops" + ]; + optional-dependencies = { jupyterlab = [ jupyterlab @@ -270,8 +274,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "manim" ]; meta = { - # https://github.com/ManimCommunity/manim/pull/4037 - broken = lib.versionAtLeast av.version "14"; description = "Animation engine for explanatory math videos - Community version"; longDescription = '' Manim is an animation engine for explanatory math videos. It's used to @@ -283,6 +285,9 @@ buildPythonPackage rec { changelog = "https://github.com/ManimCommunity/manim/releases/tag/${src.tag}"; homepage = "https://github.com/ManimCommunity/manim"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ osbm ]; + maintainers = with lib.maintainers; [ + osbm + ivyfanchiang + ]; }; } diff --git a/pkgs/development/python-modules/mistral-inference/default.nix b/pkgs/development/python-modules/mistral-inference/default.nix new file mode 100644 index 000000000000..e3476a900c47 --- /dev/null +++ b/pkgs/development/python-modules/mistral-inference/default.nix @@ -0,0 +1,90 @@ +{ + lib, + config, + buildPythonPackage, + fetchFromGitHub, + pythonAtLeast, + + # build-system + poetry-core, + + # dependencies + fire, + mistral-common, + pillow, + safetensors, + simple-parsing, + xformers, + + # tests + mamba-ssm, + pycountry, + pytestCheckHook, + writableTmpDirAsHomeHook, + + # passthu + mistral-inference, +}: + +buildPythonPackage (finalAttrs: { + pname = "mistral-inference"; + version = "1.6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mistralai"; + repo = "mistral-inference"; + tag = "v${finalAttrs.version}"; + hash = "sha256-dcBlZWrgQn7eiNsjTS8882X9quHbgTfXxTK7HLpbLM8="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + fire + mistral-common + pillow + pycountry + safetensors + simple-parsing + xformers + ]; + + nativeCheckInputs = [ + mamba-ssm + pytestCheckHook + writableTmpDirAsHomeHook + ]; + + # Tests require GPU access in the sandbox + doCheck = false; + + disabledTests = lib.optionals (pythonAtLeast "3.14") [ + # AttributeError("module 'ast' has no attribute 'Num'") + "test_generation_mamba" + ]; + + passthru.gpuCheck = mistral-inference.overridePythonAttrs { + requiredSystemFeatures = [ "cuda" ]; + doCheck = true; + }; + + pythonImportsCheck = [ "mistral_inference" ]; + + meta = { + description = "High-performance library for running Mistral AI models on local hardware"; + homepage = "https://github.com/mistralai/mistral-inference"; + changelog = "https://github.com/mistralai/mistral-inference/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + GaetanLepage + mana-byte + ]; + mainProgram = "mistral-chat"; + # Explicitly requires an NVIDIA GPU to work + broken = !config.cudaSupport; + }; +}) diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix index 32241e11b9bd..cc88e3f3a3e5 100644 --- a/pkgs/development/python-modules/mitogen/default.nix +++ b/pkgs/development/python-modules/mitogen/default.nix @@ -7,14 +7,14 @@ buildPythonPackage (finalAttrs: { pname = "mitogen"; - version = "0.3.39"; + version = "0.3.40"; pyproject = true; src = fetchFromGitHub { owner = "mitogen-hq"; repo = "mitogen"; tag = "v${finalAttrs.version}"; - hash = "sha256-VX8BvHTL3Ke6T+iGc4YGery5uXf/JvE7h5dnyK4/ESY="; + hash = "sha256-yGIXgqngr4hjejCuYaNTArncbs0Pcg1Iia5geujPQhg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 1c1977195699..419cec28e2e5 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -17,13 +17,6 @@ requests, tqdm, - # optional-dependencies - matplotlib, - scikit-image, - scikit-learn, - scipy, - yt-dlp, - # tests pytest-timeout, pytestCheckHook, @@ -56,21 +49,10 @@ buildPythonPackage rec { tqdm ]; - optional-dependencies = { - optionals = [ - matplotlib - scikit-image - scikit-learn - scipy - yt-dlp - ]; - }; - nativeCheckInputs = [ pytest-timeout pytestCheckHook - ] - ++ lib.concatAttrValues optional-dependencies; + ]; # See https://github.com/NixOS/nixpkgs/issues/381908 and https://github.com/NixOS/nixpkgs/issues/385450. pytestFlags = [ "--timeout=600" ]; diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index b2832485eae8..18d79d06ceb0 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -1,6 +1,5 @@ { lib, - mkDerivationWith, buildPythonPackage, fetchFromGitHub, @@ -9,7 +8,7 @@ setuptools-scm, # nativeBuildInputs - wrapQtAppsHook, + qt6, # dependencies app-model, @@ -54,7 +53,7 @@ zarr, }: -mkDerivationWith buildPythonPackage rec { +buildPythonPackage rec { pname = "napari"; version = "0.6.6"; pyproject = true; @@ -76,7 +75,11 @@ mkDerivationWith buildPythonPackage rec { setuptools-scm ]; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ qt6.wrapQtAppsHook ]; + + buildInputs = [ + qt6.qtbase + ]; pythonRelaxDeps = [ "app-model" diff --git a/pkgs/development/python-modules/pdfservices-sdk/default.nix b/pkgs/development/python-modules/pdfservices-sdk/default.nix new file mode 100644 index 000000000000..243899696ff5 --- /dev/null +++ b/pkgs/development/python-modules/pdfservices-sdk/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + defusedxml, + requests, + sphinx, + sphinx-rtd-theme, +}: + +buildPythonPackage rec { + pname = "pdfservices-sdk"; + version = "4.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "adobe"; + repo = "pdfservices-python-sdk"; + tag = "v${version}"; + hash = "sha256-m2k+IS+M8UrdrpLnk2OwRolAVq73StMY1WnxzOujBIM="; + }; + + pythonRelaxDeps = true; + + build-system = [ + setuptools + ]; + + dependencies = [ + defusedxml + requests + sphinx + sphinx-rtd-theme + ]; + + pythonImportsCheck = [ + "adobe.pdfservices" + ]; + + meta = { + description = "Adobe PDFServices Python SDK"; + homepage = "https://github.com/adobe/pdfservices-python-sdk"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ hhr2020 ]; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; + }; +} diff --git a/pkgs/development/python-modules/piccolo/default.nix b/pkgs/development/python-modules/piccolo/default.nix index 7e803cc6d87a..7d4558e8e782 100644 --- a/pkgs/development/python-modules/piccolo/default.nix +++ b/pkgs/development/python-modules/piccolo/default.nix @@ -21,16 +21,16 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "piccolo"; - version = "1.30.0"; + version = "1.31.0"; pyproject = true; src = fetchFromGitHub { owner = "piccolo-orm"; repo = "piccolo"; - tag = version; - hash = "sha256-CR6zdaWFwhCGQsSxxUU9f3+A3RcuksG0+EUN2IotovA="; + tag = finalAttrs.version; + hash = "sha256-ZREsvxj9fWNwbbO2erUchiXCuaFh9vziWQjdaJBl/QI="; }; build-system = [ setuptools ]; @@ -59,7 +59,7 @@ buildPythonPackage rec { pytestCheckHook python-dateutil ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies); pythonImportsCheck = [ "piccolo" ]; @@ -99,8 +99,8 @@ buildPythonPackage rec { meta = { description = "ORM and query builder which supports asyncio"; homepage = "https://github.com/piccolo-orm/piccolo"; - changelog = "https://github.com/piccolo-orm/piccolo/blob/${src.tag}/CHANGES.rst"; + changelog = "https://github.com/piccolo-orm/piccolo/blob/${finalAttrs.src.tag}/CHANGES.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/pybrowsers/default.nix b/pkgs/development/python-modules/pybrowsers/default.nix index 256d7e566c93..714e840f5794 100644 --- a/pkgs/development/python-modules/pybrowsers/default.nix +++ b/pkgs/development/python-modules/pybrowsers/default.nix @@ -5,16 +5,16 @@ poetry-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pybrowsers"; - version = "1.3.1"; + version = "1.3.2"; pyproject = true; src = fetchFromGitHub { owner = "roniemartinez"; repo = "browsers"; - tag = version; - hash = "sha256-yTEqqGbwvpNyY/lOs3wjmXngclxv3dOb7jzlmJKMwG0="; + tag = finalAttrs.version; + hash = "sha256-MpTCeu2rxIx6JByosL2C3hayrMIfKD/2kZT3AJpjKZw="; }; build-system = [ poetry-core ]; @@ -27,8 +27,8 @@ buildPythonPackage rec { meta = { description = "Python library for detecting and launching browsers"; homepage = "https://github.com/roniemartinez/browsers"; - changelog = "https://github.com/roniemartinez/browsers/releases/tag/${src.tag}"; + changelog = "https://github.com/roniemartinez/browsers/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/qreactor/default.nix b/pkgs/development/python-modules/qreactor/default.nix index 42d50befe550..3368929fe9e6 100644 --- a/pkgs/development/python-modules/qreactor/default.nix +++ b/pkgs/development/python-modules/qreactor/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, twisted, qtpy, - pyqt5, + pyqt6, }: buildPythonPackage { @@ -19,12 +19,14 @@ buildPythonPackage { sha256 = "1nb5iwg0nfz86shw28a2kj5pyhd4jvvxhf73fhnfbl8scgnvjv9h"; }; + strictDeps = true; + propagatedBuildInputs = [ twisted qtpy ]; - nativeCheckInputs = [ pyqt5 ]; + nativeCheckInputs = [ pyqt6 ]; pythonImportsCheck = [ "qreactor" ]; diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix index 0ebfd595ed30..9542f065017d 100644 --- a/pkgs/development/python-modules/qtawesome/default.nix +++ b/pkgs/development/python-modules/qtawesome/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - pyqt5, + pyqt6, pytestCheckHook, qtpy, }: @@ -20,7 +20,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - pyqt5 + pyqt6 qtpy ]; diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index a6382daba378..e3d92b9de64a 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -11,7 +11,7 @@ jupyter-core, jupyter-client, pygments, - pyqt5, + pyqt6, qtpy, traitlets, @@ -38,7 +38,7 @@ buildPythonPackage rec { jupyter-core jupyter-client pygments - pyqt5 + pyqt6 qtpy traitlets ]; diff --git a/pkgs/development/python-modules/saxonche/default.nix b/pkgs/development/python-modules/saxonche/default.nix new file mode 100644 index 000000000000..c0b51c52deb2 --- /dev/null +++ b/pkgs/development/python-modules/saxonche/default.nix @@ -0,0 +1,50 @@ +{ + lib, + autoPatchelfHook, + buildPythonPackage, + fetchPypi, + python, + stdenv, + zlib, +}: +let + pythonVersionNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; + inherit (stdenv.hostPlatform) system; + releases = lib.importJSON ./releases.json; +in +buildPythonPackage rec { + pname = "saxonche"; + inherit (releases) version; + format = "wheel"; + + src = fetchPypi { + pname = "saxonche"; + inherit version; + format = "wheel"; + python = "cp${pythonVersionNoDot}"; + abi = "cp${pythonVersionNoDot}"; + dist = "cp${pythonVersionNoDot}"; + platform = releases."cp${pythonVersionNoDot}-${system}".platform or (throw "unsupported system"); + hash = releases."cp${pythonVersionNoDot}-${system}".hash or (throw "unsupported system"); + }; + + dontBuild = true; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; + + buildInputs = [ + zlib + ]; + + pythonImportsCheck = [ "saxonche" ]; + + passthru.updateScript = ./update.py; + + meta = { + description = "Official Python package for the SaxonC-HE processor"; + homepage = "https://www.saxonica.com/saxon-c/index.xml"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ hhr2020 ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/development/python-modules/saxonche/releases.json b/pkgs/development/python-modules/saxonche/releases.json new file mode 100644 index 000000000000..9a6e61e21b78 --- /dev/null +++ b/pkgs/development/python-modules/saxonche/releases.json @@ -0,0 +1,99 @@ +{ + "version": "12.9.0", + "cp310-x86_64-darwin": { + "platform": "macosx_10_11_x86_64", + "hash": "sha256-SnYpDIY8EFfSkb3BynBB4ZH0+nZyPuWLNPXWR1CIMLY=" + }, + "cp310-aarch64-darwin": { + "platform": "macosx_11_0_arm64", + "hash": "sha256-3o9mr1BFQLZZCcpDZBxMmt88FD7XHJEBuJegXYBjaak=" + }, + "cp310-aarch64-linux": { + "platform": "manylinux_2_24_aarch64", + "hash": "sha256-8nTz+9AWp4sle4wahXJKZL72OMfAP+moTJXBH3ILn5U=" + }, + "cp310-x86_64-linux": { + "platform": "manylinux_2_24_x86_64", + "hash": "sha256-ITbgS01T8huu8QAUw2SHSCQgWdeoghX+UAsOVL2c4ww=" + }, + "cp311-x86_64-darwin": { + "platform": "macosx_10_11_x86_64", + "hash": "sha256-C+swRRRBF43QEVkjQp/0M00phpr+/PcDoesjIEuuS8o=" + }, + "cp311-aarch64-darwin": { + "platform": "macosx_11_0_arm64", + "hash": "sha256-DlHMuRRdBtkYdEGok8PomfSHcRXHuVpqKCM4rek5prg=" + }, + "cp311-aarch64-linux": { + "platform": "manylinux_2_24_aarch64", + "hash": "sha256-ZWN2m242Q8u/cZ8rHzipx0YdfY3elQGnfFuFbCemGOI=" + }, + "cp311-x86_64-linux": { + "platform": "manylinux_2_24_x86_64", + "hash": "sha256-hlqyyA2T1wSBZmKdE0KJ4TY+wUd3ADuTd5pFeY5C4MY=" + }, + "cp312-x86_64-darwin": { + "platform": "macosx_10_11_x86_64", + "hash": "sha256-wDl0O7SuQgqkzar66IBIqXNdP6jns9iS0orklSjbo7E=" + }, + "cp312-aarch64-darwin": { + "platform": "macosx_11_0_arm64", + "hash": "sha256-mXKva5ajdH5Lb6enbgNtK8SDEI3HH+ufeA7OUeNOBr4=" + }, + "cp312-aarch64-linux": { + "platform": "manylinux_2_24_aarch64", + "hash": "sha256-Us12nO+baJ731z1Jfs/Lr3m+CuH1GtcZDMK6awsFw/E=" + }, + "cp312-x86_64-linux": { + "platform": "manylinux_2_24_x86_64", + "hash": "sha256-SQ8w6UhnUPagZt4rRnEU39bhTSPIzmRcrWTmY/WASQo=" + }, + "cp313-x86_64-darwin": { + "platform": "macosx_10_11_x86_64", + "hash": "sha256-pnAVA41KuwOaUbk1ry6YaoMTj5/ibIPyiOlydkS/g9c=" + }, + "cp313-aarch64-darwin": { + "platform": "macosx_11_0_arm64", + "hash": "sha256-uqw/nArOticdA6hwBfbFMaq6wjserj7ssdxl1/iBfpE=" + }, + "cp313-aarch64-linux": { + "platform": "manylinux_2_24_aarch64", + "hash": "sha256-Wxap5a54viT4PaaixeaYtZyk3o9ogAIvBRNRFwtp+dA=" + }, + "cp313-x86_64-linux": { + "platform": "manylinux_2_24_x86_64", + "hash": "sha256-t9KV3erj58NVz1MDXsR6HbMBqLm8kXY2+JO1ajGkgYc=" + }, + "cp314-aarch64-darwin": { + "platform": "macosx_11_0_arm64", + "hash": "sha256-O0UUZ3D2RZ4QxwkR/SjodB/NLN4HtTY58gCPmNWxUGc=" + }, + "cp314-x86_64-darwin": { + "platform": "macosx_11_0_x86_64", + "hash": "sha256-y1k0A3c3+3ly9T6UCBZfGHxOzqXvIT/NvCG3hvRnp4Q=" + }, + "cp314-aarch64-linux": { + "platform": "manylinux_2_24_aarch64", + "hash": "sha256-oaebbnE665TMMIFSU73pbG36vo6m8hSWntDkrmCYD2g=" + }, + "cp314-x86_64-linux": { + "platform": "manylinux_2_24_x86_64", + "hash": "sha256-tq0/kHqHERdyuIexF1QrT9AwJTwjaxu3GQKXLO/PVdo=" + }, + "cp39-x86_64-darwin": { + "platform": "macosx_10_11_x86_64", + "hash": "sha256-FhKq8g/NedtAhhVoxxJqIg3iPreWXJQXM6CADOQmqts=" + }, + "cp39-aarch64-darwin": { + "platform": "macosx_11_0_arm64", + "hash": "sha256-9zNMcbScwKokc+sXvM1GH4GBE3Nsvm8kl/KKNbCqOxQ=" + }, + "cp39-aarch64-linux": { + "platform": "manylinux_2_24_aarch64", + "hash": "sha256-+fpWZqMiOOUJpLpEDYXF8aIHhq9Hn8wlXqYc5Cb9NHc=" + }, + "cp39-x86_64-linux": { + "platform": "manylinux_2_24_x86_64", + "hash": "sha256-37G/UxcYnNQKbaxJaN8D4TuA2UbDJK/EgAlx4G/3VP0=" + } +} diff --git a/pkgs/development/python-modules/saxonche/update.py b/pkgs/development/python-modules/saxonche/update.py new file mode 100755 index 000000000000..87489705c575 --- /dev/null +++ b/pkgs/development/python-modules/saxonche/update.py @@ -0,0 +1,54 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p 'python3.withPackages(ps: [ps.requests ps.packaging])' +import json +import requests +from pathlib import Path +from packaging.utils import parse_wheel_filename +import base64 + +HERE = Path(__file__).parent + + +def write_release(releases): + with HERE.joinpath("releases.json").open("w") as fd: + json.dump(releases, fd, indent=2) + fd.write("\n") + + +wheels = {} + +resp = requests.get("https://pypi.org/pypi/saxonche/json") +assert resp.status_code == 200 +resp = resp.json() +version = resp["info"]["version"] +wheels["version"] = version + +for file in resp["urls"]: + python_version: str = file["python_version"] # for example "cp310" + _, _, _, tags = parse_wheel_filename(file["filename"]) + (tag,) = tags # There should only be one tag, take it from the frozenset + platform = tag.platform + + if "x86_64" in platform: + isa = "x86_64" + elif "arm64" in platform or "aarch64" in platform: + isa = "aarch64" + else: + continue + + if "macosx" in platform: + os = "darwin" + elif "manylinux" in platform: + os = "linux" + else: + continue + + hex_hash: str = file["digests"]["sha256"] + sri_hash = f"sha256-{base64.b64encode(bytes.fromhex(hex_hash)).decode('utf-8')}" + + wheels[f"{python_version}-{isa}-{os}"] = { + "platform": platform, + "hash": sri_hash, + } + +write_release(wheels) diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index d92e7e56b634..7e0a1ecba5d3 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -4,7 +4,7 @@ fetchPypi, # nativeBuildInputs - pyqtwebengine, + pyqt6-webengine, # build-system setuptools, @@ -36,6 +36,7 @@ pylint-venv, pyls-spyder, pyopengl, + pyqt6, python-lsp-black, python-lsp-ruff, python-lsp-server, @@ -55,6 +56,7 @@ three-merge, watchdog, yarl, + qt6, }: buildPythonPackage rec { @@ -69,7 +71,7 @@ buildPythonPackage rec { patches = [ ./dont-clear-pythonpath.patch ]; - nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; + nativeBuildInputs = [ qt6.wrapQtAppsHook ]; build-system = [ setuptools ]; @@ -78,6 +80,11 @@ buildPythonPackage rec { "python-lsp-server" ]; + buildInputs = [ + qt6.qtbase + qt6.qtwayland + ]; + dependencies = [ aiohttp asyncssh @@ -105,7 +112,7 @@ buildPythonPackage rec { pylint-venv pyls-spyder pyopengl - pyqtwebengine + pyqt6-webengine python-lsp-black python-lsp-ruff python-lsp-server @@ -125,12 +132,15 @@ buildPythonPackage rec { three-merge watchdog yarl + pyqt6 ] ++ python-lsp-server.optional-dependencies.all; # There is no test for spyder doCheck = false; + env.SPYDER_QT_BINDING = "pyqt6"; + postInstall = '' # Add Python libs to env so Spyder subprocesses # created to run compute kernels don't fail with ImportErrors diff --git a/pkgs/development/python-modules/sqlmodel/default.nix b/pkgs/development/python-modules/sqlmodel/default.nix index 174c24138d48..69c5cbde7885 100644 --- a/pkgs/development/python-modules/sqlmodel/default.nix +++ b/pkgs/development/python-modules/sqlmodel/default.nix @@ -12,16 +12,16 @@ sqlalchemy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sqlmodel"; - version = "0.0.31"; + version = "0.0.32"; pyproject = true; src = fetchFromGitHub { owner = "tiangolo"; repo = "sqlmodel"; - tag = version; - hash = "sha256-HJ8we0gYySagUvs7NEKcwe9l7KEcqmJ8+CTW/rjBdME="; + tag = finalAttrs.version; + hash = "sha256-+92QPpWFHs2qUUR5au6MKO/wHIk+4lXYX/gFfxKzafo="; }; build-system = [ pdm-backend ]; @@ -50,8 +50,8 @@ buildPythonPackage rec { meta = { description = "Module to work with SQL databases"; homepage = "https://github.com/fastapi/sqlmodel"; - changelog = "https://github.com/fastapi/sqlmodel/releases/tag/${src.tag}"; + changelog = "https://github.com/fastapi/sqlmodel/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix index 8b136351093f..aaba190c7e63 100644 --- a/pkgs/development/python-modules/superqt/default.nix +++ b/pkgs/development/python-modules/superqt/default.nix @@ -34,7 +34,6 @@ buildPythonPackage rec { dependencies = [ pygments - pyqt5 qtpy typing-extensions ]; @@ -44,6 +43,7 @@ buildPythonPackage rec { pyside2 = [ pyside2 ]; pyside6 = [ pyside6 ]; pyqt6 = [ pyqt6 ]; + pyqt5 = [ pyqt5 ]; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/types-tqdm/default.nix b/pkgs/development/python-modules/types-tqdm/default.nix index ec2a0e755d74..64abe4872ce9 100644 --- a/pkgs/development/python-modules/types-tqdm/default.nix +++ b/pkgs/development/python-modules/types-tqdm/default.nix @@ -6,15 +6,15 @@ types-requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-tqdm"; - version = "4.67.0.20250809"; + version = "4.67.3.20260205"; pyproject = true; src = fetchPypi { pname = "types_tqdm"; - inherit version; - hash = "sha256-Ar96uRJWCAucTGP58RtRnCe6r1Jxjl/auelgbaFo1QA="; + inherit (finalAttrs) version; + hash = "sha256-8wI2gtSqO7v5CMjGuzXzVpLTGUYNm70+ZG6IUvPdn4U="; }; build-system = [ setuptools ]; @@ -30,4 +30,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -} +}) diff --git a/pkgs/development/python-modules/typst/default.nix b/pkgs/development/python-modules/typst/default.nix index b114d6095e73..e6e94fb7898a 100644 --- a/pkgs/development/python-modules/typst/default.nix +++ b/pkgs/development/python-modules/typst/default.nix @@ -12,19 +12,19 @@ buildPythonPackage (finalAttrs: { pname = "typst"; - version = "0.14.7"; + version = "0.14.8"; pyproject = true; src = fetchFromGitHub { owner = "messense"; repo = "typst-py"; tag = "v${finalAttrs.version}"; - hash = "sha256-GhXsfsJieBMKvHji4YGfZtvGMIa3k353Erb7V8RSDkU="; + hash = "sha256-hJOAcP4MyI7TCY8M99OVaMhFhp2RbhBekCc1mjqBvcc="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-A/iNQifMjpAMdoiEF3GaBe74mfsv8i/EwQL+ZmMc1YM="; + hash = "sha256-trmnUSIYr5X3UyJjbd7VYko71ziPsvR7l1c0XfFzC80="; }; build-system = [ diff --git a/pkgs/development/python-modules/vl-convert-python/default.nix b/pkgs/development/python-modules/vl-convert-python/default.nix index 00e83458a5b3..48245b2a670c 100644 --- a/pkgs/development/python-modules/vl-convert-python/default.nix +++ b/pkgs/development/python-modules/vl-convert-python/default.nix @@ -11,21 +11,21 @@ }: buildPythonPackage rec { pname = "vl-convert-python"; - version = "1.8.0"; + version = "1.9.0"; pyproject = true; src = fetchFromGitHub { owner = "vega"; repo = "vl-convert"; tag = "v${version}"; - hash = "sha256-jOqqqr6O/wHFwUHJ/7iE4N/JXXH1MvqQkAQJ47Ww7YI="; + hash = "sha256-W23cau2VzpvfO6DRa/40UVv4j8AbsNLfAfDaMkTyj6w="; }; patches = [ ./libffi-sys-system-feature.patch ]; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-oPUpX7aMZBSsVujcXkIBNL8pk2JJ0RyBCwoVsuARkkQ="; + hash = "sha256-P228JMS5K0TbZYyPgKhIbZ1NviwO1jHO5dClFYerNbI="; }; buildAndTestSubdir = "vl-convert-python"; diff --git a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix index 841bc5312442..fafe7cfeaa1c 100644 --- a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix +++ b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix @@ -13,16 +13,16 @@ websockets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "whirlpool-sixth-sense"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "abmantis"; repo = "whirlpool-sixth-sense"; - tag = version; - hash = "sha256-n+PZHk64F7azgqeio8F5b/AheaZMh5TjvUXTgTc7q4A="; + tag = finalAttrs.version; + hash = "sha256-uX1Q4F6pcc/mPdopPgyU63p4yeo9YPmUGbn0sxW09Yo="; }; build-system = [ setuptools ]; @@ -46,8 +46,8 @@ buildPythonPackage rec { meta = { description = "Python library for Whirlpool 6th Sense appliances"; homepage = "https://github.com/abmantis/whirlpool-sixth-sense/"; - changelog = "https://github.com/abmantis/whirlpool-sixth-sense/releases/tag/${src.tag}"; + changelog = "https://github.com/abmantis/whirlpool-sixth-sense/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/whisperx/default.nix b/pkgs/development/python-modules/whisperx/default.nix index 235bca7af2fe..a2e5b132259f 100644 --- a/pkgs/development/python-modules/whisperx/default.nix +++ b/pkgs/development/python-modules/whisperx/default.nix @@ -8,9 +8,9 @@ setuptools, # dependencies - av, ctranslate2, faster-whisper, + huggingface-hub, nltk, numpy, pandas, @@ -38,14 +38,14 @@ let in buildPythonPackage rec { pname = "whisperx"; - version = "3.7.4"; + version = "3.7.6"; pyproject = true; src = fetchFromGitHub { owner = "m-bain"; repo = "whisperX"; tag = "v${version}"; - hash = "sha256-wmCGHRx1JaOs5+7fp2jeh8PIR5dlmOl8hKrIw2550Bk="; + hash = "sha256-ZHPGQP5HIuFafHGS6ykiSNtHY6QHh0o8DUE2lV41lUI="; }; # As `makeWrapperArgs` does not apply to the module, and whisperx depends on `ffmpeg`, @@ -60,7 +60,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; pythonRelaxDeps = [ - "av" "numpy" "pandas" "pyannote-audio" @@ -68,9 +67,9 @@ buildPythonPackage rec { "torchaudio" ]; dependencies = [ - av ctranslate faster-whisper + huggingface-hub nltk numpy pandas @@ -83,13 +82,6 @@ buildPythonPackage rec { triton ]; - # Import check fails due on `aarch64-linux` ONLY in the sandbox due to onnxruntime - # not finding its default logger, which then promptly segfaults. - # Simply run the import check on every other platform instead. - pythonImportsCheck = lib.optionals ( - !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) - ) [ "whisperx" ]; - # No tests in repository doCheck = false; @@ -100,5 +92,14 @@ buildPythonPackage rec { changelog = "https://github.com/m-bain/whisperX/releases/tag/${src.tag}"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.bengsparks ]; + + # nixpkgs has `pyannote-audio` >= 4.0.0, but `whisperx`'s `pyproject.toml` specifies <4.0.0. + # + # See https://github.com/m-bain/whisperX/issues/1240 for a serious discussion, + # and a potential upgrade in https://github.com/m-bain/whisperX/pull/1243. + # Alternatively read https://github.com/m-bain/whisperX/issues/1336 if you prefer a more humorous perspective. + # + # Failure was first documented in nixpkgs under https://github.com/NixOS/nixpkgs/issues/460172. + broken = true; }; } diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 8fa5fbc30eeb..1df2ea37c8a3 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -63,5 +63,6 @@ stdenv.mkDerivation (finalAttrs: { kashw2 ]; platforms = lib.platforms.unix; + mainProgram = "sbt"; }; }) diff --git a/pkgs/development/tools/zls/default.nix b/pkgs/development/tools/zls/default.nix index 849309893cdf..9e6e2b4eb207 100644 --- a/pkgs/development/tools/zls/default.nix +++ b/pkgs/development/tools/zls/default.nix @@ -40,7 +40,7 @@ lib.mapAttrs (_: extension: stdenv.mkDerivation (lib.extends common extension)) nativeBuildInputs = [ zig_0_14 ]; - postPatch = '' + postConfigure = '' ln -s ${callPackage ./deps_0_14.nix { }} $ZIG_GLOBAL_CACHE_DIR/p ''; }; @@ -58,7 +58,7 @@ lib.mapAttrs (_: extension: stdenv.mkDerivation (lib.extends common extension)) nativeBuildInputs = [ zig_0_15 ]; - postPatch = '' + postConfigure = '' ln -s ${callPackage ./deps_0_15.nix { }} $ZIG_GLOBAL_CACHE_DIR/p ''; }; diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix index 62ba72222d4b..e4b10e79d42d 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix @@ -4,18 +4,13 @@ fetchurl, b43FirmwareCutter, }: - -let - version = "5.100.138"; -in - -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "b43-firmware"; - inherit version; + version = "5.100.138"; src = fetchurl { - url = "http://www.lwfinger.com/b43-firmware/broadcom-wl-${version}.tar.bz2"; - sha256 = "0vz4ka8gycf72gmnaq61k8rh8y17j1wm2k3fidxvcqjvmix0drzi"; + url = "https://github.com/minios-linux/b43-firmware/releases/download/b43-firmware/broadcom-wl-${finalAttrs.version}.tar.bz2"; + hash = "sha256-8ecGeqxbYrZ7i25MUXmQJ3gEM5rBYGXrE8cx/5Ca5G8="; }; nativeBuildInputs = [ b43FirmwareCutter ]; @@ -29,5 +24,6 @@ stdenvNoCC.mkDerivation { description = "Firmware for cards supported by the b43 kernel module"; homepage = "https://wireless.wiki.kernel.org/en/users/drivers/b43"; license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryFirmware ]; }; -} +}) diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix index b85f5f60385c..34b3e8cf2775 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix @@ -4,14 +4,13 @@ fetchurl, b43FirmwareCutter, }: - -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "b43-firmware"; version = "6.30.163.46"; src = fetchurl { - url = "http://www.lwfinger.com/b43-firmware/broadcom-wl-${version}.tar.bz2"; - sha256 = "0baw6gcnrhxbb447msv34xg6rmlcj0gm3ahxwvdwfcvq4xmknz50"; + url = "https://github.com/minios-linux/b43-firmware/releases/download/b43-firmware/broadcom-wl-${finalAttrs.version}.tar.bz2"; + hash = "sha256-oHw7ayd4M8fb5h2qUR+QjNZsXidj63oIWavDbNkzXC0="; }; nativeBuildInputs = [ b43FirmwareCutter ]; @@ -28,5 +27,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://wireless.wiki.kernel.org/en/users/drivers/b43"; downloadPage = "http://www.lwfinger.com/b43-firmware"; license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryFirmware ]; }; -} +}) diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix index 3fdf89ef7c9f..36ec48db3571 100644 --- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "postgres_exporter"; - version = "0.18.1"; + version = "0.19.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "postgres_exporter"; rev = "v${version}"; - sha256 = "sha256-yiWcJVpa5yGNk1ahbb+0uVzpFaXqBL2qgS0aH+bi4rU="; + sha256 = "sha256-0CoK1CVIq7wXFy7TdCsEEncZTTuRoIItRf2d2xU8IRE="; }; - vendorHash = "sha256-/9a3lB9V25OppkeLsIr02LZPLAQrQYZ74RJIDHiG6w8="; + vendorHash = "sha256-2WJsNSKhyxObrNWDFUh5zcJwNQeEZl9rY30yspE2NQ8="; ldflags = let diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7e131ca1db6e..31a2e5487b3d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -292,6 +292,7 @@ mapAliases { androidndkPkgs_25 = throw "androidndkPkgs_25 has been removed, as it is EOL"; # Added 2025-08-09 androidndkPkgs_26 = throw "androidndkPkgs_26 has been removed, as it is EOL"; # Added 2025-08-09 anew = throw "'anew' has been removed, as it has been unmaintained upstream since March 2022"; # Added 2026-01-01 + anonymousPro = anonymous-pro-fonts; # Added 2026-02-08 ansible-language-server = throw "ansible-language-server was removed, because it was unmaintained in nixpkgs."; # Added 2025-09-24 ansible-later = throw "ansible-later has been discontinued. The author recommends switching to ansible-lint"; # Added 2025-08-24 ansible_2_16 = throw "ansible_2_16 has been removed, as it is EOL"; # Added 2025-11-10 @@ -410,6 +411,7 @@ mapAliases { cargo-espflash = throw "'cargo-espflash' has been renamed to/replaced by 'espflash'"; # Converted to throw 2025-10-27 cargo-sync-readme = throw "'cargo-sync-readme' has been removed because upstream 404s"; # Converted to throw 2025-12-18 cargonode = throw "'cargonode' has been removed due to lack of upstream maintenance"; # Added 2025-06-18 + carp = throw "'carp' has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05 cask = throw "'cask' has been renamed to/replaced by 'emacs.pkgs.cask'"; # Converted to throw 2025-10-27 catalyst-browser = throw "'catalyst-browser' has been removed due to a lack of maintenance and not satisfying our security criteria for browsers."; # Added 2025-06-25 cataract = throw "'cataract' has been removed due to a lack of maintenace"; # Added 2025-08-25 @@ -631,6 +633,7 @@ mapAliases { evolve-core = throw "'evolve-core' has been removed, as it hindered the removal of flutter329"; # Added 2026-01-25 eww-wayland = throw "'eww-wayland' has been renamed to/replaced by 'eww'"; # Converted to throw 2025-10-27 f3d_egl = warnAlias "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # Added 2025-07-18 + fabs = throw "'fabs' has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05 fast-cli = throw "'fast-cli' has been removed because it was unmaintainable in nixpkgs"; # Added 2025-11-17 fastnlo_toolkit = throw "'fastnlo_toolkit' has been renamed to/replaced by 'fastnlo-toolkit'"; # Converted to throw 2025-10-27 faustStk = throw "'faustStk' has been renamed to/replaced by 'faustPhysicalModeling'"; # Converted to throw 2025-10-27 @@ -875,6 +878,7 @@ mapAliases { immersed-vr = throw "'immersed-vr' has been renamed to/replaced by 'immersed'"; # Converted to throw 2025-10-27 inconsolata-nerdfont = throw "'inconsolata-nerdfont' has been renamed to/replaced by 'nerd-fonts.inconsolata'"; # Converted to throw 2025-10-27 incrtcl = throw "'incrtcl' has been renamed to/replaced by 'tclPackages.incrtcl'"; # Converted to throw 2025-10-27 + infamousPlugins = infamousplugins; # Added 2026-02-08 inotifyTools = throw "'inotifyTools' has been renamed to/replaced by 'inotify-tools'"; # Converted to throw 2025-10-27 insync-emblem-icons = throw "'insync-emblem-icons' has been removed, use 'insync-nautilus' instead"; # Added 2025-05-14 invalidateFetcherByDrvHash = throw "'invalidateFetcherByDrvHash' has been renamed to/replaced by 'testers.invalidateFetcherByDrvHash'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 991a63bfb8ee..50e15531d8cc 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -75,6 +75,7 @@ mapAliases { asyncio-nats-client = throw "'asyncio-nats-client' has been renamed to/replaced by 'nats-py'"; # Converted to throw 2025-10-29 atsim_potentials = throw "'atsim_potentials' has been renamed to/replaced by 'atsim-potentials'"; # Converted to throw 2025-10-29 autotrash = throw "'autotrash' has been renamed to/replaced by 'super.pkgs.autotrash'"; # Converted to throw 2025-10-29 + av_13 = throw "'av_13' has been renamed to/replaced by 'av'"; # Added 2026-02-01 Babel = throw "'Babel' has been renamed to/replaced by 'babel'"; # Converted to throw 2025-10-29 backports-functools-lru-cache = throw "'backports-functools-lru-cache' has been removed from nixpkgs as it was not longer used in python2"; # Added 2026-01-14 backports_shutil_get_terminal_size = throw "'backports_shutil_get_terminal_size' has been renamed to/replaced by 'backports-shutil-get-terminal-size'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5ec00f4bb2a6..40b9b4f175c2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1258,8 +1258,6 @@ self: super: with self; { av = callPackage ../development/python-modules/av { }; - av_13 = callPackage ../development/python-modules/av_13 { }; - avahi = toPythonModule ( pkgs.avahi.override { inherit python; @@ -9770,6 +9768,8 @@ self: super: with self; { mistral-common = callPackage ../development/python-modules/mistral-common { }; + mistral-inference = callPackage ../development/python-modules/mistral-inference { }; + mistralai = callPackage ../development/python-modules/mistralai { }; mistune = callPackage ../development/python-modules/mistune { }; @@ -10669,9 +10669,7 @@ self: super: with self; { napalm-ros = callPackage ../development/python-modules/napalm/ros.nix { }; - napari = callPackage ../development/python-modules/napari { - inherit (pkgs.libsForQt5) mkDerivationWith wrapQtAppsHook; - }; + napari = callPackage ../development/python-modules/napari { }; napari-console = callPackage ../development/python-modules/napari-console { }; @@ -12022,6 +12020,8 @@ self: super: with self; { pdfrw2 = callPackage ../development/python-modules/pdfrw2 { }; + pdfservices-sdk = callPackage ../development/python-modules/pdfservices-sdk { }; + pdftotext = callPackage ../development/python-modules/pdftotext { }; pdm-backend = callPackage ../development/python-modules/pdm-backend { }; @@ -16959,6 +16959,8 @@ self: super: with self; { satel-integra = callPackage ../development/python-modules/satel-integra { }; + saxonche = callPackage ../development/python-modules/saxonche { }; + sbom2dot = callPackage ../development/python-modules/sbom2dot { }; sbom4files = callPackage ../development/python-modules/sbom4files { };