diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 42c0657a8c62..98a3cbacd816 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5103,12 +5103,6 @@ githubId = 68112; name = "Simon"; }; - cirno-999 = { - email = "reverene@protonmail.com"; - github = "cirno-999"; - githubId = 73712874; - name = "cirno-999"; - }; citadelcore = { email = "alex@arctarus.co.uk"; github = "RealityAnomaly"; @@ -11906,12 +11900,6 @@ github = "ivan-timokhin"; githubId = 9802104; }; - ivan-tkatchev = { - email = "tkatchev@gmail.com"; - github = "ivan-tkatchev"; - githubId = 650601; - name = "Ivan Tkatchev"; - }; ivan770 = { email = "ivan@ivan770.me"; github = "ivan770"; diff --git a/nixos/modules/programs/wayland/hyprland.nix b/nixos/modules/programs/wayland/hyprland.nix index c3fba1db7548..cd041ad85f91 100644 --- a/nixos/modules/programs/wayland/hyprland.nix +++ b/nixos/modules/programs/wayland/hyprland.nix @@ -107,9 +107,9 @@ in services.displayManager.sessionPackages = [ cfg.package ]; systemd = lib.mkIf cfg.systemd.setPath.enable { - user.extraConfig = '' - DefaultEnvironment="PATH=/run/wrappers/bin:/etc/profiles/per-user/%u/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:$PATH" - ''; + user.settings.Manager = { + DefaultEnvironment = "PATH=/run/wrappers/bin:/etc/profiles/per-user/%u/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:$PATH"; + }; }; } diff --git a/nixos/modules/services/misc/llama-cpp.nix b/nixos/modules/services/misc/llama-cpp.nix index c2d267a1bc98..80a6ab17b0ce 100644 --- a/nixos/modules/services/misc/llama-cpp.nix +++ b/nixos/modules/services/misc/llama-cpp.nix @@ -164,7 +164,7 @@ in }; }; - networking.firewall.allowedTCPPorts = lib.optional cfg.openFirewall cfg.port; + networking.firewall.allowedTCPPorts = lib.optional cfg.openFirewall cfg.settings.port; }; meta.maintainers = with lib.maintainers; [ diff --git a/nixos/modules/services/networking/haproxy.nix b/nixos/modules/services/networking/haproxy.nix index 0397b5f2d641..0d9271854882 100644 --- a/nixos/modules/services/networking/haproxy.nix +++ b/nixos/modules/services/networking/haproxy.nix @@ -68,13 +68,10 @@ in # when the master process receives USR2, it reloads itself using exec(argv[0]), # so we create a symlink there and update it before reloading "${pkgs.coreutils}/bin/ln -sf ${lib.getExe cfg.package} /run/haproxy/haproxy" - # when running the config test, don't be quiet so we can see what goes wrong - "/run/haproxy/haproxy -c -f ${haproxyCfg}" ]; ExecStart = "/run/haproxy/haproxy -Ws -f /etc/haproxy.cfg -p /run/haproxy/haproxy.pid"; # support reloading ExecReload = [ - "${lib.getExe cfg.package} -c -f ${haproxyCfg}" "${pkgs.coreutils}/bin/ln -sf ${lib.getExe cfg.package} /run/haproxy/haproxy" "${pkgs.coreutils}/bin/kill -USR2 $MAINPID" ]; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c7a78d5e9ffb..d0e374351c8b 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -320,8 +320,8 @@ let mktplcRef = { name = "vscode-apollo"; publisher = "apollographql"; - version = "2.6.5"; - hash = "sha256-WOt0bY/hi9tLJEo0bTAPLQhgM+2A7JPp0pypX4EcYNo="; + version = "2.6.6"; + hash = "sha256-rvLZoLY0P031ZAjeYXNqPVYwRNkCRYUvedosxM51opc="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/apollographql.vscode-apollo/changelog"; @@ -2030,8 +2030,8 @@ let mktplcRef = { name = "Go"; publisher = "golang"; - version = "0.52.2"; - hash = "sha256-8g+r4Mv06Bx1W3yAXWVbtz1B/gXPcRdmaV0tPkTP6Gk="; + version = "0.54.0"; + hash = "sha256-o1SJjR6eQcGWN9BGoN5CBTdn6RsNG2a0+p/ZDcywzr0="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/golang.Go/changelog"; @@ -4130,8 +4130,8 @@ let mktplcRef = { name = "scala"; publisher = "scala-lang"; - version = "0.5.9"; - hash = "sha256-zgCqKwnP7Fm655FPUkD5GL+/goaplST8507X890Tnhc="; + version = "0.5.10"; + hash = "sha256-hGJbu/tRt1Du/OYuui7z/CINlMug/SlUQjPNy8Rvkxg="; }; meta = { license = lib.licenses.mit; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6943d1d6ba2e..f2d1b48c691b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -155,13 +155,13 @@ "vendorHash": "sha256-SO3CX7pZ+q7ytz/55cxTPlW7ByY1zKhxkQxMiqAvm8o=" }, "checkly_checkly": { - "hash": "sha256-C85OWP4y5Kh4coaUwxW07bgQWrB6LntEKtXia3Xu7Bg=", + "hash": "sha256-9kcZXbrfl8ovrg1w3bWdta/ABnLtVIfseRptZn5NrgI=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", "repo": "terraform-provider-checkly", - "rev": "v1.24.0", + "rev": "v1.25.0", "spdx": null, - "vendorHash": "sha256-CkrDrGP20Gby2wWsl+un3hp3u5gAmWOpjzgs9HQytjg=" + "vendorHash": "sha256-7XgTkzYBfkpF8Dd4YsgpB+YIfkANsg/60b3AyO8Y8FA=" }, "ciscodevnet_aci": { "hash": "sha256-Z3qat3S7dv5kGpc82RxAwlgp3hfscFbkokVsgGnBRHY=", @@ -851,13 +851,13 @@ "vendorHash": "sha256-OgKOjLwDQxJiv+VWdOzjMcUDPu9LOuhyTRyLyM39vLM=" }, "linode_linode": { - "hash": "sha256-ZDU8rEmbq9tIXq9+jL30i5GnTIWM6lMJ+rljVJhBJis=", + "hash": "sha256-aOLto01ntce/l+1ZcQf5Rsdu6ptgpYWpf5JpJ0zRUNs=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v3.14.0", + "rev": "v3.14.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-6wWNt0TDqqwtRFMCLH81WQ55XLEn4dHx+prM0DA+e4U=" + "vendorHash": "sha256-dnvv6sSzEUZ4Hbrq/pAgi/O1RyxCx89omCVzvCe70S0=" }, "loafoe_htpasswd": { "hash": "sha256-1HCvAGWsYlcYCA8iOmBb/AawxHPLuoxxQWLzNy0x79M=", diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index 35372d9e4fb8..d69c5f484959 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -893,7 +893,7 @@ rec { # Docs in doc/build-helpers/fetchers.chapter.md # See https://nixos.org/manual/nixpkgs/unstable/#requirefile requireFile = lib.extendMkDerivation { - constructDrv = stdenv.mkDerivation; + constructDrv = stdenvNoCC.mkDerivation; excludeDrvArgNames = [ "hash" diff --git a/pkgs/build-support/trivial-builders/test/default.nix b/pkgs/build-support/trivial-builders/test/default.nix index 836a29342168..e83a41a1cc7b 100644 --- a/pkgs/build-support/trivial-builders/test/default.nix +++ b/pkgs/build-support/trivial-builders/test/default.nix @@ -25,6 +25,7 @@ recurseIntoAttrs { symlinkJoin = recurseIntoAttrs (callPackage ./symlink-join.nix { }); overriding = callPackage ../test-overriding.nix { }; inherit references; + requireFile = callPackage ./requireFile.nix { }; writeCBin = callPackage ./writeCBin.nix { }; writeClosure-union = callPackage ./writeClosure-union.nix { inherit (references) samples; diff --git a/pkgs/build-support/trivial-builders/test/requireFile.nix b/pkgs/build-support/trivial-builders/test/requireFile.nix new file mode 100644 index 000000000000..da06e73646d1 --- /dev/null +++ b/pkgs/build-support/trivial-builders/test/requireFile.nix @@ -0,0 +1,22 @@ +{ + pkgsStatic, + lib, + requireFile, + emptyFile, +}: +let + name = "this-is-a-test"; + requireFileTest = + requireFile: + requireFile { + inherit name; + url = "this-is-a-test"; + hash = lib.fakeHash; + }; + requireFile-native = requireFileTest requireFile; + requireFile-static = requireFileTest pkgsStatic.requireFile; +in +assert lib.assertMsg ( + requireFile-native.name == name && requireFile-static.name == name +) "requireFile derivation name must be the same across different package sets"; +emptyFile diff --git a/pkgs/by-name/ab/ab-av1/package.nix b/pkgs/by-name/ab/ab-av1/package.nix index e6bf4c01c2c3..04446daddba3 100644 --- a/pkgs/by-name/ab/ab-av1/package.nix +++ b/pkgs/by-name/ab/ab-av1/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ab-av1"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "alexheretic"; repo = "ab-av1"; tag = "v${finalAttrs.version}"; - hash = "sha256-kT0BJr4xoYigKObD6vZNRieslaJj/MWuqQmhYLWNwvs="; + hash = "sha256-lLZAECwF8V19Qx/FugbjLeVns7lhVlwWDTK9cdYb0xo="; }; - cargoHash = "sha256-o64GrmHvwF2VUKw+nIRK0jesSuelxNo0TFnyKaP/YlQ="; + cargoHash = "sha256-AONJz1BoDi6weHT7W9DmzwoPW5khfgYjDqLNl7OM5bY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/al/alglib/package.nix b/pkgs/by-name/al/alglib/package.nix index 67ede7419971..d545e8f148a5 100644 --- a/pkgs/by-name/al/alglib/package.nix +++ b/pkgs/by-name/al/alglib/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "alglib3"; - version = "4.07.0"; + version = "4.08.0"; src = fetchurl { url = "https://www.alglib.net/translator/re/alglib-${finalAttrs.version}.cpp.gpl.tgz"; - sha256 = "sha256-y4mlU+4gKwqUFgUHKoVxAjdq5EsMzSJeT6Dg4Llwi/A="; + sha256 = "sha256-mKPtCE+wLFagvBVDida8oQCyO7N0klWkyHFjkip3aoY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/al/alpaca-proxy/package.nix b/pkgs/by-name/al/alpaca-proxy/package.nix index 9db4f78d4720..959a64a7867e 100644 --- a/pkgs/by-name/al/alpaca-proxy/package.nix +++ b/pkgs/by-name/al/alpaca-proxy/package.nix @@ -30,7 +30,7 @@ buildGoModule (finalAttrs: { meta = { description = "HTTP forward proxy with PAC and NTLM authentication support"; homepage = "https://github.com/samuong/alpaca"; - changelog = "https://github.com/samuong/alpaca/releases/tag/v${finalAttrs.src.rev}"; + changelog = "https://github.com/samuong/alpaca/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ _1nv0k32 ]; diff --git a/pkgs/by-name/am/aml/package.nix b/pkgs/by-name/am/aml/package.nix index c55e9dc25011..b185ffb70378 100644 --- a/pkgs/by-name/am/aml/package.nix +++ b/pkgs/by-name/am/aml/package.nix @@ -3,33 +3,34 @@ stdenv, fetchFromGitHub, meson, - pkg-config, ninja, }: stdenv.mkDerivation (finalAttrs: { pname = "aml"; - version = "0.3.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "any1"; repo = "aml"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-BX+MRqvnwwLPhz22m0gfJ2EkW31KQEi/YTgOCMcQk2Q="; + hash = "sha256-10gm6YphZrpLShj3NUj/AG24dSVLZAZbbnXr7GiF4DI="; }; nativeBuildInputs = [ meson - pkg-config ninja ]; + strictDeps = true; + + __structuredAttrs = true; + meta = { - description = "Another main loop"; - inherit (finalAttrs.src.meta) homepage; + description = "Andri's Main Loop"; + homepage = "https://github.com/any1/aml"; license = lib.licenses.isc; - platforms = lib.platforms.unix; - maintainers = [ ]; - broken = stdenv.hostPlatform.isDarwin; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ nickcao ]; }; }) diff --git a/pkgs/by-name/an/anki/addons/anki-quizlet-importer-extended/default.nix b/pkgs/by-name/an/anki/addons/anki-quizlet-importer-extended/default.nix index 8602a87598aa..70b70de85a39 100644 --- a/pkgs/by-name/an/anki/addons/anki-quizlet-importer-extended/default.nix +++ b/pkgs/by-name/an/anki/addons/anki-quizlet-importer-extended/default.nix @@ -5,12 +5,12 @@ }: anki-utils.buildAnkiAddon (finalAttrs: { pname = "anki-quizlet-importer-extended"; - version = "2026.01.17"; + version = "2026.06.08"; src = fetchFromGitHub { owner = "sviatoslav-lebediev"; repo = "anki-quizlet-importer-extended"; tag = "v${finalAttrs.version}"; - hash = "sha256-BTddZColXM193x8xFa1axHeiWukjxXvwkXGpHxsLtR0="; + hash = "sha256-f8Y2Tp3Wo41rKhz/YX602xhxvR7xWUOfvjIKuprt/bo="; }; meta = { description = "Import Quizlet Decks into Anki"; diff --git a/pkgs/by-name/an/antigravity-cli/package.nix b/pkgs/by-name/an/antigravity-cli/package.nix index 0b017339516c..d26b21016e85 100644 --- a/pkgs/by-name/an/antigravity-cli/package.nix +++ b/pkgs/by-name/an/antigravity-cli/package.nix @@ -6,7 +6,7 @@ versionCheckHook, }: let - wholeVersion = "1.0.7-5858071034068992"; # unfortunately this has dumb versioning + wholeVersion = "1.0.8-6513509081677824"; # unfortunately this has dumb versioning version = builtins.head (lib.splitString "-" wholeVersion); throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"; @@ -14,19 +14,19 @@ let sourceData = { x86_64-linux = fetchurl { url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/${wholeVersion}/linux-x64/cli_linux_x64.tar.gz"; - hash = "sha256-8kaHmc0XPAPuATHb4rrkMhUzBqaLqi7n1UQPFcRB4Go="; + hash = "sha256-/BxcglSN6NqZdEbq50MypFW4bv2bCN37L0PqcuYz+e4="; }; aarch64-linux = fetchurl { url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/${wholeVersion}/linux-arm/cli_linux_arm64.tar.gz"; - hash = "sha256-3ylG6ZW/9AuKydzzyMLtqC1ec2NnixFG/CJih26S0K0="; + hash = "sha256-QWQevvVezRdubRbG3V64C/XMHunfDsdA1OM8yhHoCHA="; }; aarch64-darwin = fetchurl { url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/${wholeVersion}/darwin-arm/cli_mac_arm64.tar.gz"; - hash = "sha256-e4VhL/9rUNgE2XyW8REz8QXEbzwsUFg41xNpUHfNLK0="; + hash = "sha256-j+/brIYCKjIOa0KSGZHt4Ic4tjTzOrfPtA4J8iY9tHE="; }; x86_64-darwin = fetchurl { url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/${wholeVersion}/darwin-x64/cli_mac_x64.tar.gz"; - hash = "sha256-SECE7bAd0VneVeAvBs14Ortkcqg8CJy9xcq3ZnuqfKY="; + hash = "sha256-0Cp76whEYtBdZS6GOnC+qqICGoqexX+v3KCFJmfaFAU="; }; }; in diff --git a/pkgs/by-name/ba/bashunit/package.nix b/pkgs/by-name/ba/bashunit/package.nix index 1cea0f4f80c2..74d68aa0b1ec 100644 --- a/pkgs/by-name/ba/bashunit/package.nix +++ b/pkgs/by-name/ba/bashunit/package.nix @@ -17,13 +17,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "bashunit"; - version = "0.36.0"; + version = "0.39.1"; src = fetchFromGitHub { owner = "TypedDevs"; repo = "bashunit"; tag = finalAttrs.version; - hash = "sha256-alhqJ7coRk5O4dYGx8m6u8/j7KMfr2m9Jeb5pn0wwiU="; + hash = "sha256-yMzi2SFEMSNNFztapWavMmbueWwVK0GWjyFR3cJZmTg="; forceFetchGit = true; # needed to include the tests directory for the check phase }; diff --git a/pkgs/by-name/bo/boost-build/package.nix b/pkgs/by-name/bo/boost-build/package.nix index f789f8c0cb82..aec23ef6a32e 100644 --- a/pkgs/by-name/bo/boost-build/package.nix +++ b/pkgs/by-name/bo/boost-build/package.nix @@ -78,6 +78,6 @@ stdenv.mkDerivation { homepage = "https://www.boost.org/build/"; license = lib.licenses.boost; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ ivan-tkatchev ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix b/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix index 749b3a1e8976..52ce2ebdadf4 100644 --- a/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix +++ b/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage { pname = "cosmic-ext-applet-sysinfo"; - version = "0-unstable-2026-05-29"; + version = "0-unstable-2026-06-05"; src = fetchFromGitHub { owner = "cosmic-utils"; repo = "cosmic-ext-applet-sysinfo"; - rev = "1dbaad78d7d06f0b2abaee92996c87adc65c6ba3"; - hash = "sha256-rOgc5IHsCqUAepfbmsuGL8iJKiH4dkGHT65nXUlXxxI="; + rev = "681dfcf86009a84ae76573726d227f949930225b"; + hash = "sha256-HZZxyAzAwEgGWjPUU6MUhO/yShx423FTpvpImhdjGpk="; }; - cargoHash = "sha256-5+QtuxyKOIbzE5piVqeOk6woSm6BGhxFyVJ3xywyeJ0="; + cargoHash = "sha256-KVnvyiF2rXb9gio3o+dE9w/zZ5gcad1uEbWHMBC3yDc="; nativeBuildInputs = [ libcosmicAppHook diff --git a/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix b/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix index 8860427b81b2..4176ee13862a 100644 --- a/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix +++ b/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage { pname = "cosmic-ext-applet-weather"; - version = "0-unstable-2026-05-29"; + version = "0-unstable-2026-06-05"; src = fetchFromGitHub { owner = "cosmic-utils"; repo = "cosmic-ext-applet-weather"; - rev = "a93d0703a1b5129ceabc73292c91d6966b03f0b8"; - hash = "sha256-qeiZD5HgzNxCn2AdNYAW8G0lvjADppm9JctShVHgJko="; + rev = "4571eeee76755cc202f11007c4641196ad8a2793"; + hash = "sha256-D/uCIJL79AWRIabps8I82wc0yP9CrOimx0g9dEthd08="; }; cargoHash = "sha256-AHz4gQGGbVMmr/bbUdkfNQq3zx88+kPenq6kDz8IxN8="; diff --git a/pkgs/by-name/cp/cproto/package.nix b/pkgs/by-name/cp/cproto/package.nix index 2c9e3be32dd4..ae5b68d5bf72 100644 --- a/pkgs/by-name/cp/cproto/package.nix +++ b/pkgs/by-name/cp/cproto/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "cproto"; - version = "4.7y"; + version = "4.8"; src = fetchurl { urls = [ @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { # No version listings and apparently no versioned tarball over http(s). "https://invisible-island.net/archives/cproto/cproto-${finalAttrs.version}.tgz" ]; - sha256 = "sha256-C9HYvo/wpMpD+Uf5V1DTT2TtqTyeLKeRAP1gFAt8YzE="; + sha256 = "sha256-DMy5NEdoLH/bTwvb++BdUqgnMx4KGaUhXSw8uFrSklg="; }; # patch made by Joe Khoobyar copied from gentoo bugs diff --git a/pkgs/by-name/cr/crawley/package.nix b/pkgs/by-name/cr/crawley/package.nix index 3abb7ee8197a..1ba0bb9c7dae 100644 --- a/pkgs/by-name/cr/crawley/package.nix +++ b/pkgs/by-name/cr/crawley/package.nix @@ -7,18 +7,18 @@ buildGoModule (finalAttrs: { pname = "crawley"; - version = "1.7.19"; + version = "1.7.20"; src = fetchFromGitHub { owner = "s0rg"; repo = "crawley"; rev = "v${finalAttrs.version}"; - hash = "sha256-d854JL2/ZhEKQUG8tJ7TctDaicWnAKEFl0mJF6MIvls="; + hash = "sha256-paKlo/awxxji1TzCC4jEJT2r2svS6AiI6GiwOiBs4Ps="; }; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-lptFxIt5b7d6hIXdAqakA1K78NGJ86u0p/XfbQMiTsc="; + vendorHash = "sha256-jqJtWLwLO0UsDa6Al2Jb0fc3nwSWMMNc/ikxtMOPpCE="; ldflags = [ "-w" diff --git a/pkgs/by-name/cs/csharp-ls/package.nix b/pkgs/by-name/cs/csharp-ls/package.nix index e93012514bf2..decfbf629b2a 100644 --- a/pkgs/by-name/cs/csharp-ls/package.nix +++ b/pkgs/by-name/cs/csharp-ls/package.nix @@ -11,9 +11,9 @@ in buildDotnetGlobalTool (finalAttrs: { pname = "csharp-ls"; - version = "0.24.0"; + version = "0.25.0"; - nugetHash = "sha256-hpLTqgxwXiycfTaSd3nliS1quNB3VHLpSDBo+V18a9A="; + nugetHash = "sha256-w+zbCCR7ns8a5TqAOlwi5nE3AKWF9xhWG2jLmKbpzeI="; inherit dotnet-sdk; dotnet-runtime = dotnet-sdk; diff --git a/pkgs/by-name/de/deterministic-zip/package.nix b/pkgs/by-name/de/deterministic-zip/package.nix index a7e23a4ef569..7d4eb1b5bc3f 100644 --- a/pkgs/by-name/de/deterministic-zip/package.nix +++ b/pkgs/by-name/de/deterministic-zip/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "deterministic-zip"; - version = "6.0.3"; + version = "6.1.0"; src = fetchFromGitHub { owner = "timo-reymann"; repo = "deterministic-zip"; tag = finalAttrs.version; - hash = "sha256-YQCJ2nAE9/wt+KiU2eXdGXVxFiHZzBMyNX+1sSPtxt4="; + hash = "sha256-zGIij65ziX/nB5wGj1plX0e8uj7EDHYFAAj2mPalibQ="; }; vendorHash = "sha256-hEPZrS2D6YqlaaJXF8uyt+fJ38Adi3WvOq7v9dZuovI="; diff --git a/pkgs/by-name/de/dexter/package.nix b/pkgs/by-name/de/dexter/package.nix index f10dd17adeb1..cff8f20d1dd0 100644 --- a/pkgs/by-name/de/dexter/package.nix +++ b/pkgs/by-name/de/dexter/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "dexter"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "remoteoss"; repo = "dexter"; tag = "v${finalAttrs.version}"; - hash = "sha256-MQ8LxSI2amecFUiNK6vED/nJKHgs5sRT7rJVi6cLdkc="; + hash = "sha256-VrKLi92fCkAL6C5dvydXuwOCp3dYXsDJSGk9rkHv1t8="; }; vendorHash = "sha256-1mJ4HdDCsZl/g8F+L+NrW2ACuiHe2aSheJO/1XfKAb4="; diff --git a/pkgs/by-name/dn/dns-collector/package.nix b/pkgs/by-name/dn/dns-collector/package.nix index 2a5f099884c9..3a113a35d490 100644 --- a/pkgs/by-name/dn/dns-collector/package.nix +++ b/pkgs/by-name/dn/dns-collector/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "dns-collector"; - version = "2.2.3"; + version = "2.3.0"; src = fetchFromGitHub { owner = "dmachard"; repo = "dns-collector"; tag = "v${finalAttrs.version}"; - hash = "sha256-hqSfL3R0fp7uYBGoD1Wu0ZNLq1VnOvcN0n8zzfRXTfA="; + hash = "sha256-5SFdTDuXnVdMFGxoraUMbDV3o476sc9c7D9qWBoQXr4="; }; subPackages = [ "." ]; @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { "-X=github.com/prometheus/common/version.Version=${finalAttrs.version}" ]; - vendorHash = "sha256-i1Ogo5zRYaEgiYMMTUjI2WiL2gABw2r31/WslXLzowI="; + vendorHash = "sha256-eoUsiRGtq1ucAIyeCRNEuro2Qj4iRe+3aE8DrqIcCWs="; passthru.updateScript = nix-update-script { }; @@ -38,8 +38,8 @@ buildGoModule (finalAttrs: { versionCheckProgramArg = "-version"; meta = { - changelog = "https://github.com/dmachart/dns-collector/releases/tag/v${finalAttrs.version}"; - homepage = "https://github.com/dmachart/dns-collector"; + changelog = "https://github.com/dmachard/dns-collector/releases/tag/v${finalAttrs.version}"; + homepage = "https://github.com/dmachard/dns-collector"; description = "Ingesting, pipelining, and enhancing your DNS logs with usage indicators, security analysis, and additional metadata"; license = lib.licenses.mit; mainProgram = "go-dnscollector"; diff --git a/pkgs/by-name/el/electron-mail/package.nix b/pkgs/by-name/el/electron-mail/package.nix index ef689926bd18..22ed742e22d5 100644 --- a/pkgs/by-name/el/electron-mail/package.nix +++ b/pkgs/by-name/el/electron-mail/package.nix @@ -10,20 +10,20 @@ let pname = "electron-mail"; - version = "5.3.6"; + version = "5.3.7"; sources = { x86_64-linux = fetchurl { url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage"; - hash = "sha256-3BWrVMlSUMMmuj6EAmqVtlHGCcminuVHkyPnc3TvgpM="; + hash = "sha256-VJbCQ/4yIuBE4NPDFUbp8t2G/QjUclphH/MghvamDVo="; }; aarch64-darwin = fetchurl { url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-mac-arm64.dmg"; - hash = "sha256-z7j5WrU1F+iX8UDLWS5sXLwHjobPKJZFKXTcHTOQ/Eo="; + hash = "sha256-ulB+dlp6ZBhcBJiLY4k+E/oEWy9XSIuIzd5rTzEq9+4="; }; x86_64-darwin = fetchurl { url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-mac-x64.dmg"; - hash = "sha256-7i0p7mBkzViXGdUrHXTrDDGdIy81p2YIei5Qsk8G5GU="; + hash = "sha256-LbAqUj34m8qSq8sQ1xgCQj9+MfJHoFDRMq+/waMKtzM="; }; }; diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix index c97171567097..046ced1cb339 100644 --- a/pkgs/by-name/fe/fex/package.nix +++ b/pkgs/by-name/fe/fex/package.nix @@ -99,13 +99,13 @@ let in llvmPackages.stdenv.mkDerivation (finalAttrs: { pname = "fex"; - version = "2604"; + version = "2605"; src = fetchFromGitHub { owner = "FEX-Emu"; repo = "FEX"; tag = "FEX-${finalAttrs.version}"; - hash = "sha256-VPlw15vM3wowgba9Z95F/vRYJLaevtt8lJEgw4hYS8w="; + hash = "sha256-N4iiDa9DbET/8wzFmp9FoFQfm0ZmtUT76sipmi8LE/0="; leaveDotGit = true; postFetch = '' @@ -172,6 +172,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { # Temporarily disable failing tests. TODO: investigate the root cause of these failures rm \ + unittests/ASM/FEX_bugs/SegmentAddressOverride.asm \ unittests/ASM/Primary/Primary_63_2.asm \ unittests/32Bit_ASM/Secondary/07_XX_04.asm \ unittests/ASM/Secondary/07_XX_04.asm diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix index 2e6cd985954e..c3d2e420c035 100644 --- a/pkgs/by-name/fl/flyctl/package.nix +++ b/pkgs/by-name/fl/flyctl/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { pname = "flyctl"; - version = "0.4.57"; + version = "0.4.59"; src = fetchFromGitHub { owner = "superfly"; @@ -22,11 +22,11 @@ buildGoModule rec { cd "$out" git rev-parse HEAD > COMMIT ''; - hash = "sha256-1yI3YWXOqm3Y+lHaJFW5vgu7yYpW/hT2uGy0qgb7c5Y="; + hash = "sha256-UDwVwfx/FTLszEK/vTv0P07TBBPsNR+e+jAGxqNwSDk="; }; proxyVendor = true; - vendorHash = "sha256-pqEMVtTXxSQtEILKHNpfiYPiHBrLnP+dRGmczIti7uQ="; + vendorHash = "sha256-XBpLOhC3fY18o0tQZXgyKrQRgd84U5SRo6Rrgkuq4f8="; subPackages = [ "." ]; diff --git a/pkgs/by-name/gh/gh-eco/package.nix b/pkgs/by-name/gh/gh-eco/package.nix index cbe12671bf6a..ca80d2c1abf0 100644 --- a/pkgs/by-name/gh/gh-eco/package.nix +++ b/pkgs/by-name/gh/gh-eco/package.nix @@ -4,7 +4,7 @@ buildGoModule, }: let - version = "0.1.5"; + version = "0.1.6"; in buildGoModule { pname = "gh-eco"; @@ -14,10 +14,10 @@ buildGoModule { owner = "jrnxf"; repo = "gh-eco"; tag = "v${version}"; - hash = "sha256-Xtlz+u31hO81M53V0ZUtxmOgJ60zlspgVyCr181QrRE="; + hash = "sha256-PkZ/5mYAbPAELxW4l4BIck4qedOJ7htWqrH0KEKrF9o="; }; - vendorHash = "sha256-mPZQPjZ+nnsRMYnSWDM9rYeAPvPwAp3vLZXwTNNHSx0="; + vendorHash = "sha256-LrD6mfzilN+5nHBY/j2Jn+poc8ZXpr5rAs2oOkhDZNs="; ldflags = [ "-s" diff --git a/pkgs/by-name/gt/gtest/package.nix b/pkgs/by-name/gt/gtest/package.nix index 27424fb2c83c..49d5de368f04 100644 --- a/pkgs/by-name/gt/gtest/package.nix +++ b/pkgs/by-name/gt/gtest/package.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/google/googletest"; license = lib.licenses.bsd3; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ ivan-tkatchev ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/ha/ha-mcp/package.nix b/pkgs/by-name/ha/ha-mcp/package.nix index 332d0244ce33..0335da534872 100644 --- a/pkgs/by-name/ha/ha-mcp/package.nix +++ b/pkgs/by-name/ha/ha-mcp/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "ha-mcp"; - version = "7.4.1"; + version = "7.7.0"; pyproject = true; src = fetchFromGitHub { owner = "homeassistant-ai"; repo = "ha-mcp"; tag = "v${finalAttrs.version}"; - hash = "sha256-F13BoZinPnv+tlkiVnG7iAkr2JdEbFE0RIEgmHa/yq4="; + hash = "sha256-Gp4C3SRNkgv9GfLkVx/VCMp4/kCORHsp87IHcCaCPKk="; }; build-system = with python3Packages; [ @@ -30,6 +30,7 @@ python3Packages.buildPythonApplication (finalAttrs: { fastmcp httpx pydantic + pydantic-monty python-dotenv truststore websockets diff --git a/pkgs/by-name/im/imagemagick/package.nix b/pkgs/by-name/im/imagemagick/package.nix index 225c2b999cf8..40d518373564 100644 --- a/pkgs/by-name/im/imagemagick/package.nix +++ b/pkgs/by-name/im/imagemagick/package.nix @@ -61,6 +61,7 @@ nixos-icons, perlPackages, python3, + nix-update-script, }: assert libXtSupport -> libX11Support; @@ -204,6 +205,8 @@ stdenv.mkDerivation (finalAttrs: { }; }; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "http://www.imagemagick.org/"; changelog = "https://github.com/ImageMagick/Website/blob/main/ChangeLog.md"; diff --git a/pkgs/by-name/in/intelli-shell/package.nix b/pkgs/by-name/in/intelli-shell/package.nix index 721eeb78e875..cac4d1afcccf 100644 --- a/pkgs/by-name/in/intelli-shell/package.nix +++ b/pkgs/by-name/in/intelli-shell/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "intelli-shell"; - version = "3.4.2"; + version = "3.4.3"; src = fetchFromGitHub { owner = "lasantosr"; repo = "intelli-shell"; rev = "v${finalAttrs.version}"; - hash = "sha256-p0o1KFNo+gR/eTaYGd3HkE1Ndwt8mqQOz0gHzM8lnBk="; + hash = "sha256-oE/o+8+nLO1cW3P/AeVtNOjZgQNl1ze/LCHe7Gx9UEU="; }; - cargoHash = "sha256-xJ2hjv3JlzMcnjoTAzuXA8Hongb9gfuXxnWFBQkffOc="; + cargoHash = "sha256-qK8HioGJfLARjo/fhe3ZOqNeqneGqnlg7I3+7fkMm5I="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/iw/iw/package.nix b/pkgs/by-name/iw/iw/package.nix index 61f5e832915b..8e73ef791494 100644 --- a/pkgs/by-name/iw/iw/package.nix +++ b/pkgs/by-name/iw/iw/package.nix @@ -39,7 +39,9 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.isc; mainProgram = "iw"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + nick-linux + ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/je/jetbrains-toolbox/package.nix b/pkgs/by-name/je/jetbrains-toolbox/package.nix index 637e843db07f..25f9fafe6104 100644 --- a/pkgs/by-name/je/jetbrains-toolbox/package.nix +++ b/pkgs/by-name/je/jetbrains-toolbox/package.nix @@ -10,7 +10,7 @@ let pname = "jetbrains-toolbox"; - version = "3.4.3.81140"; + version = "3.5.0.84344"; updateScript = ./update.sh; @@ -58,10 +58,10 @@ let aarch64 = "-arm64"; }; hash = selectSystem { - x86_64-linux = "sha256-cDquMMb2gcRv6juEo2Ty4KgoKG5zBYtq+0mppnq4vyU="; - aarch64-linux = "sha256-jF9Evg6IZVEz6Nsl8XYb0nIyaO/yqdEEYOs+k2vZ8jo="; - x86_64-darwin = "sha256-AiaER3tqV1GXL3E1ImWdIjWt/iElt+kxNTHz7bpgeQw="; - aarch64-darwin = "sha256-UIh7HRx+ofdnxA8Bv6kI2L0pFmWW0UMApexffe+9bY0="; + x86_64-linux = "sha256-u+ATMiioJAmr8wTde4g1hB/DZqPnLZoPNJp6Oiq6m5o="; + aarch64-linux = "sha256-5sOJ7nrhNDCtAlrh2yoCUX/nGDm6gM5gV/y592zWQqQ="; + x86_64-darwin = "sha256-o2v30FIeVafjKXWjwEY9Mw+rbNfQyXJZUvDF6+DAR58="; + aarch64-darwin = "sha256-DDGoHMltZWW/7LtHdDiMwS7HEgs8iPrJqc0XC6YolpY="; }; in selectKernel { diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix index bda9fa1ae2a2..7ccbcaf947dd 100644 --- a/pkgs/by-name/la/lazysql/package.nix +++ b/pkgs/by-name/la/lazysql/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "lazysql"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "jorgerojas26"; repo = "lazysql"; rev = "v${version}"; - hash = "sha256-XjBEbaNxdKnfheTeb0wPkqzYMs62TDJ6ZrUmvfxzdew="; + hash = "sha256-srQyUQM7lvJD5SLLX9tr3x8U2/sv/fIrspUgSPbnsac="; }; vendorHash = "sha256-FbAt/HsjoxqAKWQqqWN2xuyyTG2Ic4DcyEU4O0rjpQE="; diff --git a/pkgs/by-name/lu/lunatask/package.nix b/pkgs/by-name/lu/lunatask/package.nix index 6e9f57bcb55c..9ccb3333104d 100644 --- a/pkgs/by-name/lu/lunatask/package.nix +++ b/pkgs/by-name/lu/lunatask/package.nix @@ -6,12 +6,12 @@ }: let - version = "2.1.28"; + version = "2.1.29"; pname = "lunatask"; src = fetchurl { url = "https://github.com/lunatask/lunatask/releases/download/v${version}/Lunatask-${version}.AppImage"; - hash = "sha256-ojsep3WVHbaUSZWVoDn8XRtjeriLcNrhzS7bFdh7/6A="; + hash = "sha256-Ds1aOejeFA4Gl9ysnp1NOgsoJSz5OA/k4gOBRCj5KZo="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/ma/makerpm/package.nix b/pkgs/by-name/ma/makerpm/package.nix index d7edcd74cb97..b32bdc2ee916 100644 --- a/pkgs/by-name/ma/makerpm/package.nix +++ b/pkgs/by-name/ma/makerpm/package.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "makerpm"; license = lib.licenses.free; platforms = lib.platforms.all; - maintainers = [ lib.maintainers.ivan-tkatchev ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/mc/mcp-server-git/package.nix b/pkgs/by-name/mc/mcp-server-git/package.nix index f5f78899a692..2d36a3921180 100644 --- a/pkgs/by-name/mc/mcp-server-git/package.nix +++ b/pkgs/by-name/mc/mcp-server-git/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "mcp-server-git"; - version = "2026.1.26"; + version = "2026.6.3"; pyproject = true; src = fetchFromGitHub { owner = "modelcontextprotocol"; repo = "servers"; tag = finalAttrs.version; - hash = "sha256-uULXUEHFZpYm/fmF6PkOFCxS+B+0q3dMveLG+3JHrhk="; + hash = "sha256-C5wE5ChDI1w4fh5LC1gV9WFuKMVfwvSnS18Fi2s+t+s="; }; sourceRoot = "${finalAttrs.src.name}/src/git/"; diff --git a/pkgs/by-name/mc/mcp-server-time/package.nix b/pkgs/by-name/mc/mcp-server-time/package.nix index c49b951a5869..a2542902074f 100644 --- a/pkgs/by-name/mc/mcp-server-time/package.nix +++ b/pkgs/by-name/mc/mcp-server-time/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "mcp-server-time"; - version = "2026.1.26"; + version = "2026.6.3"; pyproject = true; src = fetchFromGitHub { owner = "modelcontextprotocol"; repo = "servers"; tag = finalAttrs.version; - hash = "sha256-uULXUEHFZpYm/fmF6PkOFCxS+B+0q3dMveLG+3JHrhk="; + hash = "sha256-C5wE5ChDI1w4fh5LC1gV9WFuKMVfwvSnS18Fi2s+t+s="; }; sourceRoot = "${finalAttrs.src.name}/src/time/"; diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix index fcb8c69cab68..d62bd0abadb3 100644 --- a/pkgs/by-name/mi/mihomo/package.nix +++ b/pkgs/by-name/mi/mihomo/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "mihomo"; - version = "1.19.26"; + version = "1.19.27"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "mihomo"; rev = "v${version}"; - hash = "sha256-As0MqIGHs1Gn+aUWpeFsC231n9v7lBNmGlQdAwVWcJs="; + hash = "sha256-OfhCdGHm9nTONhQHRP6TS1EJX5Bkt2HNsvdf32JDj58="; }; - vendorHash = "sha256-ySpBMR/djPPs1aTw7yiCrCFxDFsvRfTJEChg8v1C408="; + vendorHash = "sha256-7toFgKj1paxFzSM0vSxIBLVJQ2YOxqhdAtvyEIpCUnQ="; excludedPackages = [ "./test" ]; diff --git a/pkgs/by-name/mi/mistral-vibe/package.nix b/pkgs/by-name/mi/mistral-vibe/package.nix index 721ad86d4060..25e74941caae 100644 --- a/pkgs/by-name/mi/mistral-vibe/package.nix +++ b/pkgs/by-name/mi/mistral-vibe/package.nix @@ -28,7 +28,7 @@ let in python3Packages.buildPythonApplication (finalAttrs: { pname = "mistral-vibe"; - version = "2.14.1"; + version = "2.15.0"; pyproject = true; __structuredAttrs = true; @@ -36,7 +36,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "mistralai"; repo = "mistral-vibe"; tag = "v${finalAttrs.version}"; - hash = "sha256-Mkz4COMQDQvMZ5rKOYLsIUWFcZfI/dUqpf8z/23YDrY="; + hash = "sha256-UGi20sH/w5Yv6d89c8/1+ly3xssqnjhLug8Mvb62kK0="; }; build-system = with python3Packages; [ @@ -165,6 +165,9 @@ python3Packages.buildPythonApplication (finalAttrs: { # reason: [SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed: Missing Authority Key Identifier (_ssl.c:1032) "test_generic_backend_streaming_uses_ssl_cert_file" + # AssertionError: assert 0 == 1 + "test_preserves_accents_when_matching_latin1_encoded_file" + # Fail in the sandbox # vibe.core.audio_recorder.audio_recorder_port.NoAudioInputDeviceError: No audio input device available "test_audio_stream_yields_chunks" @@ -232,6 +235,8 @@ python3Packages.buildPythonApplication (finalAttrs: { "tests/acp/test_acp_entrypoint_smoke.py" ]; + __darwinAllowLocalNetworking = true; + meta = { description = "Minimal CLI coding agent by Mistral"; homepage = "https://github.com/mistralai/mistral-vibe"; diff --git a/pkgs/by-name/ne/neatvnc/package.nix b/pkgs/by-name/ne/neatvnc/package.nix index 4acbb12b429a..4d0730f08e66 100644 --- a/pkgs/by-name/ne/neatvnc/package.nix +++ b/pkgs/by-name/ne/neatvnc/package.nix @@ -8,21 +8,25 @@ aml, ffmpeg, gnutls, + libdrm, libjpeg_turbo, libgbm, + nettle, pixman, zlib, + python3, + openssl, }: stdenv.mkDerivation (finalAttrs: { pname = "neatvnc"; - version = "0.9.6"; + version = "1.0.0"; src = fetchFromGitHub { owner = "any1"; repo = "neatvnc"; rev = "v${finalAttrs.version}"; - hash = "sha256-VStlTsfXbFxTnRGdK1y7MLtCzxbHzraw5GGph3sS/kI="; + hash = "sha256-yEWNiazRxc8G7ToqOcTtCXEuBCgXO64v31Xx1YeOPCM="; }; strictDeps = true; @@ -37,17 +41,26 @@ stdenv.mkDerivation (finalAttrs: { aml ffmpeg gnutls + libdrm libjpeg_turbo libgbm + nettle pixman zlib ]; - mesonFlags = [ - (lib.mesonBool "tests" true) + nativeCheckInputs = [ + python3 + openssl ]; - doCheck = true; + mesonFlags = [ + (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + __structuredAttrs = true; meta = { description = "VNC server library"; diff --git a/pkgs/by-name/ne/nemu/package.nix b/pkgs/by-name/ne/nemu/package.nix index 329754fe2c1b..af1be5c21d61 100644 --- a/pkgs/by-name/ne/nemu/package.nix +++ b/pkgs/by-name/ne/nemu/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nemu"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "nemuTUI"; repo = "nemu"; rev = "v${finalAttrs.version}"; - hash = "sha256-QvyCBHZmahZPIghPX53HcL5HsOVvhsVwdMZosVQ9A5U="; + hash = "sha256-DGHrCQjaikjkANb+/H69JCIO3S4vgag28BLx1HcCnQ0="; }; cmakeFlags = [ diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index f05b371aaa27..2cc407fb2ca9 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "1.16.2"; + version = "1.17.4"; __structuredAttrs = true; strictDeps = true; @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "anomalyco"; repo = "opencode"; tag = "v${finalAttrs.version}"; - hash = "sha256-IpTD4YCgGNtYlZ6EoyY+YLD81rIFR0D2A4W3uhWSSfo="; + hash = "sha256-ppWpyi1iGmL5UF6FuERf7tnN9kRkphaiyN3IoHcFY6A="; }; node_modules = stdenvNoCC.mkDerivation { @@ -78,7 +78,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { # NOTE: Required else we get errors that our fixed-output derivation references store paths dontFixup = true; - outputHash = "sha256-4yjQlxN+U4CKwA/hE8gACuvA4bBeTrX0ACVBIK4UQCg="; + outputHash = "sha256-V9LtFMyZj/rYXZ2R+ALbAL5yCZF58DZdCRg2KqdGVqs="; outputHashAlgo = "sha256"; outputHashMode = "recursive"; }; diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix index e72d6597cae2..c6cc48c9381f 100644 --- a/pkgs/by-name/pk/pkgsite/package.nix +++ b/pkgs/by-name/pk/pkgsite/package.nix @@ -7,13 +7,13 @@ buildGoModule { pname = "pkgsite"; - version = "0-unstable-2026-05-29"; + version = "0.1.0-unstable-2026-06-05"; src = fetchFromGitHub { owner = "golang"; repo = "pkgsite"; - rev = "b045357bb4e9728f75e705110c5ca0f7c7a78fbf"; - hash = "sha256-tdZHFoSoLUBB6I6FHRPG6rkPXB0dkgWC9RKqQHjP4YU="; + rev = "deb78785c3ce936751c393f7eb5079a9ad63d841"; + hash = "sha256-3K4O59BtJfDyiUKQ/OA20FLb/9LGyiutn6ULeiDFQ6g="; }; vendorHash = "sha256-jMHGQrGQjNsWNj7BnhRYDn17W+6VI3A940AkR4Rmvok="; diff --git a/pkgs/by-name/po/pomerium/package.nix b/pkgs/by-name/po/pomerium/package.nix index 194b1c65ef8b..83c43ac31a1c 100644 --- a/pkgs/by-name/po/pomerium/package.nix +++ b/pkgs/by-name/po/pomerium/package.nix @@ -16,12 +16,12 @@ let mapAttrsToList ; - version = "0.32.7"; + version = "0.32.8"; src = fetchFromGitHub { owner = "pomerium"; repo = "pomerium"; rev = "v${version}"; - hash = "sha256-JPRyLQzQmC3EiIp+rOMx24JVneFUN7ovC2eYrKxf3ik="; + hash = "sha256-Kqv3wbqiOnqEQiaz0J2P8Y2TToX5WiuKCZCbsl1bopM="; }; vendorHash = "sha256-ST33a/YNJiE70ORWNxS9gFNfHcNGGiQhOpUwqgbEJiQ="; diff --git a/pkgs/by-name/pr/prometheus/package.nix b/pkgs/by-name/pr/prometheus/package.nix index 7ab27fa8cefa..23deee23b54f 100644 --- a/pkgs/by-name/pr/prometheus/package.nix +++ b/pkgs/by-name/pr/prometheus/package.nix @@ -94,10 +94,6 @@ buildGoModule (finalAttrs: { proxyVendor = true; - patches = [ - ./prometheus-pr18519-fix-TestFsType.patch - ]; - outputs = [ "out" "doc" diff --git a/pkgs/by-name/pr/prometheus/prometheus-pr18519-fix-TestFsType.patch b/pkgs/by-name/pr/prometheus/prometheus-pr18519-fix-TestFsType.patch deleted file mode 100644 index a7ad2c20b32c..000000000000 --- a/pkgs/by-name/pr/prometheus/prometheus-pr18519-fix-TestFsType.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/util/runtime/statfs_unix_test.go -+++ b/util/runtime/statfs_unix_test.go -@@ -19,20 +19,18 @@ import ( - "os" - "testing" - -- "github.com/grafana/regexp" - "github.com/stretchr/testify/require" - ) - --var regexpFsType = regexp.MustCompile("^[A-Z][A-Z0-9_]*_MAGIC$") -- - func TestFsType(t *testing.T) { - var fsType string - - path, err := os.Getwd() - require.NoError(t, err) - -+ // A real path must yield a non-zero filesystem type. - fsType = FsType(path) -- require.Regexp(t, regexpFsType, fsType) -+ require.NotEqual(t, "0", fsType) - - fsType = FsType("/no/where/to/be/found") - require.Equal(t, "0", fsType) diff --git a/pkgs/by-name/pr/prometheus/source.nix b/pkgs/by-name/pr/prometheus/source.nix index 7a582275a2f2..f1322bb8c0ca 100644 --- a/pkgs/by-name/pr/prometheus/source.nix +++ b/pkgs/by-name/pr/prometheus/source.nix @@ -1,6 +1,6 @@ { - version = "3.11.3"; - hash = "sha256-JmnVTVW6LsrdiQspKznksyhAYkmCXQcqCLK8q5nZI48="; - npmDepsHash = "sha256-6uE8d3+v5wobSyCl8oYlbNQZjRj/WtvVrpzo/PR2hQA="; - vendorHash = "sha256-wR1b5jV/2B50OeKokv8Ss+tpSXNjJBsLIZrK7gOb168="; + version = "3.12.0"; + hash = "sha256-xeENUVmG9tbIF+7i2u9zuvo7RXI9iNWFVDNUfNpF6/4="; + npmDepsHash = "sha256-cHMI5DqSRpIanrgk/H3aFUHLrGXH1v796PH1qDrCnbE="; + vendorHash = "sha256-caSI9uzbH93j06sJus9jSqo6qHKbP8D9DuDkiAlnfF4="; } diff --git a/pkgs/by-name/pr/proton-pass-cli/package.nix b/pkgs/by-name/pr/proton-pass-cli/package.nix index c13cfc0afe79..05acd775adef 100644 --- a/pkgs/by-name/pr/proton-pass-cli/package.nix +++ b/pkgs/by-name/pr/proton-pass-cli/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "proton-pass-cli"; - version = "2.1.2"; + version = "2.1.3"; __structuredAttrs = true; strictDeps = true; @@ -57,19 +57,19 @@ stdenv.mkDerivation (finalAttrs: { sources = { "aarch64-darwin" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-aarch64"; - hash = "sha256-KuW98gL2fkt/eIbdukTSZyQvzTXMuGGmGs+GAjXeIlA="; + hash = "sha256-pQihDrFG3w5LVbcAqT8MT7cJlhhcfIAgHwD/oyPLcEM="; }; "aarch64-linux" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-aarch64"; - hash = "sha256-BWJiWBL5QL1Ler1mSzu8/v3q950vmxLy0Kc74f/FUf8="; + hash = "sha256-90rHOiapg8RfmLzD7kyqiaaiabnuQ60X95iR1sBV8gg="; }; "x86_64-darwin" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-macos-x86_64"; - hash = "sha256-XZAtgly95dAANK4G4VKUKeOJ3ssIkdhgT9RrD7DGdQA="; + hash = "sha256-nC1OKcCqCQq972VWlkOCcv4zCYqVRFbg+X9yP1zwqMU="; }; "x86_64-linux" = fetchurl { url = "https://proton.me/download/pass-cli/${finalAttrs.version}/pass-cli-linux-x86_64"; - hash = "sha256-UpHt0h2F0iJTi5E0E0WuOwoUeeJU1Ckgwru9NAEsYkM="; + hash = "sha256-2/v/4cIHf50o2G6yxgCunbGgBMYE7CZwpA5iT2rpBHo="; }; }; updateScript = writeShellScript "update-proton-pass-cli" '' diff --git a/pkgs/by-name/qu/quesoglc/package.nix b/pkgs/by-name/qu/quesoglc/package.nix index 6d093a62ed6f..f569c9367e24 100644 --- a/pkgs/by-name/qu/quesoglc/package.nix +++ b/pkgs/by-name/qu/quesoglc/package.nix @@ -31,6 +31,9 @@ stdenv.mkDerivation (finalAttrs: { # required for cross builds configureFlags = [ + # system glew is not compatible with chromium-bsu API assumption + "--without-glew" + "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" "ac_cv_func_memcmp_working=yes" diff --git a/pkgs/by-name/ra/rain-bittorrent/package.nix b/pkgs/by-name/ra/rain-bittorrent/package.nix index 1df3524d7a2d..a68aaa4a6547 100644 --- a/pkgs/by-name/ra/rain-bittorrent/package.nix +++ b/pkgs/by-name/ra/rain-bittorrent/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "rain"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "cenkalti"; repo = "rain"; tag = "v${finalAttrs.version}"; - hash = "sha256-g7KzqQymnB37nngi4CUuFMoLTUpc5iA3YKEoD+nJ814="; + hash = "sha256-PrzpaFGi4uGIXQ/L8dgJl7NrLD2SQwuI2vfCq2NPLLg="; }; - vendorHash = "sha256-U4NZR3vJRLTrhE1CoCAB+7pkVnvxlJpbLmIGMFuZzWc="; + vendorHash = "sha256-/OjWPt4X4xfcFgX8H2dd2T/wl/wH9Nz1l0uA2Ejd21Q="; meta = { description = "BitTorrent client and library in Go"; diff --git a/pkgs/by-name/re/reframe/package.nix b/pkgs/by-name/re/reframe/package.nix index 7ce80f88692e..3db4f76a6284 100644 --- a/pkgs/by-name/re/reframe/package.nix +++ b/pkgs/by-name/re/reframe/package.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "reframe"; - version = "1.15.2"; + version = "1.16.0"; src = fetchFromGitHub { owner = "AlynxZhou"; repo = "reframe"; tag = "v${finalAttrs.version}"; - hash = "sha256-R0l/sXRT+B3mb1SMoX9DLUbFP4lcTK2dVJox8OWwY6Y="; + hash = "sha256-2GuQ+Qwlbv83OBgg017MU0n58lGpY1yjsCWQMpXeQlw="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/re/render-cli/package.nix b/pkgs/by-name/re/render-cli/package.nix index 41c9d9862c09..9d390da9e620 100644 --- a/pkgs/by-name/re/render-cli/package.nix +++ b/pkgs/by-name/re/render-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "render-cli"; - version = "2.19.0"; + version = "2.20.0"; src = fetchFromGitHub { owner = "render-oss"; repo = "cli"; rev = "v${version}"; - hash = "sha256-v5kYPQtYO9YqsBbs57ypqMfwWMswdKcdbI2WfKyllHc="; + hash = "sha256-2pKZQsL/MffTaz4ZPj2IPjNFgObPPotJOTNB+VsHxns="; }; - vendorHash = "sha256-0cOW8g9rhUbcBF/JfsYu8OJJhaDXAd37341GZeoCAVQ="; + vendorHash = "sha256-F7wI/u1LgBJkcOAJe/Xcgf3v5H6qfRn3fFLdj9Jlftc="; # Tests require network access doCheck = false; diff --git a/pkgs/by-name/rs/rsshub/package.nix b/pkgs/by-name/rs/rsshub/package.nix index 353735aa181f..a097e9097c06 100644 --- a/pkgs/by-name/rs/rsshub/package.nix +++ b/pkgs/by-name/rs/rsshub/package.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "rsshub"; - version = "0-unstable-2026-05-31"; + version = "0-unstable-2026-06-09"; src = fetchFromGitHub { owner = "DIYgod"; repo = "RSSHub"; - rev = "575f71abdeb94b3bb0a4fda3c3ae00d14f7715fd"; - hash = "sha256-GAGe6AMT0WPr1riBzz06IbJ5/O9GJ1RU3H+VeZF4Sj0="; + rev = "7c3d43ca7d935c24bc767fb2fea83f57d7ea2354"; + hash = "sha256-WmEvR0HbWyHetYUzalDn2OzQa9wGLWSjyqdYkITYNig="; }; patches = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; fetcherVersion = 3; - hash = "sha256-ZdG4ZIYLYYUQToJHqI+GWDq2KiQrryMrUHtCn/qxr+o="; + hash = "sha256-jLRZOz4c8MCr/cEvZBD4yTa6nmkPxXgM+h8Fybvklgc="; pnpm = pnpm_10; }; diff --git a/pkgs/by-name/ru/rust-rpxy/package.nix b/pkgs/by-name/ru/rust-rpxy/package.nix index 7581c7c08303..9f241b19209c 100644 --- a/pkgs/by-name/ru/rust-rpxy/package.nix +++ b/pkgs/by-name/ru/rust-rpxy/package.nix @@ -5,17 +5,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "rust-rpxy"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "junkurihara"; repo = "rust-rpxy"; tag = finalAttrs.version; - hash = "sha256-PjlC65wKZFz6pEHoBHFk3J1+GXa6lwFsLEhgg57odxY="; + hash = "sha256-YGXvRnpDKUi1qGJasTUrfa95AWsHAT+V/La1WOZIUkI="; fetchSubmodules = true; }; - cargoHash = "sha256-d6Tsh1wYreJGwfT5vzjT+ZmYTm50Aj8dT/creN9fqtI="; + cargoHash = "sha256-CiauwBhv9Phdlpe7V9KwmgUvMSSFBLYPrlDl1lRT5/c="; meta = { description = "Http reverse proxy serving multiple domain names and terminating TLS for http/1.1, 2 and 3, written in Rust"; diff --git a/pkgs/by-name/se/seanime/package.nix b/pkgs/by-name/se/seanime/package.nix index 2d3bed8546ab..8ce8abf1da1f 100644 --- a/pkgs/by-name/se/seanime/package.nix +++ b/pkgs/by-name/se/seanime/package.nix @@ -10,13 +10,13 @@ }: buildGoModule (finalAttrs: { pname = "seanime"; - version = "3.8.3"; + version = "3.8.4"; src = fetchFromGitHub { owner = "5rahim"; repo = "seanime"; tag = "v${finalAttrs.version}"; - hash = "sha256-jD18xNgSKitgRzUjwJA2q79Me/qZzFb+fSLdycmAld0="; + hash = "sha256-Sfd+HF+Of+dDFmK7v2D05ZxffEzu/m6N31ScEklA2ZM="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { npmRoot = "seanime-web"; npmDeps = fetchNpmDeps { src = "${finalAttrs.src}/seanime-web"; - hash = "sha256-LtRiwmrWSu4Zc0+/AywEEGpcxElIrp0A+x+8jWMfKig="; + hash = "sha256-47SRdvaTlGyuqdImeZaVGEyFWkkuECJzaQpeujybNgA="; }; }; @@ -42,7 +42,7 @@ buildGoModule (finalAttrs: { rm -rf .github ''; - vendorHash = "sha256-BPOLDqa9qt/nISJ6Ja6ZSDGf8oXwKgZ6sbMee6hFLfs="; + vendorHash = "sha256-cLUD6UvGQiOwuLlfScDPCvwmf3L66DIsBF/Gc1aWgrY="; subPackages = [ "." ]; diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix index 407b9e9c692f..9f8d4eec4e87 100644 --- a/pkgs/by-name/si/sing-box/package.nix +++ b/pkgs/by-name/si/sing-box/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "sing-box"; - version = "1.13.12"; + version = "1.13.13"; src = fetchFromGitHub { owner = "SagerNet"; repo = "sing-box"; tag = "v${finalAttrs.version}"; - hash = "sha256-AGv/0zUYWD32mQMkdiltWjMzHjfiAGIC1QDqZpK5sCw="; + hash = "sha256-RsiBxPQOE4rE3cFRjl81x1uIG2A4/smSBUg+G0vm7uQ="; }; - vendorHash = "sha256-lA7EuNsjCWlgZZNc/fSEnNQz2pX8jCqy12tukrBs8j8="; + vendorHash = "sha256-FUzGQx0TIJdWWYtF6781BSXLViFrXbPEdLKjuvtuleM="; tags = [ "with_gvisor" diff --git a/pkgs/by-name/sp/spacedrive/package.nix b/pkgs/by-name/sp/spacedrive/package.nix index 3f6539776cfd..a1e86f16de7a 100644 --- a/pkgs/by-name/sp/spacedrive/package.nix +++ b/pkgs/by-name/sp/spacedrive/package.nix @@ -38,6 +38,7 @@ let .${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); meta = { + broken = true; description = "Open source file manager, powered by a virtual distributed filesystem"; homepage = "https://www.spacedrive.com"; changelog = "https://github.com/spacedriveapp/spacedrive/releases/tag/${version}"; diff --git a/pkgs/by-name/to/tonearm/package.nix b/pkgs/by-name/to/tonearm/package.nix index 22a2c4a8d49d..51952bcc3b70 100644 --- a/pkgs/by-name/to/tonearm/package.nix +++ b/pkgs/by-name/to/tonearm/package.nix @@ -40,12 +40,12 @@ let in buildGo126Module (finalAttrs: { pname = "tonearm"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromCodeberg { owner = "dergs"; repo = "Tonearm"; tag = "v${finalAttrs.version}"; - hash = "sha256-uhKWUF8IhihaCA+BkKBEIYB/kbnxdxmJwidsJ52L4yQ="; + hash = "sha256-XXL0PfBNBuYkoDocZTWr26ogcgPJX6fUkzj9ccEmt84="; }; vendorHash = "sha256-vOkOSquBbWjx1eK7h3vmmHKzaopkbu2iL5mbknMo1Kg="; diff --git a/pkgs/by-name/ve/veracrypt/package.nix b/pkgs/by-name/ve/veracrypt/package.nix index dc19606ebea4..25bfcf8663b8 100644 --- a/pkgs/by-name/ve/veracrypt/package.nix +++ b/pkgs/by-name/ve/veracrypt/package.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "veracrypt"; - version = "1.26.24"; + version = "1.26.29"; src = fetchurl { url = "https://launchpad.net/veracrypt/trunk/${finalAttrs.version}/+download/VeraCrypt_${finalAttrs.version}_Source.tar.bz2"; - hash = "sha256-f1wgr0KTd6tW97UsqGiTa5kj14T0YG2piGw2KXiQPng="; + hash = "sha256-YIJnMeKYK0vSMeOTDoWkQ5EWljhnGhsgDFGPjItGyyo="; }; patches = [ diff --git a/pkgs/by-name/vk/vk-bootstrap/package.nix b/pkgs/by-name/vk/vk-bootstrap/package.nix index 2cfb8a684f86..c888844f021e 100644 --- a/pkgs/by-name/vk/vk-bootstrap/package.nix +++ b/pkgs/by-name/vk/vk-bootstrap/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vk-bootstrap"; - version = "1.4.341"; + version = "1.4.350"; src = fetchFromGitHub { owner = "charles-lunarg"; repo = "vk-bootstrap"; rev = "v${finalAttrs.version}"; - hash = "sha256-JbgcjhCehCWzLDY/6PP3NeSY09IRuup8ym5n0c6rNEs="; + hash = "sha256-HAoEsWwc12lcpEl5gNz4EN0cvjZcg5jsnEBodiDj+1c="; }; patches = [ diff --git a/pkgs/by-name/vl/vlc/package.nix b/pkgs/by-name/vl/vlc/package.nix index 5174bf62351b..0f1a3937cabe 100644 --- a/pkgs/by-name/vl/vlc/package.nix +++ b/pkgs/by-name/vl/vlc/package.nix @@ -316,7 +316,9 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.videolan.org/vlc/"; donationPage = "https://www.videolan.org/contribute.html#money"; license = lib.licenses.lgpl21Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + nick-linux + ]; platforms = lib.platforms.linux; mainProgram = "vlc"; }; diff --git a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_120/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_120/package.nix new file mode 100644 index 000000000000..3276efef463b --- /dev/null +++ b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_120/package.nix @@ -0,0 +1,19 @@ +{ + buildWasmBindgenCli, + fetchCrate, + rustPlatform, +}: + +buildWasmBindgenCli rec { + src = fetchCrate { + pname = "wasm-bindgen-cli"; + version = "0.2.120"; + hash = "sha256-Dkkx8Bhfk+y/jEz9Fzwytmv2N3Gj/7ST+5MlPRzzetU="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + inherit (src) pname version; + hash = "sha256-5Zu/Sh9aBMxB+KGC1MHWJAQ8PuE40M6lsenkpFEwJ6A="; + }; +} diff --git a/pkgs/by-name/wa/wasmtime/package.nix b/pkgs/by-name/wa/wasmtime/package.nix index a8be07cbe92c..f83f0ffc470d 100644 --- a/pkgs/by-name/wa/wasmtime/package.nix +++ b/pkgs/by-name/wa/wasmtime/package.nix @@ -13,20 +13,20 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "wasmtime"; - version = "45.0.0"; + version = "45.0.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wasmtime"; tag = "v${finalAttrs.version}"; - hash = "sha256-oCIMfBGhWZiaNNfH7Pc9DCpbEXs8AU3w8tIE6o/vjLk="; + hash = "sha256-6PZ+r+slOegjiTwkfTvBY3QeWCU69YQnpoiOC/mUND4="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-yAPs2o2ayxxh3jk5+T8DiP9uFjBGyPTLzgP/RXPSj2g="; + cargoHash = "sha256-2s3v0o8H2EWAzSCwc3wgsslcf+eYaRDxItwy7ccCKv4="; cargoBuildFlags = [ "--package" "wasmtime-cli" diff --git a/pkgs/by-name/wa/wayvnc/package.nix b/pkgs/by-name/wa/wayvnc/package.nix index d300c7b36fe7..e9adab82fde4 100644 --- a/pkgs/by-name/wa/wayvnc/package.nix +++ b/pkgs/by-name/wa/wayvnc/package.nix @@ -9,6 +9,7 @@ wayland-scanner, aml, jansson, + libdrm, libxkbcommon, libgbm, neatvnc, @@ -19,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wayvnc"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "any1"; repo = "wayvnc"; rev = "v${finalAttrs.version}"; - hash = "sha256-LINzkC18gitj1a8Giqlt/6LyydOdV+8YXRJmuxT/Nq8="; + hash = "sha256-+CAH2jcIIQqImonWeWxMQyTtEEuuQlaGyl/ajPfClh8="; }; strictDeps = true; @@ -45,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ aml jansson + libdrm libxkbcommon libgbm neatvnc @@ -54,10 +56,12 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ - (lib.mesonBool "tests" true) + (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) ]; - doCheck = true; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + __structuredAttrs = true; meta = { description = "VNC server for wlroots based Wayland compositors"; @@ -68,11 +72,11 @@ stdenv.mkDerivation (finalAttrs: { headless one, so it is also possible to run wayvnc without a physical display attached. ''; - mainProgram = "wayvnc"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/any1/wayvnc"; changelog = "https://github.com/any1/wayvnc/releases/tag/v${finalAttrs.version}"; license = lib.licenses.isc; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ nickcao ]; + mainProgram = "wayvnc"; }; }) diff --git a/pkgs/by-name/we/weston/package.nix b/pkgs/by-name/we/weston/package.nix index 0a552ce1b95c..921656aae6ca 100644 --- a/pkgs/by-name/we/weston/package.nix +++ b/pkgs/by-name/we/weston/package.nix @@ -56,22 +56,23 @@ stdenv.mkDerivation (finalAttrs: { pname = "weston"; - version = "15.0.0"; + version = "15.0.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "wayland"; repo = "weston"; rev = finalAttrs.version; - hash = "sha256-7FbQkXazsf6FkkNbE+Q6ilKACFa/CoOL2Q1oXHuaVX8="; + hash = "sha256-c6h8GQt1S3t2+K+8A4ncxBtWLtaV61EABdYA55o9i4o="; }; - # Backport for https://gitlab.freedesktop.org/wayland/weston/-/issues/1100 patches = [ + # backend-vnc, gitlab-ci: Update to Neat VNC 1.0.0, aml 1.0.0 + # https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/2064 (fetchpatch { - name = "weston-upstream-assertion-fix.patch"; - url = "https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/1993.patch"; - hash = "sha256-705GIM7drTzv0N5Hk5dO18LWBnhhi1VoX8sfITHRYc4="; + url = "https://gitlab.freedesktop.org/wayland/weston/-/commit/8a1c91e771312d1e0d0cd92495ef717402784dae.patch"; + hash = "sha256-9eBONM7OfzHhCuT8Wnq534KS51q2VtUyOOLjYHohEds="; + excludes = [ ".gitlab-ci.yml" ]; }) ]; diff --git a/pkgs/by-name/wl/wlvncc/package.nix b/pkgs/by-name/wl/wlvncc/package.nix index 33209a300ed9..b2abde634167 100644 --- a/pkgs/by-name/wl/wlvncc/package.nix +++ b/pkgs/by-name/wl/wlvncc/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation { pname = "wlvncc"; - version = "0-unstable-2025-07-07"; + version = "0-unstable-2026-04-29"; src = fetchFromGitHub { owner = "any1"; repo = "wlvncc"; - rev = "bc6063aeacd4fbe9ac8f58f4ba3c5388b3e1f1f2"; - hash = "sha256-Udu/CtrNBqnlgZCK2cS8VWNTfHJGXdijTnNIWnAW2Nw="; + rev = "cc0abf87c37920540f2439a556e6a480c28f8f46"; + hash = "sha256-VPZJd4/yerWZeLl+NVH1EDtSokeS/XMS6lQUXOn9a7Q="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/xa/xauth/package.nix b/pkgs/by-name/xa/xauth/package.nix index b28bd41cddd8..9882355e1bf7 100644 --- a/pkgs/by-name/xa/xauth/package.nix +++ b/pkgs/by-name/xa/xauth/package.nix @@ -51,7 +51,9 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.freedesktop.org/xorg/app/xauth"; license = lib.licenses.mitOpenGroup; mainProgram = "xauth"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + nick-linux + ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/xf/xf86-input-evdev/package.nix b/pkgs/by-name/xf/xf86-input-evdev/package.nix index 3a414ba30662..501963a53eaf 100644 --- a/pkgs/by-name/xf/xf86-input-evdev/package.nix +++ b/pkgs/by-name/xf/xf86-input-evdev/package.nix @@ -64,7 +64,9 @@ stdenv.mkDerivation (finalAttrs: { hpndSellVariant mit ]; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + nick-linux + ]; pkgConfigModules = [ "xorg-evdev" ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/xf/xf86-input-libinput/package.nix b/pkgs/by-name/xf/xf86-input-libinput/package.nix index f3852ab9ad9a..59b23d76cc83 100644 --- a/pkgs/by-name/xf/xf86-input-libinput/package.nix +++ b/pkgs/by-name/xf/xf86-input-libinput/package.nix @@ -60,7 +60,9 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + nick-linux + ]; pkgConfigModules = [ "xorg-libinput" ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/xi/xinput/package.nix b/pkgs/by-name/xi/xinput/package.nix index e382442bdd42..23fa1fc33e2f 100644 --- a/pkgs/by-name/xi/xinput/package.nix +++ b/pkgs/by-name/xi/xinput/package.nix @@ -55,7 +55,9 @@ stdenv.mkDerivation (finalAttrs: { mit ]; mainProgram = "xinput"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + nick-linux + ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/xo/xorg-server/package.nix b/pkgs/by-name/xo/xorg-server/package.nix index 01e8f819be54..270f23950dbf 100644 --- a/pkgs/by-name/xo/xorg-server/package.nix +++ b/pkgs/by-name/xo/xorg-server/package.nix @@ -244,7 +244,9 @@ stdenv.mkDerivation (finalAttrs: { hpndSellVariantMitDisclaimerXserver # 1780-1793 ]; mainProgram = "X"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + nick-linux + ]; pkgConfigModules = [ "xorg-server" ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/xo/xournalpp/package.nix b/pkgs/by-name/xo/xournalpp/package.nix index 9b3884c3d47e..3de0a9384c01 100644 --- a/pkgs/by-name/xo/xournalpp/package.nix +++ b/pkgs/by-name/xo/xournalpp/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xournalpp"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "xournalpp"; repo = "xournalpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-RNGVUgpn1Wefc48x5E88AGk4rtXyu0RovZxaS2bqQ+c="; + hash = "sha256-JvB9Oh56ujg7L+q1wTuLsel9Wl2Fyoz9nnz0m/mGxAU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/xp/xprop/package.nix b/pkgs/by-name/xp/xprop/package.nix index 9943a313949d..53524a8d2763 100644 --- a/pkgs/by-name/xp/xprop/package.nix +++ b/pkgs/by-name/xp/xprop/package.nix @@ -45,7 +45,9 @@ stdenv.mkDerivation (finalAttrs: { mit ]; mainProgram = "xprop"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + nick-linux + ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/xr/xrandr/package.nix b/pkgs/by-name/xr/xrandr/package.nix index 18a13fbb06d7..26727f1e0953 100644 --- a/pkgs/by-name/xr/xrandr/package.nix +++ b/pkgs/by-name/xr/xrandr/package.nix @@ -57,7 +57,9 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.freedesktop.org/xorg/app/xrandr"; license = lib.licenses.hpndSellVariant; mainProgram = "xrandr"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + nick-linux + ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/xr/xrdb/package.nix b/pkgs/by-name/xr/xrdb/package.nix index 653849f1f157..fe508438601f 100644 --- a/pkgs/by-name/xr/xrdb/package.nix +++ b/pkgs/by-name/xr/xrdb/package.nix @@ -52,7 +52,9 @@ stdenv.mkDerivation (finalAttrs: { mitOpenGroup ]; mainProgram = "xrdb"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + nick-linux + ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/xs/xset/package.nix b/pkgs/by-name/xs/xset/package.nix index e16e5c884dbf..0044bb6a4257 100644 --- a/pkgs/by-name/xs/xset/package.nix +++ b/pkgs/by-name/xs/xset/package.nix @@ -45,7 +45,9 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.freedesktop.org/xorg/app/xset"; license = lib.licenses.mitOpenGroup; mainProgram = "xset"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + nick-linux + ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/xs/xsetroot/package.nix b/pkgs/by-name/xs/xsetroot/package.nix index db3bdc81b024..82f9e885c00f 100644 --- a/pkgs/by-name/xs/xsetroot/package.nix +++ b/pkgs/by-name/xs/xsetroot/package.nix @@ -47,7 +47,9 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.freedesktop.org/xorg/app/xsetroot"; license = lib.licenses.mitOpenGroup; mainProgram = "xsetroot"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + nick-linux + ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ze/zeroc-ice/fix-mb_init.patch b/pkgs/by-name/ze/zeroc-ice/fix-mb_init.patch deleted file mode 100644 index bac289fc81f6..000000000000 --- a/pkgs/by-name/ze/zeroc-ice/fix-mb_init.patch +++ /dev/null @@ -1,34 +0,0 @@ -From faa694a7171a06f83034fd869adc4cffa2ae0c18 Mon Sep 17 00:00:00 2001 -From: laurensmiers -Date: Wed, 22 Oct 2025 14:50:23 +0200 -Subject: [PATCH] fix: mb_init does not accept any parameter - -Defined in mbchar.c:114 : -```c -void mb_init() -/* - * Initialize multi-byte character settings. - * First called prior to setting the 'mcpp_mode'. - * Will be called again each time the multibyte character encoding is changed. - */ -{ -``` - -It does not expect any parameters. ---- - mcpp_main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mcpp_main.c b/mcpp_main.c -index 54a62b2..44265ad 100644 ---- a/mcpp_main.c -+++ b/mcpp_main.c -@@ -302,7 +302,7 @@ int mcpp_lib_main - inc_dirp = &null; /* Initialize to current (null) directory */ - cur_fname = cur_fullname = "(predefined)"; /* For predefined macros */ - init_defines(); /* Predefine macros */ -- mb_init(TRUE); /* Should be initialized prior to get options */ -+ mb_init(); /* Should be initialized prior to get options */ - do_options( argc, argv, &in_file, &out_file); /* Command line options */ - - /* Open input file, "-" means stdin. */ diff --git a/pkgs/by-name/ze/zeroc-ice/fix-reserved-keywords.patch b/pkgs/by-name/ze/zeroc-ice/fix-reserved-keywords.patch deleted file mode 100644 index 90b409f322c8..000000000000 --- a/pkgs/by-name/ze/zeroc-ice/fix-reserved-keywords.patch +++ /dev/null @@ -1,55 +0,0 @@ -From bd5ddbde9e4ed24101cdc86007f26e95f38dd5b1 Mon Sep 17 00:00:00 2001 -From: laurensmiers -Date: Wed, 22 Oct 2025 14:52:30 +0200 -Subject: [PATCH] fix: don't use reserved keyword for goto statement - -Rename: -- 'true' to 'exit_success' -- 'false' to 'exit_fail' - -Chose not to change the flow of the code by removing the goto's to -avoid regressions. ---- - system.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/system.c b/system.c -index 646caf6..0a15aec 100644 ---- a/system.c -+++ b/system.c -@@ -1738,7 +1738,7 @@ static int open_file( - if (! fullname) /* Non-existent or directory */ - return FALSE; - if (included( fullname)) /* Once included */ -- goto true; -+ goto exit_success; - - if ((max_open != 0 && max_open <= include_nest) - /* Exceed the known limit of open files */ -@@ -1765,12 +1765,12 @@ static int open_file( - if ((fp = mcpp_fopen( fullname, "r")) == NULL) { - file->fp = mcpp_fopen( cur_fullname, "r"); - fseek( file->fp, file->pos, SEEK_SET); -- goto false; -+ goto exit_fail; - } - if (max_open == 0) /* Remember the limit of the system */ - max_open = include_nest; - } else if (fp == NULL) /* No read permission */ -- goto false; -+ goto exit_fail; - /* Truncate buffer of the includer to save memory */ - len = (int) (file->bptr - file->buffer); - if (len) { -@@ -1802,9 +1802,9 @@ static int open_file( - if (mkdep && ((mkdep & MD_SYSHEADER) || ! infile->sys_header)) - put_depend( fullname); /* Output dependency line */ - --true: -+exit_success: - return TRUE; --false: -+exit_fail: - free( fullname); - return FALSE; - } diff --git a/pkgs/by-name/ze/zeroc-ice/package.nix b/pkgs/by-name/ze/zeroc-ice/package.nix index 6832f757beb7..3f0711551b2b 100644 --- a/pkgs/by-name/ze/zeroc-ice/package.nix +++ b/pkgs/by-name/ze/zeroc-ice/package.nix @@ -16,21 +16,17 @@ let mcpp' = mcpp.overrideAttrs (prevAttrs: rec { pname = "mcpp-zeroc-ice"; - version = "2.7.3"; + version = "2.7.2.20"; src = fetchFromGitHub { owner = "zeroc-ice"; repo = "mcpp"; rev = "v${version}"; - hash = "sha256-hZGU5mqMRTTHV2bR9uzM6ALj1sypjPxO5Ajg8aKzLxc="; + hash = "sha256-FlzHpfYoHzbz5DfXgkr6Hf96xejRKd0Rr1TmzE5GyGg="; }; # zeroc-ice's fork diverges quite a bit from upstream mcpp, so prevAttrs.patches is not used here - patches = [ - # See https://github.com/zeroc-ice/mcpp/pull/12 - ./fix-mb_init.patch - ./fix-reserved-keywords.patch - ]; + patches = [ ]; installFlags = prevAttrs.installFlags or [ ] ++ [ "PREFIX=$(out)" ]; }); diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix index 8af344b2f534..3d6b8bc4188b 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, gitUpdater, replaceVars, testers, @@ -75,13 +74,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "lomiri-ui-toolkit"; - version = "1.3.5905"; + version = "1.3.5906"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-ui-toolkit"; rev = finalAttrs.version; - hash = "sha256-59Q7Atxt6CfR0LgNa6keGDY+HpV/eOdTngVHcUJEesg="; + hash = "sha256-OT3XH1NRnLHP80rgPllXfuos7vG3DHX95CXWm2fvwvI="; }; outputs = [ @@ -93,13 +92,6 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ - # Remove when version > 1.3.5905 - (fetchpatch { - name = "0001-lomiri-ui-toolkit-Fix-compatibility-with-Qt-6.11.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/commit/57303d2b01549ef78b029ed05babbc9400e102f3.patch"; - hash = "sha256-22QSOaYZ+hsctLt8+ffrzBIY3btp+rM6NBsu0gvQMeM="; - }) - ./2001-Mark-problematic-tests.patch (replaceVars ./2002-Nixpkgs-versioned-QML-path.patch.in { diff --git a/pkgs/development/compilers/factor-lang/mk-factor-application.nix b/pkgs/development/compilers/factor-lang/mk-factor-application.nix index 2b694d68ecdd..bbd039ba3615 100644 --- a/pkgs/development/compilers/factor-lang/mk-factor-application.nix +++ b/pkgs/development/compilers/factor-lang/mk-factor-application.nix @@ -31,12 +31,24 @@ in extraPaths ? [ ], # Extra vocabularies needed by this application extraVocabs ? [ ], - deployScriptText ? '' + deployScriptText ? /* factor */ '' USING: command-line io io.backend io.pathnames kernel namespaces sequences - tools.deploy tools.deploy.config tools.deploy.backend vocabs.loader ; + tools.deploy tools.deploy.config tools.deploy.backend vocabs.loader + io.directories.unix ; IN: deploy-me + ! The Nix sandbox’s seccomp filter blocks chmod(2). Factor’s + ! copy-file calls set-file-permissions which chmod’s the target + ! to the source’s mode, 0o444. The blocked syscall returns + ! EACCES, crashing the deploys. The method override skips the + ! set-file-permissions call (Nix will manage its output + ! permissions). + ! + ! Surfaced with Factor 0.101 which added icon PNG resources to + ! the definitions.icons vocab to copy-vocab-resources. + M: unix copy-file call-next-method ; + : load-and-deploy ( path/vocab -- ) normalize-path [ parent-directory add-vocab-root @@ -44,17 +56,22 @@ in file-name dup reload deploy ] bi ; + ! Factor 0.101 added a .out extension on not macOS. Rather than + ! having shell scripts dealing path name changes per-OS & + ! per-version, the deploy script prints its deploy path to a file. : deploy-vocab ( path/vocab path/target -- ) normalize-path deploy-directory set f open-directory-after-deploy? set - load-and-deploy ; + dup file-name + [ load-and-deploy ] dip + deploy-path "deploy-path.txt" utf8 set-file-contents ; : deploy-me ( -- ) command-line get dup length 2 = [ first2 deploy-vocab ] [ drop - "usage: deploy-me " print + "Usage: deploy-me " print nl ] if ; @@ -91,44 +108,47 @@ in buildInputs = (lib.optional enableUI gdk-pixbuf) ++ attrs.buildInputs or [ ]; buildPhase = - attrs.buildPhase or '' + attrs.buildPhase or /* bash */ '' runHook preBuild vocabBaseName=$(basename "$vocabName") mkdir -p "$out/lib/factor" "$TMPDIR/.cache" export XDG_CACHE_HOME="$TMPDIR/.cache" + # Deploy script writes the deploy path to to $PWD/deploy-path.txt factor "${deployScript}" "./$vocabName" "$out/lib/factor" - cp "$TMPDIR/factor-temp"/*.image "$out/lib/factor/$vocabBaseName" + deploy_path=$(cat "$PWD/deploy-path.txt") + if [ ! -x "$deploy_path" ]; then + echo "Not a valid deploy path for Factor: $deploy_path" + exit 1 + fi + + cp "$TMPDIR/factor-temp"/*.image "$(dirname "$deploy_path")/$(basename "$deploy_path").image" runHook postBuild ''; __structuredAttrs = true; installPhase = - attrs.installPhase or ( - '' - runHook preInstall - '' - + (lib.optionalString finalAttrs.enableUI '' + attrs.installPhase or /* bash */ '' + runHook preInstall + ${lib.optionalString finalAttrs.enableUI /* bash */ '' # Set Gdk pixbuf loaders file to the one from the build dependencies here unset GDK_PIXBUF_MODULE_FILE # Defined in gdk-pixbuf setup hook findGdkPixbufLoaders "${librsvg}" appendToVar makeWrapperArgs --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" appendToVar makeWrapperArgs --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib - '') - + (lib.optionalString (wrapped-factor.runtimeLibs != [ ])) '' + ''} + ${lib.optionalString (wrapped-factor.runtimeLibs != [ ]) /* bash */ '' appendToVar makeWrapperArgs --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath wrapped-factor.runtimeLibs}" - '' - + '' - mkdir -p "$out/bin" - makeWrapper "$out/lib/factor/$vocabBaseName/$vocabBaseName" \ - "$out/bin/$binName" \ - --prefix PATH : "${lib.makeBinPath runtimePaths}" \ - "''${makeWrapperArgs[@]}" - runHook postInstall - '' - ); + ''} + mkdir -p "$out/bin" + makeWrapper "$deploy_path" \ + "$out/bin/$binName" \ + --prefix PATH : "${lib.makeBinPath runtimePaths}" \ + "''${makeWrapperArgs[@]}" + runHook postInstall + ''; passthru = { vocab = finalAttrs.src; diff --git a/pkgs/development/compilers/factor-lang/test/hello-world/default.nix b/pkgs/development/compilers/factor-lang/test/hello-world/default.nix new file mode 100644 index 000000000000..a84260381291 --- /dev/null +++ b/pkgs/development/compilers/factor-lang/test/hello-world/default.nix @@ -0,0 +1,56 @@ +# Builds hello-world Factor application using buildFactorApplication & verifies +# source-to-binary that the resulting app prints "Hello, $NAME" depending on +# `--name` flag. +{ + lib, + runCommandLocal, + buildFactorApplication, + buildFactorVocab, +}: + +let + fs = lib.fileset; + + factorFilter = + file: + lib.lists.any file.hasExt [ + "factor" + "txt" + ]; + + version = "0-test"; + + vocab = buildFactorVocab { + inherit version; + pname = "hello"; + src = fs.toSource { + root = ./extra; + fileset = fs.difference (fs.fileFilter factorFilter ./extra/hello) ./extra/hello/cli; + }; + vocabName = "hello"; + }; + + app = buildFactorApplication { + inherit version; + pname = "hello-cli"; + src = fs.toSource { + root = ./extra; + fileset = fs.fileFilter factorFilter ./extra/hello/cli; + }; + vocabName = "hello.cli"; + binName = "hello"; + extraVocabs = [ vocab ]; + }; +in +runCommandLocal "assert-factor-hello-world" + { + env.expected = "Hello, Nixpkgs"; + } + '' + output="$(${lib.getExe app} --name "Nixpkgs")" + if [ "$output" != "$expected" ]; then + echo "FAIL: expected “$expected”; got “$output”" >&2 + exit 1 + fi + touch "$out" + '' diff --git a/pkgs/development/compilers/factor-lang/test/hello-world/extra/hello/author.txt b/pkgs/development/compilers/factor-lang/test/hello-world/extra/hello/author.txt new file mode 100644 index 000000000000..95fc5a77b470 --- /dev/null +++ b/pkgs/development/compilers/factor-lang/test/hello-world/extra/hello/author.txt @@ -0,0 +1 @@ +toastal diff --git a/pkgs/development/compilers/factor-lang/test/hello-world/extra/hello/cli/author.txt b/pkgs/development/compilers/factor-lang/test/hello-world/extra/hello/cli/author.txt new file mode 100644 index 000000000000..95fc5a77b470 --- /dev/null +++ b/pkgs/development/compilers/factor-lang/test/hello-world/extra/hello/cli/author.txt @@ -0,0 +1 @@ +toastal diff --git a/pkgs/development/compilers/factor-lang/test/hello-world/extra/hello/cli/cli.factor b/pkgs/development/compilers/factor-lang/test/hello-world/extra/hello/cli/cli.factor new file mode 100644 index 000000000000..027ddd7bc9f0 --- /dev/null +++ b/pkgs/development/compilers/factor-lang/test/hello-world/extra/hello/cli/cli.factor @@ -0,0 +1,13 @@ +! SPDX-License-Identifier: 0BSD +USING: command-line combinators io kernel namespaces sequences hello ; + +IN: hello.cli + +: main ( -- ) + command-line get { + { [ dup empty? ] [ drop "world" ] } + { [ dup first "--name" = not ] [ drop "world" ] } + [ second ] + } cond greet ; + +MAIN: main diff --git a/pkgs/development/compilers/factor-lang/test/hello-world/extra/hello/hello.factor b/pkgs/development/compilers/factor-lang/test/hello-world/extra/hello/hello.factor new file mode 100644 index 000000000000..bf256300c641 --- /dev/null +++ b/pkgs/development/compilers/factor-lang/test/hello-world/extra/hello/hello.factor @@ -0,0 +1,7 @@ +! SPDX-License-Identifier: 0BSD +USING: io namespaces sequences ; + +IN: hello + +: greet ( name -- ) + "Hello, " prepend print ; diff --git a/pkgs/development/compilers/factor-lang/wrapper.nix b/pkgs/development/compilers/factor-lang/wrapper.nix index 5f8e4ff37020..80d3def2df04 100644 --- a/pkgs/development/compilers/factor-lang/wrapper.nix +++ b/pkgs/development/compilers/factor-lang/wrapper.nix @@ -2,6 +2,9 @@ lib, stdenv, makeWrapper, + runCommandLocal, + buildFactorApplication, + buildFactorVocab, buildEnv, copyDesktopItems, makeDesktopItem, @@ -220,6 +223,16 @@ stdenv.mkDerivation (finalAttrs: { extraVocabs vocabTree ; + tests = { + hello-world = import ./test/hello-world { + inherit + lib + runCommandLocal + buildFactorApplication + buildFactorVocab + ; + }; + }; }; meta = factor-unwrapped.meta // { diff --git a/pkgs/development/python-modules/arro3/default.nix b/pkgs/development/python-modules/arro3/default.nix index c278dbc4d9c4..23c510335174 100644 --- a/pkgs/development/python-modules/arro3/default.nix +++ b/pkgs/development/python-modules/arro3/default.nix @@ -10,19 +10,19 @@ pandas, }: let - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "kylebarron"; repo = "arro3"; tag = "py-v${version}"; - hash = "sha256-Zlc+M+h8pgYLLhEGgv2W6YfahYtdm9Q8ezVK+Kwd2lw="; + hash = "sha256-24aMiFHQdwZwTthPt7GILjQzbbLp3K2UcXYw3ZGWUJ4="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit version src; pname = "arro3-vendor"; - hash = "sha256-f36qIkQIu6Jl2hb3HJaMpnLbWVaR3z4WrQ1aLZr4VvQ="; + hash = "sha256-8pD7vfGtwknUKLQ/DARmRvvnffBqbGLY9lWJgU7VvWM="; }; commonMeta = { diff --git a/pkgs/development/python-modules/arviz-base/default.nix b/pkgs/development/python-modules/arviz-base/default.nix index 32f7a70f191f..99c5e909f275 100644 --- a/pkgs/development/python-modules/arviz-base/default.nix +++ b/pkgs/development/python-modules/arviz-base/default.nix @@ -24,7 +24,7 @@ buildPythonPackage (finalAttrs: { pname = "arviz-base"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; __structuredAttrs = true; @@ -32,7 +32,7 @@ buildPythonPackage (finalAttrs: { owner = "arviz-devs"; repo = "arviz-base"; tag = "v${finalAttrs.version}"; - hash = "sha256-/v1LPgM2rDw9Z0en0MYGELGiRlmwQX4ILKsBEqOhhSs="; + hash = "sha256-IMS5t+ezAoALBxk0PnX7G+DFNfYW20Qd+/M2p1IzktA="; }; build-system = [ diff --git a/pkgs/development/python-modules/arviz-plots/default.nix b/pkgs/development/python-modules/arviz-plots/default.nix index 5e7a4a87e052..124dfb4ae34e 100644 --- a/pkgs/development/python-modules/arviz-plots/default.nix +++ b/pkgs/development/python-modules/arviz-plots/default.nix @@ -41,7 +41,7 @@ buildPythonPackage (finalAttrs: { pname = "arviz-plots"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; __structuredAttrs = true; @@ -49,7 +49,7 @@ buildPythonPackage (finalAttrs: { owner = "arviz-devs"; repo = "arviz-plots"; tag = "v${finalAttrs.version}"; - hash = "sha256-ti1wD/aPNCk59wkad+xkvIKTB2Wkupovlo0Hg0YqK1o="; + hash = "sha256-C08HLWnCixreeMj5imN7iOnYgYUZZ3+XG0lPExL4O1c="; }; build-system = [ diff --git a/pkgs/development/python-modules/arviz-stats/default.nix b/pkgs/development/python-modules/arviz-stats/default.nix index 490f7bdacb23..222c202bb5dd 100644 --- a/pkgs/development/python-modules/arviz-stats/default.nix +++ b/pkgs/development/python-modules/arviz-stats/default.nix @@ -38,7 +38,7 @@ buildPythonPackage (finalAttrs: { pname = "arviz-stats"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; __structuredAttrs = true; @@ -46,7 +46,7 @@ buildPythonPackage (finalAttrs: { owner = "arviz-devs"; repo = "arviz-stats"; tag = "v${finalAttrs.version}"; - hash = "sha256-81duRavbPUKsqTWaeD0G6ieWLtyoZm7sRk06QkG5dKQ="; + hash = "sha256-KA36JGqgsYs5fF1AndsTBkXQ6U/duoebDQ1TOEmaCSc="; }; build-system = [ diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index abfabf9053ae..84f681b56191 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -17,7 +17,7 @@ buildPythonPackage (finalAttrs: { pname = "arviz"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; __structuredAttrs = true; @@ -25,7 +25,7 @@ buildPythonPackage (finalAttrs: { owner = "arviz-devs"; repo = "arviz"; tag = "v${finalAttrs.version}"; - hash = "sha256-M9tj1X65hiLpI32X+t/gPYZHGwmAQ+9n52e8lVptg7k="; + hash = "sha256-pbYc9ofBTAZ9e7IqAgHXT0EXhbQzovSdc6X3SysAKhw="; }; build-system = [ diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix index 45bcc9338918..b967b7cb6c47 100644 --- a/pkgs/development/python-modules/asteval/default.nix +++ b/pkgs/development/python-modules/asteval/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "asteval"; - version = "1.0.8"; + version = "1.0.9"; pyproject = true; src = fetchFromGitHub { owner = "lmfit"; repo = "asteval"; tag = version; - hash = "sha256-qENmfqWaKhNKMTTYg2QrhL1eqhda8dUOP8b0Wcq4Ats="; + hash = "sha256-TJGKQA4jI6aRcwUbFH2t1pFs0XdN3MVSEfGovnzI2/Q="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/bdffont/default.nix b/pkgs/development/python-modules/bdffont/default.nix index 9a737218d020..249178c9bba9 100644 --- a/pkgs/development/python-modules/bdffont/default.nix +++ b/pkgs/development/python-modules/bdffont/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "bdffont"; - version = "0.0.37"; + version = "0.0.39"; pyproject = true; src = fetchFromGitHub { owner = "TakWolf"; repo = "bdffont"; tag = finalAttrs.version; - hash = "sha256-FC4I4gxK0Lly32WYfjs6+CtfUhfASf8kgZDTGmDp+kE="; + hash = "sha256-sBSIcQHL1FtWmn/1ra1GgeGFzO882UMr467fEfEcG2U="; }; build-system = [ uv-build ]; diff --git a/pkgs/development/python-modules/chex/default.nix b/pkgs/development/python-modules/chex/default.nix index ed93783889d6..bdd741606efe 100644 --- a/pkgs/development/python-modules/chex/default.nix +++ b/pkgs/development/python-modules/chex/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, # build-system flit-core, @@ -23,29 +22,17 @@ buildPythonPackage (finalAttrs: { pname = "chex"; - version = "0.1.91"; + version = "0.1.92"; pyproject = true; __structuredAttrs = true; src = fetchFromGitHub { - owner = "deepmind"; + owner = "google-deepmind"; repo = "chex"; tag = "v${finalAttrs.version}"; - hash = "sha256-lJ9+kvG7dRtfDVgvkcJ9/jtnX0lMfxY4mmZ290y/74U="; + hash = "sha256-PM76Q72Bgyms7dROJkmlpPuDvtqjHLPTDkUYqo08T74="; }; - patches = [ - # jax.device_put_replicated is removed in jax 0.10.0 - # This fix was merged upstream -> remove when updating to the next release - (fetchpatch { - url = "https://github.com/google-deepmind/chex/commit/5fbd2c9a9936799daf92354e0307b9e88b9cc163.patch"; - excludes = [ - "chex/_src/variants.py" - ]; - hash = "sha256-ZTimSq7/yt2UEiWmLcfFBadX8+VcaxuPhkQJEyiEZlE="; - }) - ]; - build-system = [ flit-core ]; @@ -67,19 +54,9 @@ buildPythonPackage (finalAttrs: { pytestCheckHook ]; - disabledTests = [ - # Jax 0.8.2 incompatibility (reported at https://github.com/google-deepmind/chex/issues/422) - # AssertionError: AssertionError not raised - "test_assert_tree_is_on_device" - # AssertionError: "\[Chex\]\ [\s\S]*sharded arrays are disallowed" does not match ... - "test_assert_tree_is_on_host" - # AssertionError: [Chex] Assertion assert_tree_is_sharded failed: ... - "test_assert_tree_is_sharded" - ]; - meta = { description = "Library of utilities for helping to write reliable JAX code"; - homepage = "https://github.com/deepmind/chex"; + homepage = "https://github.com/google-deepmind/chex"; changelog = "https://github.com/google-deepmind/chex/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ ndl ]; diff --git a/pkgs/development/python-modules/copier/default.nix b/pkgs/development/python-modules/copier/default.nix index 0c93f62cf4a8..819eddb0ebc1 100644 --- a/pkgs/development/python-modules/copier/default.nix +++ b/pkgs/development/python-modules/copier/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "copier"; - version = "9.15.1"; + version = "9.15.2"; pyproject = true; src = fetchFromGitHub { @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm $out/tests/demo/doc/ma*ana.txt ''; - hash = "sha256-HetG19IfXCVAtdKpj5XPJUIqHH10kut3gPcDwbfN6+8="; + hash = "sha256-57FQtXPf9L7dXogf2mmWVViggHkn/2VTKm/B4FFSrfI="; }; env.POETRY_DYNAMIC_VERSIONING_BYPASS = version; diff --git a/pkgs/development/python-modules/exllamav3/default.nix b/pkgs/development/python-modules/exllamav3/default.nix index f50965fcc98f..0f8baeda4922 100644 --- a/pkgs/development/python-modules/exllamav3/default.nix +++ b/pkgs/development/python-modules/exllamav3/default.nix @@ -29,14 +29,14 @@ let in buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: { pname = "exllamav3"; - version = "0.0.39"; + version = "0.0.42"; pyproject = true; src = fetchFromGitHub { owner = "turboderp-org"; repo = "exllamav3"; tag = "v${finalAttrs.version}"; - hash = "sha256-auAOnsNOr22TTIBR9L81tp9ZCrSLY4RxXWAJ1E39EwM="; + hash = "sha256-kdI2BT7T2+mrdgWE7aXTeqC49WP6qEus+LfQGk0ozhA="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix index 47af6704df75..6045a2d21105 100644 --- a/pkgs/development/python-modules/gradient/default.nix +++ b/pkgs/development/python-modules/gradient/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "gradient"; - version = "3.10.1"; + version = "3.12.1"; pyproject = true; src = fetchFromGitHub { owner = "digitalocean"; repo = "gradient-python"; rev = "v${finalAttrs.version}"; - hash = "sha256-Psre4HdF4/cgQ5CcM3H6PC+6asej4Is4+932Gvym774="; + hash = "sha256-4BJMUxNryePXIAG92JOX7pTbDN6FQzmYRu1+2bKEwX0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix index ab6d18e46fe8..a756393a4ef4 100644 --- a/pkgs/development/python-modules/greeclimate/default.nix +++ b/pkgs/development/python-modules/greeclimate/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "greeclimate"; - version = "2.1.4"; + version = "3.0.0"; pyproject = true; src = fetchFromGitHub { owner = "cmroche"; repo = "greeclimate"; tag = "v${version}"; - hash = "sha256-qYgwjVfH9Im0Mxd8YOjV1M4fKhSd3tKyQB2PZ9dkqTU="; + hash = "sha256-ikIpL9Il6uCA2z6SbceNzqTyC5P0lP5ZR4J3KfSgypo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/marshmallow-oneofschema/default.nix b/pkgs/development/python-modules/marshmallow-oneofschema/default.nix index 23382bf35f8e..3caa6fa5e3b9 100644 --- a/pkgs/development/python-modules/marshmallow-oneofschema/default.nix +++ b/pkgs/development/python-modules/marshmallow-oneofschema/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { changelog = "https://github.com/marshmallow-code/marshmallow-oneofschema/blob/${version}/CHANGELOG.rst"; homepage = "https://github.com/marshmallow-code/marshmallow-oneofschema"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ivan-tkatchev ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix index 062f44c3dffb..88930abfb5e8 100644 --- a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "microsoft-kiota-abstractions"; - version = "1.10.2"; + version = "1.10.3"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "kiota-python"; tag = "microsoft-kiota-abstractions-v${finalAttrs.version}"; - hash = "sha256-rj0NpuXvqS5rB6TrD3FyuMWb7Dl8/SIBcW/Lzj4cY6I="; + hash = "sha256-r0u+erTSKBWzLV7VfwWUYh7lyJS1hDh5A0Tzk3pFzo4="; }; sourceRoot = "${finalAttrs.src.name}/packages/abstractions/"; diff --git a/pkgs/development/python-modules/microsoft-kiota-http/default.nix b/pkgs/development/python-modules/microsoft-kiota-http/default.nix index 95d4a2e8bcc9..245d7935a741 100644 --- a/pkgs/development/python-modules/microsoft-kiota-http/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-http/default.nix @@ -16,14 +16,14 @@ buildPythonPackage (finalAttrs: { pname = "microsoft-kiota-http"; - version = "1.10.2"; + version = "1.10.3"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "kiota-python"; tag = "microsoft-kiota-http-v${finalAttrs.version}"; - hash = "sha256-rj0NpuXvqS5rB6TrD3FyuMWb7Dl8/SIBcW/Lzj4cY6I="; + hash = "sha256-r0u+erTSKBWzLV7VfwWUYh7lyJS1hDh5A0Tzk3pFzo4="; }; sourceRoot = "${finalAttrs.src.name}/packages/http/httpx/"; diff --git a/pkgs/development/python-modules/mistral-common/default.nix b/pkgs/development/python-modules/mistral-common/default.nix index bda5944d02ab..8a9b481a9268 100644 --- a/pkgs/development/python-modules/mistral-common/default.nix +++ b/pkgs/development/python-modules/mistral-common/default.nix @@ -38,14 +38,14 @@ buildPythonPackage (finalAttrs: { pname = "mistral-common"; - version = "1.11.2"; + version = "1.11.3"; pyproject = true; src = fetchFromGitHub { owner = "mistralai"; repo = "mistral-common"; tag = "v${finalAttrs.version}"; - hash = "sha256-EXdZcBR61GNye8LqwIqRO8lP1lK6fqPJufWFO9XkkYQ="; + hash = "sha256-9NeJqv7m7vT/lI6mV9QbAsrLUcxO4Wr+QgKfz6RWtsM="; }; build-system = [ diff --git a/pkgs/development/python-modules/openmm-torch/default.nix b/pkgs/development/python-modules/openmm-torch/default.nix new file mode 100644 index 000000000000..deee601861ed --- /dev/null +++ b/pkgs/development/python-modules/openmm-torch/default.nix @@ -0,0 +1,120 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + + # nativeBuildInputs + cmake, + pip, + setuptools, + swig, + wheel, + autoAddDriverRunpath, + + # dependencies + openmm, + torch, +}: +let + inherit (torch) cudaSupport cudaPackages; +in +buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: { + pname = "openmm-torch"; + version = "1.5.1"; + pyproject = false; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "openmm"; + repo = "openmm-torch"; + tag = "v${finalAttrs.version}"; + hash = "sha256-z9aw1ye9zcDTiS/2eBBoxqSjds+eB2aMeO04GzsH3aw="; + }; + + # Ensure pip will not try to query an online index + install to the output store path + postPatch = '' + substituteInPlace python/CMakeLists.txt \ + --replace-fail \ + '-m pip install .' \ + '-m pip install --no-index --no-build-isolation --no-deps --prefix=$ENV{out} .' + ''; + + cmakeFlags = [ + (lib.cmakeFeature "OPENMM_DIR" "${openmm}") + + # Upstream's CMakeLists.txt registers OPENMM_DIR's lib directories as the build RPATH. CMake then + # fails trying to rewrite the install RPATH because Nix's cc-wrapper has already baked the correct + # RUNPATH (torch, openmm, ...) into the library at link time. Disable CMake's RPATH handling and + # keep the Nix-set RUNPATH. + (lib.cmakeBool "CMAKE_SKIP_RPATH" true) + + (lib.cmakeBool "NN_BUILD_CUDA_LIB" cudaSupport) + ]; + + nativeBuildInputs = [ + cmake + pip + setuptools + swig + wheel + ] + ++ lib.optionals cudaSupport [ + cudaPackages.cuda_nvcc + autoAddDriverRunpath + ]; + + env.NIX_LDFLAGS = toString ( + lib.optionals cudaSupport [ + # The CUDA platform references driver API (libcuda) symbols. + # Upstream's CMake only links the driver library on Windows; on Linux it relies on it being on the + # link path, which fails in the sandbox (the openmm CUDA libs point their RUNPATH at the impure + # /run/opengl-driver/lib). + + # Link the driver stub explicitly so the symbols resolve; the real driver is found at runtime via + # autoAddDriverRunpath, and removeStubsFromRunpath strips the stub path from the output. + "-L${lib.getOutput "stubs" cudaPackages.cuda_cudart}/lib/stubs" + + "-lcuda" + ] + ); + + buildInputs = [ + openmm + torch + ] + ++ lib.optionals cudaSupport [ + cudaPackages.cuda_cudart + cudaPackages.cuda_nvrtc + ]; + + dependencies = [ + openmm + torch + ]; + + # Install the python bindings + postInstall = '' + ${lib.optionalString cudaSupport '' + # The Python extension only wraps the core TorchForce API; it must not link the CUDA driver + # stub, otherwise importing it would require libcuda.so.1 at load time (absent in the sandbox + # and on CPU-only hosts). + export NIX_LDFLAGS="''${NIX_LDFLAGS//-lcuda/}" + ''} + make PythonInstall + ''; + + pythonImportsCheck = [ "openmmtorch" ]; + + # No tests + doCheck = false; + + meta = { + description = "OpenMM plugin to define forces with neural networks"; + homepage = "https://github.com/openmm/openmm-torch"; + changelog = "https://github.com/openmm/openmm-torch/releases/tag/${finalAttrs.src.tag}"; + # https://github.com/openmm/openmm-torch/tree/master#license + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix index 724a845abfe8..f66d6e3cef87 100644 --- a/pkgs/development/python-modules/plotnine/default.nix +++ b/pkgs/development/python-modules/plotnine/default.nix @@ -23,7 +23,7 @@ buildPythonPackage (finalAttrs: { pname = "plotnine"; - version = "0.15.5"; + version = "0.15.6"; pyproject = true; __structuredAttrs = true; @@ -31,7 +31,7 @@ buildPythonPackage (finalAttrs: { owner = "has2k1"; repo = "plotnine"; tag = "v${finalAttrs.version}"; - hash = "sha256-o2yCZeYMIKpmJ7ekH4dCFZXnxyw7uN5rhXYehCNOOWI="; + hash = "sha256-5/1LV5MvqXZZiXxp1HnUb665kaRPfaiLH750iovoH4g="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-unmagic/default.nix b/pkgs/development/python-modules/pytest-unmagic/default.nix index 07906b948ddc..60e911fec185 100644 --- a/pkgs/development/python-modules/pytest-unmagic/default.nix +++ b/pkgs/development/python-modules/pytest-unmagic/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-unmagic"; - version = "1.0.1"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "dimagi"; repo = "pytest-unmagic"; tag = "v${version}"; - hash = "sha256-XHeQuMCYHtrNF5+7e/eMzcvYukM+AobHCMRdzL+7KpU="; + hash = "sha256-M7eTZmLkSm1XGgF3ijzenkXcy8zBawauM9+AUxA9RDg="; }; build-system = [ diff --git a/pkgs/development/python-modules/python-nvd3/default.nix b/pkgs/development/python-modules/python-nvd3/default.nix index 54006017fd58..5829cbe73ade 100644 --- a/pkgs/development/python-modules/python-nvd3/default.nix +++ b/pkgs/development/python-modules/python-nvd3/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { homepage = "https://github.com/areski/python-nvd3"; changelog = "https://github.com/areski/python-nvd3/releases/tag/${src.tag}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ivan-tkatchev ]; + maintainers = [ ]; mainProgram = "nvd3"; }; } diff --git a/pkgs/development/python-modules/schwifty/default.nix b/pkgs/development/python-modules/schwifty/default.nix index ba5cb0e4ee65..e33dddaca7d3 100644 --- a/pkgs/development/python-modules/schwifty/default.nix +++ b/pkgs/development/python-modules/schwifty/default.nix @@ -23,11 +23,14 @@ buildPythonPackage rec { pname = "schwifty"; - version = "2026.1.0"; + version = "2026.01.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit pname; + # The version is different missing leading zeros in the CalVer month. + # This is due to PyPI's normalization of integers + version = "2026.1.0"; hash = "sha256-VhZBQDAewy23iyMfli9Xsf1zIAKO6Q38OWNEOW9pdJg="; }; diff --git a/pkgs/development/python-modules/smp/default.nix b/pkgs/development/python-modules/smp/default.nix index cdae250e0a2a..548e087ab316 100644 --- a/pkgs/development/python-modules/smp/default.nix +++ b/pkgs/development/python-modules/smp/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "smp"; - version = "4.0.2"; + version = "4.1.0"; pyproject = true; src = fetchFromGitHub { owner = "JPHutchins"; repo = "smp"; tag = version; - hash = "sha256-dATsVGG0b5SBZh7R7NT1deJFDRYi7BwtWzT7/QPjkJw="; + hash = "sha256-RjecTnMYNcJeD7wqq4FkwRvEgTn5V/RwMfOjf2dqQ+U="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix b/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix index ab46d7723fce..27410f916f22 100644 --- a/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { homepage = "https://github.com/penguinolog/sqlalchemy_jsonfield"; changelog = "https://github.com/penguinolog/sqlalchemy_jsonfield/releases/tag/${version}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ ivan-tkatchev ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/token-bucket/default.nix b/pkgs/development/python-modules/token-bucket/default.nix index 2be53be08b13..c4e8e9aeace9 100644 --- a/pkgs/development/python-modules/token-bucket/default.nix +++ b/pkgs/development/python-modules/token-bucket/default.nix @@ -3,38 +3,23 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch, pytestCheckHook, setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "token-bucket"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "falconry"; repo = "token-bucket"; - tag = version; - hash = "sha256-dazqJRpC8FUHOhgKFzDnIl5CT2L74J2o2Hsm0IQf4Cg="; + tag = finalAttrs.version; + hash = "sha256-ZWmrLZ3CsotGAoVdbVTz7YNrBHfCKR5t94wrdVMM3P4="; }; - patches = [ - # Replace imp with importlib, https://github.com/falconry/token-bucket/pull/24 - (fetchpatch { - name = "remove-imp.patch"; - url = "https://github.com/falconry/token-bucket/commit/10a3c9f4de00f4933349f66b4c72b6c96db6e766.patch"; - hash = "sha256-Hk5+i3xzeA3F1kXRaRarWT9mff2lT2WNmTfTZvYzGYI="; - }) - ]; - - postPatch = '' - substituteInPlace setup.py \ - --replace "'pytest-runner'" "" - ''; - - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -43,8 +28,8 @@ buildPythonPackage rec { meta = { description = "Token Bucket Implementation for Python Web Apps"; homepage = "https://github.com/falconry/token-bucket"; - changelog = "https://github.com/falconry/token-bucket/releases/tag/${version}"; + changelog = "https://github.com/falconry/token-bucket/releases/tag/${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ hexa ]; }; -} +}) diff --git a/pkgs/development/python-modules/unstructured-client/default.nix b/pkgs/development/python-modules/unstructured-client/default.nix index 46c9f8016dd8..c3f913ce991d 100644 --- a/pkgs/development/python-modules/unstructured-client/default.nix +++ b/pkgs/development/python-modules/unstructured-client/default.nix @@ -18,14 +18,14 @@ buildPythonPackage (finalAttrs: { pname = "unstructured-client"; - version = "0.44.1"; + version = "0.45.0"; pyproject = true; src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-python-client"; tag = "v${finalAttrs.version}"; - hash = "sha256-UW7kulpcSgVZpU8hdneC7XvlLfvBj08qjYPdVny9tCo="; + hash = "sha256-K4+k1wKFvT2JYElt2SdBFKJGpFdC15Bu8Aa+M/c7JSQ="; }; preBuild = '' diff --git a/pkgs/development/python-modules/zigpy-zboss/default.nix b/pkgs/development/python-modules/zigpy-zboss/default.nix index a1090a5ddc14..6bec028b7cc2 100644 --- a/pkgs/development/python-modules/zigpy-zboss/default.nix +++ b/pkgs/development/python-modules/zigpy-zboss/default.nix @@ -2,52 +2,35 @@ buildPythonPackage, coloredlogs, fetchFromGitHub, - fetchpatch, jsonschema, lib, - pytest-asyncio_0, + pytest-asyncio, pytest-mock, pytestCheckHook, + serialx, setuptools, voluptuous, zigpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zigpy-zboss"; - version = "1.2.0"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "kardia-as"; repo = "zigpy-zboss"; - tag = "v${version}"; - hash = "sha256-T2R291GeFIsnDRI1tAydTlLamA3LF5tKxKFhPtcEUus="; + tag = "v${finalAttrs.version}"; + hash = "sha256-mVOuBy/uf4NsWqSfpL/ETLMnUDF5H8x1n8XoNjH5DNY="; }; - patches = [ - # https://github.com/kardia-as/zigpy-zboss/pull/66 - (fetchpatch { - name = "replace-async-timeout-with-asyncio-timeout.patch"; - url = "https://github.com/kardia-as/zigpy-zboss/commit/91688873ddbcd0c2196f0da69a857b2e2bec75a6.patch"; - excludes = [ "setup.cfg" ]; - hash = "sha256-aC0+FbbtuHDW3ApJDnTG3TUeNWhzecEYVuiSOik03uU="; - }) - (fetchpatch { - # https://github.com/kardia-as/zigpy-zboss/pull/67 - name = "replace-pyserial-asyncio-with-pyserial-asyncio-fast.patch"; - url = "https://github.com/kardia-as/zigpy-zboss/commit/d44ceb537dc16ce020f8c60a0ff35e88672f3455.patch"; - hash = "sha256-aXWRtBLDr9NLIMNK/xtsYuy/hEB2zHU3YYcRKbguTTo="; - }) - ]; - - pythonRemoveDeps = [ "async_timeout" ]; - build-system = [ setuptools ]; dependencies = [ coloredlogs jsonschema + serialx voluptuous zigpy ]; @@ -55,33 +38,16 @@ buildPythonPackage rec { pythonImportsCheck = [ "zigpy_zboss" ]; nativeCheckInputs = [ - pytest-asyncio_0 + pytest-asyncio pytest-mock pytestCheckHook ]; - disabledTestPaths = [ - # AttributeError: 'Ledvance' object has no attribute 'get' - "tests/application/test_connect.py" - "tests/application/test_join.py" - "tests/application/test_requests.py" - "tests/application/test_startup.py" - "tests/application/test_zdo_requests.py" - "tests/application/test_zigpy_callbacks.py" - # This hasn't been updated in 2 years, and we're getting new failing tests. Best I can do for now is disable them. - # If this recieves an update, please give reenabling these tests a try. - "tests/api/test_listeners.py" - "tests/api/test_request.py" - "tests/api/test_response.py" - "tests/api/test_connect.py" - "tests/test_uart.py" - ]; - meta = { - changelog = "https://github.com/kardia-as/zigpy-zboss/releases/tag/v${version}"; + changelog = "https://github.com/kardia-as/zigpy-zboss/releases/tag/${finalAttrs.src.tag}"; description = "Library for zigpy which communicates with Nordic nRF52 radios"; homepage = "https://github.com/kardia-as/zigpy-zboss"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 6af44a1f2b30..f0fb666cd8de 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -363,7 +363,14 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (withHomed || withCryptsetup) [ libfido2 ] ++ lib.optionals withLibBPF [ libbpf ] ++ lib.optional withTpm2Tss tpm2-tss - ++ lib.optional withUkify (python3Packages.python.withPackages (ps: with ps; [ pefile ])) + ++ lib.optional withUkify ( + python3Packages.python.withPackages ( + ps: with ps; [ + cryptography + pefile + ] + ) + ) ++ lib.optionals withPasswordQuality [ libpwquality ] ++ lib.optionals withQrencode [ qrencode ] ++ lib.optionals withLibarchive [ libarchive ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8944205f1b1f..6af7a2024028 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5851,7 +5851,7 @@ with pkgs; stdenv = clangStdenv; }; }; - factorPackages = factorPackages-0_100; + factorPackages = factorPackages-0_101; factor-lang-0_99 = factorPackages-0_99.factor-lang; factor-lang-0_100 = factorPackages-0_100.factor-lang; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 59128805b25d..cb255c8fb62c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11841,6 +11841,8 @@ self: super: with self; { } ); + openmm-torch = callPackage ../development/python-modules/openmm-torch { }; + openpaperwork-core = callPackage ../applications/office/paperwork/openpaperwork-core.nix { }; openpaperwork-gtk = callPackage ../applications/office/paperwork/openpaperwork-gtk.nix { };