diff --git a/nixos/modules/services/web-apps/strichliste.nix b/nixos/modules/services/web-apps/strichliste.nix index 4f7db7cd31da..e32a2a169169 100644 --- a/nixos/modules/services/web-apps/strichliste.nix +++ b/nixos/modules/services/web-apps/strichliste.nix @@ -246,6 +246,16 @@ in }; }; + splitInvoice = { + enabled = mkOption { + type = types.bool; + default = true; + description = '' + Whether to allow splitting invoices. + ''; + }; + }; + transaction = { enabled = mkOption { type = types.bool; @@ -464,26 +474,22 @@ in wants = unitDependencies; after = unitDependencies; inherit (cfg) environment; - preStart = '' - set -ex - if [ ! -e "/var/lib/strichliste/.db-init" ]; then - ${lib.optionalString (lib.hasInfix "sqlite" cfg.environment.DATABASE_URL) '' - ${lib.getExe cfg.packages.backend} doctrine:database:create - ''} - ${lib.getExe cfg.packages.backend} doctrine:schema:create - touch "/var/lib/strichliste/.db-init" - fi - ''; serviceConfig = { - Type = "exec"; + Type = "oneshot"; User = "strichliste"; Group = "strichliste"; EnvironmentFile = cfg.environmentFiles; - ExecStart = toString [ - (lib.getExe cfg.packages.backend) - "doctrine:migrations:migrate" - "--allow-no-migration" - "--no-interaction" + ExecStart = map toString [ + [ + (lib.getExe cfg.packages.backend) + "cache:clear" + ] + [ + (lib.getExe cfg.packages.backend) + "doctrine:migrations:migrate" + "--allow-no-migration" + "--no-interaction" + ] ]; }; }; diff --git a/nixos/modules/system/boot/kernel_config.nix b/nixos/modules/system/boot/kernel_config.nix index 2cf34e899cae..115b55d98143 100644 --- a/nixos/modules/system/boot/kernel_config.nix +++ b/nixos/modules/system/boot/kernel_config.nix @@ -29,9 +29,7 @@ let }; freeform = mkOption { - type = types.nullOr types.str // { - merge = mergeEqualOption; - }; + type = types.nullOr types.str; default = null; example = ''MMC_BLOCK_MINORS.freeform = "32";''; description = '' diff --git a/nixos/tests/web-apps/strichliste.nix b/nixos/tests/web-apps/strichliste.nix index 36c3617af50e..71ff7fa20479 100644 --- a/nixos/tests/web-apps/strichliste.nix +++ b/nixos/tests/web-apps/strichliste.nix @@ -7,38 +7,36 @@ name = "strichliste"; meta.maintainers = pkgs.strichliste.meta.maintainers; - nodes = { - server = - { config, ... }: - { - networking.extraHosts = '' - 127.0.0.1 strichliste.local - ''; + containers.server = + { config, ... }: + { + networking.extraHosts = '' + 127.0.0.1 strichliste.local + ''; - environment.systemPackages = with pkgs; [ httpie ]; + environment.systemPackages = with pkgs; [ httpie ]; - time.timeZone = "Europe/Berlin"; + time.timeZone = "Europe/Berlin"; - services.strichliste = { - enable = true; - domain = "strichliste.local"; - environmentFiles = [ - (pkgs.writeText "strichliste-secret.env" '' - APP_SECRET=changemechangemechangeme - '') - ]; - settings = { - i18n = { - currency = { - alpha3 = "EUR"; - name = "Euro"; - symbol = "€"; - }; + services.strichliste = { + enable = true; + domain = "strichliste.local"; + environmentFiles = [ + (pkgs.writeText "strichliste-secret.env" '' + APP_SECRET=changemechangemechangeme + '') + ]; + settings = { + i18n = { + currency = { + alpha3 = "EUR"; + name = "Euro"; + symbol = "€"; }; }; }; }; - }; + }; testScript = { @@ -52,12 +50,12 @@ start_all() def get_users(): - response = server.succeed("http --check-status http://strichliste.local/api/user") + response = server.succeed("http --ignore-stdin --check-status http://strichliste.local/api/user") users = json.loads(response)["users"] return users def get_user(uid: int): - response = server.succeed(f"http --check-status http://strichliste.local/api/user/{uid}") + response = server.succeed(f"http --ignore-stdin --check-status http://strichliste.local/api/user/{uid}") user = json.loads(response)["user"] return user @@ -67,7 +65,7 @@ t.assertEqual(len(users), 0, "Strichliste must not have users.") with subtest("Create user"): - server.succeed("http --check-status post http://strichliste.local/api/user name=Alice") + server.succeed("http --ignore-stdin --check-status post http://strichliste.local/api/user name=Alice") users = get_users() t.assertEqual(len(users), 1, "Strichliste must have exactly one user.") @@ -77,27 +75,27 @@ t.assertEqual(user["balance"], 0, "New users should have a balance of 0") with subtest("Deposit money"): - server.succeed("http --check-status post http://strichliste.local/api/user/1/transaction amount=500") + server.succeed("http --ignore-stdin --check-status post http://strichliste.local/api/user/1/transaction amount=500") user = get_user(1) t.assertEqual(user["balance"], 500, "Balance must be 500 after depositing 500") with subtest("Dispense money"): - server.succeed("http --check-status post http://strichliste.local/api/user/1/transaction amount=-1000") + server.succeed("http --ignore-stdin --check-status post http://strichliste.local/api/user/1/transaction amount=-1000") user = get_user(1) t.assertEqual(user["balance"], -500, "Balance must be -500 after dispensing 1000") with subtest("Undo transaction"): - response = server.succeed("http --check-status post http://strichliste.local/api/user/1/transaction amount=7500") + response = server.succeed("http --ignore-stdin --check-status post http://strichliste.local/api/user/1/transaction amount=7500") transaction = json.loads(response)["transaction"] - server.succeed(f"http --check-status delete http://strichliste.local/api/user/1/transaction/{transaction['id']}") + server.succeed(f"http --ignore-stdin --check-status delete http://strichliste.local/api/user/1/transaction/{transaction['id']}") server.wait_for_unit("phpfpm-strichliste.service") # frontend - server.wait_until_succeeds("http --check-status http://strichliste.local/ | grep -q 'Strichliste'") + server.wait_until_succeeds("http --ignore-stdin --check-status http://strichliste.local/ | grep -q 'Strichliste'") # backend - server.wait_until_succeeds("http --check-status http://strichliste.local/api/settings") + server.wait_until_succeeds("http --ignore-stdin --check-status http://strichliste.local/api/settings") # sqlite test() diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 2aad4186b645..69e9299af06e 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -7169,6 +7169,20 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + harpoon-lualine = buildVimPlugin { + pname = "harpoon-lualine"; + version = "0-unstable-2025-07-28"; + src = fetchFromGitHub { + owner = "letieu"; + repo = "harpoon-lualine"; + rev = "215c0847dfb787b19268f7b42eed83bdcf06b966"; + hash = "sha256-HGbz/b2AVl8145BCy8I47dDrhBVMSQQIr+mWbOrmj5Q="; + }; + meta.homepage = "https://github.com/letieu/harpoon-lualine/"; + meta.license = unfree; + meta.hydraPlatforms = [ ]; + }; + harpoon2 = buildVimPlugin { pname = "harpoon2"; version = "0-unstable-2025-10-31"; @@ -8164,6 +8178,20 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + jujutsu-nvim = buildVimPlugin { + pname = "jujutsu.nvim"; + version = "0-unstable-2026-05-14"; + src = fetchFromGitHub { + owner = "yannvanhalewyn"; + repo = "jujutsu.nvim"; + rev = "17ab008d71cbcd31f8c2891e11cb758579f597c0"; + hash = "sha256-KygJ73YZNPtTfECWyrwK86AfO7jXDEfIMFia3yvorM0="; + }; + meta.homepage = "https://github.com/yannvanhalewyn/jujutsu.nvim/"; + meta.license = getLicenseFromSpdxId "MIT"; + meta.hydraPlatforms = [ ]; + }; + jule-nvim = buildVimPlugin { pname = "jule.nvim"; version = "0-unstable-2025-12-26"; @@ -11231,6 +11259,20 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + neotest-bun = buildVimPlugin { + pname = "neotest-bun"; + version = "0-unstable-2026-01-05"; + src = fetchFromGitHub { + owner = "Arthur944"; + repo = "neotest-bun"; + rev = "af0f8684cd00a96f1e0359f1aeff2b9bf7a0ec88"; + hash = "sha256-Y1I0zW8S8/Fz46rPIkHzTGbm7C8BXOfjq+V19YrzPlo="; + }; + meta.homepage = "https://github.com/Arthur944/neotest-bun/"; + meta.license = getLicenseFromSpdxId "MIT"; + meta.hydraPlatforms = [ ]; + }; + neotest-ctest = buildVimPlugin { pname = "neotest-ctest"; version = "0.3.0"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index a1989d0e7c17..d2c94557c544 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -150,7 +150,6 @@ let }" overrides; in - assertNoAdditions { # keep-sorted start case=no block=yes newline_separated=yes ack-vim = super.ack-vim.overrideAttrs (old: { @@ -1579,7 +1578,6 @@ assertNoAdditions { ]; dependencies = [ self.fzf-vim ]; passthru = old.passthru // { - initLua = "vim.g.hoogle_fzf_cache_file = vim.fn.stdpath('cache')..'/hoogle_cache.json"; }; }); @@ -1778,6 +1776,13 @@ assertNoAdditions { dependencies = [ self.plenary-nvim ]; }; + harpoon-lualine = super.harpoon-lualine.overrideAttrs { + dependencies = [ + self.lualine-nvim + self.harpoon2 + ]; + }; + harpoon2 = super.harpoon2.overrideAttrs { dependencies = [ self.plenary-nvim ]; nvimSkipModules = [ @@ -2809,6 +2814,13 @@ assertNoAdditions { ]; }; + neotest-bun = super.neotest-bun.overrideAttrs { + dependencies = with self; [ + neotest + nvim-nio + ]; + }; + neotest-ctest = super.neotest-ctest.overrideAttrs { dependencies = with self; [ neotest @@ -4122,7 +4134,6 @@ assertNoAdditions { } ''; }; - }); rtorrent-syntax-file = super.rtorrent-syntax-file.overrideAttrs (old: { @@ -4419,6 +4430,7 @@ assertNoAdditions { # the vim plugin expects evinceSync.py to be a python file, but it is a C wrapper pythonWrapper = writeText "evinceSync-wrapper.py" # python + '' #!${python3}/bin/python3 import os @@ -4824,7 +4836,6 @@ assertNoAdditions { --replace-fail "['tinymist'] = nil," "tinymist = '${lib.getExe tinymist}'," \ --replace-fail "['websocat'] = nil," "websocat = '${lib.getExe websocat}'," ''; - }; unicode-vim = diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 9d98d2d27261..0e9fd99fc7c1 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -510,6 +510,7 @@ https://github.com/TheSnakeWitcher/hardhat.nvim/,, https://github.com/m4xshen/hardtime.nvim/,, https://git.sr.ht/~sircmpwn/hare.vim,, https://github.com/ThePrimeagen/harpoon/,, +https://github.com/letieu/harpoon-lualine/,, https://github.com/ThePrimeagen/harpoon/,harpoon2,harpoon2 https://github.com/kiyoon/haskell-scope-highlighting.nvim/,, https://github.com/mrcjkb/haskell-snippets.nvim/,, @@ -581,6 +582,7 @@ https://github.com/NicolasGB/jj.nvim/,, https://github.com/vito-c/jq.vim/,, https://github.com/neoclide/jsonc.vim/,, https://git.myzel394.app/Myzel394/jsonfly.nvim,, +https://github.com/yannvanhalewyn/jujutsu.nvim/,, https://github.com/julelang/jule.nvim/,, https://github.com/JuliaEditorSupport/julia-vim/,, https://github.com/GCBallesteros/jupytext.nvim/,, @@ -800,6 +802,7 @@ https://github.com/Shougo/neosnippet.vim/,, https://github.com/kawre/neotab.nvim/,, https://github.com/kassio/neoterm/,, https://github.com/rcasia/neotest-bash/,, +https://github.com/Arthur944/neotest-bun/,, https://github.com/orjangj/neotest-ctest/,, https://github.com/sidlatau/neotest-dart/,, https://github.com/MarkEmmons/neotest-deno/,, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 90e532d1ed90..caa8e1ba1c2c 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3967,8 +3967,8 @@ let publisher = "rocq-prover"; name = "vsrocq"; # When updating the version here, also update the language server vsrocq-language-server - version = "2.3.4"; - hash = "sha256-2zYoCUtyhboQt68UJEmWOvrTrIOV2QmpaXU5mUhJfsA="; + version = "2.4.3"; + hash = "sha256-o9rsSDCDYRWZQBMDA7DtWay50tBI76kw7H7CivrZpKo="; }; meta = { description = "VsRocq is an extension for Visual Studio Code with support for the Rocq Prover"; diff --git a/pkgs/by-name/_8/_86box/package.nix b/pkgs/by-name/_8/_86box/package.nix index d83bb8b0f2c5..9c2af3bc015f 100644 --- a/pkgs/by-name/_8/_86box/package.nix +++ b/pkgs/by-name/_8/_86box/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, cmake, kdePackages, pkg-config, @@ -21,6 +20,7 @@ discord-gamesdk, libpcap, libslirp, + libserialport, wayland, wayland-scanner, libsndfile, @@ -41,24 +41,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "86box"; - version = "5.3"; + version = "6.0"; src = fetchFromGitHub { owner = "86Box"; repo = "86Box"; tag = "v${finalAttrs.version}"; - hash = "sha256-n68Ghhsv15TzpOMH4dBTNxa6AYwqN5s2C5pyO9VVaco="; + hash = "sha256-Qm7y/7LpBopti0K+jrC9TgORfFGjFYP/4rYPr7802gw="; }; patches = [ ./darwin.patch - # Fix build: Only make the fallthrough define available in C code - # https://github.com/86Box/86Box/issues/6607 - (fetchpatch { - name = "fix-fallthrough-define-c-only.patch"; - url = "https://github.com/86Box/86Box/commit/0092ce15de3efac108b961882f870a8c05e8c38f.patch"; - hash = "sha256-DqjOtnyk6Zv9XHCLeuxD1wcLfvjGwGFvUWS0alXcchs="; - }) ]; postPatch = '' @@ -87,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: { jack2 libpcap libslirp + libserialport qt5.qtbase qt5.qttools libsndfile @@ -105,6 +99,9 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF" + # On Darwin, 86Box ignores pkg-config for libserialport and links + # $LIBSERIALPORT_ROOT/lib/libserialport.dylib directly, so point it at the store path. + ++ lib.optional stdenv.hostPlatform.isDarwin "-DLIBSERIALPORT_ROOT=${libserialport}" ++ lib.optional enableNewDynarec "-DNEW_DYNAREC=ON" ++ lib.optional enableVncRenderer "-DVNC=ON" ++ lib.optional (!enableDynarec) "-DDYNAREC=OFF" @@ -114,9 +111,9 @@ stdenv.mkDerivation (finalAttrs: { lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm644 -t $out/share/applications $src/src/unix/assets/net.86box.86Box.desktop - for size in 48 64 72 96 128 192 256 512; do - install -Dm644 -t $out/share/icons/hicolor/"$size"x"$size"/apps \ - $src/src/unix/assets/"$size"x"$size"/net.86box.86Box.png + for icon in $src/src/unix/assets/*x*/net.86box.86Box.png; do + size=$(basename "$(dirname "$icon")") + install -Dm644 -t $out/share/icons/hicolor/"$size"/apps "$icon" done; '' + lib.optionalString unfreeEnableRoms '' @@ -129,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "86Box"; repo = "roms"; tag = "v${finalAttrs.version}"; - hash = "sha256-7/xhhT29ijGNVlW7oJXdyJuhUwVs0b4dIUjc3lVtNEY="; + hash = "sha256-AjFxyxW6Op4w637k5AXPtibqablVoPK03Axh2h2JWdI="; }; updateScript = ./update.sh; }; diff --git a/pkgs/by-name/an/anytype-cli/package.nix b/pkgs/by-name/an/anytype-cli/package.nix index 1c7b8b4e8722..7c112e42cb8e 100644 --- a/pkgs/by-name/an/anytype-cli/package.nix +++ b/pkgs/by-name/an/anytype-cli/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { __structuredAttrs = true; pname = "anytype-cli"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "anyproto"; repo = "anytype-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-9jJ4FV4ASUrhUvW/lI4qs7AmK06OkPfnD0+okl5blrs="; + hash = "sha256-t1EdNrXmG1kTMx17Ni5jM81V1bfZTGA2jMDm+wdqKAE="; }; - vendorHash = "sha256-7J/nW4Jn2vdAs8sN+rV3wg6nV3JhtQrnLwlxNI0uja0="; + vendorHash = "sha256-/yF5niHBEPKvIGoWUVvZ00vrEaxG5s3kK5uFNdGCYcA="; proxyVendor = true; env.CGO_ENABLED = 1; diff --git a/pkgs/by-name/bo/bodyclose/package.nix b/pkgs/by-name/bo/bodyclose/package.nix deleted file mode 100644 index cdf353e7b586..000000000000 --- a/pkgs/by-name/bo/bodyclose/package.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - unstableGitUpdater, -}: - -buildGoModule { - pname = "bodyclose"; - version = "0-unstable-2024-12-22"; - - src = fetchFromGitHub { - owner = "timakin"; - repo = "bodyclose"; - rev = "1db5c5ca4d6719fe28430df1ae8d337ee2ac09c7"; - hash = "sha256-s5bWvpV6gHGEsuiNXJl2ZuyDaffD82/rCbusov3zsyw="; - }; - - vendorHash = "sha256-8grdJuV8aSETsJr2VazC/3ctfnGh3UgjOWD4/xf3uC8="; - - ldflags = [ - "-s" - "-w" - ]; - - passthru.updateScript = unstableGitUpdater { }; - - meta = { - description = "Golang linter to check whether HTTP response body is closed and a re-use of TCP connection is not blocked"; - mainProgram = "bodyclose"; - homepage = "https://github.com/timakin/bodyclose"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ meain ]; - }; -} diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index e7b6b4190de9..1fded730bd27 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -19,7 +19,7 @@ }: let stdenv = stdenvNoCC; - baseUrl = "https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases"; + baseUrl = "https://downloads.claude.ai/claude-code-releases"; manifest = lib.importJSON ./manifest.json; platformKey = "${stdenv.hostPlatform.node.platform}-${stdenv.hostPlatform.node.arch}"; platformManifestEntry = manifest.platforms.${platformKey}; diff --git a/pkgs/by-name/cl/claude-code/update.sh b/pkgs/by-name/cl/claude-code/update.sh index 1e2125a74625..fd0e340365a5 100755 --- a/pkgs/by-name/cl/claude-code/update.sh +++ b/pkgs/by-name/cl/claude-code/update.sh @@ -5,7 +5,7 @@ set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" -BASE_URL="https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases" +BASE_URL="https://downloads.claude.ai/claude-code-releases" VERSION="${1:-$(curl -fsSL "$BASE_URL/latest")}" diff --git a/pkgs/by-name/cr/crc/package.nix b/pkgs/by-name/cr/crc/package.nix index e3497b0cd54a..dc35dffb6f76 100644 --- a/pkgs/by-name/cr/crc/package.nix +++ b/pkgs/by-name/cr/crc/package.nix @@ -8,16 +8,16 @@ }: let - openShiftVersion = "4.21.4"; - okdVersion = "4.21.0-okd-scos.5"; - microshiftVersion = "4.21.0"; + openShiftVersion = "4.21.14"; + okdVersion = "4.21.0-okd-scos.8"; + microshiftVersion = "4.21.7"; writeKey = "$(MODULEPATH)/pkg/crc/segment.WriteKey=cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp"; - gitCommit = "e90757a62cf73025d22e2bcdc7b04bf5e5e9a0e0"; - gitHash = "sha256-0Rs+kpuiCQzgLKpZ4fkspZEiH/cnkkN3jdObgAK9hGw="; + gitCommit = "6eb443d169c5a6dd461db1181f95506aa429f34b"; + gitHash = "sha256-sVByFqYvPLrpG90GYigLEDemaJVF2fj+tSgERmmRzsM="; in buildGoModule (finalAttrs: { pname = "crc"; - version = "2.59.0"; + version = "2.61.0"; src = fetchFromGitHub { owner = "crc-org"; diff --git a/pkgs/by-name/da/davis/package.nix b/pkgs/by-name/da/davis/package.nix index f4b66521c282..30b4805bac3f 100644 --- a/pkgs/by-name/da/davis/package.nix +++ b/pkgs/by-name/da/davis/package.nix @@ -7,17 +7,17 @@ php.buildComposerProject2 (finalAttrs: { pname = "davis"; - version = "5.3.0"; + version = "5.4.2"; src = fetchFromGitHub { owner = "tchapi"; repo = "davis"; tag = "v${finalAttrs.version}"; - hash = "sha256-YLVfcoC8cIcCfi7R2zWXNxD4P+KIXOCL+MqFEt2Z7Tc="; + hash = "sha256-ZoNd4RvHKdKhfWZN8KrDBGvRbLG6SWUytVEuCQRlnG4="; }; composerNoPlugins = false; - vendorHash = "sha256-VpINHPy2gwA5dk8OGQjmWnCpS9JVyEAUG+bptggCybk="; + vendorHash = "sha256-Cpwr8YP1WiMW/ki7WK4zu88ycULP31vXbsqnzYEFHKs="; postInstall = '' chmod -R u+w $out/share diff --git a/pkgs/by-name/dd/ddcutil-service/package.nix b/pkgs/by-name/dd/ddcutil-service/package.nix index 497ddc511397..0eb2febe4aee 100644 --- a/pkgs/by-name/dd/ddcutil-service/package.nix +++ b/pkgs/by-name/dd/ddcutil-service/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ddcutil-service"; - version = "1.0.14"; + version = "1.0.15"; src = fetchFromGitHub { owner = "digitaltrails"; repo = "ddcutil-service"; rev = "v${finalAttrs.version}"; - hash = "sha256-IZ6s9z0zxMZT7qd+yuQJGLnKc1WISIvhJlIGsM/Dw3w="; + hash = "sha256-r66Ua+4jGl1wFEX3RoRHN60GujNApGbDHtJnVDtP3Z4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/dq/dq/package.nix b/pkgs/by-name/dq/dq/package.nix index f43d7b08e4e5..ae9db4717ede 100644 --- a/pkgs/by-name/dq/dq/package.nix +++ b/pkgs/by-name/dq/dq/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dq"; - version = "20251001"; + version = "20260601"; src = fetchFromGitHub { owner = "janmojzis"; repo = "dq"; tag = finalAttrs.version; - hash = "sha256-+3NGtHx9DI7s3V8aIJkW25apYAoFuLuiQ4TGsr981c8="; + hash = "sha256-hXDRmCtQuRWk9bViffjojaDf2S57HlHBBobuLFC9nzM="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/gh/ghex/package.nix b/pkgs/by-name/gh/ghex/package.nix index 9a1e8de811c5..b060d9b1b31d 100644 --- a/pkgs/by-name/gh/ghex/package.nix +++ b/pkgs/by-name/gh/ghex/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "ghex"; - version = "50.0"; + version = "50.2"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/ghex/${lib.versions.major finalAttrs.version}/ghex-${finalAttrs.version}.tar.xz"; - hash = "sha256-gyXKSx+nU3XPiVHmL4Z/pqhCgiwt1aRqmHc2CBizAhI="; + hash = "sha256-QTTSMYsqqtx6s90z4H1+bb8xZjzvW/0tIbqQ3tX1hKs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hy/hyprshell/package.nix b/pkgs/by-name/hy/hyprshell/package.nix index 507d1c9b52ce..3845463b8b1e 100644 --- a/pkgs/by-name/hy/hyprshell/package.nix +++ b/pkgs/by-name/hy/hyprshell/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hyprshell"; - version = "4.10.4"; + version = "4.10.6"; src = fetchFromGitHub { owner = "H3rmt"; repo = "hyprshell"; tag = "v${finalAttrs.version}"; - hash = "sha256-33qau/UP4CHBwL/6damFBTjsy/6gX8Nuh87uuhmqVfA="; + hash = "sha256-ud3tZngQzl6eupFCSvpcEdNuOA/g7bmkWWO+3h7V1mg="; }; - cargoHash = "sha256-6m0ZvZBO30DbhcBJQWBx3PoHeZuS2FKiGJhcJx1eEfo="; + cargoHash = "sha256-gPZZWz6ihBgpcnLvzwE4b4AvNph5Euaomm220n/0GA8="; nativeBuildInputs = [ wrapGAppsHook4 diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix index 495ecff0c54e..f3e71e4eb565 100644 --- a/pkgs/by-name/li/lint-staged/package.nix +++ b/pkgs/by-name/li/lint-staged/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "lint-staged"; - version = "17.0.5"; + version = "17.0.7"; src = fetchFromGitHub { owner = "okonet"; repo = "lint-staged"; rev = "v${version}"; - hash = "sha256-W9OW4ylRhgeUq7AlJlSkfN0IKv8Us6IEhmfE08UXzH8="; + hash = "sha256-oh4t1MlCs006W8oL0ljrNnckGfGqZOkER6J/FigoOZs="; }; - npmDepsHash = "sha256-ifz75kaLfDq42cdnN7eel/HtG6Fmr+1BFbD0b1vcjCA="; + npmDepsHash = "sha256-MCFfmIXoFk2RyXg19Aho3MLf/W3hYGPelRhLka7lQWc="; dontNpmBuild = true; diff --git a/pkgs/by-name/ma/mathjax/package.nix b/pkgs/by-name/ma/mathjax/package.nix index 1bbe418c7726..a7f6bc9c3590 100644 --- a/pkgs/by-name/ma/mathjax/package.nix +++ b/pkgs/by-name/ma/mathjax/package.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "mathjax"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitHub { owner = "mathjax"; repo = "mathjax"; tag = finalAttrs.version; - hash = "sha256-ptM7dLG4wc9XoYOtn0R92LVH4J0tbP8J/0TpGqrVIaQ="; + hash = "sha256-x4aRA1EDBpx/PmWF8YmWs1Le7yX/hJo0Egrhc/nrWsE="; }; installPhase = '' diff --git a/pkgs/by-name/ma/maven/build-maven-package.nix b/pkgs/by-name/ma/maven/build-maven-package.nix index f737507ddb73..afa25872e976 100644 --- a/pkgs/by-name/ma/maven/build-maven-package.nix +++ b/pkgs/by-name/ma/maven/build-maven-package.nix @@ -20,6 +20,15 @@ let version, mvnJdk ? jdk, mvnHash ? "", + /** + Maven goal to execute. Normally the the default should be used, but some special cases need other goals. + */ + mvnGoal ? "package", + /** + Set the Maven offline argument, `-o`. Normally the default is preferred, but to call `mvn deploy` with + a directory destination `-o` must be removed. In that case we rely on the Nix sandbox to keep things hermetic. + */ + mvnOffline ? true, mvnFetchExtraArgs ? { }, mvnDepsParameters ? "", manualMvnArtifacts ? [ ], @@ -143,7 +152,9 @@ let mvnDeps=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd) runHook afterDepsSetup - mvn package -o -nsu "-Dmaven.repo.local=$mvnDeps/.m2" ${mvnSkipTests} ${mvnParameters} + mvn ${mvnGoal} ${ + if mvnOffline then "-o" else "" + } -nsu "-Dmaven.repo.local=$mvnDeps/.m2" ${mvnSkipTests} ${mvnParameters} runHook postBuild ''; diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix index 5dba16159a22..6f7675405b2e 100644 --- a/pkgs/by-name/mu/mullvad-browser/package.nix +++ b/pkgs/by-name/mu/mullvad-browser/package.nix @@ -123,12 +123,6 @@ let }; } ); - - policiesJson = writeText "policies.json" ( - builtins.toJSON { - policies.DisableAppUpdate = true; - } - ); in stdenv.mkDerivation rec { pname = "mullvad-browser"; @@ -200,7 +194,7 @@ stdenv.mkDerivation rec { mv mullvadbrowser.real mullvadbrowser # store state at `~/.mullvad` instead of relative to executable - touch "$MB_IN_STORE/system-install" + touch "$MB_IN_STORE/is-packaged-app" # Add bundled libraries to libPath. libPath=${libPath}:$MB_IN_STORE @@ -282,7 +276,6 @@ stdenv.mkDerivation rec { # Install distribution customizations install -Dvm644 ${distributionIni} $out/share/mullvad-browser/distribution/distribution.ini - install -Dvm644 ${policiesJson} $out/share/mullvad-browser/distribution/policies.json runHook postInstall ''; diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index 84491ae199d9..8a3b39bf0c54 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -26,20 +26,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "n8n"; - version = "2.20.6"; + version = "2.22.5"; src = fetchFromGitHub { owner = "n8n-io"; repo = "n8n"; tag = "n8n@${finalAttrs.version}"; - hash = "sha256-c0O6tC+QDhHN3nmzXqNwhAM4+NoFYVO1mtO3V348hDs="; + hash = "sha256-YF6VJLA+y8pcAE3RwTub1XjPVfeh8cR+3TQqb3VvV5U="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-ft7n3J7L+u2hwEiR32Jw2k0ZsHCfI5yIB+IfmtB8xMY="; + hash = "sha256-lAe3GuZRdzEwOXWmpBtF7YfGvA4XJumLf80uDYS6j30="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/n8/n8n/update.sh b/pkgs/by-name/n8/n8n/update.sh index 74ce4a18986d..501aecf308f0 100755 --- a/pkgs/by-name/n8/n8n/update.sh +++ b/pkgs/by-name/n8/n8n/update.sh @@ -2,9 +2,7 @@ #!nix-shell --pure -i bash -p bash curl jq nix-update cacert git set -euo pipefail -new_version="$(curl -s 'https://api.github.com/repos/n8n-io/n8n/releases?per_page=30' | \ - jq -r ' - map(select(.prerelease | not) | .tag_name | select(startswith("n8n@")) | sub("^n8n@"; "")) - | sort_by(split(".") | map(tonumber)) | last - ')" +new_version="$(curl -s ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} \ + 'https://api.github.com/repos/n8n-io/n8n/releases/latest' | + jq -r '.tag_name | sub("^n8n@"; "")')" nix-update n8n --version "$new_version" diff --git a/pkgs/by-name/ni/nimmm/lock.json b/pkgs/by-name/ni/nimmm/lock.json index f21abc4d2954..8b8025308375 100644 --- a/pkgs/by-name/ni/nimmm/lock.json +++ b/pkgs/by-name/ni/nimmm/lock.json @@ -35,6 +35,18 @@ "sha256": "06b9ylqbjcxgm9mjfzljbi8gr9sbajykcqpcxgyqymynqyhxmqjn", "srcDir": "src", "url": "https://github.com/shoyu777/wcwidth-nim/archive/86f8db1a883f6a64e590a56aed81e788389b7196.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "tinyre" + ], + "path": "/nix/store/w556rbsnv2fxb229av2iq180ri9x0d9j-source", + "ref": "1.6.0", + "rev": "77469f58916369bc3863194cabb05238577fb257", + "sha256": "18wjz5yqzr1dz6286p2w02fk2xjr54l477g90bz4pskjcqrqnjbv", + "srcDir": "", + "url": "https://github.com/khchen/tinyre/archive/77469f58916369bc3863194cabb05238577fb257.tar.gz" } ] } diff --git a/pkgs/by-name/ni/nimmm/package.nix b/pkgs/by-name/ni/nimmm/package.nix index 3a5dcb628108..f1e261d043c7 100644 --- a/pkgs/by-name/ni/nimmm/package.nix +++ b/pkgs/by-name/ni/nimmm/package.nix @@ -8,20 +8,19 @@ buildNimPackage (finalAttrs: { pname = "nimmm"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "joachimschmidt557"; repo = "nimmm"; rev = "v${finalAttrs.version}"; - hash = "sha256-yq91rQlX6bfYHHw72+8m53PCD7hViLe56jAwPTeBBcg="; + hash = "sha256-NK2OH5eAlcityUdz9p95Y7iNOX39ed0Krdns1+2NKLU="; }; lockFile = ./lock.json; buildInputs = [ termbox - pcre ]; meta = { diff --git a/pkgs/by-name/ni/nixfmt/generated-package.nix b/pkgs/by-name/ni/nixfmt/generated-package.nix index 15d12a654017..e1c3e1c67fd1 100644 --- a/pkgs/by-name/ni/nixfmt/generated-package.nix +++ b/pkgs/by-name/ni/nixfmt/generated-package.nix @@ -24,10 +24,10 @@ }: mkDerivation { pname = "nixfmt"; - version = "1.2.0"; + version = "1.3.1"; src = fetchzip { - url = "https://github.com/nixos/nixfmt/archive/v1.2.0.tar.gz"; - sha256 = "1qvj1sddh7bgggqnj7cnhvfh4iz1pwzc9a9awc1g7y349yvpwad3"; + url = "https://github.com/nixos/nixfmt/archive/v1.3.1.tar.gz"; + sha256 = "1c0iz6hrzafld8vkldcmall7fvby6xgzzqgap8c3bxwhaxhq86hm"; }; isLibrary = true; isExecutable = true; @@ -58,6 +58,6 @@ mkDerivation { jailbreak = true; homepage = "https://github.com/NixOS/nixfmt"; description = "Official formatter for Nix code"; - license = lib.licenses.mpl20; + license = lib.meta.getLicenseFromSpdxId "MPL-2.0"; mainProgram = "nixfmt"; } diff --git a/pkgs/by-name/ni/nixfmt/package.nix b/pkgs/by-name/ni/nixfmt/package.nix index 93a198f73f2a..c12ec5d2ed4f 100644 --- a/pkgs/by-name/ni/nixfmt/package.nix +++ b/pkgs/by-name/ni/nixfmt/package.nix @@ -2,27 +2,32 @@ haskell, haskellPackages, lib, - runCommand, - nixfmt, + stdenv, + versionCheckHook, }: let inherit (haskell.lib.compose) overrideCabal justStaticExecutables; - overrides = { + cabalOverrides = drv: { passthru.updateScript = ./update.sh; - teams = [ lib.teams.formatter ]; - - # These tests can be run with the following command. - # - # $ nix-build -A nixfmt.tests - passthru.tests = runCommand "nixfmt-tests" { nativeBuildInputs = [ nixfmt ]; } '' - nixfmt --version > $out - ''; + changelog = "https://github.com/NixOS/nixfmt/releases/tag/v${drv.version}"; }; + + # haskellPackages.mkDerivation and haskell.lib.compose.overrideCabal + # do not allow access to `doInstallCheck` or `nativeInstallCheckInputs`, + # so we override directly with `.overrideAttrs`. + lateOverrides = finalAttrs: prevAttrs: { + doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + nativeInstallCheckInputs = prevAttrs.nativeInstallCheckInputs or [ ] ++ [ + versionCheckHook + ]; + }; + raw-pkg = haskellPackages.callPackage ./generated-package.nix { }; in lib.pipe raw-pkg [ - (overrideCabal overrides) + (overrideCabal cabalOverrides) justStaticExecutables + (drv: drv.overrideAttrs lateOverrides) ] diff --git a/pkgs/by-name/no/nostr-rs-relay/package.nix b/pkgs/by-name/no/nostr-rs-relay/package.nix index 7aea9427584e..26703226408d 100644 --- a/pkgs/by-name/no/nostr-rs-relay/package.nix +++ b/pkgs/by-name/no/nostr-rs-relay/package.nix @@ -11,15 +11,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nostr-rs-relay"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "scsibug"; repo = "nostr-rs-relay"; rev = finalAttrs.version; - hash = "sha256-MS5jgUh9aLAFr4Nnf3Wid+ki0PTfsyob3r16/EXYZ7E="; + hash = "sha256-HNAoCb6NHfSXpz+qDsxeqSiV8ydd4f9/t5JfS5p9af4="; }; - cargoHash = "sha256-hrq9EEUot9painlXVGjIh+NMlrH4iRQ28U3PLGnvYsw="; + cargoHash = "sha256-zLLkAj1Kahkrahru7STSSdyzsLihc3z34c4v5BrFXvU="; buildInputs = [ openssl.dev diff --git a/pkgs/by-name/ns/nsis/package.nix b/pkgs/by-name/ns/nsis/package.nix index 05e25a5ed97d..0538abab156b 100644 --- a/pkgs/by-name/ns/nsis/package.nix +++ b/pkgs/by-name/ns/nsis/package.nix @@ -4,6 +4,8 @@ symlinkJoin, fetchurl, fetchzip, + makeWrapper, + runCommand, scons, zlib, libiconv, @@ -29,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { chmod -R u+w $out/share/nsis ''; - nativeBuildInputs = [ scons ]; + nativeBuildInputs = [ scons ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ]; buildInputs = [ zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; env = { @@ -67,6 +69,36 @@ stdenv.mkDerivation (finalAttrs: { prefixKey = "PREFIX="; installTargets = [ "install-compiler" ]; + # NSIS can crash when compiling Unicode installers under non-UTF-8 locales on macOS + # see https://sourceforge.net/p/nsis/bugs/1165/ for more info + # code adapted from the makensis formulae in Homebrew + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + wrapProgram $out/bin/makensis \ + --run ' + case "''${LC_ALL:-}" in + *UTF-8*|*utf8*) ;; + "") + case "''${LC_CTYPE:-} ''${LANG:-}" in + *UTF-8*|*utf8*) ;; + *) export LC_ALL=en_US.UTF-8 ;; + esac + ;; + *) export LC_ALL=en_US.UTF-8 ;; + esac + ' + ''; + + passthru.tests = { + compile-bigtest = + runCommand "nsis-compile-bigtest" { nativeBuildInputs = [ finalAttrs.finalPackage ]; } + '' + pushd ${finalAttrs.srcWinDistributable}/Examples >/dev/null + makensis bigtest.nsi "-XOutfile /dev/null" + popd >/dev/null + touch $out + ''; + }; + meta = { description = "Free scriptable win32 installer/uninstaller system that doesn't suck and isn't huge"; homepage = "https://nsis.sourceforge.io/"; @@ -74,6 +106,5 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ pombeirp ]; mainProgram = "makensis"; - broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/op/openapi-python-client/package.nix b/pkgs/by-name/op/openapi-python-client/package.nix index 3a0a86ccec4b..4576c937c365 100644 --- a/pkgs/by-name/op/openapi-python-client/package.nix +++ b/pkgs/by-name/op/openapi-python-client/package.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "openapi-python-client"; - version = "0.28.4"; + version = "0.29.0"; pyproject = true; src = fetchFromGitHub { @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "openapi-generators"; repo = "openapi-python-client"; tag = "v${finalAttrs.version}"; - hash = "sha256-YwEF7ZJzxAznGoxZDGYGVUkwQo8AD+tDMl2s2Yplvek="; + hash = "sha256-TxLwRi7zoFO5ejYLXllprxkiEbRtvidqjzLLpQOuQG8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pa/parca/package.nix b/pkgs/by-name/pa/parca/package.nix index 3babc527626c..f31b71498456 100644 --- a/pkgs/by-name/pa/parca/package.nix +++ b/pkgs/by-name/pa/parca/package.nix @@ -10,13 +10,13 @@ stdenv, }: let - version = "0.27.1"; + version = "0.28.0"; parca-src = fetchFromGitHub { owner = "parca-dev"; repo = "parca"; tag = "v${version}"; - hash = "sha256-pI2SV2BiBqqga4RADEE5Z0FffdGb3fxhRRNj4S9Hxzc="; + hash = "sha256-7ndRiOYa7HiOwwHRXqeCr3A+5EAVvbo4I4vkoqSya+E="; }; ui = stdenv.mkDerivation (finalAttrs: { @@ -28,7 +28,7 @@ let inherit (finalAttrs) pname src version; pnpm = pnpm_9; fetcherVersion = 3; - hash = "sha256-3eICZpJJacvcD9MGQ9AmoMMnlcNt/LCxIIM+H+oJdR8="; + hash = "sha256-zHdMwJyeafzbIlp+Fhh1khcUVrLsoUg6ViSGm/ByGAA="; }; nativeBuildInputs = [ @@ -61,7 +61,7 @@ buildGoModule rec { pname = "parca"; src = parca-src; - vendorHash = "sha256-dAFGcavDaN1vW4SdjZ78IRWCnfqaRipLOQHc+V6MuDw="; + vendorHash = "sha256-eZPAgxOi1jgTHmisFG/Sz2y3vhxUu/L3Iodb5mrKnVs="; ldflags = [ "-X=main.version=${version}" diff --git a/pkgs/by-name/po/pocketbase/package.nix b/pkgs/by-name/po/pocketbase/package.nix index 74032329b167..513a14fdb9d6 100644 --- a/pkgs/by-name/po/pocketbase/package.nix +++ b/pkgs/by-name/po/pocketbase/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "pocketbase"; - version = "0.38.2"; + version = "0.39.0"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${finalAttrs.version}"; - hash = "sha256-p2cyZ1g5F2sIkhoXVPvDvy67gIJl57mX4dn5dH+E3kI="; + hash = "sha256-4myp2MleKb6mAwDKhN39uyc5PZJhB3lvm2x/KDR9u0g="; }; - vendorHash = "sha256-TrcCWMZx9rVathC4nSLQB72SlF6pQIX1+SseSbx6UDU="; + vendorHash = "sha256-VBsClxCOA9Mp/kCHQKuBPd2Nt5sfXkVRx/8mGk5Gkcg="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; diff --git a/pkgs/by-name/re/resterm/package.nix b/pkgs/by-name/re/resterm/package.nix index 163e13a8899f..76e510f4737d 100644 --- a/pkgs/by-name/re/resterm/package.nix +++ b/pkgs/by-name/re/resterm/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "resterm"; - version = "0.39.5"; + version = "0.41.1"; src = fetchFromGitHub { owner = "unkn0wn-root"; repo = "resterm"; tag = "v${finalAttrs.version}"; - hash = "sha256-Qd7ocX2w2dDyoXvv5oaEqpLJYieBahjjkPMom4EVBss="; + hash = "sha256-PSWgbq1aV+9AEhAXL3gZGKh6BzKc5CxufLTp80T0Tno="; }; vendorHash = "sha256-AjckKD6NScBa8w9nWMdVExuNadz3vHnK854XXg3nj84="; diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json index 5b106ea95e4b..d0e8ecefd297 100644 --- a/pkgs/by-name/ro/roslyn-ls/deps.json +++ b/pkgs/by-name/ro/roslyn-ls/deps.json @@ -79,9 +79,9 @@ }, { "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers", - "version": "5.7.0-1.26215.121", - "hash": "sha256-91me6S6uT9wAM5stwzWc86ilPnVGxuWPg0WeCdhbIRs=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/5.7.0-1.26215.121/microsoft.codeanalysis.bannedapianalyzers.5.7.0-1.26215.121.nupkg" + "version": "5.7.0-1.26227.104", + "hash": "sha256-AKe8YV9hIgC8SSQ43ve3cdYGjJJOFU3H5I8psUlPZ94=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/5.7.0-1.26227.104/microsoft.codeanalysis.bannedapianalyzers.5.7.0-1.26227.104.nupkg" }, { "pname": "Microsoft.CodeAnalysis.Common", @@ -103,9 +103,9 @@ }, { "pname": "Microsoft.CodeAnalysis.PublicApiAnalyzers", - "version": "5.7.0-1.26215.121", - "hash": "sha256-RwRhXL8XuRypKne2WEH5xm05AePSJcH2LGBF4kwDMH0=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/5.7.0-1.26215.121/microsoft.codeanalysis.publicapianalyzers.5.7.0-1.26215.121.nupkg" + "version": "5.7.0-1.26227.104", + "hash": "sha256-xsfLYDo5tdRJNjyRvvr5TA/yM2qicxwZ9m7DYZfd4Rg=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/5.7.0-1.26227.104/microsoft.codeanalysis.publicapianalyzers.5.7.0-1.26227.104.nupkg" }, { "pname": "Microsoft.CSharp", @@ -121,15 +121,15 @@ }, { "pname": "Microsoft.DotNet.Arcade.Sdk", - "version": "10.0.0-beta.26208.4", - "hash": "sha256-2IyF5OTwwHaOdpvoZK4hI/uXksNozsspxdg8dP8FeWM=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/10.0.0-beta.26208.4/microsoft.dotnet.arcade.sdk.10.0.0-beta.26208.4.nupkg" + "version": "10.0.0-beta.26257.4", + "hash": "sha256-SMGV9wBaog3i0bHH0OCNw9s+t418+xhqVvRSBFugHJI=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/10.0.0-beta.26257.4/microsoft.dotnet.arcade.sdk.10.0.0-beta.26257.4.nupkg" }, { "pname": "Microsoft.DotNet.XliffTasks", - "version": "10.0.0-beta.26208.4", - "hash": "sha256-ZGH2bAXTyc0dVJwrPNZrcLEeD0pyKo/9M5p1w/hx0oE=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/10.0.0-beta.26208.4/microsoft.dotnet.xlifftasks.10.0.0-beta.26208.4.nupkg" + "version": "10.0.0-beta.26257.4", + "hash": "sha256-0SyzThHnzmWcY7hiiw4LgrjV67YxerOvT+pZkRyehe4=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/10.0.0-beta.26257.4/microsoft.dotnet.xlifftasks.10.0.0-beta.26257.4.nupkg" }, { "pname": "Microsoft.Extensions.Configuration", @@ -433,9 +433,9 @@ }, { "pname": "Roslyn.Diagnostics.Analyzers", - "version": "5.7.0-1.26215.121", - "hash": "sha256-24oGYM1xHKZHKr0a5d/pAC5d6dIwCsWqq3Ykx6VziWU=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/roslyn.diagnostics.analyzers/5.7.0-1.26215.121/roslyn.diagnostics.analyzers.5.7.0-1.26215.121.nupkg" + "version": "5.7.0-1.26227.104", + "hash": "sha256-b5++ZAtq5ZsKDuSPkH7P8lWlQn38lSIXhLThiS5/R/A=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/roslyn.diagnostics.analyzers/5.7.0-1.26227.104/roslyn.diagnostics.analyzers.5.7.0-1.26227.104.nupkg" }, { "pname": "SQLitePCLRaw.bundle_green", @@ -499,9 +499,9 @@ }, { "pname": "System.CommandLine", - "version": "3.0.0-preview.4.26215.121", - "hash": "sha256-GJjEBeXmrAwXeGfXjJ4GFeFVdKvdAgIMzOhR0svAH2o=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/3.0.0-preview.4.26215.121/system.commandline.3.0.0-preview.4.26215.121.nupkg" + "version": "3.0.0-preview.5.26227.104", + "hash": "sha256-J8JFd0mMtcCi1L6u6mpFrnu0I/4iLuaPPdwlxHqrqjc=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/3.0.0-preview.5.26227.104/system.commandline.3.0.0-preview.5.26227.104.nupkg" }, { "pname": "System.ComponentModel.Composition", @@ -661,9 +661,9 @@ }, { "pname": "System.Security.Cryptography.Pkcs", - "version": "8.0.0", - "hash": "sha256-yqfIIeZchsII2KdcxJyApZNzxM/VKknjs25gDWlweBI=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.pkcs/8.0.0/system.security.cryptography.pkcs.8.0.0.nupkg" + "version": "8.0.1", + "hash": "sha256-KMNIkJ3yQ/5O6WIhPjyAIarsvIMhkp26A6aby5KkneU=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.pkcs/8.0.1/system.security.cryptography.pkcs.8.0.1.nupkg" }, { "pname": "System.Security.Cryptography.ProtectedData", diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix index 0d70848f0623..15c2f7232bfd 100644 --- a/pkgs/by-name/ro/roslyn-ls/package.nix +++ b/pkgs/by-name/ro/roslyn-ls/package.nix @@ -38,18 +38,18 @@ in buildDotnetModule (finalAttrs: { inherit pname dotnet-sdk dotnet-runtime; - vsVersion = "2.136.19-prerelease"; + vsVersion = "2.142.16-prerelease"; src = fetchFromGitHub { owner = "dotnet"; repo = "roslyn"; rev = "VSCode-CSharp-${finalAttrs.vsVersion}"; - hash = "sha256-xBxWBh4J8NJWQUDGdVLf/vXz0UTFP8q/2VoN9r55kvc="; + hash = "sha256-aErsCXA8SiR41QVz2ePcn85qAyCcoAKV4vog6L7x+8E="; }; # versioned independently from vscode-csharp # "roslyn" in here: # https://github.com/dotnet/vscode-csharp/blob/main/package.json - version = "5.7.0-1.26220.12"; + version = "5.8.0-1.26262.9"; projectFile = "src/LanguageServer/${project}/${project}.csproj"; useDotnetFromEnv = true; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/si/silver-searcher/bash-completion.patch b/pkgs/by-name/si/silver-searcher/bash-completion.patch deleted file mode 100644 index 30e8c72389b7..000000000000 --- a/pkgs/by-name/si/silver-searcher/bash-completion.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -9 +9 @@ --bashcompdir = $(pkgdatadir)/completions -+bashcompdir = $(datadir)/bash-completion/completions diff --git a/pkgs/by-name/si/silver-searcher/package.nix b/pkgs/by-name/si/silver-searcher/package.nix deleted file mode 100644 index 6015d39697c6..000000000000 --- a/pkgs/by-name/si/silver-searcher/package.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - autoreconfHook, - pkg-config, - pcre, - zlib, - xz, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "silver-searcher"; - version = "2.2.0"; - - src = fetchFromGitHub { - owner = "ggreer"; - repo = "the_silver_searcher"; - rev = finalAttrs.version; - sha256 = "0cyazh7a66pgcabijd27xnk1alhsccywivv6yihw378dqxb22i1p"; - }; - - patches = [ ./bash-completion.patch ]; - - env = { - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: src/zfile.o:/build/source/src/log.h:12: multiple definition of - # `print_mtx'; src/ignore.o:/build/source/src/log.h:12: first defined here - # TODO: remove once next release has https://github.com/ggreer/the_silver_searcher/pull/1377 - NIX_CFLAGS_COMPILE = "-fcommon"; - } - // lib.optionalAttrs stdenv.hostPlatform.isLinux { - NIX_LDFLAGS = "-lgcc_s"; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - buildInputs = [ - pcre - zlib - xz - ]; - - meta = { - homepage = "https://github.com/ggreer/the_silver_searcher/"; - description = "Code-searching tool similar to ack, but faster"; - maintainers = with lib.maintainers; [ madjar ]; - mainProgram = "ag"; - platforms = lib.platforms.all; - license = lib.licenses.asl20; - }; -}) diff --git a/pkgs/by-name/so/solanum/package.nix b/pkgs/by-name/so/solanum/package.nix index cb0e89a330c8..3c5bd47709db 100644 --- a/pkgs/by-name/so/solanum/package.nix +++ b/pkgs/by-name/so/solanum/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "solanum"; - version = "0-unstable-2026-05-23"; + version = "0-unstable-2026-05-24"; src = fetchFromGitHub { owner = "solanum-ircd"; repo = "solanum"; - rev = "dfe6757a577109d2180465da6270b5a6bc08f8d7"; - hash = "sha256-ngg/0HPZeCYodIWt8p9zpCj6hQMiVoc9E2cm/87eE8k="; + rev = "eb62eb9cab93ce0519c0ca2c8fa10e688054434d"; + hash = "sha256-ujSNxSc7HT55YaN4RKD4gDfqt3joVBPGgEzFgLJS5as="; }; postPatch = '' diff --git a/pkgs/by-name/st/strichliste/frontend.nix b/pkgs/by-name/st/strichliste/frontend.nix index a30c4fff3766..21c37325772f 100644 --- a/pkgs/by-name/st/strichliste/frontend.nix +++ b/pkgs/by-name/st/strichliste/frontend.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "strichliste-frontend"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "strichliste"; repo = "strichliste-web-frontend"; tag = "v${finalAttrs.version}"; - hash = "sha256-fi4pz3ylWyC4yvDWsK2Rvv8KDaXeHNVz0jY6PpF07hE="; + hash = "sha256-LzTdFYuIIFmAVuHtGjljqSBZGEPibwXcK5WuYB6ELNg="; }; yarnOfflineCache = fetchYarnDeps { @@ -39,5 +39,7 @@ stdenv.mkDerivation (finalAttrs: { __structuredAttrs = true; - inherit meta; + meta = meta // { + changelog = "https://github.com/strichliste/strichliste-web-frontend/releases/tag/${finalAttrs.src.tag}"; + }; }) diff --git a/pkgs/by-name/st/strichliste/package.nix b/pkgs/by-name/st/strichliste/package.nix index d26d2dfef174..f81fceed7452 100644 --- a/pkgs/by-name/st/strichliste/package.nix +++ b/pkgs/by-name/st/strichliste/package.nix @@ -9,17 +9,18 @@ php.buildComposerProject2 (finalAttrs: { pname = "strichliste-backend"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "strichliste"; repo = "strichliste-backend"; tag = "v${finalAttrs.version}"; - hash = "sha256-yI20cUp19ehtOnWdu+MItwgOlNDnt1VK3giInaTQQ4Y="; + hash = "sha256-ps0IJBXVchPaW2Tx4rfD02EFYiv3oTyaNB6/V7txeM0="; }; - vendorHash = "sha256-vYPjUaNIf62GoKXopC4nGqIa+Z3C8Q5dnX9FPvM1Ers="; + vendorHash = "sha256-PLq+XiZIJyyzVq+87timGO/jbPB4ZYQqSZilZMIE4Cw="; composerNoDev = true; + composerNoPlugins = false; composerStrictValidation = false; postPatch = '' @@ -45,6 +46,7 @@ php.buildComposerProject2 (finalAttrs: { }; meta = { + changelog = "https://github.com/strichliste/strichliste/releases/tag/${finalAttrs.src.tag}"; description = "strichliste is a tool to replace a tally sheet."; homepage = "https://www.strichliste.org/"; license = lib.licenses.mit; diff --git a/pkgs/by-name/st/strictdoc/package.nix b/pkgs/by-name/st/strictdoc/package.nix index ba4e634bc9f0..c02084371d6a 100644 --- a/pkgs/by-name/st/strictdoc/package.nix +++ b/pkgs/by-name/st/strictdoc/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "strictdoc"; - version = "0.19.0"; + version = "0.21.1"; pyproject = true; src = fetchFromGitHub { owner = "strictdoc-project"; repo = "strictdoc"; tag = finalAttrs.version; - hash = "sha256-UkXVn1GVWBBhjFaRvkVk+E9mug3i2k7SQk+7JVA8KSo="; + hash = "sha256-kKygvUCrkftEEKLoinVkP5DARsHGguSfsPaTpYYXPpU="; }; build-system = [ @@ -79,7 +79,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { meta = { description = "Software for technical documentation and requirements management"; homepage = "https://github.com/strictdoc-project/strictdoc"; - changelog = "https://github.com/strictdoc-project/strictdoc/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + changelog = "https://github.com/strictdoc-project/strictdoc/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.puzzlewolf ]; mainProgram = "strictdoc"; diff --git a/pkgs/by-name/su/sunsetr/package.nix b/pkgs/by-name/su/sunsetr/package.nix index 030c3fa3bfc8..8ed957040af3 100644 --- a/pkgs/by-name/su/sunsetr/package.nix +++ b/pkgs/by-name/su/sunsetr/package.nix @@ -6,16 +6,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "sunsetr"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "psi4j"; repo = "sunsetr"; tag = "v${finalAttrs.version}"; - hash = "sha256-M91eW8FKJDlR8pdvXcKte3OL3uJlpapShTUNpnA/Jvo="; + hash = "sha256-hbr7NpJCi2dulzgN2JVtUJewoo7s4rr1zGt+KpKYTWE="; }; - cargoHash = "sha256-fFk/JPB6MGmYnwARMuKF1/fVZOf+W1C+YqQvuG/ub60="; + cargoHash = "sha256-yOU96xWnpMKzvBo64ewhzktRHLzSBn4ZXdSFrhrejZE="; checkFlags = [ "--skip=config::tests::test_geo_toml_exists_before_config_creation" diff --git a/pkgs/by-name/sv/svnfs/package.nix b/pkgs/by-name/sv/svnfs/package.nix deleted file mode 100644 index a6a9e5e148ea..000000000000 --- a/pkgs/by-name/sv/svnfs/package.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - autoreconfHook, - subversion, - fuse, - apr, - perl, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "svnfs"; - version = "0.4"; - - src = fetchurl { - url = "http://www.jmadden.eu/wp-content/uploads/svnfs/svnfs-${finalAttrs.version}.tgz"; - sha256 = "1lrzjr0812lrnkkwk60bws9k1hq2iibphm0nhqyv26axdsygkfky"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ - subversion - fuse - apr - perl - ]; - - # autoconf's AC_CHECK_HEADERS and AC_CHECK_LIBS fail to detect libfuse on - # Darwin if FUSE_USE_VERSION isn't set at configure time. - # - # NOTE: Make sure the value of FUSE_USE_VERSION specified here matches the - # actual version used in the source code: - # - # $ tar xf "$(nix-build -A svnfs.src)" - # $ grep -R FUSE_USE_VERSION - configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "CFLAGS=-DFUSE_USE_VERSION=25" ]; - - # why is this required? - preConfigure = '' - export LD_LIBRARY_PATH=${subversion.out}/lib - ''; - - env = { - # -fcommon: workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: svnclient.o:/build/svnfs-0.4/src/svnfs.h:40: multiple definition of - # `dirbuf'; svnfs.o:/build/svnfs-0.4/src/svnfs.h:40: first defined here - NIX_CFLAGS_COMPILE = toString [ - "-I ${subversion.dev}/include/subversion-1" - "-fcommon" - ]; - NIX_LDFLAGS = toString [ - "-lsvn_client-1" - "-lsvn_subr-1" - ]; - }; - - meta = { - description = "FUSE filesystem for accessing Subversion repositories"; - homepage = "https://www.jmadden.eu/index.php/svnfs/"; - license = lib.licenses.gpl2Only; - maintainers = [ ]; - platforms = lib.platforms.unix; - mainProgram = "svnfs"; - }; -}) diff --git a/pkgs/by-name/tk/tk-safe/package.nix b/pkgs/by-name/tk/tk-safe/package.nix index 395801cce4d6..913a2fa42ea0 100644 --- a/pkgs/by-name/tk/tk-safe/package.nix +++ b/pkgs/by-name/tk/tk-safe/package.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { pname = "tk-safe"; - version = "25.12.3"; - revision = "25"; + version = "26.1.1"; + revision = "27"; src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/rLNeIGEaag0TKFQLO0TxF3ARXg3rcTNx_${revision}.snap"; - hash = "sha512-RdcScrTOQHVUn5JE59Z7S44+l2naNXBgID5VqMVelni0bPvnBigEDgRp5BID65Q52MXMe79lzzqo7qRmbYkb3Q=="; + hash = "sha512-idCFUt0nzg5rM2HXvuMzPPzukmvHSMxCEX+PIM/23A8j8IT3IhUQCvZLaXLnUs6eb1hWNvsNEr+XlaM8cSTdWA=="; }; desktopItems = [ diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix index 83bc910e7697..009c201e13f6 100644 --- a/pkgs/by-name/to/tor-browser/package.nix +++ b/pkgs/by-name/to/tor-browser/package.nix @@ -136,12 +136,6 @@ let }; } ); - - policiesJson = writeText "policies.json" ( - builtins.toJSON { - policies.DisableAppUpdate = true; - } - ); in stdenv.mkDerivation rec { pname = "tor-browser"; @@ -213,8 +207,8 @@ stdenv.mkDerivation rec { # firefox is a wrapper that checks for a more recent libstdc++ & appends it to the ld path mv firefox.real firefox - # store state at `~/.tor browser` instead of relative to executable - touch "$TBB_IN_STORE/system-install" + # store state at `~/.tor project` instead of relative to executable + touch "$TBB_IN_STORE/is-packaged-app" # The final libPath. Note, we could split this into firefoxLibPath # and torLibPath for accuracy, but this is more convenient ... @@ -331,7 +325,6 @@ stdenv.mkDerivation rec { # Install distribution customizations install -Dvm644 ${distributionIni} $out/share/tor-browser/distribution/distribution.ini - install -Dvm644 ${policiesJson} $out/share/tor-browser/distribution/policies.json runHook postInstall ''; diff --git a/pkgs/by-name/vc/vcmi/package.nix b/pkgs/by-name/vc/vcmi/package.nix index ef2c940b8c1d..db4ece2e1b64 100644 --- a/pkgs/by-name/vc/vcmi/package.nix +++ b/pkgs/by-name/vc/vcmi/package.nix @@ -5,6 +5,7 @@ SDL2_ttf, boost, cmake, + gettext, fetchFromGitHub, ffmpeg, fuzzylite, @@ -30,16 +31,27 @@ stdenv.mkDerivation (finalAttrs: { pname = "vcmi"; version = "1.7.4"; + __structuredAttrs = true; + strictDeps = true; + src = fetchFromGitHub { owner = "vcmi"; repo = "vcmi"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-uzdnRKF0xb2B2r6kTzk6OEDGBdOwcu9eGYsvv4ALCF0="; + # Disable git background maintenance for the whole prefetch, including submodule clones. + # Upstream nix-prefetch-git only disables it on the outer repo (NixOS/nixpkgs#524215), so + # submodule clones can still race with their own maintenance and break `.git` cleanup. + preFetch = '' + export GIT_CONFIG_GLOBAL="$TMPDIR/gitconfig" + printf '[maintenance]\n\tauto = false\n' > "$GIT_CONFIG_GLOBAL" + ''; + hash = "sha256-iV1twkoOJyUsUkq17mdTYk1YvfmUtLHdtR3H77BoNJk="; }; nativeBuildInputs = [ cmake + gettext # msgfmt ninja pkg-config python3 @@ -98,13 +110,13 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/vcmiclient"; - versionCheckProgramArg = "--version"; versionCheckKeepEnvironment = [ "XDG_CACHE_HOME" "XDG_CONFIG_HOME" "XDG_DATA_HOME" ]; preVersionCheck = '' + cd $(mktemp -d) export \ XDG_CACHE_HOME="$TMPDIR" \ XDG_CONFIG_HOME="$TMPDIR" \ diff --git a/pkgs/by-name/wh/whichllm/package.nix b/pkgs/by-name/wh/whichllm/package.nix new file mode 100644 index 000000000000..8bdf145dd472 --- /dev/null +++ b/pkgs/by-name/wh/whichllm/package.nix @@ -0,0 +1,55 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + versionCheckHook, +}: + +python3Packages.buildPythonApplication (finalAttrs: { + pname = "whichllm"; + version = "0.5.7"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "Andyyyy64"; + repo = "whichllm"; + tag = "v${finalAttrs.version}"; + hash = "sha256-UvhCSC9tKpdgXFCMGn0HWM0kuHhXSauEr/ys/9PUIRs="; + }; + + build-system = with python3Packages; [ hatchling ]; + + dependencies = + with python3Packages; + [ + dbgpu + httpx + nvidia-ml-py + psutil + rich + typer + ] + ++ python3Packages.dbgpu.optional-dependencies.fuzz; + + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; + + disabledTests = [ + # require network access + "test_plan_no_model_found_shows_error" + "test_snippet_no_model_found" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + pythonImportsCheck = [ "whichllm" ]; + + meta = { + description = "Find the local LLM that actually runs and performs best on your hardware. Ranked by real, recency-aware benchmarks, not parameter count. One command, run it instantly"; + homepage = "https://github.com/Andyyyy64/whichllm"; + changelog = "https://github.com/Andyyyy64/whichllm/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jaredmontoya ]; + mainProgram = "whichllm"; + }; +}) diff --git a/pkgs/by-name/ya/yazi/plugins/yatline-created-time/default.nix b/pkgs/by-name/ya/yazi/plugins/yatline-created-time/default.nix new file mode 100644 index 000000000000..8066350696b3 --- /dev/null +++ b/pkgs/by-name/ya/yazi/plugins/yatline-created-time/default.nix @@ -0,0 +1,23 @@ +{ + lib, + fetchFromGitHub, + mkYaziPlugin, +}: +mkYaziPlugin { + pname = "yatline-created-time.yazi"; + version = "0-unstable-2025-09-04"; + + src = fetchFromGitHub { + owner = "wekauwau"; + repo = "yatline-created-time.yazi"; + rev = "7cd5e216554b0d6fcfd04bcde617726194a110ba"; + hash = "sha256-yhm/tzRHBL011Gp+bOqT+Ck/0BcR5smo49Gqfv0L3oI="; + }; + + meta = { + description = "An addon to display the creation time of file or folder in your yatline.yazi"; + homepage = "https://github.com/wekauwau/yatline-created-time.yazi"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kpbaks ]; + }; +} diff --git a/pkgs/by-name/yo/yoshimi/package.nix b/pkgs/by-name/yo/yoshimi/package.nix index f973d270d6c1..2b35570f0248 100644 --- a/pkgs/by-name/yo/yoshimi/package.nix +++ b/pkgs/by-name/yo/yoshimi/package.nix @@ -14,7 +14,6 @@ libxdmcp, lv2, minixml, - pcre, pkg-config, readline, libpthread-stubs, @@ -56,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: { libxdmcp lv2 minixml - pcre readline libpthread-stubs zlib diff --git a/pkgs/development/beam-modules/livebook/default.nix b/pkgs/development/beam-modules/livebook/default.nix index 81adf8d0e35a..ec77a1344c3f 100644 --- a/pkgs/development/beam-modules/livebook/default.nix +++ b/pkgs/development/beam-modules/livebook/default.nix @@ -1,46 +1,121 @@ { lib, - beamPackages, + stdenv, makeWrapper, fetchFromGitHub, + versionCheckHook, + writableTmpDirAsHomeHook, + + bun, + beamPackages, + nixosTests, nix-update-script, }: beamPackages.mixRelease rec { pname = "livebook"; - version = "0.18.6"; + version = "0.19.8"; inherit (beamPackages) elixir; buildInputs = [ beamPackages.erlang ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + bun + makeWrapper + writableTmpDirAsHomeHook + ]; src = fetchFromGitHub { owner = "livebook-dev"; repo = "livebook"; tag = "v${version}"; - hash = "sha256-8pFvY86ht2NMUtknjt5M7QasOKnoHvQdYJrOlgTyueU="; + hash = "sha256-cIFnGUJ8yRnEBL9eu4Jpg1sMlTV1t/ybhHusLSFdZEY="; }; mixFodDeps = beamPackages.fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version; - hash = "sha256-pfHzcYEEvj+x1/vLKhJ6bAsKGg19UisVK6h0xskhu74="; + hash = "sha256-T74RmUORPdNibxdl+bRGyYyOdnKs1TyjtdutLtfLNLM="; }; - postInstall = '' - wrapProgram $out/bin/livebook \ - --prefix PATH : ${ - lib.makeBinPath [ - beamPackages.elixir - beamPackages.erlang - ] - } \ - --set MIX_REBAR3 ${beamPackages.rebar3}/bin/rebar3 + node_modules = stdenv.mkDerivation { + pname = "${pname}-node_modules"; + inherit src version; + nativeBuildInputs = [ + bun + writableTmpDirAsHomeHook + ]; + dontBuild = true; + dontFixup = true; + installPhase = '' + mkdir -p deps/phoenix deps/phoenix_html deps/phoenix_live_view + echo '{"name": "phoenix", "version": "1.0.0"}' > deps/phoenix/package.json + echo '{"name": "phoenix_html", "version": "1.0.0"}' > deps/phoenix_html/package.json + echo '{"name": "phoenix_live_view", "version": "1.0.0"}' > deps/phoenix_live_view/package.json + cd assets + bun install \ + --no-cache \ + --backend=copyfile \ + --cpu="*" \ + --frozen-lockfile \ + --ignore-scripts \ + --no-progress \ + --os="*" + mkdir -p $out + cp -r node_modules $out/ + rm -rf $out/node_modules/phoenix + rm -rf $out/node_modules/phoenix_html + rm -rf $out/node_modules/phoenix_live_view + ''; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "sha256-XtEkedj5QJh1tveKKd5sh4xcC6Gol1DUweQKEw1jLgU="; + }; + + postPatch = '' + substituteInPlace lib/mix/tasks/compile.ensure_livebook_priv.ex \ + --replace-fail 'Mix.Task.run("bun.install", ~w"--if-missing")' ':ok' \ + --replace-fail 'Mix.Task.run("bun", ~w"assets install")' ':ok' \ + --replace-fail 'Mix.Task.run("bun", ~w" assets run build")' ':ok' ''; + preBuild = '' + cp -r ${node_modules}/node_modules assets/node_modules + chmod -R +w assets/node_modules + ln -sf ../../deps/phoenix assets/node_modules/phoenix + ln -sf ../../deps/phoenix_html assets/node_modules/phoenix_html + ln -sf ../../deps/phoenix_live_view assets/node_modules/phoenix_live_view + pushd assets + bun --bun ./node_modules/vite/bin/vite.js build + popd + ''; + + postInstall = + let + path = lib.makeBinPath [ + beamPackages.elixir + beamPackages.erlang + ]; + in + '' + wrapProgram $out/bin/livebook \ + --prefix PATH : ${path} \ + --set MIX_REBAR3 ${beamPackages.rebar3}/bin/rebar3 + + wrapProgram $out/bin/server \ + --prefix PATH : ${path} + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + writableTmpDirAsHomeHook + ]; + versionCheckProgramArg = [ "version" ]; + versionCheckKeepEnvironment = [ "HOME" ]; + doInstallCheck = true; + passthru = { updateScript = nix-update-script { }; tests = { @@ -52,11 +127,15 @@ beamPackages.mixRelease rec { license = lib.licenses.asl20; homepage = "https://livebook.dev/"; description = "Automate code & data workflows with interactive Elixir notebooks"; + mainProgram = "livebook"; maintainers = with lib.maintainers; [ munksgaard scvalex ]; platforms = lib.platforms.unix; - teams = [ lib.teams.beam ]; + teams = [ + lib.teams.beam + lib.teams.ngi + ]; }; } diff --git a/pkgs/development/python-modules/ale-py/default.nix b/pkgs/development/python-modules/ale-py/default.nix index 3cbf53d33cdf..3282fd421f5d 100644 --- a/pkgs/development/python-modules/ale-py/default.nix +++ b/pkgs/development/python-modules/ale-py/default.nix @@ -7,8 +7,10 @@ # build-system cmake, ninja, - pybind11, - setuptools, + nanobind, + scikit-build-core, + # linux-only + jax, # buildInputs SDL2, @@ -16,86 +18,54 @@ zlib, # dependencies - importlib-resources, numpy, - typing-extensions, - jax, # tests + chex, gymnasium, - opencv-python, pytestCheckHook, - - # Whether to enable recently added vector environments: - # https://github.com/Farama-Foundation/Arcade-Learning-Environment/blob/v0.11.0/docs/vector-environment.md - # FIXME: Disabled by default as it mysteriously causes stable-baselines3's tests to hang indefinitely. - withVectorEnv ? false, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ale-py"; - version = "0.11.2"; + version = "0.12.0"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "Farama-Foundation"; repo = "Arcade-Learning-Environment"; - tag = "v${version}"; - hash = "sha256-4IkjW8HX21uBEHFtb3qETxco6FfDMgLbG1BDHWwvn58="; + tag = "v${finalAttrs.version}"; + hash = "sha256-hFbreHk0i4h+JOyvDYcNX3TmwgvxNC5U0l5Xrqqz1zQ="; }; build-system = [ cmake ninja - pybind11 - setuptools - ]; - - buildInputs = [ - SDL2 - zlib - ] - ++ lib.optionals withVectorEnv [ - opencv - ]; - - dependencies = [ - gymnasium - importlib-resources - numpy - typing-extensions + scikit-build-core + nanobind ] ++ lib.optionals stdenv.hostPlatform.isLinux [ jax ]; - - postPatch = - # Relax the pybind11 version - '' - substituteInPlace src/ale/python/CMakeLists.txt \ - --replace-fail \ - 'find_package(pybind11 ''${PYBIND11_VER} QUIET)' \ - 'find_package(pybind11 QUIET)' - '' - + lib.optionalString (!withVectorEnv) '' - substituteInPlace setup.py \ - --replace-fail \ - "-DBUILD_VECTOR_LIB=ON" \ - "-DBUILD_VECTOR_LIB=OFF" - ''; - dontUseCmakeConfigure = true; + buildInputs = [ + SDL2 + zlib + opencv + ]; + + dependencies = [ + numpy + ]; + pythonImportsCheck = [ "ale_py" ]; - doCheck = false; - nativeCheckInputs = [ + chex gymnasium pytestCheckHook - ] - + lib.optionals withVectorEnv [ - opencv-python ]; disabledTests = [ @@ -103,20 +73,35 @@ buildPythonPackage rec { # line 414 in test_display_screen "test_display_screen" - # test_atari_env.py tests fail on the majority of the environments because the ROM are missing. + # Most Atari tests fail because the ROM are missing. # The user is expected to manually download the roms: # https://github.com/Farama-Foundation/Arcade-Learning-Environment/blob/v0.9.0/docs/faq.md#i-downloaded-ale-and-i-installed-it-successfully-but-i-cannot-find-any-rom-file-at-roms-do-i-have-to-get-them-somewhere-else + "TestVectorEnv" "test_check_env" + "test_clone_pickle_restore_new_env" + "test_clone_restore" + "test_continuous_actions" + "test_determinism" + "test_gym_keys_to_action" + "test_jit" + "test_obs_params" "test_reset_step_shapes" "test_rollout_consistency" + "test_seeding" "test_sound_obs" + "test_state_serialize_roundtrip" + ]; + + disabledTestPaths = [ + # + "tests/python/test_atari_vector_xla.py" ]; meta = { description = "Simple framework that allows researchers and hobbyists to develop AI agents for Atari 2600 games"; mainProgram = "ale-import-roms"; homepage = "https://github.com/mgbellemare/Arcade-Learning-Environment"; - changelog = "https://github.com/Farama-Foundation/Arcade-Learning-Environment/releases/tag/v${version}"; + changelog = "https://github.com/Farama-Foundation/Arcade-Learning-Environment/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ billhuang ]; badPlatforms = [ @@ -125,4 +110,4 @@ buildPythonPackage rec { lib.systems.inspect.patterns.isDarwin ]; }; -} +}) diff --git a/pkgs/development/python-modules/alectryon/default.nix b/pkgs/development/python-modules/alectryon/default.nix index 035a272b3be1..7895437e6b17 100644 --- a/pkgs/development/python-modules/alectryon/default.nix +++ b/pkgs/development/python-modules/alectryon/default.nix @@ -6,27 +6,34 @@ dominate, beautifulsoup4, docutils, + myst-parser, + setuptools, sphinx, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "alectryon"; - version = "1.4.0"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; src = fetchPypi { - inherit pname version; - sha256 = "00cxzfifvgcf3d3s8lsj1yxcwyf3a1964p86fj7b42q8pa0b4r3i"; + inherit (finalAttrs) pname version; + sha256 = "sha256-ouuCwipCQKSlH8NpF5QZd4jx4mEYooyIcnRhtDRWOnU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pygments dominate beautifulsoup4 docutils + myst-parser sphinx ]; + pythonImportsCheck = [ "alectryon" ]; + doCheck = false; meta = { @@ -36,4 +43,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ Zimmi48 ]; }; -} +}) diff --git a/pkgs/development/python-modules/cuda-pathfinder/default.nix b/pkgs/development/python-modules/cuda-pathfinder/default.nix index d70070d20644..ce922a403f35 100644 --- a/pkgs/development/python-modules/cuda-pathfinder/default.nix +++ b/pkgs/development/python-modules/cuda-pathfinder/default.nix @@ -14,7 +14,7 @@ buildPythonPackage (finalAttrs: { pname = "cuda-pathfinder"; - version = "1.5.4"; + version = "1.5.5"; pyproject = true; __structuredAttrs = true; @@ -22,7 +22,7 @@ buildPythonPackage (finalAttrs: { owner = "NVIDIA"; repo = "cuda-python"; tag = "cuda-pathfinder-v${finalAttrs.version}"; - hash = "sha256-0hUcc9jZooN7yQ63MJhpNJb1IyfwwTRbp4NjjbK4y1A="; + hash = "sha256-hvCwN6uLGiZLdAholFy3Jqb+ys7mAqVNc9UonPXm3+M="; }; sourceRoot = "${finalAttrs.src.name}/cuda_pathfinder"; diff --git a/pkgs/development/python-modules/dbgpu/default.nix b/pkgs/development/python-modules/dbgpu/default.nix new file mode 100644 index 000000000000..ee31a2e407a3 --- /dev/null +++ b/pkgs/development/python-modules/dbgpu/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + + setuptools, + + click, + pydantic, + + thefuzz, +}: + +buildPythonPackage (finalAttrs: { + pname = "dbgpu"; + version = "2025.12"; + pyproject = true; + + src = fetchPypi { + inherit (finalAttrs) pname version; + hash = "sha256-1KL9w2/1/yrzfo/Yo+B0CrKvc8xeD9oZn9/z1vFob04="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + click + pydantic + ]; + + optional-dependencies = { + fuzz = [ thefuzz ]; + }; + + pythonImportsCheck = [ "dbgpu" ]; + + meta = { + description = "A small, easy-to-use open source database of over 2000 GPUs with architecture, manufacturing, API support and performance details"; + homepage = "https://github.com/painebenjamin/dbgpu"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jaredmontoya ]; + mainProgram = "dbgpu"; + }; +}) diff --git a/pkgs/development/python-modules/executorch/default.nix b/pkgs/development/python-modules/executorch/default.nix index 16c5f2255d10..c727a336c17e 100644 --- a/pkgs/development/python-modules/executorch/default.nix +++ b/pkgs/development/python-modules/executorch/default.nix @@ -102,6 +102,12 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: { sed -i "1i #include " backends/apple/coreml/runtime/inmemoryfs/memory_buffer.hpp sed -i "1i #include " extension/llm/tokenizers/third-party/sentencepiece/src/sentencepiece_processor.h + '' + + '' + substituteInPlace extension/llm/tokenizers/test/test_python_bindings.py \ + --replace-fail \ + 'self.assertEqual(pytorch_tokenizers.__version__, "0.1.0")' \ + 'self.assertEqual(pytorch_tokenizers.__version__, "${pytorch-tokenizers.version}")' ''; env = { diff --git a/pkgs/development/python-modules/flash-attn-4/default.nix b/pkgs/development/python-modules/flash-attn-4/default.nix new file mode 100644 index 000000000000..072f4a43ad16 --- /dev/null +++ b/pkgs/development/python-modules/flash-attn-4/default.nix @@ -0,0 +1,68 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + setuptools-scm, + + # dependencies + apache-tvm-ffi, + cuda-bindings, + einops, + nvidia-cutlass-dsl, + quack-kernels, + torch, + torch-c-dlpack-ext, +}: +buildPythonPackage (finalAttrs: { + pname = "flash-attn-4"; + version = "4.0.0.beta15"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "Dao-AILab"; + repo = "flash-attention"; + tag = "fa4-v${finalAttrs.version}"; + hash = "sha256-k6158mEJocKIRS4MQIM+Ih4VMHnXCKJGcykZFi91J2w="; + }; + + # FA4 is a separate distribution shipped under flash_attn/cute/ with its own pyproject.toml. + # The top-level setup.py builds the classic compiled flash-attn and excludes flash_attn.cute. + sourceRoot = "${finalAttrs.src.name}/flash_attn/cute"; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + apache-tvm-ffi + cuda-bindings + einops + nvidia-cutlass-dsl + quack-kernels + torch + torch-c-dlpack-ext + ]; + + pythonImportsCheck = [ "flash_attn.cute" ]; + + # No tests + doCheck = false; + + meta = { + description = "CuTeDSL-based implementation of FlashAttention for Hopper and Blackwell GPUs"; + homepage = "https://github.com/Dao-AILab/flash-attention/tree/main/flash_attn/cute"; + changelog = "https://github.com/Dao-AILab/flash-attention/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + GaetanLepage + prince213 + ]; + }; +}) diff --git a/pkgs/development/python-modules/html2pdf4doc/default.nix b/pkgs/development/python-modules/html2pdf4doc/default.nix index 216d5ed88243..f47f4012a0f5 100644 --- a/pkgs/development/python-modules/html2pdf4doc/default.nix +++ b/pkgs/development/python-modules/html2pdf4doc/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "html2pdf4doc"; - version = "0.0.31"; + version = "0.0.33"; pyproject = true; src = fetchFromGitHub { owner = "mettta"; repo = "html2pdf4doc_python"; tag = version; - hash = "sha256-ailiZfqO2NacJmCbWWtZ2bnerjc9mdJZKDVWNUTMEAg="; + hash = "sha256-d5Y1llC7Yb1Vw2tvxAhgIw7wk18mFJ+sm8Rrr+UwxUI="; }; build-system = [ diff --git a/pkgs/development/python-modules/moyopy/default.nix b/pkgs/development/python-modules/moyopy/default.nix index ba3bbdb78128..1523fe4f4482 100644 --- a/pkgs/development/python-modules/moyopy/default.nix +++ b/pkgs/development/python-modules/moyopy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: { pname = "moyopy"; - version = "0.9.0"; + version = "0.10.0"; pyproject = true; __structuredAttrs = true; @@ -24,7 +24,7 @@ buildPythonPackage (finalAttrs: { owner = "spglib"; repo = "moyo"; tag = "v${finalAttrs.version}"; - hash = "sha256-aOkxA9oQjP7EEJ+VoXTy+Hb8wHZD1V3hS4Xwhc0GsOM="; + hash = "sha256-C1260FQ/V/puPU41LQHxsvvQ3BAabxRKWBCVEm79gp0="; }; sourceRoot = "${finalAttrs.src.name}/moyopy"; @@ -47,7 +47,7 @@ buildPythonPackage (finalAttrs: { sourceRoot cargoRoot ; - hash = "sha256-+Qhxn2nvPN4FKlz6nyPtxQeHcu/3bgmtvkgAM2gp85I="; + hash = "sha256-M/AWtXfexXbnFHYd6DxxrRSTuejXdt0DVxU/XtT9iPQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix index 49a93b0021d6..210e0b730448 100644 --- a/pkgs/development/python-modules/oelint-data/default.nix +++ b/pkgs/development/python-modules/oelint-data/default.nix @@ -8,7 +8,7 @@ buildPythonPackage (finalAttrs: { pname = "oelint-data"; - version = "1.5.1"; + version = "1.5.2"; pyproject = true; __structuredAttrs = true; @@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: { owner = "priv-kweihmann"; repo = "oelint-data"; tag = finalAttrs.version; - hash = "sha256-9dsiyWVQ5FGspOXq9pyHatSfOtmOYKUP74CHDS7RoD8="; + hash = "sha256-M0vGXXoQvVW6801gWQ6gf6/Z/ZFzREfVlHD6pTyG7rU="; }; build-system = [ diff --git a/pkgs/development/python-modules/pytorch-tokenizers/default.nix b/pkgs/development/python-modules/pytorch-tokenizers/default.nix index 842cef4a1697..55e789733d5c 100644 --- a/pkgs/development/python-modules/pytorch-tokenizers/default.nix +++ b/pkgs/development/python-modules/pytorch-tokenizers/default.nix @@ -30,15 +30,16 @@ let in buildPythonPackage (finalAttrs: { pname = "pytorch-tokenizers"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "meta-pytorch"; repo = "tokenizers"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-4VWOKCdRx1VpYoJq7LYfpdcAAQeHnLD5mxI65XrrEHs="; + hash = "sha256-1G6mDUSwy4KXKgdtEimj9rrQDonGHdo8R8DvPQppvwE="; }; patches = [ @@ -62,6 +63,17 @@ buildPythonPackage (finalAttrs: { ]; dontUseCmakeConfigure = true; + # pkgs/by-name/cm/cmake/setup-hook.sh + preBuild = '' + if ! [[ -v enableParallelBuilding ]]; then + enableParallelBuilding=1 + echo "cmake: enabled parallel building" + fi + if [[ "$enableParallelBuilding" -ne 0 ]]; then + export CMAKE_BUILD_PARALLEL_LEVEL=$NIX_BUILD_CORES + fi + ''; + dependencies = [ sentencepiece tiktoken @@ -90,6 +102,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "C++ implementations for various tokenizers (sentencepiece, tiktoken, etc.)"; homepage = "https://github.com/meta-pytorch/tokenizers"; + changelog = "https://github.com/meta-pytorch/tokenizers/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ GaetanLepage ]; }; diff --git a/pkgs/development/python-modules/rpy2-robjects/default.nix b/pkgs/development/python-modules/rpy2-robjects/default.nix index 01e9e2e16602..72034f447237 100644 --- a/pkgs/development/python-modules/rpy2-robjects/default.nix +++ b/pkgs/development/python-modules/rpy2-robjects/default.nix @@ -16,7 +16,7 @@ }: buildPythonPackage rec { - version = "3.6.3"; + version = "3.6.5"; pyproject = true; pname = "rpy2-robjects"; @@ -25,7 +25,7 @@ buildPythonPackage rec { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${ builtins.replaceStrings [ "-" ] [ "_" ] pname }-${version}.tar.gz"; - hash = "sha256-cxqhpJBcSyXAVk1yy/2F+SMBAvmJ56IlFYhekdTfPUA="; + hash = "sha256-A9CZ9DagGotR+4+L9gJCCpnHzdqMP84OOg9TLja0r+Q="; }; patches = [ diff --git a/pkgs/development/python-modules/schemdraw/default.nix b/pkgs/development/python-modules/schemdraw/default.nix index cab4e58a4ebf..38e2ee2bad65 100644 --- a/pkgs/development/python-modules/schemdraw/default.nix +++ b/pkgs/development/python-modules/schemdraw/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "schemdraw"; - version = "0.22"; + version = "0.23"; pyproject = true; src = fetchFromGitHub { owner = "cdelker"; repo = "schemdraw"; tag = version; - hash = "sha256-trhpPv9x+S4d9AHT52/uvuCDOX4tJj6EhPzYBxtzyeQ="; + hash = "sha256-NAvJDrJKf4CYs9W4zdNAU8WnuXlCK6FU44+5flWzyAk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/rocq-modules/vsrocq-language-server/default.nix b/pkgs/development/rocq-modules/vsrocq-language-server/default.nix index d5965f8a4e7e..b65295d03b47 100644 --- a/pkgs/development/rocq-modules/vsrocq-language-server/default.nix +++ b/pkgs/development/rocq-modules/vsrocq-language-server/default.nix @@ -17,7 +17,7 @@ let in lib.switch rocq-core.rocq-version [ # When updating the default version here, also update the VsRocq VS Code extension - (case (lib.versions.range "8.18" "9.1") "2.3.4") + (case (lib.versions.range "8.18" "9.1") "2.4.3") ] null; location = { domain = "github.com"; @@ -31,6 +31,8 @@ let release."2.3.3".sha256 = "sha256-wgn28wqWhZS4UOLUblkgXQISgLV+XdSIIEMx9uMT/ig="; release."2.3.4".rev = "v2.3.4"; release."2.3.4".sha256 = "sha256-v1hQjE8U1o2VYOlUjH0seIsNG+NrMNZ8ixt4bQNyGvI="; + release."2.4.3".rev = "v2.4.3"; + release."2.4.3".sha256 = "sha256-R/fpTiYZ9uvtKQcWD4jwUZPvUrcdvHc/wpoTrdkEQoQ="; inherit location; }; fetched = fetch (if version != null then version else defaultVersion); diff --git a/pkgs/development/web/nodejs/v26.nix b/pkgs/development/web/nodejs/v26.nix index 7abb9b12f71f..930d8a474aa4 100644 --- a/pkgs/development/web/nodejs/v26.nix +++ b/pkgs/development/web/nodejs/v26.nix @@ -23,8 +23,8 @@ let [ ]; in buildNodejs { - version = "26.2.0"; - sha256 = "ea82be7db418f54b3ef153a02d44d4f6748466f4765ae80bc484f34af40df610"; + version = "26.3.0"; + sha256 = "319ad5d7d20cc622e55eb75b9f1a2546b77a08bd462b67030d0c89316c2c2349"; patches = ( if (stdenv.hostPlatform.emulatorAvailable buildPackages) then diff --git a/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix b/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix index d2859e1b8342..cda6f31556be 100644 --- a/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix +++ b/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "magico13"; domain = "emporia_vue"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "magico13"; repo = "ha-emporia-vue"; rev = "v${version}"; - hash = "sha256-6VeyKmFKbBG6MgQqylkTg1blZJlBKBWYdkUmCYyEV2I="; + hash = "sha256-kdTM5keDxRNz46uwq+tXIv7Hz80lxmbQVVzk7bmRm1w="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix b/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix index 050a1b771cd3..94864fb3b271 100644 --- a/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix +++ b/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix @@ -11,13 +11,13 @@ buildHomeAssistantComponent rec { owner = "pymitsubishi"; domain = "mitsubishi"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "pymitsubishi"; repo = "homeassistant-mitsubishi"; tag = "v${version}"; - hash = "sha256-qP2jLkDeiNMdTlHg0G8AryRb2v0ohGnkIoQWIWvbTbs="; + hash = "sha256-F9T2egZEEUrXYgPmYFwHO+WasYwbgoHtUZf4RFar9Ck="; }; dependencies = [ diff --git a/pkgs/servers/monitoring/zabbix/agent.nix b/pkgs/servers/monitoring/zabbix/agent.nix index 8266301b77c3..d96790f9841b 100644 --- a/pkgs/servers/monitoring/zabbix/agent.nix +++ b/pkgs/servers/monitoring/zabbix/agent.nix @@ -5,7 +5,6 @@ pkg-config, libiconv, openssl, - pcre, pcre2, }: @@ -26,14 +25,14 @@ import ./versions.nix ( buildInputs = [ libiconv openssl - (if (lib.versions.major version >= "7" && lib.versions.minor version >= "4") then pcre2 else pcre) + pcre2 ]; configureFlags = [ "--enable-agent" "--enable-ipv6" "--with-iconv" - "--with-libpcre" + "--with-libpcre2" "--with-openssl=${openssl.dev}" ]; makeFlags = [ diff --git a/pkgs/servers/monitoring/zabbix/agent2.nix b/pkgs/servers/monitoring/zabbix/agent2.nix index 1bd5bae89d3a..c6bd5ba7af18 100644 --- a/pkgs/servers/monitoring/zabbix/agent2.nix +++ b/pkgs/servers/monitoring/zabbix/agent2.nix @@ -6,7 +6,6 @@ pkg-config, libiconv, openssl, - pcre, pcre2, zlib, }: @@ -37,7 +36,7 @@ import ./versions.nix ( buildInputs = [ libiconv openssl - (if (lib.versions.major version >= "7" && lib.versions.minor version >= "4") then pcre2 else pcre) + pcre2 zlib ]; @@ -57,7 +56,7 @@ import ./versions.nix ( --enable-agent2 \ --enable-ipv6 \ --with-iconv \ - --with-libpcre \ + --with-libpcre2 \ --with-openssl=${openssl.dev} ''; diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index 688524e6f3ec..87fc5caa8591 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -7,7 +7,6 @@ libevent, libiconv, openssl, - pcre, pcre2, zlib, buildPackages, @@ -64,7 +63,7 @@ import ./versions.nix ( libevent libiconv openssl - (if (lib.versions.major version >= "7" && lib.versions.minor version >= "4") then pcre2 else pcre) + pcre2 zlib ] ++ optional odbcSupport unixodbc @@ -80,7 +79,7 @@ import ./versions.nix ( "--with-iconv" "--with-libcurl" "--with-libevent" - "--with-libpcre" + "--with-libpcre2" "--with-openssl=${openssl.dev}" "--with-zlib=${zlib}" ] diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index 9a01605a6238..901f79c00cb7 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -9,7 +9,6 @@ libiconv, libxml2, openssl, - pcre, pcre2, zlib, jabberSupport ? true, @@ -61,7 +60,7 @@ import ./versions.nix ( libiconv libxml2 openssl - (if lib.versionAtLeast version "7.4" then pcre2 else pcre) + pcre2 zlib ] ++ optional odbcSupport unixodbc @@ -79,7 +78,7 @@ import ./versions.nix ( "--with-iconv" "--with-libcurl" "--with-libevent" - "--with-libpcre" + "--with-libpcre2" "--with-libxml2" "--with-openssl=${openssl.dev}" "--with-zlib=${zlib}" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bc8ede1d87e7..192c8db0d5ae 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -402,6 +402,7 @@ mapAliases { blueberry = throw "'blueberry' has been removed as it is unmaintained upstream. Consider using blueman instead"; # Added 2026-03-09 bmap-tools = throw "'bmap-tools' has been renamed to/replaced by 'bmaptool'"; # Converted to throw 2025-10-27 bob = throw "'bob' has been removed as it is unmaintained upstream and has vulnerable dependencies."; # Added 2025-12-29 + bodyclose = throw "'bodyclose' has been removed because it was broken for an entire release cycle."; # Added 2026-05-31 boost177 = throw "Boost 1.77 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2026-04-20 botan2 = throw "botan2 has been removed as it is EOL"; # Added 2025-10-20 bower2nix = throw "bower2nix has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17 @@ -1958,6 +1959,7 @@ mapAliases { sierra-breeze-enhanced = throw "'sierra-breeze-enhanced' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 signal-desktop-bin = throw "'signal-desktop-bin' has been replaced by 'signal-desktop' which is built from source"; # Added 2026-03-02 signal-desktop-source = throw "'signal-desktop-source' has been renamed to/replaced by 'signal-desktop'"; # Converted to throw 2025-10-27 + silver-searcher = throw "'silver-surfer' has been removed as it has seen no development since 2020 and is stuck on the obsolete pcre library"; simpleBluez = warnAlias "'simpleBluez' has been renamed to 'simplebluez'" simplebluez; # Added 2026-02-18 simpleDBus = warnAlias "'simpleDBus' has been renamed to 'simpledbus'" simpledbus; # Added 2026-02-12 simplesamlphp = throw "'simplesamlphp' was removed because it was unmaintained in nixpkgs"; # Added 2025-10-17 @@ -2057,6 +2059,7 @@ mapAliases { superTux = warnAlias "'superTux' has been renamed to 'supertux'" supertux; # Added 2026-02-12 superTuxKart = warnAlias "'superTuxKart' has been renamed to 'supertuxkart'" supertuxkart; # Added 2026-02-12 surge-XT = warnAlias "'surge-XT' has been renamed to 'surge-xt'" surge-xt; # Added 2026-02-12 + svnfs = throw "'svnfs' has been removed as it was unmaintained upstream"; # Added 2026-06-01 svox = warnAlias "'svox' has been renamed to/replaced by 'picotts'" picotts; # Added 2026-03-04 svt-av1-psy = warnAlias "'svt-av1-psy' has been replaced by 'svt-av1-psyex'" svt-av1-psyex; # Added 2026-01-10 swagger-cli = throw "'swagger-cli' has been removed as it is broken and unmaintained. Upstream suggests using 'redocly' instead"; # Added 2026-04-23 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fec3053e53d8..ffe1520697b8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3712,6 +3712,8 @@ self: super: with self; { dbglib = callPackage ../development/python-modules/dbglib { }; + dbgpu = callPackage ../development/python-modules/dbgpu { }; + dbt-adapters = callPackage ../development/python-modules/dbt-adapters { }; dbt-bigquery = callPackage ../development/python-modules/dbt-bigquery { }; @@ -5703,6 +5705,8 @@ self: super: with self; { flash-attn = callPackage ../development/python-modules/flash-attn { }; + flash-attn-4 = callPackage ../development/python-modules/flash-attn-4 { }; + flash-mla = callPackage ../development/python-modules/flash-mla { }; flashinfer = callPackage ../development/python-modules/flashinfer { };