diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fa92966782fd..63c34175999d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5172,6 +5172,12 @@ githubId = 202474; name = "Jens Reimann"; }; + ctucx = { + email = "katja@ctu.cx"; + github = "katjakwast"; + githubId = 176372446; + name = "Katja Kwast"; + }; curran = { email = "curran@mercury.com"; github = "curranosaurus"; @@ -16415,6 +16421,13 @@ githubId = 15896005; name = "Vladyslav Burzakovskyy"; }; + MrSom3body = { + email = "nix@sndh.dev"; + matrix = "@mrsom3body:matrix.org"; + github = "MrSom3body"; + githubId = 129101708; + name = "Karun Sandhu"; + }; mrtarantoga = { email = "goetz-dev@web.de"; name = "Götz Grimmer"; @@ -25059,6 +25072,12 @@ github = "TyberiusPrime"; githubId = 1257580; }; + Tygo-van-den-Hurk = { + name = "Tygo van den Hurk"; + github = "Tygo-van-den-Hurk"; + githubId = 91738110; + keys = [ { fingerprint = "1AAE 628A 2D49 0597 17AE A7F8 7CA2 CBB2 7505 8A44"; } ]; + }; tylerjl = { email = "tyler+nixpkgs@langlois.to"; github = "tylerjl"; diff --git a/nixos/modules/programs/flashprog.nix b/nixos/modules/programs/flashprog.nix index d7529575a3d3..89671fba08f3 100644 --- a/nixos/modules/programs/flashprog.nix +++ b/nixos/modules/programs/flashprog.nix @@ -20,6 +20,8 @@ in config = lib.mkIf cfg.enable { services.udev.packages = [ cfg.package ]; environment.systemPackages = [ cfg.package ]; + hardware.libjaylink.enable = true; + hardware.libftdi.enable = true; }; meta.maintainers = with lib.maintainers; [ felixsinger ]; diff --git a/nixos/modules/services/home-automation/wyoming/piper.nix b/nixos/modules/services/home-automation/wyoming/piper.nix index b4029eb631f2..bf14d4ce85c6 100644 --- a/nixos/modules/services/home-automation/wyoming/piper.nix +++ b/nixos/modules/services/home-automation/wyoming/piper.nix @@ -164,7 +164,7 @@ in DeviceAllow = ""; DevicePolicy = "closed"; LockPersonality = true; - MemoryDenyWriteExecute = true; + MemoryDenyWriteExecute = false; # required for onnxruntime PrivateDevices = true; PrivateUsers = true; ProtectHome = true; diff --git a/nixos/modules/services/networking/cloudflare-dyndns.nix b/nixos/modules/services/networking/cloudflare-dyndns.nix index f99935210b06..c8597d28c209 100644 --- a/nixos/modules/services/networking/cloudflare-dyndns.nix +++ b/nixos/modules/services/networking/cloudflare-dyndns.nix @@ -108,13 +108,14 @@ in ++ lib.optional cfg.proxied "--proxied"; in '' - export CLOUDFLARE_API_TOKEN=$(< "''${CREDENTIALS_DIRECTORY}/apiToken") + export CLOUDFLARE_API_TOKEN_FILE=''${CREDENTIALS_DIRECTORY}/apiToken # Added 2025-03-10: `cfg.apiTokenFile` used to be passed as an # `EnvironmentFile` to the service, which required it to be of # the form "CLOUDFLARE_API_TOKEN=" rather than just the secret. # If we detect this legacy usage, error out. - if [[ $CLOUDFLARE_API_TOKEN == CLOUDFLARE_API_TOKEN* ]]; then + token=$(< "''${CLOUDFLARE_API_TOKEN_FILE}") + if [[ $token == CLOUDFLARE_API_TOKEN* ]]; then echo "Error: your api token starts with 'CLOUDFLARE_API_TOKEN='. Remove that, and instead specify just the token." >&2 exit 1 fi diff --git a/nixos/tests/send.nix b/nixos/tests/send.nix index b02f083fef9f..fb0021ce0b78 100644 --- a/nixos/tests/send.nix +++ b/nixos/tests/send.nix @@ -1,9 +1,16 @@ -{ lib, pkgs, ... }: +{ + lib, + pkgs, + ... +}: { name = "send"; meta = { - maintainers = with lib.maintainers; [ moraxyc ]; + maintainers = with lib.maintainers; [ + moraxyc + MrSom3body + ]; }; nodes.machine = diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 8e94213d51b7..a8fc6afebcb4 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -7,12 +7,12 @@ let pname = "plexamp"; - version = "4.12.0"; + version = "4.12.2"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - hash = "sha512-vIH6HPWjL0fzM8rXZhXYUH6qT3mca5WxicRRaQr9RHW511x8pNnRmdwtMDfKtyrhUiZFiE1XAfWBDXmuxbJW/g=="; + hash = "sha512-qsuJv5rnw8Gprlfb3pNChMTCXDYuCd1B5Kz+TWsbjbOw8+u2mieh4gGIiPLIy2jhFBjtZUacqM6eibXL+wHGEg=="; }; appimageContents = appimageTools.extractType2 { @@ -38,7 +38,7 @@ appimageTools.wrapType2 { meta = with lib; { description = "Beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/78"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/79"; license = licenses.unfree; maintainers = with maintainers; [ killercup diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix index cb6b4b16bcf2..0147c4d31b79 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -13,18 +13,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "youtube-music"; - version = "3.8.0"; + version = "3.8.1"; src = fetchFromGitHub { owner = "th-ch"; repo = "youtube-music"; rev = "v${finalAttrs.version}"; - hash = "sha256-2oXHSYKqftuvPhBogPgl2RxajQZM12ch9ZrEX26wcjs="; + hash = "sha256-KypGAP3dx1g5x5IWbmzXIR9olZo190s5r+VkbzIjvuQ="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-s3Ba7uxtJTDV5tRoLFD30VSL5M/nWHHQZkMc+2bM1wE="; + hash = "sha256-5Vlf2+l77r6HvuSGy7NrGV1HDX+l5DC0fq/pMWDKSas="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index d888c32436d7..ca6a6b0069e8 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -8863,6 +8863,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + neomodern-nvim = buildVimPlugin { + pname = "neomodern.nvim"; + version = "2025-04-26"; + src = fetchFromGitHub { + owner = "cdmill"; + repo = "neomodern.nvim"; + rev = "1ef8dcde62ff7179c94da8cba9879a5ddd1b4e2d"; + sha256 = "1cn9227i1pdjd2ljk0nawyma5gaav256nhhf970ibwsgffn6n5d0"; + }; + meta.homepage = "https://github.com/cdmill/neomodern.nvim/"; + meta.hydraPlatforms = [ ]; + }; + neomru-vim = buildVimPlugin { pname = "neomru.vim"; version = "2020-02-05"; @@ -21298,6 +21311,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + xmake-nvim = buildVimPlugin { + pname = "xmake.nvim"; + version = "2025-04-01"; + src = fetchFromGitHub { + owner = "Mythos-404"; + repo = "xmake.nvim"; + rev = "4f03aa221ebb462f3ce013fc48d4d32b88b6ded8"; + sha256 = "0ldrz485r092fd35wqvh8nknv2gslag7wj2v4dichmihn81701ry"; + }; + meta.homepage = "https://github.com/Mythos-404/xmake.nvim/"; + meta.hydraPlatforms = [ ]; + }; + xptemplate = buildVimPlugin { pname = "xptemplate"; version = "2022-09-08"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 48db101cb795..a3a822ab1baf 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3871,6 +3871,15 @@ in dependencies = [ self.nui-nvim ]; }; + xmake-nvim = super.xmake-nvim.overrideAttrs { + nvimSkipModule = [ + # attempt to index upvalue 'options' (a nil value) + "xmake.action" + "xmake.command" + "xmake.runner_wrapper" + ]; + }; + yanky-nvim = super.yanky-nvim.overrideAttrs { nvimSkipModules = [ # Optional telescope integration diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index d6ac74a9881c..1b89a9da8844 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -680,6 +680,7 @@ https://github.com/danymat/neogen/,HEAD, https://github.com/NeogitOrg/neogit/,, https://github.com/Shougo/neoinclude.vim/,, https://github.com/neomake/neomake/,, +https://github.com/cdmill/neomodern.nvim/,HEAD, https://github.com/Shougo/neomru.vim/,, https://github.com/neomutt/neomutt.vim/,HEAD, https://github.com/rafamadriz/neon/,, @@ -1635,6 +1636,7 @@ https://github.com/lukaszkorecki/workflowish/,, https://github.com/andrewferrier/wrapping.nvim/,HEAD, https://github.com/tweekmonster/wstrip.vim/,, https://github.com/piersolenski/wtf.nvim/,HEAD, +https://github.com/Mythos-404/xmake.nvim/,HEAD, https://github.com/drmingdrmer/xptemplate/,, https://github.com/guns/xterm-color-table.vim/,, https://github.com/gbprod/yanky.nvim/,HEAD, diff --git a/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix index 4653457b99bb..c92f38180f5f 100644 --- a/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix +++ b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix @@ -3,7 +3,7 @@ lib, vscode-utils, ruff, - vscode-extensions-update-script, + vscode-extension-update-script, }: vscode-utils.buildVscodeMarketplaceExtension { @@ -45,7 +45,7 @@ vscode-utils.buildVscodeMarketplaceExtension { ln -sf ${lib.getExe ruff} "$out/$installPrefix/bundled/libs/bin/ruff" ''; - passthru.updateScript = vscode-extensions-update-script { extraArgs = [ "--platforms" ]; }; + passthru.updateScript = vscode-extension-update-script { }; meta = { license = lib.licenses.mit; diff --git a/pkgs/applications/editors/vscode/extensions/language-packs.nix b/pkgs/applications/editors/vscode/extensions/language-packs.nix index 627e009c9a54..f620571b6f51 100644 --- a/pkgs/applications/editors/vscode/extensions/language-packs.nix +++ b/pkgs/applications/editors/vscode/extensions/language-packs.nix @@ -3,7 +3,7 @@ vscode-utils, writeShellScript, nix-update, - vscode-extensions-update, + vscode-extension-update, }: with vscode-utils; @@ -13,7 +13,7 @@ let buildVscodeLanguagePack = { language, - version ? "1.99.2025040209", + version ? "1.99.2025041609", hash, }: buildVscodeMarketplaceExtension { @@ -24,7 +24,7 @@ let }; passthru.updateScript = lib.optionalAttrs (language == "fr") ( writeShellScript "vscode-language-packs-update-script" '' - ${lib.getExe vscode-extensions-update} vscode-extensions.ms-ceintl.vscode-language-pack-fr --override-filename "pkgs/applications/editors/vscode/extensions/language-packs.nix" + ${lib.getExe vscode-extension-update} vscode-extensions.ms-ceintl.vscode-language-pack-fr --override-filename "pkgs/applications/editors/vscode/extensions/language-packs.nix" for lang in cs de es it ja ko pl pt-br qps-ploc ru tr zh-hans zh-hant; do ${lib.getExe nix-update} --version "skip" "vscode-extensions.ms-ceintl.vscode-language-pack-$lang" --override-filename "pkgs/applications/editors/vscode/extensions/language-packs.nix" done @@ -41,71 +41,71 @@ in # French vscode-language-pack-fr = buildVscodeLanguagePack { language = "fr"; - hash = "sha256-QQHaNifN6ol6dnmuLZcIv74g8gbAWJgQBX4BPNx1bgM="; + hash = "sha256-c4p/wVQ9GIxEkF/82ZZpRKxem7IVMK3AzCI/YfZKF4U="; }; # Italian vscode-language-pack-it = buildVscodeLanguagePack { language = "it"; - hash = "sha256-b8HVmF9Wf4jLpaHMK+9EuCayMLxAKyPRJpohBNTDk7I="; + hash = "sha256-ftAYkS5WRSqc+rB901J7X8IRE+XuqtIdRiBJfEKumQ8="; }; # German vscode-language-pack-de = buildVscodeLanguagePack { language = "de"; - hash = "sha256-e7slPjnns7Y3GwmYDKjvIi7eJBkrBUG6KTnUJFoz0nk="; + hash = "sha256-37pDfoFi4QPOBP9vYPw/+zOXDOluuEojI6ZSYsiwv64="; }; # Spanish vscode-language-pack-es = buildVscodeLanguagePack { language = "es"; - hash = "sha256-OtxIM70wTLkgxFN6s4myLGe2fdjVG3p13tYko0MzhUc="; + hash = "sha256-IASRtQag6wuNmKtes7L6i0coLluo6ryRW4lUEgQAiz4="; }; # Russian vscode-language-pack-ru = buildVscodeLanguagePack { language = "ru"; - hash = "sha256-JLcQ2JVR7eFThgKrabQPo0Z27AigWfeHVY+lW2ZY1es="; + hash = "sha256-H8UxMc1FKkfWOcITdwYrI6giD11Sk4YN2er+wnnFvBs="; }; # Chinese (Simplified) vscode-language-pack-zh-hans = buildVscodeLanguagePack { language = "zh-hans"; - hash = "sha256-oUb3nj67HBAavB6b0XLgwpbQO2aZ9HMF42Rdw53Z9B4="; + hash = "sha256-3yvzcJXdTIYbBNBaiuW92UYADSUeYPm3clSpSM3k71w="; }; # Chinese (Traditional) vscode-language-pack-zh-hant = buildVscodeLanguagePack { language = "zh-hant"; - hash = "sha256-1ESY/7woVrPN/PITD2T0/Cm9zFKDyYcGy4x1/oBxZeE="; + hash = "sha256-AiZYIoE2wdiRXdJVpOTnj0vFJH5UsYh8k5tf/0lNqVY="; }; # Japanese vscode-language-pack-ja = buildVscodeLanguagePack { language = "ja"; - hash = "sha256-nHeWIcipl/nztwPkUTzetO5eGTVEaEp7oW3a31c5Obo="; + hash = "sha256-96bavTK4JNYk6tfDxnzujHA5V3a1/AL7PTnrNZsyiXU="; }; # Korean vscode-language-pack-ko = buildVscodeLanguagePack { language = "ko"; - hash = "sha256-R/mbXCUsVTYhRpvCUr44jbDvYWYKqBXF4kr+TRl/MeU="; + hash = "sha256-NEkFv+I0TmK9wvfQ9Wc34Q0EnzrHuccQypIAVVYoofY="; }; # Czech vscode-language-pack-cs = buildVscodeLanguagePack { language = "cs"; - hash = "sha256-oVpGg7OMZ+8WrO2vGzmwF2mDwTaRGYvM1kOXEtmFvdw="; + hash = "sha256-U1loNdDlYC8ahsy2xdeE/zBs/EhAo/DvoUI0rFFCA88="; }; # Portuguese (Brazil) vscode-language-pack-pt-br = buildVscodeLanguagePack { language = "pt-BR"; - hash = "sha256-cY1hGBNeTa3rul8ZtvtZW2PCLp0MZwugufdLTaI7rx0="; + hash = "sha256-M02Q5HNCkT1Se+AuJXDNz3YfT9+kyuUTvosqor4bZ4k="; }; # Turkish vscode-language-pack-tr = buildVscodeLanguagePack { language = "tr"; - hash = "sha256-DzPerwuqvHk4G5/AcrXLJh0PINd5HK+TelO9C4EOdVc="; + hash = "sha256-ieYvmzK+5QmcwKSXK4X+NQQfd4OCf6IAKuepYByq4b8="; }; # Polish vscode-language-pack-pl = buildVscodeLanguagePack { language = "pl"; - hash = "sha256-9UilVHsAWCZq6N6sqrGpnIEzjCBfalBL9LgCfEGFLvU="; + hash = "sha256-DhhlFKICXWjC+c0POuO9upCD0DSzEJ6shkQoK/oTeM4="; }; # Pseudo Language vscode-language-pack-qps-ploc = buildVscodeLanguagePack { language = "qps-ploc"; - hash = "sha256-lYS+uje6eLUr7J7diq2Lkh3xjhPKWdU+ccwVQrOs75g="; + hash = "sha256-mpKx+rluYIuKmpvJVJH6uBPTk6OHBzCIpE7KpOskuEE="; }; } diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix index 329a96835187..feb136b5acad 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix @@ -8,7 +8,7 @@ # Defaults to `false` as we expect it to be project specific most of the time. pythonUseFixed ? false, # For updateScript - vscode-extensions-update-script, + vscode-extension-update-script, }: vscode-utils.buildVscodeMarketplaceExtension rec { @@ -45,7 +45,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec { --replace-fail "\"default\":\"python\"" "\"default\":\"${python3.interpreter}\"" ''; - passthru.updateScript = vscode-extensions-update-script { }; + passthru.updateScript = vscode-extension-update-script { }; meta = { description = "Visual Studio Code extension with rich support for the Python language"; diff --git a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix index df71d0b3ce53..5dde4c8392ed 100644 --- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix @@ -1,7 +1,7 @@ { lib, vscode-utils, - vscode-extensions-update-script, + vscode-extension-update-script, }: vscode-utils.buildVscodeMarketplaceExtension { @@ -12,7 +12,7 @@ vscode-utils.buildVscodeMarketplaceExtension { hash = "sha256-ezmBS84RonkqlguLcgGZa4663GpY6yReKKb+r6YzQms="; }; - passthru.updateScript = vscode-extensions-update-script { }; + passthru.updateScript = vscode-extension-update-script { }; meta = { description = "AI-powered autonomous coding agent that lives in your editor"; diff --git a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix index 1cca4d3cdd03..afb7b11be174 100644 --- a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix @@ -5,6 +5,7 @@ moreutils, typos-lsp, vscode-utils, + vscode-extension-update-script, }: let inherit (stdenv.hostPlatform) system; @@ -13,19 +14,19 @@ let { x86_64-linux = { arch = "linux-x64"; - hash = "sha256-M3m3fFsz/LPSmghyKVuLVcMgxtUf3iNvHDLjOptfs6I="; + hash = "sha256-fn9cVi5fa+wv2LitNi4Bb4oFIDKFdl1mTrNPlK3Z0XE="; }; aarch64-linux = { arch = "linux-arm64"; - hash = "sha256-S3mMOtXYdVp5P8aKlzWyehVKCz7EjcNjYJqgSsNIS3g="; + hash = "sha256-B+oKdmNBZAydWfwZHdgVMc1eemrrrANnQyhIphKcDxg="; }; x86_64-darwin = { arch = "darwin-x64"; - hash = "sha256-lIUM5W+lKL7OgcJVWJTJYsZNqpZ3MhSk7YnKsfWDX4U="; + hash = "sha256-sJ4ZfdMytAOehcBQANl5X3Q2snbjd9/t7uUIb9QRMGw="; }; aarch64-darwin = { arch = "darwin-arm64"; - hash = "sha256-Lc2W1SNdn1rcxeKgv1YzKRr+DPN39C1J6O1KZBeELWc="; + hash = "sha256-xCs61aCeIUlICyVCu5sKoVakpVPr01FBxIlmA3SZnt0="; }; } .${system} or (throw "Unsupported system: ${system}"); @@ -37,7 +38,7 @@ vscode-utils.buildVscodeMarketplaceExtension { # Please update the corresponding binary (typos-lsp) # when updating this extension. # See pkgs/by-name/ty/typos-lsp/package.nix - version = "0.1.35"; + version = "0.1.36"; inherit (extInfo) hash arch; }; @@ -53,12 +54,20 @@ vscode-utils.buildVscodeMarketplaceExtension { jq '.contributes.configuration.properties."typos.path".default = "${lib.getExe typos-lsp}"' package.json | sponge package.json ''; + passthru.updateScript = vscode-extension-update-script { }; + meta = { changelog = "https://marketplace.visualstudio.com/items/tekumara.typos-vscode/changelog"; description = "VSCode extension for providing a low false-positive source code spell checker"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=tekumara.typos-vscode"; homepage = "https://github.com/tekumara/typos-lsp"; license = lib.licenses.mit; + platforms = [ + "aarch64-linux" + "aarch64-darwin" + "x86_64-linux" + "x86_64-darwin" + ]; maintainers = [ lib.maintainers.drupol ]; }; } diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix index 5bbccd2b23e3..a66e90adf7dd 100644 --- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix +++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -2,7 +2,7 @@ stdenvNoCC, lib, vscode-utils, - vscode-extensions-update-script, + vscode-extension-update-script, }: vscode-utils.buildVscodeMarketplaceExtension { @@ -35,7 +35,7 @@ vscode-utils.buildVscodeMarketplaceExtension { // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); - passthru.updateScript = vscode-extensions-update-script { extraArgs = [ "--platforms" ]; }; + passthru.updateScript = vscode-extension-update-script { }; meta = { description = "Jujutsu version control integration, for simpler Git workflow"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 4d1aa569f066..cac34eec585d 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -26,11 +26,11 @@ let hash = { - x86_64-linux = "sha256-NgbN8hqayBG/5bFS+2f+Jmx8a1RSjHJG8zvvJvtOLGs="; - x86_64-darwin = "sha256-Gt8K3sL81cxeldiG/mNXFzQG1/M2D7Klj/scCAa+RgI="; - aarch64-linux = "sha256-YXKiYVHwo5Nn8e8JGtuuKcXx4JgxfnDr10rvwEy2m3Y="; - aarch64-darwin = "sha256-uBimHECN3qvyHvmGDleR228ms5OBlBFPHafRueUfzBU="; - armv7l-linux = "sha256-DacykoqnE4ZFNn8t5i93k3k/OK0H9krWzw5YoX4+rrM="; + x86_64-linux = "sha256-dAckjPosKsL1ZM2lQNKtxl1jOo/q1lBd1rkbj3G2AVs="; + x86_64-darwin = "sha256-z3U5wBJ72XG/k4HWUaaZm+MMEw4pqtvhejTnFq5fDmQ="; + aarch64-linux = "sha256-ZLbMknKHc6yVZ+fJOGZWh1NeFWMYYCXyNnnPRBMM6R4="; + aarch64-darwin = "sha256-RPL60SMdic8Q5GMtgY5yEoR0dzhnniEaoYKusfPN0Ks="; + armv7l-linux = "sha256-UrLjrBDFfTeSSsrzq4lIAd1lXNssmgrEWKpaweMtVRc="; } .${system} or throwSystem; @@ -41,7 +41,7 @@ callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.99.32562"; + version = "1.99.32704"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/logging/sosreport/default.nix b/pkgs/applications/logging/sosreport/default.nix index 7e35770fb6c7..ccd49916804d 100644 --- a/pkgs/applications/logging/sosreport/default.nix +++ b/pkgs/applications/logging/sosreport/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, gettext, - magic, + packaging, pexpect, pyyaml, setuptools, @@ -11,24 +11,26 @@ buildPythonPackage rec { pname = "sosreport"; - version = "4.9.0"; + version = "4.9.1"; + pyproject = true; src = fetchFromGitHub { owner = "sosreport"; repo = "sos"; tag = version; - sha256 = "sha256-UJzDRse1rjbGRV/+3JLLrXNwYTJtqlDudB1dDB7uslg="; + hash = "sha256-97S8b4PfjUN8uzvp01PGCLs4J3CbwpJsgBKtY8kI0HE="; }; + build-system = [ setuptools ]; + nativeBuildInputs = [ gettext ]; - propagatedBuildInputs = [ - magic + dependencies = [ + packaging pexpect pyyaml - setuptools ]; # requires avocado-framework 94.0, latest version as of writing is 96.0 @@ -40,10 +42,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "sos" ]; - meta = with lib; { + meta = { description = "Unified tool for collecting system logs and other debug information"; homepage = "https://github.com/sosreport/sos"; - license = licenses.gpl2Only; + license = lib.licenses.gpl2Plus; maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/tipp10/default.nix b/pkgs/applications/misc/tipp10/default.nix index 29f1591b9fc8..fd3f631d6cf1 100644 --- a/pkgs/applications/misc/tipp10/default.nix +++ b/pkgs/applications/misc/tipp10/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "tipp10"; - version = "3.3.2"; + version = "3.3.3"; src = fetchFromGitLab { owner = "tipp10"; repo = "tipp10"; rev = "v${version}"; - hash = "sha256-e0sWH4pT7ej9XGK/Sg9XMX2bMqcXqtSaYI7KBZTXvp4="; + hash = "sha256-OiBtUizN6OjcAb5RLvzfod6tVQo/b8p8Ec4lgKYaifw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/firefox/build-fix-RELRHACK_LINKER-setting-when-linker-name-i.patch b/pkgs/applications/networking/browsers/firefox/build-fix-RELRHACK_LINKER-setting-when-linker-name-i.patch new file mode 100644 index 000000000000..58107b6b9320 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/build-fix-RELRHACK_LINKER-setting-when-linker-name-i.patch @@ -0,0 +1,57 @@ +From 45d40b3eeb393051bd3a49feebcefe39dc6e4e93 Mon Sep 17 00:00:00 2001 +From: Peter Collingbourne +Date: Wed, 23 Apr 2025 21:13:38 -0700 +Subject: [PATCH] build: fix RELRHACK_LINKER setting when linker name is target + triple prefixed + +RELRHACK_LINKER is used as the name of a binary installed in a +directory specified with -B to override the linker. Both Clang and +GCC will only look for a binary named "ld" (or "ld.$fuse_ld_setting" +if -fuse-ld= is specified) in the -B directories, which means that +if the linker name does not follow this pattern, for example if it +is named $target_triple-ld", the relrhack linker will not be found, +the compiler will use the normal linker and the link will fail. To fix +this problem, use the correct pattern to name the relrhack executable. +--- + toolkit/moz.configure | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/toolkit/moz.configure b/toolkit/moz.configure +index 6c47287a5b..1a9c368e5e 100644 +--- a/toolkit/moz.configure ++++ b/toolkit/moz.configure +@@ -1843,23 +1843,23 @@ with only_when("--enable-compile-environment"): + use_relrhack = depends(which_elf_hack)(lambda x: x == "relr") + set_config("RELRHACK", True, when=use_relrhack) + +- @depends(c_compiler, linker_ldflags, when=use_relrhack) +- def relrhack_real_linker(c_compiler, linker_ldflags): ++ @depends(linker_ldflags, when=use_relrhack) ++ def relrhack_linker(linker_ldflags): + ld = "ld" + for flag in linker_ldflags: + if flag.startswith("-fuse-ld="): + ld = "ld." + flag[len("-fuse-ld=") :] ++ return ld ++ ++ set_config("RELRHACK_LINKER", relrhack_linker) ++ ++ @depends(c_compiler, relrhack_linker, when=use_relrhack) ++ def relrhack_real_linker(c_compiler, ld): + ld = check_cmd_output( + c_compiler.compiler, f"--print-prog-name={ld}", *c_compiler.flags + ) + return ld.rstrip() + +- @depends(relrhack_real_linker, when=use_relrhack) +- def relrhack_linker(ld): +- return os.path.basename(ld) +- +- set_config("RELRHACK_LINKER", relrhack_linker) +- + std_filesystem = host_cxx_compiler.try_run( + header="#include ", + body='auto foo = std::filesystem::absolute("");', +-- +2.49.0.805.g082f7c87e0-goog + diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index f2692a647c97..70d811c73ee1 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -357,6 +357,10 @@ buildStdenv.mkDerivation { # Fix for missing vector header on macOS # https://bugzilla.mozilla.org/show_bug.cgi?id=1939405 ./firefox-mac-missing-vector-header.patch + + # https://bugzilla.mozilla.org/show_bug.cgi?id=1962497 + # https://phabricator.services.mozilla.com/D246545 + ./build-fix-RELRHACK_LINKER-setting-when-linker-name-i.patch ] ++ extraPatches; diff --git a/pkgs/applications/networking/discordo/default.nix b/pkgs/applications/networking/discordo/default.nix index ec4705660e91..cc65d141adcb 100644 --- a/pkgs/applications/networking/discordo/default.nix +++ b/pkgs/applications/networking/discordo/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "discordo"; - version = "0-unstable-2025-04-05"; + version = "0-unstable-2025-04-19"; src = fetchFromGitHub { owner = "ayn2op"; repo = pname; - rev = "977e9c99b2c8aea2210e73541955515883931f03"; - hash = "sha256-WFGyXfi3P0xr9bLqhBgtfAjc8fQRrmwSbvlFLPHRi5Q="; + rev = "c6c66c31ba0af106d45132bcf5e14540d54f24d0"; + hash = "sha256-AYi9biVjJatG8lEGj1oJvukre+ZbFePyBZIYc5aMpXY="; }; - vendorHash = "sha256-NKGsY/5FqLGbwyW6fVSxictDVhju0+jOJSBXQp3ZhFY="; + vendorHash = "sha256-NZlIZYytk3OKtIdEwVInnQhORL1iSzuWzmZjrknD71E="; env.CGO_ENABLED = 0; diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index 4135f7a0938a..250d862ba56e 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - hash = "sha256-4IToXaOEMfgEh9mXuN7nRn+8l8T6+mzVWYvfsYN4ZIM="; + hash = "sha256-KU9B6ygK6PwMvXDL+SBB79TCBScJDgVMs4m92zgibdE="; }; doCheck = false; diff --git a/pkgs/build-support/fetchnextcloudapp/default.nix b/pkgs/build-support/fetchnextcloudapp/default.nix index ccc079b70204..31f35c0568d3 100644 --- a/pkgs/build-support/fetchnextcloudapp/default.nix +++ b/pkgs/build-support/fetchnextcloudapp/default.nix @@ -16,6 +16,7 @@ description ? null, homepage ? null, maintainers ? [ ], + teams ? [ ], unpack ? false, # whether to use fetchzip rather than fetchurl }: applyPatches ( @@ -27,7 +28,7 @@ applyPatches ( { license = lib.licenses.${license}; longDescription = description; - inherit homepage maintainers; + inherit homepage maintainers teams; } // lib.optionalAttrs (description != null) { longDescription = description; diff --git a/pkgs/by-name/ad/adw-gtk3/package.nix b/pkgs/by-name/ad/adw-gtk3/package.nix index d8f25e1a80ab..7511b95242c7 100644 --- a/pkgs/by-name/ad/adw-gtk3/package.nix +++ b/pkgs/by-name/ad/adw-gtk3/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "adw-gtk3"; - version = "5.8"; + version = "5.10"; src = fetchFromGitHub { owner = "lassekongo83"; repo = "adw-gtk3"; tag = "v${finalAttrs.version}"; - hash = "sha256-Z/A2vn/P0EWoihYHFk+ELsxffzA8ypxv61ZURCSC/W0="; + hash = "sha256-0OZk27b0kujzWtRX5uvelTMivL19g6sNB1IY6BsrO10="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/al/altair/package.nix b/pkgs/by-name/al/altair/package.nix index 9c6e046c6176..38ae1087564e 100644 --- a/pkgs/by-name/al/altair/package.nix +++ b/pkgs/by-name/al/altair/package.nix @@ -7,11 +7,11 @@ let pname = "altair"; - version = "8.2.1"; + version = "8.2.2"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-DO4T/NgLSxZIxVK4oEz6QNsQJRacF8KRcwAvWToxIy8="; + sha256 = "sha256-3tLBZNuiqhSRg/a2g2PC53esnNb1jVFpCO2YiC7Rw6k="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/by-name/an/antidote/package.nix b/pkgs/by-name/an/antidote/package.nix index f1060567983b..e4e47cfa44d2 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.7"; + version = "1.9.8"; pname = "antidote"; src = fetchFromGitHub { owner = "mattmc3"; repo = "antidote"; rev = "v${finalAttrs.version}"; - hash = "sha256-Gg69O35CpsI3Q3cdxBpRDOfSxRxWG3PHew59kJVH1eQ="; + hash = "sha256-74bajVwbsfbibOIqETrewHZbbzceOHD6d1OEh+LYh7o="; }; dontPatch = true; diff --git a/pkgs/by-name/ap/appvm/package.nix b/pkgs/by-name/ap/appvm/package.nix index 62378c5072fe..5947b482ad9a 100644 --- a/pkgs/by-name/ap/appvm/package.nix +++ b/pkgs/by-name/ap/appvm/package.nix @@ -22,13 +22,13 @@ let in buildGoModule rec { pname = "appvm"; - version = "unstable-2021-12-20"; + version = "0.6"; src = fetchFromGitHub { owner = "jollheef"; repo = pname; - rev = "17f17be7846d872e7e26d5cb6759a52ea4113587"; - sha256 = "sha256-FL5olOy1KufULyqI2dJeS0OnKzC3LfPWxnia2i4f4yY="; + tag = "v${version}"; + sha256 = "sha256-n+YputGiNWSOYbwes/rjz0h3RWZONDTc8+LDc0La/KU="; }; vendorHash = "sha256-8eU+Mf5dxL/bAMMShXvj8I1Kdd4ysBTWvgYIXwLStPI="; @@ -45,14 +45,14 @@ buildGoModule rec { }" ''; - meta = with lib; { + meta = { description = "Nix-based app VMs"; homepage = "https://code.dumpstack.io/tools/${pname}"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ dump_stack cab404 onny ]; - license = licenses.gpl3; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/by-name/bi/binwalk/package.nix b/pkgs/by-name/bi/binwalk/package.nix index 538c23dcf9af..69b3d8405d18 100644 --- a/pkgs/by-name/bi/binwalk/package.nix +++ b/pkgs/by-name/bi/binwalk/package.nix @@ -33,55 +33,44 @@ xz, zlib, zstd, - _7zz, + p7zip, + makeBinaryWrapper, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "binwalk"; version = "3.1.0"; src = fetchFromGitHub { owner = "ReFirmLabs"; repo = "binwalk"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-em+jOnhCZH5EEJrhXTHmxiwpMcBr5oNU1+5IJ1H/oco="; }; useFetchCargoVendor = true; cargoHash = "sha256-cnJVeuvNNApEHqgZDcSgqkH3DKAr8+HkqXUH9defTCA="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + makeBinaryWrapper + ]; # https://github.com/ReFirmLabs/binwalk/commits/master/dependencies buildInputs = [ bzip2 - cabextract - dmg2img dtc - dumpifs fontconfig - gnutar - jefferson - lzfse lzo - lzop - lz4 openssl_3 python3.pkgs.python-lzo - sasquatch - sleuthkit - srec2bin - ubi_reader ucl - uefi-firmware-parser - unyaffs unzip - vmlinux-to-elf xz zlib - zstd - _7zz - ] ++ lib.optionals enableUnfree [ unrar ]; + ]; + + dontUseCargoParallelTests = true; # skip broken tests checkFlags = @@ -110,10 +99,37 @@ rustPlatform.buildRustPackage rec { doInstallCheck = true; versionCheckProgramArg = "-V"; + postInstall = '' + wrapProgram $out/bin/binwalk --suffix PATH : ${ + lib.makeBinPath ( + [ + p7zip + cabextract + dmg2img + dumpifs + jefferson + vmlinux-to-elf + lz4 + lzfse + lzop + sasquatch + srec2bin + gnutar + sleuthkit + ubi_reader + uefi-firmware-parser + unyaffs + zstd + ] + ++ lib.optionals enableUnfree [ unrar ] + ) + } + ''; + meta = { description = "Firmware Analysis Tool"; homepage = "https://github.com/ReFirmLabs/binwalk"; - changelog = "https://github.com/ReFirmLabs/binwalk/releases/tag/v${version}"; + changelog = "https://github.com/ReFirmLabs/binwalk/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ @@ -122,4 +138,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "binwalk"; }; -} +}) diff --git a/pkgs/by-name/bo/bootdev-cli/package.nix b/pkgs/by-name/bo/bootdev-cli/package.nix new file mode 100644 index 000000000000..a798a8854916 --- /dev/null +++ b/pkgs/by-name/bo/bootdev-cli/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, + nix-update-script, + versionCheckHook, + writableTmpDirAsHomeHook, +}: + +buildGoModule rec { + pname = "bootdev-cli"; + version = "1.19.0"; + + src = fetchFromGitHub { + owner = "bootdotdev"; + repo = "bootdev"; + tag = "v${version}"; + hash = "sha256-5S4XjqajX1Y9XKxfWFDeFVC2d14/C9fo6zytbwXuW7E="; + }; + + vendorHash = "sha256-jhRoPXgfntDauInD+F7koCaJlX4XDj+jQSe/uEEYIMM="; + + ldflags = [ + "-s" + "-w" + ]; + + nativeBuildInputs = [ + installShellFiles + writableTmpDirAsHomeHook + ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd bootdev \ + --bash <($out/bin/bootdev completion bash) \ + --zsh <($out/bin/bootdev completion zsh) \ + --fish <($out/bin/bootdev completion fish) + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/bootdev"; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "CLI used to complete coding challenges and lessons on Boot.dev"; + homepage = "https://github.com/bootdotdev/bootdev"; + changelog = "https://github.com/bootdotdev/bootdev/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ vinnymeller ]; + mainProgram = "bootdev"; + }; +} diff --git a/pkgs/by-name/ca/cargo-lambda/package.nix b/pkgs/by-name/ca/cargo-lambda/package.nix index 048966ee8ba5..6377cfbbae2c 100644 --- a/pkgs/by-name/ca/cargo-lambda/package.nix +++ b/pkgs/by-name/ca/cargo-lambda/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-lambda"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "cargo-lambda"; repo = "cargo-lambda"; tag = "v${version}"; - hash = "sha256-XaCbKasPFmhoiZymnP7aeRkz0za4cJeA98uWkgotuZ8="; + hash = "sha256-v4QWHbgxzizB1Za2jRi0YxCCqnympHGzOioNFk0DED4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-gqahTN7wV4xn4xQK+fDnjxtAFp4LSvI3H93XQgHf4fM="; + cargoHash = "sha256-MTI+ESP0DLGjNoVZjMCpD2IXxkP7IXpB3AlSTpUf3rM="; nativeCheckInputs = [ cacert ]; diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index c342579c0b44..90dc4adce2a4 100644 --- a/pkgs/by-name/ca/cargo-shear/package.nix +++ b/pkgs/by-name/ca/cargo-shear/package.nix @@ -6,7 +6,7 @@ cargo-shear, }: let - version = "1.1.14"; + version = "1.2.5"; in rustPlatform.buildRustPackage { pname = "cargo-shear"; @@ -16,11 +16,11 @@ rustPlatform.buildRustPackage { owner = "Boshen"; repo = "cargo-shear"; rev = "v${version}"; - hash = "sha256-xGNIk/9UYU1F/Qj2tGvBb5rEZWjVoTyzk23OJE6seps="; + hash = "sha256-MOjGc0ji4r7thogj+xar9O8Hesd+WoNqV1dwjnL4/Bk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-olnkcA9Vt1+yFzL2ntfDmO4rzMuJ0JjJVqCl15xcdDI="; + cargoHash = "sha256-QEKJmhrOj8L9fa+k7ADux2ynpoMPbqLLAhZaKemk6sQ="; # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23 SHEAR_VERSION = version; diff --git a/pkgs/by-name/ch/chatbox/package.nix b/pkgs/by-name/ch/chatbox/package.nix index 85e2af95a374..0684485ff709 100644 --- a/pkgs/by-name/ch/chatbox/package.nix +++ b/pkgs/by-name/ch/chatbox/package.nix @@ -6,11 +6,11 @@ }: let pname = "chatbox"; - version = "1.11.12"; + version = "1.12.0"; src = fetchurl { url = "https://download.chatboxai.app/releases/Chatbox-${version}-x86_64.AppImage"; - hash = "sha256-sfR4fXpREPdEoPoez5ugCpn/ubpB6EhkvpVq6rz0BSg="; + hash = "sha256-uSusmtLRTTwp/5xH5CRRSAoojgCWZzeFwpkxc4r+24Y="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/by-name/cl/clj-kondo/package.nix b/pkgs/by-name/cl/clj-kondo/package.nix index fd647ee59c33..482a230e06ef 100644 --- a/pkgs/by-name/cl/clj-kondo/package.nix +++ b/pkgs/by-name/cl/clj-kondo/package.nix @@ -7,11 +7,11 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2025.02.20"; + version = "2025.04.07"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-oTa/WA1ieukgHf8GX5oE1D2lTZ2KjFPty3aVWUb64Ck="; + sha256 = "sha256-yJyRqQglJUiHotB70zga5NhFquHsKgmwT9sryZHEFRU="; }; graalvmDrv = graalvmPackages.graalvm-ce; diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix index eb8558b9dba7..94074ca6035e 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.23"; + version = "1.1.24"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; rev = "v${finalAttrs.version}"; - hash = "sha256-nvLVJAB751dY28jG1WjguuEVkCUb4Iy7V8cJjw3y8GI="; + hash = "sha256-WSICdPIz4Af+TW3H+pHnZHHzMNkI6myj8X1u4087Qa8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ds/dssp/package.nix b/pkgs/by-name/ds/dssp/package.nix index f746d83294a2..78ef72ce864a 100644 --- a/pkgs/by-name/ds/dssp/package.nix +++ b/pkgs/by-name/ds/dssp/package.nix @@ -11,18 +11,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "dssp"; - version = "4.4.11"; + version = "4.5.0"; src = fetchFromGitHub { owner = "PDB-REDO"; repo = "dssp"; tag = "v${finalAttrs.version}"; - hash = "sha256-7L9pdKWDa/g/r+cuou2b0pqS559qwuwHBBhDDhvM7VE="; + hash = "sha256-UE97bdSx41K962TqXLlKsp8oDnBBX7uXqsfIzhWjsTI="; }; - nativeBuildInputs = [ - cmake - ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ eigen @@ -31,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { zlib ]; - meta = with lib; { + meta = { description = "Calculate the most likely secondary structure assignment given the 3D structure of a protein"; mainProgram = "mkdssp"; homepage = "https://github.com/PDB-REDO/dssp"; changelog = "https://github.com/PDB-REDO/dssp/releases/tag/v${finalAttrs.version}"; - license = licenses.bsd2; - maintainers = with maintainers; [ natsukium ]; - platforms = platforms.unix; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ natsukium ]; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/el/eliza/package.nix b/pkgs/by-name/el/eliza/package.nix index b241cbe1de63..3fdea35c48b1 100644 --- a/pkgs/by-name/el/eliza/package.nix +++ b/pkgs/by-name/el/eliza/package.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "eliza"; - version = "0-unstable-2025-02-21"; + version = "0-unstable-2025-04-18"; src = fetchFromGitHub { owner = "anthay"; repo = "ELIZA"; - rev = "27bcf6e5fb1d32812cc0aab8133fa5e395d41773"; - hash = "sha256-/i8mckRQWTK1yI/MNaieSuE+dx94DMdrABkqf/bXQbM="; + rev = "1a185a37eb12078fa87e1034cc3eec88bfb90323"; + hash = "sha256-YhtD7tF7yGcPj6a+L1/uh+bWu+L5qiQ2bpB6gZJie2I="; }; doCheck = true; diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix index 4a369c142f02..1447ce070196 100644 --- a/pkgs/by-name/en/ente-auth/package.nix +++ b/pkgs/by-name/en/ente-auth/package.nix @@ -8,6 +8,7 @@ makeDesktopItem, copyDesktopItems, makeWrapper, + jdk17_headless, }: let # fetch simple-icons directly to avoid cloning with submodules, @@ -17,14 +18,14 @@ let in flutter324.buildFlutterApplication rec { pname = "ente-auth"; - version = "4.3.2"; + version = "4.3.5"; src = fetchFromGitHub { owner = "ente-io"; repo = "ente"; sparseCheckout = [ "auth" ]; tag = "auth-v${version}"; - hash = "sha256-/WWodQcMibwXVexI+XbTZYRkIMtfNHk3bJVBPJHcoqI="; + hash = "sha256-kM1y3Q5Z8J84qHhki9A+I/uY7xYQNMlfh2ZhxzpUBHM="; }; sourceRoot = "${src.name}/auth"; @@ -51,6 +52,12 @@ flutter324.buildFlutterApplication rec { webkitgtk_4_0 sqlite libayatana-appindicator + # The networking client used by ente-auth (native_dio_adapter) + # introduces a transitive dependency on Java, which technically + # is only needed for the Android implementation. + # Unfortunately, attempts to remove it from the build entirely were + # unsuccessful. + jdk17_headless # JDK version used by upstream CI ]; # Based on https://github.com/ente-io/ente/blob/main/auth/linux/packaging/rpm/make_config.yaml @@ -84,6 +91,9 @@ flutter324.buildFlutterApplication rec { # For backwards compatibility ln -s $out/bin/enteauth $out/bin/ente_auth + + # Not required at runtime as it's only used on Android + rm $out/app/ente-auth/lib/libdartjni.so ''; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/en/ente-auth/pubspec.lock.json b/pkgs/by-name/en/ente-auth/pubspec.lock.json index e04e4f9a1544..7656e78bcddf 100644 --- a/pkgs/by-name/en/ente-auth/pubspec.lock.json +++ b/pkgs/by-name/en/ente-auth/pubspec.lock.json @@ -356,6 +356,16 @@ "source": "hosted", "version": "3.1.1" }, + "cronet_http": { + "dependency": "transitive", + "description": { + "name": "cronet_http", + "sha256": "3af9c4d57bf07ef4b307e77b22be4ad61bea19ee6ff65e62184863f3a09f1415", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, "cross_file": { "dependency": "transitive", "description": { @@ -386,6 +396,16 @@ "source": "hosted", "version": "1.0.0" }, + "cupertino_http": { + "dependency": "transitive", + "description": { + "name": "cupertino_http", + "sha256": "6fcf79586ad872ddcd6004d55c8c2aab3cdf0337436e8f99837b1b6c30665d0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, "dart_style": { "dependency": "transitive", "description": { @@ -430,11 +450,11 @@ "dependency": "direct main", "description": { "name": "dio", - "sha256": "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260", + "sha256": "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.7.0" + "version": "5.8.0+1" }, "dio_web_adapter": { "dependency": "transitive", @@ -1073,6 +1093,16 @@ "source": "hosted", "version": "4.0.2" }, + "http_profile": { + "dependency": "transitive", + "description": { + "name": "http_profile", + "sha256": "7e679e355b09aaee2ab5010915c932cce3f2d1c11c3b2dc177891687014ffa78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0" + }, "image": { "dependency": "transitive", "description": { @@ -1103,6 +1133,16 @@ "source": "hosted", "version": "1.0.4" }, + "jni": { + "dependency": "transitive", + "description": { + "name": "jni", + "sha256": "f377c585ea9c08d48b427dc2e03780af2889d1bb094440da853c6883c1acba4b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.1" + }, "js": { "dependency": "transitive", "description": { @@ -1323,6 +1363,16 @@ "source": "hosted", "version": "1.0.2" }, + "native_dio_adapter": { + "dependency": "direct main", + "description": { + "name": "native_dio_adapter", + "sha256": "7420bc9517b2abe09810199a19924617b45690a44ecfb0616ac9babc11875c03", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, "nested": { "dependency": "transitive", "description": { @@ -1343,6 +1393,16 @@ "source": "hosted", "version": "0.5.0" }, + "objective_c": { + "dependency": "transitive", + "description": { + "name": "objective_c", + "sha256": "62e79ab8c3ed6f6a340ea50dd48d65898f5d70425d404f0d99411f6e56e04584", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, "otp": { "dependency": "direct main", "description": { diff --git a/pkgs/by-name/er/ergogen/package.nix b/pkgs/by-name/er/ergogen/package.nix new file mode 100644 index 000000000000..8e7834f4344b --- /dev/null +++ b/pkgs/by-name/er/ergogen/package.nix @@ -0,0 +1,41 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "ergogen"; + version = "4.1.0"; + + forceGitDeps = true; + + src = fetchFromGitHub { + owner = "ergogen"; + repo = "ergogen"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Y4Ri5nLxbQ78LvyGARPxsvoZ9gSMxY14QuxZJg6Cu3Y="; + }; + + npmDepsHash = "sha256-BQbf/2lWLYnrSjwWjDo6QceFyR+J/vhDcVgCaytGfl0="; + + makeCacheWritable = true; + dontNpmBuild = true; + npmPackFlags = [ "--ignore-scripts" ]; + NODE_OPTIONS = "--openssl-legacy-provider"; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Ergonomic keyboard layout generator."; + homepage = "https://ergogen.xyz"; + mainProgram = "ergogen"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Tygo-van-den-Hurk ]; + }; +}) diff --git a/pkgs/by-name/fl/flashprog/package.nix b/pkgs/by-name/fl/flashprog/package.nix index 2a7bedf69ba0..446061807a86 100644 --- a/pkgs/by-name/fl/flashprog/package.nix +++ b/pkgs/by-name/fl/flashprog/package.nix @@ -46,9 +46,16 @@ stdenv.mkDerivation (finalAttrs: { libgpiod ]; + postPatch = '' + # Remove these rules from flashprog to avoid conflicts with libftdi + sed -i"" '/ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6001"/d' "util/50-flashprog.rules" + sed -i"" '/ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6010"/d' "util/50-flashprog.rules" + sed -i"" '/ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6011"/d' "util/50-flashprog.rules" + sed -i"" '/ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6014"/d' "util/50-flashprog.rules" + ''; + postInstall = '' - cd "$src" - install -Dm644 util/50-flashprog.rules "$out/lib/udev/rules.d/50-flashprog.rules" + install -Dm644 ../util/50-flashprog.rules "$out/lib/udev/rules.d/50-flashprog.rules" ''; passthru.updateScript = gitUpdater { diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix index 7a09a25b604e..f2b675d11c61 100644 --- a/pkgs/by-name/fl/flyctl/package.nix +++ b/pkgs/by-name/fl/flyctl/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.3.99"; + version = "0.3.106"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-vmmInlco4uxiFFTxSqxpaJCUbLbUWN3Iw4SDaRYaaOI="; + hash = "sha256-RGpf9R5tEss5gD/WfZ/wWRNPGJiFpUvcTX7H+cfjPzg="; }; - vendorHash = "sha256-iJdZDQaoaAf56wbE3v3apr6Zme4ZrY9PtfxAMncDM+Y="; + vendorHash = "sha256-QaCBeSCaA5MyagpAG5SC46YefhQD1UgFqK5jo0UqnUo="; subPackages = [ "." ]; diff --git a/pkgs/by-name/fo/forkstat/package.nix b/pkgs/by-name/fo/forkstat/package.nix index c80d47b55e45..9c5d947ea9af 100644 --- a/pkgs/by-name/fo/forkstat/package.nix +++ b/pkgs/by-name/fo/forkstat/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "forkstat"; - version = "0.03.02"; + version = "0.04.00"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = "forkstat"; rev = "V${version}"; - hash = "sha256-lwJIs5knNzkwgIkSdMSVVtrzqnxGy6uOTKsBDkS3xy4="; + hash = "sha256-HHyGjhu8yaBvDncloW8ST2L4iUU2ik2ydW1z9pFhfrw="; }; installFlags = [ diff --git a/pkgs/by-name/fr/frp/package.nix b/pkgs/by-name/fr/frp/package.nix index 09708fd6130a..186bd32ac24a 100644 --- a/pkgs/by-name/fr/frp/package.nix +++ b/pkgs/by-name/fr/frp/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "frp"; - version = "0.61.2"; + version = "0.62.0"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - hash = "sha256-speKU15zsg7jpPP3X6/QovHWtQxzHbVMWz4YLsZhE8A="; + hash = "sha256-ZzNn2iYrj0FZmZm0aQdbCeS3fCnwqqSCh2mVfjO9d5Q="; }; - vendorHash = "sha256-ZKhOBD6rLcZtllSQxkpYbHLyb3Ga2teZnGr8jJcETKQ="; + vendorHash = "sha256-koeOCkqYy1TUYXp2I7M+BIjmQEJGXtizOnqJuvzhHJM="; doCheck = false; diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix index af8206fd4f33..84ba80b79b73 100644 --- a/pkgs/by-name/ga/gallery-dl/package.nix +++ b/pkgs/by-name/ga/gallery-dl/package.nix @@ -8,7 +8,7 @@ let pname = "gallery-dl"; - version = "1.29.4"; + version = "1.29.5"; in python3Packages.buildPythonApplication { inherit pname version; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication { owner = "mikf"; repo = "gallery-dl"; tag = "v${version}"; - hash = "sha256-dQK1AWmdlfb1cRcYzXWUsXmRgjQRc++zEHZvLUygMwg="; + hash = "sha256-pa+UZsqLU8u3gBG06iiI9yT+TpxUYKS1US2nQ9Ou9ko="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix index 453c62fe8b69..aea534c9828a 100644 --- a/pkgs/by-name/gi/github-mcp-server/package.nix +++ b/pkgs/by-name/gi/github-mcp-server/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "github-mcp-server"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "github"; repo = "github-mcp-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-FMkulZoZtvu2aZC1qAszoIbKpWRoyY2LyQEUw6irawM="; + hash = "sha256-vbL96EXzgbjqVJaKizYIe8Fne60CVx7v/5ya9Xx3JvA="; }; vendorHash = "sha256-LjwvIn/7PLZkJrrhNdEv9J6sj5q3Ljv70z3hDeqC5Sw="; diff --git a/pkgs/by-name/gn/gnmic/package.nix b/pkgs/by-name/gn/gnmic/package.nix index 73fe10e42abe..34e558286453 100644 --- a/pkgs/by-name/gn/gnmic/package.nix +++ b/pkgs/by-name/gn/gnmic/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "gnmic"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "openconfig"; - repo = pname; - rev = "v${version}"; - hash = "sha256-rdT1gCALEsPiyN+4RKmJ36CUkYmbkIyi56JjVkzzkp8="; + repo = "gnmic"; + tag = "v${version}"; + hash = "sha256-tuEkpuUs245jj0/wzZjqTWeMZNJhiylZD7e0XOc/c14="; }; - vendorHash = "sha256-n4HBm9n3RkSmAkd29dhDN0tZ/bjVCBzQSihgY8VA1L4="; + vendorHash = "sha256-piHSVATQjHjKIWNIjm8p2A0ivQzDR2PQj0ovfYDk/FA="; ldflags = [ "-s" diff --git a/pkgs/by-name/gn/gnu-shepherd/package.nix b/pkgs/by-name/gn/gnu-shepherd/package.nix index 30f80016f5b9..760095c071a3 100644 --- a/pkgs/by-name/gn/gnu-shepherd/package.nix +++ b/pkgs/by-name/gn/gnu-shepherd/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnu-shepherd"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { url = "mirror://gnu/shepherd/shepherd-${version}.tar.gz"; - hash = "sha256-QOd561/9dvvoXN6VM9N/DamARihT4Bl0gWCT9VEL89g="; + hash = "sha256-EzBqa1bf4lJGToSiPCOnI0M4zHUsVl4bhl98v4oD8M8="; }; configureFlags = [ "--localstatedir=/" ]; diff --git a/pkgs/by-name/go/go-task/package.nix b/pkgs/by-name/go/go-task/package.nix index dc81f175b3dd..48d9eaf0ebff 100644 --- a/pkgs/by-name/go/go-task/package.nix +++ b/pkgs/by-name/go/go-task/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.41.0"; + version = "3.43.2"; src = fetchFromGitHub { owner = "go-task"; repo = "task"; tag = "v${version}"; - hash = "sha256-yJ9XTCS0BK+pcQvcbGR2ixwPODJKdfQnHgB1QoTFhzA="; + hash = "sha256-duq5OGUFki0OK/U09EmzBtTH5ObXdWwNYrmenUyubr0="; }; - vendorHash = "sha256-DR9G+I6PYk8jrR0CZiPqtuULTMekATNSLjyHACOmlbk="; + vendorHash = "sha256-3Uu0ozwOgp6vQh+s9nGKojw6xPUI49MjjPqKh9g35lQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/go/gomuks-web/package.nix b/pkgs/by-name/go/gomuks-web/package.nix new file mode 100644 index 000000000000..487b90b5d8e4 --- /dev/null +++ b/pkgs/by-name/go/gomuks-web/package.nix @@ -0,0 +1,74 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + buildNpmPackage, + stdenv, + olm, + unstableGitUpdater, + withGoolm ? false, +}: + +let + cppStdLib = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++"; + +in +buildGoModule (finalAttrs: { + pname = "gomuks-web"; + version = "0.4.0-unstable-2025-04-22"; + + src = fetchFromGitHub { + owner = "tulir"; + repo = "gomuks"; + rev = "fd257ed74c9df42e5b6d14d3c6a283f557f61666"; + hash = "sha256-jMDLfiwkUme2bxE+ZEtUoNMwZ7GuGGzCV2dH1V87YtQ="; + }; + + frontend = buildNpmPackage { + name = "${finalAttrs.pname}_${finalAttrs.version}-frontend"; + src = "${finalAttrs.src}/web"; + inherit (finalAttrs) version; + + npmDepsHash = "sha256-Mt2gJ1lLT3oQ3RKr3XTVFXkS/Xmjy0gahbdaxxrO+6g="; + + installPhase = '' + cp -r dist $out + ''; + }; + + vendorHash = "sha256-qeSxxd9ml2ENAYSPkdd1OWqy2DULnwLUVkKje47uT/I="; + + buildInputs = [ + (if withGoolm then stdenv.cc.cc.lib else olm) + ]; + + CGO_LDFLAGS = lib.optional withGoolm cppStdLib; + + tags = lib.optional withGoolm "goolm"; + + subPackages = [ "cmd/gomuks" ]; + + preBuild = '' + cp -r ${finalAttrs.frontend} ./web/dist + ''; + + postInstall = '' + mv $out/bin/gomuks $out/bin/gomuks-web + ''; + + passthru.updateScript = { + inherit (finalAttrs) frontend; + updateScript = unstableGitUpdater { + branch = "main"; + }; + }; + + meta = { + mainProgram = "gomuks-web"; + description = "Matrix client written in Go"; + homepage = "https://github.com/tulir/gomuks"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ ctucx ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/gq/gqlgen/package.nix b/pkgs/by-name/gq/gqlgen/package.nix index 2f57022ee15d..2d7fdeabf2a9 100644 --- a/pkgs/by-name/gq/gqlgen/package.nix +++ b/pkgs/by-name/gq/gqlgen/package.nix @@ -6,7 +6,7 @@ }: let - version = "0.17.70"; + version = "0.17.71"; in buildGoModule { pname = "gqlgen"; @@ -16,10 +16,10 @@ buildGoModule { owner = "99designs"; repo = "gqlgen"; tag = "v${version}"; - hash = "sha256-VpZQBmQKxqrWC9pD90V4hMO6mYgbCCbrenyCEbGTHtA="; + hash = "sha256-AkLs7nDnygbnq4DYZ72+JChutKj+2cJHlNiTa761aIs="; }; - vendorHash = "sha256-B3RiZZee6jefslUSTfHDth8WUl5rv7fmEFU0DpKkWZk="; + vendorHash = "sha256-Q9voEyziSlq9Ele4fz/obQS4ufapa4zK3cTd493XJgU="; subPackages = [ "." ]; diff --git a/pkgs/by-name/gu/gui-for-singbox/package.nix b/pkgs/by-name/gu/gui-for-singbox/package.nix index 980455e65c77..8c5c2557367d 100644 --- a/pkgs/by-name/gu/gui-for-singbox/package.nix +++ b/pkgs/by-name/gu/gui-for-singbox/package.nix @@ -17,13 +17,13 @@ let pname = "gui-for-singbox"; - version = "1.9.4"; + version = "1.9.6"; src = fetchFromGitHub { owner = "GUI-for-Cores"; repo = "GUI.for.SingBox"; tag = "v${version}"; - hash = "sha256-v6bx1nIIL5SpPsiUNbU35w7vh+1Zgl+d0Y6sG5XfEB8="; + hash = "sha256-qmYZWLzGAjUlbORhr67KqhTTeOxskAb7/HO+pPZ6uQE="; }; metaCommon = { @@ -45,7 +45,7 @@ let pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; sourceRoot = "${finalAttrs.src.name}/frontend"; - hash = "sha256-5SVu8eCyN89k6BvNEqgs4hOrP5IjvjUZrzrVuDwtYCk="; + hash = "sha256-RIkdnDyHjl5C0+Hdtne1NYEh46+yylW7Q/agT7AtDBo="; }; sourceRoot = "${finalAttrs.src.name}/frontend"; @@ -81,7 +81,7 @@ buildGoModule { --replace-fail '@basepath@' "$out" ''; - vendorHash = "sha256-Zt3We+Ai8oEqof2eQvcaIkocH85goeldmPf4mmDX17o="; + vendorHash = "sha256-4MPKAI1/F/sgfUORulhcpKJYHX7LpLknlzZx4DqnCfY="; nativeBuildInputs = [ wails diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index 371ce858ca15..91c9a0479fc7 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.29.1"; + version = "0.30.0"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${version}"; - hash = "sha256-bar4AdLovV8MBGF/yGHbcw1w3MQ4FFbmJkiDDS2Iq5g="; + hash = "sha256-Xs0/9LkvPvfLGxou1GZbvDAKnrSuEtKzyAwcT92mrB8="; }; buildAndTestSubdir = "harper-ls"; useFetchCargoVendor = true; - cargoHash = "sha256-CJZSBs8EtUstUNDUt3QQhv/f/GriaGzF9fw9IJWDNAk="; + cargoHash = "sha256-gY3Zm+frVdUqeNFUEwEPrWZog9arWQtL1CyGhlMgwFw="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/he/heynote/package.nix b/pkgs/by-name/he/heynote/package.nix index 3859f013e290..75062d8752fe 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.1.4"; + version = "2.2.1"; src = fetchurl { url = "https://github.com/heyman/heynote/releases/download/v${version}/Heynote_${version}_x86_64.AppImage"; - sha256 = "sha256-nei4akpXA5MWpQSL/oIcwfNILTKE3lwSi1ij68FMMtQ="; + sha256 = "sha256-IUy5EAtUk5+e64DC4VXXTgkyrG3mNJiItf1d4DR/fms="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/hi/hiawatha/package.nix b/pkgs/by-name/hi/hiawatha/package.nix index 9ff18400619a..727651369179 100644 --- a/pkgs/by-name/hi/hiawatha/package.nix +++ b/pkgs/by-name/hi/hiawatha/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hiawatha"; - version = "11.6"; + version = "11.7"; src = fetchFromGitLab { owner = "hsleisink"; repo = "hiawatha"; rev = "v${finalAttrs.version}"; - hash = "sha256-YsZdVqanVNibA4KnAknLh61hVo7x5uu67lb+RX2N7c8="; + hash = "sha256-Vr7rpYyUgB2NI/PJgh/nQa7gY1XJ4AfUDAHEOVblD1g="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix index 90f9b1140ad5..1f2e8a90d937 100644 --- a/pkgs/by-name/io/iosevka/package.nix +++ b/pkgs/by-name/io/iosevka/package.nix @@ -56,16 +56,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "33.2.1"; + version = "33.2.2"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-3veB083ZJUfQy7xqnQDnooV2comlQI3ZKNZkJiowpJg="; + hash = "sha256-dhMTcceHru/uLHRY4eWzFV+73ckCBBnDlizP3iY5w5w="; }; - npmDepsHash = "sha256-la57MOeG6f0ArnUwTOCseevZDR+Qg7kbxNT3cIAr/xE="; + npmDepsHash = "sha256-5DcMV9N16pyQxRaK6RCoeghZqAvM5EY1jftceT/bP+o="; nativeBuildInputs = [ diff --git a/pkgs/by-name/ip/ipxe/package.nix b/pkgs/by-name/ip/ipxe/package.nix index 683af773a1ed..d7ea15672759 100644 --- a/pkgs/by-name/ip/ipxe/package.nix +++ b/pkgs/by-name/ip/ipxe/package.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "ipxe"; - version = "1.21.1-unstable-2025-03-27"; + version = "1.21.1-unstable-2025-04-25"; nativeBuildInputs = [ mtools @@ -65,8 +65,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ipxe"; repo = "ipxe"; - rev = "09fbebc084bddcb5bc7277f1644154ab35e6a334"; - hash = "sha256-7F7SYSvSiY23xZbiJdzjiSDMnfeB4gWNodlHVgm9MyE="; + rev = "4c8bf666f4afb578645269a5a81431d784fad771"; + hash = "sha256-9yxUArp1kKA8deCnaHJkOnrL4Ox08u/7/VxCQjOUkvY="; }; # Calling syslinux on a FAT image isn't going to work on Aarch64. diff --git a/pkgs/by-name/jh/jhentai/package.nix b/pkgs/by-name/jh/jhentai/package.nix index a967c7adbb03..86247f51484c 100644 --- a/pkgs/by-name/jh/jhentai/package.nix +++ b/pkgs/by-name/jh/jhentai/package.nix @@ -13,13 +13,13 @@ flutter324.buildFlutterApplication rec { pname = "jhentai"; - version = "8.0.6+277"; + version = "8.0.6+279"; src = fetchFromGitHub { owner = "jiangtian616"; repo = "JHenTai"; tag = "v${version}"; - hash = "sha256-uS9jRgOKjByZazT6KCf9oOTeC6VPv7cIjtx5SNgIO7A="; + hash = "sha256-omaGtqaWIE43j7BPAw2G3SUVQgjTdUb5F1d/loCvzHE="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/by-name/jh/jhentai/pubspec.lock.json b/pkgs/by-name/jh/jhentai/pubspec.lock.json index d2ccdbdc8ab9..9e1f48f8bb16 100644 --- a/pkgs/by-name/jh/jhentai/pubspec.lock.json +++ b/pkgs/by-name/jh/jhentai/pubspec.lock.json @@ -4,27 +4,27 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77", + "sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab", "url": "https://pub.dev" }, "source": "hosted", - "version": "73.0.0" + "version": "76.0.0" }, "_macros": { "dependency": "transitive", "description": "dart", "source": "sdk", - "version": "0.3.2" + "version": "0.3.3" }, "analyzer": { "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a", + "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.8.0" + "version": "6.11.0" }, "analyzer_plugin": { "dependency": "transitive", @@ -1162,21 +1162,21 @@ "dependency": "transitive", "description": { "name": "leak_tracker", - "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05", + "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.0.5" + "version": "10.0.7" }, "leak_tracker_flutter_testing": { "dependency": "transitive", "description": { "name": "leak_tracker_flutter_testing", - "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806", + "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.5" + "version": "3.0.8" }, "leak_tracker_testing": { "dependency": "transitive", @@ -1293,11 +1293,11 @@ "dependency": "transitive", "description": { "name": "macros", - "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", + "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.2-main.4" + "version": "0.1.3-main.0" }, "matcher": { "dependency": "direct overridden", @@ -1885,7 +1885,7 @@ "dependency": "transitive", "description": "flutter", "source": "sdk", - "version": "0.0.99" + "version": "0.0.0" }, "smart_auth": { "dependency": "transitive", @@ -2031,11 +2031,11 @@ "dependency": "transitive", "description": { "name": "stack_trace", - "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.11.1" + "version": "1.12.0" }, "stream_channel": { "dependency": "transitive", @@ -2061,11 +2061,11 @@ "dependency": "transitive", "description": { "name": "string_scanner", - "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.3.0" }, "syncfusion_flutter_charts": { "dependency": "direct main", @@ -2452,11 +2452,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", + "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b", "url": "https://pub.dev" }, "source": "hosted", - "version": "14.2.5" + "version": "14.3.0" }, "wakelock_plus": { "dependency": "direct main", diff --git a/pkgs/by-name/li/libcifpp/package.nix b/pkgs/by-name/li/libcifpp/package.nix index 6e1385feaa09..2b7eab77f104 100644 --- a/pkgs/by-name/li/libcifpp/package.nix +++ b/pkgs/by-name/li/libcifpp/package.nix @@ -10,18 +10,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "libcifpp"; - version = "7.0.9"; + version = "8.0.0"; src = fetchFromGitHub { owner = "PDB-REDO"; repo = "libcifpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-wV4YvQmtpbj+mOiMeSr9gBpZzFPygkAOkj74vv4pA4U="; + hash = "sha256-t1ovrrKu+QSSdwgTp2Nag4SsAJeU9aRizJccd+u+dVI="; }; - nativeBuildInputs = [ - cmake - ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ # disable network access @@ -39,12 +37,12 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/share/libcifpp ''; - meta = with lib; { + meta = { description = "Manipulate mmCIF and PDB files"; homepage = "https://github.com/PDB-REDO/libcifpp"; changelog = "https://github.com/PDB-REDO/libcifpp/releases/tag/v${finalAttrs.version}"; - license = licenses.bsd2; - maintainers = with maintainers; [ natsukium ]; - platforms = platforms.unix; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ natsukium ]; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/li/liburcu/package.nix b/pkgs/by-name/li/liburcu/package.nix index ad7a5d83ce24..2308f77b58a6 100644 --- a/pkgs/by-name/li/liburcu/package.nix +++ b/pkgs/by-name/li/liburcu/package.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { ++ platforms.mips ++ platforms.m68k ++ platforms.riscv + ++ platforms.loongarch64 ); maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix index 0543c2efcbfa..b3ab380c17f4 100644 --- a/pkgs/by-name/lu/luau/package.nix +++ b/pkgs/by-name/lu/luau/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "luau"; - version = "0.670"; + version = "0.671"; src = fetchFromGitHub { owner = "luau-lang"; repo = "luau"; rev = version; - hash = "sha256-3iRQJ3v8MyW9LZiaEAkRFubFBdPxg7EEzXYqzbKspFY="; + hash = "sha256-iiIQKXByHuGCH5ypr7uSAcABaQagLw008Z0HRCsREIM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/mi/micronaut/package.nix b/pkgs/by-name/mi/micronaut/package.nix index 44c7f32ab990..3b3bbdb39b27 100644 --- a/pkgs/by-name/mi/micronaut/package.nix +++ b/pkgs/by-name/mi/micronaut/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "4.8.0"; + version = "4.8.2"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-BV3O+HwZc8Bin3G+DoV/nxmroCxSinvuy+bW11TrTrY="; + sha256 = "sha256-QCXf3999EFLVSUuks8vQWAG/yJnZ74leJ0HWwzH70qU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mi/minetest-mapserver/package.nix b/pkgs/by-name/mi/minetest-mapserver/package.nix index 9641223a8460..5e9fb2aade10 100644 --- a/pkgs/by-name/mi/minetest-mapserver/package.nix +++ b/pkgs/by-name/mi/minetest-mapserver/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "minetest-mapserver"; - version = "4.9.2"; + version = "4.9.3"; src = fetchFromGitHub { owner = "minetest-mapserver"; repo = "mapserver"; rev = "v${version}"; - hash = "sha256-wo3/7axVkEcnqkOG29KE136EeMt/FW63q68UlpIA3z8="; + hash = "sha256-6tDhfYG/zcFjGNCR6yir71FM/qFHK5p/3+q+P6V1a4c="; }; vendorHash = "sha256-P3+M1ciRmFbOFnjy1+oWPhngPYFe/5o6Cs8pRlYNx2Q="; diff --git a/pkgs/by-name/mo/mox/package.nix b/pkgs/by-name/mo/mox/package.nix index 6c4c5addeb13..8997a9604b75 100644 --- a/pkgs/by-name/mo/mox/package.nix +++ b/pkgs/by-name/mo/mox/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "mox"; - version = "0.0.14"; + version = "0.0.15"; src = fetchFromGitHub { owner = "mjl-"; repo = "mox"; tag = "v${version}"; - hash = "sha256-cBTY4SjQxdM5jXantLws1ckGVn3/b0/iVPFunBy09YQ="; + hash = "sha256-apIV+nClXTUbmCssnvgG9UwpTNTHTe6FgLCxp14/s0A="; }; # set the version during buildtime diff --git a/pkgs/by-name/mu/mud/package.nix b/pkgs/by-name/mu/mud/package.nix index b67867c11517..dba30e320701 100644 --- a/pkgs/by-name/mu/mud/package.nix +++ b/pkgs/by-name/mu/mud/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "mud"; - version = "1.0.12"; + version = "1.0.13"; pyproject = true; src = fetchFromGitHub { owner = "jasursadikov"; repo = "mud"; tag = "v${version}"; - hash = "sha256-fFSnkodYhV1dokCJq43PwXxjIeAkObYZA3VxhjGZlhM="; + hash = "sha256-DRkr4SYXzYZg7IvPwKGeqcJVDyJr4TdJ4TKuBu7iHEc="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index 17b81bcf130f..520233ca23e9 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation ( in { pname = "neovim-unwrapped"; - version = "0.11.0"; + version = "0.11.1"; __structuredAttrs = true; @@ -103,7 +103,7 @@ stdenv.mkDerivation ( owner = "neovim"; repo = "neovim"; tag = "v${finalAttrs.version}"; - hash = "sha256-UVMRHqyq3AP9sV79EkPUZnVkj0FpbS+XDPPOppp2yFE="; + hash = "sha256-kJvKyNjpqIKa5aBi62jHTCb1KxQ4YgYtBh/aNYZSeO8="; }; patches = [ diff --git a/pkgs/by-name/op/openomf/package.nix b/pkgs/by-name/op/openomf/package.nix new file mode 100644 index 000000000000..0e55ab5f2ee4 --- /dev/null +++ b/pkgs/by-name/op/openomf/package.nix @@ -0,0 +1,94 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchurl, + cmake, + argtable, + enet, + git, + libconfuse, + libnatpmp, + libepoxy, + libpng, + libxmp, + miniupnpc, + opusfile, + SDL2, + SDL2_mixer, + unzip, + zlib, + withRemix ? true, +}: + +let + assets = fetchurl { + url = "https://www.omf2097.com/pub/files/omf/openomf-assets.zip"; + hash = "sha256-3kcseGrfnmGL9LcaXyy4W7CwkPJ9orMAjzBUU6jepn0="; + }; + icons = fetchurl { + url = "https://www.omf2097.com/pub/files/omf/openomf-icons.zip"; + hash = "sha256-8LWmrkY3ZiXcuVe0Zj90RQFUTwM27dJ4ev9TiBGoVk0="; + }; + remix = fetchurl { + url = "https://github.com/omf2097/openomf/releases/download/0.8.0/ARENA2.ogg"; + hash = "sha256-jOIzDaIwQDlwCaPrRZdG5Y0g7bWKwc38mPKP030PGb4="; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "openomf"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "omf2097"; + repo = "openomf"; + tag = finalAttrs.version; + hash = "sha256-c4J/MqVO65+F4rfd8w+J+42jNWROByB1hdAHarwAIVY="; + }; + + nativeBuildInputs = [ + cmake + git + unzip + ]; + + buildInputs = [ + argtable + enet + libconfuse + libepoxy + libnatpmp + libpng + libxmp + miniupnpc + opusfile + SDL2 + SDL2_mixer + zlib + ]; + + postInstall = + '' + mkdir -p $out/share/icons/hicolor/256x256/apps + unzip -j ${assets} -d $out/share/games/openomf + unzip -p ${icons} omf-logo/omf-256x256.png > $out/share/icons/hicolor/256x256/apps/org.openomf.OpenOMF.png + install -Dm644 $src/resources/flatpak/org.openomf.OpenOMF.desktop $out/share/applications/org.openomf.OpenOMF.desktop + '' + + lib.optionalString withRemix '' + ln -s ${remix} $out/share/games/openomf/ARENA2.ogg + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/resources + ln -s $out/share/games/openomf/* $out/resources + ''; + + meta = { + description = "One Must Fall 2097 Remake"; + homepage = "https://www.openomf.org"; + changelog = "https://github.com/omf2097/openomf/releases/tag/${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ keenanweaver ]; + mainProgram = "openomf"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ox/oxker/package.nix b/pkgs/by-name/ox/oxker/package.nix index b568754d11b1..1dc3cb54219e 100644 --- a/pkgs/by-name/ox/oxker/package.nix +++ b/pkgs/by-name/ox/oxker/package.nix @@ -2,26 +2,29 @@ lib, fetchCrate, rustPlatform, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "oxker"; - version = "0.10.2"; + version = "0.10.3"; src = fetchCrate { - inherit pname version; - hash = "sha256-szsC6EniAmcjZaSunvNY0fP3tx0hEbP6oUO0NNbjgTY="; + inherit (finalAttrs) pname version; + hash = "sha256-2xLTR5+0xtyYhc5+gYG78EMP/B5Vk6ZqEGsZwM2bAok="; }; useFetchCargoVendor = true; - cargoHash = "sha256-77oMoKzhe+vrdAwn85A6tj35EOz/ylZh5imdmRjkR3k="; + cargoHash = "sha256-d6jaOtB6S8R6cdqLUnuPhDP6q9Hl6FTieFEiBibiDDE="; - meta = with lib; { - description = "Simple tui to view & control docker containers"; + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Simple TUI to view & control docker containers"; homepage = "https://github.com/mrjackwills/oxker"; - changelog = "https://github.com/mrjackwills/oxker/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ siph ]; + changelog = "https://github.com/mrjackwills/oxker/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ siph ]; mainProgram = "oxker"; }; -} +}) diff --git a/pkgs/by-name/pa/parca-agent/package.nix b/pkgs/by-name/pa/parca-agent/package.nix index f7ae30e2876a..fa4c4e2b6747 100644 --- a/pkgs/by-name/pa/parca-agent/package.nix +++ b/pkgs/by-name/pa/parca-agent/package.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "parca-agent"; - version = "0.38.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "parca-dev"; repo = "parca-agent"; tag = "v${version}"; - hash = "sha256-GaJeVfpyh61zro/WQgTxPisT/lZPx+BNekpFY6UXcAA="; + hash = "sha256-8xzRHOqiGaAKkVlFv0YLj76xJhr6+ljFyGa819iOPiY="; fetchSubmodules = true; }; proxyVendor = true; - vendorHash = "sha256-5vjG0RAoqE69v8uooRxRD87clkX7dMZCP3W42/2+OSk="; + vendorHash = "sha256-o7wf0n2XHZnfURJfQqgvU9bXfFrbFXIo3rt5cqYCx6w="; buildInputs = [ stdenv.cc.libc.static diff --git a/pkgs/by-name/pf/pferd/package.nix b/pkgs/by-name/pf/pferd/package.nix index 5fb3dc21d4e6..d1c23a7112e2 100644 --- a/pkgs/by-name/pf/pferd/package.nix +++ b/pkgs/by-name/pf/pferd/package.nix @@ -5,14 +5,14 @@ }: python3Packages.buildPythonApplication rec { pname = "pferd"; - version = "3.8.0"; + version = "3.8.1"; format = "pyproject"; src = fetchFromGitHub { owner = "Garmelon"; repo = "PFERD"; tag = "v${version}"; - sha256 = "sha256-pbMT6KqqITDBPGgLGq4gmCmasby4lhuZzq02ixnDeSI="; + sha256 = "sha256-IRQQkQTkP0B3S8j2MFP5W18wt6QsZ5MppAwvOUfE1Yg="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix index ddb3c8eb6ad4..a07b756b6d7b 100644 --- a/pkgs/by-name/pl/plasticity/package.nix +++ b/pkgs/by-name/pl/plasticity/package.nix @@ -34,11 +34,11 @@ }: stdenv.mkDerivation rec { pname = "plasticity"; - version = "24.2.6"; + version = "25.1.8"; src = fetchurl { url = "https://github.com/nkallen/plasticity/releases/download/v${version}/Plasticity-${version}-1.x86_64.rpm"; - hash = "sha256-MEw7pmaDPOxhjeIHWumCxwESZri3gdXULIc7kRh9/BM="; + hash = "sha256-5PjjEsHchryUhmzqyQ4XqwiycNEVCefmpSW/9jZEzpg="; }; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/pr/primesieve/package.nix b/pkgs/by-name/pr/primesieve/package.nix index 85619664b711..0aeee779743c 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.7"; + version = "12.8"; src = fetchFromGitHub { owner = "kimwalisch"; repo = "primesieve"; rev = "v${finalAttrs.version}"; - hash = "sha256-wWxbEu8nBY7LI5Ut1w0b6qMuQ4O/hCV6/dpxcojWepU="; + hash = "sha256-1jy4cfH/z4fwuuonoRHtrKUVNX9mD9A2sBaUTtAUA8M="; }; outputs = [ diff --git a/pkgs/by-name/qd/qdrant-web-ui/package.nix b/pkgs/by-name/qd/qdrant-web-ui/package.nix index b6609ea78825..d16c33ea5354 100644 --- a/pkgs/by-name/qd/qdrant-web-ui/package.nix +++ b/pkgs/by-name/qd/qdrant-web-ui/package.nix @@ -5,16 +5,16 @@ }: buildNpmPackage rec { pname = "qdrant-web-ui"; - version = "0.1.38"; + version = "0.1.39"; src = fetchFromGitHub { owner = "qdrant"; repo = "qdrant-web-ui"; tag = "v${version}"; - hash = "sha256-0oUTKX4dDJ8GYRp8oPgx2a7TEHKofn2ZpIEZRpvbfIs="; + hash = "sha256-xMVLZoboDiFYIPNkNgRuJQ0aUVi0Z8qHnD2ExTiIEwE="; }; - npmDepsHash = "sha256-uH8kjCHQk+4vNkgHSlvO0UrvGRh/LKEM1bvrcEHolp0="; + npmDepsHash = "sha256-HT7Lm4PUhVx/HJpeYpni3ZXZ/53Fyq2iTNtpK64XPtU="; npmBuildScript = "build-qdrant"; diff --git a/pkgs/by-name/qu/quantframe/0001-disable-telemetry.patch b/pkgs/by-name/qu/quantframe/0001-disable-telemetry.patch index 38eebfba6e68..4ff0cb5b1085 100644 --- a/pkgs/by-name/qu/quantframe/0001-disable-telemetry.patch +++ b/pkgs/by-name/qu/quantframe/0001-disable-telemetry.patch @@ -1,11 +1,37 @@ diff --git a/src-tauri/src/qf_client/modules/analytics.rs b/src-tauri/src/qf_client/modules/analytics.rs -index f6f1209..e08490b 100644 +index 3b31cfa..562e0b4 100644 --- a/src-tauri/src/qf_client/modules/analytics.rs +++ b/src-tauri/src/qf_client/modules/analytics.rs -@@ -115,52 +115,6 @@ impl AnalyticsModule { - } - }; - } +@@ -37,7 +37,7 @@ impl AnalyticsModule { + current_page: "home".to_string(), + component: "Analytics".to_string(), + is_init: false, +- send_metrics: true, ++ send_metrics: false, + last_user_activity: Arc::new(Mutex::new(Instant::now())), + metricAndLabelPairsScheduledToSend: vec![], + } +@@ -96,69 +96,6 @@ impl AnalyticsModule { + // Create Timer for sending metrics + let mut last_metric_time = Instant::now(); + +- if is_first_install { +- logger::info( +- &&qf.analytics().get_component("init"), +- "Detected first install", +- LoggerOptions::default(), +- ); +- match qf +- .analytics() +- .try_send_analytics("install", 3, json!({})) +- .await +- { +- Ok(_) => {} +- Err(e) => { +- error::create_log_file("analytics.log", &e); +- } +- }; +- } - loop { - let send_metrics = qf.analytics().send_metrics; - if !send_metrics { @@ -22,10 +48,10 @@ index f6f1209..e08490b 100644 - } - - last_metric_time = Instant::now(); -- logger::info_con( -- &qf.analytics().get_component("TrySendAnalytics"), -- "Sending user activity", -- ); +- // logger::info_con( +- // &qf.analytics().get_component("TrySendAnalytics"), +- // "Sending user activity", +- // ); - match qf - .analytics() - .try_send_analytics( @@ -43,10 +69,10 @@ index f6f1209..e08490b 100644 - || e.cause().contains("Banned") - || e.cause().contains("WFMBanned") - { -- error::create_log_file("analytics.log".to_string(), &e); +- error::create_log_file("analytics.log", &e); - break; - } -- error::create_log_file("analytics.log".to_string(), &e); +- error::create_log_file("analytics.log", &e); - } - }; - } @@ -55,7 +81,7 @@ index f6f1209..e08490b 100644 qf.analytics().is_init = false; } }); -@@ -176,44 +130,6 @@ impl AnalyticsModule { +@@ -174,45 +111,6 @@ impl AnalyticsModule { mut retry_count: i64, data: Value, ) -> Result<(), AppError> { @@ -88,16 +114,30 @@ index f6f1209..e08490b 100644 - return Err(err); - } - retry_count -= 1; -- logger::warning_con( +- logger::warning( - &self.get_component("TrySendAnalytics"), - &format!( - "Failed to send analytics, retrying in 5 seconds, retries left: {}", - retry_count - ), +- LoggerOptions::default(), - ); - tokio::time::sleep(std::time::Duration::from_secs(5)).await; - } - Ok(()) -+ return Ok(()); ++ return Ok(()) } } +diff --git a/src/contexts/app.context.tsx b/src/contexts/app.context.tsx +index 8b3ced9..5da811f 100644 +--- a/src/contexts/app.context.tsx ++++ b/src/contexts/app.context.tsx +@@ -160,7 +160,7 @@ export function AppContextProvider({ children }: AppContextProviderProps) { + const id = context.substring(start, end); + + console.log("OpenTos", settings?.tos_uuid, id); +- if (id == settings?.tos_uuid) return; ++ if (true) return; + modals.open({ + title: useTranslateModals("tos.title"), + size: "100%", diff --git a/pkgs/by-name/qu/quantframe/package.nix b/pkgs/by-name/qu/quantframe/package.nix index 864f2883cb8b..c175469262c6 100644 --- a/pkgs/by-name/qu/quantframe/package.nix +++ b/pkgs/by-name/qu/quantframe/package.nix @@ -2,33 +2,37 @@ lib, rustPlatform, fetchFromGitHub, - cargo-tauri_1, + cargo-tauri, nodejs, pnpm_9, pkg-config, glib-networking, openssl, - webkitgtk_4_0, + webkitgtk_4_1, wrapGAppsHook3, - libsoup_2_4, + libsoup_3, libayatana-appindicator, gtk3, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "quantframe"; - version = "1.3.4"; + version = "1.4.3"; src = fetchFromGitHub { owner = "Kenya-DK"; repo = "quantframe-react"; tag = "v${finalAttrs.version}"; - hash = "sha256-/cjlYQHb23DY4RSjc2HosTar6p1epsqlWQX6TlrzSe8="; + hash = "sha256-ls6c9xLmjjx0kSh1s+HkdClrcTOvsAemjzqNwMeOd9c="; }; postPatch = '' substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" + + substituteInPlace src-tauri/tauri.conf.json \ + --replace-fail '"createUpdaterArtifacts": "v1Compatible"' '"createUpdaterArtifacts": false' ''; patches = [ @@ -37,34 +41,34 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-4uyjvwvrMDe+86wcB7MBBWWc4NGKzqBsgG3TScf7BMk="; + hash = "sha256-3IHwwbl1aH3Pzh9xq2Jfev9hj6/LXZaVaIJOPbgsquE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-mtHbWTNrWh4hq4IAncE9TCWr7sozIy2zf3DK3WN7wqI="; + cargoHash = "sha256-UyfSmlr+5mWmlisNtjF6jZKx92kdQziG26mgeZtkySY="; nativeBuildInputs = [ - cargo-tauri_1.hook - + cargo-tauri.hook pkg-config wrapGAppsHook3 - nodejs pnpm_9.configHook ]; buildInputs = [ openssl - libsoup_2_4 + libsoup_3 glib-networking gtk3 libayatana-appindicator - webkitgtk_4_0 + webkitgtk_4_1 ]; cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; + passthru.updateScript = nix-update-script { }; + meta = { description = "Warframe Market listings and transactions manager"; mainProgram = "quantframe"; diff --git a/pkgs/by-name/ra/radicale/package.nix b/pkgs/by-name/ra/radicale/package.nix index 494a72430b40..d63126908328 100644 --- a/pkgs/by-name/ra/radicale/package.nix +++ b/pkgs/by-name/ra/radicale/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "radicale"; - version = "3.5.1"; + version = "3.5.2"; pyproject = true; src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; tag = "v${version}"; - hash = "sha256-CM4ljD2fXwQIiJW135G9cIEO0YNmhbS0Cwiv0EU+Bsk="; + hash = "sha256-ixX385oWBD4rCgpuivh6o8Htmk80JsHUz+vKD3u60lk="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/ra/rare-regex/package.nix b/pkgs/by-name/ra/rare-regex/package.nix index 671550c39555..153745222480 100644 --- a/pkgs/by-name/ra/rare-regex/package.nix +++ b/pkgs/by-name/ra/rare-regex/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "rare"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "zix99"; repo = "rare"; rev = version; - hash = "sha256-Sc8Ek1JfagqEDZ1Ci2UdqDkKZbQ6klH+uICML/ifO0Q="; + hash = "sha256-fb4JbfDVZpehDhWlQHoUOOstcPMgEFuRlIZQV6OdvkQ="; }; vendorHash = "sha256-wUOtxNjL/4MosACCzPTWKWrnMZhxINfN1ppkRsqDh9M="; diff --git a/pkgs/by-name/rc/rc-9front/package.nix b/pkgs/by-name/rc/rc-9front/package.nix index a88159cf72a6..df50742c1d5b 100644 --- a/pkgs/by-name/rc/rc-9front/package.nix +++ b/pkgs/by-name/rc/rc-9front/package.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation { pname = "rc-9front"; - version = "0-unstable-2025-01-19"; + version = "0-unstable-2025-04-12"; src = fetchFrom9Front { domain = "shithub.us"; owner = "cinap_lenrek"; repo = "rc"; - rev = "a827beee910cb143f916cf3657c45c29d904800c"; - hash = "sha256-FPHKGuJn1xs6yex64knplr6hteFy2xVsUOAgMxQbGXs="; + rev = "ab2af6895d0e66aa9e5a94f77c2ba132c08f28d8"; + hash = "sha256-hpBZsZ+I2dS79bS6lkXOgx+KPri7vQftTLwuPEnomhc="; }; strictDeps = true; diff --git a/pkgs/by-name/re/repomix/package.nix b/pkgs/by-name/re/repomix/package.nix index 05da4f6c520c..10be21e9ecf4 100644 --- a/pkgs/by-name/re/repomix/package.nix +++ b/pkgs/by-name/re/repomix/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "repomix"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "yamadashy"; repo = "repomix"; tag = "v${version}"; - hash = "sha256-vK+Fn9gmPUTWkUHmNAX9OAoGxhG4tiVwqK6P+f8hcJQ="; + hash = "sha256-Dmp+PtQ5qnj5MYS1jFUvLRhrxTp94WDaR8z7Ayv0lhU="; }; - npmDepsHash = "sha256-ihC4SCl0J5trz84ixUq12BjGtPMsfv5Ngs+QzkbjJbQ="; + npmDepsHash = "sha256-5DIZMb1dKkgWmEzjNOthXY6weOyLDQVjJKPdsHj+pb8="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/rt/rt-tests/package.nix b/pkgs/by-name/rt/rt-tests/package.nix index 692763c6d74a..c8f430119cc6 100644 --- a/pkgs/by-name/rt/rt-tests/package.nix +++ b/pkgs/by-name/rt/rt-tests/package.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { "prefix=$(out)" "DESTDIR=" "PYLIB=$(out)/${python3.sitePackages}" + "CC=${stdenv.cc.targetPrefix}cc" + "AR=${stdenv.cc.bintools.targetPrefix}ar" ]; postInstall = '' diff --git a/pkgs/by-name/ru/rutorrent/package.nix b/pkgs/by-name/ru/rutorrent/package.nix index 3cef28ce3db0..4d0caaf316b2 100644 --- a/pkgs/by-name/ru/rutorrent/package.nix +++ b/pkgs/by-name/ru/rutorrent/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rutorrent"; - version = "5.1.6"; + version = "5.1.7"; src = fetchFromGitHub { owner = "Novik"; repo = "ruTorrent"; tag = "v${finalAttrs.version}"; - hash = "sha256-XdPrl1yDcn/dFU4etacDmBAvs0kU/cJE4Ioy6q8+pig="; + hash = "sha256-GeSHLPAmnq5ZStpBSfPc3DzRSh7zjDu31oO04oKgpYk="; }; installPhase = '' diff --git a/pkgs/by-name/sd/SDL2_mixer/package.nix b/pkgs/by-name/sd/SDL2_mixer/package.nix index e1d199dfe60f..228f35554a70 100644 --- a/pkgs/by-name/sd/SDL2_mixer/package.nix +++ b/pkgs/by-name/sd/SDL2_mixer/package.nix @@ -13,9 +13,11 @@ smpeg2, stdenv, timidity, + wavpack, + libxmp, + game-music-emu, # Boolean flags enableSdltest ? (!stdenv.hostPlatform.isDarwin), - enableSmpegtest ? (!stdenv.hostPlatform.isDarwin), }: stdenv.mkDerivation (finalAttrs: { @@ -44,6 +46,9 @@ stdenv.mkDerivation (finalAttrs: { mpg123 opusfile smpeg2 + wavpack + libxmp + game-music-emu # MIDI patterns timidity ]; @@ -56,14 +61,11 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; configureFlags = [ - (lib.enableFeature false "music-ogg-shared") - (lib.enableFeature false "music-flac-shared") (lib.enableFeature false "music-mod-modplug-shared") (lib.enableFeature false "music-mp3-mpg123-shared") (lib.enableFeature false "music-opus-shared") (lib.enableFeature false "music-midi-fluidsynth-shared") (lib.enableFeature enableSdltest "sdltest") - (lib.enableFeature enableSmpegtest "smpegtest") # override default path to allow MIDI files to be played (lib.withFeatureAs true "timidity-cfg" "${timidity}/share/timidity/timidity.cfg") ]; diff --git a/pkgs/by-name/se/seaweedfs/package.nix b/pkgs/by-name/se/seaweedfs/package.nix index e86774137597..0550dd037730 100644 --- a/pkgs/by-name/se/seaweedfs/package.nix +++ b/pkgs/by-name/se/seaweedfs/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.85"; + version = "3.86"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-vW/+zvpx5UIAUwsPyad2Ib+wI3gtBbh23k03yCiGnH0="; + hash = "sha256-narKC6ptQhiPuA91HfFp09sJZWF+jhZ60989TMtJPmU="; }; - vendorHash = "sha256-wlwL/9c0WuGzHfMotYKltjzeIVUhDJ0OTzXF9QE4zcw="; + vendorHash = "sha256-dZ6IBF/M/tEg2GavMCi4OKPbeDUX5rpKQf9CbA1GVXA="; subPackages = [ "weed" ]; diff --git a/pkgs/by-name/se/send/package.nix b/pkgs/by-name/se/send/package.nix index b9d9298af3d5..95e51b8de8f8 100644 --- a/pkgs/by-name/se/send/package.nix +++ b/pkgs/by-name/se/send/package.nix @@ -3,22 +3,21 @@ buildNpmPackage, fetchFromGitHub, makeBinaryWrapper, - nodejs, + nodejs_20, nixosTests, }: - buildNpmPackage rec { pname = "send"; - version = "3.4.23"; + version = "3.4.25"; src = fetchFromGitHub { owner = "timvisee"; repo = "send"; tag = "v${version}"; - hash = "sha256-bqQEXLwUvTKX+m2yNHRnrl+eeaGmcovXpXugxd+j14A="; + hash = "sha256-2XeChKJi57auIf9aSe2JlP55tiE8dmrCBtUfCkziYi8="; }; - npmDepsHash = "sha256-r1iaurKuhpP0sevB5pFdtv9j1ikM1fKL7Jgakh4FzTI="; + npmDepsHash = "sha256-DY+4qOzoURx8xmemhutxcNxg0Tv2u6tyJHK5RhBjo8w="; nativeBuildInputs = [ makeBinaryWrapper @@ -38,7 +37,7 @@ buildNpmPackage rec { cp -r dist $out/lib/node_modules/send/ ln -s $out/lib/node_modules/send/dist/version.json $out/lib/node_modules/send/version.json - makeWrapper ${lib.getExe nodejs} $out/bin/send \ + makeWrapper ${lib.getExe nodejs_20} $out/bin/send \ --add-flags $out/lib/node_modules/send/server/bin/prod.js \ --set "NODE_ENV" "production" ''; @@ -52,7 +51,10 @@ buildNpmPackage rec { changelog = "https://github.com/timvisee/send/releases/tag/v${version}"; homepage = "https://github.com/timvisee/send"; license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ moraxyc ]; + maintainers = with lib.maintainers; [ + moraxyc + MrSom3body + ]; mainProgram = "send"; }; } diff --git a/pkgs/by-name/so/soundsource/package.nix b/pkgs/by-name/so/soundsource/package.nix index 94e1e1bd5668..108ef419e875 100644 --- a/pkgs/by-name/so/soundsource/package.nix +++ b/pkgs/by-name/so/soundsource/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "soundsource"; - version = "5.7.5"; + version = "5.8.2"; src = fetchurl { - url = "https://web.archive.org/web/20241208194405/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip"; - hash = "sha256-KjyhccLAAa/atSpw/H2IVt23huEY6lxC5BVAaqSG3JI="; + url = "https://web.archive.org/web/20250424131232/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip"; + hash = "sha256-RilL2nD0pUQKCb63uip7q9kmsKVXvEPcT+GUfZKtKNM="; }; dontUnpack = true; diff --git a/pkgs/by-name/sp/spiped/package.nix b/pkgs/by-name/sp/spiped/package.nix index e45caedb7c07..068e248cb56b 100644 --- a/pkgs/by-name/sp/spiped/package.nix +++ b/pkgs/by-name/sp/spiped/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "spiped"; - version = "1.6.3"; + version = "1.6.4"; src = fetchurl { url = "https://www.tarsnap.com/spiped/spiped-${version}.tgz"; - hash = "sha256-cMUwcNu7ENFEJ1Sur7AbCOyCkgPUECNkfb8aFDXuSmU="; + hash = "sha256-Qk+003adkSsE3kPSHMMnSM39MSHE8dJtVJmSpUZ44Go="; }; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index 9b6675c2b09c..922266a721b0 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -14,6 +14,7 @@ nixosTests, rocksdb, callPackage, + withFoundationdb ? false, }: rustPlatform.buildRustPackage rec { @@ -41,7 +42,7 @@ rustPlatform.buildRustPackage rec { openssl sqlite zstd - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ foundationdb ]; + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withFoundationdb) [ foundationdb ]; # Issue: https://github.com/stalwartlabs/mail-server/issues/1104 buildNoDefaultFeatures = true; @@ -53,7 +54,7 @@ rustPlatform.buildRustPackage rec { "elastic" "s3" "redis" - ]; + ] ++ lib.optionals withFoundationdb [ "foundationdb" ]; env = { OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/su/subread/package.nix b/pkgs/by-name/su/subread/package.nix index 601eb3542705..fb3ee4ecacd4 100644 --- a/pkgs/by-name/su/subread/package.nix +++ b/pkgs/by-name/su/subread/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "subread"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { url = "mirror://sourceforge/subread/subread-${version}/subread-${version}-source.tar.gz"; - sha256 = "sha256-/fioTPFF7atJhAcOcVlWEsl603Qa/bjSX5Pa58hwNDM="; + sha256 = "sha256-Y5LXxmgxzddn5YJRiSp5pRtvq47QupZxrV6F/xqwHqo="; }; buildInputs = [ diff --git a/pkgs/by-name/sv/svelte-language-server/package-lock.json b/pkgs/by-name/sv/svelte-language-server/package-lock.json index 10bc2c6460a9..533b617b27cb 100644 --- a/pkgs/by-name/sv/svelte-language-server/package-lock.json +++ b/pkgs/by-name/sv/svelte-language-server/package-lock.json @@ -1,12 +1,12 @@ { "name": "svelte-language-server", - "version": "0.17.11", + "version": "0.17.12", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "svelte-language-server", - "version": "0.17.11", + "version": "0.17.12", "license": "MIT", "dependencies": { "@jridgewell/trace-mapping": "^0.3.25", @@ -253,9 +253,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "18.19.80", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.80.tgz", - "integrity": "sha512-kEWeMwMeIvxYkeg1gTc01awpwLbfMRZXdIhwRcakd/KlK53jmRC26LqcbIt7fnAQTu5GzlnWmzA3H6+l1u6xxQ==", + "version": "18.19.86", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.86.tgz", + "integrity": "sha512-fifKayi175wLyKyc5qUfyENhQ1dCNI1UNjp653d8kuYcPQN5JhX3dGuP/XmvPTg/xRBn1VTLpbmi+H/Mr7tLfQ==", "dev": true, "license": "MIT", "dependencies": { @@ -544,9 +544,9 @@ } }, "node_modules/code-red/node_modules/@types/estree": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", - "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz", + "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==", "license": "MIT" }, "node_modules/code-red/node_modules/estree-walker": { @@ -1010,9 +1010,9 @@ } }, "node_modules/is-reference/node_modules/@types/estree": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", - "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz", + "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==", "license": "MIT" }, "node_modules/is-unicode-supported": { @@ -1418,9 +1418,9 @@ } }, "node_modules/periscopic/node_modules/@types/estree": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", - "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz", + "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==", "license": "MIT" }, "node_modules/periscopic/node_modules/estree-walker": { @@ -1694,9 +1694,9 @@ } }, "node_modules/svelte/node_modules/@types/estree": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", - "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz", + "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==", "license": "MIT" }, "node_modules/svelte/node_modules/estree-walker": { @@ -1709,9 +1709,9 @@ } }, "node_modules/svelte2tsx": { - "version": "0.7.35", - "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.35.tgz", - "integrity": "sha512-z2lnOnrfb5nrlRfFQI8Qdz03xQqMHUfPj0j8l/fQuydrH89cCeN+v9jgDwK9GyMtdTRUkE7Neu9Gh+vfXJAfuQ==", + "version": "0.7.36", + "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.36.tgz", + "integrity": "sha512-nBlERuCZRwmpebC8m0vDqZ9oaKsqW8frQS2l3zwFQW1voQIkItYtHxh1F5OTZEmE0meDIH6cxU36eIOQVOxlCw==", "license": "MIT", "dependencies": { "dedent-js": "^1.0.1", @@ -1806,9 +1806,9 @@ } }, "node_modules/typescript": { - "version": "5.8.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz", - "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==", + "version": "5.8.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz", + "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==", "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", @@ -1842,29 +1842,41 @@ "license": "MIT" }, "node_modules/vscode-css-languageservice": { - "version": "6.3.2", - "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.2.tgz", - "integrity": "sha512-GEpPxrUTAeXWdZWHev1OJU9lz2Q2/PPBxQ2TIRmLGvQiH3WZbqaNoute0n0ewxlgtjzTW3AKZT+NHySk5Rf4Eg==", + "version": "6.3.4", + "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.4.tgz", + "integrity": "sha512-qutdhFg4hnlf6IsOynwtfsN8W0Xc7g3SZd+KK9F2moUEjHtkcZoj5p8uH7BSwHx9hSEXjwKgSRRyHTXThfwAkQ==", "license": "MIT", "dependencies": { "@vscode/l10n": "^0.0.18", "vscode-languageserver-textdocument": "^1.0.12", "vscode-languageserver-types": "3.17.5", - "vscode-uri": "^3.0.8" + "vscode-uri": "^3.1.0" } }, + "node_modules/vscode-css-languageservice/node_modules/vscode-uri": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz", + "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==", + "license": "MIT" + }, "node_modules/vscode-html-languageservice": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.3.2.tgz", - "integrity": "sha512-3MgFQqVG+iQVNG7QI/slaoL7lJpne0nssX082kjUF1yn/YJa8BWCLeCJjM0YpTlp8A7JT1+J22mk4qSPx3NjSQ==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.3.3.tgz", + "integrity": "sha512-AK/jJM0VIWRrlfqkDBMZxNMnxYT5I2uoMVRoNJ5ePSplnSaT9mbYjqJlxxeLvUrOW7MEH0vVIDzU48u44QZE0w==", "license": "MIT", "dependencies": { "@vscode/l10n": "^0.0.18", "vscode-languageserver-textdocument": "^1.0.12", "vscode-languageserver-types": "^3.17.5", - "vscode-uri": "^3.0.8" + "vscode-uri": "^3.1.0" } }, + "node_modules/vscode-html-languageservice/node_modules/vscode-uri": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz", + "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==", + "license": "MIT" + }, "node_modules/vscode-jsonrpc": { "version": "8.2.0", "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz", diff --git a/pkgs/by-name/sv/svelte-language-server/package.nix b/pkgs/by-name/sv/svelte-language-server/package.nix index 9b523e4dada8..30f2d9b71990 100644 --- a/pkgs/by-name/sv/svelte-language-server/package.nix +++ b/pkgs/by-name/sv/svelte-language-server/package.nix @@ -4,7 +4,7 @@ fetchurl, }: let - version = "0.17.11"; + version = "0.17.12"; in buildNpmPackage { pname = "svelte-language-server"; @@ -12,10 +12,10 @@ buildNpmPackage { src = fetchurl { url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-${version}.tgz"; - hash = "sha256-rmyn0DjYa+DWQt6Qw8aIW0BnceIv5ZGi7VQXBBXRAHY="; + hash = "sha256-KNXaXjgIE0ryVkSxzsEoXE/1VjKPpEiMv+E2np8K6OU="; }; - npmDepsHash = "sha256-tc4AGUNKNUict31kDdx6LLbHZSYURZrHJK7d/wgfz54="; + npmDepsHash = "sha256-B8Ji9bsKKN7mem8W3Qg/oEQy9Emr5ilUKMYrMkAFS8Y="; postPatch = '' ln -s ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/sy/symbolicator/package.nix b/pkgs/by-name/sy/symbolicator/package.nix index c73dedb13297..be724331796c 100644 --- a/pkgs/by-name/sy/symbolicator/package.nix +++ b/pkgs/by-name/sy/symbolicator/package.nix @@ -10,18 +10,18 @@ rustPlatform.buildRustPackage rec { pname = "symbolicator"; - version = "25.3.0"; + version = "25.4.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "symbolicator"; rev = version; - hash = "sha256-/8Jo/M51ulrQFzXKkcFXTYfh9a3w6C5oW6A/bDFcRp0="; + hash = "sha256-TMQzrwPjQnLcIveJIwHMMbglagrtH6sNqGIbUD/Q8Xs="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-mWvCvzqTUzpxYYxf8KWjxfo4E7oS9oNVbeVxx8J3QwI="; + cargoHash = "sha256-Q148QzBHNOty/icF8oarEOD3p8cjSMA/IdjJaE9ncn8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sy/system76-firmware/package.nix b/pkgs/by-name/sy/system76-firmware/package.nix index fe4efbae8ff4..9e3e8fe0251d 100644 --- a/pkgs/by-name/sy/system76-firmware/package.nix +++ b/pkgs/by-name/sy/system76-firmware/package.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-firmware"; # Check Makefile when updating, make sure postInstall matches make install - version = "1.0.70"; + version = "1.0.71"; src = fetchFromGitHub { owner = "pop-os"; repo = "system76-firmware"; rev = version; - sha256 = "sha256-6c2OTHCTIYl/ezkWjmyb60FAdasOrV9hjd0inDc44wI="; + sha256 = "sha256-z4n1olvOSiJfHnEixUaWfz86519SntHfECOtWSeI4vk="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--workspace" ]; useFetchCargoVendor = true; - cargoHash = "sha256-mLk4EhaRaJvZk27BmjuvNy7PWbqYjUZ9uDikWmBEaz8="; + cargoHash = "sha256-YgDWaxrEfG1xxZOqa7tk2NaPVfMIqoMNZdjejkY6Jow="; # Purposefully don't install systemd unit file, that's for NixOS postInstall = '' diff --git a/pkgs/by-name/ta/tabiew/package.nix b/pkgs/by-name/ta/tabiew/package.nix index ea60b3371476..24f402dcbf6c 100644 --- a/pkgs/by-name/ta/tabiew/package.nix +++ b/pkgs/by-name/ta/tabiew/package.nix @@ -6,17 +6,17 @@ }: rustPlatform.buildRustPackage rec { pname = "tabiew"; - version = "0.8.5"; + version = "0.9.0"; src = fetchFromGitHub { owner = "shshemi"; repo = "tabiew"; rev = "v${version}"; - hash = "sha256-mBGEw3WyjEmDPo9L+CPOtMiVA+2ndQ2pjo7bUBZZO8o="; + hash = "sha256-FDHK1tEioV7KxlYhPfF+MTub45f0G+ZPvbi0CMeMBOs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-tDXTiVuQMSPewD5MwDj3pSna22Jelbi3fINszMi9P20="; + cargoHash = "sha256-xzdi3LGVC0/GxE+fmQZ9VsnCreU9tEGvDa97l9TRtfY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/tb/tbls/package.nix b/pkgs/by-name/tb/tbls/package.nix index d17bb2f496ea..3613e9e3cac2 100644 --- a/pkgs/by-name/tb/tbls/package.nix +++ b/pkgs/by-name/tb/tbls/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "tbls"; - version = "1.85.0"; + version = "1.85.1"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; tag = "v${version}"; - hash = "sha256-zXaygbcKUZ5BzTKur+K0gUGtoc4FFG0EPwl0KxaJGJo="; + hash = "sha256-68eNqSncPwtaUi/m5ccHF+o4PGxo39a1QGtyisYesoM="; }; vendorHash = "sha256-hARsbsy9us/knGg6dwNgDezjas5IC6GtL7neEZbwgvo="; diff --git a/pkgs/by-name/te/telepresence2/package.nix b/pkgs/by-name/te/telepresence2/package.nix index 67a04bac7181..07514f4687a3 100644 --- a/pkgs/by-name/te/telepresence2/package.nix +++ b/pkgs/by-name/te/telepresence2/package.nix @@ -31,13 +31,13 @@ let in buildGoModule rec { pname = "telepresence2"; - version = "2.22.3"; + version = "2.22.4"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - hash = "sha256-xrWlm5crDybvcOX3TevXcEq63Vuw0u9+4NvktIG6LxU="; + hash = "sha256-ECuu6uMsY5vZVrMJknnd5IH0BZ2yVBTKIIC/Q8RARs8="; }; propagatedBuildInputs = [ @@ -51,7 +51,7 @@ buildGoModule rec { export CGO_ENABLED=0 ''; - vendorHash = "sha256-spIdC2ZV+2tm3noyEhygoblN2BjE0w75n4I3jsrg6HI="; + vendorHash = "sha256-+l+Dtyq+9u+Lc6yF++KnX2DixVVfPX+oFUn3lq6B/1U="; ldflags = [ "-s" diff --git a/pkgs/by-name/ts/ts_query_ls/package.nix b/pkgs/by-name/ts/ts_query_ls/package.nix index aab0192fe498..2e38695c2976 100644 --- a/pkgs/by-name/ts/ts_query_ls/package.nix +++ b/pkgs/by-name/ts/ts_query_ls/package.nix @@ -6,7 +6,7 @@ }: let pname = "ts_query_ls"; - version = "1.10.0"; + version = "1.11.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage { owner = "ribru17"; repo = "ts_query_ls"; rev = "v${version}"; - hash = "sha256-3dUmHux+kXuIGao8vX0ZzVZO6fnPegQ4yqzmt2mMmOg="; + hash = "sha256-RpzQUqCaS6/MrYlVqkWaJPUgEpIBIzToMygn+TDeX88="; }; nativeBuildInputs = [ cmake ]; useFetchCargoVendor = true; - cargoHash = "sha256-14RSZC4yo76g1E2fcN22iQ9ElniNV4RZey0H2kLxoGE="; + cargoHash = "sha256-g0BVLduTWZRxNwDblvl7lm/ZduvEAbkSFYmzADMkKjg="; meta = { description = "LSP implementation for Tree-sitter's query files"; diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix index b7e25d2e6b44..a0832ad0cad5 100644 --- a/pkgs/by-name/tu/turbo-unwrapped/package.nix +++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix @@ -17,13 +17,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "turbo-unwrapped"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "vercel"; repo = "turborepo"; tag = "v${finalAttrs.version}"; - hash = "sha256-qwTFD9lIHY5sBliB5ri5AOvW5Cr/nvM+u7e7JS0CAKQ="; + hash = "sha256-sqTMiaXXkZwGI0fakDoa6HUk6hc8HG7Pi4mpk72QyHg="; }; useFetchCargoVendor = true; diff --git a/pkgs/by-name/v2/v2rayn/deps.json b/pkgs/by-name/v2/v2rayn/deps.json index bfb4fe2f56f2..6b28dfc1eb88 100644 --- a/pkgs/by-name/v2/v2rayn/deps.json +++ b/pkgs/by-name/v2/v2rayn/deps.json @@ -11,8 +11,8 @@ }, { "pname": "Avalonia", - "version": "11.2.5", - "hash": "sha256-DGTMzInnfvJUJWu2SXiRBercxxe1/paQkSlBHMahp4g=" + "version": "11.2.6", + "hash": "sha256-f+fuElhlc2dCUt/GD/Noh07JqPIA8ZtpFxdmetdPVVI=" }, { "pname": "Avalonia.Angle.Windows.Natives", @@ -31,38 +31,38 @@ }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.2.5", - "hash": "sha256-gWGIqXrac0fOnmGbovcFWv5Uj14hOyC+n0l45N7owMg=" + "version": "11.2.6", + "hash": "sha256-TeUwMcNIvXw/gMuApUODZ7nuymM6OF9cNUGSajlyfoQ=" }, { "pname": "Avalonia.Controls.DataGrid", - "version": "11.2.5", - "hash": "sha256-eGKc+UnsO5nNiUd7+n3CQW6vIWq2qpazYvYXrVTQY7s=" + "version": "11.2.6", + "hash": "sha256-69ZtybLdpGG28M6p1Cenz6PZEfdf1VKxA4wIrw5FJnI=" }, { "pname": "Avalonia.Desktop", - "version": "11.2.5", - "hash": "sha256-rDJ1NJM3tEqB7sRszj0AfplwkkvtE3Hvn7acrIsq+yw=" + "version": "11.2.6", + "hash": "sha256-PANuvQlAhDWjnv7VUzxOjz6XRmt4l/YKhVLSIP7YL24=" }, { "pname": "Avalonia.Diagnostics", - "version": "11.2.5", - "hash": "sha256-WsAMBmNfUKMB2II3AfM8A0klfJR/vgEtRUTGpgC6F3A=" + "version": "11.2.6", + "hash": "sha256-Lc9qLIywzD06I9sPXQRjLLLijDoFOVmuO5qNh301gYQ=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.2.5", - "hash": "sha256-rLzsxUQS1LLLcLWkDR8SLLwLY53vUMqgiKoDWM6PjtM=" + "version": "11.2.6", + "hash": "sha256-816li4Nj8+oNkfeMjOAtFSFS+DSo9e2S3K45xqyHJAQ=" }, { "pname": "Avalonia.Native", - "version": "11.2.5", - "hash": "sha256-XQQgcfbRRHPzH432M1KzkSEtLQof40yCt+KIrQREBY0=" + "version": "11.2.6", + "hash": "sha256-by589X1UIjeQNK0lJMLfNzF2dK+qTNT6CBJNLgG86Aw=" }, { "pname": "Avalonia.ReactiveUI", - "version": "11.2.5", - "hash": "sha256-p3ELTiH4kYdcrUF87zZzRMsOU41Q3XBCBKRmQYWdLBs=" + "version": "11.2.6", + "hash": "sha256-DsUxdEQMgpmzgRS5zkf3rqk32YL3xFN7KoQkn1Xl6WU=" }, { "pname": "Avalonia.Remote.Protocol", @@ -76,28 +76,28 @@ }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.2.5", - "hash": "sha256-Mpml6U6Fl8FUvENGQxpxuw0+pOPvoWbZXV4V1bLUS9w=" + "version": "11.2.6", + "hash": "sha256-Q2uPnR6tPFWExohhMJKnJGTet8IVpQn/HIcRurUPAHQ=" }, { "pname": "Avalonia.Skia", - "version": "11.2.5", - "hash": "sha256-su1K1RmQ+syE6ufjrzpQR1yiUa6GEtY5QPlW0GOVKnU=" + "version": "11.2.6", + "hash": "sha256-6CfDcJT707iSB9XUQRvSvr5YWMavhiYPnHwVudUl74c=" }, { "pname": "Avalonia.Themes.Simple", - "version": "11.2.5", - "hash": "sha256-EjQ2XA81SS91h8oGUwVxLYewm3Lp5Sa2Lmbj0c8y8BU=" + "version": "11.2.6", + "hash": "sha256-kE31/1tchMJ6XmEbjLr5Idc7uKBAbuhsroUMg0LQauA=" }, { "pname": "Avalonia.Win32", - "version": "11.2.5", - "hash": "sha256-ljgJgXDxmHOUQ+p8z62mtaK4FTmYAI+c+6gL2lczD/8=" + "version": "11.2.6", + "hash": "sha256-e+DNtKz4UDNqOP1vvVRqbD67n5IG9PxmGkMz7B6b7AY=" }, { "pname": "Avalonia.X11", - "version": "11.2.5", - "hash": "sha256-wHEHcEvOUyIBgBtQZOIs330KajSv8DSEsJP7w4M9i4E=" + "version": "11.2.6", + "hash": "sha256-atnfxY6vspMzvMFc9PzwWb/uPNkPx5tF3zDGKeqlGIw=" }, { "pname": "CliWrap", @@ -116,8 +116,8 @@ }, { "pname": "DynamicData", - "version": "9.0.4", - "hash": "sha256-3pyiJeWRwfaT7p1ArsoR13aI78Jo13aHOEw3BelTS9g=" + "version": "9.1.2", + "hash": "sha256-rDbtd7Fw/rhq6s9G4p/rltZ3EIR5r1RcMXsAEe7nZjw=" }, { "pname": "Fody", @@ -186,8 +186,8 @@ }, { "pname": "ReactiveUI", - "version": "20.1.63", - "hash": "sha256-fcLBYRz5WFlPYtIiLA1k/6xxxWhlclVMj7li8z04g68=" + "version": "20.2.45", + "hash": "sha256-7JzWD40/iNnp7+wuG/qEJoVXQz0T7qipq5NWJFxJ6VM=" }, { "pname": "ReactiveUI.Fody", @@ -196,13 +196,13 @@ }, { "pname": "Semi.Avalonia", - "version": "11.2.1.5", - "hash": "sha256-xomim/K3C6F0/105KCVc054AG80Z4cQw1bycHF9MD/U=" + "version": "11.2.1.6", + "hash": "sha256-E7FKQe3oQlzaza/ofmSvtrLXWo+ht7QutZKGylGW8QE=" }, { "pname": "Semi.Avalonia.DataGrid", - "version": "11.2.1.5", - "hash": "sha256-xebEht0T5hPSYhyuqbZEzHw3D7/9K920SZhnIXDrM3s=" + "version": "11.2.1.6", + "hash": "sha256-uXy8eqoENQXNpfskJgJsKW1HaThMKfMNpiJpzDc5oRo=" }, { "pname": "SkiaSharp", @@ -244,11 +244,6 @@ "version": "2.88.9", "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" }, - { - "pname": "Splat", - "version": "15.1.1", - "hash": "sha256-WipAVaUx2HrYNQ9LcYm496LndmSpVbuzJxzP9FA6Ohg=" - }, { "pname": "Splat", "version": "15.3.1", @@ -299,6 +294,11 @@ "version": "8.0.0", "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" }, + { + "pname": "System.IO.Pipelines", + "version": "9.0.2", + "hash": "sha256-uxM7J0Q/dzEsD0NGcVBsOmdHiOEawZ5GNUKBwpdiPyE=" + }, { "pname": "System.Memory", "version": "4.5.3", @@ -319,6 +319,16 @@ "version": "5.0.0", "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" }, + { + "pname": "System.Text.Encodings.Web", + "version": "9.0.2", + "hash": "sha256-tZhc/Xe+SF9bCplthph2QmQakWxKVjMfQJZzD1Xbpg8=" + }, + { + "pname": "System.Text.Json", + "version": "9.0.2", + "hash": "sha256-kftKUuGgZtF4APmp77U79ws76mEIi+R9+DSVGikA5y8=" + }, { "pname": "TaskScheduler", "version": "2.12.1", @@ -331,8 +341,8 @@ }, { "pname": "WebDav.Client", - "version": "2.8.0", - "hash": "sha256-hINrSLAqy20lC0AtHgc/qfMA6iPrhZ265vpwdr6lkEY=" + "version": "2.9.0", + "hash": "sha256-/ffcn87aItoi7K3Pdjh6Ktn6/72uGhUnQGi+yqHryJI=" }, { "pname": "YamlDotNet", diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix index e15b100c337b..81c3828b9792 100644 --- a/pkgs/by-name/v2/v2rayn/package.nix +++ b/pkgs/by-name/v2/v2rayn/package.nix @@ -21,13 +21,13 @@ buildDotnetModule rec { pname = "v2rayn"; - version = "7.10.5"; + version = "7.11.1"; src = fetchFromGitHub { owner = "2dust"; repo = "v2rayN"; tag = version; - hash = "sha256-5tLO7KVHj0DXQdJg02Jxs6fgRLJSfFWPbARg9dqKcSI="; + hash = "sha256-oDjZwVBgTmBQQEl9A0eWZEFq1in82ercSLtoQeVS3k0="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/va/vault/package.nix b/pkgs/by-name/va/vault/package.nix index dd994b9b7475..1e6a7a4e7c56 100644 --- a/pkgs/by-name/va/vault/package.nix +++ b/pkgs/by-name/va/vault/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "vault"; - version = "1.19.1"; + version = "1.19.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - hash = "sha256-VbSGzEGMlmVaia+ZhhRWTkKBGmimLGI40JuWREgeh4I="; + hash = "sha256-8i00QdBcqpLy6qgInIWZ91Fqs4dWmamA8lmlqVR5TeI="; }; - vendorHash = "sha256-O8H/marfVSN47bmRAxuMEJXEXLE0HL9vj10yeGrm93I="; + vendorHash = "sha256-oZhYIsDGxTGQwJGkq1tFUSMBB6240XLG2pm8/2PMA3s="; proxyVendor = true; diff --git a/pkgs/by-name/vs/vscode-extension-update/package.nix b/pkgs/by-name/vs/vscode-extension-update/package.nix new file mode 100644 index 000000000000..b0d73e775bc1 --- /dev/null +++ b/pkgs/by-name/vs/vscode-extension-update/package.nix @@ -0,0 +1,5 @@ +{ + writeScriptBin, +}: + +writeScriptBin "vscode-extension-update" (builtins.readFile ./vscode_extension_update.py) diff --git a/pkgs/by-name/vs/vscode-extensions-update/vscode-extensions-update-script.nix b/pkgs/by-name/vs/vscode-extension-update/vscode-extension-update-script.nix similarity index 61% rename from pkgs/by-name/vs/vscode-extensions-update/vscode-extensions-update-script.nix rename to pkgs/by-name/vs/vscode-extension-update/vscode-extension-update-script.nix index af432feb58e4..5fcf904653c9 100644 --- a/pkgs/by-name/vs/vscode-extensions-update/vscode-extensions-update-script.nix +++ b/pkgs/by-name/vs/vscode-extension-update/vscode-extension-update-script.nix @@ -1,6 +1,6 @@ { lib, - vscode-extensions-update, + vscode-extension-update, }: { @@ -8,6 +8,6 @@ extraArgs ? [ ], }: -[ "${lib.getExe vscode-extensions-update}" ] +[ "${lib.getExe vscode-extension-update}" ] ++ lib.optionals (attrPath != null) [ attrPath ] ++ extraArgs diff --git a/pkgs/by-name/vs/vscode-extensions-update/vscode_extensions_batch_update.py b/pkgs/by-name/vs/vscode-extension-update/vscode_extension_batch_update.py similarity index 82% rename from pkgs/by-name/vs/vscode-extensions-update/vscode_extensions_batch_update.py rename to pkgs/by-name/vs/vscode-extension-update/vscode_extension_batch_update.py index 057065ace59f..7d85cde5a9c2 100755 --- a/pkgs/by-name/vs/vscode-extensions-update/vscode_extensions_batch_update.py +++ b/pkgs/by-name/vs/vscode-extension-update/vscode_extension_batch_update.py @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python3 -p nix python3 python3Packages.loguru nix-search-tv vscode-extensions-update gitMinimal +#! nix-shell -i python3 -p nix python3 python3Packages.loguru nix-search-tv vscode-extension-update gitMinimal import argparse import subprocess @@ -21,6 +21,7 @@ class VSCodeExtensionBatchUpdater: "vscode-extensions.ms-ceintl.vscode-language-pack-it", "vscode-extensions.ms-ceintl.vscode-language-pack-ja", "vscode-extensions.ms-ceintl.vscode-language-pack-ko", + "vscode-extensions.ms-ceintl.vscode-language-pack-pl", "vscode-extensions.ms-ceintl.vscode-language-pack-pt-br", "vscode-extensions.ms-ceintl.vscode-language-pack-qps-ploc", "vscode-extensions.ms-ceintl.vscode-language-pack-ru", @@ -39,13 +40,6 @@ class VSCodeExtensionBatchUpdater: self.parser = argparse.ArgumentParser( description="Batch update VSCode extensions" ) - # By default, update command skips extensions with updateScript or need '--platforms' - self.parser.add_argument( - "--platforms", - action="store_true", - help="add '--platforms' to update command from some extensions", - ) - self.platforms = self.parser.parse_args().platforms def execute_command( self, command, env: dict[str, str] = None, shell: bool = False @@ -75,10 +69,6 @@ class VSCodeExtensionBatchUpdater: except subprocess.CalledProcessError: return False - def _has_platform_source(self, extension: str) -> bool: - source_url = self._get_nix_attribute(f"{extension}.src.url") - return "targetPlatform=" in source_url - def _get_nix_attribute(self, attribute: str) -> str: return self.execute_command(["nix", "eval", "--raw", "-f", ".", attribute]) @@ -92,12 +82,7 @@ class VSCodeExtensionBatchUpdater: try: if self._has_update_script(extension): return - update_command = ["vscode-extensions-update", extension, "--commit"] - if self._has_platform_source(extension): - if self.platforms: - update_command.append("--platforms") - else: - return + update_command = ["vscode-extension-update", extension, "--commit"] filename = self._get_extension_filename(extension) if filename: update_command.extend(["--override-filename", filename]) diff --git a/pkgs/by-name/vs/vscode-extensions-update/vscode_extensions_update.py b/pkgs/by-name/vs/vscode-extension-update/vscode_extension_update.py similarity index 94% rename from pkgs/by-name/vs/vscode-extensions-update/vscode_extensions_update.py rename to pkgs/by-name/vs/vscode-extension-update/vscode_extension_update.py index a8d8cbf17e2c..979e44a3bcee 100755 --- a/pkgs/by-name/vs/vscode-extensions-update/vscode_extensions_update.py +++ b/pkgs/by-name/vs/vscode-extension-update/vscode_extension_update.py @@ -34,11 +34,6 @@ class VSCodeExtensionUpdater: action="store_true", help="allow check pre-release versions", ) - self.parser.add_argument( - "--platforms", - action="store_true", - help="set system according to meta.platforms for nix-update", - ) self.parser.add_argument( "--commit", action="store_true", help="commit the updated package" ) @@ -58,18 +53,16 @@ class VSCodeExtensionUpdater: f"{self.extension_publisher}.{self.extension_name}" ) self.nix_system = self.get_nix_system() - self.nix_systems = self._get_nix_vscode_extension_platforms() or [ + nix_vscode_extension_platforms = self._get_nix_vscode_extension_platforms() + if not nix_vscode_extension_platforms and self._has_platform_source(): + logger.error("Error: not found meta.platforms.") + sys.exit(1) + self.nix_vscode_extension_platforms = nix_vscode_extension_platforms or [ self.nix_system ] - if not self.args.platforms: - self.nix_systems = ( - [self.nix_system] - if self.nix_system in self.nix_systems - else self.nix_systems[:1] - ) - if self.nix_system in self.nix_systems: - self.nix_systems.remove(self.nix_system) - self.nix_systems.insert(0, self.nix_system) + if self.nix_system in self.nix_vscode_extension_platforms: + self.nix_vscode_extension_platforms.remove(self.nix_system) + self.nix_vscode_extension_platforms.insert(0, self.nix_system) self.supported_nix_systems = self.get_supported_nix_systems() logger.info(f"VSCode version: {self.target_vscode_version}") logger.info(f"Extension Marketplace ID: {self.extension_marketplace_id}") @@ -118,6 +111,10 @@ class VSCodeExtensionUpdater: extra_platforms = value.strip("[]").replace('"', "").split() return ([system] if system is not None else []) + extra_platforms + def _has_platform_source(self) -> bool: + source_url = self._get_nix_attribute(f"{self.attribute_path}.src.url") + return "targetPlatform=" in source_url + def _get_nix_vscode_extension_src_hash(self, system: str) -> str: url = self.execute_command( [ @@ -411,7 +408,8 @@ class VSCodeExtensionUpdater: f"Total versions found for {self.extension_marketplace_id}: {len(available_versions)}" ) self.new_version = self.find_compatible_extension_version( - available_versions, self.get_target_platform(self.nix_systems[0]) + available_versions, + self.get_target_platform(self.nix_vscode_extension_platforms[0]), ) try: self.execute_command( @@ -420,7 +418,7 @@ class VSCodeExtensionUpdater: except subprocess.CalledProcessError: logger.info("Already up to date or new version is older!") sys.exit(0) - for i, system in enumerate(self.nix_systems): + for i, system in enumerate(self.nix_vscode_extension_platforms): version = self.new_version if i == 0 else "skip" self.run_nix_update(version, system) if self.commit: diff --git a/pkgs/by-name/vs/vscode-extensions-update/package.nix b/pkgs/by-name/vs/vscode-extensions-update/package.nix deleted file mode 100644 index 80c333ddf23d..000000000000 --- a/pkgs/by-name/vs/vscode-extensions-update/package.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - writeScriptBin, -}: - -writeScriptBin "vscode-extensions-update" (builtins.readFile ./vscode_extensions_update.py) diff --git a/pkgs/development/compilers/dart/sources.nix b/pkgs/development/compilers/dart/sources.nix index 5fcc0a68849c..7f04adc298cb 100644 --- a/pkgs/development/compilers/dart/sources.nix +++ b/pkgs/development/compilers/dart/sources.nix @@ -1,27 +1,27 @@ let - version = "3.7.2"; + version = "3.7.3"; 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"; - sha256 = "1bj9libb4bnmgm4544876xz512i1nvp73fbxrs4jz0xfp398c206"; + sha256 = "02g8pdirn9bsmqmmrnwxv2x9ynxpsk5i3k03jicc04wz4xzkxa4q"; }; "${version}-aarch64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip"; - sha256 = "0z35ndh7mdaz1dnd2yvv5g50jbfy563yclgfjlx9k400b7cn6vhh"; + sha256 = "1334zb9nkvv9m5kplhynkl518ys1c2j844zwsx8v7181i38pjr7b"; }; "${version}-aarch64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip"; - sha256 = "1a2cwr3qyy8paxjhgb1xwcv4rm1ml0dfv1byl5zynmz0c6nwqlil"; + sha256 = "1bbqzz4kab7nyspl6i0pah17x9h9yjbpa7kzxqz8ijkzs966ym0n"; }; "${version}-x86_64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "133q4jz5wszs0bja7pnfgjd7mvawdspgz866ip3m0v351zbzs5n2"; + sha256 = "1cl236ihrigp277x0yh628f3k1qf7c99iyfgxns0ikrggn0a4wmp"; }; "${version}-i686-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip"; - sha256 = "0y3slablp94lbcm9bafg0p407axrdqxf33vpxc420ifqczpidmh2"; + sha256 = "1da185r7d0s83h4v7waqg3yb5k9pqbmlcvgr1wfjhzd17m686cc2"; }; } diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix index a4fd44accf6f..b5d6f5a7b8be 100644 --- a/pkgs/development/libraries/embree/2.x.nix +++ b/pkgs/development/libraries/embree/2.x.nix @@ -5,24 +5,26 @@ cmake, pkg-config, ispc, - tbb, + tbb_2020_3, glfw, openimageio_2, libjpeg, libpng, libpthreadstubs, libX11, + python3Packages, + nix-update-script, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "embree"; - version = "2.17.4"; + version = "2.17.7"; src = fetchFromGitHub { owner = "embree"; repo = "embree"; - rev = "v2.17.4"; - sha256 = "0q3r724r58j4b6cbyy657fsb78z7a2c7d5mwdp7552skynsn2mn9"; + tag = "v${finalAttrs.version}"; + hash = "sha256-FD/ITZBJnYy1F+x4jLTVTsGsNKy/mS7OYWP06NoHZqc="; }; cmakeFlags = [ "-DEMBREE_TUTORIALS=OFF" ]; @@ -33,7 +35,8 @@ stdenv.mkDerivation { ]; buildInputs = [ ispc - tbb + # tbb_2021_0 is not backward compatible + tbb_2020_3 glfw openimageio_2 libjpeg @@ -41,11 +44,28 @@ stdenv.mkDerivation { libX11 libpthreadstubs ]; + + passthru = { + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "v(2.*)" + ]; + }; + tbb = tbb_2020_3; + tests = { + inherit (python3Packages) embreex; + }; + }; + meta = with lib; { description = "High performance ray tracing kernels from Intel"; homepage = "https://embree.github.io/"; - maintainers = with maintainers; [ hodapp ]; + maintainers = with maintainers; [ + hodapp + pbsds + ]; license = licenses.asl20; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/development/python-modules/beanhub-cli/default.nix b/pkgs/development/python-modules/beanhub-cli/default.nix index 31d3fae9ede1..a5f907098e8e 100644 --- a/pkgs/development/python-modules/beanhub-cli/default.nix +++ b/pkgs/development/python-modules/beanhub-cli/default.nix @@ -51,6 +51,10 @@ buildPythonPackage rec { hash = "sha256-mGLg6Kgur2LAcujFzO/rkSPAC2t3wR5CO2AeOO0+bFI="; }; + pythonRelaxDeps = [ + "rich" + ]; + build-system = [ poetry-core ]; dependencies = [ diff --git a/pkgs/development/python-modules/django-celery-beat/default.nix b/pkgs/development/python-modules/django-celery-beat/default.nix index 5dd5a914aeef..e4bed5b213f3 100644 --- a/pkgs/development/python-modules/django-celery-beat/default.nix +++ b/pkgs/development/python-modules/django-celery-beat/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "django-celery-beat"; - version = "2.7.0"; + version = "2.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "celery"; repo = "django-celery-beat"; tag = "v${version}"; - hash = "sha256-XWcmKQXNw8eoGkld77E3rHpR9ofa1i2qO/JI8Hnpi9M="; + hash = "sha256-PWTWFcmjeY0T6dmLzMDN3gqgJaYx1kWy1VJKlWxY+io="; }; pythonRelaxDeps = [ "django" ]; @@ -58,7 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Celery Periodic Tasks backed by the Django ORM"; homepage = "https://github.com/celery/django-celery-beat"; - changelog = "https://github.com/celery/django-celery-beat/releases/tag/v${version}"; + changelog = "https://github.com/celery/django-celery-beat/releases/tag/${src.tag}"; license = licenses.bsd3; maintainers = with maintainers; [ onny ]; }; diff --git a/pkgs/development/python-modules/django-cms/default.nix b/pkgs/development/python-modules/django-cms/default.nix index bec6596c64a7..a33caa7b8024 100644 --- a/pkgs/development/python-modules/django-cms/default.nix +++ b/pkgs/development/python-modules/django-cms/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "django-cms"; - version = "4.1.5"; + version = "4.1.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "django-cms"; repo = "django-cms"; tag = version; - hash = "sha256-XxLg6IkoC/LT6eCeEx8Bd4u2Q63fObD/lv8p1+jhYdw="; + hash = "sha256-KowhiJz84hR5VqW+WNIBEhC+X9zPE1opDWygFfsFfPE="; }; patches = [ diff --git a/pkgs/development/python-modules/embreex/default.nix b/pkgs/development/python-modules/embreex/default.nix new file mode 100644 index 000000000000..38b2904a2cbf --- /dev/null +++ b/pkgs/development/python-modules/embreex/default.nix @@ -0,0 +1,72 @@ +{ + lib, + fetchFromGitHub, + fetchpatch, + buildPythonPackage, + embree2, + cython, + numpy, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "embreex"; + version = "2.17.7.post6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "trimesh"; + repo = "embreex"; + tag = version; + hash = "sha256-iLIfhngorSFOdkOvlCAJQXGQrVuRfBSDGzvjXOlQuHk="; + }; + + patches = [ + # https://github.com/trimesh/embreex/pull/7 + (fetchpatch { + name = "fix-use-after-free.patch"; + url = "https://github.com/trimesh/embreex/commit/c6b047285419f8986fae962e2734a01522be7ef7.patch"; + hash = "sha256-s8x2vsqbsIR3aoNUDrYs2vQttuNY8lLJ6TC7H8FMRyQ="; + }) + ]; + + build-system = [ + setuptools + numpy + cython + ]; + + dependencies = [ + numpy + ]; + + buildInputs = [ + embree2 + embree2.tbb + ]; + + pythonImportsCheck = [ + "embreex" + "embreex.mesh_construction" + "embreex.rtcore" + "embreex.rtcore_scene" + "embreex.triangles" + ]; + + preCheck = '' + # conflicts with $out + rm -rf embreex/ + ''; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "Maintained PyEmbree fork, wrapper for Embree v2"; + homepage = "https://github.com/trimesh/embreex"; + changelog = "https://github.com/trimesh/embreex/releases/tag/${src.tag}"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ pbsds ]; + inherit (embree2.meta) platforms; + }; +} diff --git a/pkgs/development/python-modules/fnv-hash-fast/default.nix b/pkgs/development/python-modules/fnv-hash-fast/default.nix index f6ef01b847c4..ec767a4a1620 100644 --- a/pkgs/development/python-modules/fnv-hash-fast/default.nix +++ b/pkgs/development/python-modules/fnv-hash-fast/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "fnv-hash-fast"; - version = "1.4.0"; + version = "1.5.0"; pyproject = true; src = fetchFromGitHub { owner = "bdraco"; repo = "fnv-hash-fast"; tag = "v${version}"; - hash = "sha256-gowKpqB3qXnqS2H+/v8fWL6kn680a8Dt5BZNNcVqT6U="; + hash = "sha256-yhn39QEIZQqY/6W2rhUff45tQzap9N6OPiP/Z9oEz8U="; }; build-system = [ diff --git a/pkgs/development/python-modules/ghostscript/default.nix b/pkgs/development/python-modules/ghostscript/default.nix new file mode 100644 index 000000000000..34d88bd2c91d --- /dev/null +++ b/pkgs/development/python-modules/ghostscript/default.nix @@ -0,0 +1,63 @@ +{ + stdenv, + lib, + buildPythonPackage, + fetchFromGitLab, + pytestCheckHook, + + setuptools, + + ghostscript_headless, +}: + +buildPythonPackage rec { + pname = "ghostscript"; + version = "0.7"; + pyproject = true; + + src = fetchFromGitLab { + owner = "pdftools"; + repo = "python-ghostscript"; + tag = "v${version}"; + hash = "sha256-yBJuAnLK/4YDU9PBsSWPQay4pDws3bP+3rCplysq41w="; + }; + + postPatch = + let + extLib = stdenv.hostPlatform.extensions.sharedLibrary; + in + '' + substituteInPlace ghostscript/__init__.py \ + --replace-fail '__version__ = gs.__version__' '__version__ = "${version}"' + + substituteInPlace ghostscript/_gsprint.py \ + --replace-fail 'cdll.LoadLibrary("libgs.so")' 'cdll.LoadLibrary("${lib.getLib ghostscript_headless}/lib/libgs${extLib}")' + ''; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # Some tests don't (fully) match anymore. + # Not sure if ghostscript ever promised to keep producing the same outputs, bit-by-bit… + "test_simple" + "test_unicode_arguments" + "test_run_string" + "test_stdin" + ]; + + pythonImportsCheck = [ "ghostscript" ]; + + meta = { + description = "Interface to the Ghostscript C-API using ctypes."; + homepage = "https://gitlab.com/pdftools/python-ghostscript"; + changelog = "https://gitlab.com/pdftools/python-ghostscript/-/blob/v${version}/CHANGES.txt"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ flokli ]; + }; +} diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index 1d29ce17352a..08f676729163 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -1,5 +1,6 @@ { lib, + pkgs, buildPythonPackage, fetchFromGitea, fetchpatch, @@ -10,7 +11,6 @@ pillow, stdenv, exiftool, - ghostscript, imagemagick, mupdf-headless, netpbm, @@ -67,7 +67,7 @@ buildPythonPackage rec { nativeCheckInputs = [ exiftool - ghostscript + pkgs.ghostscript imagemagick mupdf-headless netpbm diff --git a/pkgs/development/python-modules/lancedb/default.nix b/pkgs/development/python-modules/lancedb/default.nix index 28dcdb583228..1f946f440893 100644 --- a/pkgs/development/python-modules/lancedb/default.nix +++ b/pkgs/development/python-modules/lancedb/default.nix @@ -13,22 +13,18 @@ protobuf, # dependencies - attrs, - cachetools, deprecation, - nest-asyncio, overrides, packaging, + pyarrow, pydantic, - pylance, - requests, - retry, tqdm, # tests aiohttp, pandas, polars, + pylance, pytest-asyncio, pytestCheckHook, duckdb, @@ -37,21 +33,21 @@ buildPythonPackage rec { pname = "lancedb"; - version = "0.19.0"; + version = "0.21.2"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lancedb"; tag = "python-v${version}"; - hash = "sha256-AvISt9YpnHFrxRQYkkycXmsHSRs9QcBUe0DLXMYGrEI="; + hash = "sha256-ZPVkMlZz6lSF4ZCIX6fGcfCvni3kXCLPLXZqZw7icpE="; }; buildAndTestSubdir = "python"; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-0mBCBQTv9nsHiQDUrZfm5+ZUGp3A2k8+DH/T85Vq2KA="; + hash = "sha256-Q3ejJsddHLGGbw3peLRtjPqBrS6fNi0C3K2UWpcM/4k="; }; build-system = [ rustPlatform.maturinBuildHook ]; @@ -72,16 +68,11 @@ buildPythonPackage rec { ]; dependencies = [ - attrs - cachetools deprecation - nest-asyncio overrides packaging + pyarrow pydantic - pylance - requests - retry tqdm ]; @@ -92,6 +83,7 @@ buildPythonPackage rec { duckdb pandas polars + pylance pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix index d273c815aeae..26877a858eed 100644 --- a/pkgs/development/python-modules/llm/default.nix +++ b/pkgs/development/python-modules/llm/default.nix @@ -6,6 +6,7 @@ pythonOlder, setuptools, click-default-group, + condense-json, numpy, openai, pip, @@ -16,13 +17,14 @@ pyyaml, sqlite-migrate, cogapp, + pytest-asyncio, pytest-httpx, sqlite-utils, }: let llm = buildPythonPackage rec { pname = "llm"; - version = "0.23"; + version = "0.24.2"; pyproject = true; build-system = [ setuptools ]; @@ -33,13 +35,14 @@ let owner = "simonw"; repo = "llm"; tag = version; - hash = "sha256-jUWhdLZLHgrIP7trHvLBETQ764+k4ze5Swt2HYMqg4E="; + hash = "sha256-G5XKau8sN/AW9icSmJW9ht0wP77QdJkT5xmn7Ej4NeU="; }; patches = [ ./001-disable-install-uninstall-commands.patch ]; dependencies = [ click-default-group + condense-json numpy openai pip @@ -56,6 +59,7 @@ let nativeCheckInputs = [ cogapp numpy + pytest-asyncio pytest-httpx pytestCheckHook ]; diff --git a/pkgs/development/python-modules/oras/default.nix b/pkgs/development/python-modules/oras/default.nix index d6f8524c6fae..d3ad961a3c10 100644 --- a/pkgs/development/python-modules/oras/default.nix +++ b/pkgs/development/python-modules/oras/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "oras"; - version = "0.2.28"; + version = "0.2.29"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "oras-project"; repo = "oras-py"; tag = version; - hash = "sha256-JUKInJDBR9Qnqg04FDG2SlktSRRWCf30+96tDuhYc1Y="; + hash = "sha256-+31DTtUie+Ve5H3jx/8AFzJ5YHPQzOKN3+fq2ujtj28="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pdfplumber/default.nix b/pkgs/development/python-modules/pdfplumber/default.nix index 5130c287c9c1..3678634fd942 100644 --- a/pkgs/development/python-modules/pdfplumber/default.nix +++ b/pkgs/development/python-modules/pdfplumber/default.nix @@ -1,8 +1,8 @@ { lib, + pkgs, buildPythonPackage, fetchFromGitHub, - ghostscript, jupyterlab, nbexec, pandas, @@ -42,7 +42,7 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ - ghostscript + pkgs.ghostscript jupyterlab nbexec pandas diff --git a/pkgs/development/python-modules/pydyf/default.nix b/pkgs/development/python-modules/pydyf/default.nix index 46a001bb1c26..8f9b12f17c0a 100644 --- a/pkgs/development/python-modules/pydyf/default.nix +++ b/pkgs/development/python-modules/pydyf/default.nix @@ -1,9 +1,9 @@ { + pkgs, lib, buildPythonPackage, fetchPypi, flit-core, - ghostscript, pillow, pytestCheckHook, pytest-cov-stub, @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core ]; nativeCheckInputs = [ - ghostscript + pkgs.ghostscript pillow pytestCheckHook pytest-cov-stub diff --git a/pkgs/development/python-modules/pyinstaller/default.nix b/pkgs/development/python-modules/pyinstaller/default.nix index 878387fadeae..7202152b21b9 100644 --- a/pkgs/development/python-modules/pyinstaller/default.nix +++ b/pkgs/development/python-modules/pyinstaller/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "pyinstaller"; - version = "6.12.0"; + version = "6.13.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-GDR5e+SM4bJgFa9oves8YabHUAE28E4Pxl5GgRXex3c="; + hash = "sha256-OJEf7sLF4hXlFZp+Zv2xJAAWi9EWFDtUqKejfwhzNFY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pylsqpack/default.nix b/pkgs/development/python-modules/pylsqpack/default.nix index ec9aa62cd5eb..fd9de0a6b2cc 100644 --- a/pkgs/development/python-modules/pylsqpack/default.nix +++ b/pkgs/development/python-modules/pylsqpack/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pylsqpack"; - version = "0.3.19"; + version = "0.3.20"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Up+j49bxsO7JK0NFA8DsVRy3FAI8wXEJEfZl+raobr0="; + hash = "sha256-4tgSjvH0VcGYzo6tnXD4rKklM6bqUTSB8eXrVGoruDQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-transip/default.nix b/pkgs/development/python-modules/python-transip/default.nix new file mode 100644 index 000000000000..95c3997123c1 --- /dev/null +++ b/pkgs/development/python-modules/python-transip/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, + requests, + cryptography, + responses, +}: +buildPythonPackage rec { + pname = "python-transip"; + version = "0.6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "roaldnefs"; + repo = "python-transip"; + tag = "v${version}"; + hash = "sha256-HjlUwItkR81dyFGfY/YbHXI5k/IWUgzfikw5i4+yNWU="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + requests + cryptography + ]; + + pythonImportsCheck = [ + "transip" + ]; + + nativeCheckInputs = [ + responses + pytestCheckHook + ]; + + meta = { + description = "Python wrapper for the TransIP REST API V6"; + homepage = "https://github.com/roaldnefs/python-transip"; + changelog = "https://github.com/roaldnefs/python-transip/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.lgpl3; + maintainers = [ lib.maintainers.provokateurin ]; + }; +} diff --git a/pkgs/development/python-modules/tlds/default.nix b/pkgs/development/python-modules/tlds/default.nix index 4000c35e3558..15fd3eeb3708 100644 --- a/pkgs/development/python-modules/tlds/default.nix +++ b/pkgs/development/python-modules/tlds/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "tlds"; - version = "2025022800"; + version = "2025042400"; pyproject = true; src = fetchFromGitHub { owner = "kichik"; repo = "tlds"; tag = version; - hash = "sha256-USFuifbcSET5Kfz8xPsJDTKxYKfqaB9RXegVz8FM5m4="; + hash = "sha256-SxiV0EVOECxNjq+v8dCKtm+zcAvNdG6HwsQzUpmVaos="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index da0e9394e585..8f0345058067 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -1,5 +1,6 @@ { lib, + python, buildPythonPackage, fetchFromGitHub, setuptools, @@ -7,6 +8,7 @@ pythonOlder, numpy, lxml, + trimesh, }: buildPythonPackage rec { @@ -27,6 +29,31 @@ buildPythonPackage rec { dependencies = [ numpy ]; + optional-dependencies = with python.pkgs; { + easy = + [ + colorlog + manifold3d + charset-normalizer + lxml + jsonschema + networkx + svg-path + pycollada + shapely + xxhash + rtree + httpx + scipy + pillow + # vhacdx # not packaged + mapbox-earcut + ] + ++ lib.optionals embreex.meta.available [ + embreex + ]; + }; + nativeCheckInputs = [ lxml pytestCheckHook @@ -39,7 +66,19 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests/test_minimal.py" ]; - pythonImportsCheck = [ "trimesh" ]; + pythonImportsCheck = [ + "trimesh" + "trimesh.ray" + "trimesh.path" + "trimesh.path.exchange" + "trimesh.scene" + "trimesh.voxel" + "trimesh.visual" + "trimesh.viewer" + "trimesh.exchange" + "trimesh.resources" + "trimesh.interfaces" + ]; meta = { description = "Python library for loading and using triangular meshes"; diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index 36824cdcc2ff..696bee47ac5f 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -1,4 +1,7 @@ { + stdenv, + lib, + pkgs, buildPythonPackage, cffi, cssselect2, @@ -6,10 +9,8 @@ flit-core, fontconfig, fonttools, - ghostscript, glib, harfbuzz, - lib, pango, pillow, pydyf, @@ -18,7 +19,6 @@ pytestCheckHook, pythonOlder, replaceVars, - stdenv, tinycss2, tinyhtml5, }: @@ -61,7 +61,7 @@ buildPythonPackage rec { ] ++ fonttools.optional-dependencies.woff; nativeCheckInputs = [ - ghostscript + pkgs.ghostscript pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix index 0786c3cb6e56..312d10a60c62 100644 --- a/pkgs/development/tools/alloy/default.nix +++ b/pkgs/development/tools/alloy/default.nix @@ -37,7 +37,7 @@ let buildCommand = '' jar=$out/share/alloy/${pname}.jar - install -Dm644 ${src} $jar + install -Dm644 $src $jar mkdir -p $out/bin makeWrapper ${jre}/bin/java $out/bin/${pname} --add-flags \ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 85d3cca07570..3bcdee618429 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -515,7 +515,6 @@ python.pkgs.buildPythonApplication rec { pytest-aiohttp pytest-freezer pytest-mock - pytest-rerunfailures pytest-socket pytest-timeout pytest-unordered @@ -540,15 +539,16 @@ python.pkgs.buildPythonApplication rec { pytestFlagsArray = [ # assign tests grouped by file to workers "--dist loadfile" - # retry racy tests that end in "RuntimeError: Event loop is closed" - "--reruns 3" - "--only-rerun RuntimeError" # enable full variable printing on error "--showlocals" # AssertionError: assert 1 == 0 "--deselect tests/test_config.py::test_merge" # checks whether pip is installed "--deselect=tests/util/test_package.py::test_check_package_fragment" + # flaky + "--deselect=tests/test_bootstrap.py::test_setup_hass_takes_longer_than_log_slow_startup" + "--deselect=tests/test_test_fixtures.py::test_evict_faked_translations" + "--deselect=tests/helpers/test_backup.py::test_async_get_manager" # tests are located in tests/ "tests" ]; diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index 7c2ad7f12dd6..7173b606e2f1 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "snmp_exporter"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "snmp_exporter"; rev = "v${version}"; - sha256 = "sha256-/uNmY4xON9VFXEi4njAC5nD1RVWn+nUr1oQnt9w8pmQ="; + sha256 = "sha256-eM3R4wNsBeGscaTzqdrj9ceiKFjRF3F78SWDamNMEYM="; }; - vendorHash = "sha256-WSqkuRzeSctO+modNHBGBD3HvhrSXFlmsdfB/3lS5sw="; + vendorHash = "sha256-C5iY3hBqepxLkGwPDVmnDf/ugF4h5y8scEomU9mkMEM="; buildInputs = [ net-snmp ]; diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix index 763e534a5697..21a307b0b4ba 100644 --- a/pkgs/servers/varnish/digest.nix +++ b/pkgs/servers/varnish/digest.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Digest and HMAC vmod"; homepage = "https://github.com/varnish/libvmod-digest"; - inherit (varnish.meta) license platforms maintainers; + inherit (varnish.meta) license platforms teams; }; } diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix index da1df5fc50a6..c98d9f0fb0b2 100644 --- a/pkgs/servers/varnish/dynamic.nix +++ b/pkgs/servers/varnish/dynamic.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation { meta = with lib; { description = "Dynamic director similar to the DNS director from Varnish 3"; homepage = "https://github.com/nigoroll/libvmod-dynamic"; - inherit (varnish.meta) license platforms maintainers; + inherit (varnish.meta) license platforms teams; }; } diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix index c1cdb0277016..ad0b47915810 100644 --- a/pkgs/servers/varnish/modules.nix +++ b/pkgs/servers/varnish/modules.nix @@ -46,7 +46,7 @@ let meta = with lib; { description = "Collection of Varnish Cache modules (vmods) by Varnish Software"; homepage = "https://github.com/varnish/varnish-modules"; - inherit (varnish.meta) license platforms maintainers; + inherit (varnish.meta) license platforms teams; }; }; in diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix index 379e3cb22a07..cba3c24f70d8 100644 --- a/pkgs/tools/graphics/mangohud/default.nix +++ b/pkgs/tools/graphics/mangohud/default.nix @@ -15,7 +15,7 @@ addDriverRunpath, appstream, glslang, - mako, + python3Packages, meson, ninja, pkg-config, @@ -31,7 +31,7 @@ libXrandr, x11Support ? true, waylandSupport ? true, - nvidiaSupport ? true, + nvidiaSupport ? lib.meta.availableOn stdenv.hostPlatform libXNVCtrl, gamescopeSupport ? true, mangoappSupport ? gamescopeSupport, mangohudctlSupport ? gamescopeSupport, @@ -173,21 +173,17 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonBool "mangohudctl" mangohudctlSupport) ]; - nativeBuildInputs = - [ - addDriverRunpath - glslang - mako - meson - ninja - pkg-config - unzip - ] - # Only the headers are used from these packages - # The corresponding libraries are loaded at runtime from the app's runpath - ++ lib.optional x11Support libX11 - ++ lib.optional waylandSupport wayland - ++ lib.optional nvidiaSupport libXNVCtrl; + strictDeps = true; + + nativeBuildInputs = [ + addDriverRunpath + glslang + python3Packages.mako + meson + ninja + pkg-config + unzip + ]; buildInputs = [ @@ -195,6 +191,9 @@ stdenv.mkDerivation (finalAttrs: { nlohmann_json spdlog ] + ++ lib.optional waylandSupport wayland + ++ lib.optional x11Support libX11 + ++ lib.optional nvidiaSupport libXNVCtrl ++ lib.optional (x11Support || waylandSupport) libxkbcommon ++ lib.optionals mangoappSupport [ glew diff --git a/pkgs/tools/networking/octodns/providers/transip/default.nix b/pkgs/tools/networking/octodns/providers/transip/default.nix new file mode 100644 index 000000000000..70557d0ae799 --- /dev/null +++ b/pkgs/tools/networking/octodns/providers/transip/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + octodns, + pytestCheckHook, + setuptools, + python-transip, +}: +buildPythonPackage rec { + pname = "octodns-transip"; + version = "0.0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "octodns"; + repo = "octodns-transip"; + tag = "v${version}"; + hash = "sha256-Mq5UwhU7hPK3RgD3TWz6l8Qjtv7VN5TP+3b4ESN2jGs="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + octodns + python-transip + ]; + + env.OCTODNS_RELEASE = 1; + + pythonImportsCheck = [ + "octodns_transip" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "octoDNS provider that targets Transip DNS"; + homepage = "https://github.com/octodns/octodns-transip"; + changelog = "https://github.com/octodns/octodns-transip/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.provokateurin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f734cf38307..5002d615414d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -428,6 +428,7 @@ with pkgs; powerdns = python3Packages.callPackage ../tools/networking/octodns/providers/powerdns { }; cloudflare = python3Packages.callPackage ../tools/networking/octodns/providers/cloudflare { }; ddns = python3Packages.callPackage ../tools/networking/octodns/providers/ddns { }; + transip = python3Packages.callPackage ../tools/networking/octodns/providers/transip { }; }; oletools = with python3.pkgs; toPythonApplication oletools; @@ -4030,7 +4031,6 @@ with pkgs; mangohud = callPackage ../tools/graphics/mangohud { libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; mangohud32 = pkgsi686Linux.mangohud; - inherit (python3Packages) mako; }; marimo = with python3Packages; toPythonApplication marimo; @@ -15228,8 +15228,8 @@ with pkgs; vscode-extensions = recurseIntoAttrs (callPackage ../applications/editors/vscode/extensions { }); - vscode-extensions-update-script = - callPackage ../by-name/vs/vscode-extensions-update/vscode-extensions-update-script.nix + vscode-extension-update-script = + callPackage ../by-name/vs/vscode-extension-update/vscode-extension-update-script.nix { }; vscodium = callPackage ../applications/editors/vscode/vscodium.nix { }; @@ -15292,7 +15292,7 @@ with pkgs; webcord = callPackage ../by-name/we/webcord/package.nix { electron = electron_34; }; - webcord-vencord = callPackage ../by-name/we/webcord-vencord/package.nix { electron = electron_33; }; + webcord-vencord = callPackage ../by-name/we/webcord-vencord/package.nix { electron = electron_34; }; webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs { stdenv = if stdenv.cc.isClang then gccStdenv else stdenv; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 096ca732ded6..a892ef4faa30 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4406,6 +4406,8 @@ self: super: with self; { embrace = callPackage ../development/python-modules/embrace { }; + embreex = callPackage ../development/python-modules/embreex { }; + emcee = callPackage ../development/python-modules/emcee { }; emoji = callPackage ../development/python-modules/emoji { }; @@ -5540,6 +5542,8 @@ self: super: with self; { ghome-foyer-api = callPackage ../development/python-modules/ghome-foyer-api { }; + ghostscript = callPackage ../development/python-modules/ghostscript { }; + ghp-import = callPackage ../development/python-modules/ghp-import { }; ghrepo-stats = callPackage ../development/python-modules/ghrepo-stats { }; @@ -14196,6 +14200,8 @@ self: super: with self; { python-toolbox = callPackage ../development/python-modules/python-toolbox { }; + python-transip = callPackage ../development/python-modules/python-transip { }; + python-troveclient = callPackage ../development/python-modules/python-troveclient { }; python-trovo = callPackage ../development/python-modules/python-trovo { };