diff --git a/ci/github-script/get-pr-commit-details.js b/ci/github-script/get-pr-commit-details.js index 097e14db7047..00c1211de95d 100644 --- a/ci/github-script/get-pr-commit-details.js +++ b/ci/github-script/get-pr-commit-details.js @@ -84,7 +84,6 @@ async function getCommitDetailsForPR({ core, pr, repoPath }) { 'log', '--format=%s\t%aN\t%aE\t%cN\t%cE', '--name-only', - '-m', '-1', sha, ], diff --git a/lib/licenses/licenses.nix b/lib/licenses/licenses.nix index f58e809cd089..673d0dffdd49 100644 --- a/lib/licenses/licenses.nix +++ b/lib/licenses/licenses.nix @@ -320,6 +320,11 @@ lib.mapAttrs mkLicense ( fullName = "Buddy License"; }; + bugroff = { + spdxId = "Bugroff"; + fullName = "Bugroff License"; + }; + bzip2 = { spdxId = "bzip2-1.0.6"; fullName = "bzip2 and libbzip2 License v1.0.6"; @@ -1039,9 +1044,9 @@ lib.mapAttrs mkLicense ( fullName = "Licence Libre du Québec – Permissive version 1.1"; }; - llgpl21 = { - fullName = "Lisp LGPL; GNU Lesser General Public License version 2.1 with Franz Inc. preamble for clarification of LGPL terms in context of Lisp"; - url = "https://opensource.franz.com/preamble.html"; + llgplPreamble = { + spdxId = "LLGPL"; + fullName = "LLGPL Preamble"; }; llvm-exception = { diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 774ae6509cde..69d0d9418ecc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -27382,6 +27382,11 @@ githubId = 19950702; email = "silence.m@hotmail.com"; }; + subham-roy = { + github = "SUBHAM-ROY"; + githubId = 7468505; + name = "Subham Roy"; + }; SubhrajyotiSen = { email = "subhrajyoti12@gmail.com"; github = "SubhrajyotiSen"; diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index dcb05e349197..7b0fed338073 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -2,51 +2,12 @@ config, options, lib, - pkgs, ... }: let cfg = config.nixpkgs; opt = options.nixpkgs; - isConfig = x: builtins.isAttrs x || lib.isFunction x; - - optCall = f: x: if lib.isFunction f then f x else f; - - mergeConfig = - lhs_: rhs_: - let - lhs = optCall lhs_ { inherit lib pkgs; }; - rhs = optCall rhs_ { inherit lib pkgs; }; - in - lib.recursiveUpdate lhs rhs - // lib.optionalAttrs (lhs ? allowUnfreePackages) { - allowUnfreePackages = lhs.allowUnfreePackages ++ (lib.attrByPath [ "allowUnfreePackages" ] [ ] rhs); - } - // lib.optionalAttrs (lhs ? packageOverrides) { - packageOverrides = - pkgs: - optCall lhs.packageOverrides pkgs // optCall (lib.attrByPath [ "packageOverrides" ] { } rhs) pkgs; - } - // lib.optionalAttrs (lhs ? perlPackageOverrides) { - perlPackageOverrides = - pkgs: - optCall lhs.perlPackageOverrides pkgs - // optCall (lib.attrByPath [ "perlPackageOverrides" ] { } rhs) pkgs; - }; - - configType = lib.mkOptionType { - name = "nixpkgs-config"; - description = "nixpkgs config"; - check = - x: - let - traceXIfNot = c: if c x then true else lib.traceSeqN 1 x false; - in - traceXIfNot isConfig; - merge = args: lib.foldr (def: mergeConfig def.value) { }; - }; - overlayType = lib.mkOptionType { name = "nixpkgs-overlay"; description = "nixpkgs overlay"; @@ -73,6 +34,8 @@ let ++ lib.optional (opt.localSystem.highestPrio < (lib.mkOptionDefault { }).priority) opt.localSystem ++ lib.optional (opt.crossSystem.highestPrio < (lib.mkOptionDefault { }).priority) opt.crossSystem; + _configDefinitions = opt.config.definitionsWithLocations; + defaultPkgs = if opt.hostPlatform.isDefined then let @@ -90,14 +53,21 @@ let in import ../../.. ( { - inherit (cfg) config overlays; + inherit _configDefinitions; + inherit (cfg) overlays; + # Explicitly set config to prevent impure.nix from filling it + # from the NIXPKGS_CONFIG environment variable. + config = { }; } // systemArgs ) else import ../../.. { + inherit _configDefinitions; + # Explicitly set config to prevent impure.nix from filling it + # from the NIXPKGS_CONFIG environment variable. + config = { }; inherit (cfg) - config overlays localSystem crossSystem @@ -165,7 +135,15 @@ in example = lib.literalExpression '' { allowBroken = true; allowUnfree = true; } ''; - type = configType; + type = lib.types.deferredModuleWith { + staticModules = [ + { _module.args.docPrefix = "https://nixos.org/manual/nixpkgs/unstable/"; } + ../../../pkgs/top-level/config.nix + ]; + }; + # Returns pkgs.config instead of nixpkgs.config + # This shadows the deferredModule to make it look like a submodule + apply = _: finalPkgs.config; description = '' Global configuration for Nixpkgs. The complete list of [Nixpkgs configuration options](https://nixos.org/manual/nixpkgs/unstable/#sec-config-options-reference) is in the [Nixpkgs manual section on global configuration](https://nixos.org/manual/nixpkgs/unstable/#chap-packageconfig). @@ -406,7 +384,7 @@ in ''; } { - assertion = opt.pkgs.isDefined -> cfg.config == { }; + assertion = opt.pkgs.isDefined -> opt.config.highestPrio == (lib.mkOptionDefault null).priority; message = '' Your system configures nixpkgs with an externally created instance. `nixpkgs.config` options should be passed when creating the instance instead. diff --git a/nixos/modules/security/auditd.nix b/nixos/modules/security/auditd.nix index e79b0a2c9231..d971b5db2e86 100644 --- a/nixos/modules/security/auditd.nix +++ b/nixos/modules/security/auditd.nix @@ -151,10 +151,9 @@ in path = lib.getExe' config.security.auditd.package "audisp-af_unix"; args = [ "0640" - "/var/run/audispd_events" + "/run/audit/audispd_events" "string" ]; - format = "binary"; }; remote = { path = lib.getExe' config.security.auditd.package "audisp-remote"; @@ -234,7 +233,6 @@ in "/run/audit/audispd_events" "string" ]; - format = "binary"; }; remote = { path = lib.getExe' cfg.package "audisp-remote"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix index 6dd22994d42a..814e968d0265 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix @@ -11,13 +11,13 @@ }: vimUtils.buildVimPlugin rec { pname = "codediff.nvim"; - version = "2.53.1"; + version = "2.66.0"; src = fetchFromGitHub { owner = "esmuellert"; repo = "codediff.nvim"; tag = "v${version}"; - hash = "sha256-G1PAq/vA/4QPSuqtEBl/dc8HHXD7RLn3oVDmoxmlnOs="; + hash = "sha256-+2Prk091hcQXtQyk6gtdvChWY0njhUTARhlsr5Lwdps="; }; dependencies = [ vimPlugins.nui-nvim ]; diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix index 4f8e22c9add4..ed9e244477ea 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -21,22 +21,22 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-3V4N8zHj7nB987ImVtBS84LGxdQgkDp14kTPps72fHo="; + hash = "sha256-BE9YnAuEFyGrHCIWP0o+ddQ1lkcMhc5M+cIjAujQka0="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-6p09GcEfmSQs4nRuaFxQ1tKK25ENo2KOPkRQTPndNcw="; + hash = "sha256-bQR4WyDCbSYZG5YA/mytdKYQHqKc9NxgjWRVIfQPI6E="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-qbYE3f0fkxvfGyFAR8UPIFodOEYA0aJK6JK/r8PbI/k="; + hash = "sha256-kXm2c77lrCLq9MdzGcPijJuRDfLJxjMTDgIBCPMAy3U="; }; }; in { name = "claude-code"; publisher = "anthropic"; - version = "2.1.223"; + version = "2.1.224"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix index 37cbabd4ba4a..4ee33cbfae79 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix @@ -8,13 +8,13 @@ }: mkLibretroCore { core = "mednafen-psx" + lib.optionalString withHw "-hw"; - version = "0-unstable-2026-07-28"; + version = "0-unstable-2026-08-07"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-psx-libretro"; - rev = "d45d9d1a8c3f59b7345e19d4ea66b187cb1fbe7b"; - hash = "sha256-njKdOWciCUCQf/AJOLlJ1fKEAARXVs0DwOnhFpuBPpI="; + rev = "ed640fac8986d7813e4db6604544a6aafddd3018"; + hash = "sha256-dwat09yGQ0OnF8GaglqCVlgcoyAfqhleqD/mMlgHh1w="; }; extraBuildInputs = lib.optionals withHw [ diff --git a/pkgs/applications/emulators/libretro/cores/bluemsx.nix b/pkgs/applications/emulators/libretro/cores/bluemsx.nix index 92025e1af3d9..9f94477e5346 100644 --- a/pkgs/applications/emulators/libretro/cores/bluemsx.nix +++ b/pkgs/applications/emulators/libretro/cores/bluemsx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "bluemsx"; - version = "0-unstable-2026-07-27"; + version = "0-unstable-2026-07-29"; src = fetchFromGitHub { owner = "libretro"; repo = "bluemsx-libretro"; - rev = "f1715c8bf6443c4de7cad254ea14037704f8058e"; - hash = "sha256-CPVo3RN8zeXwywYK4kxG7e7GktFxzI4e7zij+pX2vVw="; + rev = "0f32f52c48d3e772bfdf0379756f81f00b4e08bc"; + hash = "sha256-4XjaPkv5Tm58nhU6JUdiZXbto/uePljwXpcePRCqVus="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/fbneo.nix b/pkgs/applications/emulators/libretro/cores/fbneo.nix index bee3e08d4a5f..7425285019b9 100644 --- a/pkgs/applications/emulators/libretro/cores/fbneo.nix +++ b/pkgs/applications/emulators/libretro/cores/fbneo.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fbneo"; - version = "0-unstable-2026-07-28"; + version = "0-unstable-2026-08-06"; src = fetchFromGitHub { owner = "libretro"; repo = "fbneo"; - rev = "c79a2611849c6b2e76b638659f6f28b3244bd627"; - hash = "sha256-5EfZIM+tXBCsCI/tktW9yS2V6zlmWSxnlGv0JP51fbI="; + rev = "ef1f64b7023bc511858e96b8961f99c18a09f112"; + hash = "sha256-BW53MDOnHc2AwbphywZw4AK1+X/bA5RIDl3Ae3OSQpM="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/hatari.nix b/pkgs/applications/emulators/libretro/cores/hatari.nix index 7bc9ca4def96..3e05beef2b68 100644 --- a/pkgs/applications/emulators/libretro/cores/hatari.nix +++ b/pkgs/applications/emulators/libretro/cores/hatari.nix @@ -6,13 +6,13 @@ }: mkLibretroCore { core = "hatari"; - version = "0-unstable-2026-07-28"; + version = "0-unstable-2026-07-31"; src = fetchFromGitHub { owner = "libretro"; repo = "hatari"; - rev = "97faf4271c67a5336fba6bb7960c77bdc5d29f9e"; - hash = "sha256-Jkq7FKpf+zMaRk6XG31Sco3iXklPvVh/MDm5p52JMRo="; + rev = "92e2874e664be40e1b51b97e0ff925a1aa917f22"; + hash = "sha256-TwPlz/H0FKHI0wELj5gYTTL2RJIQOwLLIe+UktK3XXI="; }; extraNativeBuildInputs = [ which ]; diff --git a/pkgs/by-name/aa/aardvark-dns/package.nix b/pkgs/by-name/aa/aardvark-dns/package.nix index d4ae035f8518..cb59f4044e47 100644 --- a/pkgs/by-name/aa/aardvark-dns/package.nix +++ b/pkgs/by-name/aa/aardvark-dns/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "aardvark-dns"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "containers"; repo = "aardvark-dns"; tag = "v${finalAttrs.version}"; - hash = "sha256-w+qHHq/4jdkEzyoxfy1h6Vb+55uWLJhirbBSZHxLxTU="; + hash = "sha256-EQFTkJQaW4f6AFmMP5h24ugK5st1rg9c/QK3WjBORAQ="; }; - cargoHash = "sha256-rpflZfMYNlrn13Cv3znkS2Jp9peyIJDQrXVnVnVuy9g="; + cargoHash = "sha256-nTcAuhfez2ub+4z9E2YGp5i+JJr9K/PpG22ZvMW5ni4="; passthru.tests = { inherit (nixosTests) podman; }; diff --git a/pkgs/by-name/ac/acl2/package.nix b/pkgs/by-name/ac/acl2/package.nix index f5d78743636e..34daaaf573ed 100644 --- a/pkgs/by-name/ac/acl2/package.nix +++ b/pkgs/by-name/ac/acl2/package.nix @@ -192,20 +192,22 @@ stdenv.mkDerivation (finalAttrs: { downloadPage = "https://github.com/acl2-devel/acl2-devel/releases"; license = with lib.licenses; - [ - # ACL2 itself is bsd3 - bsd3 - ] - ++ lib.optionals certifyBooks [ - # The community books are mostly bsd3 or mit but with a few - # other things thrown in. - mit - gpl2 - llgpl21 - cc0 - publicDomain - unfreeRedistributable - ]; + AND ( + [ + # ACL2 itself is bsd3 + bsd3 + ] + ++ lib.optionals certifyBooks [ + # The community books are mostly bsd3 or mit but with a few + # other things thrown in. + mit + gpl2 + (WITH lgpl21Only llgplPreamble) + cc0 + publicDomain + unfreeRedistributable + ] + ); maintainers = with lib.maintainers; [ kini raskin diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix index 4654b89dc523..40ce95a87313 100644 --- a/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -20,18 +20,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cinny-desktop"; - version = "4.12.5"; + version = "4.12.6"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-/A/O42jwwK2iDV1IdRjOO8fE/AZ0h7UWAZZLozOqUWs="; + hash = "sha256-XNbdTRm+oJjnuWEk1AT63HRmOV4OjSK7aj874z+15pE="; }; sourceRoot = "${finalAttrs.src.name}/src-tauri"; - cargoHash = "sha256-EF8gpfeZasazq0NKrjItt4bkgautQjYjEegf1OlWLOw="; + cargoHash = "sha256-2jzsXj6iLf4TRUIgWe+VTEjBtYgnHJPBnZmlfvTlrXs="; postPatch = let diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix index f8b00f00cf07..f1e6010dff07 100644 --- a/pkgs/by-name/ci/cinny-unwrapped/package.nix +++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix @@ -7,17 +7,17 @@ buildNpmPackage (finalAttrs: { pname = "cinny-unwrapped"; # Remember to update cinny-desktop when bumping this version. - version = "4.12.3"; + version = "4.12.6"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny"; tag = "v${finalAttrs.version}"; - hash = "sha256-RjPdq9xNvUbJESV7CqxmgfqAx+MoKZbhUtJNTcH9aUk="; + hash = "sha256-rxW26obe+9FJmWFAZijfEqVQxH8DYSaq5/faoypmV3I="; }; - npmDepsHash = "sha256-CU8AVRuMFOGI0/LbN0LGysBk+qc2XQYxQGfrrH72stc="; + npmDepsHash = "sha256-zzyc04GrmEtqzVo2LPMw6l9Hb24XZF3XVBReWY79Pxc="; # Skip rebuilding native modules since they're not needed for the web app npmRebuildFlags = [ diff --git a/pkgs/by-name/cl/cl-launch/package.nix b/pkgs/by-name/cl/cl-launch/package.nix index 5b8e9eabb12f..122cd5fe9479 100644 --- a/pkgs/by-name/cl/cl-launch/package.nix +++ b/pkgs/by-name/cl/cl-launch/package.nix @@ -26,7 +26,12 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Common Lisp launcher script"; - license = lib.licenses.llgpl21; + license = + with lib.licenses; + OR [ + (WITH lgpl21Only llgplPreamble) + bugroff + ]; maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json index 4f608ea8240a..1f5517cc0c1a 100644 --- a/pkgs/by-name/cl/claude-code/manifest.json +++ b/pkgs/by-name/cl/claude-code/manifest.json @@ -1,52 +1,51 @@ { - "version": "2.1.223", - "commit": "4535f69721056abf01650c73ee8a91c69ba00838", - "buildDate": "2026-08-05T21:55:19Z", + "version": "2.1.224", + "commit": "8a2a469b68f918917492973f3b16bd1682b9f82c", + "buildDate": "2026-08-06T01:47:12Z", "platforms": { "darwin-arm64": { "binary": "claude", - "checksum": "fcbe0b8d47570c501302dd1ad31cc26ac2810f022c45fa253936a6961dee32bf", - "size": 272553824 + "checksum": "391df9d2ab04e4cf32199335720ac7715a582e91eaecfd4d2198a16f57ea59b3", + "size": 277495040 }, "darwin-x64": { "binary": "claude", - "checksum": "350e657428a6d34f7cf71f6738c5ebb6a1952ccb12fc1747f64297e065b1846f", - "size": 282118560 + "checksum": "7ae17a768a7270c7bd6c5484587c3c650dff425b4beeeb03addc1f2a4a7d702a", + "size": 287105184 }, "linux-arm64": { "binary": "claude", - "checksum": "60e83d8db0e894d0e54413e5e7daa256d180db660f51e139a51b614fc30cf3ac", - "size": 287423416 + "checksum": "3e50836e227868746273653e0f8115cf5fc9cb34a081847c6040c81d80812c33", + "size": 292404152 }, "linux-x64": { "binary": "claude", - "checksum": "98226474f802e3094d6a86c5ade8883c16206d0fcb5c400b7401c800063e99d7", - "size": 290728968 + "checksum": "a2b5add7dc4bcd8eaa029f4e8bdac4df7769b4073698db7989d206baf9419c2d", + "size": 295676936 }, "linux-arm64-musl": { "binary": "claude", - "checksum": "f41692eab23ebcd836d342fbc494d8783b1f19efb13d04fbf8461d2806ccb586", - "size": 280737128 + "checksum": "5ab089acd0b8d56b08d9510aeecd96767a057fc7bc05221c968c81d8d21711f6", + "size": 285717864 }, "linux-x64-musl": { "binary": "claude", - "checksum": "8a4e561e8af19746d2defcf1a5661f5c0384c9c26dadd87d45e11b67802ad147", - "size": 285336144 + "checksum": "979b08e51d814a4abaa36d8c3b570bdaa8c1dd2020b318c6f8334b631c2c4f19", + "size": 290284112 }, "win32-x64": { "binary": "claude.exe", - "checksum": "a708ba811c4cc46907df358e22f2aa6da3dbc28192747e4d3c4a0869752fe722", - "size": 280233632 + "checksum": "879f0d7e7eee606095051c0c00772fc1de41778f34835a9de43ea8e1caad9afb", + "size": 284981920 }, "win32-arm64": { "binary": "claude.exe", - "checksum": "8efb44f04fda50fac3c7602276903e44ff82d48f1a29a41f1a5d98891a01864b", - "size": 274906784 + "checksum": "105b33963dfdcd58c52e90562fb03face32b7b7e0d9caba74bc06b9d7b45c102", + "size": 279654560 } }, "sdkCompat": { "testedWrapperVersions": [ - "0.3.182", "0.3.183", "0.3.185", "0.3.186", @@ -75,7 +74,8 @@ "0.3.217", "0.3.218", "0.3.220", - "0.3.221" + "0.3.221", + "0.3.222" ], "harnessSchema": 1 } diff --git a/pkgs/by-name/cl/clboss/package.nix b/pkgs/by-name/cl/clboss/package.nix index b2890eab4109..7f381634d56e 100644 --- a/pkgs/by-name/cl/clboss/package.nix +++ b/pkgs/by-name/cl/clboss/package.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "clboss"; - version = "0.16.0"; + version = "0.16.1"; # The release tarball includes the pre-generated file `commit_hash.h` that is required for building src = fetchzip { url = "https://github.com/ZmnSCPxj/clboss/releases/download/v${finalAttrs.version}/clboss-v${finalAttrs.version}.tar.gz"; - hash = "sha256-hPrg3GlxURH208XB81UtHBb7jZtWF5Nc4Be7XZp57Dc="; + hash = "sha256-32v57d0ntNkPH6vMPd+mcY/z7gQi0shqXD3Fw10dHb4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/codipack/package.nix b/pkgs/by-name/co/codipack/package.nix index f195639e9e88..e19c9a78bc94 100644 --- a/pkgs/by-name/co/codipack/package.nix +++ b/pkgs/by-name/co/codipack/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "codipack"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "SciCompKL"; repo = "CoDiPack"; tag = "v${finalAttrs.version}"; - hash = "sha256-Xg87vpLiRuFqpKKKxmbf3TWjQRTbWWqYlH/Fku82Pak="; + hash = "sha256-Kkr+bCusS3zfcFspWByjg1fgyHNQlDJZw4+8yDs1tXk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/di/diskwatch/package.nix b/pkgs/by-name/di/diskwatch/package.nix index 0e43e9aca270..7dc74441391c 100644 --- a/pkgs/by-name/di/diskwatch/package.nix +++ b/pkgs/by-name/di/diskwatch/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "diskwatch"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "matthart1983"; repo = "diskwatch"; tag = "v${finalAttrs.version}"; - hash = "sha256-5EGNfMn//b38mhTK8rJfPJdk1rIPeijreDBkgoDmjBs="; + hash = "sha256-Ugqda8QWiHlNcMFIrenoHVD2WCK9JgcfoCNNOwBuQMY="; }; __structuredAttrs = true; - cargoHash = "sha256-QCO29y4R4IRW24qJrG0vHPxHHvKHopJlMen2tBD/F5s="; + cargoHash = "sha256-MjRU/NDZIbxIXFiU6sdfPfvcszkmbVeDAC0rb+Sz/6s="; nativeCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/dn/dnsproxy/package.nix b/pkgs/by-name/dn/dnsproxy/package.nix index 8eeab5a5c8d6..0d2d430b0109 100644 --- a/pkgs/by-name/dn/dnsproxy/package.nix +++ b/pkgs/by-name/dn/dnsproxy/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "dnsproxy"; - version = "0.83.1"; + version = "0.83.2"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = "dnsproxy"; tag = "v${finalAttrs.version}"; - hash = "sha256-tx0mge1AVGbtG04oJXiBr1ok7mvlcVCD6nUtzH9g+EA="; + hash = "sha256-/vGr4G8JZp+2iiF1DI1nmALgO0cJ5jZUJEjBpLA0aZg="; }; vendorHash = "sha256-E2tEOnGDMWXK3BFCMpkiISnW9evU6SRCN9z9vtMR+z0="; diff --git a/pkgs/by-name/ev/everforest-gtk-theme/fix-install-script.patch b/pkgs/by-name/ev/everforest-gtk-theme/fix-install-script.patch new file mode 100644 index 000000000000..75634c5eb77a --- /dev/null +++ b/pkgs/by-name/ev/everforest-gtk-theme/fix-install-script.patch @@ -0,0 +1,34 @@ +From f9be45b024e29efa6082cdfe6f47ca6b1110f20a Mon Sep 17 00:00:00 2001 +From: poz +Date: Fri, 9 Jan 2026 03:25:01 +0100 +Subject: [PATCH] fix install script + +--- + themes/install.sh | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/themes/install.sh b/themes/install.sh +index 1dc573f1..b1657b62 100755 +--- a/themes/install.sh ++++ b/themes/install.sh +@@ -130,6 +130,7 @@ install() { + ln -s assets/no-events.svg no-events.svg + ln -s assets/process-working.svg process-working.svg + ln -s assets/no-notifications.svg no-notifications.svg ++ cd - > /dev/null + + # GTK2 Themes + mkdir -p "${THEME_DIR}/gtk-2.0" +@@ -166,7 +167,11 @@ install() { + cp -r "${SRC_DIR}/main/metacity-1/metacity-theme-3${window}${color}.xml" "${THEME_DIR}/metacity-1/metacity-theme-3.xml" + cp -r "${SRC_DIR}/assets/metacity-1/assets${window}" "${THEME_DIR}/metacity-1/assets" + cp -r "${SRC_DIR}/assets/metacity-1/thumbnail${ELSE_DARK:-}.png" "${THEME_DIR}/metacity-1/thumbnail.png" +- cd "${THEME_DIR}/metacity-1" && ln -s metacity-theme-3.xml metacity-theme-1.xml && ln -s metacity-theme-3.xml metacity-theme-2.xml ++ ++ cd "${THEME_DIR}/metacity-1" ++ ln -s metacity-theme-3.xml metacity-theme-1.xml ++ ln -s metacity-theme-3.xml metacity-theme-2.xml ++ cd - > /dev/null + + # XFWM4 Themes + mkdir -p "${THEME_DIR}/xfwm4" diff --git a/pkgs/by-name/ev/everforest-gtk-theme/gtk3-remove-border-spacing.patch b/pkgs/by-name/ev/everforest-gtk-theme/gtk3-remove-border-spacing.patch new file mode 100644 index 000000000000..9efb115de101 --- /dev/null +++ b/pkgs/by-name/ev/everforest-gtk-theme/gtk3-remove-border-spacing.patch @@ -0,0 +1,12 @@ +diff --git a/themes/src/sass/gtk/_common-3.0.scss b/themes/src/sass/gtk/_common-3.0.scss +index 4148a1b4..735905e9 100644 +--- a/themes/src/sass/gtk/_common-3.0.scss ++++ b/themes/src/sass/gtk/_common-3.0.scss +@@ -1119,7 +1119,6 @@ dropdown { + + > button > box { + border-radius: 0 $modal-radius $modal-radius 0; +- border-spacing: $space-size; + + > stack > row.activatable { + &:hover, diff --git a/pkgs/by-name/ev/everforest-gtk-theme/package.nix b/pkgs/by-name/ev/everforest-gtk-theme/package.nix new file mode 100644 index 000000000000..6873efcb1b45 --- /dev/null +++ b/pkgs/by-name/ev/everforest-gtk-theme/package.nix @@ -0,0 +1,72 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + gnome-themes-extra, + gtk3, + sassc, +}: + +stdenvNoCC.mkDerivation { + pname = "everforest-gtk-theme"; + version = "0-unstable-2025-10-23"; + + src = fetchFromGitHub { + owner = "Fausto-Korpsvart"; + repo = "Everforest-GTK-Theme"; + rev = "9b8be4d6648ae9eaae3dd550105081f8c9054825"; + hash = "sha256-XHO6NoXJwwZ8gBzZV/hJnVq5BvkEKYWvqLBQT00dGdE="; + }; + + patches = [ + # remove when merged + # https://github.com/Fausto-Korpsvart/Everforest-GTK-Theme/pull/34 + ./fix-install-script.patch + # remove when merged + # https://github.com/Fausto-Korpsvart/Everforest-GTK-Theme/pull/35 + ./gtk3-remove-border-spacing.patch + ]; + + buildInputs = [ + gnome-themes-extra + ]; + + nativeBuildInputs = [ + gtk3 + sassc + ]; + + dontBuild = true; + dontFixup = true; + dontDropIconThemeCache = true; + + postPatch = '' + patchShebangs themes/install.sh + ''; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/share/"{themes,icons} + + cp -a icons/* "$out/share/icons/" + + for theme in "$out/share/icons/"*; do + gtk-update-icon-cache "$theme" + done + + cd themes + ./install.sh --name Everforest --theme all --dest "$out/share/themes" + cd .. + + runHook postInstall + ''; + + meta = { + description = "Everforest colour palette for GTK"; + homepage = "https://github.com/Fausto-Korpsvart/Everforest-GTK-Theme"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ poz ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/fa/fastnetmon-advanced/package.nix b/pkgs/by-name/fa/fastnetmon-advanced/package.nix index e19e5820bc3b..720ff4c03852 100644 --- a/pkgs/by-name/fa/fastnetmon-advanced/package.nix +++ b/pkgs/by-name/fa/fastnetmon-advanced/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "fastnetmon-advanced"; - version = "2.0.380"; + version = "2.0.383"; src = fetchurl { - url = "https://repo.fastnetmon.com/fastnetmon_ubuntu_noble/pool/fastnetmon/f/fastnetmon/fastnetmon_${version}_amd64.deb"; - hash = "sha256-4hCrDaFat0kEbyzKg6nHdV+LlqCBYYJEojyvXyPYKD0="; + url = "https://noble.ubuntu.repo.fastnetmon.com/pool/stable/f/fa/fastnetmon_${version}_amd64.deb"; + hash = "sha256-n43LDnkk5cMvnfbHc8MtR+zmQok7DEbUwR0ZeHOq2UY="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { tar xf data.tar.xz # unused libraries, which have additional dependencies - rm opt/fastnetmon/libraries/gcc1210/lib/libgccjit.so* + rm opt/fastnetmon/libraries/gcc1610/lib/libgccjit.so* ''; installPhase = '' @@ -62,7 +62,10 @@ stdenv.mkDerivation rec { homepage = "https://fastnetmon.com"; changelog = "https://github.com/FastNetMon/fastnetmon-advanced-releases/releases/tag/v${version}"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ yureka-wdz ]; + maintainers = with lib.maintainers; [ + yureka-wdz + netali + ]; license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/by-name/fc/fcitx5-lotus/package.nix b/pkgs/by-name/fc/fcitx5-lotus/package.nix index 64c578ad4f57..029b67e3d645 100644 --- a/pkgs/by-name/fc/fcitx5-lotus/package.nix +++ b/pkgs/by-name/fc/fcitx5-lotus/package.nix @@ -30,13 +30,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fcitx5-lotus"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "LotusInputMethod"; repo = "fcitx5-lotus"; rev = "v${finalAttrs.version}"; - hash = "sha256-MN83U0/o+vDGCxpYgFxfXAf+Iw59OaXyB7770ppLmEQ="; + hash = "sha256-8JL/DblBSwlnc9iXVbmqtTGRYy+8ioimWZeyZRWN0qo="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/fe/feather/package.nix b/pkgs/by-name/fe/feather/package.nix index b26212554a7f..6af4f3ef3c02 100644 --- a/pkgs/by-name/fe/feather/package.nix +++ b/pkgs/by-name/fe/feather/package.nix @@ -3,6 +3,7 @@ boost186, cmake, fetchFromGitHub, + fetchpatch2, hidapi, lib, libsodium, @@ -33,6 +34,14 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + patches = [ + (fetchpatch2 { + name = "0001-zxing-3-compat.patch"; + url = "https://github.com/feather-wallet/feather/commit/9b17ffd1f783689c835da3ce22996a25d8221806.patch?full_index=1"; + hash = "sha256-o4Tq6Dg5xrkF1eoGw0uuN9GiW4+FCnswx6//PYYA34w="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/fe/fetchtastic/package.nix b/pkgs/by-name/fe/fetchtastic/package.nix index 8c77c4b2f4df..6ff2309051f0 100644 --- a/pkgs/by-name/fe/fetchtastic/package.nix +++ b/pkgs/by-name/fe/fetchtastic/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "fetchtastic"; - version = "0.11.1"; + version = "0.11.2"; pyproject = true; src = fetchFromGitHub { owner = "jeremiah-k"; repo = "fetchtastic"; tag = finalAttrs.version; - hash = "sha256-DoscB4oHAn/xCTifJ7Ltign/3vcgqPQP+aYjTvRE3SQ="; + hash = "sha256-gEgqmJx1hKBmGFrv/9EsD+Li/zuuo+y49U1Dzt8nA0U="; }; pythonRelaxDeps = [ "platformdirs" ]; diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix index ec8aa287ffbb..fa64eff5a96c 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.75"; + version = "0.4.79"; src = fetchFromGitHub { owner = "superfly"; @@ -22,11 +22,11 @@ buildGoModule rec { cd "$out" git rev-parse HEAD > COMMIT ''; - hash = "sha256-2fXjRmWQdgoh9RctWyIp5sZ5Vh4otO5+qMqJ3hUwDZY="; + hash = "sha256-XRJeHGaN06QeJKLh5KMRIXMPO4tndIKEiwkux8eLAdg="; }; proxyVendor = true; - vendorHash = "sha256-jIgd4MwTiFrJMurUf8/rV7rx2GIh5fPdsssYWi7OM7U="; + vendorHash = "sha256-pzuVGCiKBlORfFWbWhTqSXPUwwz6VrO+Ztr6Zqf1p3M="; subPackages = [ "." ]; diff --git a/pkgs/by-name/fr/freetype-demos/package.nix b/pkgs/by-name/fr/freetype-demos/package.nix new file mode 100644 index 000000000000..b0c08260c94a --- /dev/null +++ b/pkgs/by-name/fr/freetype-demos/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + fetchurl, + meson, + ninja, + pkg-config, + freetype, + zlib, + bzip2, + brotli, + libpng, + librsvg, + libx11, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "freetype-demos"; + # must match freetype.version: the demos build against the FreeType + # source tree of the same release + version = "2.14.3"; + + src = fetchurl { + url = "mirror://savannah/freetype/ft2demos-${finalAttrs.version}.tar.xz"; + hash = "sha256-GslqBmw5EI8rDMiqgFEG7Sw4FGyJE9wjltwkLpHjVoY="; + }; + + # Some demos (e.g. ttdebug) need FreeType internal headers, so + # upstream builds FreeType as a static meson subproject whose wrap + # file fetches git HEAD. Provide the matching release tarball + # instead — the wrap download is unavailable in the sandbox. + postPatch = '' + mkdir -p subprojects/freetype2 + tar -xf ${freetype.src} -C subprojects/freetype2 --strip-components=1 + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + zlib + bzip2 + brotli + libpng + librsvg + libx11 + ]; + + __structuredAttrs = true; + strictDeps = true; + + meta = { + description = "Demo and diagnostic programs for FreeType (ftview, ftgrid, ftdump, ...)"; + homepage = "https://www.freetype.org/"; + changelog = "https://gitlab.freedesktop.org/freetype/freetype-demos/-/raw/VER-${ + builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version + }/ChangeLog"; + license = lib.licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause) + platforms = lib.platforms.unix; + mainProgram = "ftview"; + maintainers = with lib.maintainers; [ fraggerfox ]; + }; +}) diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix index 27fc79a78ad7..f5f855dcf55b 100644 --- a/pkgs/by-name/gh/ghostfolio/package.nix +++ b/pkgs/by-name/gh/ghostfolio/package.nix @@ -12,13 +12,13 @@ buildNpmPackage (finalAttrs: { pname = "ghostfolio"; - version = "3.35.0"; + version = "3.43.0"; src = fetchFromGitHub { owner = "ghostfolio"; repo = "ghostfolio"; tag = finalAttrs.version; - hash = "sha256-2HaEee3NZ24ZR+NGodlMgMspC5lhZLXY6jfwiGgJG3A="; + hash = "sha256-SFu/oBrl1PZomquPjetYHnkdzFoxlhcxWe/eIqc5Q04="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -28,7 +28,7 @@ buildNpmPackage (finalAttrs: { ''; }; - npmDepsHash = "sha256-5afjokIgi7ofNRG013irUtpmcUcScFUI+Uy0igjpCmw="; + npmDepsHash = "sha256-kS/KXjMqmuF5cQgFk2pmqzsb4T8QCqK64Y/xPGqDSqQ="; postPatch = '' substituteInPlace replace.build.mjs \ diff --git a/pkgs/by-name/gi/git-graph/package.nix b/pkgs/by-name/gi/git-graph/package.nix index 48a9acc8f009..68a6020b7537 100644 --- a/pkgs/by-name/gi/git-graph/package.nix +++ b/pkgs/by-name/gi/git-graph/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "git-graph"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "git-bahn"; repo = "git-graph"; tag = "v${finalAttrs.version}"; - hash = "sha256-9GFwxWYDnH3kKDWpxgh7ciSLB1Zr2zExxIrIrhycmZY="; + hash = "sha256-5h1PSVGLxWVktRNPbVbx/Rk3/URcIMJvDCbG0PTtBk0="; }; - cargoHash = "sha256-hKCEAXZj2ExSamvtl10RnAiuV9w6yOYdnsXm0gplFSU="; + cargoHash = "sha256-MGa9QKCEu7t3y7AKAm++/8+C+PjAY1dFAFIxpr4c9ks="; meta = { description = "Command line tool to show clear git graphs arranged for your branching model"; diff --git a/pkgs/by-name/ip/iptvnator/package.nix b/pkgs/by-name/ip/iptvnator/package.nix new file mode 100644 index 000000000000..03cb3673acca --- /dev/null +++ b/pkgs/by-name/ip/iptvnator/package.nix @@ -0,0 +1,166 @@ +{ + lib, + stdenv, + nodejs, + fetchFromGitHub, + fetchPnpmDeps, + electron_41, + pnpmConfigHook, + pnpm_10, + copyDesktopItems, + makeDesktopItem, + nix-update-script, + faketty, + makeWrapper, + jq, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "iptvnator"; + version = "0.22.0"; + + src = fetchFromGitHub { + owner = "4gray"; + repo = "iptvnator"; + rev = "v${finalAttrs.version}"; + hash = "sha256-LKLM9SQ7TJCmsH2cDN4GAkTbvMtEfsDA3y40i4dGqJs="; + }; + + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname version src; + pnpm = pnpm_10; + fetcherVersion = 3; + hash = "sha256-gPeQ+LYsEmZa38/C7q6DqRijMUc7FZAwO5Sn2NRv5kc="; + }; + + __structuredAttrs = true; + strictDeps = true; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + nativeBuildInputs = [ + nodejs + nodejs.python + pnpmConfigHook + pnpm_10 + faketty + makeWrapper + jq + copyDesktopItems + ]; + + dontStrip = true; + + postPatch = '' + # embedded MPV requires vendored binaries; skip and use system mpv instead + cat > apps/electron-backend/build-embedded-mpv.js << 'EOF' + #!/usr/bin/env node + console.log("[embedded-mpv] Skipping embedded MPV build; using system mpv instead."); + EOF + + # webpack references native/build/Release in its assets config; create it + mkdir -p apps/electron-backend/native/build/Release + touch apps/electron-backend/native/build/Release/.empty + + rm -f apps/electron-backend/src/app/options/electron-builder.metadata.generated.json + ''; + + preConfigure = '' + export HOME="$NIX_BUILD_TOP/home" + mkdir -p "$HOME" + + cp -rL "${electron_41.dist}" "$HOME/.electron-dist" + chmod -R u+w "$HOME/.electron-dist" + ''; + + preBuild = '' + export npm_config_nodedir=${electron_41.headers} + export npm_config_build_from_source=true + ''; + + # faketty is required to work around a bug in nx. + # See: https://github.com/nrwl/nx/issues/22445 + buildPhase = '' + runHook preBuild + + faketty pnpm run build:backend + + runHook postBuild + ''; + + postBuild = '' + # Override electron-builder config: use local electron dist, pin version, dir-only for linux + jq --arg dist "$HOME/.electron-dist" \ + --arg ver "${electron_41.version}" \ + '. + {electronDist: $dist, electronVersion: $ver} + | .linux.target = [{"target": "dir", "arch": ["x64"]}] + | .files = [ + {"from": "dist/apps/remote-control-web", "to": "remote-control-web", "filter": ["**/*"]}, + {"from": "dist/apps/electron-backend", "to": "electron-backend", "filter": ["**/*"]}, + {"from": "dist/apps/web", "to": "web", "filter": ["**/*"]}, + "!**/*.map" + ]' \ + electron-builder.json > dist/electron-builder.nix.json + + npm exec electron-builder -- \ + --dir \ + --config dist/electron-builder.nix.json \ + -c.linux.executableName=iptvnator + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/iptvnator $out/bin + + linuxDir=$(echo dist/executables/linux*-unpacked) + if [ ! -d "$linuxDir" ]; then + echo "ERROR: electron-builder output directory not found: $linuxDir" >&2 + exit 1 + fi + cp -r "$linuxDir"/{locales,resources{,.pak}} $out/share/iptvnator/ + + makeWrapper ${lib.getExe electron_41} $out/bin/iptvnator \ + --add-flags $out/share/iptvnator/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + --set ELECTRON_FORCE_IS_PACKAGED 1 \ + --set ELECTRON_IS_DEV 0 \ + --inherit-argv0 + + for s in 16 32 48 64 128 1024; do + icon_path="apps/web/src/assets/icons/icon-$s.png" + if [ -f "$icon_path" ]; then + install -Dm644 "$icon_path" "$out/share/icons/hicolor/''${s}x$s/apps/iptvnator.png" + fi + done + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "iptvnator"; + desktopName = "IPTVnator"; + exec = "iptvnator %U"; + icon = "iptvnator"; + comment = "Cross-platform IPTV player application"; + categories = [ + "AudioVideo" + "Video" + ]; + startupWMClass = "iptvnator"; + }) + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Cross-platform IPTV player application with support for m3u/m3u8 playlists, favorites, TV guide, and TV archive/catchup"; + homepage = "https://github.com/4gray/iptvnator"; + maintainers = with lib.maintainers; [ subham-roy ]; + changelog = "https://github.com/4gray/iptvnator/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + mainProgram = "iptvnator"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/it/itgmania/themes/digital-dance.nix b/pkgs/by-name/it/itgmania/themes/digital-dance.nix index 507964063156..77a9c73c7b62 100644 --- a/pkgs/by-name/it/itgmania/themes/digital-dance.nix +++ b/pkgs/by-name/it/itgmania/themes/digital-dance.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "digital-dance"; - version = "1.1.5-unstable-2026-07-28"; + version = "1.1.5-unstable-2026-08-05"; src = fetchFromCodeberg { owner = "JNero"; repo = "Digital-Dance-ITGMania"; - rev = "2f3f1bd5b5e7e699bc842836634b50d424e6f778"; - hash = "sha256-jNxN6/7KDPMlDMnQpj3MIk8Kt2rllT/f0fvmeMB5z1c="; + rev = "dbcf7b36fa4d3915ac0de73074dbdea263dcd3dc"; + hash = "sha256-JFfOdQhih9aq9oB8cPMTCB0pi56g9OZESMK/Kgk5H24="; }; postInstall = '' diff --git a/pkgs/by-name/jj/jj-vine/package.nix b/pkgs/by-name/jj/jj-vine/package.nix index 17ef577e9285..d998475024b8 100644 --- a/pkgs/by-name/jj/jj-vine/package.nix +++ b/pkgs/by-name/jj/jj-vine/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "jj-vine"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromCodeberg { owner = "abrenneke"; repo = "jj-vine"; tag = "v${finalAttrs.version}"; - hash = "sha256-dUamfoMtdDNz9xmXeg1O1j5UHW6uF/1WznHSsG+eVjs="; + hash = "sha256-rgTFo4mrGlIe7lfwpT0P7r5RBjD/XaX2S4AOp+oUaqY="; }; - cargoHash = "sha256-nuj0cugeK5oc+sZmm1f5dvGEjML0qkle5uO66e54VIY="; + cargoHash = "sha256-7j/eWCc5PvllLYSyC2CcL+R5xxDqqfjdhQ/xtb2b3rE="; nativeCheckInputs = [ jujutsu diff --git a/pkgs/by-name/me/meters-lv2/package.nix b/pkgs/by-name/me/meters-lv2/package.nix index 605d9912349c..0fe725efe3d2 100644 --- a/pkgs/by-name/me/meters-lv2/package.nix +++ b/pkgs/by-name/me/meters-lv2/package.nix @@ -13,17 +13,16 @@ libjack2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "meters-lv2"; - version = "0.9.20"; - robtkVersion = "0.7.5"; + version = "0.9.28"; + robtkVersion = "0.8.6"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ lv2 libGLU libGL - gtk2 cairo pango fftwFloat @@ -33,27 +32,27 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "x42"; repo = "meters.lv2"; - rev = "v${version}"; - sha256 = "sha256-eGXTbE83bJEDqTBltL6ZX9qa/OotCFmUxpE/aLqGELU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-vNLo16ZFBrbV5AYDGu9CIb+pXW7fAzc8IDDryuAeeLM="; }; robtkSrc = fetchFromGitHub { owner = "x42"; repo = "robtk"; - rev = "v${robtkVersion}"; - sha256 = "sha256-L1meipOco8esZl+Pgqgi/oYVbhimgh9n8p9Iqj3dZr0="; + tag = "v${finalAttrs.robtkVersion}"; + hash = "sha256-/X7+oZh25IIbji6THwDGcP+SlGIPi/T4HnFtVx/PcZ0="; }; postUnpack = '' rm -rf $sourceRoot/robtk/ - ln -s ${robtkSrc} $sourceRoot/robtk + ln -s ${finalAttrs.robtkSrc} $sourceRoot/robtk ''; postPatch = '' substituteInPlace Makefile --replace "-msse -msse2 -mfpmath=sse" "" ''; # remove x86-specific flags - meter_VERSION = version; + meter_VERSION = finalAttrs.version; enableParallelBuilding = true; makeFlags = [ "PREFIX=${placeholder "out"}" ]; @@ -64,4 +63,4 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/mu/multica-cli/package.nix b/pkgs/by-name/mu/multica-cli/package.nix index 33ce9effdbec..6786ab4dd07a 100644 --- a/pkgs/by-name/mu/multica-cli/package.nix +++ b/pkgs/by-name/mu/multica-cli/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { __structuredAttrs = true; pname = "multica-cli"; - version = "0.4.13"; + version = "0.4.20"; src = fetchFromGitHub { owner = "multica-ai"; repo = "multica"; rev = "v${version}"; - hash = "sha256-ZkZl+AXXWccPZQ+Imq8CTbF5E7WDLgS26ZmKJgyHw+8="; + hash = "sha256-qIiN+fKzCwJOTpWVysUJGYYK623TjQ2hlkegFEZ0zVQ="; }; sourceRoot = "${src.name}/server"; diff --git a/pkgs/by-name/ni/nightlight/package.nix b/pkgs/by-name/ni/nightlight/package.nix index 0cbb748a9d9e..372f5ae6117a 100644 --- a/pkgs/by-name/ni/nightlight/package.nix +++ b/pkgs/by-name/ni/nightlight/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "nightlight"; - version = "0.3.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "smudge"; repo = "nightlight"; tag = "v${version}"; - hash = "sha256-NOphjrqsnO5693Zw3NkX3c74I3PdJ8W6sxYwOEJ1yCU="; + hash = "sha256-xoYqC48WFeulr1m3EiLouVH007PD9bdE7ERZzbjxdvk="; }; - cargoHash = "sha256-v5Oo1AxwvJs66l9CtVjO+WfwgsM16zSLT1SSnDi1kSo="; + cargoHash = "sha256-WtzCk2kBO2cWUfNN+xZ84Go4m5/a3BmBayOzy3uU5Wk="; checkFlags = [ "--skip=repl" diff --git a/pkgs/by-name/nt/ntfy-sh/package.nix b/pkgs/by-name/nt/ntfy-sh/package.nix index 2dfb0e7beb86..311877bc9ca8 100644 --- a/pkgs/by-name/nt/ntfy-sh/package.nix +++ b/pkgs/by-name/nt/ntfy-sh/package.nix @@ -18,7 +18,7 @@ buildGoModule ( ui = buildNpmPackage { inherit (finalAttrs) src version; pname = "ntfy-sh-ui"; - npmDepsHash = "sha256-ENwqAS3HDzezlwiNG7e0dCN16c6RreBirua+Yv6GTS4="; + npmDepsHash = "sha256-zxI7ATaO8e7/eqoKpYXY2bCLG/gn5b7Md7m7d39zAvk="; prePatch = '' cd web/ @@ -38,16 +38,16 @@ buildGoModule ( in { pname = "ntfy-sh"; - version = "2.26.3"; + version = "2.27.0"; src = fetchFromGitHub { owner = "binwiederhier"; repo = "ntfy"; tag = "v${finalAttrs.version}"; - hash = "sha256-J76og4Iosaf22hlx5CJRwReXhAELsaY+PCGtxhcP1Ug="; + hash = "sha256-kopG3lPhu1j5AGyNp35iKBZkNlDCTyNP+8XeRmbor/k="; }; - vendorHash = "sha256-t/NTLIL+eVFBFuTy6T1st8cdRliJZCYHojyDx76IW7o="; + vendorHash = "sha256-0kHWTvj+B4ZQuwayNG7Yw4HAS19RPgeo2vUPi2kzkRo="; doCheck = false; diff --git a/pkgs/by-name/op/openvaf/package.nix b/pkgs/by-name/op/openvaf/package.nix new file mode 100644 index 000000000000..6f447112b706 --- /dev/null +++ b/pkgs/by-name/op/openvaf/package.nix @@ -0,0 +1,59 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, + llvmPackages, +}: + +rustPlatform.buildRustPackage.override { inherit (llvmPackages) stdenv; } (finalAttrs: { + pname = "openvaf"; + version = "24.0.1"; + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "OpenVAF"; + repo = "OpenVAF-Reloaded"; + rev = "v${finalAttrs.version}mob"; + hash = "sha256-wZMZpg4X7yRVssGv8U6dupawTtzs7CLbYhaMBlxxBKo="; + }; + + cargoHash = "sha256-+jvaiBCmjd3RrlES+Sc1SskEMOtO1ykOdInMTH/Gazo="; + + nativeBuildInputs = [ + llvmPackages.llvm + ]; + + buildFeatures = [ + "llvm${lib.versions.major llvmPackages.llvm.version}" + ]; + + cargoBuildFlags = [ + "--package" + "openvaf-driver" + ]; + + cargoTestFlags = [ + "--package" + "openvaf-driver" + ]; + + # This is required or else nothing will build + hardeningDisable = [ + "pic" + "zerocallusedregs" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Verilog-A compiler"; + homepage = "https://github.com/OpenVAF/OpenVAF-Reloaded"; + changelog = "https://github.com/OpenVAF/OpenVAF-Reloaded/releases/tag/v${finalAttrs.version}mob"; + mainProgram = "openvaf-r"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ eljamm ]; + teams = with lib.teams; [ ngi ]; + }; +}) diff --git a/pkgs/by-name/pi/pi-coding-agent/package.nix b/pkgs/by-name/pi/pi-coding-agent/package.nix index a8cc2b9150fb..579d5bc11dab 100644 --- a/pkgs/by-name/pi/pi-coding-agent/package.nix +++ b/pkgs/by-name/pi/pi-coding-agent/package.nix @@ -13,16 +13,16 @@ }: buildNpmPackage (finalAttrs: { pname = "pi-coding-agent"; - version = "0.83.0"; + version = "0.84.0"; src = fetchFromGitHub { owner = "earendil-works"; repo = "pi"; tag = "v${finalAttrs.version}"; - hash = "sha256-+XRJua2TSXkZMnWtxtLMskSzEHrGEFFyvYcPATi7An4="; + hash = "sha256-qySIyclHsWUo/Uap9rCl97amvKBbHfRXlOB16t8t3Ns="; }; - npmDepsHash = "sha256-AbSfP1Ion8bN309NUBQb1QSn2cIIUjNONmZgls9vnYE="; + npmDepsHash = "sha256-pIpwMAmSWjJKM5P+jltU/L/vS+d5JWNJYiIChfSZGOE="; # The provider model catalog (packages/ai/src/providers/data/) is generated by # a network fetch (models.dev plus provider APIs) and is gitignored upstream, @@ -31,7 +31,7 @@ buildNpmPackage (finalAttrs: { # under dist/providers/data/. Bump this hash alongside version. modelData = fetchurl { url = "https://registry.npmjs.org/@earendil-works/pi-ai/-/pi-ai-${finalAttrs.version}.tgz"; - hash = "sha256-+YPCiiEgkwXtnCdJd+KRMPpNiEjfbN836QlNlcx7xtQ="; + hash = "sha256-WWDOeXctyqZZmC8LENp3qeMvapehFSu7LMfsZh/LzOo="; }; preConfigure = '' @@ -58,9 +58,12 @@ buildNpmPackage (finalAttrs: { buildPhase = '' runHook preBuild - npx tsgo -p packages/ai/tsconfig.build.json npx tsgo -p packages/tui/tsconfig.build.json + npx tsgo -p packages/telemetry/tsconfig.build.json + npx tsgo -p packages/ai/tsconfig.build.json npx tsgo -p packages/agent/tsconfig.build.json + npx tsgo -p packages/protocol/tsconfig.build.json + npx tsgo -p packages/client/tsconfig.build.json npm run build --workspace=packages/coding-agent runHook postBuild @@ -75,6 +78,9 @@ buildNpmPackage (finalAttrs: { # Replace workspace deps needed at runtime with real copies for ws in @earendil-works/pi-ai:packages/ai \ @earendil-works/pi-agent-core:packages/agent \ + @earendil-works/pi-client:packages/client \ + @earendil-works/pi-protocol:packages/protocol \ + @earendil-works/pi-telemetry:packages/telemetry \ @earendil-works/pi-tui:packages/tui; do IFS=: read -r pkg src <<< "$ws" rm "$nm/$pkg" diff --git a/pkgs/by-name/pi/pijul/package.nix b/pkgs/by-name/pi/pijul/package.nix index cf1cf740d9d0..b622e946764b 100644 --- a/pkgs/by-name/pi/pijul/package.nix +++ b/pkgs/by-name/pi/pijul/package.nix @@ -17,14 +17,14 @@ rustPlatform.buildRustPackage (finalAttrs: { __structuredAttrs = true; pname = "pijul"; - version = "1.0.0-beta.18"; + version = "1.0.0-beta.21"; src = fetchCrate { inherit (finalAttrs) version pname; - hash = "sha256-vU41JiuxB6Bsi88st/tkt02054oN3HEN52pnLu5hMA4="; + hash = "sha256-IC47l6FzlopoiVZmKojPzIQzBS6UzdgE397no6GzrR4="; }; - cargoHash = "sha256-Ach8wLBhZ3pA5+m910Gt+oftEaO3Mu/ii+bxgnla0ak="; + cargoHash = "sha256-Ldb+CpKiVvNOeMhdD/hfQfAAMwdwUy/npY85VBPBq5k="; # Tests require a TTY, which the Nix sandbox does not provide. doCheck = false; diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix index c10b14930880..496f4c14539e 100644 --- a/pkgs/by-name/po/pocket-id/package.nix +++ b/pkgs/by-name/po/pocket-id/package.nix @@ -38,8 +38,7 @@ buildGo127Module (finalAttrs: { ''; checkFlags = [ - # requires networking - "-skip=TestOidcService_downloadAndSaveLogoFromURL" + "-tags=unit" ]; # required for TestIsURLPrivate diff --git a/pkgs/by-name/pr/prl-tools/package.nix b/pkgs/by-name/pr/prl-tools/package.nix index ef3fb2075385..9fbc38461ad2 100644 --- a/pkgs/by-name/pr/prl-tools/package.nix +++ b/pkgs/by-name/pr/prl-tools/package.nix @@ -45,13 +45,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prl-tools"; - version = "26.4.0-57513"; + version = "26.4.1-57516"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg"; - hash = "sha256-Qkul+hZh0J7g8+D+T7RLmfrtK2i90+wlsrfm5tNaYug="; + hash = "sha256-8ypP8r9dUiOSqdKMEzsMdo3Qm3V2NPM/MBx8sh0kOx8="; }; hardeningDisable = [ diff --git a/pkgs/by-name/qb/qbittorrent-enhanced/package.nix b/pkgs/by-name/qb/qbittorrent-enhanced/package.nix index dff0e8439e1b..31ee4a365f90 100644 --- a/pkgs/by-name/qb/qbittorrent-enhanced/package.nix +++ b/pkgs/by-name/qb/qbittorrent-enhanced/package.nix @@ -7,13 +7,13 @@ (qbittorrent.override { inherit guiSupport; }).overrideAttrs (old: rec { pname = "qbittorrent-enhanced" + lib.optionalString (!guiSupport) "-nox"; - version = "5.2.1.10"; + version = "5.2.3.10"; src = fetchFromGitHub { owner = "c0re100"; repo = "qBittorrent-Enhanced-Edition"; rev = "release-${version}"; - hash = "sha256-WTzNIK6/ePLHfGN8vqnhvoO4Sbq57oLB5//RPYeG5As="; + hash = "sha256-frAmiYQekEzIgWeSqHVAlTY5u6j7eH8Nx8MaqHjZU9E="; }; meta = old.meta // { diff --git a/pkgs/by-name/qu/qui/package.nix b/pkgs/by-name/qu/qui/package.nix index 4c99a0ee9f18..bb2b8a51a5b7 100644 --- a/pkgs/by-name/qu/qui/package.nix +++ b/pkgs/by-name/qu/qui/package.nix @@ -14,12 +14,12 @@ }: buildGo126Module (finalAttrs: { pname = "qui"; - version = "1.24.0"; + version = "1.25.0"; src = fetchFromGitHub { owner = "autobrr"; repo = "qui"; tag = "v${finalAttrs.version}"; - hash = "sha256-xtYHIM1xYg92EwHndpuSRSdg8aAjNc3xaBo+Uu6Zsf4="; + hash = "sha256-nTFqN3dccCP/W8GN5pW8fkyxqvftiMudALYrq/43vME="; }; qui-web = stdenvNoCC.mkDerivation (finalAttrs': { @@ -44,7 +44,7 @@ buildGo126Module (finalAttrs: { ; pnpm = pnpm_11; fetcherVersion = 4; - hash = "sha256-ajnOwiMBpNesn+4F+lNpdWO7VgK7O99xITVz4NjVWTE="; + hash = "sha256-HpH65G6tzADVLXSa/BNbJCMTEbzJTeormf+r1fsjd/g="; }; postBuild = '' @@ -56,7 +56,7 @@ buildGo126Module (finalAttrs: { ''; }); - vendorHash = "sha256-GxpYkRsPUVbVK8oKwwGM+AGNvfzT2pdUadX+pAmr7Bk="; + vendorHash = "sha256-baNthuhGi0VvNQ+sXIO/FHDX+h+Ca/96PZbX0dYwWQU="; preBuild = '' cp -r ${finalAttrs.qui-web}/* web/dist diff --git a/pkgs/by-name/si/signal-export/package.nix b/pkgs/by-name/si/signal-export/package.nix index 3059b32c0d05..7d212d3d71d9 100644 --- a/pkgs/by-name/si/signal-export/package.nix +++ b/pkgs/by-name/si/signal-export/package.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "signal-export"; - version = "3.8.3"; + version = "3.9.0"; pyproject = true; src = fetchPypi { inherit (finalAttrs) version; pname = "signal_export"; - hash = "sha256-V6yo1nimjQJgbf17A/RSe/vykfCxcFFL0xZaQY3k0Tk="; + hash = "sha256-iJfbeY1xVWsg95TpZqauTyy9uywWp6jZAdMlZaPDDmQ="; }; build-system = with python3.pkgs; [ @@ -24,6 +24,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { typer beautifulsoup4 emoji + filetype markdown pycryptodome sqlcipher3-wheels diff --git a/pkgs/by-name/su/subxt/package.nix b/pkgs/by-name/su/subxt/package.nix index f2dad1fd6e10..2c51a400ea7b 100644 --- a/pkgs/by-name/su/subxt/package.nix +++ b/pkgs/by-name/su/subxt/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "subxt"; - version = "0.50.0"; + version = "0.50.3"; src = fetchFromGitHub { owner = "paritytech"; repo = "subxt"; tag = "v${finalAttrs.version}"; - hash = "sha256-nMal78+TYZ1f9X/YZhsqOsEIrjxhi9fEcevnQW8u97o="; + hash = "sha256-ctViZ1veorf+fmalmaZkqVGJYZTGYYcPeM23UGxRNRg="; }; - cargoHash = "sha256-sqspcTwODoRzaaUSXT+2yPUTzUqcW1gNu0c1Lv9D1u0="; + cargoHash = "sha256-QM6tmLygNjrqqE5ptEjYGAEQDBs08Ix2nYrbujtPv7Q="; # Only build the command line client cargoBuildFlags = [ diff --git a/pkgs/by-name/ti/timoni/package.nix b/pkgs/by-name/ti/timoni/package.nix index e87553dbe3f6..0f83a41ed74c 100644 --- a/pkgs/by-name/ti/timoni/package.nix +++ b/pkgs/by-name/ti/timoni/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "timoni"; - version = "0.27.1"; + version = "0.29.0"; src = fetchFromGitHub { owner = "stefanprodan"; repo = "timoni"; tag = "v${finalAttrs.version}"; - hash = "sha256-C86S9+sQ93FXVTV9iiDqHrJ50xSNSQ8z9X0fjFjamho="; + hash = "sha256-Kdyw2e7WMxNzvIn59SxMpaxgi64MTVfEPbg5ZjKVg2E="; }; - vendorHash = "sha256-HsHhuGBcA49/6OETChz1ZzNT2d0TYTLdww+UoefZkds="; + vendorHash = "sha256-+ehIFQslQMCam6nJ6QQ3B/5f8hbRHRGbsxdai3vW+pw="; subPackages = [ "cmd/timoni" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ti/tinycdb/package.nix b/pkgs/by-name/ti/tinycdb/package.nix index 703fdd45597e..6684e4e24f09 100644 --- a/pkgs/by-name/ti/tinycdb/package.nix +++ b/pkgs/by-name/ti/tinycdb/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://www.corpit.ru/mjt/tinycdb.html"; - license = lib.licenses.publicDomain; + license = lib.licenses.mit; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/tr/trezor-suite/package.nix b/pkgs/by-name/tr/trezor-suite/package.nix index fa3612628dab..069a2669d09b 100644 --- a/pkgs/by-name/tr/trezor-suite/package.nix +++ b/pkgs/by-name/tr/trezor-suite/package.nix @@ -10,7 +10,7 @@ let pname = "trezor-suite"; - version = "26.7.2"; + version = "26.7.4"; suffix = { @@ -24,8 +24,8 @@ let hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-5lKIWbEm/z3B1CEN9xepqpPauhd8x1gOkKKk+/W7iyqJbn/G1iDZ+1rs2nHFPmLW5TP5xYpmN9qurxgBGqFzNA=="; - x86_64-linux = "sha512-0aBQ2K91+SH4eKVVFyGvX7g1DhRATx/KuIRxw8B0+JZR1Pj6ZzQsk/FgnVAlU7Odsyo4TbGTVdD13JETepxliQ=="; + aarch64-linux = "sha512-ESlTDvRu5blfLWbn+CDenbJsmuGUnCXeuuhswFe1rryThFz6YSOLuHaRH2H+FsPu9xtlCJ97D5LTdSI/2l8D8w=="; + x86_64-linux = "sha512-Q+3yrsM5F9fPXTPy3bDGIX8t57eLJZZOaU/iHRvOoDD1CvC2fc+Dt6BezXeZiINjYxxdb0Wt0IT1phDdpmeDxg=="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/by-name/va/vacask/package.nix b/pkgs/by-name/va/vacask/package.nix new file mode 100644 index 000000000000..df72bc92f73c --- /dev/null +++ b/pkgs/by-name/va/vacask/package.nix @@ -0,0 +1,108 @@ +{ + lib, + stdenv, + fetchFromGitea, + nix-update-script, + runCommand, + + # build-time + bison, + cmake, + flex, + openvaf, + python3, + + # run-time + boost188, + suitesparse, + tomlplusplus, +}: + +let + # VACASK includes SuiteSparse headers as , the layout used + # by SuiteSparse >= 6. However, our suitesparse is currently at 5.13.0 and + # installs headers flat into include/, so here we're fixing that. + # TODO: remove when suitesparse is updated + suitesparse-include = runCommand "suitesparse-include" { } '' + mkdir -p $out/include/suitesparse + ln -s ${suitesparse.dev}/include/*.h $out/include/suitesparse/ + ''; + + pyEnv = python3.withPackages ( + ps: with ps; [ + numpy + scipy + ] + ); +in + +stdenv.mkDerivation (finalAttrs: { + pname = "vacask"; + version = "0.3.3"; + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "arpadbuermen"; + repo = "VACASK"; + tag = "_${finalAttrs.version}"; + hash = "sha256-eU3SuJPqxqc8QO5k4Jb/9zc8V2JQ1VP1bPEoJ6KCi/c="; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail \ + "Boost_USE_STATIC_LIBS ON" \ + "Boost_USE_STATIC_LIBS OFF" \ + --replace-fail \ + 'set(PROGRAM_VERSION "unknown")' \ + 'set(PROGRAM_VERSION "${finalAttrs.version}")' + ''; + + nativeBuildInputs = [ + bison + boost188.dev + cmake + flex + openvaf + pyEnv + ]; + + buildInputs = [ + boost188 + suitesparse + tomlplusplus + ]; + + cmakeFlags = [ + (lib.cmakeFeature "FLEX_INCLUDE_DIR" "${flex}/include") + (lib.cmakeFeature "SuiteSparse_DIR" "${suitesparse-include}") + (lib.cmakeFeature "TOMLPP_DIR" "${tomlplusplus}") + ]; + + doCheck = true; + + nativeCheckInputs = [ + openvaf + pyEnv + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Analog circuit simulator"; + longDescription = '' + VACASK is a Verilog-A Circuit Analysis Kernel - an analog circuit + simulator with a device library built from Verilog-A modules. + ''; + homepage = "https://codeberg.org/arpadbuermen/VACASK"; + changelog = "https://codeberg.org/arpadbuermen/VACASK/releases/tag/${finalAttrs.src.tag}"; + mainProgram = "vacask"; + license = lib.licenses.agpl3Plus; + # TODO: add darwin support + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ eljamm ]; + teams = with lib.teams; [ ngi ]; + }; +}) diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 84b281b9a5db..e4b223c22fb0 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-wKXwL2frlyE7UVMVMzscrHfXJ6b4LIzGMTK53jAG4c4=", - "version": "0.2026.07.22.09.01.stable_01" + "hash": "sha256-jVdPiFOdU1V8KSi/GBEEhwkPpRsdCNZv2MfR6ScEvF0=", + "version": "0.2026.07.29.09.05.stable_02" }, "linux_x86_64": { - "hash": "sha256-afV/GSoaL4bdn0rdlVtdy6Z3S1EImRknNIODddYNhpg=", - "version": "0.2026.07.22.09.01.stable_01" + "hash": "sha256-yjgUjX38PeCCz7GbboUpOILu1VvOadTZPyB9UgAKuzM=", + "version": "0.2026.07.29.09.05.stable_02" }, "linux_aarch64": { - "hash": "sha256-nqRt4OLzpy9BW/3GRtOsvdSxJoZRNwso44WxVZuT6sE=", - "version": "0.2026.07.22.09.01.stable_01" + "hash": "sha256-8a13daXZHrgPCQMz0psEl7TjCYvkwBV7ri0y9FgmqzQ=", + "version": "0.2026.07.29.09.05.stable_02" } } diff --git a/pkgs/by-name/xf/xfr/package.nix b/pkgs/by-name/xf/xfr/package.nix index f4d2e6a72d53..8cfeb57c35cb 100644 --- a/pkgs/by-name/xf/xfr/package.nix +++ b/pkgs/by-name/xf/xfr/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "xfr"; - version = "0.9.22"; + version = "0.9.25"; src = fetchFromGitHub { owner = "lance0"; repo = "xfr"; tag = "v${finalAttrs.version}"; - hash = "sha256-N66/uIzOJmKJ9EE9gcFz1JTmxVPkCqGEFZo19F1LtCk="; + hash = "sha256-3yL8N3pjU6//joBs8Js/fsQtNJBkIyuBdG0GiR9F608="; }; - cargoHash = "sha256-65bscbYHB8Lkt3YEsfsDiZr68AbRNktKKS1t2DoguVM="; + cargoHash = "sha256-Za00+UJEKtpybAJoIhK1Xb6N4OQY+c7Jb/CO5SVFGW8="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/za/zashboard/package.nix b/pkgs/by-name/za/zashboard/package.nix index 3f77343cdae5..498110b15dbe 100644 --- a/pkgs/by-name/za/zashboard/package.nix +++ b/pkgs/by-name/za/zashboard/package.nix @@ -12,13 +12,13 @@ let in buildNpmPackage (finalAttrs: { pname = "zashboard"; - version = "3.16.0"; + version = "3.17.0"; src = fetchFromGitHub { owner = "Zephyruso"; repo = "zashboard"; tag = "v${finalAttrs.version}"; - hash = "sha256-DWvmv3V431DnplhprqKyLBrhN652tcgBT89ZiaEI3oo="; + hash = "sha256-5CxzST/3vb6YxzvjAJSyDORpW++R2OonTfJUp9trdBc="; }; npmDeps = null; @@ -26,7 +26,7 @@ buildNpmPackage (finalAttrs: { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 3; - hash = "sha256-8EQziLcmP+bjQez+b0QdgF43XGydYC9yh4m9lEkbhCY="; + hash = "sha256-UjoY2/cLJ0chdZ2VUq/7KoJXRhLrJAADi8jEYjHKdmw="; }; nativeBuildInputs = [ pnpm ]; diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index 416fb261fd12..137d2ba5aaf1 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -601,7 +601,7 @@ let meta = { description = "Functional collections library"; homepage = "https://gitlab.common-lisp.net/fset/fset/-/wikis/home"; - license = pkgs.lib.licenses.llgpl21; + license = with pkgs.lib.licenses; WITH lgpl21Only llgplPreamble; }; }); diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix index 1886491d8c3e..e018c74a2c7b 100644 --- a/pkgs/development/ocaml-modules/mtime/default.nix +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -8,13 +8,13 @@ topkg, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ocaml${ocaml.version}-mtime"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://erratique.ch/software/mtime/releases/mtime-${version}.tbz"; - sha256 = "sha256-CXyygC43AerZVy4bSD1aKMbi8KOUSfqvm0StiomDTYg="; + url = "https://erratique.ch/software/mtime/releases/mtime-${finalAttrs.version}.tbz"; + hash = "sha256-+SEKB8Sj6xdWpF+ooyl02bXdrTWDw0AEQv3+LJ1j1jY="; }; nativeBuildInputs = [ @@ -35,6 +35,5 @@ stdenv.mkDerivation rec { inherit (ocaml.meta) platforms; maintainers = [ lib.maintainers.vbgl ]; license = lib.licenses.bsd3; - broken = !(lib.versionAtLeast ocaml.version "4.08"); }; -} +}) diff --git a/pkgs/development/ocaml-modules/odoc/default.nix b/pkgs/development/ocaml-modules/odoc/default.nix index ab2f8557e0d6..3c5cbc624a0b 100644 --- a/pkgs/development/ocaml-modules/odoc/default.nix +++ b/pkgs/development/ocaml-modules/odoc/default.nix @@ -4,9 +4,9 @@ ocaml-crunch, astring, cmdliner, + cmdliner_1, cppo, fpath, - result, tyxml, markup, yojson, @@ -18,7 +18,7 @@ fmt, }: -buildDunePackage { +buildDunePackage (self: { pname = "odoc"; inherit (odoc-parser) version src; @@ -28,7 +28,7 @@ buildDunePackage { ]; buildInputs = [ astring - cmdliner + (if lib.versionAtLeast self.version "3.2.0" then cmdliner else cmdliner_1) fpath tyxml odoc-parser @@ -63,4 +63,4 @@ buildDunePackage { homepage = "https://github.com/ocaml/odoc"; changelog = "https://github.com/ocaml/odoc/blob/${odoc-parser.version}/CHANGES.md"; }; -} +}) diff --git a/pkgs/development/python-modules/alibabacloud-credentials/default.nix b/pkgs/development/python-modules/alibabacloud-credentials/default.nix index e7dba9f6cdd1..017f73f44c86 100644 --- a/pkgs/development/python-modules/alibabacloud-credentials/default.nix +++ b/pkgs/development/python-modules/alibabacloud-credentials/default.nix @@ -11,13 +11,13 @@ buildPythonPackage (finalAttrs: { pname = "alibabacloud-credentials"; - version = "1.0.10"; + version = "1.0.11"; pyproject = true; src = fetchPypi { pname = "alibabacloud_credentials"; inherit (finalAttrs) version; - hash = "sha256-rmbEN0kUhilZy/CWg55Ayt+PRMbxjqRKWj8ecdpjxCg="; + hash = "sha256-EQUOiZbj8YIb+1KqYDL/nwGSeYp3LAe300qxmmioLMA="; }; pythonRelaxDeps = [ "aiofiles" ]; diff --git a/pkgs/development/python-modules/apify-fingerprint-datapoints/default.nix b/pkgs/development/python-modules/apify-fingerprint-datapoints/default.nix index 21531eb5d07f..ac2f42858874 100644 --- a/pkgs/development/python-modules/apify-fingerprint-datapoints/default.nix +++ b/pkgs/development/python-modules/apify-fingerprint-datapoints/default.nix @@ -7,13 +7,13 @@ buildPythonPackage (finalAttrs: { pname = "apify-fingerprint-datapoints"; - version = "0.13.0"; + version = "0.15.0"; pyproject = true; src = fetchPypi { pname = "apify_fingerprint_datapoints"; inherit (finalAttrs) version; - hash = "sha256-JjFBwZ6byQqCHmtOK4RZJfF+C4+9U6iX/HFUa9UN9/E="; + hash = "sha256-V3b+c/6qORAmXK5VWZVSsJjzpxbYhyyaDCKV/yu2gNw="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/asyncmy/default.nix b/pkgs/development/python-modules/asyncmy/default.nix index fa0716d08b78..f93749628553 100644 --- a/pkgs/development/python-modules/asyncmy/default.nix +++ b/pkgs/development/python-modules/asyncmy/default.nix @@ -7,19 +7,19 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "asyncmy"; - version = "0.2.11"; + version = "0.2.13"; pyproject = true; src = fetchFromGitHub { owner = "long2ice"; repo = "asyncmy"; - tag = "v${version}"; - hash = "sha256-+6sXXlSAZr09nPuJtZH8S2UfijFthDpRA/AdGOyIfxU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-SoRnOd+GpJF6kaixl7v6/UpPgcr62tl9MGPvwO0IQdA="; }; - nativeBuildInputs = [ + build-system = [ cython poetry-core setuptools @@ -33,7 +33,8 @@ buildPythonPackage rec { meta = { description = "Python module to interact with MySQL/mariaDB"; homepage = "https://github.com/long2ice/asyncmy"; + changelog = "https://github.com/long2ice/asyncmy/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index dae972db72cb..052554d767cb 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -11,14 +11,14 @@ buildPythonPackage (finalAttrs: { pname = "boschshcpy"; - version = "0.6.6"; + version = "0.6.8"; pyproject = true; src = fetchFromGitHub { owner = "tschamm"; repo = "boschshcpy"; tag = "v${finalAttrs.version}"; - hash = "sha256-ymuo9z1Aw/+c1L908ClLsMWRCh7sWr5e2QavUXbWseo="; + hash = "sha256-jCX0lgFgbGgKdZMrk2vqdJWSPskQEOxizJ2jzola9l4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 8df9e0f9eb37..244de27334c6 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -358,13 +358,13 @@ buildPythonPackage (finalAttrs: { pname = "boto3-stubs"; - version = "1.43.64"; + version = "1.43.66"; pyproject = true; src = fetchPypi { pname = "boto3_stubs"; inherit (finalAttrs) version; - hash = "sha256-coJym7MD6kvZ5WhSBJ8Sr1Y768p3wD/A6geIZCfMUDU="; + hash = "sha256-67iPkEb+14gxW+LXsbSfr6KIW+XPblVumivjj8qA3u4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/claude-agent-sdk/default.nix b/pkgs/development/python-modules/claude-agent-sdk/default.nix index 8bbc247598db..3d1c917e843e 100644 --- a/pkgs/development/python-modules/claude-agent-sdk/default.nix +++ b/pkgs/development/python-modules/claude-agent-sdk/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "claude-agent-sdk"; - version = "0.2.130"; + version = "0.2.132"; pyproject = true; src = fetchFromGitHub { owner = "anthropics"; repo = "claude-agent-sdk-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-7hFgXoQ1OlKMrHWc2nhfqPuj1pDRw5OfIOgeGlc4CFw="; + hash = "sha256-iXJNs5c+p2jSDsAcFvVPFucl2a7ir5K9bAZu3uF8joE="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/hier-config/default.nix b/pkgs/development/python-modules/hier-config/default.nix index ba1648988b4a..6d9a5a5f6662 100644 --- a/pkgs/development/python-modules/hier-config/default.nix +++ b/pkgs/development/python-modules/hier-config/default.nix @@ -10,14 +10,14 @@ buildPythonPackage (finalAttrs: { pname = "hier-config"; - version = "3.6.2"; + version = "4.0.0b1"; pyproject = true; src = fetchFromGitHub { owner = "netdevops"; repo = "hier_config"; tag = "v${finalAttrs.version}"; - hash = "sha256-hE9W5f+RUDBu0AaqP++QjrTJo6biKIxUMSE18C++AVI="; + hash = "sha256-EpoMBAg1gLjEMWmAgkni2cI9HPvINMQx4CjuNAIrkSA="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index a45d43089bc5..04275bc40db9 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -7,14 +7,14 @@ buildPythonPackage (finalAttrs: { pname = "hstspreload"; - version = "2026.7.1"; + version = "2026.8.1"; pyproject = true; src = fetchFromGitHub { owner = "sethmlarson"; repo = "hstspreload"; tag = finalAttrs.version; - hash = "sha256-nq9dr8Jd+OvRCXLOQbarXTnUg4QISEty7wvi/P2YUU8="; + hash = "sha256-0YcUn5ebfO+cmJSRZPtuvEM0XzKUE1+8+BrSMC3/YOc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 46bb790ca0bf..cdc912238fd7 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "iamdata"; - version = "0.1.202608061"; + version = "0.1.202608071"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-fVC5iKfCa0hPYftbS4HGZxyHtl2WiX1dC349lLdx/v8="; + hash = "sha256-wIhZFq4Il2Fwip7Autw7ahR4MG5IVByDoxswJzpZ9Pw="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/itkwasm-downsample-emscripten/default.nix b/pkgs/development/python-modules/itkwasm-downsample-emscripten/default.nix index 87fa26c38d1c..3531b3a5affb 100644 --- a/pkgs/development/python-modules/itkwasm-downsample-emscripten/default.nix +++ b/pkgs/development/python-modules/itkwasm-downsample-emscripten/default.nix @@ -10,13 +10,13 @@ buildPythonPackage (finalAttrs: { pname = "itkwasm-downsample-emscripten"; - version = "1.8.1"; + version = "2.0.0"; pyproject = true; src = fetchPypi { pname = "itkwasm_downsample_emscripten"; inherit (finalAttrs) version; - hash = "sha256-kF851K6cy1jozPxd5zE8XVnBAHMljmOqtvpmfmQDZy4="; + hash = "sha256-Gz4sO6udvY/5AZzQcB5DE6+pk2cmSMmuQor7wNj9Wv8="; }; build-system = [ diff --git a/pkgs/development/python-modules/itkwasm-downsample-wasi/default.nix b/pkgs/development/python-modules/itkwasm-downsample-wasi/default.nix index 71b72fdf8a28..7622612ffa21 100644 --- a/pkgs/development/python-modules/itkwasm-downsample-wasi/default.nix +++ b/pkgs/development/python-modules/itkwasm-downsample-wasi/default.nix @@ -11,13 +11,13 @@ buildPythonPackage (finalAttrs: { pname = "itkwasm-downsample-wasi"; - version = "1.8.1"; + version = "2.0.0"; pyproject = true; src = fetchPypi { pname = "itkwasm_downsample_wasi"; inherit (finalAttrs) version; - hash = "sha256-OykKkZRlRGDw+SsK69z6dqh6LY7eUlyHGdZwmkKsMKQ="; + hash = "sha256-5vqw+sb9Zb0npYiDtzUla3JT5zEimOD5gAnwxcYi4cM="; }; build-system = [ diff --git a/pkgs/development/python-modules/itkwasm-downsample/default.nix b/pkgs/development/python-modules/itkwasm-downsample/default.nix index 6e0176183017..2051e3cde22a 100644 --- a/pkgs/development/python-modules/itkwasm-downsample/default.nix +++ b/pkgs/development/python-modules/itkwasm-downsample/default.nix @@ -12,13 +12,13 @@ buildPythonPackage (finalAttrs: { pname = "itkwasm-downsample"; - version = "1.8.1"; + version = "2.0.0"; pyproject = true; src = fetchPypi { pname = "itkwasm_downsample"; inherit (finalAttrs) version; - hash = "sha256-tKkct5+39p5jM/vBj3RTSM1YZZoLnajh85Eon4/wavs="; + hash = "sha256-LP9sg4VFc1/niioRzAR9cbwdl6fiEkrOpGT7vjj+6LQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/itkwasm/default.nix b/pkgs/development/python-modules/itkwasm/default.nix index 663df3e947b0..0bbf4042c69b 100644 --- a/pkgs/development/python-modules/itkwasm/default.nix +++ b/pkgs/development/python-modules/itkwasm/default.nix @@ -13,12 +13,12 @@ buildPythonPackage (finalAttrs: { pname = "itkwasm"; - version = "1.0b195"; + version = "1.0b200"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-1OQ0SieMEcrWiIgWT1dQxXdk9lCbWD+1xJ0jfIr0isU="; + hash = "sha256-vhN4Nm5tuGDRYYZKFyC+mH+LxW4UXmVxZDzsQI48U4s="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/linode-api4/default.nix b/pkgs/development/python-modules/linode-api4/default.nix index dd33853fbe9d..35068a5282ce 100644 --- a/pkgs/development/python-modules/linode-api4/default.nix +++ b/pkgs/development/python-modules/linode-api4/default.nix @@ -15,7 +15,7 @@ buildPythonPackage (finalAttrs: { pname = "linode-api4"; - version = "5.46.0"; + version = "5.46.1"; pyproject = true; __structuredAttrs = true; @@ -24,7 +24,7 @@ buildPythonPackage (finalAttrs: { owner = "linode"; repo = "linode_api4-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-d9VgHHbyEcFHy3bM2KpuwUN3Su7ABYqYRWL+nOZ1Xd4="; + hash = "sha256-3nWRWufvUm3o2f1uEUh2QDIYGq4eRWZUnLzv3KF2VyM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/llama-index-workflows/default.nix b/pkgs/development/python-modules/llama-index-workflows/default.nix index 37850b703739..6c36a7b14dd5 100644 --- a/pkgs/development/python-modules/llama-index-workflows/default.nix +++ b/pkgs/development/python-modules/llama-index-workflows/default.nix @@ -10,13 +10,13 @@ buildPythonPackage (finalAttrs: { pname = "llama-index-workflows"; - version = "2.22.2"; + version = "2.23.0"; pyproject = true; src = fetchPypi { pname = "llama_index_workflows"; inherit (finalAttrs) version; - hash = "sha256-l7ZLz3LnfhoDgAaM2gnl0HdLdavbiRCWxDNobC8pnj4="; + hash = "sha256-lgVt/q1YvTPIadIZyO9WxKv5dsBCJtf28RPqONsZ5W0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index fba4be2324a8..9b51626fe7d9 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -16,14 +16,14 @@ buildPythonPackage (finalAttrs: { pname = "msgraph-sdk"; - version = "1.60.0"; + version = "1.61.0"; pyproject = true; src = fetchFromGitHub { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-7ly+NvatNYYbudErsLGNG40xUf7Xea3VgJZ8e/2Favk="; + hash = "sha256-bjXbFa76quD5J7uPRHu15juxulHUh4U/7e12yPvS5SU="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 80a80136f5d7..ff7a50c9737f 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -55,8 +55,8 @@ in "sha256-m4sUtL3riEkcXGeWgD0vAkKx78R2SYrwHycxz1Fjxw8="; mypy-boto3-acm-pca = - buildMypyBoto3Package "acm-pca" "1.43.0" - "sha256-o5hZAxSZklg7hzL7MWCBYnnYTRoBSSAKPLpub1NVO74="; + buildMypyBoto3Package "acm-pca" "1.43.65" + "sha256-M2L+W6/5g0v6RejXtkEJV/H4991u7P2gqN3ZFt4QWxU="; mypy-boto3-amp = buildMypyBoto3Package "amp" "1.43.62" @@ -147,16 +147,16 @@ in "sha256-0QMHGUpHVdAUf8hw4RtgU3wManp26riDDbx49a9929U="; mypy-boto3-autoscaling = - buildMypyBoto3Package "autoscaling" "1.43.38" - "sha256-xpwzqlkGC3ZCKuCMLZ5DvZAuPCQCRdwpccVuhsmaOWY="; + buildMypyBoto3Package "autoscaling" "1.43.66" + "sha256-nGqCwROsgVdCEJeQwhy8J+rk7tyaYMIrQSu+fFAl3EU="; mypy-boto3-autoscaling-plans = buildMypyBoto3Package "autoscaling-plans" "1.43.0" "sha256-imuX16TqfUAoPqzJTclvPMWiVnDSh6nJ8QbSksLEKps="; mypy-boto3-backup = - buildMypyBoto3Package "backup" "1.43.15" - "sha256-MyUtN6c4ABRaB7mq1LS7ndGawcUb44sPrzsdvsAQ0Oc="; + buildMypyBoto3Package "backup" "1.43.66" + "sha256-7T19wui6KEHjIDVQ9Bl2G0mfNtlHF3AS219/YDES/gM="; mypy-boto3-backup-gateway = buildMypyBoto3Package "backup-gateway" "1.43.55" @@ -391,8 +391,8 @@ in "sha256-cQqctK2DnuHUuhMb+07M60JkyuBveerK2ybTt4bM+kA="; mypy-boto3-devicefarm = - buildMypyBoto3Package "devicefarm" "1.43.0" - "sha256-vwaHsbqy5/hS/s+cNGvjldHffDpJ1Gx5nBSLKwvBU4g="; + buildMypyBoto3Package "devicefarm" "1.43.66" + "sha256-yP7EUJb22oi8m64wg1wodx2u/2VieMFMQnYc5KBsGZQ="; mypy-boto3-devops-guru = buildMypyBoto3Package "devops-guru" "1.43.0" @@ -443,8 +443,8 @@ in "sha256-dXNkOcMonYrBh4yzeubd+v3mW42s9XpmpfvgbtgoJgY="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.43.64" - "sha256-4gEYjeyfYdWjolPQvClPEZlUxIfUTZcU3nsq8kLDHOU="; + buildMypyBoto3Package "ec2" "1.43.66" + "sha256-jkMI4mJ04W7N6JT+YUyNI1WrIBvERaC9Flo7XVhPZ58="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.43.0" @@ -459,8 +459,8 @@ in "sha256-02BUkAFhr9sT8ohkJJFPYNni0O9/UI/G0GUee/Kx5Dw="; mypy-boto3-ecs = - buildMypyBoto3Package "ecs" "1.43.43" - "sha256-MYV6zPmiuWwBCv9Jncw5GS4E3+pX++KARj8L8W6yK04="; + buildMypyBoto3Package "ecs" "1.43.65" + "sha256-mCyC8VzQI4vXhyQ56UL8D4QujTyUnptrRCRoh38qVHk="; mypy-boto3-efs = buildMypyBoto3Package "efs" "1.43.23" @@ -559,8 +559,8 @@ in "sha256-4roB3AEdN4zXGceUNkrmarmTThmPbS9SltvHG6kF+84="; mypy-boto3-gamelift = - buildMypyBoto3Package "gamelift" "1.43.47" - "sha256-RG+oi43/mshz3rbssYLfx6lI7VN5E7VHMiA7vFavJP4="; + buildMypyBoto3Package "gamelift" "1.43.66" + "sha256-ApoGnTCfa7+GhGRUWWUStE5ad/gZQpCvGUd8ugcZh1g="; mypy-boto3-glacier = buildMypyBoto3Package "glacier" "1.43.0" @@ -571,8 +571,8 @@ in "sha256-vMz4YKm78XMavlPUNiSVAYmAbyUBrJhUXbFrhxIvUJA="; mypy-boto3-glue = - buildMypyBoto3Package "glue" "1.43.59" - "sha256-TdCAQMk1awgIFti1BgdHyb427zO1m/Tk8NavsBfW/mE="; + buildMypyBoto3Package "glue" "1.43.65" + "sha256-PGBd4GFY05uWSu/FPyn5yRegtj/z3Os1wRsXS817o8o="; mypy-boto3-grafana = buildMypyBoto3Package "grafana" "1.43.11" "sha256-XJOSLyL1+uEweZ9zER7IhH3DFLaLtpJKvuRIn8Ri+P4="; @@ -706,8 +706,8 @@ in "sha256-9XMdnVsYUmz8Uf9kAgVMbG960vy0TOJturoD9/ZoM98="; mypy-boto3-kafka = - buildMypyBoto3Package "kafka" "1.43.60" - "sha256-yl6FIgBJslNzGQtSXomgJEb3GCXdxYBeimlhfTssejk="; + buildMypyBoto3Package "kafka" "1.43.66" + "sha256-reGKCXTFRIebc26zStSUrcX8TxFF+3FJ+t4cSaSpnW0="; mypy-boto3-kafkaconnect = buildMypyBoto3Package "kafkaconnect" "1.43.0" @@ -806,8 +806,8 @@ in "sha256-EunrKwNaYp0CDiwp8frI7zASilMF4wYHjDSuCsJ6aJM="; mypy-boto3-logs = - buildMypyBoto3Package "logs" "1.43.62" - "sha256-qF00eFrV3huxoy0GDbRoACCUayzRe5fHjuhdtUNlaaU="; + buildMypyBoto3Package "logs" "1.43.66" + "sha256-fRs87lb3AwmaJMeod6bqnlszb6qjaTRVHC8UmwHq53I="; mypy-boto3-lookoutequipment = buildMypyBoto3Package "lookoutequipment" "1.43.0" @@ -886,8 +886,8 @@ in "sha256-8K0Xm6PMo+daS6xt4kBqaVvO2/LruFV7PVvugI7sNDU="; mypy-boto3-mediatailor = - buildMypyBoto3Package "mediatailor" "1.43.52" - "sha256-rlWHNZ2ipI7J7T0cgtUe+suNlj3bqFRqM7yhznfQLPA="; + buildMypyBoto3Package "mediatailor" "1.43.66" + "sha256-z9YFzucipXAIMQIRleA455so1gFcWdIQYeULXgQ+OEI="; mypy-boto3-medical-imaging = buildMypyBoto3Package "medical-imaging" "1.43.4" @@ -1158,8 +1158,8 @@ in "sha256-8or7NMBfeq9jZRzAu0Q1ShoTXTm8GCXR4kov0kaJCcE="; mypy-boto3-s3 = - buildMypyBoto3Package "s3" "1.43.50" - "sha256-IGgX0i6AeV2jXa9wQiXy4qK1YfpL+MYJ8hULBIAK6BE="; + buildMypyBoto3Package "s3" "1.43.66" + "sha256-svdHY+Nzs/PWTPzS8AzbHBDIpM7+bUzbwe1Kat4IXAc="; mypy-boto3-s3control = buildMypyBoto3Package "s3control" "1.43.17" @@ -1170,8 +1170,8 @@ in "sha256-T+JIJpHxD7IzAwq8yxgq6zbVMj/btpbhKnylMyfFvvU="; mypy-boto3-sagemaker = - buildMypyBoto3Package "sagemaker" "1.43.60" - "sha256-1ruaaxLwOdyzh0OFgyEhPu7DDEqyV6bt2WEhiw8Rtow="; + buildMypyBoto3Package "sagemaker" "1.43.66" + "sha256-iTCVmu0bslp4tJn0x/PC0vEsH2erCa0b1wqElLXYitE="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.43.0" @@ -1218,8 +1218,8 @@ in "sha256-Jl7i/d+dPkKuOWhWJft4YaU5EQ2OMkNyhHwOHL1mayA="; mypy-boto3-securityhub = - buildMypyBoto3Package "securityhub" "1.43.48" - "sha256-R05c+bDVzi1NNW03CTkORKYhbiPyajsjn88BRx3RNJw="; + buildMypyBoto3Package "securityhub" "1.43.66" + "sha256-zuv74XGZqO0OXvAKw2yCd48PgFrmZilmqEPOJrTTPu0="; mypy-boto3-securitylake = buildMypyBoto3Package "securitylake" "1.43.0" diff --git a/pkgs/development/python-modules/napalm/hp-procurve.nix b/pkgs/development/python-modules/napalm/hp-procurve.nix index ef6ec5862bc9..64e0462b3a9a 100644 --- a/pkgs/development/python-modules/napalm/hp-procurve.nix +++ b/pkgs/development/python-modules/napalm/hp-procurve.nix @@ -11,15 +11,15 @@ standard-telnetlib, }: -buildPythonPackage rec { - pname = "napalm-hp-procurve"; +buildPythonPackage (finalAttrs: { + pname = "napalm-procurve"; version = "0.7.0"; pyproject = true; src = fetchFromGitHub { owner = "napalm-automation-community"; repo = "napalm-hp-procurve"; - tag = version; + tag = finalAttrs.version; hash = "sha256-cO4kxI90krj1knzixRKWxa77OAaxjO8dLTy02VpkV9M="; }; @@ -27,7 +27,7 @@ buildPythonPackage rec { # Dependency installation in setup.py doesn't work echo -n > requirements.txt substituteInPlace setup.cfg \ - --replace " --pylama" "" + --replace-fail " --pylama" "" ''; build-system = [ @@ -62,8 +62,8 @@ buildPythonPackage rec { meta = { description = "HP ProCurve Driver for NAPALM automation frontend"; homepage = "https://github.com/napalm-automation-community/napalm-hp-procurve"; - changelog = "https://github.com/napalm-automation-community/napalm-hp-procurve/releases/tag/${src.tag}"; + changelog = "https://github.com/napalm-automation-community/napalm-hp-procurve/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/napalm/ros.nix b/pkgs/development/python-modules/napalm/ros.nix index 080766099cf6..3374a9504860 100644 --- a/pkgs/development/python-modules/napalm/ros.nix +++ b/pkgs/development/python-modules/napalm/ros.nix @@ -2,13 +2,13 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools, napalm, librouteros, pytestCheckHook, - pythonAtLeast, + poetry-core, }: -buildPythonPackage rec { + +buildPythonPackage (finalAttrs: { pname = "napalm-ros"; version = "1.2.6"; pyproject = true; @@ -16,19 +16,31 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "napalm-automation-community"; repo = "napalm-ros"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Fv11Blx44vZZ8NuhQQIFpDr+dH2gDJtQP7b0kAk3U/s="; }; - build-system = [ setuptools ]; + # Setuptools is wrong, upstream uses poetry + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'requires = ["setuptools>=56.0.0", "wheel"]' 'requires = ["poetry-core"]' \ + --replace-fail 'build-backend = "setuptools.build_meta"' 'build-backend = "poetry.core.masonry.api"' + ''; - dependencies = [ librouteros ]; + build-system = [ poetry-core ]; - nativeCheckInputs = [ + dependencies = [ + librouteros napalm - pytestCheckHook ]; + pythonRelaxDeps = [ + "librouteros" + "napalm" + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = [ # AssertionError: Some methods vary. "test_method_signatures" @@ -39,9 +51,9 @@ buildPythonPackage rec { meta = { description = "MikroTik RouterOS NAPALM driver"; homepage = "https://github.com/napalm-automation-community/napalm-ros"; - changelog = "https://github.com/napalm-automation-community/napalm-ros/releases/tag/${src.tag}"; + changelog = "https://github.com/napalm-automation-community/napalm-ros/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ felbinger ]; }; -} +}) diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index ed7733fb8fe7..0a2a32413190 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -26,14 +26,14 @@ buildPythonPackage (finalAttrs: { pname = "playwrightcapture"; - version = "1.40.3"; + version = "1.40.5"; pyproject = true; src = fetchFromGitHub { owner = "Lookyloo"; repo = "PlaywrightCapture"; tag = "v${finalAttrs.version}"; - hash = "sha256-qtYy8b0tN4VvmBtG2p3zXQ5Wc8QB+NiESsSYqd0/cuw="; + hash = "sha256-yyAIQOOc39iRqQZOqnGpuW6DyqWeq4rE4OBt+62mwTg="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pyfaup-rs/default.nix b/pkgs/development/python-modules/pyfaup-rs/default.nix index 86a2a408fe26..babc2b446ce9 100644 --- a/pkgs/development/python-modules/pyfaup-rs/default.nix +++ b/pkgs/development/python-modules/pyfaup-rs/default.nix @@ -8,19 +8,19 @@ buildPythonPackage (finalAttrs: { pname = "pyfaup-rs"; - version = "0.4.14"; + version = "0.4.16"; pyproject = true; src = fetchFromGitHub { owner = "ail-project"; repo = "faup-rs"; tag = "pyfaup-rs-v${finalAttrs.version}"; - hash = "sha256-rECfx7um1Rk9Fd65y3377StGru68QE13xwqDOmXQ140="; + hash = "sha256-ytU7dlbgZU2c99DawDOthKs1O7Gknj9m44LaAH06zsE="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-F41gKLhly8V6dw8qE5lFLuQpSmGGfWg9EcAUMD29dsA="; + hash = "sha256-2YFRT6n1/+1emde3lq1GCkYoNvbZUwSDQgBeOVeEiso="; }; buildAndTestSubdir = "python"; diff --git a/pkgs/development/python-modules/rembg/default.nix b/pkgs/development/python-modules/rembg/default.nix index eae7ff3567e9..bb2a075422c3 100644 --- a/pkgs/development/python-modules/rembg/default.nix +++ b/pkgs/development/python-modules/rembg/default.nix @@ -46,14 +46,14 @@ let in buildPythonPackage (finalAttrs: { pname = "rembg"; - version = "2.0.77"; + version = "2.0.78"; pyproject = true; src = fetchFromGitHub { owner = "danielgatis"; repo = "rembg"; tag = "v${finalAttrs.version}"; - hash = "sha256-N7G9jYERoFAj3GBuGypuWqeOMmspKr3lzVY/3mb58Mw="; + hash = "sha256-d5v22e0WRqJGTRg6smv4htJ5Jo2l2++wCllKqQ/ihQU="; }; env.POETRY_DYNAMIC_VERSIONING_BYPASS = finalAttrs.version; diff --git a/pkgs/development/python-modules/roadtx/default.nix b/pkgs/development/python-modules/roadtx/default.nix index 003c90868315..253571710596 100644 --- a/pkgs/development/python-modules/roadtx/default.nix +++ b/pkgs/development/python-modules/roadtx/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "roadtx"; - version = "1.22.0"; + version = "1.22.1"; pyproject = true; __structuredAttrs = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-2GIJAjLxOqy3E+5j1gnby8F5IAvdnChMT4Lfq5I5zeE="; + hash = "sha256-kOsXowM5LM5jX8XW+G8u65P9y2/6ZMIwMFvbAtO/b34="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-tqdm/default.nix b/pkgs/development/python-modules/types-tqdm/default.nix index cad534a55a5a..714390d9a063 100644 --- a/pkgs/development/python-modules/types-tqdm/default.nix +++ b/pkgs/development/python-modules/types-tqdm/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "types-tqdm"; - version = "4.69.0.20260728"; + version = "4.70.0.20260805"; pyproject = true; __structuredAttrs = true; src = fetchPypi { pname = "types_tqdm"; inherit (finalAttrs) version; - hash = "sha256-MPZiUT/0+a5hVk7aRTgVSkvrJ02oZdaI2PPL1qhWMY4="; + hash = "sha256-Vp79D9iypGDm5lSGNOwlPBNi7YkH+LDarPCgfqsgSiY="; }; build-system = [ setuptools ]; diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 746caf595ebf..17e4187965c2 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -5,28 +5,28 @@ "lts": false }, "6.1": { - "version": "6.1.181", - "hash": "sha256:0249n5phpg0kc9713nnrcf1lwskn092ybyf6fsvcwal5i6j4pffr", + "version": "6.1.182", + "hash": "sha256:118z7jqabpja5xzlqj73alvsg4sjs6fg5iv8x0da4940dsxid17k", "lts": true }, "5.15": { - "version": "5.15.214", - "hash": "sha256:0hg516kjz2h35vmm6jsbqvsjs71hvvgvhmxj3h8cwj3i9dzw9lk1", + "version": "5.15.215", + "hash": "sha256:19xp4gyp9h341dmvg36i3jm4zgk4lgwrrrdjkzbacgw1l2fjfzym", "lts": true }, "5.10": { - "version": "5.10.263", - "hash": "sha256:19kx9i76vag49ch7w4lkah304mv6hb55p87qpx3cgdmaczrkhcy9", + "version": "5.10.264", + "hash": "sha256:17j8bdqsq6n0zl5a59chiapxpn7yapqvihqq37414dbq6bn54xgj", "lts": true }, "6.6": { - "version": "6.6.149", - "hash": "sha256:1l637avlbq2df3km7ndcxla8kw3blwcph5l1abmi2lbc9n4pmvx7", + "version": "6.6.150", + "hash": "sha256:0yc948nv0lhqfjphj2mjsqasa367sn76fl70z456r4sij4k27f3f", "lts": true }, "6.12": { - "version": "6.12.101", - "hash": "sha256:0xlaq8gz9v7ya2w38r2hps58rp7xqf6bp7bw3cazfj9zjc8ws88d", + "version": "6.12.102", + "hash": "sha256:00sqcn7q4ibha1v2sdqbx3xvz0gdb39hn15pqawklckijgsbajv9", "lts": true }, "6.18": { diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index 5fbf304244e2..87542deb48a2 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -8,13 +8,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "plpgsql-check"; - version = "2.10.3"; + version = "2.10.4"; src = fetchFromGitHub { owner = "okbob"; repo = "plpgsql_check"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZnZ+/3/ClMPmW0BTDvROeNAv9s8K+ipOGvh5qM/7+Zc="; + hash = "sha256-eGbtFqzuwg1taHJUjT5QSe1OdvWkeXZSGyQAYRLyeaQ="; }; passthru.tests.extension = postgresqlTestExtension { diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index bbdf448d5f08..c97fde73b34b 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -13,13 +13,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; - version = "2.29.0"; + version = "2.29.1"; src = fetchFromGitHub { owner = "timescale"; repo = "timescaledb"; tag = finalAttrs.version; - hash = "sha256-N5RYIKc467zHNgvmXrp+KltRZcTPo3fiv4KASU8i8L0="; + hash = "sha256-X92KeX9D+lI/iqMIJ1AsADBHT23tfY0DSiEwUmOKYaw="; }; nativeBuildInputs = [ cmake ]; @@ -105,7 +105,7 @@ postgresqlBuildExtension (finalAttrs: { lib.versionOlder postgresql.version "16" || # Check after next package update. - lib.warnIf (finalAttrs.version != "2.29.0") "Is postgresql19Packages.timescaledb still broken?" ( + lib.warnIf (finalAttrs.version != "2.29.1") "Is postgresql19Packages.timescaledb still broken?" ( lib.versionAtLeast postgresql.version "19" ); }; diff --git a/pkgs/test/config-nix-unit.nix b/pkgs/test/config-nix-unit.nix new file mode 100644 index 000000000000..cd16d5ca1c43 --- /dev/null +++ b/pkgs/test/config-nix-unit.nix @@ -0,0 +1,117 @@ +# Tests for nixpkgs config forwarding from NixOS modules. +# +# Run with: +# nix-unit pkgs/test/config-nix-unit.nix +# or +# nix-build -A tests.config-nix-unit +# +{ + nixpkgsPath ? ../.., + pkgs ? import nixpkgsPath { }, +}: +let + lib = pkgs.lib; + + # Test helper + evalNixos = + modules: + import (nixpkgsPath + "/nixos/lib/eval-config.nix") { + modules = [ { nixpkgs.hostPlatform = "x86_64-linux"; } ] ++ modules; + }; +in +{ + # Basic: a single config option is forwarded correctly. + testSingleConfigOption = { + expr = (evalNixos [ { nixpkgs.config.allowUnfree = true; } ]).config.nixpkgs.config.allowUnfree; + expected = true; + }; + + # Multiple config definitions from separate modules are merged. + testMultipleModulesMerge = { + expr = + let + eval = evalNixos [ + { nixpkgs.config.allowUnfree = true; } + { nixpkgs.config.allowBroken = true; } + ]; + in + { + inherit (eval.config.nixpkgs.config) allowUnfree allowBroken; + }; + expected = { + allowUnfree = true; + allowBroken = true; + }; + }; + + # mkForce works. Also covers other properties + testMkForce = { + expr = + (evalNixos [ + { nixpkgs.config.allowUnfree = true; } + { nixpkgs.config.allowUnfree = lib.mkForce false; } + ]).config.nixpkgs.config.allowUnfree; + expected = false; + }; + + testDefaults = { + expr = (evalNixos [ ]).config.nixpkgs.config.allowUnfree; + expected = false; + }; + + # Standalone nixpkgs (i.e. import { ... }) + testStandaloneConfig = { + expr = (import nixpkgsPath { config.allowUnfree = true; }).config.allowUnfree; + expected = true; + }; + + # Standalone nixpkgs with a function (i.e. import ({pkgs, lib, ...}: { ... }) + testStandaloneConfigFunctionPkgs = { + expr = + (import nixpkgsPath { + config = + { pkgs, lib, ... }: + { + allowUnfree = lib.isAttrs pkgs; + }; + }).config.allowUnfree; + expected = true; + }; + + # NixOS module sets nixpkgs.config as a function + testNixosConfigFunction = { + expr = + (evalNixos [ + { + nixpkgs.config = + { lib, ... }: + { + allowUnfree = lib.isFunction lib.id; + }; + } + ]).config.nixpkgs.config.allowUnfree; + expected = true; + }; + + # Passing both config and _configDefinitions is not allowed + testConfigAndDefinitionsMutuallyExclusive = { + expr = + (import nixpkgsPath { + config = { + allowUnfree = true; + }; + _configDefinitions = [ + { + file = "test"; + value = { + allowBroken = true; + }; + } + ]; + }).config.allowUnfree; + expectedError = { + type = "ThrownError"; + msg = ".*_configDefinitions.*internal.*must not be combined.*"; + }; + }; +} diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 35f3f2c8aa82..8fc201288c5e 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -128,6 +128,26 @@ in config = callPackage ./config.nix { }; + # Technically nix-unit binds to a fixed nix version + # We have tests in lib to test the module system itself against different nix-versions + # Based on this assumption (transitivity of correctness) this test should therefore also cover all tested nix-versions + config-nix-unit = + pkgs.runCommand "config-nix-unit" + { + nativeBuildInputs = [ pkgs.nix-unit ]; + } + '' + export HOME=$TMPDIR + nix-unit --eval-store "$HOME" ${./config-nix-unit.nix} \ + --arg nixpkgsPath "${ + builtins.path { + path = pkgs.path; + name = "source"; + } + }" + mkdir $out + ''; + top-level = callPackage ./top-level { }; haskell = callPackage ./haskell { }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 504d7f4e5b4a..ccd0fe5fa3e3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -781,7 +781,6 @@ mapAliases { ethercalc = throw "'ethercalc' has been removed from nixpkgs as the project was old, unmaintained, and could not be packaged well in nixpkgs"; # Added 2025-11-28 ethersync = warnAlias "'ethersync' has been renamed to 'teamtype'" teamtype; # Added 2025-10-31 eureka-ideas = throw "'eureka-ideas' has been removed as it has been unmaintained upstream since April 2023"; # Added 2026-02-07 - everforest-gtk-theme = throw "'everforest-gtk-theme' has been removed because it depended on 'gtk-engine-murrine', which was removed because it was unmaintained upstream and depended on GTK 2."; # Added 2026-07-22 everspace = throw "'everspace' has been removed, as it relies on gtk2 libraries"; # Added 2026-06-15 evolve-core = throw "'evolve-core' has been removed, as it hindered the removal of flutter329"; # Added 2026-01-25 eww-wayland = throw "'eww-wayland' has been renamed to/replaced by 'eww'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix index 058e383e0b7a..97199162932c 100644 --- a/pkgs/top-level/config.nix +++ b/pkgs/top-level/config.nix @@ -6,7 +6,12 @@ # nix-build -A tests.config # -{ config, lib, ... }: +{ + config, + lib, + docPrefix, + ... +}: let inherit (lib) @@ -143,13 +148,13 @@ let gitConfig = mkOption { type = types.attrsOf (types.attrsOf types.anything); description = '' - The default [git configuration](https://git-scm.com/docs/git-config#_variables) for all [`pkgs.fetchgit`](#fetchgit) calls. + The default [git configuration](https://git-scm.com/docs/git-config#_variables) for all [`pkgs.fetchgit`](${docPrefix}#fetchgit) calls. Among many other potential uses, this can be used to override URLs to point to local mirrors. Changing this will not cause any rebuilds because `pkgs.fetchgit` produces a [fixed-output derivation](https://nix.dev/manual/nix/stable/glossary.html?highlight=fixed-output%20derivation#gloss-fixed-output-derivation). - To set the configuration file directly, use the [`gitConfigFile`](#opt-gitConfigFile) option instead. + To set the configuration file directly, use the [`gitConfigFile`](${docPrefix}#opt-gitConfigFile) option instead. To set the configuration file for individual calls, use `fetchgit { gitConfigFile = "..."; }`. ''; @@ -163,9 +168,9 @@ let gitConfigFile = mkOption { type = types.nullOr types.path; description = '' - A path to a [git configuration](https://git-scm.com/docs/git-config#_variables) file, to be used for all [`pkgs.fetchgit`](#fetchgit) calls. + A path to a [git configuration](https://git-scm.com/docs/git-config#_variables) file, to be used for all [`pkgs.fetchgit`](${docPrefix}#fetchgit) calls. - This overrides the [`gitConfig`](#opt-gitConfig) option, see its documentation for more details. + This overrides the [`gitConfig`](${docPrefix}#opt-gitConfig) option, see its documentation for more details. ''; default = if config.gitConfig != { } then @@ -183,7 +188,7 @@ let For example, an override like `"registry.npmjs.org" = "my-mirror.local/registry.npmjs.org"` will replace a URL like `https://registry.npmjs.org/foo.tar.gz` with `https://my-mirror.local/registry.npmjs.org/foo.tar.gz`. - To set the string directly, see [`npmRegistryOverridesString`](#opt-npmRegistryOverridesString). + To set the string directly, see [`npmRegistryOverridesString`](${docPrefix}#opt-npmRegistryOverridesString). ''; default = { }; example = { @@ -202,7 +207,7 @@ let description = '' A string containing a string with a JSON representation of npm registry overrides for `fetchNpmDeps`. - This overrides the [`npmRegistryOverrides`](#opt-npmRegistryOverrides) option, see its documentation for more details. + This overrides the [`npmRegistryOverrides`](${docPrefix}#opt-npmRegistryOverrides) option, see its documentation for more details. ''; default = builtins.toJSON config.npmRegistryOverrides; }; @@ -440,7 +445,7 @@ let type = types.listOf types.str; default = [ "https://tarballs.nixos.org" ]; description = '' - The set of content-addressed/hashed mirror URLs used by [`pkgs.fetchurl`](#sec-pkgs-fetchers-fetchurl). + The set of content-addressed/hashed mirror URLs used by [`pkgs.fetchurl`](${docPrefix}#sec-pkgs-fetchers-fetchurl). In case `pkgs.fetchurl` can't download from the given URLs, it will try the hashed mirrors based on the expected output hash. @@ -493,11 +498,27 @@ let binaries for the platform. It is provided only as an escape hatch for custom setups, and comes with no support. - See the [release notes](#x86_64-darwin-26.11) for more + See the [release notes](${docPrefix}#x86_64-darwin-26.11) for more information. ''; }; + packageOverrides = mkOption { + type = types.functionTo types.attrs; + default = pkgs: { }; + description = '' + A function to replace or add packages in `pkgs` expects an attrset to be returned when called. + ''; + }; + + perlPackageOverrides = mkOption { + type = types.functionTo types.attrs; + default = pkgs: { }; + description = '' + The same as `packageOverrides` but for packages in the perl package set. + ''; + }; + problems = (import ../stdenv/generic/problems.nix { inherit lib; }).configOptions; }; @@ -521,6 +542,7 @@ in inherit options; config = { + _module.args.docPrefix = lib.mkDefault ""; warnings = optionals config.warnUndeclaredOptions ( mapAttrsToList (k: v: "undeclared Nixpkgs option set: config.${k}") config._undeclared or { } diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index c00efe313abd..421f11cbca6b 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -45,6 +45,11 @@ # list it returns. stdenvStages ? import ../stdenv, + # Temporary parameter to unify nixpkgs/pkgs evaluation + # Internal, do not use this manually! + # Will be removed again within the next releases + _configDefinitions ? null, + # Ignore unexpected args. ... }@args: @@ -109,11 +114,13 @@ let (throwIfNot (lib.all lib.isFunction overlays) "All overlays passed to nixpkgs must be functions.") (throwIfNot (lib.isList crossOverlays) "The crossOverlays argument to nixpkgs must be a list.") (throwIfNot (lib.all lib.isFunction crossOverlays) "All crossOverlays passed to nixpkgs must be functions.") + (throwIf ( + ((localSystem.isDarwin && localSystem.isx86) || (crossSystem.isDarwin && crossSystem.isx86)) + && config.allowDeprecatedx86_64Darwin != "force" + ) x86_64DarwinDeprecationMessage) ( - throwIf ( - ((localSystem.isDarwin && localSystem.isx86) || (crossSystem.isDarwin && crossSystem.isx86)) - && config.allowDeprecatedx86_64Darwin != "force" - ) x86_64DarwinDeprecationMessage + throwIfNot (_configDefinitions == null || config0 == { }) + "The `_configDefinitions` argument is an internal interface and must not be combined with `config`." ); localSystem = lib.systems.elaborate args.localSystem; @@ -138,20 +145,24 @@ let # Allow both: # { /* the config */ } and - # { pkgs, ... } : { /* the config */ } + # { lib, pkgs, ... } : { /* the config */ } config1 = if lib.isFunction config0 then config0 { inherit lib pkgs; } else config0; configEval = lib.evalModules { modules = [ ./config.nix - ( - { options, ... }: - { - _file = "nixpkgs.config"; - config = config1; - } - ) - ]; + ] + ++ ( + if _configDefinitions != null then + map (def: lib.modules.setDefaultModuleLocation def.file def.value) _configDefinitions + else + [ + { + _file = "nixpkgs.config"; + config = config1; + } + ] + ); class = "nixpkgsConfig"; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 171e217a2bc7..d9e14780fdd3 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1649,9 +1649,7 @@ let odig = callPackage ../development/ocaml-modules/odig { }; - odoc = callPackage ../development/ocaml-modules/odoc { - cmdliner = cmdliner_1; - }; + odoc = callPackage ../development/ocaml-modules/odoc { }; odoc-parser = callPackage ../development/ocaml-modules/odoc-parser { };