diff --git a/doc/languages-frameworks/texlive.section.md b/doc/languages-frameworks/texlive.section.md index f380cc4c5a92..391cb48633c3 100644 --- a/doc/languages-frameworks/texlive.section.md +++ b/doc/languages-frameworks/texlive.section.md @@ -32,6 +32,21 @@ There is a TeX Live packaging that lives entirely under attribute `texlive`. ) ``` +- Packages can be overriden by passing a new package with the same `pname` to `.withPackages`. For instance, the following replaces Asymptote with the version from Nixpkgs, which is usually more up to date: + ```nix + texliveMedium.withPackages (ps: [ asymptote ]) + ``` + +- To exclude a package from a collection, use an empty override as below: + ```nix + texliveBasic.withPackages ( + ps: with ps; [ + collection-bibtexextra + { pname = "bib2gls"; } + ] + ) + ``` + - To add the documentation for all packages in the environment, use ```nix texliveSmall.overrideAttrs { withDocs = true; } diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index be893bb67a64..122ea9f1f499 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1495,6 +1495,12 @@ githubId = 60479013; name = "Alma Cemerlic"; }; + aln730 = { + email = "arnsg730@proton.me"; + github = "aln730"; + githubId = 94751172; + name = "AGawas"; + }; Alper-Celik = { email = "alper@alper-celik.dev"; name = "Alper Çelik"; @@ -16678,12 +16684,6 @@ githubId = 10746692; name = "Leopold Luley"; }; - lumi = { - email = "lumi@pew.im"; - github = "lumi-me-not"; - githubId = 26020062; - name = "lumi"; - }; luminarleaf = { github = "LuminarLeaf"; githubId = 80571430; @@ -20788,8 +20788,9 @@ github = "numinit"; githubId = 369111; keys = [ - # SSH + # SSH, per-machine yubikey ecdsa-sk keys { fingerprint = "XX/0lMz82MpucPqf0KG+5EJoozzNRi8i/t59byD2kNo"; } + { fingerprint = "dye2C1N4RQaf+8ht5Ipd52BbnnuwBtdXxocPzk8b2mw"; } # GPG, >=2025, stays in one place { fingerprint = "FD28 F9C9 81C5 D78E 56E8 8311 5C3E B94D 198F 1491"; } # GPG, >=2025, travels with me @@ -22085,6 +22086,12 @@ githubId = 421510; name = "Noé Rubinstein"; }; + phluxjr = { + email = "phluxjr@phluxjr.net"; + github = "phluxjr"; + githubId = 185956030; + name = "phluxjr"; + }; pho = { email = "phofin@gmail.com"; github = "pho"; diff --git a/nixos/modules/services/web-apps/tabbyapi.nix b/nixos/modules/services/web-apps/tabbyapi.nix index bd937b0d5685..a955afe463b5 100644 --- a/nixos/modules/services/web-apps/tabbyapi.nix +++ b/nixos/modules/services/web-apps/tabbyapi.nix @@ -34,7 +34,7 @@ in host = lib.mkOption { type = lib.types.str; default = "127.0.0.1"; - description = "The IP to host on. Use 0.0.0.0 to expose on all adapters."; + description = "The IP to host on. Use 0.0.0.0 to expose on all network adapters."; }; port = lib.mkOption { @@ -46,13 +46,22 @@ in disable_auth = lib.mkOption { type = lib.types.bool; default = false; - description = "Disable HTTP token authentication. WARNING: Vulnerable if exposed."; + description = '' + Disable HTTP token authentication with requests. + WARNING: This will make your instance vulnerable! Only turn this on if you are ONLY connecting from localhost. + ''; + }; + + disable_fetch_requests = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Disable fetching external content in response to requests, such as images from URLs."; }; api_servers = lib.mkOption { type = lib.types.listOf lib.types.str; default = [ "OAI" ]; - description = "Select API servers to enable. Options: OAI, Kobold."; + description = "Select API servers to enable. Possible values: OAI, Kobold."; }; }; @@ -66,7 +75,18 @@ in log_requests = lib.mkOption { type = lib.types.bool; default = false; - description = "Enable request logging. Only use for debug."; + description = "Enable request logging. NOTE: Only use this for debugging!"; + }; + + log_chat_completion_requests = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Write every /v1/chat/completions request to logs/debug/ as JSON. + PRIVACY WARNING: Enabling this creates a comprehensive request log, including the + full message history and generation parameters. API keys are redacted, but prompts + and user-provided content are preserved for bug-report reproduction. + ''; }; }; @@ -111,35 +131,94 @@ in ''; }; + inline_model_loading = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Allow direct loading of models from a completion or chat completion request. + This method of loading is strict by default; enable dummy models to add + exceptions for invalid model names. + ''; + }; + model_name = lib.mkOption { type = lib.types.nullOr lib.types.str; default = null; - description = "The initial model to load on startup. Must exist in model_dir."; + description = '' + An initial model to load. Make sure the model is located in the model directory! + REQUIRED: This must be filled out to load a model on startup. + ''; example = "Qwen3_5-9B"; }; max_seq_len = lib.mkOption { type = lib.types.nullOr lib.types.int; default = null; - description = "Max sequence length. Set null to use model defaults."; + description = '' + Max sequence length (default: min(max_position_embeddings, cache_size)). + Set to -1 to fetch from the model's config.json. + ''; }; cache_mode = lib.mkOption { type = lib.types.str; default = "FP16"; - description = "Cache mode for VRAM savings. ExLlamaV2: FP16, Q8, Q6, Q4. ExLlamaV3: specific pair string (e.g., '8,8')."; + description = '' + Enable different cache modes for VRAM savings. + Specify the pair k_bits,v_bits where k_bits and v_bits are integers from 2-8 (e.g. '8,8'). + The legacy values 'FP16', 'Q8', 'Q6', 'Q4' are also accepted. + ''; + }; + + tensor_parallel = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Load model with tensor parallelism. + Falls back to autosplit if GPU split isn't provided. This ignores the gpu_split_auto value. + ''; }; gpu_split_auto = lib.mkOption { type = lib.types.bool; default = true; - description = "Automatically allocate resources to GPUs."; + description = "Automatically allocate resources to GPUs. Not parsed for single GPU users."; }; dummy_model_names = lib.mkOption { type = lib.types.listOf lib.types.str; default = [ "gpt-3.5-turbo" ]; - description = "List of fake model names sent via the /v1/models endpoint."; + description = '' + A list of fake model names that are sent via the /v1/models endpoint. + Also used as bypasses for strict mode if inline_model_loading is true. + ''; + }; + + vision = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enables vision support if the model supports it."; + }; + + reasoning = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Enable reasoning parser. + Do NOT enable this if the model is not a reasoning model (e.g. deepseek-r1 series). + ''; + }; + + reasoning_start_token = lib.mkOption { + type = lib.types.str; + default = ""; + description = "The start token for reasoning content."; + }; + + reasoning_end_token = lib.mkOption { + type = lib.types.str; + default = ""; + description = "The end token for reasoning content."; }; }; }; diff --git a/nixos/tests/croc.nix b/nixos/tests/croc.nix index f5eec96d6cc3..bb5d5d6635e4 100644 --- a/nixos/tests/croc.nix +++ b/nixos/tests/croc.nix @@ -12,8 +12,8 @@ in meta = with pkgs.lib.maintainers; { maintainers = [ equirosa - SuperSandro2000 ryan4yin + kaynetik ]; }; diff --git a/nixos/tests/optee.nix b/nixos/tests/optee.nix index 2d7c80bda78c..08377a84a188 100644 --- a/nixos/tests/optee.nix +++ b/nixos/tests/optee.nix @@ -4,7 +4,6 @@ meta = { maintainers = with lib.maintainers; [ jmbaur ]; - broken = pkgs.stdenv.hostPlatform.isAarch64; }; nodes.machine = @@ -17,7 +16,8 @@ uboot = ubootQemuAarch64.overrideAttrs (old: { postPatch = (old.postPatch or "") + '' substituteInPlace board/emulation/qemu-arm/qemu-arm.env \ - --replace-fail "ramdisk_addr_r=0x44000000" "ramdisk_addr_r=0x46000000" + --replace-fail "kernel_addr_r=0x40400000" "kernel_addr_r=0x50000000" \ + --replace-fail "ramdisk_addr_r=0x44000000" "ramdisk_addr_r=0x58000000" ''; }); @@ -53,6 +53,7 @@ # VM boots up via qfw boot.loader.grub.enable = false; + boot.kernelModules = [ "optee" ]; services.tee-supplicant = { enable = true; diff --git a/nixos/tests/web-apps/immichframe.nix b/nixos/tests/web-apps/immichframe.nix index dff57b5c27c2..810fe24b796d 100644 --- a/nixos/tests/web-apps/immichframe.nix +++ b/nixos/tests/web-apps/immichframe.nix @@ -31,9 +31,14 @@ in ../common/x11.nix ]; - # When setting this to 2500 I got "Kernel panic - not syncing: Out of + # When setting memory to 2500 I got "Kernel panic - not syncing: Out of # memory: compulsory panic_on_oom is enabled". - virtualisation.memorySize = 3000; + # Setting cores to 1 (the default) also makes immich take a long time to start up. + # If this breaks, keep synced with the immich test. + virtualisation = { + memorySize = 4096; + cores = 2; + }; hardware.graphics.enable = true; environment.variables.XAUTHORITY = "/home/${user}/.Xauthority"; test-support.displayManager.auto.user = user; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6b6b69fc7333..3717352cd6d2 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1058,11 +1058,11 @@ "vendorHash": null }, "oracle_oci": { - "hash": "sha256-ENFE5nK1qxZcOxIMzXiilCLxRGBg0dc3lTPODk9e99g=", + "hash": "sha256-ZDpyBnralPWEMorou9A8+llGqavGlPMe1YJlUMrfYRY=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v8.22.0", + "rev": "v8.23.0", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/pkgs/by-name/_7/_7zz-rar/package.nix b/pkgs/by-name/_7/_7zz-rar/package.nix new file mode 100644 index 000000000000..5a1cf62bda75 --- /dev/null +++ b/pkgs/by-name/_7/_7zz-rar/package.nix @@ -0,0 +1,6 @@ +{ + _7zz, +}: +_7zz.override { + enableUnfree = true; +} diff --git a/pkgs/by-name/_7/_7zz/package.nix b/pkgs/by-name/_7/_7zz/package.nix index fe3878f417aa..6923d10979d1 100644 --- a/pkgs/by-name/_7/_7zz/package.nix +++ b/pkgs/by-name/_7/_7zz/package.nix @@ -1,7 +1,9 @@ { stdenv, lib, - fetchzip, + fetchFromGitHub, + _experimental-update-script-combinators, + nix-update-script, # Free MASM-compatible assembler asmc-linux, @@ -43,17 +45,17 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "7zz"; - version = "26.01"; + version = "26.02"; - src = fetchzip { - url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}-src.tar.xz"; + src = fetchFromGitHub { + owner = "ip7z"; + repo = "7zip"; + tag = finalAttrs.version; hash = - { - free = "sha256-52+Gg66MOFmwYUVB0OO4PAtZJtQOkoVpxV7F9xBGy58="; - unfree = "sha256-w0fk8EDusUYiOfrmIiUq+xevlwfQxMhjdPzfkHkOkR8="; - } - .${if enableUnfree then "unfree" else "free"}; - stripRoot = false; + if enableUnfree then + "sha256-MmnsCM4guQ5DuWDE5MslI8QIIbkUtZnddVPgAuCRWQU=" + else + "sha256-prKxsT7y7iHbzduM+xqz1yQMEbJ8IjnsmafzC2mOwr4="; # remove the unRAR related code from the src drv # > the license requires that you agree to these use restrictions, # > or you must remove the software (source and binary) from your hard disks @@ -138,7 +140,16 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = ./update.sh; + updateScript = _experimental-update-script-combinators.sequence [ + (nix-update-script { + attrPath = "_7zz"; + extraArgs = [ "--use-github-releases" ]; + }) + (nix-update-script { + attrPath = "_7zz-rar"; + extraArgs = [ "--version=skip" ]; + }) + ]; tests.version = testers.testVersion { package = finalAttrs.finalPackage; command = "7zz --help"; diff --git a/pkgs/by-name/_7/_7zz/update.sh b/pkgs/by-name/_7/_7zz/update.sh deleted file mode 100755 index 1128cedd5491..000000000000 --- a/pkgs/by-name/_7/_7zz/update.sh +++ /dev/null @@ -1,15 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -I nixpkgs=./. -i bash -p curl xq-xml common-updater-scripts -set -euo pipefail - -OLD_VERSION="$(nix-instantiate --eval --json --expr 'let pkgs = import ./. {}; in pkgs._7zz.version' | sed 's/"//g')" -NEW_VERSION="$(curl -H 'Accept: application/rss+xml' 'https://sourceforge.net/projects/sevenzip/rss?path=/7-Zip' | xq -x "substring((/rss/channel/item[link[contains(., 'src.tar.xz')]])[1]/title, 8, 5)")" - -echo "comparing versions $OLD_VERSION => $NEW_VERSION" -if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then - echo "Already up to date! Doing nothing" - exit 0 -fi - -update-source-version _7zz "$NEW_VERSION" -update-source-version _7zz-rar "$NEW_VERSION" --ignore-same-version diff --git a/pkgs/by-name/ar/archon-lite/package.nix b/pkgs/by-name/ar/archon-lite/package.nix index d5177c4a810d..adc73facd7ad 100644 --- a/pkgs/by-name/ar/archon-lite/package.nix +++ b/pkgs/by-name/ar/archon-lite/package.nix @@ -6,10 +6,10 @@ }: let pname = "archon-lite"; - version = "9.3.172"; + version = "9.4.36"; src = fetchurl { url = "https://github.com/RPGLogs/Uploaders-archon-lite/releases/download/v${version}/archon-lite-v${version}.AppImage"; - hash = "sha256-Jl1/40jtdG9acb2SSef4G91hs/b1UdOp6gPnoGPnQ60="; + hash = "sha256-th48nSDIi2iugtiqjgkI7/QZtBq+BRQjRs1pKweDArI="; }; extracted = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/au/auto-editor/package.nix b/pkgs/by-name/au/auto-editor/package.nix index e260967f09ce..e4f4af57f247 100644 --- a/pkgs/by-name/au/auto-editor/package.nix +++ b/pkgs/by-name/au/auto-editor/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - config, buildNimPackage, fetchFromGitHub, @@ -9,9 +7,9 @@ yt-dlp, lame, libopus, - libvpx, x264, dav1d, + zlib, python3, python3Packages, @@ -19,13 +17,13 @@ buildNimPackage rec { pname = "auto-editor"; - version = "30.4.0"; + version = "31.0.0"; src = fetchFromGitHub { owner = "WyattBlue"; repo = "auto-editor"; tag = version; - hash = "sha256-AzUTDOWzyhZLrwqO9HfZ/Ke72LElJAMzVoDydBfYKwg="; + hash = "sha256-25xzVaG9seu4hE5rc776lvNucf8lsEDvjkQPbFzjgII="; }; lockFile = ./lock.json; @@ -36,6 +34,7 @@ buildNimPackage rec { libopus x264 dav1d + zlib ]; env = { @@ -54,8 +53,6 @@ buildNimPackage rec { # buildNimPackage hack substituteInPlace ae.nimble \ --replace-fail '"main=auto-editor"' '"main"' - - mv tests/unit.nim tests/tunit.nim # buildNimPackage expects tests to start with t ''; nativeCheckInputs = [ @@ -63,19 +60,6 @@ buildNimPackage rec { python3Packages.av ]; - checkPhase = '' - runHook preCheck - - nim_builder --phase:check - - substituteInPlace tests/test.py \ - --replace-fail '"./auto-editor"' "\"$out/bin/main\"" - - python3 tests/test.py - - runHook postCheck - ''; - postInstall = '' mv $out/bin/main $out/bin/auto-editor ''; diff --git a/pkgs/by-name/be/betteralign/package.nix b/pkgs/by-name/be/betteralign/package.nix index b1e5a9605035..c7efd14543a8 100644 --- a/pkgs/by-name/be/betteralign/package.nix +++ b/pkgs/by-name/be/betteralign/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "betteralign"; - version = "0.14.0"; + version = "0.14.2"; src = fetchFromGitHub { owner = "dkorunic"; repo = "betteralign"; tag = "v${finalAttrs.version}"; - hash = "sha256-8aIFHFZ9O+4Tq9dfbl2Ou8LYekRgBcx6O/G+xP+7BPA="; + hash = "sha256-H6KjYk90GhBzLcv2gN5gfv8Y4MY2VH3EFCq8Zf7xHI0="; # Trick for getting accurate commit, source date and timestamp for ldflags # Required by upstream https://github.com/dkorunic/betteralign/blob/346baa9c9dd024bfe55302c9d7d0ca46b2734c1c/.goreleaser.yml @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { ''; }; - vendorHash = "sha256-DaAa3Rj6Tl+KtLjjQlHR/peZPaEeUo7wwlfBeVQVx/s="; + vendorHash = "sha256-K2n418V0LBM3Q9UcWS59v915RgiCnhQ5pNRy9P9OBTg="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/ca/casync/package.nix b/pkgs/by-name/ca/casync/package.nix index 9a1c009ab9b3..0bd0fe6abf62 100644 --- a/pkgs/by-name/ca/casync/package.nix +++ b/pkgs/by-name/ca/casync/package.nix @@ -9,12 +9,10 @@ sphinx, acl, curl, - fuse, libselinux, udev, xz, zstd, - fuseSupport ? true, selinuxSupport ? true, udevSupport ? true, glibcLocales, @@ -39,7 +37,6 @@ stdenv.mkDerivation { xz zstd ] - ++ lib.optionals fuseSupport [ fuse ] ++ lib.optionals selinuxSupport [ libselinux ] ++ lib.optionals udevSupport [ udev ]; nativeBuildInputs = [ @@ -66,10 +63,12 @@ stdenv.mkDerivation { env.PKG_CONFIG_UDEV_UDEVDIR = "lib/udev"; - mesonFlags = - lib.optionals (!fuseSupport) [ "-Dfuse=false" ] - ++ lib.optionals (!udevSupport) [ "-Dudev=false" ] - ++ lib.optionals (!selinuxSupport) [ "-Dselinux=false" ]; + mesonFlags = [ + # fuse2 only, https://github.com/systemd/casync/issues/269 + "-Dfuse=false" + ] + ++ lib.optionals (!udevSupport) [ "-Dudev=false" ] + ++ lib.optionals (!selinuxSupport) [ "-Dselinux=false" ]; doCheck = true; preCheck = '' diff --git a/pkgs/by-name/co/confy-tui/package.nix b/pkgs/by-name/co/confy-tui/package.nix new file mode 100644 index 000000000000..ea852b704127 --- /dev/null +++ b/pkgs/by-name/co/confy-tui/package.nix @@ -0,0 +1,36 @@ +{ + lib, + python3Packages, + fetchFromGitHub, +}: + +python3Packages.buildPythonApplication (finalAttrs: { + pname = "confy-tui"; + version = "3.0.0"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "phluxjr"; + repo = "confy"; + rev = "v${finalAttrs.version}"; + hash = "sha256-yhzmkIPrOckDxoB10RBX5ul/rYzVKtU6l6O1Zm69e9c="; + }; + + build-system = [ + python3Packages.hatchling + ]; + + postInstall = '' + install -Dm644 confy.1 $out/share/man/man1/confy.1 + ''; + + meta = { + description = "config manager tui for linux/unix systems"; + homepage = "https://github.com/phluxjr/confy"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ phluxjr ]; + mainProgram = "confy"; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/cr/croc/package.nix b/pkgs/by-name/cr/croc/package.nix index 6c54f91f9708..d10752e52d65 100644 --- a/pkgs/by-name/cr/croc/package.nix +++ b/pkgs/by-name/cr/croc/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "croc"; - version = "10.4.6"; + version = "10.4.13"; src = fetchFromGitHub { owner = "schollz"; repo = "croc"; rev = "v${finalAttrs.version}"; - hash = "sha256-+KG1PHUymeoAj92UAn/sitQF6xC1xwl+cdisxy2ZtPs="; + hash = "sha256-XhudK0wFk2VFYmd1ihW4SjJ4nzwNxOp9pTNUWJUg+AU="; }; vendorHash = "sha256-rwGunSDIgetBsk97LxQz0WHpzMDMMESHC1OhBWRuVjI="; diff --git a/pkgs/by-name/de/deskreen/package.nix b/pkgs/by-name/de/deskreen/package.nix index b8f091919bee..7747ac41388f 100644 --- a/pkgs/by-name/de/deskreen/package.nix +++ b/pkgs/by-name/de/deskreen/package.nix @@ -4,35 +4,39 @@ fetchurl, appimageTools, }: - -stdenvNoCC.mkDerivation (finalAttrs: { +appimageTools.wrapType2 rec { pname = "deskreen"; - version = "2.0.4"; + version = "3.2.16"; - src = fetchurl { - url = "https://github.com/pavlobu/deskreen/releases/download/v${finalAttrs.version}/Deskreen-${finalAttrs.version}.AppImage"; - hash = "sha256-0jI/mbXaXanY6ay2zn+dPWGvsqWRcF8aYHRvfGVsObE="; - }; - deskreenUnwrapped = appimageTools.wrapType2 { - inherit (finalAttrs) pname version; - src = finalAttrs.src; - }; - - buildInputs = [ - finalAttrs.deskreenUnwrapped - ]; - - dontUnpack = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - ln -s ${finalAttrs.deskreenUnwrapped}/bin/deskreen $out/bin/deskreen - - runHook postInstall - ''; + src = + let + sources = { + x86_64-linux = { + arch = "x86_64"; + hash = "sha256-JcVKRINEWHJXzpdyiMSzx+cp/BzHBhrXRxYizQmkerI="; + }; + aarch64-linux = { + arch = "arm64"; + hash = "sha256-FDZz3Aarz9j8ppaLO6C1IhVKr7Dns77fLdQQCaCoKg0="; + }; + }; + inherit (stdenvNoCC.hostPlatform) system; + in + fetchurl { + url = "https://github.com/pavlobu/deskreen/releases/download/v${version}/deskreen-ce-${version}-${sources.${system}.arch}.AppImage"; + inherit (sources.${system}) hash; + }; + extraInstallCommands = + let + contents = appimageTools.extractType2 { inherit pname version src; }; + in + '' + install -m 444 -D ${contents}/deskreen-ce.desktop $out/share/applications/deskreen-ce.desktop + install -m 444 -D ${contents}/usr/share/icons/hicolor/256x256/apps/deskreen-ce.png \ + $out/share/icons/hicolor/512x512/apps/deskreen-ce.png + substituteInPlace $out/share/applications/deskreen-ce.desktop \ + --replace-fail 'Exec=AppRun' 'Exec=deskreen' + ''; meta = { description = "Turn any device into a secondary screen for your computer"; @@ -42,6 +46,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ leo248 ]; - platforms = lib.platforms.linux; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; }; -}) +} diff --git a/pkgs/by-name/ed/edhm-ui/package.nix b/pkgs/by-name/ed/edhm-ui/package.nix index c3e9f4aebc30..cfd0561164b6 100644 --- a/pkgs/by-name/ed/edhm-ui/package.nix +++ b/pkgs/by-name/ed/edhm-ui/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "edhm-ui"; - version = "3.0.69"; + version = "3.0.70"; strictDeps = true; src = fetchzip { url = "https://github.com/BlueMystical/EDHM_UI/releases/download/v${finalAttrs.version}/edhm-ui-v3-linux-x64.zip"; - hash = "sha256-t/K8VohJjjP/VgreHZWYtlsMXp1gp9Gme/joHywfeH4="; + hash = "sha256-jAvUWrjQl8dmXxd99ONYqgdnPkzDQwdSEf8ar2nLEds="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix index 53fc9eea0f50..3b60609fb638 100644 --- a/pkgs/by-name/ew/eww/package.nix +++ b/pkgs/by-name/ew/eww/package.nix @@ -46,9 +46,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoTestFlags = finalAttrs.cargoBuildFlags; - # requires unstable rust features - env.RUSTC_BOOTSTRAP = 1; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd eww \ --bash <($out/bin/eww shell-completions --shell bash) \ diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix index 008f989f61c7..3e4e196679f3 100644 --- a/pkgs/by-name/fi/firebase-tools/package.nix +++ b/pkgs/by-name/fi/firebase-tools/package.nix @@ -11,17 +11,17 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "15.22.4"; + version = "15.24.0"; nodejs = nodejs_22; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; tag = "v${version}"; - hash = "sha256-0O6/tOd9PNtsTzXvgFMl7bneejMJ4uAGvinWZFjlkUo="; + hash = "sha256-Ly2iWu29lmexSQL/MMjo10CStItxrHKZD1RgEHUzOVM="; }; - npmDepsHash = "sha256-TlAcsOKmHnXPNdOpgXhr16tMWFjtahT/CG5INBR59fM="; + npmDepsHash = "sha256-Qe/azXfVryMs+XFZdLq270dPrh1AqzWWqpn8PqvRnds="; # No more package-lock.json in upstream src postPatch = '' diff --git a/pkgs/by-name/fr/framework-control/package.nix b/pkgs/by-name/fr/framework-control/package.nix index 37fcf8b1df53..d324064136ff 100644 --- a/pkgs/by-name/fr/framework-control/package.nix +++ b/pkgs/by-name/fr/framework-control/package.nix @@ -7,6 +7,7 @@ fetchNpmDeps, makeDesktopItem, copyDesktopItems, + nix-update-script, controlPort ? 30912, }: @@ -75,6 +76,8 @@ rustPlatform.buildRustPackage (finalAttrs: { $out/share/icons/hicolor/256x256/apps/framework-control.png ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Lightweight control surface for Framework laptops"; homepage = "https://github.com/ozturkkl/framework-control"; diff --git a/pkgs/by-name/gd/gdb-dashboard/package.nix b/pkgs/by-name/gd/gdb-dashboard/package.nix index badac418d66a..84a3b8f2b467 100644 --- a/pkgs/by-name/gd/gdb-dashboard/package.nix +++ b/pkgs/by-name/gd/gdb-dashboard/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdb-dashboard"; - version = "0.17.4"; + version = "0.17.5"; src = fetchFromGitHub { owner = "cyrus-and"; repo = "gdb-dashboard"; tag = "v${finalAttrs.version}"; - hash = "sha256-xoBkAFwkbaAsvgPwGwe1JxE1C8gPR6GP1iXeNKK5Z70="; + hash = "sha256-q1oh/i7BWhycTK+2dZDDOTGHzMZuBKb9qrawmuyW2CU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ge/gerrit/package.nix b/pkgs/by-name/ge/gerrit/package.nix index adf149804c93..4d7c87408399 100644 --- a/pkgs/by-name/ge/gerrit/package.nix +++ b/pkgs/by-name/ge/gerrit/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "gerrit"; - version = "3.13.6"; + version = "3.14.2"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${finalAttrs.version}.war"; - hash = "sha256-nGKl5KNundR+FkiQ5CO/qBezOSNAHDHcPsssm1lZAhk="; + hash = "sha256-OuM96W9++2QKD2O2IwkzDjmBaC9Ej/6ReHY/Rwujuno="; }; buildCommand = '' diff --git a/pkgs/by-name/gg/ggml/package.nix b/pkgs/by-name/gg/ggml/package.nix index 2e1ae161f39d..aa55a4bdd3ed 100644 --- a/pkgs/by-name/gg/ggml/package.nix +++ b/pkgs/by-name/gg/ggml/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "ggml"; - version = "0.16.0"; + version = "0.17.0"; __structuredAttrs = true; strictDeps = true; @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ggml-org"; repo = "ggml"; tag = "v${finalAttrs.version}"; - hash = "sha256-0DdBEsnUAEdC+qN5s310Ih+ELyXOjvwrykMFNHLkoO4="; + hash = "sha256-kUCXeIgRRv9UgVlTDwSJaZuTw4piaP23pzTUi1PCi5Q="; }; # The cmake package does not handle absolute CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR diff --git a/pkgs/by-name/in/invidious/package.nix b/pkgs/by-name/in/invidious/package.nix index 589f0e55d209..57d6250fee35 100644 --- a/pkgs/by-name/in/invidious/package.nix +++ b/pkgs/by-name/in/invidious/package.nix @@ -3,6 +3,7 @@ callPackage, crystal, fetchFromGitHub, + fetchpatch2, librsvg, pkg-config, libxml2, @@ -41,6 +42,15 @@ crystal.buildCrystalPackage rec { inherit (versions.invidious) hash; }; + patches = [ + # Remove with the first release containing this commit. + (fetchpatch2 { + name = "CVE-2026-58447.patch"; + url = "https://github.com/iv-org/invidious/commit/77ad41678b45c4f6815940123f1796fc51259f45.patch?full_index=1"; + hash = "sha256-0pf6eu0ckQ2gYHLr2tEDy+1dvAhVjepG26kuxuHbZl8="; + }) + ]; + postPatch = let # Replacing by the value (templates) of the variables ensures that building diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix index b418ef405a55..0a2aa7e81fc1 100644 --- a/pkgs/by-name/ju/just/package.nix +++ b/pkgs/by-name/ju/just/package.nix @@ -17,7 +17,7 @@ withDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, }: let - version = "1.56.0"; + version = "1.57.0"; in rustPlatform.buildRustPackage { inherit version; @@ -36,10 +36,10 @@ rustPlatform.buildRustPackage { owner = "casey"; repo = "just"; tag = version; - hash = "sha256-ZDaSZnn/2oncsl5JTBctUXXSqw2WQnIUIWfYRh2N70A="; + hash = "sha256-fFeWGX72YcTKzPqfRYloTtnW4r7uXHUipyYP9VV8LZE="; }; - cargoHash = "sha256-I0aWzBSpU2gu1wjsUJ0jPO5oifXFcMcRdqs9P4j2vnA="; + cargoHash = "sha256-hdfOs9UDjdrk8XclCxTdQgSOpt+yYQoPD5lWZrdNs2Q="; nativeBuildInputs = lib.optionals (installShellCompletions || installManPages) [ installShellFiles ] diff --git a/pkgs/by-name/ko/komari-agent/package.nix b/pkgs/by-name/ko/komari-agent/package.nix index b2bf904c6e73..280f8e295a4c 100644 --- a/pkgs/by-name/ko/komari-agent/package.nix +++ b/pkgs/by-name/ko/komari-agent/package.nix @@ -27,7 +27,9 @@ buildGoModule (finalAttrs: { # tests require network access doCheck = false; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ "--use-github-releases" ]; + }; meta = { homepage = "https://github.com/komari-monitor/komari-agent"; diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix index 454164119cd5..4d5afcd48a16 100644 --- a/pkgs/by-name/le/lefthook/package.nix +++ b/pkgs/by-name/le/lefthook/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "lefthook"; - version = "2.1.5"; + version = "2.1.10"; src = fetchFromGitHub { owner = "evilmartians"; repo = "lefthook"; rev = "v${finalAttrs.version}"; - hash = "sha256-HLC6X9JjiiR3Ecg5MQ33vELs6ooLLjQ9x++4xB1qyHU="; + hash = "sha256-GR97Z9wnM6z6gNIcf35leBGkhdj1d6OHQ9oFnaz3f1s="; }; - vendorHash = "sha256-75jrXoBXoPCE/Ue7OlGAA4nUDXHM5ccIaK4rsKgfG84="; + vendorHash = "sha256-G+v6ZqnkcFdPDzXlN89oqD7mOnHfq1tvIkFxdoVnBNo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/li/libchewing/package.nix b/pkgs/by-name/li/libchewing/package.nix index 1c8ddd95b7b6..7258de3b987a 100644 --- a/pkgs/by-name/li/libchewing/package.nix +++ b/pkgs/by-name/li/libchewing/package.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libchewing"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromCodeberg { owner = "chewing"; repo = "libchewing"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-1/aamkc66pjAf/jl4pD2rJ9ipFW0bAWjvKg6KtINWuQ="; + hash = "sha256-BiAQSaSOjzeRt+vw+b7JoTR1+mF+UYMIyx+5nuqk9Ko="; }; # ld: unknown option: -version-script @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-1b8GbZ75jBVmvXquOjG2CEcLXg4AthAwQzdO68CjjPs="; + hash = "sha256-WPB1IIwKTF9lnkdcgNXcOP6kWIwQcUguUf8Nh5vDA5E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libfrida-core/package.nix b/pkgs/by-name/li/libfrida-core/package.nix index 7a0515460c24..044e98bb2a1c 100644 --- a/pkgs/by-name/li/libfrida-core/package.nix +++ b/pkgs/by-name/li/libfrida-core/package.nix @@ -9,7 +9,7 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "libfrida-core"; - version = "17.15.4"; + version = "17.16.0"; src = finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system} @@ -29,15 +29,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { sources = { x86_64-linux = fetchurl { url = "https://github.com/frida/frida/releases/download/${finalAttrs.version}/frida-core-devkit-${finalAttrs.version}-linux-x86_64.tar.xz"; - hash = "sha256-VzPu6AYN8LVQULJBb4Ug7GrenyklksORpcZoj9Sg354="; + hash = "sha256-4OkangepbSAtn6DPGOrDVVlcXjVnj2XXlT0xE/+WBsg="; }; aarch64-linux = fetchurl { url = "https://github.com/frida/frida/releases/download/${finalAttrs.version}/frida-core-devkit-${finalAttrs.version}-linux-arm64.tar.xz"; - hash = "sha256-ryGe+T9GP3CitQMZHwco0d5tNoyXQ9TUwRG2D5E+Hp0="; + hash = "sha256-HrFTlYbpS01i6mVJlrieFpdZ0a27/u45sLJwarCQ150="; }; aarch64-darwin = fetchurl { url = "https://github.com/frida/frida/releases/download/${finalAttrs.version}/frida-core-devkit-${finalAttrs.version}-macos-arm64.tar.xz"; - hash = "sha256-CmOkZ+/w/Vh6V5lJ8jzXU5ZLi0FWXXXIFgPLdb+nu88="; + hash = "sha256-QeT3LLGNBQOgziu/HWqMHI6q3dNmyxJfqcm5xqpxY2Q="; }; }; updateScript = writeShellScript "update-libfrida-core" '' diff --git a/pkgs/development/libraries/liquid-dsp/fix-cmake-pc-paths.patch b/pkgs/by-name/li/liquid-dsp/fix-cmake-pc-paths.patch similarity index 100% rename from pkgs/development/libraries/liquid-dsp/fix-cmake-pc-paths.patch rename to pkgs/by-name/li/liquid-dsp/fix-cmake-pc-paths.patch diff --git a/pkgs/development/libraries/liquid-dsp/include-stdarg.patch b/pkgs/by-name/li/liquid-dsp/include-stdarg.patch similarity index 100% rename from pkgs/development/libraries/liquid-dsp/include-stdarg.patch rename to pkgs/by-name/li/liquid-dsp/include-stdarg.patch diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/by-name/li/liquid-dsp/package.nix similarity index 78% rename from pkgs/development/libraries/liquid-dsp/default.nix rename to pkgs/by-name/li/liquid-dsp/package.nix index 6b4ce1c17233..55e7f60d85df 100644 --- a/pkgs/development/libraries/liquid-dsp/default.nix +++ b/pkgs/by-name/li/liquid-dsp/package.nix @@ -3,8 +3,7 @@ stdenv, cmake, fetchFromGitHub, - autoreconfHook, - autoSignDarwinBinariesHook, + darwin, fixDarwinDylibNames, }: @@ -19,23 +18,27 @@ stdenv.mkDerivation rec { sha256 = "sha256-IvWtoXuuIvpJfY4cyRUsPHgax2/aytYShSdxEStiPYI="; }; - cmakeFlags = [ - # Prevent native cpu arch from leaking into binaries. - (lib.cmakeBool "ENABLE_SIMD" false) - (lib.cmakeBool "FIND_SIMD" false) + patches = [ + # Fix CMake absolute include/lib paths issue, see also + # - https://github.com/NixOS/nixpkgs/issues/144170 + # - https://github.com/jgaeddert/liquid-dsp/pull/450 + ./fix-cmake-pc-paths.patch + # liquid.h uses va_list; needs stdarg.h + ./include-stdarg.patch ]; nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - autoSignDarwinBinariesHook + darwin.autoSignDarwinBinariesHook fixDarwinDylibNames ]; - patches = [ - ./fix-cmake-pc-paths.patch - ./include-stdarg.patch + cmakeFlags = [ + # Prevent native cpu arch from leaking into binaries. + (lib.cmakeBool "ENABLE_SIMD" false) + (lib.cmakeBool "FIND_SIMD" false) ]; doCheck = true; diff --git a/pkgs/by-name/oc/oci-cli/package.nix b/pkgs/by-name/oc/oci-cli/package.nix index 570b7829961b..15e0883007c4 100644 --- a/pkgs/by-name/oc/oci-cli/package.nix +++ b/pkgs/by-name/oc/oci-cli/package.nix @@ -31,14 +31,14 @@ in py.pkgs.buildPythonApplication (finalAttrs: { pname = "oci-cli"; - version = "3.89.1"; + version = "3.89.2"; pyproject = true; src = fetchFromGitHub { owner = "oracle"; repo = "oci-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-9sr+7zFP7THy39XWWI8bC2Th9e2t6zwfjbBkyajvOHM="; + hash = "sha256-iR4Sq0S8dUsygUeuTI3xEKEZFgjfAQwGqUOH+i+Kw/g="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix b/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix index 17d891a27037..8f30d4b87cae 100644 --- a/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix +++ b/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix @@ -15,8 +15,7 @@ icu, jdk, lib, - nodejs_22, - nodejs-slim_22, + nodejs-slim, openssl, pkg-config, python3, @@ -224,9 +223,6 @@ let web-apps = buildNpmPackage (finalAttrs: { name = "onlyoffice-core-web-apps"; - # workaround for https://github.com/NixOS/nixpkgs/issues/477803 - nodejs = nodejs_22; - src = fetchFromGitHub { owner = "ONLYOFFICE"; repo = "web-apps"; @@ -732,8 +728,6 @@ let qmakeFlags ++ icuQmakeFlags ++ [ - # c++1z for nodejs-slim_22.libv8 (20 seems to produce errors around 'is_void_v' there) - # c++ 20 for nodejs_23.libv8 "CONFIG+=c++2a" # v8_base.h will set nMaxVirtualMemory to 4000000000/5000000000 # which is not page-aligned, so disable memory limitation for now @@ -744,6 +738,13 @@ let preConfigure = '' cd $BUILDRT + # We need to build statically to be able to piggy-back + # on nodejs's v8 + substituteInPlace \ + DesktopEditor/doctrenderer/doctrenderer.pri \ + --replace-fail "CONFIG += shared" "CONFIG += staticlib" \ + --replace-fail "CONFIG += plugin" "" + substituteInPlace \ DesktopEditor/doctrenderer/nativecontrol.h \ --replace-fail "fprintf(f, strVal.c_str());" "fprintf(f, \"%s\", strVal.c_str());" \ @@ -761,16 +762,26 @@ let done echo "== v8 ==" + substituteInPlace \ + DesktopEditor/doctrenderer/js_internal/v8/v8_base.h \ + --replace-fail "args.Holder" "args.This" + substituteInPlace \ + DesktopEditor/doctrenderer/js_internal/v8/v8_base.cpp \ + --replace-fail "args.Holder" "args.This" + mkdir -p Common/3dParty/v8_89/v8/out.gn/linux_64 - # using nodejs_22 here is a workaround for https://github.com/NixOS/nixpkgs/issues/477805 - ln -s ${nodejs-slim_22.libv8}/lib Common/3dParty/v8_89/v8/out.gn/linux_64/obj - tar xf ${nodejs-slim_22.libv8.src} --one-top-level=/tmp/xxxxx + ln -s ${nodejs-slim.libv8}/lib Common/3dParty/v8_89/v8/out.gn/linux_64/obj + tar xf ${nodejs-slim.libv8.src} --one-top-level=/tmp/xxxxx for i in /tmp/xxxxx/*/deps/v8/*; do cp -r $i Common/3dParty/v8_89/v8/ done cd $BUILDRT/DesktopEditor/doctrenderer ''; + installPhase = '' + mkdir -p $out/lib + cp ../../build/lib/*/*.a $out/lib + ''; passthru.tests = lib.attrsets.genAttrs [ "embed/external" "embed/internal" "js_internal" "json" ] ( test: buildCoreTests "DesktopEditor/doctrenderer/test/${test}" { @@ -885,9 +896,24 @@ let xpsfile djvufile ]; - qmakeFlags = qmakeFlags ++ icuQmakeFlags; + qmakeFlags = + qmakeFlags + ++ icuQmakeFlags + ++ [ + "QMAKE_LFLAGS+=-licui18n" + ]; preConfigure = '' source ${fixIcu} + + # We need to build statically to be able to piggy-back + # on nodejs's v8 + substituteInPlace \ + $BUILDRT/DesktopEditor/doctrenderer/doctrenderer.pri \ + --replace-fail "CONFIG += shared" "CONFIG += staticlib" \ + --replace-fail "CONFIG += plugin" "" + + echo "LIBS += -L${openssl'.out}/lib -lcrypto" >> $BUILDRT/DesktopEditor/allthemesgen/allthemesgen.pro + echo "LIBS += -L${nodejs-slim.libv8}/lib -lv8 -pthread" >> $BUILDRT/DesktopEditor/allthemesgen/allthemesgen.pro ''; dontStrip = true; installPhase = '' @@ -956,10 +982,26 @@ buildCoreComponent "X2tConverter/build/Qt" { starmath ooxmlsignature ]; - qmakeFlags = qmakeFlags ++ icuQmakeFlags ++ [ "X2tConverter.pro" ]; + qmakeFlags = + qmakeFlags + ++ icuQmakeFlags + ++ [ + "QMAKE_LFLAGS+=-licui18n" + "X2tConverter.pro" + ]; preConfigure = '' source ${fixIcu} + # We need to build statically to be able to piggy-back + # on nodejs's v8 + substituteInPlace \ + $BUILDRT/DesktopEditor/doctrenderer/doctrenderer.pri \ + --replace-fail "CONFIG += shared" "CONFIG += staticlib" \ + --replace-fail "CONFIG += plugin" "" + + echo "LIBS += -L${nodejs-slim.libv8}/lib -lv8 -pthread" >> $BUILDRT/X2tConverter/build/Qt/X2tConverter.pro + echo "LIBS += -L${openssl'.out}/lib -lcrypto" >> $BUILDRT/X2tConverter/build/Qt/X2tConverter.pro + # (not as patch because of line endings) sed -i '47 a #include ' $BUILDRT/Common/OfficeFileFormatChecker2.cpp diff --git a/pkgs/by-name/pa/parmmg/package.nix b/pkgs/by-name/pa/parmmg/package.nix index 0d1681c04f2c..9623b341eb53 100644 --- a/pkgs/by-name/pa/parmmg/package.nix +++ b/pkgs/by-name/pa/parmmg/package.nix @@ -10,10 +10,13 @@ metis, mmg, scotch, - vtk-full, + vtk, withVtk ? true, testers, }: +let + vtk-mpi = vtk.override { mpiSupport = true; }; +in stdenv.mkDerivation (finalAttrs: { pname = "parmmg"; version = "1.5.0"; @@ -53,10 +56,10 @@ stdenv.mkDerivation (finalAttrs: { scotch (mmg.override { inherit withVtk; - vtk = vtk-full; + vtk = vtk-mpi; }) ] - ++ lib.optional withVtk vtk-full; + ++ lib.optional withVtk vtk-mpi; cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) diff --git a/pkgs/by-name/ph/phoenixd/package.nix b/pkgs/by-name/ph/phoenixd/package.nix index 9e6357913b2a..f718ba742e22 100644 --- a/pkgs/by-name/ph/phoenixd/package.nix +++ b/pkgs/by-name/ph/phoenixd/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "phoenixd"; - version = "0.8.0"; + version = "0.9.0"; src = let @@ -27,9 +27,9 @@ stdenv.mkDerivation (finalAttrs: { fetchurl { url = "https://github.com/ACINQ/phoenixd/releases/download/v${finalAttrs.version}/phoenixd-${finalAttrs.version}-${suffix}.zip"; hash = selectSystem { - aarch64-darwin = "sha256-eVrwJGjXZNl9e2QGtVVEHjptCMPQgGaxljDEqr7LE7s="; - x86_64-linux = "sha256-n/yvAisqpnbHs3XV0sHq0sUpq0+mqXmG+3LXRNmrLpI="; - aarch64-linux = "sha256-mfhLpPXFvkO0mz4okdOXALIk8MR2CQQ8mZ6aI+QgNZs="; + aarch64-darwin = "sha256-NQyHyQzfkdLPpQnuSP09cSZwITA9Q1ml7q2haU3qm5o="; + x86_64-linux = "sha256-2eVLk4E/F3GwcslsWulo/7WwUvLKHEJ2K2biy4A2Kg8="; + aarch64-linux = "sha256-yAbw2AWKSHKEFzU2rMupBBF2+CF/jITOWbbpfQSoizE="; }; }; diff --git a/pkgs/by-name/po/pocketbase/package.nix b/pkgs/by-name/po/pocketbase/package.nix index e31c998bf487..5a19aca35b40 100644 --- a/pkgs/by-name/po/pocketbase/package.nix +++ b/pkgs/by-name/po/pocketbase/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "pocketbase"; - version = "0.39.6"; + version = "0.39.8"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${finalAttrs.version}"; - hash = "sha256-EQMgqdxssB4FbVJDoYZTdk9vq+++k52MJe/6ZiGgHjo="; + hash = "sha256-ZStu568NCfNo46NNsuAi0i8Oph0bL5L2v+Zny3WqdIY="; }; - vendorHash = "sha256-Xu9jokD5Dkov5kZjO05q60YpM3NZlbwOZs0XJmQ8kC8="; + vendorHash = "sha256-88GNxiHZzDJp8Xj0Il3D3gT8NaVAyyd+gcGmFAzfKp8="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; diff --git a/pkgs/by-name/pr/prometheus-node-exporter/package.nix b/pkgs/by-name/pr/prometheus-node-exporter/package.nix index f7c75d99ea84..a450f93da895 100644 --- a/pkgs/by-name/pr/prometheus-node-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-node-exporter/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "node_exporter"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "prometheus"; repo = "node_exporter"; tag = "v${finalAttrs.version}"; - hash = "sha256-pjgxx7Xz0q2SctTEwDiwqmZAOTxrHt1XEl1pSMP7Ids="; + hash = "sha256-10sGJ4PkYMmr9mpYu22dw9zDbbDsCsHfG6Z7czaywAc="; }; vendorHash = "sha256-WFRxkwMM9D612tLJjij+kwpcwhcl3KhR8xXxx43SC9o="; diff --git a/pkgs/by-name/py/pyspread/package.nix b/pkgs/by-name/py/pyspread/package.nix index 6bb3b984431e..ea2b080a080b 100644 --- a/pkgs/by-name/py/pyspread/package.nix +++ b/pkgs/by-name/py/pyspread/package.nix @@ -1,7 +1,7 @@ { lib, python3Packages, - fetchPypi, + fetchFromGitLab, qt6, R, copyDesktopItems, @@ -10,14 +10,19 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "pyspread"; version = "2.4.5"; + pyproject = true; + __structuredAttrs = true; - src = fetchPypi { - pname = "pyspread"; - inherit (finalAttrs) version; - hash = "sha256-7Nurn9OmK6LEz5TT543JUYKc/LjpkwfN/7r0ebS1PfY="; + src = fetchFromGitLab { + owner = "pyspread"; + repo = "pyspread"; + tag = "v${finalAttrs.version}"; + hash = "sha256-3DAoRIzwFxOEIXSCO+MyCAZ92Y57AD9Z9oq6ps1Ck0k="; }; - pyproject = true; + build-system = with python3Packages; [ + setuptools + ]; nativeBuildInputs = [ R @@ -67,7 +72,11 @@ python3Packages.buildPythonApplication (finalAttrs: { }) ]; - makeWrapperArgs = [ "--set R_HOME ${lib.getLib R}/lib/R" ]; + makeWrapperArgs = [ + "--set" + "R_HOME" + "${lib.getLib R}/lib/R" + ]; preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") diff --git a/pkgs/by-name/rb/rbspy/package.nix b/pkgs/by-name/rb/rbspy/package.nix index dbdbea6f7eda..267420b6c609 100644 --- a/pkgs/by-name/rb/rbspy/package.nix +++ b/pkgs/by-name/rb/rbspy/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rbspy"; - version = "0.49.0"; + version = "0.50.0"; src = fetchFromGitHub { owner = "rbspy"; repo = "rbspy"; tag = "v${finalAttrs.version}"; - hash = "sha256-H4SFivaMmRvAhJy5n/QZ1dHFRfYywrpABMl1A9waYzo="; + hash = "sha256-rDPaG6cT+1IJ8Q0iYU3e+XPBr9gufQyOb682LJguhDs="; }; - cargoHash = "sha256-NtUJxQTRmXsI76DjJ43UfBf9FskFk/gehw5STcuQEuQ="; + cargoHash = "sha256-YiPfjLVYfn38t9wfhWiagUQvWZuOjRdxm7RzG5S9IeU="; doCheck = true; diff --git a/pkgs/by-name/s3/s3cmd/package.nix b/pkgs/by-name/s3/s3cmd/package.nix index 7e76de2f114d..8e9b4f8cfcce 100644 --- a/pkgs/by-name/s3/s3cmd/package.nix +++ b/pkgs/by-name/s3/s3cmd/package.nix @@ -4,23 +4,29 @@ fetchFromGitHub, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "s3cmd"; version = "2.4.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "s3tools"; repo = "s3cmd"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-cxwf6+9WFt3U7+JdKRgZxFElD+Dgf2P2VyejHVoiDJk="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ python-magic python-dateutil ]; + build-system = with python3Packages; [ setuptools ]; + + pythonImportsCheck = [ "S3" ]; + meta = { homepage = "https://s3tools.org/s3cmd"; description = "Command line tool for managing Amazon S3 and CloudFront services"; @@ -28,4 +34,4 @@ python3Packages.buildPythonApplication rec { license = lib.licenses.gpl2Plus; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/sh/shotgun/package.nix b/pkgs/by-name/sh/shotgun/package.nix index c3126dd8b418..5c3c0f535d80 100644 --- a/pkgs/by-name/sh/shotgun/package.nix +++ b/pkgs/by-name/sh/shotgun/package.nix @@ -21,9 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Minimal X screenshot utility"; homepage = "https://github.com/neXromancers/shotgun"; license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ - lumi - ]; + maintainers = [ ]; platforms = lib.platforms.linux; mainProgram = "shotgun"; }; diff --git a/pkgs/by-name/sl/slurp-fediverse/package.nix b/pkgs/by-name/sl/slurp-fediverse/package.nix new file mode 100644 index 000000000000..ad6a26981c32 --- /dev/null +++ b/pkgs/by-name/sl/slurp-fediverse/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildGoModule, + fetchFromCodeberg, +}: + +buildGoModule (finalAttrs: { + pname = "slurp"; + version = "1.1.1"; + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromCodeberg { + owner = "vyr"; + repo = "slurp"; + rev = "v${finalAttrs.version}"; + hash = "sha256-bqIX+kG/VXLvw/ORqS+Gq8fezd0QW6dlKdLr2vW0YY0="; + }; + + vendorHash = "sha256-i/xoMJORuJbAQW+g9H95xQ5O3811NncCgJIL9OY+B5k="; + + # Tests require networking + doCheck = false; + + meta = { + description = "Tool for exporting data from and importing data to Fediverse instances"; + homepage = "https://codeberg.org/vyr/slurp"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ onny ]; + mainProgram = "slurp"; + }; +}) diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index 2b72bd39f5d6..9d0662d48103 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -18,7 +18,7 @@ assert lib.assertMsg (builtins.elem backend [ ]) "surrealdb: backend must be one of [ \"rocksdb\" \"surrealkv\" ]"; rustPlatform.buildRustPackage (finalAttrs: { pname = if hasRocksDB then "surrealdb" else "surrealdb-surrealkv"; - version = "2.6.1"; + version = "3.0.0"; __structuredAttrs = true; @@ -26,15 +26,16 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "surrealdb"; repo = "surrealdb"; tag = "v${finalAttrs.version}"; - hash = "sha256-Dd6tabpSTh7IN9PLE4Zt/s1G7mNUwYfy+nEZpPTy8a8="; + hash = "sha256-KDVc5BTkJ5OwxANeXOBnerJihnKU6y72Dw8h1ARcj3U="; }; - cargoHash = "sha256-lebSQPGnxW+3a7vWw3R7QYtHx04/DsRK/n8c/UT3FZo="; + cargoHash = "sha256-yemnwhcC5CsQgO29Qiau39QAVbGnrNsOG1dNen987HM="; # Upstream hard-codes `aarch64-linux-gnu-gcc` in `.cargo/config.toml`. # Remove it so Cargo uses nixpkgs' wrapped C toolchain instead. postPatch = '' rm .cargo/config.toml + sed -i '1i #![recursion_limit = "256"]' surrealdb/server/src/lib.rs ''; buildNoDefaultFeatures = true; @@ -44,10 +45,6 @@ rustPlatform.buildRustPackage (finalAttrs: { "http" "scripting" "storage-mem" - "storage-surrealcs" - # Keep this enabled for the default RocksDB build to preserve upstream's - # default storage feature set. It can be dropped if `pkgs.surrealdb` is - # intentionally slimmed to RocksDB-only in a later change. "storage-surrealkv" ] ++ lib.optional hasRocksDB "storage-rocksdb"; @@ -94,6 +91,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "surreal"; license = lib.licenses.bsl11; maintainers = with lib.maintainers; [ + aln730 sikmir happysalada siriobalmelli diff --git a/pkgs/by-name/ta/tabbyapi/package.nix b/pkgs/by-name/ta/tabbyapi/package.nix index cac9ebfe2c59..2ecf9cb6b700 100644 --- a/pkgs/by-name/ta/tabbyapi/package.nix +++ b/pkgs/by-name/ta/tabbyapi/package.nix @@ -7,14 +7,14 @@ }: python3Packages.buildPythonApplication { pname = "tabbyapi"; - version = "0-unstable-2026-06-27"; + version = "0-unstable-2026-07-18"; pyproject = true; src = fetchFromGitHub { owner = "theroyallab"; repo = "tabbyAPI"; - rev = "3cf468c28362c28be1c8fc731ce1ccaf7b2206d0"; - hash = "sha256-s97YFyij2/oYlClmV2laDrCkkoK4uVZgRsn5WwftLag="; + rev = "0158fb48d76546a6475d1d63f6cd5b90932d1d11"; + hash = "sha256-Bkpx3MyZg7Np5zXAsq8mgxdAFsHUZhy2NZ93XSLbJgk="; }; build-system = with python3Packages; [ @@ -57,7 +57,6 @@ python3Packages.buildPythonApplication { numpy setuptools - exllamav2 exllamav3 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/by-name/ti/timelimit/package.nix b/pkgs/by-name/ti/timelimit/package.nix index b80ff791acc0..f68acb32c985 100644 --- a/pkgs/by-name/ti/timelimit/package.nix +++ b/pkgs/by-name/ti/timelimit/package.nix @@ -31,7 +31,9 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://devel.ringlet.net/sysutils/timelimit/"; license = lib.licenses.bsd2; platforms = lib.platforms.all; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + sheeeng + ]; mainProgram = "timelimit"; }; }) diff --git a/pkgs/by-name/tm/tml/package.nix b/pkgs/by-name/tm/tml/package.nix index 41700c789543..72aa80545ccc 100644 --- a/pkgs/by-name/tm/tml/package.nix +++ b/pkgs/by-name/tm/tml/package.nix @@ -28,6 +28,8 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/liamg/tml"; changelog = "https://github.com/liamg/tml/releases/tag/v${finalAttrs.version}"; license = lib.licenses.unlicense; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + sheeeng + ]; }; }) diff --git a/pkgs/by-name/un/unimap/package.nix b/pkgs/by-name/un/unimap/package.nix index a97d7f501f2d..d02ed9f5f80f 100644 --- a/pkgs/by-name/un/unimap/package.nix +++ b/pkgs/by-name/un/unimap/package.nix @@ -51,7 +51,9 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/Edu4rdSHL/unimap"; changelog = "https://github.com/Edu4rdSHL/unimap/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.gpl3Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + sheeeng + ]; mainProgram = "unimap"; }; }) diff --git a/pkgs/by-name/vi/vigra/package.nix b/pkgs/by-name/vi/vigra/package.nix index c095fbf53c01..23d0a049a14e 100644 --- a/pkgs/by-name/vi/vigra/package.nix +++ b/pkgs/by-name/vi/vigra/package.nix @@ -7,6 +7,7 @@ fftw, fftwSinglePrec, hdf5, + libaec, libjpeg, libpng, libtiff, @@ -43,6 +44,9 @@ stdenv.mkDerivation (finalAttrs: { (hdf5.override { apiVersion = "v110"; }) + # Satisfy the HDF5_SZLIB_OK check in the source's config/FindHDF5.cmake + # libaec is a drop-in replacement of szip. + libaec libjpeg libpng libtiff diff --git a/pkgs/by-name/wi/wifite2/package.nix b/pkgs/by-name/wi/wifite2/package.nix index 41426beb1c9a..584a614e3dbb 100644 --- a/pkgs/by-name/wi/wifite2/package.nix +++ b/pkgs/by-name/wi/wifite2/package.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, fetchpatch, - python3, python3Packages, wirelesstools, aircrack-ng, @@ -20,16 +19,10 @@ macchanger, }: -let - pythonDependencies = with python3Packages; [ - chardet - scapy - ]; -in -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "wifite2"; version = "2.7.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "kimocoder"; @@ -38,6 +31,8 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-G2AKKZUDS2UQm95TEhGJIucyMRcm7oL0d3J8uduEQhw="; }; + build-system = with python3Packages; [ setuptools ]; + patches = [ (fetchpatch { url = "https://salsa.debian.org/pkg-security-team/wifite/raw/debian/2.7.0-1/debian/patches/Disable-aircrack-failing-test.patch"; @@ -53,6 +48,13 @@ python3.pkgs.buildPythonApplication rec { }) ]; + dependencies = with python3Packages; [ + chardet + scapy + ]; + + pythonRemoveDeps = [ "argparse" ]; + propagatedBuildInputs = [ aircrack-ng wireshark-cli @@ -68,10 +70,9 @@ python3.pkgs.buildPythonApplication rec { john iw macchanger - ] - ++ pythonDependencies; + ]; - nativeCheckInputs = propagatedBuildInputs ++ [ python3.pkgs.unittestCheckHook ]; + nativeCheckInputs = propagatedBuildInputs ++ [ python3Packages.pytestCheckHook ]; meta = { homepage = "https://github.com/kimocoder/wifite2"; diff --git a/pkgs/by-name/ws/wsjtx/package.nix b/pkgs/by-name/ws/wsjtx/package.nix index c8ccf4133d4f..7a43dcc1c819 100644 --- a/pkgs/by-name/ws/wsjtx/package.nix +++ b/pkgs/by-name/ws/wsjtx/package.nix @@ -6,8 +6,8 @@ asciidoctor, cmake, nix-update-script, - gitUpdater, pkg-config, + portaudio, fftw, fftwFloat, gfortran, @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wsjtx"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "WSJTX"; repo = "wsjtx"; tag = "v${finalAttrs.version}"; - hash = "sha256-0Agm6lvzH3sgBatOBpYV3/CoyNJsO7Sw9mD/wewJ1DM="; + hash = "sha256-PompKWVxPpF3ie811tqy8bplnULyXdenBrR/pHvtM08="; }; nativeBuildInputs = [ @@ -47,6 +47,7 @@ stdenv.mkDerivation (finalAttrs: { fftwFloat hamlib_4 libusb1 + portaudio qt5.qtbase qt5.qtmultimedia qt5.qtserialport diff --git a/pkgs/by-name/za/zashboard/package.nix b/pkgs/by-name/za/zashboard/package.nix index 30bbb2c8a6ff..8dd9000fce7a 100644 --- a/pkgs/by-name/za/zashboard/package.nix +++ b/pkgs/by-name/za/zashboard/package.nix @@ -12,13 +12,13 @@ let in buildNpmPackage (finalAttrs: { pname = "zashboard"; - version = "3.14.0"; + version = "3.15.0"; src = fetchFromGitHub { owner = "Zephyruso"; repo = "zashboard"; tag = "v${finalAttrs.version}"; - hash = "sha256-GSzJpBGDCh7OPPr5OWfAAbraRjIhKkVo5/EMRmrLm/o="; + hash = "sha256-esGLewI9zF25yXZeztFGiKjYYbMn9cwYnOjLzLIijWI="; }; npmDeps = null; diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 4c701d85148a..6f846c8eedca 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -1,6 +1,6 @@ { callPackage, - fetchpatch2, + fetchpatch, }: let mkVtk = initArgs: callPackage (import ./generic.nix initArgs) { }; @@ -9,10 +9,24 @@ in vtk_9_5 = mkVtk { version = "9.5.2"; sourceSha256 = "sha256-zuZLmNJw/3MC2vHvE0WN/11awey0XUdyODX399ViyYk="; + patches = [ + (fetchpatch { + name = "fix-gdal-3.13-const-conversion.patch"; + url = "https://github.com/Kitware/VTK/commit/2395603fdddc40c29efc64c632ae98225ca2a58e.patch"; + hash = "sha256-Gcnt1JXWPkhfNLhtk9SXYqx/0cLkjO4xiRfR8YiaY8I="; + }) + ]; }; vtk_9_6 = mkVtk { - version = "9.6.0"; - sourceSha256 = "sha256-130YBpT6r9yBZXi5pTZR9nkOeZYVgRv7uRAYZho7uPI="; + version = "9.6.2"; + sourceSha256 = "sha256-rtEs7BKpYJF5v2YykHAmZifKZCRKEIVqRSsqF/+wSh0="; + patches = [ + (fetchpatch { + name = "fix-gdal-3.13-const-conversion.patch"; + url = "https://github.com/Kitware/VTK/commit/2395603fdddc40c29efc64c632ae98225ca2a58e.patch"; + hash = "sha256-Gcnt1JXWPkhfNLhtk9SXYqx/0cLkjO4xiRfR8YiaY8I="; + }) + ]; }; } diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index 2c55cb56a380..0028af291ca3 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -169,7 +169,6 @@ stdenv.mkDerivation (finalAttrs: { libxrender libxcursor ] - ++ lib.optional withQt6 qt6.qttools ++ lib.optional mpiSupport mpi ++ lib.optional pythonSupport tk; @@ -219,6 +218,10 @@ stdenv.mkDerivation (finalAttrs: { libx11 gl2ps ] + ++ lib.optionals ((lib.versionAtLeast finalAttrs.version "9.6.0") && stdenv.hostPlatform.isLinux) [ + libxcursor + ] + ++ lib.optionals withQt6 [ qt6.qttools ] # create meta package providing dist-info for python3Pacakges.vtk that common cmake build does not do ++ lib.optionals pythonSupport [ (python3Packages.mkPythonMetaPackage { @@ -227,7 +230,6 @@ stdenv.mkDerivation (finalAttrs: { with python3Packages; [ numpy - wslink matplotlib ] ++ lib.optional mpiSupport (mpi4py.override { inherit mpi; }); @@ -320,7 +322,6 @@ stdenv.mkDerivation (finalAttrs: { package = finalAttrs.finalPackage; nativeBuildInputs = lib.optionals withQt6 [ - qt6.qttools qt6.wrapQtAppsHook ]; }; diff --git a/pkgs/development/python-modules/exllamav2/default.nix b/pkgs/development/python-modules/exllamav2/default.nix deleted file mode 100644 index fd8304708569..000000000000 --- a/pkgs/development/python-modules/exllamav2/default.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - - # build-system - setuptools, - torch, - - cudaPackages, - - # nativeBuildInputs - pybind11, - - # dependencies - fastparquet, - flash-attn, - ninja, - numpy, - pandas, - pillow, - pygments, - regex, - rich, - safetensors, - tokenizers, - websockets, -}: -buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: { - pname = "exllamav2"; - version = "0.3.2"; - pyproject = true; - __structuredAttrs = true; - - src = fetchFromGitHub { - owner = "turboderp-org"; - repo = "exllamav2"; - tag = "v${finalAttrs.version}"; - hash = "sha256-WbpbANenOuy6F0qAKVKAmolHjgRKfPxSVud8FZG1TXw="; - }; - - build-system = [ - setuptools - torch - ]; - - nativeBuildInputs = [ - ninja - ]; - - preConfigure = '' - export MAX_JOBS="$NIX_BUILD_CORES" - export NVCC_THREADS=2 - ''; - - buildInputs = [ - pybind11 - ] - ++ lib.optionals torch.cudaSupport [ - cudaPackages.cuda_cudart # cuda_runtime.h - cudaPackages.libcublas # cublas_v2.h - cudaPackages.libcurand # curand_kernel.h - cudaPackages.libcusolver # cusolverDn.h - cudaPackages.libcusparse # cusparse.h - ]; - - env = lib.optionalAttrs torch.cudaSupport { - CUDA_HOME = lib.getDev cudaPackages.cuda_nvcc; - TORCH_CUDA_ARCH_LIST = lib.concatStringsSep ";" torch.cudaCapabilities; - }; - - dependencies = [ - fastparquet - flash-attn - ninja - numpy - pandas - pillow - pygments - regex - rich - safetensors - tokenizers - torch - websockets - ]; - - pythonImportsCheck = [ "exllamav2" ]; - - # Tests require GPU hardware and external model files - doCheck = false; - - meta = { - homepage = "https://github.com/turboderp-org/exllamav2"; - description = "Inference library for running LLMs locally on modern consumer-class GPUs"; - changelog = "https://github.com/turboderp-org/exllamav2/releases/tag/${finalAttrs.src.tag}"; - license = lib.licenses.mit; - platforms = [ - "x86_64-windows" - "x86_64-linux" - ]; - - # Package requires CUDA or ROCm for functionality - # ROCm support is partially implemented but untested - broken = !torch.cudaSupport; - maintainers = with lib.maintainers; [ BatteredBunny ]; - }; -}) diff --git a/pkgs/development/python-modules/exllamav3/default.nix b/pkgs/development/python-modules/exllamav3/default.nix index ab7e43ef490f..64f380cd44fe 100644 --- a/pkgs/development/python-modules/exllamav3/default.nix +++ b/pkgs/development/python-modules/exllamav3/default.nix @@ -7,7 +7,6 @@ setuptools, - flash-attn, flash-linear-attention, formatron, kbnf, @@ -22,21 +21,20 @@ tokenizers, torch, typing-extensions, - xformers, }: let newerThanTuring = lib.filter (version: lib.versionOlder "7.9" version) torch.cudaCapabilities; in buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: { pname = "exllamav3"; - version = "0.0.43"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "turboderp-org"; repo = "exllamav3"; tag = "v${finalAttrs.version}"; - hash = "sha256-68v8ptvtOzRTnnRXrgU0emqmbCO0pECidgJ36bwm8/s="; + hash = "sha256-JlZt1UuTMmjaQWhiQZxzbHK3WgYYoBjP9PMEizEfsLY="; }; pythonRelaxDeps = [ @@ -60,7 +58,6 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: { ]; dependencies = [ - flash-attn flash-linear-attention formatron kbnf @@ -74,7 +71,6 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: { tokenizers torch typing-extensions - xformers ]; env = lib.optionalAttrs torch.cudaSupport { diff --git a/pkgs/development/python-modules/flask-static-digest/default.nix b/pkgs/development/python-modules/flask-static-digest/default.nix new file mode 100644 index 000000000000..e22833682455 --- /dev/null +++ b/pkgs/development/python-modules/flask-static-digest/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + flask, + + # optional-dependencies + brotli, +}: + +buildPythonPackage (finalAttrs: { + pname = "flask-static-digest"; + version = "0.4.1"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "nickjj"; + repo = "flask-static-digest"; + tag = "v${finalAttrs.version}"; + hash = "sha256-A+NELUCjYTkUYbL0TIPvgGcJ49YRgoBn/eJRxi/yLyc="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ flask ]; + + optional-dependencies.brotli = [ brotli ]; + + # Upstream does not provide tests. + doCheck = false; + + pythonImportsCheck = [ "flask_static_digest" ]; + + meta = { + description = "Flask extension for md5 tagging and compressing static files"; + homepage = "https://github.com/nickjj/flask-static-digest"; + changelog = "https://github.com/nickjj/flask-static-digest/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ mert-kurttutan ]; + }; +}) diff --git a/pkgs/development/python-modules/gibberish-detector/default.nix b/pkgs/development/python-modules/gibberish-detector/default.nix index 9b432d32c042..6a0bf85180c2 100644 --- a/pkgs/development/python-modules/gibberish-detector/default.nix +++ b/pkgs/development/python-modules/gibberish-detector/default.nix @@ -3,20 +3,25 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gibberish-detector"; version = "0.1.1"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "domanchi"; repo = "gibberish-detector"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1si0fkpnk9vjkwl31sq5jkyv3rz8a5f2nh3xq7591j9wv2b6dn0b"; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "gibberish_detector" ]; @@ -28,4 +33,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/graphqlclient/default.nix b/pkgs/development/python-modules/graphqlclient/default.nix index e0c85fbd3751..2a8263a79ffc 100644 --- a/pkgs/development/python-modules/graphqlclient/default.nix +++ b/pkgs/development/python-modules/graphqlclient/default.nix @@ -2,20 +2,26 @@ lib, buildPythonPackage, fetchPypi, + setuptools, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "graphqlclient"; version = "0.2.4"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; - sha256 = "0b6r3ng78qsn7c9zksx4rgdkmp5296d40kbmjn8q614cz0ymyc5k"; + pname = "graphqlclient"; + inherit (finalAttrs) version; + hash = "sha256-szBfPfiMBIORlXVNQJpJotw628uk6/kTO1ZjdJ4d2Sw="; }; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; + + dependencies = [ six ]; # Project has no tests doCheck = false; @@ -28,4 +34,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ lde ]; }; -} +}) diff --git a/pkgs/development/python-modules/meld3/default.nix b/pkgs/development/python-modules/meld3/default.nix deleted file mode 100644 index cc67de2ee01c..000000000000 --- a/pkgs/development/python-modules/meld3/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, -}: - -buildPythonPackage rec { - pname = "meld3"; - version = "2.0.1"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "3ea266994f1aa83507679a67b493b852c232a7905e29440a6b868558cad5e775"; - }; - - doCheck = false; - - meta = { - description = "HTML/XML templating engine used by supervisor"; - homepage = "https://github.com/supervisor/meld3"; - license = lib.licenses.free; - }; -} diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 45725a423f68..8f204d225b39 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -50,8 +50,11 @@ buildPythonPackage (finalAttrs: { patch -p1 -d "$out/lib/python"*/site-packages < ${./subprocess-pythonpath.patch} ''; + # 3.14.0 dependency check fails with pandas >= 3.0. But the code changes required are minimal + # (strings are now `str` instead of `numpy.object`.) pythonRelaxDeps = [ "cryptography" + "pandas" ]; dependencies = [ diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix index 0ff799eade41..78787065e881 100644 --- a/pkgs/development/python-modules/plotnine/default.nix +++ b/pkgs/development/python-modules/plotnine/default.nix @@ -64,6 +64,11 @@ buildPythonPackage (finalAttrs: { # After manually checking, this is caused by extremely subtle differences in label placement. # See https://github.com/has2k1/plotnine/issues/627 "test_aesthetics" + "test_after_scale_mapping" + "test_annotate_faceting" + "test_inserting_layers" + "test_multiple_annotation_geoms" + "test_to_pandas" ]; disabledTestPaths = [ @@ -72,40 +77,56 @@ buildPythonPackage (finalAttrs: { # After manually checking, this is caused by extremely subtle differences in label placement. "tests/test_aes.py" "tests/test_annotation_logticks.py" + "tests/test_annotation_stripes.py" "tests/test_coords.py" "tests/test_facet_labelling.py" "tests/test_facets.py" + "tests/test_geom_abline.py" "tests/test_geom_bar_col_histogram.py" "tests/test_geom_bin_2d.py" + "tests/test_geom_blank.py" "tests/test_geom_boxplot.py" "tests/test_geom_count.py" - "tests/test_geom_density_2d.py" "tests/test_geom_density.py" + "tests/test_geom_density_2d.py" "tests/test_geom_dotplot.py" + "tests/test_geom_errorbar_errorbarh.py" "tests/test_geom_freqpoly.py" + "tests/test_geom_linerange_pointrange.py" "tests/test_geom_map.py" "tests/test_geom_path_line_step.py" "tests/test_geom_point.py" "tests/test_geom_pointdensity.py" "tests/test_geom_polygon.py" + "tests/test_geom_qq_qq_line.py" + "tests/test_geom_quantile.py" "tests/test_geom_raster.py" "tests/test_geom_rect_tile.py" "tests/test_geom_ribbon_area.py" + "tests/test_geom_rug.py" + "tests/test_geom_segment.py" "tests/test_geom_sina.py" "tests/test_geom_smooth.py" + "tests/test_geom_spoke.py" "tests/test_geom_text_label.py" "tests/test_geom_violin.py" + "tests/test_guide_internals.py" "tests/test_layout.py" "tests/test_plot_composition.py" "tests/test_position.py" "tests/test_qplot.py" "tests/test_scale_internals.py" "tests/test_scale_labelling.py" + "tests/test_scale_linetype.py" + "tests/test_scale_symlog.py" "tests/test_stat_ecdf.py" "tests/test_stat_ellipse.py" "tests/test_stat_function.py" + "tests/test_stat_hull.py" "tests/test_stat_summary.py" + "tests/test_stat_summary_bin.py" "tests/test_theme.py" + "tests/test_watermark.py" # Linting / formatting: useless as it has nothing to do with the package functioning # Disabling this prevents adding a dependency on 'ruff' and 'black'. diff --git a/pkgs/development/python-modules/victron-mqtt/default.nix b/pkgs/development/python-modules/victron-mqtt/default.nix index 12f1952ab591..9ea5b7794f96 100644 --- a/pkgs/development/python-modules/victron-mqtt/default.nix +++ b/pkgs/development/python-modules/victron-mqtt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "victron-mqtt"; - version = "2026.7.3"; + version = "2026.7.5"; pyproject = true; src = fetchFromGitHub { owner = "tomer-w"; repo = "victron_mqtt"; tag = "v${finalAttrs.version}"; - hash = "sha256-J5k3JkAP1E39KL3JMIfg00jDuiFfIss+N3+/Jxscx3s="; + hash = "sha256-nFsv8fij2kqzpGwflWPfN29Tt8lbHS2EvLqljWHHOwE="; }; build-system = [ diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 1da0155ebc96..13ce810188b2 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -61,8 +61,8 @@ let hash = "sha256-zLXEecqxsAYhMlv+fUyaioAx56Ul1ySeJ17L7IGwjbI="; }; "11" = { - version = "11.13.1"; - hash = "sha256-EAErV9I7lnO8U0Fo/1axrGVbpKJzf/N/bZ0ZpVFEr6o="; + version = "11.15.0"; + hash = "sha256-dy+OAPcZr7viJQJxfPl0V4gEYw0C51frPeu8CKD4+Do="; }; }; diff --git a/pkgs/servers/home-assistant/custom-components/cable_modem_monitor/package.nix b/pkgs/servers/home-assistant/custom-components/cable_modem_monitor/package.nix index 33068130ec24..b5e736f0c4f6 100644 --- a/pkgs/servers/home-assistant/custom-components/cable_modem_monitor/package.nix +++ b/pkgs/servers/home-assistant/custom-components/cable_modem_monitor/package.nix @@ -17,12 +17,12 @@ requests, }: let - version = "3.14.0-beta.13"; + version = "3.14.0-beta.14"; src = fetchFromGitHub { owner = "solentlabs"; repo = "cable_modem_monitor"; tag = "v${version}"; - hash = "sha256-biQVMq2IoOdbpdP+zDfLXdl91++aKmN3EPQfvzEACyU="; + hash = "sha256-9spsEWLwRmWgWz6EZAGHaLmLgjQN2bQevrF1+XFvBtY="; fetchLFS = true; }; diff --git a/pkgs/servers/home-assistant/custom-components/smarthq/package.nix b/pkgs/servers/home-assistant/custom-components/smarthq/package.nix index 1abf81c5ca88..c455cf9b9dbe 100644 --- a/pkgs/servers/home-assistant/custom-components/smarthq/package.nix +++ b/pkgs/servers/home-assistant/custom-components/smarthq/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent (finalAttrs: { owner = "geappliances"; domain = "smarthq"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "geappliances"; repo = "geappliances-smarthq-integration"; tag = "v${finalAttrs.version}"; - hash = "sha256-PwCorYIqRK4gQLaYxoebIVRIeTcIrDo3CRNs/6DUc9o="; + hash = "sha256-OiEUrYR4J+AUDDQN7BkGZPuBSG5lry7OB0sh7CsShtI="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix index d1f38dcba27b..788b1c54da91 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "universal-remote-card"; - version = "4.11.4"; + version = "4.11.5"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-R2fs9J0ibV9RUUbFBzKl6LCHGr5GATS4ZtABTS4Wjd8="; + hash = "sha256-6UdoWzYekoAyLF4D7LP92/LVcczB7nJU6y/C9OT/NVs="; }; - npmDepsHash = "sha256-w21PeUt34FIy2BOQNXizEfM93Wd/UwvJjU1fdSzU2OY="; + npmDepsHash = "sha256-8A5FPbxqUIS76/6K6oTrgQMRYgl9Q+4JgQJAYGSCI2U="; installPhase = '' runHook preInstall diff --git a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix index dc98b0a64297..7cb7b5668850 100644 --- a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix +++ b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix @@ -1,6 +1,6 @@ { # texlive package set - tl, + pkgs, tlpdbVersion, @@ -55,7 +55,7 @@ lib.fix ( # resolve dependencies of the packages that affect the runtime all = let - packages = ensurePkgSets (finalAttrs.passthru.requiredTeXPackages tl); + packages = ensurePkgSets (finalAttrs.passthru.requiredTeXPackages pkgs); runtime = builtins.partition ( p: p.outputSpecified or false @@ -72,7 +72,7 @@ lib.fix ( inherit p; tlDeps = if p ? tlDeps then - (if builtins.isFunction p.tlDeps then p.tlDeps tl else ensurePkgSets p.tlDeps) + (if builtins.isFunction p.tlDeps then p.tlDeps pkgs else ensurePkgSets p.tlDeps) else [ ]; }; @@ -214,13 +214,13 @@ lib.fix ( # mktexlsr nativeBuildInputs = [ - tl.texlive-scripts # for mktexlsr.pl with --sort support + pkgs.texlive-scripts # for mktexlsr.pl with --sort support perl ]; postBuild = # generate ls-R database '' - perl ${tl.texlive-scripts.tex}/scripts/texlive/mktexlsr.pl --sort "$out" + perl ${pkgs.texlive-scripts.tex}/scripts/texlive/mktexlsr.pl --sort "$out" ''; }; @@ -269,7 +269,7 @@ lib.fix ( + lib.concatMapStringsSep "\n - " ( p: p.pname + (lib.optionalString (p.outputSpecified or false) " (${p.tlOutputName or p.outputName})") - ) (finalAttrs.passthru.requiredTeXPackages tl); + ) (finalAttrs.passthru.requiredTeXPackages pkgs); }; # other outputs @@ -479,9 +479,9 @@ lib.fix ( nativeBuildInputs = [ makeWrapper libfaketime - tl."texlive.infra" # mktexlsr - tl.texlive-scripts # fmtutil, updmap - tl.texlive-scripts-extra # texlinks + pkgs."texlive.infra" # mktexlsr + pkgs.texlive-scripts # fmtutil, updmap + pkgs.texlive-scripts-extra # texlinks perl ]; diff --git a/pkgs/tools/typesetting/tex/texlive/combine-wrapper.nix b/pkgs/tools/typesetting/tex/texlive/combine-wrapper.nix index 82a5b6701e60..0408d233f9eb 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine-wrapper.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine-wrapper.nix @@ -2,7 +2,7 @@ { lib, toTLPkgList, - tl, + pkgs, buildTeXEnv, }: args@{ @@ -49,7 +49,7 @@ let operator = { pkg, ... }: pkgListToSets ( - if pkg ? tlDeps then if builtins.isFunction pkg.tlDeps then pkg.tlDeps tl else pkg.tlDeps else [ ] + if pkg ? tlDeps then if builtins.isFunction pkg.tlDeps then pkg.tlDeps pkgs else pkg.tlDeps else [ ] ); } ); diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 94a7f51089a4..da8b6b547a68 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -46,6 +46,7 @@ nixfmt, luajit, texinfo, + texlive, # for bin.nix gnum4, jdk_headless, @@ -73,7 +74,6 @@ unzip, fetchFromGitHub, buildPackages, - texlive, zlib, libiconv, libpng, @@ -99,6 +99,7 @@ let overriddenTlpdb = let overrides = import ./tlpdb-overrides.nix { + inherit (texlive) pkgs; inherit stdenv lib @@ -106,7 +107,6 @@ let bin tlpdb tlpdbxz - tl installShellFiles coreutils findutils @@ -226,13 +226,15 @@ let inherit mirrors pname; fixedHashes = fixedHashes."${pname}-${toString revision}${extraRevision}" or { }; } - // lib.optionalAttrs (args ? deps) { deps = map (n: tl.${n} or bin.${n}) (args.deps or [ ]); } + // lib.optionalAttrs (args ? deps) { + deps = map (n: texlive.pkgs.${n} or bin.${n}) (args.deps or [ ]); + } ) ) overriddenTlpdb; # function for creating a working environment buildTeXEnv = import ./build-tex-env.nix { - inherit tl; + inherit (texlive) pkgs; inherit tlpdbVersion; ghostscript = ghostscript_headless; inherit @@ -260,7 +262,7 @@ let drvWithoutDeps = removeAttrs drv [ "tlDeps" ]; drvWithDeps = if (drv ? tlDeps) then - drv // { tlDeps = if builtins.isFunction drv.tlDeps then drv.tlDeps tl else drv.tlDeps; } + drv // { tlDeps = if builtins.isFunction drv.tlDeps then drv.tlDeps texlive.pkgs else drv.tlDeps; } else drv; in @@ -320,10 +322,10 @@ let # function for creating a working environment from a set of TL packages # now a legacy wrapper around buildTeXEnv combine = import ./combine-wrapper.nix { + inherit (texlive) pkgs; inherit buildTeXEnv lib - tl toTLPkgList ; }; @@ -668,7 +670,7 @@ allPkgLists bin // { # for backward compatibility - latexindent = tl.latexindent; + latexindent = texlive.pkgs.latexindent; }; combine = diff --git a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix index 2eb1eec2366f..58131679d0a8 100644 --- a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix +++ b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix @@ -5,7 +5,7 @@ tlpdb, bin, tlpdbxz, - tl, + pkgs, installShellFiles, coreutils, findutils, @@ -253,9 +253,9 @@ lib.recursiveUpdate orig rec { context.binlinks = { context = "luametatex"; - "context.lua" = tl.context.tex + "/scripts/context/lua/context.lua"; + "context.lua" = pkgs.context.tex + "/scripts/context/lua/context.lua"; mtxrun = "luametatex"; - "mtxrun.lua" = tl.context.tex + "/scripts/context/lua/mtxrun.lua"; + "mtxrun.lua" = pkgs.context.tex + "/scripts/context/lua/mtxrun.lua"; }; dvipdfmx.binlinks = { @@ -269,10 +269,10 @@ lib.recursiveUpdate orig rec { # TODO: handle symlinks in bin.core ptex.binlinks = { - pbibtex = tl.uptex.out + "/bin/upbibtex"; - pdvitype = tl.uptex.out + "/bin/updvitype"; - ppltotf = tl.uptex.out + "/bin/uppltotf"; - ptftopl = tl.uptex.out + "/bin/uptftopl"; + pbibtex = pkgs.uptex.out + "/bin/upbibtex"; + pdvitype = pkgs.uptex.out + "/bin/updvitype"; + ppltotf = pkgs.uptex.out + "/bin/uppltotf"; + ptftopl = pkgs.uptex.out + "/bin/uptftopl"; }; texdef.binlinks = { @@ -281,7 +281,7 @@ lib.recursiveUpdate orig rec { texlive-scripts.binlinks = { mktexfmt = "fmtutil"; - texhash = tl."texlive.infra".out + "/bin/mktexlsr"; + texhash = pkgs."texlive.infra".out + "/bin/mktexlsr"; }; texlive-scripts-extra.binlinks = { @@ -309,7 +309,7 @@ lib.recursiveUpdate orig rec { ''; context-legacy.postFixup = '' - sed -i 's!File.dirname(\$0)!'"'"'${tl.context-legacy.tex}/scripts/context/ruby'"'"'!' "$out"/bin/* + sed -i 's!File.dirname(\$0)!'"'"'${pkgs.context-legacy.tex}/scripts/context/ruby'"'"'!' "$out"/bin/* ''; cyrillic-bin.postFixup = '' @@ -476,7 +476,7 @@ lib.recursiveUpdate orig rec { # find files in source container, fix incompatibilities with snobol4 texaccents.postFixup = '' - sed -i '1s!$! -I${tl.texaccents.texsource}/source/support/texaccents!' "$out"/bin/* + sed -i '1s!$! -I${pkgs.texaccents.texsource}/source/support/texaccents!' "$out"/bin/* ''; texaccents.postUnpack = '' if [[ -f "$out"/source/support/texaccents/grepl.inc ]] ; then @@ -586,7 +586,7 @@ lib.recursiveUpdate orig rec { mkdir -p support/texdoc touch support/texdoc/NEWS - TEXMFCNF="${tl.kpathsea.tex}/web2c" TEXMF="$out" TEXDOCS=. TEXMFVAR=. \ + TEXMFCNF="${pkgs.kpathsea.tex}/web2c" TEXMF="$out" TEXDOCS=. TEXMFVAR=. \ "${bin.luatex}"/bin/texlua "$out"/scripts/texdoc/texdoc.tlu \ -c texlive_tlpdb=texlive.tlpdb -lM texdoc @@ -596,7 +596,7 @@ lib.recursiveUpdate orig rec { # install zsh completion postFixup = '' - TEXMFCNF="${tl.kpathsea.tex}"/web2c TEXMF="$scriptsFolder/../.." \ + TEXMFCNF="${pkgs.kpathsea.tex}"/web2c TEXMF="$scriptsFolder/../.." \ texlua "$out"/bin/texdoc --print-completion zsh > "$TMPDIR"/_texdoc installShellCompletion --zsh "$TMPDIR"/_texdoc ''; @@ -618,7 +618,7 @@ lib.recursiveUpdate orig rec { coreutils gnused gnupg - tl.kpathsea + pkgs.kpathsea (perl.withPackages (ps: with ps; [ Tk ])) ]; @@ -631,7 +631,7 @@ lib.recursiveUpdate orig rec { lib.makeBinPath [ coreutils gnused - tl.kpathsea + pkgs.kpathsea ] }''${PATH:+:$PATH}"' "$out"/bin/mktexlsr ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cdb5c6198cf..2946c515f9b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -937,8 +937,6 @@ with pkgs; ### TOOLS - _7zz-rar = _7zz.override { enableUnfree = true; }; - acquire = with python3Packages; toPythonApplication acquire; actdiag = with python3.pkgs; toPythonApplication actdiag; @@ -6217,10 +6215,6 @@ with pkgs; libwpe-fdo = callPackage ../development/libraries/libwpe/fdo.nix { }; - liquid-dsp = callPackage ../development/libraries/liquid-dsp { - inherit (darwin) autoSignDarwinBinariesHook; - }; - luabind = callPackage ../development/libraries/luabind { lua = lua5_1; }; luabind_luajit = luabind.override { lua = luajit; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6b166ee6490f..8eae59960bba 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14466,10 +14466,10 @@ with self; FinanceQuote = buildPerlPackage rec { pname = "Finance-Quote"; - version = "1.68"; + version = "1.70"; src = fetchurl { url = "mirror://cpan/authors/id/B/BP/BPSCHUCK/Finance-Quote-${version}.tar.gz"; - hash = "sha256-MuyDh8qZZr/iTob1TiR/mgt9d5mrwADM+k8oI6+iREE="; + hash = "sha256-XxrIe3j3b8nDAT2PRi1BpMuKDKCLqvnhvu3Fw7j0eRU="; }; buildInputs = [ DateManip diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 062af50d1470..d4e748b90c7d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -219,6 +219,7 @@ mapAliases { esig = throw "'esig' has been removed as it was broken and unmaintained upstream"; # Added 2026-05-27 et_xmlfile = throw "'et_xmlfile' has been renamed to/replaced by 'et-xmlfile'"; # Converted to throw 2025-10-29 ev3dev2 = throw "'ev3dev2' has been renamed to/replaced by 'python-ev3dev2'"; # Converted to throw 2025-10-29 + exllamav2 = throw "'exllamav2' was removed because it is archived upstream and support was dropped in tabbyapi"; # Added 2026-07-19 eyeD3 = throw "'eyeD3' has been renamed to/replaced by 'eyed3'"; # Converted to throw 2025-10-29 f3d_egl = lib.warnOnInstantiate "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # added 2025-07-18 Fabric = throw "'Fabric' has been renamed to/replaced by 'fabric'"; # Converted to throw 2025-10-29 @@ -368,6 +369,7 @@ mapAliases { mdformat-tables = "'mdformat-tables' has been archived and replaced by 'mdformat-gfm"; # added 2025-01-25 MDP = throw "'MDP' has been renamed to/replaced by 'mdp'"; # Converted to throw 2025-10-29 MechanicalSoup = throw "'MechanicalSoup' has been renamed to/replaced by 'mechanicalsoup'"; # Converted to throw 2025-10-29 + meld3 = throw "'meld3' has been removed because it was unused and unmaintained upstream"; # added 2026-06-08 memcached = throw "'memcached' has been renamed to/replaced by 'python-memcached'"; # Converted to throw 2025-10-29 memory_profiler = throw "'memory_profiler' has been renamed to/replaced by 'memory-profiler'"; # Converted to throw 2025-10-29 mesa = throw "python3Packages.mesa has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5ccdc7774bb4..97d776f5369e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5662,8 +5662,6 @@ self: super: with self; { exiv2 = callPackage ../development/python-modules/exiv2 { inherit (pkgs) exiv2; }; - exllamav2 = callPackage ../development/python-modules/exllamav2 { }; - exllamav3 = callPackage ../development/python-modules/exllamav3 { }; expandvars = callPackage ../development/python-modules/expandvars { }; @@ -6196,6 +6194,8 @@ self: super: with self; { flask-sslify = callPackage ../development/python-modules/flask-sslify { }; + flask-static-digest = callPackage ../development/python-modules/flask-static-digest { }; + flask-swagger = callPackage ../development/python-modules/flask-swagger { }; flask-swagger-ui = callPackage ../development/python-modules/flask-swagger-ui { }; @@ -10310,8 +10310,6 @@ self: super: with self; { meinheld = callPackage ../development/python-modules/meinheld { }; - meld3 = callPackage ../development/python-modules/meld3 { }; - melnor-bluetooth = callPackage ../development/python-modules/melnor-bluetooth { }; memestra = callPackage ../development/python-modules/memestra { };