diff --git a/doc/build-helpers/testers.chapter.md b/doc/build-helpers/testers.chapter.md index 632b11ab12ea..5de01694e718 100644 --- a/doc/build-helpers/testers.chapter.md +++ b/doc/build-helpers/testers.chapter.md @@ -98,6 +98,14 @@ It has two modes: : The path to the files to check. +`relocatable` (boolean, optional) {#tester-lycheeLinkCheck-param-relocatable} + +: Whether the site is expected to be relocatable, i.e. servable from any URL path prefix. + + When `true` (the default), root-relative links (starting with `/`) are treated as errors, because they break when the site is served from a subpath or opened via `file://` URLs. + + When `false`, root-relative links are resolved against the `site` directory. + `remap` (attribute set, optional) {#tester-lycheeLinkCheck-param-remap} : An attribute set where the attribute names are regular expressions. diff --git a/lib/modules.nix b/lib/modules.nix index 2820aa921bf2..c5c935144ea6 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -1018,38 +1018,16 @@ let mergedType = t.typeMerge t'.functor; typesMergeable = mergedType != null; - # TODO: Remove this when all downstream reliances of internals: 'functor.wrapped' are sufficiently migrated. - # A function that adds the deprecated wrapped message to a type. - addDeprecatedWrapped = - t: - t - // { - functor = t.functor // { - wrapped = t.functor.wrappedDeprecationMessage { - inherit loc; - }; - }; - }; - typeSet = - if opt.options ? type then - if res ? type then - if typesMergeable then - { - type = - if mergedType ? functor.wrappedDeprecationMessage then - addDeprecatedWrapped mergedType - else - mergedType; - } - else - # Keep in sync with the same error below! - throw - "The option `${showOption loc}' in `${opt._file}' is already declared in ${showFiles res.declarations}." - else if opt.options.type ? functor.wrappedDeprecationMessage then - { type = addDeprecatedWrapped opt.options.type; } + if opt.options ? type && res ? type then + if typesMergeable then + { + type = mergedType; + } else - { } + # Keep in sync with the same error below! + throw + "The option `${showOption loc}' in `${opt._file}' is already declared in ${showFiles res.declarations}." else { }; diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 4eb86ddd4962..94aeea299e04 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -515,56 +515,6 @@ checkConfigError 'infinite recursion encountered' config.nonLazyResult ./lazy-at checkConfigOutput '^"mergedName..nested"$' config.result ./name-merge-attrsWith-1.nix checkConfigError 'The option .mergedName. in .*\.nix. is already declared in .*\.nix' config.mergedName ./name-merge-attrsWith-2.nix -# Test type.functor.wrapped deprecation warning -# should emit the warning on: -# - merged types -# - non-merged types -# - nestedTypes elemType -# attrsWith -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.attrsWith.type.functor.wrapped ./deprecated-wrapped.nix -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedAttrsWith.type.functor.wrapped ./deprecated-wrapped.nix - -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.attrsWith.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedAttrsWith.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix -# listOf -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.listOf.type.functor.wrapped ./deprecated-wrapped.nix -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedListOf.type.functor.wrapped ./deprecated-wrapped.nix - -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.listOf.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedListOf.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix -# unique / uniq -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.unique.type.functor.wrapped ./deprecated-wrapped.nix -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedUnique.type.functor.wrapped ./deprecated-wrapped.nix - -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.unique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedUnique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix -# nullOr -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.nullOr.type.functor.wrapped ./deprecated-wrapped.nix -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedNullOr.type.functor.wrapped ./deprecated-wrapped.nix - -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.nullOr.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedNullOr.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix -# functionTo -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.functionTo.type.functor.wrapped ./deprecated-wrapped.nix -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedFunctionTo.type.functor.wrapped ./deprecated-wrapped.nix - -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.functionTo.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedFunctionTo.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix - -# coercedTo -# Note: test 'nestedTypes.finalType' and 'nestedTypes.coercedType' -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.coercedTo.type.functor.wrapped ./deprecated-wrapped.nix -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.coercedTo.type.nestedTypes.finalType.functor.wrapped ./deprecated-wrapped.nix -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.coercedTo.type.nestedTypes.coercedType.functor.wrapped ./deprecated-wrapped.nix -# either -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.either.type.functor.wrapped ./deprecated-wrapped.nix -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedEither.type.functor.wrapped ./deprecated-wrapped.nix - -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.either.type.nestedTypes.left.functor.wrapped ./deprecated-wrapped.nix -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.either.type.nestedTypes.right.functor.wrapped ./deprecated-wrapped.nix -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedEither.type.nestedTypes.left.functor.wrapped ./deprecated-wrapped.nix -ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedEither.type.nestedTypes.right.functor.wrapped ./deprecated-wrapped.nix - # Even with multiple assignments, a type error should be thrown if any of them aren't valid checkConfigError 'A definition for option .* is not of type .*' \ config.value ./declare-int-unsigned-value.nix ./define-value-list.nix ./define-value-int-positive.nix @@ -733,9 +683,6 @@ checkConfigError 'The option .theOption.nested. in .other.nix. is already declar # Test that types.optionType leaves types untouched as long as they don't need to be merged checkConfigOutput 'ok' config.freeformItems.foo.bar ./adhoc-freeformType-survives-type-merge.nix -# Test that specifying both functor.wrapped and functor.payload isn't allowed -checkConfigError 'Type foo defines both `functor.payload` and `functor.wrapped` at the same time, which is not supported.' config.result ./default-type-merge-both.nix - # Test that not including functor.wrapped is allowed checkConfigOutput 'ok' config.result ./default-type-merge-payload.nix diff --git a/lib/tests/modules/default-type-merge-both.nix b/lib/tests/modules/default-type-merge-both.nix deleted file mode 100644 index 0b02b940f8b1..000000000000 --- a/lib/tests/modules/default-type-merge-both.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, options, ... }: -let - foo = lib.mkOptionType { - name = "foo"; - functor = lib.types.defaultFunctor "foo" // { - wrapped = lib.types.int; - payload = 10; - }; - }; -in -{ - imports = [ - { - options.foo = lib.mkOption { - type = foo; - }; - } - { - options.foo = lib.mkOption { - type = foo; - }; - } - ]; - - options.result = lib.mkOption { - default = builtins.seq options.foo null; - }; -} diff --git a/lib/types.nix b/lib/types.nix index 3cb3c64baf05..f9ae3c82a172 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -99,7 +99,6 @@ let { elemType, ... }@payload: { inherit name payload; - wrappedDeprecationMessage = makeWrappedDeprecationMessage payload; type = types.${name}; binOp = a: b: @@ -108,14 +107,6 @@ let in if merged == null then null else { elemType = merged; }; }; - makeWrappedDeprecationMessage = - payload: - { loc }: - lib.warn '' - The deprecated `${lib.optionalString (loc != null) "type."}functor.wrapped` attribute ${ - lib.optionalString (loc != null) "of the option `${showOption loc}` " - }is accessed, use `${lib.optionalString (loc != null) "type."}nestedTypes.elemType` instead. - '' payload.elemType; checkDefsForError = check: loc: defs: @@ -168,21 +159,11 @@ rec { defaultTypeMerge = f: f': let - mergedWrapped = f.wrapped.typeMerge f'.wrapped.functor; mergedPayload = f.binOp f.payload f'.payload; hasPayload = assert (f'.payload != null) == (f.payload != null); f.payload != null; - hasWrapped = - let - hasWrappedNonNull = set: set ? "wrapped" && set.wrapped != null; - in - assert (hasWrappedNonNull f') == (hasWrappedNonNull f); - hasWrappedNonNull f; - - typeFromPayload = if mergedPayload == null then null else f.type mergedPayload; - typeFromWrapped = if mergedWrapped == null then null else f.type mergedWrapped; in # Abort early: cannot merge different types if f.name != f'.name then @@ -190,22 +171,7 @@ rec { else if hasPayload then - # Just return the payload if returning wrapped is deprecated - if f ? wrappedDeprecationMessage then - typeFromPayload - else if hasWrapped then - # Has both wrapped and payload - throw '' - Type ${f.name} defines both `functor.payload` and `functor.wrapped` at the same time, which is not supported. - - Use either `functor.payload` or `functor.wrapped` but not both. - - If your code worked before remove either `functor.wrapped` or `functor.payload` from the type definition. - '' - else - typeFromPayload - else if hasWrapped then - typeFromWrapped + if mergedPayload == null then null else f.type mergedPayload else f.type; @@ -213,7 +179,6 @@ rec { defaultFunctor = name: { inherit name; type = lib.types.${name} or null; - wrapped = null; payload = null; binOp = a: b: null; }; @@ -309,17 +274,8 @@ rec { deprecationMessage nestedTypes descriptionClass + functor ; - functor = - if functor ? wrappedDeprecationMessage then - functor - // { - wrapped = functor.wrappedDeprecationMessage { - loc = null; - }; - } - else - functor; description = if description == null then name else description; }; @@ -1834,9 +1790,7 @@ rec { getSubModules = finalType.getSubModules; substSubModules = m: coercedTo coercedType coerceFunc (finalType.substSubModules m); typeMerge = t: null; - functor = (defaultFunctor name) // { - wrappedDeprecationMessage = makeWrappedDeprecationMessage { elemType = finalType; }; - }; + functor = defaultFunctor name; nestedTypes.coercedType = coercedType; nestedTypes.finalType = finalType; }; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 70c41ee05e2b..c7ea2f7c7263 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2133,6 +2133,12 @@ githubId = 56009; name = "Arcadio Rubio García"; }; + arcayr = { + email = "nixpkgs@arcayr.online"; + github = "arcayr"; + githubId = 11192354; + name = "Elliot Speck"; + }; archer-65 = { email = "mario.liguori.056@gmail.com"; github = "archer-65"; @@ -12121,6 +12127,12 @@ github = "Jaculabilis"; githubId = 10787844; }; + jadewilk = { + name = "Jade Wilk"; + email = "p.wilk@student.reading.ac.uk"; + github = "jadewilk"; + githubId = 50517631; + }; jaduff = { email = "jdduffpublic@proton.me"; github = "jaduff"; @@ -21643,12 +21655,6 @@ githubId = 43863; name = "Philip Taron"; }; - philipwilk = { - name = "Philip Wilk"; - email = "p.wilk@student.reading.ac.uk"; - github = "philipwilk"; - githubId = 50517631; - }; philocalyst = { name = "Myles Wirth"; email = "milestheperson@posteo.net"; diff --git a/nixos/modules/programs/clash-verge.nix b/nixos/modules/programs/clash-verge.nix index 0128bf6e79ed..b54643679279 100644 --- a/nixos/modules/programs/clash-verge.nix +++ b/nixos/modules/programs/clash-verge.nix @@ -81,6 +81,7 @@ LockPersonality = true; RestrictRealtime = true; RuntimeDirectory = "clash-verge-rev"; + StateDirectory = "clash-verge-service"; ProtectClock = true; MemoryDenyWriteExecute = true; RestrictSUIDSGID = true; diff --git a/nixos/modules/services/hardware/hddfancontrol.nix b/nixos/modules/services/hardware/hddfancontrol.nix index 567d6295ed1c..e6f80950b91b 100644 --- a/nixos/modules/services/hardware/hddfancontrol.nix +++ b/nixos/modules/services/hardware/hddfancontrol.nix @@ -10,7 +10,7 @@ let in { - meta.maintainers = with lib.maintainers; [ philipwilk ]; + meta.maintainers = with lib.maintainers; [ jadewilk ]; imports = [ (lib.mkRemovedOptionModule [ diff --git a/nixos/modules/services/misc/autorandr.nix b/nixos/modules/services/misc/autorandr.nix index 35a610305b04..fb23e2442b12 100644 --- a/nixos/modules/services/misc/autorandr.nix +++ b/nixos/modules/services/misc/autorandr.nix @@ -32,9 +32,14 @@ let ); getSubModules = elemType.getSubModules; substSubModules = mod: matrixOf n m (elemType.substSubModules mod); - functor = (lib.defaultFunctor name) // { - wrapped = elemType; - }; + functor = ( + lib.types.elemTypeFunctor "attrsWith" { + inherit + elemType + name + ; + } + ); }; profileModule = lib.types.submodule { diff --git a/nixos/modules/system/activation/bootspec.nix b/nixos/modules/system/activation/bootspec.nix index c625b91ec1e2..6f0653e1c44b 100644 --- a/nixos/modules/system/activation/bootspec.nix +++ b/nixos/modules/system/activation/bootspec.nix @@ -97,13 +97,13 @@ let }; in { + imports = [ + (lib.mkRemovedOptionModule [ "boot" "bootspec" "enable" ] '' + Bootspec is now always generated and can no longer be disabled. + '') + ]; + options.boot.bootspec = { - enable = - lib.mkEnableOption "the generation of RFC-0125 bootspec in $system/boot.json, e.g. /run/current-system/boot.json" - // { - default = true; - internal = true; - }; enableValidation = lib.mkEnableOption '' the validation of bootspec documents for each build. This will introduce Go in the build-time closure as we are relying on [Cuelang](https://cuelang.org/) for schema validation. diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 2a05a18f83b7..7ada1c4ae29f 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -44,7 +44,7 @@ let printf "%s " "''${extraDependencies[@]}" > "$out/extra-dependencies" - ${optionalString (!config.boot.isContainer && config.boot.bootspec.enable) '' + ${optionalString (!config.boot.isContainer) '' ${config.boot.bootspec.writer} ${optionalString config.boot.bootspec.enableValidation ''${config.boot.bootspec.validator} "$out/${config.boot.bootspec.filename}"''} ''} diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index a0d4256c3c0f..06c15ee6674b 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -27,7 +27,6 @@ NIXOS_DIR = Path( TIMEOUT = "@timeout@" EDITOR = "@editor@" == "1" # noqa: PLR0133 CONSOLE_MODE = "@consoleMode@" -BOOTSPEC_TOOLS = "@bootspecTools@" DISTRO_NAME = "@distroName@" NIX = "@nix@" SYSTEMD = "@systemd@" @@ -291,31 +290,26 @@ def write_loader_conf(default_entry_id: str | None) -> None: os.rename(tmp, LOADER_CONF) -def get_bootspec(profile: str | None, generation: int) -> BootSpec: +def get_bootspec(profile: str | None, generation: int) -> BootSpec | None: system_directory = system_dir(profile, generation, None) boot_json_path = (system_directory / "boot.json").resolve() - if boot_json_path.is_file(): - with boot_json_path.open("r") as f: - # check if json is well-formed, else throw error with filepath - try: - bootspec_json = json.load(f) - except ValueError as e: - print( - f"error: Malformed Json: {e}, in {boot_json_path}", file=sys.stderr - ) - sys.exit(1) - else: - boot_json_str = run( - [ - f"{BOOTSPEC_TOOLS}/bin/synthesize", - "--version", - "1", - system_directory, - "/dev/stdout", - ], - stdout=subprocess.PIPE, - ).stdout - bootspec_json = json.loads(boot_json_str) + if not boot_json_path.is_file(): + print( + f"warning: skipping generation {generation}" + + (f" of profile {profile}" if profile else "") + + f": {boot_json_path} does not exist", + file=sys.stderr, + ) + return None + with boot_json_path.open("r") as f: + # check if json is well-formed, else throw error with filepath + try: + bootspec_json = json.load(f) + except ValueError as e: + print( + f"error: Malformed Json: {e}, in {boot_json_path}", file=sys.stderr + ) + sys.exit(1) return bootspec_from_json(bootspec_json) @@ -551,6 +545,8 @@ def install_bootloader(args: argparse.Namespace) -> None: for gen in gens: bootspec = get_bootspec(gen.profile, gen.generation) + if bootspec is None: + continue is_default = Path(bootspec.init).parent == default_config new_boot_files, new_bootctl_id = boot_file(*gen, machine_id, bootspec) boot_files.extend(new_boot_files) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index 4c3c28b11e90..31590bb1101b 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -47,8 +47,6 @@ let systemd = config.systemd.package; - bootspecTools = config.boot.bootspec.package; - nix = config.nix.package.out; timeout = if config.boot.loader.timeout == null then "menu-force" else config.boot.loader.timeout; diff --git a/nixos/tests/bootspec.nix b/nixos/tests/bootspec.nix index 83a39d94d7e7..6b8dea979008 100644 --- a/nixos/tests/bootspec.nix +++ b/nixos/tests/bootspec.nix @@ -24,8 +24,6 @@ let environment.systemPackages = [ pkgs.efibootmgr ]; }; standard = { - boot.bootspec.enable = true; - imports = [ baseline systemd-boot @@ -53,8 +51,6 @@ in meta.maintainers = with pkgs.lib.maintainers; [ raitobezarius ]; nodes.machine = { - boot.bootspec.enable = true; - imports = [ baseline grub @@ -75,8 +71,6 @@ in meta.maintainers = with pkgs.lib.maintainers; [ raitobezarius ]; nodes.machine = { - boot.bootspec.enable = true; - imports = [ baseline grub diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index b8f2fad73503..76b3b62c0389 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -793,7 +793,6 @@ let ++ optionals (bootLoader == "systemd-boot") [ pkgs.zstd.bin pkgs.mypy - config.boot.bootspec.package ] ++ optionals clevisTest [ pkgs.klibc ] ++ optional systemdStage1 config.system.nixos-init.package; diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix index eb2384a11f03..c2d9131f1974 100644 --- a/nixos/tests/systemd-boot.nix +++ b/nixos/tests/systemd-boot.nix @@ -772,26 +772,6 @@ in } ); - no-bootspec = runTest ( - { lib, ... }: - { - name = "systemd-boot-no-bootspec"; - meta.maintainers = with lib.maintainers; [ julienmalka ]; - - nodes.machine = { - imports = [ common ]; - boot.bootspec.enable = false; - }; - - testScript = - # python - '' - machine.start() - machine.wait_for_unit("multi-user.target") - ''; - } - ); - bootCounting = let baseConfig = { diff --git a/pkgs/applications/editors/kakoune/plugins/overrides.nix b/pkgs/applications/editors/kakoune/plugins/overrides.nix index ed0cbd1c17e5..054ad9cebd92 100644 --- a/pkgs/applications/editors/kakoune/plugins/overrides.nix +++ b/pkgs/applications/editors/kakoune/plugins/overrides.nix @@ -230,7 +230,7 @@ self: super: { homepage = "https://github.com/catppuccin/kakoune/"; license = lib.licenses.mit; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ philipwilk ]; + maintainers = with lib.maintainers; [ jadewilk ]; }; }; } diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix index 370b02d80242..9e784a49d9b5 100644 --- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix +++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix @@ -10,7 +10,6 @@ let # keep-sorted start "coc-basedpyright" "coc-clangd" - "coc-cmake" "coc-css" "coc-diagnostic" "coc-docker" 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 79722fb748ee..d5e75c2183e3 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -21,26 +21,26 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-792UABRtJEpG4ipQsoiN1lkGeaNqHyg69Sv3g26BZBA="; + hash = "sha256-R3ab2IeY9QnDhZFk52/05pIv4A+sZU3kJ9Jn5uLRa4Y="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-NDiCBtQ/BWPPOAbDs/ACZ68at0gAqJJMPBLCsILnBho="; + hash = "sha256-AE6zS8bJ4vec+P36NkxWYQ1tmcJG2WsFkv75+gRlrxA="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-j81bcYqopNTAO/faiugARwAaVZ8s+1Atf8oHDTS8fR4="; + hash = "sha256-n1qV1Lrl65HSDthMc5/7hLppeNBO6067Z+Rf5+kxfnA="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-Y6M110iwzKdzJoHb6zEKWyR4NyxyQtuvNJ4ucOrUYdY="; + hash = "sha256-g+lkUYym43o8cEFseWCrcSUUTx296u8DS9JvnU1dBLU="; }; }; in { name = "claude-code"; publisher = "anthropic"; - version = "2.1.170"; + version = "2.1.172"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 890d16f48216..4f30fd2ffa01 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1145,8 +1145,8 @@ let mktplcRef = { name = "vscode-database-client2"; publisher = "cweijan"; - version = "8.4.7"; - hash = "sha256-HiyLNVtdJgzwn6BSR4ojHOkLrQ49PhRQa4twst69j7Q="; + version = "8.5.1"; + hash = "sha256-adpTh4tNlWFdAGultTLZ9SfN9sMOpMaMWq8x6diGzBg="; }; meta = { description = "Database Client For Visual Studio Code"; @@ -2052,8 +2052,8 @@ let mktplcRef = { name = "gc-excelviewer"; publisher = "grapecity"; - version = "4.2.65"; - hash = "sha256-MDGwoecU8km6a7NVQjPRqJ43592Bftd/nXj1cdBB+V8="; + version = "4.2.66"; + hash = "sha256-EFy5GjkgV5puELTzNat+30WC224PLDQJmJeBILc1Fvo="; }; meta = { description = "Edit Excel spreadsheets and CSV files in Visual Studio Code and VS Code for the Web"; diff --git a/pkgs/applications/emulators/libretro/cores/prosystem.nix b/pkgs/applications/emulators/libretro/cores/prosystem.nix index e3b8cf7453b2..b3e11c217fe7 100644 --- a/pkgs/applications/emulators/libretro/cores/prosystem.nix +++ b/pkgs/applications/emulators/libretro/cores/prosystem.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "prosystem"; - version = "0-unstable-2026-04-20"; + version = "0-unstable-2026-06-04"; src = fetchFromGitHub { owner = "libretro"; repo = "prosystem-libretro"; - rev = "3f465db9c82fc6764cd90c53fc66eb630e0b3710"; - hash = "sha256-uamxOzJt5NbMGxDqyGk/8XJbN/fiFoB81DNeULIfL1U="; + rev = "363b6dfbd3e240762e022c2b4897b4fe55722be3"; + hash = "sha256-5KNxBCZq4BfBo5pF4tBzJNNyatrVQH4kmXmcyQcIPSY="; }; makefile = "Makefile"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix index 1938832de1f2..fe1cf5cbfe59 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix @@ -45,14 +45,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop-unwrapped"; - version = "6.8.1"; + version = "6.8.2"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-CcibFBPbviakOsf+BpAF8U0CRWIt3zO/KiHycwRw2V0="; + hash = "sha256-1zKAywh6EXGDi5t7CKQRWADRKX0mFEMyeIoK4hrTFFQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 25fb22132ef7..c9e8fc153c49 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -105,11 +105,11 @@ assert lib.all (p: p.enabled -> !(builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { pname = "weechat"; - version = "4.9.1"; + version = "4.9.2"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-BJYLVuHdhhJ/Y8+P0Bu/93yBQvQK6KlBrD22QtMQzek="; + hash = "sha256-0TianlIb2gxOv6EI4qv4he5sUVDDhSmfXcoBgaQ6CRQ="; }; # Why is this needed? https://github.com/weechat/weechat/issues/2031 diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 1a405f37b3aa..bfc42d8c06be 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -27,6 +27,9 @@ assert enableCuda -> singlePrec; let inherit (cudaPackages.flags) cmakeCudaArchitecturesString; + effectiveStdenv = if enableCuda then cudaPackages.backendStdenv else stdenv; + inherit (effectiveStdenv) hostPlatform; + # Select reasonable defaults for all major platforms # The possible values are defined in CMakeLists.txt: # AUTO None SSE2 SSE4.1 AVX_128_FMA AVX_256 AVX2_256 @@ -35,15 +38,15 @@ let x: if (cpuAcceleration != null) then x - else if stdenv.hostPlatform.system == "i686-linux" then + else if hostPlatform.system == "i686-linux" then "SSE2" - else if stdenv.hostPlatform.system == "x86_64-linux" then + else if hostPlatform.system == "x86_64-linux" then "SSE4.1" - else if stdenv.hostPlatform.system == "x86_64-darwin" then + else if hostPlatform.system == "x86_64-darwin" then "SSE4.1" - else if stdenv.hostPlatform.system == "aarch64-darwin" then + else if hostPlatform.system == "aarch64-darwin" then "ARM_NEON_ASIMD" - else if stdenv.hostPlatform.system == "aarch64-linux" then + else if hostPlatform.system == "aarch64-linux" then "ARM_NEON_ASIMD" else "None"; @@ -61,12 +64,12 @@ let }; in -stdenv.mkDerivation rec { +effectiveStdenv.mkDerivation (finalAttrs: { pname = "gromacs"; version = source.version; src = fetchurl { - url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${version}.tar.gz"; + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${finalAttrs.version}.tar.gz"; inherit (source) hash; }; @@ -74,13 +77,13 @@ stdenv.mkDerivation rec { # Fix pkg-config paths for the version-specific gromacs variant. (if enablePlumed then ./pkgconfig-2024.patch else ./pkgconfig-2025.patch) ] - ++ lib.optional enablePlumed ( + ++ lib.optionals enablePlumed [ # Backport gcc 15 cstdint include fix. - fetchpatch2 { + (fetchpatch2 { url = "https://gitlab.com/gromacs/gromacs/-/commit/e0180bc37f3111d7dcaffca3854c088ed910c3b4.diff"; hash = "sha256-TvTzfb/RETAzFpYfFFr6/L5GV1Pile16gVJhNigwAB4="; - } - ); + }) + ]; postPatch = lib.optionalString enablePlumed '' plumed patch -p -e gromacs-${source.version} @@ -95,7 +98,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ] - ++ lib.optional enablePlumed plumed + ++ lib.optionals enablePlumed [ plumed ] ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ]; buildInputs = [ @@ -105,48 +108,34 @@ stdenv.mkDerivation rec { blas lapack ] - ++ lib.optional enableMpi mpi + ++ lib.optionals enableMpi [ mpi ] ++ lib.optionals enableCuda [ cudaPackages.cuda_cccl cudaPackages.cuda_cudart cudaPackages.libcufft cudaPackages.cuda_profiler_api ] - ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; + ++ lib.optionals hostPlatform.isDarwin [ llvmPackages.openmp ]; - propagatedBuildInputs = lib.optional enableMpi mpi; - propagatedUserEnvPkgs = lib.optional enableMpi mpi; + propagatedBuildInputs = lib.optionals enableMpi [ mpi ]; + propagatedUserEnvPkgs = lib.optionals enableMpi [ mpi ]; cmakeFlags = [ (lib.cmakeBool "GMX_HWLOC" true) - "-DGMX_SIMD:STRING=${SIMD cpuAcceleration}" - "-DGMX_OPENMP:BOOL=TRUE" - "-DBUILD_SHARED_LIBS=ON" + (lib.cmakeFeature "GMX_SIMD" (SIMD cpuAcceleration)) + (lib.cmakeBool "GMX_OPENMP" true) + (lib.cmakeBool "BUILD_SHARED_LIBS" true) + + (lib.cmakeBool "GMX_DOUBLE" (!singlePrec)) + (lib.cmakeBool "GMX_DEFAULT_SUFFIX" singlePrec) + + (lib.cmakeBool "GMX_MPI" enableMpi) + ] + ++ lib.optionals enableMpi [ + (lib.cmakeBool "GMX_THREAD_MPI" false) ] - ++ ( - if singlePrec then - [ - "-DGMX_DOUBLE=OFF" - ] - else - [ - "-DGMX_DOUBLE=ON" - "-DGMX_DEFAULT_SUFFIX=OFF" - ] - ) - ++ ( - if enableMpi then - [ - "-DGMX_MPI:BOOL=TRUE" - "-DGMX_THREAD_MPI:BOOL=FALSE" - ] - else - [ - "-DGMX_MPI:BOOL=FALSE" - ] - ) ++ lib.optionals enableCuda [ - "-DGMX_GPU=CUDA" + (lib.cmakeFeature "GMX_GPU" "CUDA") (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cmakeCudaArchitecturesString) # Gromacs seems to ignore and override the normal variables, so we add this ad hoc: @@ -186,4 +175,4 @@ stdenv.mkDerivation rec { markuskowa ]; }; -} +}) diff --git a/pkgs/build-support/fetchurl/boot.nix b/pkgs/build-support/fetchurl/boot.nix index a950b9983329..a04716430153 100644 --- a/pkgs/build-support/fetchurl/boot.nix +++ b/pkgs/build-support/fetchurl/boot.nix @@ -1,14 +1,33 @@ let mirrors = import ./mirrors.nix; + inherit (builtins) + elemAt + head + isString + match + ; in { rewriteURL, system, }: - +let + handleUrl = + if rewriteURL == null then + url: url + else + url: + let + u = rewriteURL url; + in + if isString u then + u + else + throw "rewriteURL deleted the only URL passed to fetchurlBoot (was ${url})"; +in { - url ? builtins.head urls, + url ? head urls, urls ? [ ], sha256 ? "", hash ? "", @@ -31,15 +50,8 @@ import { # Handle mirror:// URIs. Since currently # supports only one URI, use the first listed mirror. let - url_ = - let - u = rewriteURL url; - in - if builtins.isString u then - u - else - throw "rewriteURL deleted the only URL passed to fetchurlBoot (was ${url})"; - m = builtins.match "mirror://([a-z]+)/(.*)" url_; + url_ = handleUrl url; + m = match "mirror://([a-z]+)/(.*)" url_; in - if m == null then url_ else builtins.head (mirrors.${builtins.elemAt m 0}) + (builtins.elemAt m 1); + if m == null then url_ else head (mirrors.${head m}) + (elemAt m 1); } diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 0d626d5783f9..b91d7a6f1c5d 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -11,6 +11,23 @@ }: let + defaultNativeBuildInputs = [ curl ]; + inherit (lib) + concatMap + elemAt + fakeHash + fakeSha256 + fakeSha512 + filter + hasPrefix + head + isList + isString + length + match + warn + ; + nixpkgsVersion = lib.trivial.release; mirrors = import ./mirrors.nix // { inherit hashedMirrors; @@ -60,14 +77,30 @@ let resolveUrl = url: let - mirrorSplit = lib.match "mirror://([[:alpha:]]+)/(.+)" url; - mirrorName = lib.head mirrorSplit; + mirrorSplit = match "mirror://([[:alpha:]]+)/(.+)" url; + mirrorName = head mirrorSplit; mirrorList = mirrors."${mirrorName}" or (throw "unknown mirror:// site ${mirrorName}"); in if mirrorSplit == null || mirrorName == null then [ url ] else - map (mirror: mirror + lib.elemAt mirrorSplit 1) mirrorList; + map (mirror: mirror + elemAt mirrorSplit 1) mirrorList; + + rewriteAllUrls = + urls: + if rewriteURL == null then + urls + else + let + u = concatMap ( + url: + let + rewritten = rewriteURL url; + in + if isString rewritten then [ rewritten ] else [ ] + ) urls; + in + if u == [ ] then throw "urls is empty after rewriteURL (was ${toString urls})" else u; impureEnvVars = lib.fetchers.proxyImpureEnvVars @@ -186,34 +219,18 @@ lib.extendMkDerivation { let preRewriteUrls = if urls != [ ] && url == "" then - ( - if lib.isList urls then urls else throw "`urls` is not a list: ${lib.generators.toPretty { } urls}" - ) + (if isList urls then urls else throw "`urls` is not a list: ${lib.generators.toPretty { } urls}") else if urls == [ ] && url != "" then ( - if lib.isString url then - [ url ] - else - throw "`url` is not a string: ${lib.generators.toPretty { } urls}" + if isString url then [ url ] else throw "`url` is not a string: ${lib.generators.toPretty { } urls}" ) else throw "fetchurl requires either `url` or `urls` to be set: ${lib.generators.toPretty { } args}"; - urls_ = - let - u = lib.lists.concatMap ( - url: - let - rewritten = rewriteURL url; - in - if lib.isString rewritten then [ rewritten ] else [ ] - ) preRewriteUrls; - in - if u == [ ] then throw "urls is empty after rewriteURL (was ${toString preRewriteUrls})" else u; + urls_ = rewriteAllUrls preRewriteUrls; hash_ = if - with lib.lists; length ( filter (s: s != "") [ hash @@ -255,15 +272,13 @@ lib.extendMkDerivation { else if cacert != null then { outputHashAlgo = null; - outputHash = lib.fakeHash; + outputHash = fakeHash; } else throw "fetchurl requires a hash for fixed-output derivation: ${lib.generators.toPretty { } urls_}"; - finalHashHasColon = lib.hasInfix ":" finalAttrs.hash; - finalHashColonMatch = lib.match "([^:]+)[:](.*)" finalAttrs.hash; - - resolvedUrl = lib.head (resolveUrl url); + finalHashHasColon = match ".*:.*" finalAttrs.hash != null; + finalHashColonMatch = match "([^:]+)[:](.*)" finalAttrs.hash; in derivationArgs @@ -278,11 +293,11 @@ lib.extendMkDerivation { else if name != null then name else - baseNameOf (toString (lib.head urls_)); + baseNameOf (toString (head urls_)); builder = ./builder.sh; - nativeBuildInputs = [ curl ] ++ nativeBuildInputs; + nativeBuildInputs = defaultNativeBuildInputs ++ nativeBuildInputs; urls = urls_; @@ -295,17 +310,17 @@ lib.extendMkDerivation { if hash_.outputHashAlgo == null || hash_.outputHash == "" - || lib.hasPrefix hash_.outputHashAlgo hash_.outputHash + || hasPrefix hash_.outputHashAlgo hash_.outputHash then hash_.outputHash else "${hash_.outputHashAlgo}:${hash_.outputHash}"; - outputHashAlgo = if finalHashHasColon then lib.head finalHashColonMatch else null; + outputHashAlgo = if finalHashHasColon then head finalHashColonMatch else null; outputHash = if finalAttrs.hash == "" then - lib.fakeHash + fakeHash else if finalHashHasColon then - lib.elemAt finalHashColonMatch 1 + elemAt finalHashColonMatch 1 else finalAttrs.hash; @@ -315,9 +330,9 @@ lib.extendMkDerivation { if ( hash_.outputHash == "" - || hash_.outputHash == lib.fakeSha256 - || hash_.outputHash == lib.fakeSha512 - || hash_.outputHash == lib.fakeHash + || hash_.outputHash == fakeSha256 + || hash_.outputHash == fakeSha512 + || hash_.outputHash == fakeHash || netrcPhase != null ) then @@ -328,8 +343,8 @@ lib.extendMkDerivation { outputHashMode = if (recursiveHash || executable) then "recursive" else "flat"; curlOpts = - if lib.isList curlOpts then - lib.warn ( + if isList curlOpts then + warn ( let url = toString (builtins.head urls_); curlOptsRepresentation = lib.generators.toPretty { multiline = false; } curlOpts; @@ -360,13 +375,14 @@ lib.extendMkDerivation { impureEnvVars = impureEnvVars ++ netrcImpureEnvVars; - nixpkgsVersion = lib.trivial.release; + inherit nixpkgsVersion; inherit preferLocalBuild; inherit meta; passthru = { - inherit url resolvedUrl; + inherit url; + resolvedUrl = head (resolveUrl url); } // passthru; }; diff --git a/pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh b/pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh index 5cafdd6d1d8b..38f6eb97b56b 100644 --- a/pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh +++ b/pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh @@ -71,12 +71,13 @@ pnpmConfigHook() { pnpm config set package-import-method clone-or-copy echo "Installing dependencies" - if [[ -n "$pnpmWorkspaces" ]]; then - local IFS=" " - for ws in $pnpmWorkspaces; do - pnpmInstallFlags+=("--filter=$ws") - done - fi + + local -a pnpmWorkspacesArray + concatTo pnpmWorkspacesArray pnpmWorkspaces + + for ws in "${pnpmWorkspacesArray[@]}"; do + pnpmInstallFlags+=("--filter=$ws") + done runHook prePnpmInstall diff --git a/pkgs/build-support/testers/lychee.nix b/pkgs/build-support/testers/lychee.nix index 493ef3e880f9..eb2ddef13152 100644 --- a/pkgs/build-support/testers/lychee.nix +++ b/pkgs/build-support/testers/lychee.nix @@ -7,7 +7,7 @@ deps@{ writeShellApplication, }: let - inherit (lib) mapAttrsToList throwIf; + inherit (lib) mapAttrsToList optionalString throwIf; inherit (lib.strings) hasInfix hasPrefix escapeNixString; toURL = @@ -34,6 +34,7 @@ let lycheeLinkCheck = { site, + relocatable ? null, remap ? { }, lychee ? deps.lychee, extraConfig ? { }, @@ -55,6 +56,11 @@ let inherit lychee remap; config = { include_fragments = "full"; + root_dir = + if relocatable == false then + finalAttrs.site + else + "/root-relative-links-are-forbidden-use-relative-links"; } // lib.optionalAttrs (finalAttrs.passthru.remap != { }) { remap = mapAttrsToList ( @@ -62,6 +68,9 @@ let ) finalAttrs.passthru.remap; } // extraConfig; + # NOTE: The online wrapper does not implement the relocatable hint message. + # It uses the same configFile (with the fake root_dir), so root-relative + # links still fail, but without the custom explanation. online = writeShellApplication { name = "run-lychee-online"; runtimeInputs = [ finalAttrs.passthru.lychee ]; @@ -77,7 +86,33 @@ let }; buildCommand = '' echo Checking internal links on $site - lychee --offline --config $configFile "''${extraArgs[@]}" $site + rc=0 + lychee --offline --config $configFile "''${extraArgs[@]}" $site 2>&1 | tee lychee.log || rc="''${PIPESTATUS[0]}" + ${optionalString (relocatable != false) '' + if [ "$rc" -ne 0 ] && grep -qF "[ERROR] file:///root-relative-links-are-forbidden" lychee.log; then + echo + ${ + if relocatable == null then + '' + echo "❄️ ⚠️ Your site contains root-relative links (starting with '/')." + echo "Please set the relocatable parameter in lycheeLinkCheck:" + echo " - relocatable = true: root-relative links are forbidden because they" + echo " break when the site is served from a subpath or opened via file:// URLs." + echo " - relocatable = false: root-relative links are allowed because the" + echo " site is always served from the root." + '' + else + '' + echo "❄️ ⚠️ Root-relative links (starting with '/') are not allowed because this" + echo "site is marked as relocatable (relocatable = true)." + '' + } + echo "See https://nixos.org/manual/nixpkgs/unstable/#tester-lycheeLinkCheck-param-relocatable" + fi + ''} + if [ "$rc" -ne 0 ]; then + exit "$rc" + fi touch $out ''; }); diff --git a/pkgs/by-name/_6/_64gram/package.nix b/pkgs/by-name/_6/_64gram/package.nix index fbc065a082ea..0e3db0701cb7 100644 --- a/pkgs/by-name/_6/_64gram/package.nix +++ b/pkgs/by-name/_6/_64gram/package.nix @@ -10,13 +10,13 @@ telegram-desktop.override { inherit withWebkit; unwrapped = telegram-desktop.unwrapped.overrideAttrs (old: rec { pname = "64gram-unwrapped"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "TDesktop-x64"; repo = "tdesktop"; tag = "v${version}"; - hash = "sha256-C3DpwMF+0P2YKLG+USZMrBqRmfTSoF82YPMAgj33L+Y="; + hash = "sha256-qT7GQCqIaEZmbtFeoWMChUX6J8uqs/+UZYi0YoBIYDY="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/au/autotier/package.nix b/pkgs/by-name/au/autotier/package.nix index 0f6acdfc068a..77a5eb87119f 100644 --- a/pkgs/by-name/au/autotier/package.nix +++ b/pkgs/by-name/au/autotier/package.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/45Drives/autotier"; description = "Passthrough FUSE filesystem that intelligently moves files between storage tiers based on frequency of use, file age, and tier fullness"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ philipwilk ]; + maintainers = with lib.maintainers; [ jadewilk ]; mainProgram = "autotier"; # cli, for file system use autotierfs platforms = lib.platforms.linux; # uses io_uring so only available on linux not unix }; diff --git a/pkgs/by-name/be/beekeeper-studio/package.nix b/pkgs/by-name/be/beekeeper-studio/package.nix index 92adbc36c79e..c5da0de573aa 100644 --- a/pkgs/by-name/be/beekeeper-studio/package.nix +++ b/pkgs/by-name/be/beekeeper-studio/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "beekeeper-studio"; - version = "5.7.3"; + version = "5.8.1"; src = let @@ -54,10 +54,10 @@ stdenv.mkDerivation (finalAttrs: { fetchurl { url = "https://github.com/beekeeper-studio/beekeeper-studio/releases/download/v${finalAttrs.version}/${asset}"; hash = selectSystem { - x86_64-linux = "sha256-uaJvoYOREflJlGGyrBT0oNuJF8qPpsPCkup8GXvJ2Bo="; - aarch64-linux = "sha256-/QtR9806c7Q03Nvp6/WAKD+lIDI/RDePdLdc9Kqeb0w="; - x86_64-darwin = "sha256-KRB0wyIHnIrbr7Wruz8PdTEWWYNQuiz9F+k/LFZAJno="; - aarch64-darwin = "sha256-Rjhk5JqPayAbnDKH2RQtH/LTUmm5WwVvwGYD4mANvOs="; + x86_64-linux = "sha256-e5y7uBzdbDSUQKpxRjho+2kU3wx23spdSv1PwmJ30gA="; + aarch64-linux = "sha256-iuZDeSYljiSRUqtLIA1BcrRaYoqg9dnlbRDLsetVkMQ="; + x86_64-darwin = "sha256-7iW40NPAU4C+gDZb7YmGFmTOnmg5V/yb9+6EW6MlyXU="; + aarch64-darwin = "sha256-Jnm4Vfm9+6dXmjnI5gYpYW1g7Anl9xhIKXbQA2SGUDE="; }; }; diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index dec25773ddc9..3dfd2513b7ee 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -9,7 +9,6 @@ fetchFromGitHub, gnome-keyring, jq, - llvmPackages_18, makeDesktopItem, makeWrapper, nix-update-script, @@ -25,13 +24,8 @@ let description = "Secure and free password manager for all of your devices"; icon = "bitwarden"; electron = electron_39; - - # argon2 npm dependency is using `std::basic_string`, which is no longer allowed in LLVM 19 - buildNpmPackage' = buildNpmPackage.override { - stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv; - }; in -buildNpmPackage' rec { +buildNpmPackage rec { pname = "bitwarden-desktop"; version = "2026.5.0"; @@ -153,7 +147,8 @@ buildNpmPackage' rec { npm exec electron-builder -- \ --dir \ -c.electronDist=electron-dist \ - -c.electronVersion=${electron.version} + -c.electronVersion=${electron.version} \ + ${lib.optionalString stdenv.hostPlatform.isDarwin "-c.mac.identity=null"} popd ''; diff --git a/pkgs/by-name/bl/blast/package.nix b/pkgs/by-name/bl/blast/package.nix index e838649f517e..7096ef83ed36 100644 --- a/pkgs/by-name/bl/blast/package.nix +++ b/pkgs/by-name/bl/blast/package.nix @@ -11,6 +11,7 @@ coreutils, curl, sqlite, + llvmPackages, }: stdenv.mkDerivation (finalAttrs: { pname = "blast"; @@ -103,6 +104,9 @@ stdenv.mkDerivation (finalAttrs: { zlib bzip2 sqlite + ] + ++ lib.optionals stdenv.isDarwin [ + llvmPackages.openmp ]; strictDeps = true; @@ -128,9 +132,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://blast.ncbi.nlm.nih.gov/Blast.cgi"; license = lib.licenses.publicDomain; - # Version 2.10.0 fails on Darwin - # See https://github.com/NixOS/nixpkgs/pull/61430 - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ [ "aarch64-darwin" ]; maintainers = with lib.maintainers; [ luispedro mulatta diff --git a/pkgs/by-name/bo/bolt-launcher/package.nix b/pkgs/by-name/bo/bolt-launcher/package.nix index 8c063c22c932..d1e0ff92eee9 100644 --- a/pkgs/by-name/bo/bolt-launcher/package.nix +++ b/pkgs/by-name/bo/bolt-launcher/package.nix @@ -42,14 +42,14 @@ in let bolt = stdenv.mkDerivation (finalAttrs: { pname = "bolt-launcher"; - version = "0.21.1"; + version = "0.22.0"; src = fetchFromCodeberg { owner = "AdamCake"; repo = "Bolt"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-yrfTKrzwglCkPveKEiT1WRBLAVxiFsHaj6984QY2ZJ8="; + hash = "sha256-ncmyDav2CmsdDE/nCRmpWuBqutX72vD5/zNO1nvJIlE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/c2/c2fmzq/package.nix b/pkgs/by-name/c2/c2fmzq/package.nix index f9205130ddee..f281bf221466 100644 --- a/pkgs/by-name/c2/c2fmzq/package.nix +++ b/pkgs/by-name/c2/c2fmzq/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "c2FmZQ"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "c2FmZQ"; repo = "c2FmZQ"; rev = "v${finalAttrs.version}"; - hash = "sha256-O4/V8fFiTfqTiJWPwEsdigdeKBmwGGo43ZvJXPcVRlE="; + hash = "sha256-qIJnrMqsaa7GcsJpyWHhi6nea72XCQy5BaGWBtQKzFo="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/c2FmZQ"; - vendorHash = "sha256-B1kHtDHnviU60WEfmASMX69nyEepeeBdMZVtbcmZ9z4="; + vendorHash = "sha256-hJHnbG/NlhibY8e59hk0u5vi50x4s4mH/awPdCRkDFk="; subPackages = [ "c2FmZQ-client" diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix index 003514ae76e8..b09d09b28d4b 100644 --- a/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -13,17 +13,17 @@ let pname = "clash-verge-rev"; # Please keep service version in sync - version = "2.4.7"; + version = "2.5.1"; src = fetchFromGitHub { owner = "clash-verge-rev"; repo = "clash-verge-rev"; tag = "v${version}"; - hash = "sha256-Jw9GXD0RFFPkqhJuNZaooxIHVDt1ti0a4g863jIwtkY="; + hash = "sha256-2X2QlWo12qM7RT0wjf1Xlmh3We2wZR/kJnSxIxVst9Y="; }; - pnpm-hash = "sha256-2iGCe9LmH99hVOWEWkDy7/XH4r/Jlr8rzL5FrCRpn3Q="; - vendor-hash = "sha256-EHsGCrphP6SRQ04Q0sIh8CmzMwbvqDQeiL44ItBGIaM="; + pnpm-hash = "sha256-JvY7olf1OOQ+j/z7hFEcmum24WlPggrur3K8cTEgc7g="; + vendor-hash = "sha256-nF9d1OWpn3rf4EPhD4vqQbKEp/J5pc7J7XJDgAjd0DA="; service = callPackage ./service.nix { inherit diff --git a/pkgs/by-name/cl/clash-verge-rev/service.nix b/pkgs/by-name/cl/clash-verge-rev/service.nix index a79eeadb65f3..49dad0962642 100644 --- a/pkgs/by-name/cl/clash-verge-rev/service.nix +++ b/pkgs/by-name/cl/clash-verge-rev/service.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "clash-verge-service-ipc"; - version = "2.1.3"; + version = "2.3.0"; src = fetchFromGitHub { owner = "clash-verge-rev"; repo = "clash-verge-service-ipc"; # upstream uses branch - rev = "a486e7df6ac3d641014085f43bd08e99ff09b5a2"; - hash = "sha256-WmQ3s6uED4Q1E2ORtjDqdxaUaPD+RIB5x8bYPOuGUSk="; + rev = "21e661fa141e5ad3c705ee4cdb86efff8df6f769"; + hash = "sha256-XavlZWxuZKCTyIYpuXRvXpXCdakWhbLhOMmOrGBgDRo="; }; patches = [ @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ./patch-service-directory.patch ]; - cargoHash = "sha256-xE8ihRlox7qrmLHEGQ76pbisFj+1bqjwr+tllxLRDoA="; + cargoHash = "sha256-WhH2o5wN5vYW8jZl+hWbnk1xqHu61ibAr4+/CI3YKHg="; buildFeatures = [ "standalone" @@ -34,9 +34,9 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeCheckInputs = [ procps ]; - # build mock_binary for tests + # build test helper binaries for tests preCheck = '' - cargo build --features=test + cargo build --features=standalone,test ''; checkFeatures = [ "standalone" diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json index a113b33e702d..5521b16d66fc 100644 --- a/pkgs/by-name/cl/claude-code/manifest.json +++ b/pkgs/by-name/cl/claude-code/manifest.json @@ -1,47 +1,47 @@ { - "version": "2.1.170", - "commit": "1cda84def004ef3a8f569f8e8284a153a6b98c3a", - "buildDate": "2026-06-09T15:22:30Z", + "version": "2.1.172", + "commit": "1b719ca2781a2dccc4a769b66bc35b4a60509ad7", + "buildDate": "2026-06-10T16:38:17Z", "platforms": { "darwin-arm64": { "binary": "claude", - "checksum": "e903646d8b7a31882a80ecd27569a27d8ac57b3708745f349709632c84117fdf", - "size": 222102816 + "checksum": "3c31f345575bf6f261c7e19981f6491bb93eeb0ffb499e95033610a7184831ce", + "size": 223390752 }, "darwin-x64": { "binary": "claude", - "checksum": "914f23a70bbed5d9ae567e3e04b86206ed9971b371bc9baca3f79c8885bfddb4", - "size": 224616976 + "checksum": "c507f98750c5230e4247f7eadff38e4db04c006904f85379e31c5d5e82e1c384", + "size": 225892528 }, "linux-arm64": { "binary": "claude", - "checksum": "1bb9d032440a75532f7dd4cafbc687f220aaf16c63eba17e192dfbec2f04bd25", - "size": 247379592 + "checksum": "4ef0d735bd4180c3bffc381f6dc38df979229a8637d294be751c6043d93d12e1", + "size": 248624776 }, "linux-x64": { "binary": "claude", - "checksum": "849e007277a0442ab27570d3e3d6d43787507946590e8dd1947e5a39b7081f9e", - "size": 247469776 + "checksum": "c0915dd1691d569aeebc7978b12e029718323685ec0dd4b5c6a453108d6be1f7", + "size": 248743632 }, "linux-arm64-musl": { "binary": "claude", - "checksum": "73154fd674aaf233254edea8fbfb6a53d82d5297ae7546b998e36983def4dddc", - "size": 240234328 + "checksum": "6b10aad4270348175206bd2475f82ef3c56007dfb55d7b90f1950dfa8fb9eb40", + "size": 241479512 }, "linux-x64-musl": { "binary": "claude", - "checksum": "5d19b7c91a03182ccb69da249f721684aebecfa4c52fe46b9205a81d8fc64a47", - "size": 241863728 + "checksum": "58f2c60711f95e51d86d1af5b915cbdd0458710f1830b7c26d59b78f1ad1f861", + "size": 243153968 }, "win32-x64": { "binary": "claude.exe", - "checksum": "193061508fe619abf534b2c9d48151f26971d1d5b8460ad75c0af4be3d3525fb", - "size": 242929824 + "checksum": "07132ca4bbef551c92c1ae6ca0220a5e523092c9fa9cf402f65f428450687455", + "size": 244181152 }, "win32-arm64": { "binary": "claude.exe", - "checksum": "9abd330bcc191aecc877a8ee9da2b448852cfe3bda15e5e4608385ea1d9d1709", - "size": 238894240 + "checksum": "1e3e165c03de2af83c1e3516b73890b56e9785a2382338adcc28f41918bf4d2f", + "size": 240146080 } } } diff --git a/pkgs/by-name/cl/clipse/package.nix b/pkgs/by-name/cl/clipse/package.nix index 1e9d95a2f3eb..07920fd3aa08 100644 --- a/pkgs/by-name/cl/clipse/package.nix +++ b/pkgs/by-name/cl/clipse/package.nix @@ -2,26 +2,84 @@ lib, buildGoModule, fetchFromGitHub, + stdenv, + enableWayland ? stdenv.hostPlatform.isLinux, + enableX11 ? false, + libpng, + libx11, + libxi, + libxkbcommon, + libxtst, + pkg-config, + xclip, + xinput, + xkbcomp, + xkbutils, + xsel, }: +assert lib.assertMsg ( + stdenv.hostPlatform.isLinux -> (lib.xor enableX11 enableWayland) +) "Exactly one of enableWayland, enableX11 must be true"; + buildGoModule (finalAttrs: { - pname = "clipse"; - version = "1.1.0"; + pname = "clipse${lib.optionalString enableX11 "-x11"}"; + version = "1.2.1"; src = fetchFromGitHub { owner = "savedra1"; repo = "clipse"; - rev = "v${finalAttrs.version}"; - hash = "sha256-yUkHT7SZT7Eudvk1n43V+WGWqUKtXaV+p4ySMK/XzQw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-iDMHEhYuxspBYG54WivnVj2GfMxAc5dcrjNxtAMhsck="; }; - vendorHash = "sha256-+9uoB/1g4qucdM8RJRs+fSc5hpcgaCK0GrUOFgHWeKo="; + strictDeps = true; + __structuredAttrs = true; + + vendorHash = "sha256-LxwST4Zjxq6Fwc47VeOdv19J3g/DHZ7Fywp2ZvVR06I="; + + tags = + if stdenv.hostPlatform.isDarwin then + [ "darwin" ] + else if enableWayland then + [ "wayland" ] + else if enableX11 then + [ "linux" ] + else + [ ]; + + env = { + CGO_ENABLED = if enableX11 || stdenv.hostPlatform.isDarwin then "1" else "0"; + }; + + nativeBuildInputs = lib.optionals enableX11 [ + pkg-config + ]; + + buildInputs = lib.optionals enableX11 [ + libpng + libx11 + libxi + libxkbcommon + libxtst + xclip + xinput + xkbcomp + xkbutils + xsel + ]; + + proxyVendor = true; meta = { + changelog = "https://github.com/savedra1/clipse/blob/main/CHANGELOG.md"; description = "Useful clipboard manager TUI for Unix"; homepage = "https://github.com/savedra1/clipse"; license = lib.licenses.mit; mainProgram = "clipse"; - maintainers = [ lib.maintainers.savedra1 ]; + maintainers = with lib.maintainers; [ + magicquark + savedra1 + ]; }; }) diff --git a/pkgs/by-name/cl/cloud-nuke/package.nix b/pkgs/by-name/cl/cloud-nuke/package.nix index e49e37df88e3..90aabe017b46 100644 --- a/pkgs/by-name/cl/cloud-nuke/package.nix +++ b/pkgs/by-name/cl/cloud-nuke/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "cloud-nuke"; - version = "0.50.0"; + version = "0.51.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "cloud-nuke"; tag = "v${finalAttrs.version}"; - hash = "sha256-I7MR2cF8ZyI8FTNGcLPMj5cZ2D9aTpK0+FdCuCPCfJU="; + hash = "sha256-tJi3SFBp/zuBB+0S0IOIWqvZRWdlSyJra8K4meJHXnY="; }; vendorHash = "sha256-1DMwVJvr3zU96yAV2Vb4v58VNt7xg9dLCH7XGEMopjQ="; diff --git a/pkgs/by-name/co/coc-clangd/package.nix b/pkgs/by-name/co/coc-clangd/package.nix index 0df893d8d5ae..9dce28970af3 100644 --- a/pkgs/by-name/co/coc-clangd/package.nix +++ b/pkgs/by-name/co/coc-clangd/package.nix @@ -7,16 +7,16 @@ buildNpmPackage { pname = "coc-clangd"; - version = "0-unstable-2026-05-11"; + version = "0-unstable-2026-06-02"; src = fetchFromGitHub { owner = "clangd"; repo = "coc-clangd"; - rev = "66f32d29cf40417978514550db1c9a144c5d9f4f"; - hash = "sha256-rJ6e7xX8H3aN17PzG77W4iNh7xbQdn6Xz+D+4y57FLE="; + rev = "93926afd0beb4ac9beabddbac8b14743e2762fa9"; + hash = "sha256-03VgcaJ+EZmRXxKcWaHO9kVb9dmIGI30CiJNDkjp3CY="; }; - npmDepsHash = "sha256-Ypda0+PSYHPg8FK5sJYQkQbHEK1WTn9BoCjaJEGv6cQ="; + npmDepsHash = "sha256-YoFfBQjWvJZ1Xj9dkNmtb7jZI43eFf9O/WZDwOBejdo="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/co/coc-cmake/package.nix b/pkgs/by-name/co/coc-cmake/package.nix deleted file mode 100644 index 303a1f73fef2..000000000000 --- a/pkgs/by-name/co/coc-cmake/package.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - lib, - stdenv, - nodejs, - pnpm_8, - fetchPnpmDeps, - pnpmConfigHook, - fetchFromGitHub, - npmHooks, -}: -stdenv.mkDerivation (finalAttrs: { - pname = "coc-cmake"; - version = "0-unstable-2024-10-21"; - - src = fetchFromGitHub { - owner = "voldikss"; - repo = "coc-extensions"; - rev = "69c81e04fd3350bb75b09232d8ccf26d20075111"; - hash = "sha256-VZRHpy0OTmoQyOEa0vIJl/VkV52r0HEtTzY1fjr6yQ0="; - }; - - pnpmDeps = fetchPnpmDeps { - inherit (finalAttrs) - pname - version - src - pnpmWorkspaces - ; - pnpm = pnpm_8; - fetcherVersion = 3; - hash = "sha256-h/ND/665MpcPaDIR1Bb5iPrHmoNysr9vuFk1I0fFP34="; - }; - - pnpmWorkspaces = [ "coc-cmake" ]; - - nativeBuildInputs = [ - nodejs - pnpmConfigHook - pnpm_8 - ]; - - buildPhase = '' - runHook preBuild - - pnpm run build coc-cmake - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/lib/node_modules - mv packages/coc-cmake $out/lib/node_modules/coc-cmake - mv node_modules/.pnpm/ $out/lib/node_modules/.pnpm - runHook postInstall - ''; - - meta = { - homepage = "https://github.com/voldikss/coc-extensions"; - license = lib.licenses.mit; - }; -}) diff --git a/pkgs/by-name/co/codebuff/package-lock.json b/pkgs/by-name/co/codebuff/package-lock.json index ccc934038cdb..1de7560f441a 100644 --- a/pkgs/by-name/co/codebuff/package-lock.json +++ b/pkgs/by-name/co/codebuff/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "codebuff": "^1.0.674" + "codebuff": "^1.0.680" } }, "node_modules/@isaacs/fs-minipass": { @@ -30,9 +30,9 @@ } }, "node_modules/codebuff": { - "version": "1.0.674", - "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.674.tgz", - "integrity": "sha512-xzsFsB2E/En+pPxIGKcA4V1Yc4ObVe9s3NXW1FQA/KYeTaGUp3IKIS49wp1pQ+rCjaQHkb8YCSrb7Zxq/DNmKg==", + "version": "1.0.680", + "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.680.tgz", + "integrity": "sha512-+HrrSchE7wsAQNcq5yJfL4YygOf+ng3T9S3yF+FZFVfnT29KVXSoar5mdRmzsVFNGjHZKc9I+kqt0dEO01G9Ow==", "cpu": [ "x64", "arm64" diff --git a/pkgs/by-name/co/codebuff/package.nix b/pkgs/by-name/co/codebuff/package.nix index 9a56657fcce1..d29736373447 100644 --- a/pkgs/by-name/co/codebuff/package.nix +++ b/pkgs/by-name/co/codebuff/package.nix @@ -6,16 +6,16 @@ buildNpmPackage (finalAttrs: { pname = "codebuff"; - version = "1.0.674"; + version = "1.0.680"; src = fetchzip { url = "https://registry.npmjs.org/codebuff/-/codebuff-${finalAttrs.version}.tgz"; - hash = "sha256-dWOeqO55A0ZyZyFgtl+aSXeD2EiQBoGPuqaecfgKNaY="; + hash = "sha256-glsZk5q+Qd2NbMk/jIXklCHf9MSSqkMN67d7k1fuzlk="; }; strictDeps = true; - npmDepsHash = "sha256-xFtWLqpzRdXN+JO2ueKqRWe/GaNE1yb2LFrFvAETcBU="; + npmDepsHash = "sha256-+HZN4oal+Bn7uKfWrWd/eDRvuAPvRKlGO4ThFamNZCI="; postPatch = '' cp ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/co/cook-cli/package.nix b/pkgs/by-name/co/cook-cli/package.nix index e441de418fe3..bf30ba429f59 100644 --- a/pkgs/by-name/co/cook-cli/package.nix +++ b/pkgs/by-name/co/cook-cli/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cook-cli"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "cooklang"; repo = "cookcli"; rev = "v${finalAttrs.version}"; - hash = "sha256-UwO/pdop4grOuVEq0pSt9DXEQLCXKFrm9HhfQISdBXg="; + hash = "sha256-rn+V93QWeVH0A6SpnFLGYu12BJX9t0vQGdZzZZUDxvM="; }; - cargoHash = "sha256-VobG+Ux56TNM3U2Y51/x59rpg27b2FZXTqpRcKttCEc="; + cargoHash = "sha256-ZndjB2dE8Pgep1Yog4+yxoJbaZtTUlnwFJMpPqS+CwY="; # Build without the self-updating feature buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix b/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix index 299d3a72123a..ba9454b052d6 100644 --- a/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix +++ b/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage { pname = "cosmic-ext-applet-caffeine"; - version = "0-unstable-2026-04-18"; + version = "0-unstable-2026-06-03"; src = fetchFromGitHub { owner = "tropicbliss"; repo = "cosmic-ext-applet-caffeine"; - rev = "96f7be5de71a460b9c26ec024bb8089208ad991f"; - hash = "sha256-wdsm6snDY61+sJfzKkLDGVbAm5mC0lWDCTlDdImTwO8="; + rev = "e427a1a903fd612a09477d0e90bd4aed4a494a08"; + hash = "sha256-nsO6UMW9T2wHtpcuZNm6VB7PMsqdiNUxKrU2K9/VYV4="; }; cargoHash = "sha256-9EUrO8JNU0FPrqT6WDE+jfVgQSgODK8rbNZLgUb26EQ="; diff --git a/pkgs/by-name/cr/crossplane-cli/package.nix b/pkgs/by-name/cr/crossplane-cli/package.nix index baab6787e778..fad2199fe069 100644 --- a/pkgs/by-name/cr/crossplane-cli/package.nix +++ b/pkgs/by-name/cr/crossplane-cli/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "crossplane-cli"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "crossplane"; repo = "cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-E1Dp0ovC2FWwsrSvhVWudHXxke2z2nCg0q8CVDg58/Y="; + hash = "sha256-9BlNhllLz4LHPMy6gkph5flztQZBHI1tIMlNa22YPh4="; }; - vendorHash = "sha256-uGQ1lrj+V0ndnTJTKtN6GLGLv89RPDb/Vuo58XYqV8M="; + vendorHash = "sha256-NHLryreDHxrqjo8VHR9R/MD8tDXYaZYyqgulxPOKUyA="; ldflags = [ "-s" diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix index 6aee4f3613c5..91cff5b1404e 100644 --- a/pkgs/by-name/cu/cubeb/package.nix +++ b/pkgs/by-name/cu/cubeb/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cubeb"; - version = "0-unstable-2026-05-27"; + version = "0-unstable-2026-06-09"; src = fetchFromGitHub { owner = "mozilla"; repo = "cubeb"; - rev = "7e6ad0ce1bf7b9deb9d360ff23bdfd22118cc536"; - hash = "sha256-ZGyf/z+tpdwx5VcLkTVF59E86rYPWe/RbNj/kptN++0="; + rev = "b18d6992feeb7d4c4a0992257c85d96d761e68d2"; + hash = "sha256-H5ehdZ3PmH8VcBns7h8KsmsAjRVJqS7TSTeUwW/ucTM="; }; outputs = [ diff --git a/pkgs/by-name/dd/ddccontrol-db/package.nix b/pkgs/by-name/dd/ddccontrol-db/package.nix index c76b64421136..127aa8371c6f 100644 --- a/pkgs/by-name/dd/ddccontrol-db/package.nix +++ b/pkgs/by-name/dd/ddccontrol-db/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ddccontrol-db"; - version = "20260518"; + version = "20260610"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol-db"; tag = finalAttrs.version; - sha256 = "sha256-/QAOeL1FruxklcWQfoysO1+WzCJB5v/wi81spO6V/Y8="; + sha256 = "sha256-/3TWnBHPP3SyrsVcxiVkHxPITZDqQPF7HaMIaVnCT4M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/df/dfmt/package.nix b/pkgs/by-name/df/dfmt/package.nix index fc12e574dd4a..3265102e8b76 100644 --- a/pkgs/by-name/df/dfmt/package.nix +++ b/pkgs/by-name/df/dfmt/package.nix @@ -1,25 +1,29 @@ { lib, - python3, + python3Packages, fetchPypi, }: -let - inherit (python3.pkgs) - buildPythonApplication - pythonOlder - ; -in -buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "dfmt"; version = "1.2.0"; - format = "setuptools"; + pyproject = true; + + build-system = [ + python3Packages.poetry-core + ]; src = fetchPypi { - inherit pname version; - sha256 = "7af6360ca8d556f1cfe82b97f03b8d1ea5a9d6de1fa3018290c844b6566d9d6e"; + inherit (finalAttrs) pname version; + hash = "sha256-evY2DKjVVvHP6CuX8DuNHqWp1t4fowGCkMhEtlZtnW4="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'poetry.masonry.api' 'poetry.core.masonry.api' \ + --replace-fail 'poetry>=' 'poetry-core>=' \ + ''; + meta = { description = "Format paragraphs, comments and doc strings"; mainProgram = "dfmt"; @@ -27,4 +31,4 @@ buildPythonApplication rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ cole-h ]; }; -} +}) diff --git a/pkgs/by-name/di/discount/package.nix b/pkgs/by-name/di/discount/package.nix index 528697595f60..9816bffee910 100644 --- a/pkgs/by-name/di/discount/package.nix +++ b/pkgs/by-name/di/discount/package.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "3.0.1.2"; + version = "3.0.1.3"; pname = "discount"; src = fetchFromGitHub { owner = "Orc"; repo = "discount"; rev = "v${finalAttrs.version}"; - hash = "sha256-QZmbc3imBlQmFgTjtepEx2HqsfW93yqqUy0LN5WWKwM="; + hash = "sha256-b3cC/dWfhkuYSPGmuJIiAcvEdN5KAMjPYeit1lr546o="; }; patches = [ ./fix-configure-path.patch ]; diff --git a/pkgs/by-name/el/eliza/package.nix b/pkgs/by-name/el/eliza/package.nix index 419a2d45e71b..b7395a64a197 100644 --- a/pkgs/by-name/el/eliza/package.nix +++ b/pkgs/by-name/el/eliza/package.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "eliza"; - version = "0-unstable-2026-03-28"; + version = "0-unstable-2026-06-09"; src = fetchFromGitHub { owner = "anthay"; repo = "ELIZA"; - rev = "626ce3881a0a6b54c56ce3efa87623e0a1dc8dfb"; - hash = "sha256-8AEOmMM/gN3khe+c8GQOcOartyOr06T7F6853e9fUto="; + rev = "ed26676c8903892945c549ae58722c4d355555b0"; + hash = "sha256-M2Qy+QeBPkQNx9hn2FZ2d5cUh532e+C/x8EJSgntO9Q="; }; doCheck = true; diff --git a/pkgs/by-name/fa/fairywren/package.nix b/pkgs/by-name/fa/fairywren/package.nix index bfdc32bca920..26cdc5f0578f 100644 --- a/pkgs/by-name/fa/fairywren/package.nix +++ b/pkgs/by-name/fa/fairywren/package.nix @@ -22,13 +22,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2026-05-30"; + version = "0-unstable-2026-05-31"; src = fetchFromGitLab { owner = "FreshDoctor"; repo = "FairyWren-Icons"; - rev = "1c5df6752220e7dd1dcf6f08974234785cd0edb6"; - hash = "sha256-CD5m/juhC40Hg2rh1n5WfbukRW3TueXXQb4oYUHHVs4="; + rev = "8037795e0b9075bc2b00b0a0bf350d633ac93897"; + hash = "sha256-rBtCdO163tNMM6iCnjts9Ut2hhZ4e3ZYnpCv4BykCms="; }; propagatedBuildInputs = [ diff --git a/pkgs/by-name/gr/grpc-health-probe/package.nix b/pkgs/by-name/gr/grpc-health-probe/package.nix index f798e318a865..232eee138ffb 100644 --- a/pkgs/by-name/gr/grpc-health-probe/package.nix +++ b/pkgs/by-name/gr/grpc-health-probe/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "grpc-health-probe"; - version = "0.4.51"; + version = "0.4.52"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-health-probe"; rev = "v${finalAttrs.version}"; - hash = "sha256-F8vwgygsJNcQqDcw4QQ0BmAEH1t83Ri9NBsXj7bcpqU="; + hash = "sha256-NbC2W76p9Ph6ZdCRCylMqqPzNO7/jq1WbCW+ly/jKAM="; }; tags = [ diff --git a/pkgs/by-name/ha/hayagriva/package.nix b/pkgs/by-name/ha/hayagriva/package.nix index ba23f539917f..d37bc01d8004 100644 --- a/pkgs/by-name/ha/hayagriva/package.nix +++ b/pkgs/by-name/ha/hayagriva/package.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hayagriva"; - version = "0.9.1"; + version = "0.10.0"; src = fetchCrate { inherit (finalAttrs) version; pname = "hayagriva"; - hash = "sha256-9PGo/TPk5QuiVoa5wUGyHufW/VaxqhinxS+u2JMPZBY="; + hash = "sha256-bVyorGygr8T58qarpXiRtAwSFSf0nPttS5QNY2Y7tLs="; }; - cargoHash = "sha256-Ectd93B2yn/fn+N86LxGbUvtENsgjXTSCg06lHM8Xi0="; + cargoHash = "sha256-gqDxSj6paQOlH9ZoiWa5RRelsvr7QOZXWYJSNK2uHj0="; buildFeatures = [ "cli" ]; diff --git a/pkgs/by-name/hd/hddfancontrol/package.nix b/pkgs/by-name/hd/hddfancontrol/package.nix index 089dd611b092..8822ea5a6d98 100644 --- a/pkgs/by-name/hd/hddfancontrol/package.nix +++ b/pkgs/by-name/hd/hddfancontrol/package.nix @@ -66,7 +66,7 @@ rustPlatform.buildRustPackage (finalAttrs: { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ benley - philipwilk + jadewilk ]; mainProgram = "hddfancontrol"; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/hi/highscore-mgba/package.nix b/pkgs/by-name/hi/highscore-mgba/package.nix index c8cff0f59554..e6befe614e7d 100644 --- a/pkgs/by-name/hi/highscore-mgba/package.nix +++ b/pkgs/by-name/hi/highscore-mgba/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation { pname = "highscore-mgba"; - version = "0-unstable-2026-05-21"; + version = "0-unstable-2026-06-02"; src = fetchFromGitHub { owner = "highscore-emu"; repo = "mgba"; - rev = "c010031f76b729819246497627746fb4a7bf6c85"; - hash = "sha256-QhQ27s4Gc2IVkvgiB2vK2c0WXcxwl5/wmvpIRpM3NNI="; + rev = "0a595ca5728ed740fa94b705a49eda304d1217a8"; + hash = "sha256-ALtMF2SOhR+/00NFFWNy4jII2zCFtPunhndOY04il5g="; }; outputs = [ diff --git a/pkgs/by-name/im/immich-public-proxy/package.nix b/pkgs/by-name/im/immich-public-proxy/package.nix index 553db029dd46..921f4e44415e 100644 --- a/pkgs/by-name/im/immich-public-proxy/package.nix +++ b/pkgs/by-name/im/immich-public-proxy/package.nix @@ -8,17 +8,17 @@ }: buildNpmPackage rec { pname = "immich-public-proxy"; - version = "1.15.6"; + version = "2.4.0"; src = fetchFromGitHub { owner = "alangrainger"; repo = "immich-public-proxy"; tag = "v${version}"; - hash = "sha256-hBnWTvc6QeeWabiqzeaNs2uuhYTtYgCMoeOoDBF4Kyc="; + hash = "sha256-hGL8mTeOUd0OIfuH4QCH/jyPI7AqhF6yj/SRz6eqAEo="; }; sourceRoot = "${src.name}/app"; - npmDepsHash = "sha256-G8G1H/5POJL8DyJwXQxBbk8MjZKneerEZVQd5plzIMs="; + npmDepsHash = "sha256-WHD4d3iXHsotw7EhFWUz5/493E08Iubx/pRHWgTa2ac="; # patch in absolute nix store paths so the process doesn't need to cwd in $out postPatch = '' diff --git a/pkgs/by-name/ja/jasterix/package.nix b/pkgs/by-name/ja/jasterix/package.nix index 77dfdaf99f07..9b804aaabd26 100644 --- a/pkgs/by-name/ja/jasterix/package.nix +++ b/pkgs/by-name/ja/jasterix/package.nix @@ -1,9 +1,9 @@ { - applyPatches, boost, catch2_3, cmake, fetchFromGitHub, + fetchpatch, lib, libarchive, libpcap, @@ -24,6 +24,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-df5tByZwtQLdV0UlSo1WkgyoF3hReU/mN74V2WL6zoI="; }; + patches = [ + (fetchpatch { + name = "jasterix-fix-tests.patch"; + url = "https://github.com/OpenATSGmbH/jASTERIX/commit/b79e59c042ebb7eee31f50a7ed48840bcec50429.patch"; + hash = "sha256-V0/nMJGb8ZB/Z6bKvyZnic57HXAsUAHXgyVq+D4yFDw="; + }) + ]; + # Disable boost-stacktrace_backtrace, which is an optional dependency and not yet available in Nix. postPatch = '' sed -i 's/\(find_package .*\) stacktrace_backtrace/\1/' CMakeLists.txt @@ -54,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { openssl.dev ]; - doCheck = false; # The tests require ASTERIX files that are not publicly provided + doCheck = true; strictDeps = true; __structuredAttrs = true; diff --git a/pkgs/by-name/jo/john/package.nix b/pkgs/by-name/jo/john/package.nix index 9c216258523e..ffb0d96558b1 100644 --- a/pkgs/by-name/jo/john/package.nix +++ b/pkgs/by-name/jo/john/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation { pname = "john"; - version = "1.9.0-Jumbo-1-unstable-2026-05-31"; + version = "1.9.0-Jumbo-1-unstable-2026-06-07"; src = fetchFromGitHub { owner = "openwall"; repo = "john"; - rev = "776889036312637dd97584da68af196e2a2c93ea"; - hash = "sha256-JRQN5NJMCvRDjzXql06Pqy7xEwA8peMCeB4nCedhAvE="; + rev = "309326510e585c7a1340dab2e475c2ebfa6295aa"; + hash = "sha256-9bk5Icnm7PgQdSVrAKWHaKN0POctVKbofR7Aa9T2fXE="; }; patches = lib.optionals withOpenCL [ diff --git a/pkgs/by-name/le/level-zero/package.nix b/pkgs/by-name/le/level-zero/package.nix index 9d6348f5db81..0d3fdf208a5a 100644 --- a/pkgs/by-name/le/level-zero/package.nix +++ b/pkgs/by-name/le/level-zero/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "level-zero"; - version = "1.28.5"; + version = "1.29.0"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; tag = "v${finalAttrs.version}"; - hash = "sha256-g97BgCR/ca9Xv2l3Kbyuez8vWY6Jwrwt6Dmw3DGhPaY="; + hash = "sha256-2OtJoVO8C9E1bf2uQv01O99wtuguINRSX4dCM6S93ns="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/lib45d/package.nix b/pkgs/by-name/li/lib45d/package.nix index 33dcb2aa08e9..9deb5a4f8ddf 100644 --- a/pkgs/by-name/li/lib45d/package.nix +++ b/pkgs/by-name/li/lib45d/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/45Drives/lib45d"; description = "45Drives C++ Library"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ philipwilk ]; + maintainers = with lib.maintainers; [ jadewilk ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ly/lychee/package.nix b/pkgs/by-name/ly/lychee/package.nix index 523513c1e1e5..97422a46de71 100644 --- a/pkgs/by-name/ly/lychee/package.nix +++ b/pkgs/by-name/ly/lychee/package.nix @@ -84,6 +84,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ok = callPackage ./tests/ok.nix { }; fail = callPackage ./tests/fail.nix { }; fail-emptyDirectory = callPackage ./tests/fail-emptyDirectory.nix { }; + fail-rootRelative = callPackage ./tests/fail-rootRelative.nix { }; network = testers.runNixOSTest ./tests/network.nix; }; diff --git a/pkgs/by-name/ly/lychee/tests/fail-rootRelative.nix b/pkgs/by-name/ly/lychee/tests/fail-rootRelative.nix new file mode 100644 index 000000000000..3fa5defac3ee --- /dev/null +++ b/pkgs/by-name/ly/lychee/tests/fail-rootRelative.nix @@ -0,0 +1,21 @@ +{ runCommand, testers }: +let + sitePkg = runCommand "site" { } '' + dist=$out/dist + mkdir -p $dist + echo "hi" > $dist/index.html + echo "home" > $dist/page.html + ''; + + linkCheck = testers.lycheeLinkCheck { + site = sitePkg + "/dist"; + }; + + failure = testers.testBuildFailure linkCheck; + +in +runCommand "link-check-fail" { inherit failure; } '' + grep -F "root-relative-links-are-forbidden-use-relative-links/index.html" $failure/testBuildFailure.log >/dev/null + grep -F "Please set the relocatable parameter" $failure/testBuildFailure.log >/dev/null + touch $out +'' diff --git a/pkgs/by-name/ly/lychee/tests/ok.nix b/pkgs/by-name/ly/lychee/tests/ok.nix index b93b93384ba1..e2eb4f9f939f 100644 --- a/pkgs/by-name/ly/lychee/tests/ok.nix +++ b/pkgs/by-name/ly/lychee/tests/ok.nix @@ -5,10 +5,12 @@ let mkdir -p $dist echo "foobar" > $dist/index.html echo "index" > $dist/foo.html + echo "home" > $dist/root-relative.html ''; in testers.lycheeLinkCheck rec { site = sitePkg + "/dist"; + relocatable = false; remap = { "https://example.com" = site; }; diff --git a/pkgs/by-name/ma/macaulay2/package.nix b/pkgs/by-name/ma/macaulay2/package.nix index 04c20ea6ab78..7bb50d08f63d 100644 --- a/pkgs/by-name/ma/macaulay2/package.nix +++ b/pkgs/by-name/ma/macaulay2/package.nix @@ -64,19 +64,19 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "macaulay2"; - version = "1.26.05"; + version = "1.26.06"; src = fetchFromGitHub { owner = "Macaulay2"; repo = "M2"; tag = "release-${finalAttrs.version}"; - hash = "sha256-UiPLownaFtuYFUlZhBl+Nl/sRZRhG9OUwepZtFTkTqc"; + hash = "sha256-2e39qzBO63Ft+yw+tJChLsupeinalTkDwXp3WBF2wms="; fetchSubmodules = true; }; docs = fetchurl { url = "https://macaulay2.com/Downloads/OtherSourceCode/Macaulay2-docs-${finalAttrs.version}.tar.gz"; - hash = "sha256-rz9b7HvxfxI978yM9wE7XvLu7DO38i/amokXBU0RjSg="; + hash = "sha256-0+ilvDh87Gmwzx0bLhT6nnadcPwgU3uB6pKhP9VqW0Q="; }; buildInputs = [ @@ -152,16 +152,10 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' sed -i 's/AC_SUBST(REL,.*uname -r.*)/AC_SUBST(REL,"")/' configure.ac - substituteInPlace Macaulay2/packages/DeterminantalRepresentations.m2 \ - --replace-fail "eps = 1e-15" "eps = 1e-14" - '' - # TODO remove in v1.26.06 (see https://github.com/Macaulay2/M2/pull/4334) - # ForeignFunctions.m2 uses `brew --prefix` to discover potential library paths, - # which fails when Homebrew is not installed. - # We patch it to return an empty path instead, which should be harmless - + '' - substituteInPlace Macaulay2/packages/ForeignFunctions.m2 \ - --replace-fail 'get "!brew --prefix"' 'try get "!brew --prefix" else ""' + substituteInPlace configure.ac \ + --replace-fail "[\$gfan_version], [ge], [0.8]" "[\$gfan_version], [ge], [0.6]" + substituteInPlace Macaulay2/packages/gfanInterface.m2 \ + --replace-fail 'MinimumVersion => ("0.8"' 'MinimumVersion => ("0.6"' ''; preConfigure = '' diff --git a/pkgs/by-name/me/melos/package.nix b/pkgs/by-name/me/melos/package.nix index c6a5dbe4d188..1bf026e12c1b 100644 --- a/pkgs/by-name/me/melos/package.nix +++ b/pkgs/by-name/me/melos/package.nix @@ -5,12 +5,12 @@ }: buildDartApplication (finalAttrs: { pname = "melos"; - version = "7.4.1"; + version = "7.8.1"; src = fetchFromGitHub { owner = "invertase"; repo = "melos"; tag = "melos-v${finalAttrs.version}"; - hash = "sha256-bsNPZd1euOKF2LlAmBIkr+0iO51iAkcIZYrd5oUJTKo="; + hash = "sha256-ApD4F0JljoRKNnRVXZq4c2VFr8ewN1Bf0iKyeC/RF0Q="; }; patches = [ diff --git a/pkgs/by-name/me/melos/pubspec.lock.json b/pkgs/by-name/me/melos/pubspec.lock.json index 11aa0a7769ba..849179d32320 100644 --- a/pkgs/by-name/me/melos/pubspec.lock.json +++ b/pkgs/by-name/me/melos/pubspec.lock.json @@ -4,21 +4,21 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "3b19a47f6ea7c2632760777c78174f47f6aec1e05f0cd611380d4593b8af1dbc", + "sha256": "563c6992eaeda8625f45b87f6a6a0c547df16565d1c93d8271c7c11057710ca7", "url": "https://pub.dev" }, "source": "hosted", - "version": "96.0.0" + "version": "101.0.0" }, "analyzer": { "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "0c516bc4ad36a1a75759e54d5047cb9d15cded4459df01aa35a0b5ec7db2c2a0", + "sha256": "aa6a9365901532864cae51208f2a6bb18dd01972ebead19c431efc848f60080b", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.2.0" + "version": "13.1.0" }, "ansi_styles": { "dependency": "transitive", @@ -44,11 +44,11 @@ "dependency": "transitive", "description": { "name": "async", - "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb", + "sha256": "e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.13.0" + "version": "2.13.1" }, "boolean_selector": { "dependency": "transitive", @@ -64,11 +64,11 @@ "dependency": "transitive", "description": { "name": "build", - "sha256": "275bf6bb2a00a9852c28d4e0b410da1d833a734d57d39d44f94bfc895a484ec3", + "sha256": "a156715e7cd728130c592f30552575908aae5b100005fbc1f0fb16b3c03a3d10", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.4" + "version": "4.0.6" }, "built_collection": { "dependency": "transitive", @@ -84,11 +84,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "6ae8a6435a8c6520c7077b107e77f1fb4ba7009633259a4d49a8afd8e7efc5e9", + "sha256": "34e4067d30ce212937df995f03b69992eea683539ceeac7f679a1f1eba055b56", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.12.4" + "version": "8.12.6" }, "charcode": { "dependency": "transitive", @@ -174,11 +174,11 @@ "dependency": "transitive", "description": { "name": "coverage", - "sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d", + "sha256": "956a3de0725ca232ad353565a8290d3357592bf4250f6f298a185e2d949c5d3d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.15.0" + "version": "1.15.1" }, "crypto": { "dependency": "transitive", @@ -194,11 +194,11 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "29f7ecc274a86d32920b1d9cfc7502fa87220da41ec60b55f329559d5732e2b2", + "sha256": "59d53ef8eaed9d288ed9767618e2b31c4fa0383a127db59d5eb2e737a7638a60", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.7" + "version": "3.1.9" }, "file": { "dependency": "transitive", @@ -294,11 +294,11 @@ "dependency": "transitive", "description": { "name": "json_annotation", - "sha256": "cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8", + "sha256": "2a743920d81b7910627f68ee2c9ac1fc0bfee32b9fc3403587d7c6791ca12f80", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.11.0" + "version": "4.12.0" }, "logging": { "dependency": "transitive", @@ -314,21 +314,21 @@ "dependency": "transitive", "description": { "name": "matcher", - "sha256": "dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861", + "sha256": "31bd099b47c10cd1aeb55146a2d46ce0277630ecef3f7dae54ad7873f36696cd", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.19" + "version": "0.12.20" }, "meta": { "dependency": "transitive", "description": { "name": "meta", - "sha256": "df0c643f44ad098eb37988027a8e2b2b5a031fd3977f06bbfd3a76637e8df739", + "sha256": "c82594181e3312f3d0695fc95aaaf7758d75b8d4ae2bbecf223b9fd5109a059d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.18.2" + "version": "1.18.3" }, "mime": { "dependency": "transitive", @@ -344,21 +344,21 @@ "dependency": "transitive", "description": { "name": "mockito", - "sha256": "a45d1aa065b796922db7b9e7e7e45f921aed17adf3a8318a1f47097e7e695566", + "sha256": "c8d040d754367108fbe482dcb79dd72b8fe60ac6727abd15b4783c5560297ee6", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.6.3" + "version": "5.7.0" }, "mustache_template": { "dependency": "transitive", "description": { "name": "mustache_template", - "sha256": "4326d0002ff58c74b9486990ccbdab08157fca3c996fe9e197aff9d61badf307", + "sha256": "c689b4d59176f8c7a2860aab765d205916aa5b06cfafff7613bfcc42fa996143", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.3" + "version": "2.0.5" }, "node_preamble": { "dependency": "transitive", @@ -514,11 +514,11 @@ "dependency": "transitive", "description": { "name": "source_gen", - "sha256": "adc962c96fffb2de1728ef396a995aaedcafbe635abdca13d2a987ce17e57751", + "sha256": "ec37cc0e6694374cbef59ed79685572c870a54ede6fa30a3e420feb3adffea02", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.1" + "version": "4.2.3" }, "source_map_stack_trace": { "dependency": "transitive", @@ -594,31 +594,31 @@ "dependency": "transitive", "description": { "name": "test", - "sha256": "280d6d890011ca966ad08df7e8a4ddfab0fb3aa49f96ed6de56e3521347a9ae7", + "sha256": "ca578dc12bb8b2f40b67b7d3bd2fac4f31c01a6ff7130a14e2597b919934507f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.30.0" + "version": "1.31.1" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a", + "sha256": "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.10" + "version": "0.7.12" }, "test_core": { "dependency": "transitive", "description": { "name": "test_core", - "sha256": "0381bd1585d1a924763c308100f2138205252fb90c9d4eeaf28489ee65ccde51", + "sha256": "d2e98ec12998368dc59ddd47ab709f2cd55acd6b66dc7db764455a44082f4bc5", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.16" + "version": "0.6.18" }, "typed_data": { "dependency": "transitive", @@ -634,11 +634,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60", + "sha256": "0016aef94fc66495ac78af5859181e3f3bf2026bd8eecc72b9565601e19ab360", "url": "https://pub.dev" }, "source": "hosted", - "version": "15.0.2" + "version": "15.2.0" }, "watcher": { "dependency": "transitive", @@ -694,11 +694,11 @@ "dependency": "transitive", "description": { "name": "xml", - "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025", + "sha256": "67f0aff7be013d107995e9b75bf4e7f2c3ef2dfdb2c8e68024bba0a7fd5756a4", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.6.1" + "version": "7.0.1" }, "yaml": { "dependency": "direct dev", @@ -722,6 +722,6 @@ } }, "sdks": { - "dart": ">=3.10.0 <4.0.0" + "dart": ">=3.11.0 <4.0.0" } } diff --git a/pkgs/by-name/me/melos/update.sh b/pkgs/by-name/me/melos/update.sh index dc0514431d57..b624d730ace3 100755 --- a/pkgs/by-name/me/melos/update.sh +++ b/pkgs/by-name/me/melos/update.sh @@ -55,6 +55,14 @@ tar -xzf "$archive_path" -C "$tmpdir" extracted_dir=$(tar -tzf "$archive_path" | head -1 | cut -d/ -f1) source_dir="$tmpdir/$extracted_dir" +# Compute the hash from the downloaded and unpacked archive +echo "Computing source hash..." >&2 +new_hash=$(nix-hash --type sha256 --sri "$source_dir") +if [ -z "$new_hash" ]; then + echo "Error: Failed to compute source hash" >&2 + exit 1 +fi + echo "Generating pubspec.lock..." >&2 cd "$source_dir" dart pub get > /dev/null 2>&1 @@ -62,15 +70,6 @@ dart pub get > /dev/null 2>&1 echo "Converting to JSON..." >&2 yq eval --output-format=json --prettyPrint pubspec.lock > "$tmpdir/pubspec.lock.json" -# Compute the hash from the downloaded archive -echo "Computing source hash..." >&2 -nix_hash=$(nix-hash --flat --base32 --type sha256 "$archive_path") -if [ -z "$nix_hash" ]; then - echo "Error: Failed to compute source hash" >&2 - exit 1 -fi -new_hash="sha256-$(nix-hash --to-sri --type sha256 "$nix_hash")" - cp "$tmpdir/pubspec.lock.json" "$script_dir/pubspec.lock.json" echo "Updated pubspec.lock.json" >&2 diff --git a/pkgs/by-name/me/memos/package.nix b/pkgs/by-name/me/memos/package.nix index 6ad36eb53454..ba786d2f0ec6 100644 --- a/pkgs/by-name/me/memos/package.nix +++ b/pkgs/by-name/me/memos/package.nix @@ -14,12 +14,12 @@ let in buildGoModule (finalAttrs: { pname = "memos"; - version = "0.29.0"; + version = "0.29.1"; src = fetchFromGitHub { owner = "usememos"; repo = "memos"; rev = "v${finalAttrs.version}"; - hash = "sha256-l9jyByfVCx+z41H+RVgkggjkVSoleHq+mR6nhgk9Pj8="; + hash = "sha256-bc9NWP/CauR3gKBOPFg8urD9dSUq0jtfwQOknkPbX0s="; }; memos-web = stdenvNoCC.mkDerivation (finalWebAttrs: { @@ -30,7 +30,7 @@ buildGoModule (finalAttrs: { inherit pnpm; sourceRoot = "${finalWebAttrs.src.name}/web"; fetcherVersion = 3; - hash = "sha256-Ki9rC1i0gvz+4La0GZIF40mZPwv/EwzhHUaealSpU40="; + hash = "sha256-wj8Rh1/wYDKIrJQgdoJBtoP2xeQnrUBORE2Gegxwim0="; }; pnpmRoot = "web"; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/menulibre/package.nix b/pkgs/by-name/me/menulibre/package.nix index 3e2569927fe1..4bdddfaacb32 100644 --- a/pkgs/by-name/me/menulibre/package.nix +++ b/pkgs/by-name/me/menulibre/package.nix @@ -16,7 +16,9 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "menulibre"; version = "2.4.0"; - format = "setuptools"; + pyproject = true; + + build-system = with python3Packages; [ setuptools ]; src = fetchFromGitHub { owner = "bluesabre"; @@ -25,7 +27,7 @@ python3Packages.buildPythonApplication (finalAttrs: { hash = "sha256-IfsuOYP/H3r1GDWMVVSBfYvQS+01VJaAlZu+c05geWg="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ pygobject3 gnome-menus psutil diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index 971f04edea95..4fce3c41811b 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "namespace-cli"; - version = "0.0.517"; + version = "0.0.520"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${finalAttrs.version}"; - hash = "sha256-hYgfmWTDiJgwoVMz6yUgkn/RKOFzHEDnN/wpZ7EYWCQ="; + hash = "sha256-4qx3FFpdaiRCjzcF6/gnC4MQ9W74A4z1rzvSWS9trx0="; }; vendorHash = "sha256-rLP+djBDM1EJWFfC8s9e34Wz8EUDCzU23iJel5gscUs="; diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-bgp/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-bgp/package.nix index fe01897a0f28..0534c7d98d39 100644 --- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-bgp/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-bgp/package.nix @@ -8,7 +8,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netbox-bgp"; version = "0.19.0"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "netbox-community"; repo = "netbox-bgp"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6LZLsUPC9L9L19KeXJilJvmZYcl6YwqysGO8nFAUmcI="; }; @@ -36,8 +36,8 @@ buildPythonPackage rec { meta = { description = "NetBox plugin for BGP related objects documentation"; homepage = "https://github.com/netbox-community/netbox-bgp"; - changelog = "https://github.com/netbox-community/netbox-bgp/releases/tag/${src.tag}"; + changelog = "https://github.com/netbox-community/netbox-bgp/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ felbinger ]; }; -} +}) diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-config-backup/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-config-backup/package.nix index f2448ed669c8..9cd6ad7e3542 100644 --- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-config-backup/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-config-backup/package.nix @@ -10,7 +10,7 @@ pydriller, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netbox-config-backup"; version = "2.2.2"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "DanSheps"; repo = "netbox-config-backup"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-PT7/RCpB7SAinQ8McQV59b9ouqqUSoEqEj0ultL37cs="; }; @@ -45,8 +45,8 @@ buildPythonPackage rec { meta = { description = "NetBox plugin for configuration backups using napalm"; homepage = "https://github.com/DanSheps/netbox-config-backup"; - changelog = "https://github.com/DanSheps/netbox-config-backup/releases/tag/${src.tag}"; + changelog = "https://github.com/DanSheps/netbox-config-backup/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ felbinger ]; }; -} +}) diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-contextmenus/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-contextmenus/package.nix index 0a7d57fb11e6..9c6097b6ebeb 100644 --- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-contextmenus/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-contextmenus/package.nix @@ -7,7 +7,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netbox-contextmenus"; version = "1.4.14"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "PieterL75"; repo = "netbox_contextmenus"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-YqyxZaHKXhMLDdBTAAKQsCBBSXikxBgcOvXEfa6f+0Y="; }; @@ -27,8 +27,8 @@ buildPythonPackage rec { meta = { description = "Netbox plugin to add context buttons to the links, making navigating less clicky"; homepage = "https://github.com/PieterL75/netbox_contextmenus/"; - changelog = "https://github.com/PieterL75/netbox_contextmenus/releases/tag/${src.tag}"; + changelog = "https://github.com/PieterL75/netbox_contextmenus/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ felbinger ]; }; -} +}) diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-custom-objects/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-custom-objects/package.nix index 2cc4444bc49f..6cff03d9b841 100644 --- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-custom-objects/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-custom-objects/package.nix @@ -7,7 +7,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netbox-custom-objects"; version = "0.5.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "netboxlabs"; repo = "netbox-custom-objects"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-8PEqt6TpoQ8ncyZPesRos0BQHF3cKIzgoFr56v8UTTY="; }; @@ -35,8 +35,8 @@ buildPythonPackage rec { meta = { description = "NetBox plugin to create new object types"; homepage = "https://github.com/netboxlabs/netbox-custom-objects"; - changelog = "https://github.com/netboxlabs/netbox-custom-objects/releases/tag/${src.tag}"; + changelog = "https://github.com/netboxlabs/netbox-custom-objects/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.netboxLimitedUse; maintainers = with lib.maintainers; [ felbinger ]; }; -} +}) diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-data-flows/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-data-flows/package.nix index 0fd9b85b4d18..1d444e76ec38 100644 --- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-data-flows/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-data-flows/package.nix @@ -7,7 +7,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netbox-data-flows"; version = "1.5.2"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Alef-Burzmali"; repo = "netbox-data-flows"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-fry8AK0qgPs+QC5L2oilGSY68m1Y9KHWQ/QOzQ7B2+k="; }; @@ -35,8 +35,8 @@ buildPythonPackage rec { meta = { description = "NetBox plugin to document data flows between systems and applications"; homepage = "https://github.com/Alef-Burzmali/netbox-data-flows"; - changelog = "https://github.com/Alef-Burzmali/netbox-data-flows/releases/tag/${src.tag}"; + changelog = "https://github.com/Alef-Burzmali/netbox-data-flows/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ felbinger ]; }; -} +}) diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-dns/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-dns/package.nix index 06e6ba525036..e3eb95a6e56f 100644 --- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-dns/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-dns/package.nix @@ -5,7 +5,7 @@ setuptools, dnspython, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netbox-plugin-dns"; version = "1.5.9"; pyproject = true; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "peteeckel"; repo = "netbox-plugin-dns"; - tag = version; + tag = finalAttrs.version; hash = "sha256-yWOoYQm5XQs8j2DWs1UAaT9LwI61TKHjfOdjRn6UtJA="; }; @@ -29,9 +29,9 @@ buildPythonPackage rec { meta = { description = "Netbox plugin for managing DNS data"; homepage = "https://github.com/peteeckel/netbox-plugin-dns"; - changelog = "https://github.com/peteeckel/netbox-plugin-dns/releases/tag/${src.tag}"; + changelog = "https://github.com/peteeckel/netbox-plugin-dns/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ felbinger ]; }; -} +}) diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-documents/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-documents/package.nix index 8ecb88a51ac7..393cf1ab3b6e 100644 --- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-documents/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-documents/package.nix @@ -8,7 +8,7 @@ netbox, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netbox-documents"; version = "0.8.2"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jasonyates"; repo = "netbox-documents"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-XFVfNLU9a/0tQAVTrN2B1Oia/isOD8G5BdA3fVUn2sM="; }; @@ -37,8 +37,8 @@ buildPythonPackage rec { meta = { description = "Plugin designed to faciliate the storage of site, circuit, device type and device specific documents within NetBox"; homepage = "https://github.com/jasonyates/netbox-documents"; - changelog = "https://github.com/jasonyates/netbox-documents/releases/tag/${src.tag}"; + changelog = "https://github.com/jasonyates/netbox-documents/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ felbinger ]; }; -} +}) diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-floorplan-plugin/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-floorplan-plugin/package.nix index d066d5f4c306..0dc6c7954a4d 100644 --- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-floorplan-plugin/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-floorplan-plugin/package.nix @@ -8,7 +8,7 @@ netaddr, python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netbox-floorplan-plugin"; version = "0.9.1"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "netbox-community"; repo = "netbox-floorplan-plugin"; - tag = version; + tag = finalAttrs.version; hash = "sha256-0EeE5NrImbCs6xqrSTGupXOuv455EfNXgcLVix2HTPs="; }; @@ -40,8 +40,8 @@ buildPythonPackage rec { meta = { description = "Netbox plugin providing floorplan mapping capability for locations and sites"; homepage = "https://github.com/netbox-community/netbox-floorplan-plugin"; - changelog = "https://github.com/netbox-community/netbox-floorplan-plugin/releases/tag/${src.tag}"; + changelog = "https://github.com/netbox-community/netbox-floorplan-plugin/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.lgpl3; maintainers = with lib.maintainers; [ cobalt ]; }; -} +}) diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-inventory/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-inventory/package.nix index d0aa49dbaf1e..8980785adbe9 100644 --- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-inventory/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-inventory/package.nix @@ -7,7 +7,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netbox-inventory"; version = "2.5.1"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ArnesSI"; repo = "netbox-inventory"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6MIYwz11YZhu3ksM7iAfKACKIKpuq283DTzaRR3lcXA="; }; @@ -35,8 +35,8 @@ buildPythonPackage rec { meta = { description = "NetBox plugin to manage hardware inventory"; homepage = "https://github.com/ArnesSI/netbox-inventory"; - changelog = "https://github.com/ArnesSI/netbox-inventory/releases/tag/${src.tag}"; + changelog = "https://github.com/ArnesSI/netbox-inventory/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ felbinger ]; }; -} +}) diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-lifecycle/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-lifecycle/package.nix index e23fdd81a696..c744d28dc46b 100644 --- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-lifecycle/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-lifecycle/package.nix @@ -9,7 +9,7 @@ django-polymorphic, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netbox-lifecycle"; version = "1.1.9"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "DanSheps"; repo = "netbox-lifecycle"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-iCBlwhaf6IFdni7FQyRPtRJVwt04w0Jc4R0CeQlIWCY="; }; @@ -39,8 +39,8 @@ buildPythonPackage rec { meta = { description = "NetBox plugin for managing Hardware EOL/EOS, and Support Contracts"; homepage = "https://github.com/DanSheps/netbox-lifecycle"; - changelog = "https://github.com/DanSheps/netbox-lifecycle/releases/tag/${src.tag}"; + changelog = "https://github.com/DanSheps/netbox-lifecycle/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ felbinger ]; }; -} +}) diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-lists/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-lists/package.nix index 479dc69f1ab5..1ea85a1d8dfb 100644 --- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-lists/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-lists/package.nix @@ -9,7 +9,7 @@ django-polymorphic, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netbox-lists"; version = "4.0.4"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "devon-mar"; repo = "netbox-lists"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-RRUuvoeB3xfqlZr1v1zpRdmVZK9av52ZsADOh9s4toQ="; }; @@ -37,8 +37,8 @@ buildPythonPackage rec { meta = { description = "NetBox plugin to generate IP and prefix lists. Integrates with Ansible, Terraform, Prometheus, Oxidized and more"; homepage = "https://github.com/devon-mar/netbox-lists"; - changelog = "https://github.com/devon-mar/netbox-lists/releases/tag/${src.tag}"; + changelog = "https://github.com/devon-mar/netbox-lists/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ felbinger ]; }; -} +}) diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-reorder-rack/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-reorder-rack/package.nix index 1bac84933d94..9e41b6cef014 100644 --- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-reorder-rack/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-reorder-rack/package.nix @@ -7,7 +7,7 @@ python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netbox-reorder-rack"; version = "1.1.4"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "netbox-community"; repo = "netbox-reorder-rack"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-lWC+Br66POJe3M8L+Pt5D1pWBr9qSpRLn2TcVMXKje4="; }; @@ -36,7 +36,8 @@ buildPythonPackage rec { meta = { description = "NetBox plugin to allow users to reorder devices within a rack using a drag and drop UI"; homepage = "https://github.com/netbox-community/netbox-reorder-rack"; + changelog = "https://github.com/netbox-community/netbox-reorder-rack/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ minijackson ]; }; -} +}) diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-routing/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-routing/package.nix index f13da6c54474..bb46f0909bd6 100644 --- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-routing/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-routing/package.nix @@ -9,7 +9,7 @@ django-polymorphic, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netbox-routing"; version = "0.4.3"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "DanSheps"; repo = "netbox-routing"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3biANhaAi3uRtaXnAw4i6nWnHkARkkBVqyBHLXIMOdA="; }; @@ -39,8 +39,8 @@ buildPythonPackage rec { meta = { description = "NetBox plugin for tracking all kinds of routing information"; homepage = "https://github.com/DanSheps/netbox-routing"; - changelog = "https://github.com/DanSheps/netbox-routing/releases/tag/${src.tag}"; + changelog = "https://github.com/DanSheps/netbox-routing/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ benley ]; }; -} +}) diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-secrets/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-secrets/package.nix index c4f510c786ec..5ca3ac286b85 100644 --- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-secrets/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-secrets/package.nix @@ -8,7 +8,7 @@ pycryptodome, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netbox-secrets"; version = "3.0.2"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Onemind-Services-LLC"; repo = "netbox-secrets"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-4qUbzQTfSCXT7b8DfrsP9y3tatJZa5F40kl9tuMKed4="; }; @@ -38,8 +38,8 @@ buildPythonPackage rec { meta = { description = "NetBox plugin to enhance secret management with encrypted storage and flexible, user-friendly features"; homepage = "https://github.com/Onemind-Services-LLC/netbox-secrets"; - changelog = "https://github.com/Onemind-Services-LLC/netbox-secrets/releases/tag/${src.tag}"; + changelog = "https://github.com/Onemind-Services-LLC/netbox-secrets/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ felbinger ]; }; -} +}) diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-security/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-security/package.nix index f179e4c0b1f0..e04649d0444a 100644 --- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-security/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-security/package.nix @@ -9,7 +9,7 @@ django-polymorphic, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netbox-security"; version = "1.4.5"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "andy-shady-org"; repo = "netbox-security"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-DGiuQignYPSTFFm0RkDl5kwYQJNKbRdgdmIZ1DKXkGs="; }; @@ -37,8 +37,8 @@ buildPythonPackage rec { meta = { description = "NetBox plugin covering various security and NAT related models"; homepage = "https://github.com/andy-shady-org/netbox-security"; - changelog = "https://github.com/andy-shady-org/netbox-security/releases/tag/${src.tag}"; + changelog = "https://github.com/andy-shady-org/netbox-security/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ felbinger ]; }; -} +}) diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-topology-views/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-topology-views/package.nix index 162045f2c381..d502f5d0a70d 100644 --- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-topology-views/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-topology-views/package.nix @@ -8,7 +8,7 @@ netaddr, python, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "netbox-topology-views"; version = "4.5.1"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "netbox-community"; repo = "netbox-topology-views"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-uKxIu8IPeEwBdRbtQaLWGwLnxvFyJ5FrScsU/ufyTuM="; }; @@ -40,9 +40,9 @@ buildPythonPackage rec { meta = { description = "Netbox plugin for generate topology views/maps from your devices"; homepage = "https://github.com/netbox-community/netbox-topology-views"; - changelog = "https://github.com/netbox-community/netbox-topology-views/releases/tag/${src.tag}"; + changelog = "https://github.com/netbox-community/netbox-topology-views/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ felbinger ]; }; -} +}) diff --git a/pkgs/by-name/ni/nix-olde/package.nix b/pkgs/by-name/ni/nix-olde/package.nix index 4f206e138da4..8f078a4faff0 100644 --- a/pkgs/by-name/ni/nix-olde/package.nix +++ b/pkgs/by-name/ni/nix-olde/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nix-olde"; - version = "0.2.3"; + version = "0.3.0"; src = fetchFromGitHub { owner = "trofi"; repo = "nix-olde"; tag = "v${finalAttrs.version}"; - hash = "sha256-Q5M9/tW5Kz4ILm0MKhx540iPrFaH5Y5gQawZ13l2hg0="; + hash = "sha256-zpKcEUSqfkfBgDaz/2wIajCAzPOrBP6aPnMA6v1wnb8="; }; - cargoHash = "sha256-jCaDTLF3U3Ov1EBsoz27UlA2KYXnDTD9GRcj0isueNQ="; + cargoHash = "sha256-HbcgCrRjQ49Ekwl6MoWk6h6iYqKtNzEx/gtp9ktP1Y8="; meta = { description = "Show details about outdated packages in your NixOS system"; diff --git a/pkgs/by-name/oa/oauth2-proxy/package.nix b/pkgs/by-name/oa/oauth2-proxy/package.nix index 4aff6c05f7ea..8542c14bf37c 100644 --- a/pkgs/by-name/oa/oauth2-proxy/package.nix +++ b/pkgs/by-name/oa/oauth2-proxy/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "oauth2-proxy"; - version = "7.15.2"; + version = "7.15.3"; src = fetchFromGitHub { repo = "oauth2-proxy"; owner = "oauth2-proxy"; - sha256 = "sha256-qhWU6i57WS8TWJ5ggzwmeoIv0osQjA9wdwqnvxMddrc="; + sha256 = "sha256-HpWmIOqyE3L0JYAQh+bd30Gr2dDpTGH8DwFJo5XwflY="; rev = "v${version}"; }; - vendorHash = "sha256-Iu1dm0f3eYJpr9eR8RL7wAV8UGwpOway0aP8r5wci0M="; + vendorHash = "sha256-o4JWhqLbfHmlIY1XhaupIhYLfXJNguFueH+SpAe9xaw="; # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile ldflags = [ "-X github.com/oauth2-proxy/oauth2-proxy/v7/pkg/version.VERSION=v${version}" ]; diff --git a/pkgs/by-name/os/osm2pgsql/package.nix b/pkgs/by-name/os/osm2pgsql/package.nix index 333037b46906..7f5f6ac5945b 100644 --- a/pkgs/by-name/os/osm2pgsql/package.nix +++ b/pkgs/by-name/os/osm2pgsql/package.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "osm2pgsql"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "osm2pgsql-dev"; repo = "osm2pgsql"; rev = finalAttrs.version; - hash = "sha256-ZKSyMNc+EHY4QBTLtUiWiTMEcmAAbrV1xqxmvNF96f8="; + hash = "sha256-+l74TWD2CJr0vj2uNuCCf5EHHTVysKBqEeWHInF4Ols="; }; postPatch = '' diff --git a/pkgs/by-name/pi/pius/package.nix b/pkgs/by-name/pi/pius/package.nix index a6384b2d70a8..0b54ebb72fcc 100644 --- a/pkgs/by-name/pi/pius/package.nix +++ b/pkgs/by-name/pi/pius/package.nix @@ -6,20 +6,19 @@ perl, }: -let - version = "3.0.0"; -in -python3Packages.buildPythonApplication { +python3Packages.buildPythonApplication (finalAttrs: { pname = "pius"; namePrefix = ""; - inherit version; - format = "setuptools"; + version = "3.0.0"; + pyproject = true; + + build-system = with python3Packages; [ setuptools ]; src = fetchFromGitHub { owner = "jaymzh"; repo = "pius"; - rev = "v${version}"; - sha256 = "0l87dx7n6iwy8alxnhvval8h1kl4da6a59hsilbi65c6bpj4dh3y"; + tag = "v${finalAttrs.version}"; + hash = "sha256-fsBG5F2GFRMXjRqmooxqhM4AEVV7Q9upQp5HY09vB1E="; }; patchPhase = '' @@ -47,4 +46,4 @@ python3Packages.buildPythonApplication { platforms = lib.platforms.gnu ++ lib.platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/po/portfolio-filemanager/package.nix b/pkgs/by-name/po/portfolio-filemanager/package.nix index c95395cb5841..decc6d2ae47f 100644 --- a/pkgs/by-name/po/portfolio-filemanager/package.nix +++ b/pkgs/by-name/po/portfolio-filemanager/package.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "portfolio"; - version = "1.0.2"; + version = "1.0.3"; pyproject = false; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { owner = "tchx84"; repo = "Portfolio"; rev = "v${finalAttrs.version}"; - hash = "sha256-v86pQbj5+SqdzsW0Ko5TW/12NsFVNSPyX6g0e+MdzHE="; + hash = "sha256-KlFRgBXEoIF/UqZKSAC/oQ+OQBrl40NIXV+49jBq430="; }; postPatch = '' diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index dcc6446e4bc9..a4ff74d7697c 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "proto"; - version = "0.56.4"; + version = "0.57.4"; src = fetchFromGitHub { owner = "moonrepo"; repo = "proto"; rev = "v${finalAttrs.version}"; - hash = "sha256-fX9kPkhJ2AgmTR/7fINBpHnZfdB+W7QNx3CGX7O9Lh4="; + hash = "sha256-U0KI8g1qeHOE2mUXs0HKb0mkqNL6LmIIXsptWLiBfsQ="; }; - cargoHash = "sha256-b0inmhRT5lm9zQHl9jFYFWVI80sWHtr7OggMntUNK/o="; + cargoHash = "sha256-R5HNiaFnjm+QSgmzcb23yfaRyyc5E1CcmYEVbX0xTdc="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv diff --git a/pkgs/by-name/pr/proton-vpn/linux.nix b/pkgs/by-name/pr/proton-vpn/linux.nix index 1423a4cfffb8..15e9bea8e78d 100644 --- a/pkgs/by-name/pr/proton-vpn/linux.nix +++ b/pkgs/by-name/pr/proton-vpn/linux.nix @@ -14,14 +14,14 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "proton-vpn"; - version = "4.15.3"; + version = "4.16.5"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "proton-vpn-gtk-app"; tag = "v${finalAttrs.version}"; - hash = "sha256-2v8BckNmm7Ecw+uAgOyfofHDPWgXkJJ8DmhMszb0tg0="; + hash = "sha256-wClBUF5bz+bVt9w7LQGfU3mKnEtgax8GXnGNyH2/obU="; }; nativeBuildInputs = [ @@ -85,6 +85,8 @@ python3Packages.buildPythonApplication (finalAttrs: { disabledTestPaths = [ # Segmentation fault during widgets tests "tests/unit/widgets" + # Segmentation fault during GObject signal test + "tests/unit/utils/test_safe_signal_connect.py" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pr/proxelar/package.nix b/pkgs/by-name/pr/proxelar/package.nix index 8e88bee7ae56..d5a1a31e4055 100644 --- a/pkgs/by-name/pr/proxelar/package.nix +++ b/pkgs/by-name/pr/proxelar/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "proxelar"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = "emanuele-em"; repo = "proxelar"; tag = "v${finalAttrs.version}"; - hash = "sha256-/uRvk0bUkDtxpNEKLOgh8J1V2+xaTxAHZdrXTnLApFM="; + hash = "sha256-HkUQXnx3gX6b16dXIdwAjR/3e2lkkOHjFevr3vj4Pe0="; }; - cargoHash = "sha256-j94fVzAJa/4B4et98LowZmbKwAy9eZ/qhfKjZ9p/9NI="; + cargoHash = "sha256-BQkWSilaQenfLO8BQMX9YPoknuCkZXWMNn76W/v8WrY="; __structuredAttrs = true; diff --git a/pkgs/by-name/ps/psitransfer/package.nix b/pkgs/by-name/ps/psitransfer/package.nix index 77d9837240d9..7182ebd7f24c 100644 --- a/pkgs/by-name/ps/psitransfer/package.nix +++ b/pkgs/by-name/ps/psitransfer/package.nix @@ -8,16 +8,16 @@ buildNpmPackage (finalAttrs: { pname = "psitransfer"; - version = "2.4.3"; + version = "2.4.4"; src = fetchFromGitHub { owner = "psi-4ward"; repo = "psitransfer"; tag = "v${finalAttrs.version}"; - hash = "sha256-lULgdzObjPXe+SmAY+s1MmuTnQpKEKlWPLsy1HMUKiw="; + hash = "sha256-A26Mse69+ChyqUKhx5TlIdZYVC5e5bOPQ4DX8eVKcHw="; }; - npmDepsHash = "sha256-hKthHajNO6PK7KHwNwZ9ZEHkaXqi73zP+7colV3TyVs="; + npmDepsHash = "sha256-IgPqX6nxxTWA6gLr2NP42vnGS+e98mWUWBIMSsIriRY="; app = buildNpmPackage { pname = "psitransfer-app"; diff --git a/pkgs/by-name/pu/pulumi-bin/data.nix b/pkgs/by-name/pu/pulumi-bin/data.nix index 8bff766b24aa..933dd208189d 100644 --- a/pkgs/by-name/pu/pulumi-bin/data.nix +++ b/pkgs/by-name/pu/pulumi-bin/data.nix @@ -1,64 +1,64 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.237.0"; + version = "3.244.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.237.0-linux-x64.tar.gz"; - sha256 = "0h78sg60pbjnrwvp6xshg2xkpddwjq9vwb8cgb567v171lafhr3j"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.244.0-linux-x64.tar.gz"; + sha256 = "0ka1wg7ks7ryd34sg6c2cgkv4rm90v5hypi3w6li8ph5419liikr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.53.1-linux-amd64.tar.gz"; - sha256 = "08s30ng4bgk8p3rlazpclg36anjir2c2qvyyyfwpila7bf6h6f9b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.55.0-linux-amd64.tar.gz"; + sha256 = "0vjbmdn8zq9rv5h86akj0vlgj2kvmcx7dx5h77ivzshww03ny3hm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v11.1.0-linux-amd64.tar.gz"; - sha256 = "139h210ixh4s46sa90p9ga9nl1bqb1m36hbr1ylcr80nx5hjh42p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v11.3.0-linux-amd64.tar.gz"; + sha256 = "177kl3adb7vbq9nh8f76kh538j5qwqgndksjqpx1ad54wsnpmadb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.102.0-linux-amd64.tar.gz"; - sha256 = "0xp8d1lirp3mzi2h8y0s9gsxqrkl13d7vzfsx28amjyawrn1amwl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.103.0-linux-amd64.tar.gz"; + sha256 = "14k2qw48mgxynqf45a4w61lm1bns2sd9qxr48pbgm2ghn69l22w8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.5-linux-amd64.tar.gz"; - sha256 = "1bdxzgqjvnyf6bi8i0c4zi5qmlb24ck8qhw9chvfigrqqi655221"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.11.1-linux-amd64.tar.gz"; + sha256 = "0q2jan0x7vgpvm4dwyw61cwkxfgxvmxv88fxb6kivkzljlws2662"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.41.0-linux-amd64.tar.gz"; - sha256 = "1m11q8zm5112gh7wcqnb3k4jqv5yzsxzs4g319yxxh3b4jhi6mgv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.45.0-linux-amd64.tar.gz"; + sha256 = "10z8sa4ag63j9c8y2qi491ynqc12qw5dlgz94crsqq89nhn9kzxs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.29.0-linux-amd64.tar.gz"; - sha256 = "0aj63rk78ccknbavjdkkjzdmyxchfcm6mx0hjaiw79v44vmldsya"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.32.0-linux-amd64.tar.gz"; + sha256 = "12xa1mh99gx9gqwm1891l60l8knfa5sgksxlls9kv9320861a0cz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.9.0-linux-amd64.tar.gz"; - sha256 = "0w03d8r2dy4488wyjqj0q5259fwky6xxckq3dcyy69a2inakg762"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.9.1-linux-amd64.tar.gz"; + sha256 = "10nl0b3wgr7rhgy195z67w3013yvxl4dasdr4sy4v368lz7rvk7j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.14.1-linux-amd64.tar.gz"; - sha256 = "0hvrq3b9al6sbx61dlqjs9rz5wd2ljr8ijd1x42ni76gazihix81"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.15.0-linux-amd64.tar.gz"; + sha256 = "0hx94wf890a8cz9k66q4p89w9330axb1a3lg2g6j5lbxhrp2bvac"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.35.0-linux-amd64.tar.gz"; - sha256 = "1wlfds1g2wx08dwi2vbzz79wlwyk78brxxirlq8xblp4hi8wv72d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.38.0-linux-amd64.tar.gz"; + sha256 = "0hb10w22n602shb73my53d79qb91h87qa2q02xkpmaqkkwblz36a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.15.0-linux-amd64.tar.gz"; - sha256 = "1m7fkzr5cx9bb48bvqadyi38az403di4m1jyfr6ad05b6nqqiyww"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.17.0-linux-amd64.tar.gz"; + sha256 = "1qkx0kmgx50pz06m6rpz58iilx7b94w1dvz17j0mrr4vdmkbldid"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.14.1-linux-amd64.tar.gz"; - sha256 = "184rpv0sa2qaxm1ng729x5vrw1rjv6bbskc1m7sjpj5ls9sgacw0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.15.0-linux-amd64.tar.gz"; + sha256 = "0xbx66jaknq7n8s77s1zkv3jdacqv4pnxfnlg424vlk04laar6q0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v5.1.0-linux-amd64.tar.gz"; - sha256 = "1af9y48rchnpryyy3j228d94iyvfrhphjw6m94r92y6carkpggg5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v5.3.0-linux-amd64.tar.gz"; + sha256 = "03dz0bbw85y8s002bn7lp0djdizh7cpj0kphagmyb8q54sy8jndx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.65.0-linux-amd64.tar.gz"; - sha256 = "13rps07axi5v1v77bc37dspb6zr610h72pjslx3c9ky6hdapdpvv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.68.0-linux-amd64.tar.gz"; + sha256 = "035fvrjklq5h2n58j4mwv9vcnrh89f04nnra3xng4f3v5ba5q581"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v5.0.0-linux-amd64.tar.gz"; @@ -69,16 +69,16 @@ sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.0.1-linux-amd64.tar.gz"; - sha256 = "03w4kfws4zksmri961fs3lsvwg15mpj6nhc0a1zplqpw6rsjgcmr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.2.0-linux-amd64.tar.gz"; + sha256 = "0zypdp1x34m1pkwygpzppg5bp32fngbb6wa523mrvm3a2slmpbhz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.23.0-linux-amd64.tar.gz"; - sha256 = "0iqg4xn6vc960sl3nkp09ca65r8vzrffk7axbpd80xmivg0nw5pd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.24.0-linux-amd64.tar.gz"; + sha256 = "1iipxgqzp76ip4d53bz9spq7pv9vfc1b17gahfzslhl61kk9xyj2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.13.1-linux-amd64.tar.gz"; - sha256 = "1sblvkd800i30gy719g2sqajg3k5akblv7p5xa2j29lb46mxiaqf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.14.0-linux-amd64.tar.gz"; + sha256 = "0vsaqqc21kn46pc4pkli2zqh9xmbp4b23rgl5c10100mkjn516bq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.11.0-linux-amd64.tar.gz"; @@ -89,68 +89,68 @@ sha256 = "1zra1ck64gs4nwqf62ksfmpbx24lxw6vsgi47j4v8q051m89fgq3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.34.0-linux-amd64.tar.gz"; - sha256 = "1pmp1cfhglx2cf0xpj1s1rrx6w9xzmcsvpzqgh2rzpy2rpbg5yfq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.38.0-linux-amd64.tar.gz"; + sha256 = "04j0wj6f2m7gk5lnwla5nfqnyynjzd83bdilks7xvq85jw0vic1i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.30.0-linux-amd64.tar.gz"; - sha256 = "0yqbn1niyy2a4gq87r4wk75v3p114xf099gxqgyq39c079bdwlns"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.31.1-linux-amd64.tar.gz"; + sha256 = "0yagph61nyrpa1jikjd8ahgj3dq73q9yqci714by0bf20pwkvi2j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.11.0-linux-amd64.tar.gz"; - sha256 = "12jr7p6c6xzmywcp39ag0ymladxc83v3sp5j38j82m6qx7fg25c2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.13.0-linux-amd64.tar.gz"; + sha256 = "0cmxxjy1vm38zgb00mkis4xswb0iz9z38jp1gjigjw9dp979cklx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.7.1-linux-amd64.tar.gz"; - sha256 = "1fl4pm2zlh0s2zv89b6m0qhphan9n0rcbaxid8gh24912h82xa5v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.8.0-linux-amd64.tar.gz"; + sha256 = "0ql5y5n82lr0850hg33w7jh7v8b5qc0j4lk47vjdkfxg87s8f36k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.15-linux-amd64.tar.gz"; - sha256 = "1rk8sfbv99qrwzi1hfbr163aifs5v0bx2fqqzzymnj57br0i67yc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.3.0-linux-amd64.tar.gz"; + sha256 = "1j6clq6h9j0n8xl9bx1apay138569sgv5x5byl9zvp4cyfxri6gr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.4.2-linux-amd64.tar.gz"; - sha256 = "0hd5djg3p9q2iikm8d1d2pkrmqid39ydgs4zdzwfss7bkfc4c0sy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.5.0-linux-amd64.tar.gz"; + sha256 = "060vr8rd6c1rm92x5cn97ijk5f2mq730mvw25n79smli90yk3d7y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.16.3-linux-amd64.tar.gz"; - sha256 = "0hmynpkjfa30bx6dcf98mfvh4m9djkihkksmgwamvpmdsqfq8ll5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.17.0-linux-amd64.tar.gz"; + sha256 = "0sq70hajgwjcg7nlx82kh7xzx657gwxfqycndbmj0wpwmzpngdzg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.19.2-linux-amd64.tar.gz"; - sha256 = "12jjgcnjkmyyl09zr3wlc0acp2xnsv1pwz51dhh3v9hfjm4541l9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.21.0-linux-amd64.tar.gz"; + sha256 = "07lqjsz8d7cn52zfawhxj6k9n6g1a220kcckdfnf6135h26w75h0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.15.0-linux-amd64.tar.gz"; - sha256 = "1f1srb7s8ig7bdmgi6zyf923ignhrvbjfk9xrx732rcsag534a8a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.16.0-linux-amd64.tar.gz"; + sha256 = "1q6sphd3hhi2wc74d8ryv06amjbn8hm1n0vajslb32spvl8gsgdx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.131.0-linux-amd64.tar.gz"; - sha256 = "1l8wc8xhppjfbm9v60raqhgrimbbx2wqy0jj7r1nd7kw1b0x4kkh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.133.0-linux-amd64.tar.gz"; + sha256 = "1mg9jrjlkvq9g0fsv8xc1z677bihrafvba6xqng1nphwfz91p5k2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-linux-amd64.tar.gz"; sha256 = "0pppwgwl726rfy92fnya9afj3cciw13vzs9r60w2477i3250slqj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.27.1-linux-amd64.tar.gz"; - sha256 = "0n6j1s4xk5f9nmhldk2fbmp5h9p1vcr4733hhk45by3ffbd1fbrz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.28.0-linux-amd64.tar.gz"; + sha256 = "0d15p18as2y37ay40bmwnffmvww0gx5gk8ldy05w42lppkpvf216"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.3.1-linux-amd64.tar.gz"; - sha256 = "06c90pyq2jb2xx81qcpqjviz3x3f1z5skrxwdjfg68z5330b5vdx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.5.0-linux-amd64.tar.gz"; + sha256 = "1j034cch58whw4zf0vggbhm32is6qw2bjfp8zfjna490rbba6xlf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.8.0-linux-amd64.tar.gz"; - sha256 = "03pwdk0yjrnvr5hzd9fz4hvxa7cqfczd5148jvv5064vj214dk0w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.10.0-linux-amd64.tar.gz"; + sha256 = "03cgllyqi4sn2m3109d2qcdrg4zi7q7s0ijnglb0pikf54rckj5f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.4-linux-amd64.tar.gz"; - sha256 = "1r4g7czwknylpymi4v8zf771ri0dwl6ym9jd7ry7qsc84h9rx3by"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.13.0-linux-amd64.tar.gz"; + sha256 = "038jpbd3id3lbfqkbp0cxmpj8grf2ym5vaf7khvbjb4ydpglvkg1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.5-linux-amd64.tar.gz"; - sha256 = "0aqk9slcfiyipvb38cixcqd6b66i9kpfgi88593ndna1x4jw7hs7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.6-linux-amd64.tar.gz"; + sha256 = "19140ljppf1c1d08sb464k9sn0i9k5pcmcnwfz0fwzk25gzc24r2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.12-linux-amd64.tar.gz"; @@ -163,60 +163,60 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.237.0-darwin-x64.tar.gz"; - sha256 = "0hzmfw2pqksrkj9lz2xpfxpdndsczd8c4qdx40ws8r4d6nd0rr6f"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.244.0-darwin-x64.tar.gz"; + sha256 = "1rpkdvnlfgi722nl4i0vvigfl4745pflhp0gvpjqbfvfngbm2p00"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.53.1-darwin-amd64.tar.gz"; - sha256 = "0ak7sxvgy9ribxcszs3wx36h0bqzlrqfa3acqhy3m769rgi7fk3f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.55.0-darwin-amd64.tar.gz"; + sha256 = "13rylhg3af4vpg021z38kxqi790q60plxhmxk0kb0l0zpvfzw9qp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v11.1.0-darwin-amd64.tar.gz"; - sha256 = "1r1j115bii4hv22z5pwp1yvcbi41j4mdcvwbn04xjridvrpsp63b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v11.3.0-darwin-amd64.tar.gz"; + sha256 = "1jh65k66lrzq9v33zz16h39bc0sw5fyvxmwvn72dgyfgn2vzync4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.102.0-darwin-amd64.tar.gz"; - sha256 = "01nk56ar9fnshgzgdcdkpcb99pd16anvwvsww51azaplqpxj6p6c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.103.0-darwin-amd64.tar.gz"; + sha256 = "01d1yxd9babq49bj5f4aajdj4ciqs1wavjabyncr6y7wfvkjxcpn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.5-darwin-amd64.tar.gz"; - sha256 = "0l4i7h58q23rjhgdam205xx9682j4vqy8v8mh73x9hmi93hnj6kc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.11.1-darwin-amd64.tar.gz"; + sha256 = "0msq8960yachqzxyrlc7w647qwjqprlvfn8hx27sgqv1s694hbik"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.41.0-darwin-amd64.tar.gz"; - sha256 = "0iq47qi17sxni3nq78pwc081mzi251mv2ffkb0kbijy0rix5miqd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.45.0-darwin-amd64.tar.gz"; + sha256 = "1bam0lz4kyh0ab2g7hffd7mjxfanr8hlphah7r2al996hsdlw4lw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.29.0-darwin-amd64.tar.gz"; - sha256 = "0gr07zznfri1ynqmfs5s803hiz136aijn8v96lmn6wx1v97mk6xj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.32.0-darwin-amd64.tar.gz"; + sha256 = "09b1wz4i4n6dyh65sspspqdp676iqbsmq47f84xj9ls70dssvgzp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.9.0-darwin-amd64.tar.gz"; - sha256 = "0y0qwk6vqpdaxzjl48dbgssl6bmyx4pc9167kbiir5q517bdf0zq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.9.1-darwin-amd64.tar.gz"; + sha256 = "1yql4aacwb6am3q9zldazmss262z19hvfp3jcysw7jskbsqa3gr5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.14.1-darwin-amd64.tar.gz"; - sha256 = "00jr2l7k9byw5wfsc9c764pblbisy8qhbdrb68vfhyf8xkiac4bv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.15.0-darwin-amd64.tar.gz"; + sha256 = "16h5brr42f9fhhpwplxl0h2iqa0h5h11dj6vg024p3sgqb2p5qxx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.35.0-darwin-amd64.tar.gz"; - sha256 = "0c381vy7j2flvlcri2yadw3i983dgmi28y6xxz2x8psgy48ic7zd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.38.0-darwin-amd64.tar.gz"; + sha256 = "044zrb629jsqvigdmqz9dx53cnhjvksxdf6rg2pw6v3ajxzbz80y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.15.0-darwin-amd64.tar.gz"; - sha256 = "1kb1csx83kbcx3gfjs7kq61klffi8pa83ah3i1zcp119w9lwswdz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.17.0-darwin-amd64.tar.gz"; + sha256 = "0s81lkz7bzi5z9jzgllvnf5gsvyvnc6fhdgm5xiggca5pg7a48xv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.14.1-darwin-amd64.tar.gz"; - sha256 = "10aazr97qg5k9xdjcbi8gnfg9x6b6df1844dq997pydza88hgw55"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.15.0-darwin-amd64.tar.gz"; + sha256 = "028nbjydy61zks5brpk5bhn2b1ah3w0w4f279gg04h0adc0lyvfp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v5.1.0-darwin-amd64.tar.gz"; - sha256 = "1rc9pj5p4w9fszxdh8vs8lbajbmjljx08j8nlblm5dxiypm5w5bs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v5.3.0-darwin-amd64.tar.gz"; + sha256 = "052vgdfghbd2j7q70ld6js6c31zf1b82kc8cvff159vzivdhhiaj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.65.0-darwin-amd64.tar.gz"; - sha256 = "0i9gnx79wikna2b83kg9qc1vfafyw5ibl2jlq4sk6ddqbhh283l8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.68.0-darwin-amd64.tar.gz"; + sha256 = "1bxbcfayar08a47jicmgybnlgdpaiix0ya9cnllhi3wndr88rn22"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v5.0.0-darwin-amd64.tar.gz"; @@ -227,16 +227,16 @@ sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.0.1-darwin-amd64.tar.gz"; - sha256 = "1h8s1pc8bdpbhr2v8cfzn59mczpnwdi26x9dplkf95ck6r4s96gh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.2.0-darwin-amd64.tar.gz"; + sha256 = "0r50g2frkrc6z04y57j7j2m4ms3s3cjfjgzlv7h7j842igjmz5f8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.23.0-darwin-amd64.tar.gz"; - sha256 = "1g0ql8xqvbrac47kgb4bpid16affp00zpnrz3c7nifxvrqjl82gd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.24.0-darwin-amd64.tar.gz"; + sha256 = "0zzwlhsn7r1b3dwrpkclaj2s13vqincmyvw9dv1hfq110qfyy2kx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.13.1-darwin-amd64.tar.gz"; - sha256 = "0fdsnxgnv2w2q4xq4z653cbxmr2dknyzhvz70019naj5pa60k0sq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.14.0-darwin-amd64.tar.gz"; + sha256 = "1avxgva74gcvsnc82k9vp9xskr8ddxjnbqryfbxw0mvsgp6iby0g"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.11.0-darwin-amd64.tar.gz"; @@ -247,68 +247,68 @@ sha256 = "0ddd0pgpyywq291r9q8w6bn41r2px595017iihx4n2cnb1c4v6d5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.34.0-darwin-amd64.tar.gz"; - sha256 = "1n8dqpv67b1cj25cprv2sx8sz313xqcri7i31y114sjpcj36w50b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.38.0-darwin-amd64.tar.gz"; + sha256 = "0l44hgxza0c242wsj02cfryp4qqdkaja481ws9c0ilfkyh3amx3x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.30.0-darwin-amd64.tar.gz"; - sha256 = "0f313ir5kjv8fqyyrp4k12d3nd5cy4jibjym2p5v88drjn3w1g19"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.31.1-darwin-amd64.tar.gz"; + sha256 = "1wkls064amvpjg2100xsy63man53rf5qm6gnfkznq8agk2d59q1v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.11.0-darwin-amd64.tar.gz"; - sha256 = "0k8d5gpqbij61ykish5nkpkpky5y5v7m75vn2bv6ddr1kzgp32m7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.13.0-darwin-amd64.tar.gz"; + sha256 = "057cx4sbzqs3vvrk6a2psl8vpzzkwqn3xrbdhk4mhr80zy0mf6cd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.7.1-darwin-amd64.tar.gz"; - sha256 = "1ii8mgdiljh9xhk7c8dzzx24s9khdf5n3gwsglrkaf5m2hx24pvn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.8.0-darwin-amd64.tar.gz"; + sha256 = "1phwjh9y6grc1mcppxim6q7v3wj02pdy2lj464y3v4ydy6xdw7ha"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.15-darwin-amd64.tar.gz"; - sha256 = "1rqs0pplpzjh12598prq6md50bn12nh0zp9nnv8a5ng7r4c1r8ig"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.3.0-darwin-amd64.tar.gz"; + sha256 = "0bf9m8gczh1a5b8b2xc7w98z5swd3a9r2dbd6b40g18kyc29mwjf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.4.2-darwin-amd64.tar.gz"; - sha256 = "1mm67hnkanbr0w93f034j03ajmw0k7dfvx5nv414sclbrcr59m2b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.5.0-darwin-amd64.tar.gz"; + sha256 = "0a0zs556yx2cskym7w9xfv88wfscvxip0nwzib6i8cf901732xq7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.16.3-darwin-amd64.tar.gz"; - sha256 = "095f1sl593q7rc4h5wmzg04mzb0wqqzsya1jxhhkbfkhgnm31rjl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.17.0-darwin-amd64.tar.gz"; + sha256 = "09kly1i1p9jw939k1pr51w3ja9ixh53hyv40dm6xb6fkxcpbj1q6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.19.2-darwin-amd64.tar.gz"; - sha256 = "0qglyxagy5djccykcyp75b32vaf8mxswfjxk5wqq1p6wlgdb0mm5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.21.0-darwin-amd64.tar.gz"; + sha256 = "1qrl998hs6iyvc35kas97dalr2bdrzb63k08i3bgaplj8f0p6pqy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.15.0-darwin-amd64.tar.gz"; - sha256 = "03hx8scbjiwppd1rk22k6hcmj7yihh9ck95jgm2g874gjk60hlmf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.16.0-darwin-amd64.tar.gz"; + sha256 = "15kz5mb7mswhh6bmrpvy9myq87n1c7grgrikgk27r0sx8g7vv8x8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.131.0-darwin-amd64.tar.gz"; - sha256 = "14diyvn5cr0fihmbf8093gdwwgyrrx2xlj24wpqffn84jsmskgai"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.133.0-darwin-amd64.tar.gz"; + sha256 = "0fvqnj2izbyg3mc3b6wgp69cdgqrn8drwijcr0ivzjnkvz3y3bhz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-amd64.tar.gz"; sha256 = "1jpcyp3lqiz4aab331x7shhqxzp4m6nz68vhkyqksvdplzr9rj44"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.27.1-darwin-amd64.tar.gz"; - sha256 = "06kgqzqadzdjmq7sach2wwq6j125pc5pibis7b7gyx3x9mjvnccl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.28.0-darwin-amd64.tar.gz"; + sha256 = "0piwpxykabjczmd4jzzvl3fnn6g8gis02glmch2fshplgdanj7yy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.3.1-darwin-amd64.tar.gz"; - sha256 = "0v4abvn40j8im1jn598shyxbkknhdcm41li7hz62ky6pglfw59lg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.5.0-darwin-amd64.tar.gz"; + sha256 = "1hm2lbph6i0g2hl8z0cykv55yyqmzyk52wbzzr1snj5lpygrnwc8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.8.0-darwin-amd64.tar.gz"; - sha256 = "1xirrbn9zh990j8vxrm8ggld79lbnrg26rw8xzlcypxvb0mkrv9k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.10.0-darwin-amd64.tar.gz"; + sha256 = "01vysx2nl7lm5s2398sx80b3mxmjl6kcxpnspiwyvcw8h9vp2g9s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.4-darwin-amd64.tar.gz"; - sha256 = "0lzz6jzbrlg64300n25d11xi4rrrnc9gspmcbirncsn94y0hyhqq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.13.0-darwin-amd64.tar.gz"; + sha256 = "03gblpxr9y4c1k5zd0j50q045rvq9r8k3s619rp8clnxz23khk59"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.5-darwin-amd64.tar.gz"; - sha256 = "09jrky242liwcmvz09f6sdn0wylsc8ph0adcia1w3x5hlpql22j5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.6-darwin-amd64.tar.gz"; + sha256 = "0n031w8p39vfb6g51aaq1dv4gr884nhb7jdf0js591wzn9fkk9v7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.12-darwin-amd64.tar.gz"; @@ -321,60 +321,60 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.237.0-linux-arm64.tar.gz"; - sha256 = "1z401ga9valricxa3i9b19j0gh4rfsps62ha0mbch8hh9wcqddd3"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.244.0-linux-arm64.tar.gz"; + sha256 = "0ipddz2b412mhxc4clx6xyfsbdx28v5mv86schg3r56x89xxn03y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.53.1-linux-arm64.tar.gz"; - sha256 = "16x8b648cin42nj25sjhf6z6mp34m3v9jmfwav6lh65x8halxa6j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.55.0-linux-arm64.tar.gz"; + sha256 = "0zj7hamrcz7lzkd62qrm5073ndz330p3sz1zxv5lw1vdz58qj2nc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v11.1.0-linux-arm64.tar.gz"; - sha256 = "0v84z83y56lnvrgsmla4qnig8cs57ynilib4ah29wb0dwkxvzamf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v11.3.0-linux-arm64.tar.gz"; + sha256 = "0h2in38kx42csbwh9jc2nkzvh8mmhzbxzighn4bpxnqx8xdpyynb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.102.0-linux-arm64.tar.gz"; - sha256 = "0604gvz13q7q6n8n1i8x198cscfkjy5ra25n2c9labq5lv75byjr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.103.0-linux-arm64.tar.gz"; + sha256 = "1kma6856jd1smbac84jrwrlzvz85qz4f8nankpd1vrk1kbmcdcg5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.5-linux-arm64.tar.gz"; - sha256 = "1w0asfdg8dih7v77mmva0kywmyc607l7p3jy7251qcqk2in0fhn4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.11.1-linux-arm64.tar.gz"; + sha256 = "1rm2i27a1aabj7nmvqpd9dsm5w8xvm27c1mrhh4821krjfx9x12r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.41.0-linux-arm64.tar.gz"; - sha256 = "0p7vknr3j8bfgrh3mlm5nfxnwim0nj8ahc9aqbvsd3ncqlk257vw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.45.0-linux-arm64.tar.gz"; + sha256 = "13hqxy5l4asszxz2pjsr877zfzvhcaiasizlx65wxs5wflvgqjdz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.29.0-linux-arm64.tar.gz"; - sha256 = "07y0bnml8gzbpsadghbydx9i7if5s6bssd248g4bxil1h47b48v1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.32.0-linux-arm64.tar.gz"; + sha256 = "07hval3zx4bplqg60vinfpmbriczq5p1sh8zig4jirn6ixb1ri39"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.9.0-linux-arm64.tar.gz"; - sha256 = "0z4mhhj3hhz1jf1bz3sbny7xn7m158xmg3zs7jxqna4vvmk22afm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.9.1-linux-arm64.tar.gz"; + sha256 = "1w1j0k70ah61zrad83j8ksnws18ic31i1g352il0fsidm7bhxy8p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.14.1-linux-arm64.tar.gz"; - sha256 = "0ahx69c0cl2yhrac0x4041b5mw23s77kl6pp7ryvicdr51r9l3vv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.15.0-linux-arm64.tar.gz"; + sha256 = "0660ml58rak26im6fc6vr7mj943xpn7fnrysg7h8a6yi2rs31vb1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.35.0-linux-arm64.tar.gz"; - sha256 = "0hrn1bw7hr15j29ghw7c18nkpkwmfkqjh62vxmnrs26r9qawzyl5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.38.0-linux-arm64.tar.gz"; + sha256 = "1lqmk6wmx8r2ip706v3mdlwp7ji8m10xvy0dyc5p81vlx95inpgi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.15.0-linux-arm64.tar.gz"; - sha256 = "0msc1ncq5g03ikjg5f9hxzx0xfh3y1lpd369zgyjhwknc628ggfx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.17.0-linux-arm64.tar.gz"; + sha256 = "1s53h8nj6y9pd3hxygs30nwa708pi3sqgndw96l8hi2b4xckw1pv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.14.1-linux-arm64.tar.gz"; - sha256 = "1qbscdfkjbk651hsj954n8b2wcdlmj5rfsq6ybaj3wslmpnzmiqv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.15.0-linux-arm64.tar.gz"; + sha256 = "0jgqk4sp7rkapxfi3gs5z74rrrs050bqs6kggpfz32v6sp5514z1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v5.1.0-linux-arm64.tar.gz"; - sha256 = "0fah19z4iiq76pyam7m0gzfhlpd6cl4sbb6gz2gn51vnklgs5blz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v5.3.0-linux-arm64.tar.gz"; + sha256 = "1wam6zz73xrwrlzl1y3wc5bb1va0ld7wq0n990ay72yarsfqg8x8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.65.0-linux-arm64.tar.gz"; - sha256 = "1midgzvrijrcqbphdlkrhh8hv7vzvvkp6zqdk6r7iarwbj7bpigf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.68.0-linux-arm64.tar.gz"; + sha256 = "0p94wnlq16y60ykx7m43977r9vcydvziz8bdd3qyz0f9jqfiddxf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v5.0.0-linux-arm64.tar.gz"; @@ -385,16 +385,16 @@ sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.0.1-linux-arm64.tar.gz"; - sha256 = "1zagad13q8xgpicqz2d0qgrj4qxg9iqvmmw6di8n2nqhy4hczv8f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.2.0-linux-arm64.tar.gz"; + sha256 = "0aj73c535m5clkabr2hdfyp2df9immk2s67f6x4k1rf72nyzjmm0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.23.0-linux-arm64.tar.gz"; - sha256 = "0s9rbl1g145gcqbpzfv6vw8d9l6m856bqxxgfd1kf1ks08ipjbm4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.24.0-linux-arm64.tar.gz"; + sha256 = "1461d6ddk9wivbslsyy6wzh4gyhy6g69vlr9b41cr5d8x45qnrvi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.13.1-linux-arm64.tar.gz"; - sha256 = "0j5krb0aa1ajrr1n0vgdj00jzr6099yasvwv7dssby83zjl44s6k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.14.0-linux-arm64.tar.gz"; + sha256 = "0r119cbrv54k026jsg8z7hyd10asi6ff6jyd5ckxzni6rawm1yzf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.11.0-linux-arm64.tar.gz"; @@ -405,68 +405,68 @@ sha256 = "0d8m2krbzxjhfm82dgf8p4vm3kk9gk98l798q4ayjrddqqb4mxq4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.34.0-linux-arm64.tar.gz"; - sha256 = "1fgg006xljrzjnwbifbih55imgvas26mq6n11nkcgj1njpb77ylf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.38.0-linux-arm64.tar.gz"; + sha256 = "11sggs5l4y24r4iis6nnxkzq3i6c7f7rgwyll7k3zps504c7r6i3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.30.0-linux-arm64.tar.gz"; - sha256 = "1ax41ricywlhy1nxjl1gybv9xkfw6ifz1xwlzcps7xdw8bcnrcj0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.31.1-linux-arm64.tar.gz"; + sha256 = "01d1hdv6cwmp4lrg9zwghlshc623rn3rlxidkra7hnf69g2lb39f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.11.0-linux-arm64.tar.gz"; - sha256 = "0zglli3pbn895i6dp6pfc8j8lmp3ns2kn5vpscrh5hmcxa00lf9r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.13.0-linux-arm64.tar.gz"; + sha256 = "0vz7xy20dmik20ngmnfw2v7797z9cdzafckvm5psdljjlwmx1cm6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.7.1-linux-arm64.tar.gz"; - sha256 = "1k6hl98i33w0cfcr7jxjlah3ssmxk9w8319p2ycwrpmcmjnmra7z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.8.0-linux-arm64.tar.gz"; + sha256 = "1m5bw0cj07hmzk84mbfjwl7gyqqjlsyimfzbs3aqmdl7pqw7ibc4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.15-linux-arm64.tar.gz"; - sha256 = "0gyqx6cs4sd8lr1vb9f1w0i6kaw3vajg0fx4jz2ssqv62xcmwj3z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.3.0-linux-arm64.tar.gz"; + sha256 = "1zzvlsksm3599zx61rm1yr51rhglj56jd74h012h7ksnfkrg12sx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.4.2-linux-arm64.tar.gz"; - sha256 = "1kjj0sxy6702jj754nibijnjdmrgpr4qkfbyfqcbcw58f992y834"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.5.0-linux-arm64.tar.gz"; + sha256 = "1py1gip6l3rgkyp0py9bny3kpzakwf3jygmbhywb3krzmjzl1hly"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.16.3-linux-arm64.tar.gz"; - sha256 = "0hhhz1rq35wzgn2gdqy66w2xx7f2cs81d6q39d14plhxfwxz6a9c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.17.0-linux-arm64.tar.gz"; + sha256 = "0gzjkvbwbrvnyx2amdw1p05abg196n96v6vniryi92ql3k40cp10"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.19.2-linux-arm64.tar.gz"; - sha256 = "035czawc26f09ihcnvcqfjkwrm5zr502yhs3wdqmh4c7kba7f8a6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.21.0-linux-arm64.tar.gz"; + sha256 = "1d6j1hqy0w3w4jssyp3w7xdkg8501vljra8299giiv0cycmhd3w8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.15.0-linux-arm64.tar.gz"; - sha256 = "0dylb2z059v6rgir6ivlsmzigj1xn971gz9ddivdxbvyflsvhv89"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.16.0-linux-arm64.tar.gz"; + sha256 = "0jkrfkf6k0msx869ma35d084x6g36lghrl5f87pmif713rlk4zg0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.131.0-linux-arm64.tar.gz"; - sha256 = "0pzlnw3x10ad9h948g5fxz0a0vxl0k63ll8r8ysdckwnrm4a9b1a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.133.0-linux-arm64.tar.gz"; + sha256 = "15a7s7lqq1z82397r9ma8pzh7lm4v03p3q0l2ddnnnh4xw391qyb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-linux-arm64.tar.gz"; sha256 = "0glljz03v764n53n5l33ji64vj86ipdv5bkr03ijl8wrc22j5syy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.27.1-linux-arm64.tar.gz"; - sha256 = "1vh5cqyj3kifvk59s8hhfpi7fvy3av1ss78mpim4gyjqjf82rf0b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.28.0-linux-arm64.tar.gz"; + sha256 = "0nnshs122f00lw5xpfhz1rd73kc62nn55pi8v7fgndl31f9b6ca7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.3.1-linux-arm64.tar.gz"; - sha256 = "11l570naqss0wmip7jvs83sxbscimj1nxh40wzfp7rmfmwrhlk64"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.5.0-linux-arm64.tar.gz"; + sha256 = "0k5h1xc602r9lhwlh6priq75i8mvsalwn7lgyknc7lg4kgvc4f82"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.8.0-linux-arm64.tar.gz"; - sha256 = "1fraas5hwplzfll5ck2q3vq4jqrxl06q04namjy4rbb195159s0l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.10.0-linux-arm64.tar.gz"; + sha256 = "0ww2y1gnnx4rbblvrbjlm6zj2as8zwgcifqqimcar2178x755a39"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.4-linux-arm64.tar.gz"; - sha256 = "0bafyvvmprfrr30nmrccydci73zz3rrrxf4qa3w3hg1c04qsagg6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.13.0-linux-arm64.tar.gz"; + sha256 = "1nfv4cfnpwyk5fbd2znk1x3cz9p45bc5069mvvxv47cc5fn176d5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.5-linux-arm64.tar.gz"; - sha256 = "0f93zby5zw6naqw94kjzsw97bcyg3a60vgbvi7q972ipdwrnmajz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.6-linux-arm64.tar.gz"; + sha256 = "0ia25w1wq511znbxw7vgi47vnhkg64gsmlbf3adff6na3c7338jk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.12-linux-arm64.tar.gz"; @@ -479,60 +479,60 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.237.0-darwin-arm64.tar.gz"; - sha256 = "04h5difhiqijwbl5vwvkjfzy6k179nl2iv48rp3k1a8kspvxafw9"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.244.0-darwin-arm64.tar.gz"; + sha256 = "064mklz6xhksj1j3dgqxz5957dimc2vfnyf3izp8qjkkk203ndxv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.53.1-darwin-arm64.tar.gz"; - sha256 = "09iz2jkcmj5hg5p56d1lj6xii32q2fhsqjm5xfinhzlg7ryjv6bk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.55.0-darwin-arm64.tar.gz"; + sha256 = "18nkjyn6l6zs4hapg185vyzkzl61f4wd73zg399nmidyk640j3df"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v11.1.0-darwin-arm64.tar.gz"; - sha256 = "0zsa46x3fqmbicfm6lg10k9ghj40pjq0v889ksqpws2d4jlhbwp7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v11.3.0-darwin-arm64.tar.gz"; + sha256 = "19nqqf3xsl6nlaa2f8pdjv17j30dd2m2y5qjs78z7lyqwvflk9yi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.102.0-darwin-arm64.tar.gz"; - sha256 = "1cj48m88bkxwkvb60zydqnb40rcyzv8hm3hllcccr03088mim0xp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.103.0-darwin-arm64.tar.gz"; + sha256 = "15b2g42y5jmn2nn7pk3v8i17970hvwznj9i860yigi9na72c70sk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.10.5-darwin-arm64.tar.gz"; - sha256 = "1zm352c89rnf78n9xq4pffq1rsd3rddc7v6xi8md41x9vhnpsp6j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.11.1-darwin-arm64.tar.gz"; + sha256 = "07xdrydhaj0jar34ylvmlz7dzpm87pi5xc0748lw5xd8fhczq7b5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.41.0-darwin-arm64.tar.gz"; - sha256 = "0q71v1skm0k26rapggsam7ds9k3454qdn3wrpmsinjdmvdlbm7m0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.45.0-darwin-arm64.tar.gz"; + sha256 = "0g6wfywhka55h3v0253fh618m2p3cp9hjl99nvgzk1357d91mrrs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.29.0-darwin-arm64.tar.gz"; - sha256 = "1wqa9zkrbmxj2nrc8j8z12x947mqb7w8a98yvrrbq5fs0w031g22"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.32.0-darwin-arm64.tar.gz"; + sha256 = "0vjj6aj80pkrmwqzcn0r6kdcxrcgjnbvvc9cp0svy9sarg9iwyy7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.9.0-darwin-arm64.tar.gz"; - sha256 = "15fnai1jw1mfgk4n6ka952y3iw0825g9xib9h08j6v8r6c06a4by"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.9.1-darwin-arm64.tar.gz"; + sha256 = "0lbfv8md4zkxgvg9rg0l2j4h3p3lnmp3q0dgc30m2637qf19ggdn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.14.1-darwin-arm64.tar.gz"; - sha256 = "12vvxl1x9drn91dvnjsa0ff59civlj9ps00ggrbvdn4y43cdlxc1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.15.0-darwin-arm64.tar.gz"; + sha256 = "0rzjlcwq1gpp7v9a4xcfwcc09g9ry6c8d7s00jiy8ix5cfzmwv10"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.35.0-darwin-arm64.tar.gz"; - sha256 = "1g076zzz792s9ywc81xwm7y6r6nfwglwxapcyl0jnlc873mdf842"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.38.0-darwin-arm64.tar.gz"; + sha256 = "0nlhi9i0l0csw9s86fkzaxccqs622jzjbhny14lggakx6g00ynjh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.15.0-darwin-arm64.tar.gz"; - sha256 = "03pjmknlf16i20bs92fiw3kzsvns6jj4szzngcahfwalm6ycg3kz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.17.0-darwin-arm64.tar.gz"; + sha256 = "0la2l0c5chif0j681k4dgnav8qd0bdfbc01x7w0wpa1cvp5a7g49"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.14.1-darwin-arm64.tar.gz"; - sha256 = "0albxlwafzkyv6z9iab6kcx06a7rv6fjvf1vlr1j3a24dzkmlb25"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.15.0-darwin-arm64.tar.gz"; + sha256 = "1ly07rsqrrxqcbgwf0a0dhjgv16bbsanc56k04yhvsq1i4cis8v3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v5.1.0-darwin-arm64.tar.gz"; - sha256 = "1rnp6l80fbgc1dzc643y4xrgcgj6niaq0hrnb4zq257ksjcm6wmx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v5.3.0-darwin-arm64.tar.gz"; + sha256 = "1c6w0yvx4my53dlml628y48qzdjar4l630h67h75licpsja493ic"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.65.0-darwin-arm64.tar.gz"; - sha256 = "0p338qlfsxrxmd7f4kv2aiaxn7rnjh843nl01iv15i47pbq6512v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.68.0-darwin-arm64.tar.gz"; + sha256 = "0rwcglm00kl41vx8w7h52p2i7ln108nirwaww7r1j2vnqk8r6bjy"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v5.0.0-darwin-arm64.tar.gz"; @@ -543,16 +543,16 @@ sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.0.1-darwin-arm64.tar.gz"; - sha256 = "13lgi9zy9cxs6zwc1whw3qhq6hk1kgi72p4yvhdavdc3j4nf241p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v12.2.0-darwin-arm64.tar.gz"; + sha256 = "15j6pkinyi9gv515qsnkpcb8y0hls8k8q2vcpf12bg6ymp9fgvkp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.23.0-darwin-arm64.tar.gz"; - sha256 = "1k4ah4pjr4gskgz88j46cw6q84d5wwg7fvav3lbvba09f1agk3ip"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.24.0-darwin-arm64.tar.gz"; + sha256 = "1nwrs1aynlpn8bzvniym9646zkfdrf9a736c0xwrziixrskxj7m9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.13.1-darwin-arm64.tar.gz"; - sha256 = "1fyz5ciiq6cxl9wmnsysnn0afx5fcs1cpz92zzjlbk62g66kx2a4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.14.0-darwin-arm64.tar.gz"; + sha256 = "05kzpbg75j47ls6y7a9pqgn4yqis7yp2fsd9ix2laywmkd9rqhv5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.11.0-darwin-arm64.tar.gz"; @@ -563,68 +563,68 @@ sha256 = "0caz4kgnnrmdr7n571xc7yqscac9jnjwwpjzbnvx4ib6a91wvsdn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.34.0-darwin-arm64.tar.gz"; - sha256 = "07wzz9a3ch000bvf77m32wkclvzdqq6chc6qcb98m6lc8m3m2h07"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.38.0-darwin-arm64.tar.gz"; + sha256 = "0lqqcqbq94pgn16b6dlawqqdd5kc019ppfmd900ccl2vx7p1hgqi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.30.0-darwin-arm64.tar.gz"; - sha256 = "0n8my65zbia3kyhcfrzi7119kggkzldmcljhw3i3zh9839a52p7a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.31.1-darwin-arm64.tar.gz"; + sha256 = "1kslay4j7dq49153cyr0sxw9f7vcd7lxx3i4ispydw8wzpjzsrdv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.11.0-darwin-arm64.tar.gz"; - sha256 = "0samqsxs2calvxanf7jljdlk3fimjshwd4w87nzi5amw8grm76l9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.13.0-darwin-arm64.tar.gz"; + sha256 = "1cjbslbm03q5g4hjiflwb9r2hivzmljbfxm6zbd291w3764h2xyq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.7.1-darwin-arm64.tar.gz"; - sha256 = "0pni3rikp7vai89jix54mc1k1niawxb0kajwwqis9k34f1nf8yir"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.8.0-darwin-arm64.tar.gz"; + sha256 = "1idhx267y78hl33vc7w196fyq4bjqjgicrgd8bbls6vh0z0k9zhk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.15-darwin-arm64.tar.gz"; - sha256 = "056l532pqhff0ib5yp2p6jh7hyn3bs6vw7wamgkhnwvl8amqgbmn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.3.0-darwin-arm64.tar.gz"; + sha256 = "1x81na0bj8x2mxy789n944ibf21wlzpqmv1h5i4h9nfm07jqz8d9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.4.2-darwin-arm64.tar.gz"; - sha256 = "1s0cvgp728654dfvhk524w10rws77xapxwigaqrciba5cwasp069"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.5.0-darwin-arm64.tar.gz"; + sha256 = "1y33bybcdmjc39xhnggf06zrffamcdxnjvqiqg8110ps5wxqjzmc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.16.3-darwin-arm64.tar.gz"; - sha256 = "1ypdjf341vq48q9icpxf1fz3am1f8kdjfcmzr9xx5zsvl6dhciv2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.17.0-darwin-arm64.tar.gz"; + sha256 = "0yzvqn2i55y1q5wl1hykdvwv0zj957ascm731d4a6fs54gbnv174"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.19.2-darwin-arm64.tar.gz"; - sha256 = "1bzw8zl11n9kqn8lz7m42rx3yahagi2r3l153146yi080ndvpsbq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.21.0-darwin-arm64.tar.gz"; + sha256 = "1ccyxmkzmj5qah2z912vks548bbrhiifa65h0dm5bkihyjk1bi95"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.15.0-darwin-arm64.tar.gz"; - sha256 = "1h6z3rc4j7a4iq6d1yh7d25jhmn6j55rssfynfpissqgbc275r61"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.16.0-darwin-arm64.tar.gz"; + sha256 = "1f5v4f4y2km8li8hf52cinyi84c6jbi3vv5zw437l8846zir60i4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.131.0-darwin-arm64.tar.gz"; - sha256 = "1ixsmykdi9q3xd3v3i95alhfmdylak44wmxisinfw09c23l3fx1f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.133.0-darwin-arm64.tar.gz"; + sha256 = "18dlrs73y6q954c9331l7gb95a0m2p5dcdxq4yxiawvwlyfm6vv7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-arm64.tar.gz"; sha256 = "1c4pn5nr8d97n9bqd7vz9gzlbi50hnfjylwwch445ylqp5l8gvqf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.27.1-darwin-arm64.tar.gz"; - sha256 = "08aapfbkaqn7q1ngqg4sv070js1zkz1wd6v1hsigi217cgn7l4zc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.28.0-darwin-arm64.tar.gz"; + sha256 = "0cbdkcphzkfchz3xipf950np79i8hyazdlgjycp173zfq8n7323y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.3.1-darwin-arm64.tar.gz"; - sha256 = "1sac633vvm25n2r1hbgk85d4br281i9bqs3r4kd6gqd5qqq3dy9b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.5.0-darwin-arm64.tar.gz"; + sha256 = "1hajg5iaxhl4dk4v67clk5957sd2pznxaj8h3475vmq7vpzxfpwi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.8.0-darwin-arm64.tar.gz"; - sha256 = "1cdz7s9hij9xmpkmlzszj78b9wand55sivwnk49halbwdrfrjd8x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.10.0-darwin-arm64.tar.gz"; + sha256 = "1h8izm6mbvvjj3ybxdskaanh4f3pws3wrl46y4biwkb2b9g71wqp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.4-darwin-arm64.tar.gz"; - sha256 = "0njj75j9b5gq2fwk09i5bnsvph8gvjqm4m4b5jrhmxj34j1325ig"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.13.0-darwin-arm64.tar.gz"; + sha256 = "09aza2hkn6ckr3anzif82ka370g7mqcj4s796lcak15pp93c0q9b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.5-darwin-arm64.tar.gz"; - sha256 = "1bpvab7fm2xi7imgwg6drris8yxxzwlkdpr4awkbsbr0ms8h87qf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.6-darwin-arm64.tar.gz"; + sha256 = "01n4ax2m8ypw8c6dslb6p1akf24wp0wwfdjwy1f9lj79j42nv8lm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.12-darwin-arm64.tar.gz"; diff --git a/pkgs/by-name/qb/qbit-manage/package.nix b/pkgs/by-name/qb/qbit-manage/package.nix index e2014612445e..fabd8b5bd30e 100644 --- a/pkgs/by-name/qb/qbit-manage/package.nix +++ b/pkgs/by-name/qb/qbit-manage/package.nix @@ -4,17 +4,16 @@ python3Packages, testers, nix-update-script, - qbit-manage, }: python3Packages.buildPythonApplication (finalAttrs: { pname = "qbit-manage"; - version = "4.8.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "StuffAnThings"; repo = "qbit_manage"; tag = "v${finalAttrs.version}"; - hash = "sha256-ime1l/j1DGxtsW6BxEEWnes7hwjfsLd5VU2iIsE1eoU="; + hash = "sha256-53G0iXFJHTHRo+cNLpJAXdAYJTyceDpZCpyeZLGyY88="; }; pyproject = true; @@ -52,7 +51,7 @@ python3Packages.buildPythonApplication (finalAttrs: { updateScript = nix-update-script { }; tests = { version = testers.testVersion { - package = qbit-manage; + package = finalAttrs.finalPackage; command = "env HOME=$TMPDIR qbit-manage --version"; }; }; diff --git a/pkgs/by-name/qt/qtwirediff/package.nix b/pkgs/by-name/qt/qtwirediff/package.nix index c042a560e7d8..abc58fc69b0c 100644 --- a/pkgs/by-name/qt/qtwirediff/package.nix +++ b/pkgs/by-name/qt/qtwirediff/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation { pname = "qtwirediff"; - version = "unstable-2023-03-07"; + version = "0-unstable-2026-06-10"; src = fetchFromGitHub { owner = "aaptel"; repo = "qtwirediff"; - rev = "e0a38180cdf9d94b7535c441487dcefb3a8ec72e"; - hash = "sha256-QS4PslSHe2qhxayF7IHvtFASgd4A7vVtSY8tFQ6dqXM="; + rev = "61d7a7013a74ab4ad5fb2c1041d1f2559bd70644"; + hash = "sha256-mE8AiY1KVVLDJyz4yRoVqW2Gae021Ww7u9Qb4EGXetA="; }; nativeBuildInputs = [ @@ -52,7 +52,5 @@ stdenv.mkDerivation { homepage = "https://github.com/aaptel/qtwirediff"; license = lib.licenses.gpl3Plus; maintainers = [ ]; - # error: assignment of member 'trivial' in read-only object - broken = true; }; } diff --git a/pkgs/by-name/qu/qui/package.nix b/pkgs/by-name/qu/qui/package.nix index c65693f43fc8..6454cfbff46a 100644 --- a/pkgs/by-name/qu/qui/package.nix +++ b/pkgs/by-name/qu/qui/package.nix @@ -43,8 +43,8 @@ buildGo126Module (finalAttrs: { sourceRoot ; pnpm = pnpm_11; - fetcherVersion = 3; - hash = "sha256-OEr5uyMnwP1TkSxRFNaopB9AAx2OVE7lNEzGyQwF6kc="; + fetcherVersion = 4; + hash = "sha256-vTVZItC5SUocdw+fHbbGM/v+CHKaB45dc2mUh4Jy8K8="; }; postBuild = '' diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index f470a6f0b4c8..6c5ce29cd413 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -1,7 +1,7 @@ { stdenv, rustPlatform, - pnpm_10, + pnpm_11, fetchPnpmDeps, pnpmConfigHook, cargo-tauri, @@ -23,13 +23,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "readest"; - version = "0.11.1"; + version = "0.11.4"; src = fetchFromGitHub { owner = "readest"; repo = "readest"; tag = "v${finalAttrs.version}"; - hash = "sha256-VS1YpSy9dw0Z6hOZRKhq/3Yl2+x+jxQf7VWXeDs2HIg="; + hash = "sha256-tudx4LLRZXjA5wgfnA7+pBgBIUv1ZOYl2DZbsx7sWr0="; fetchSubmodules = true; }; @@ -44,13 +44,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmRoot = "../.."; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - pnpm = pnpm_10; + pnpm = pnpm_11; fetcherVersion = 3; - hash = "sha256-AnCxGeYaA5pY3tXA8e03fAXvU/mj4mBP0ZA3MUkodNo="; + hash = "sha256-K6KQfXKBopTFJ4LKbFYSe0wVtwWkkhj40nMzYosBeGw="; }; cargoRoot = "../.."; - cargoHash = "sha256-BGI1C8SSDjkqhkBhos1GVXMaIUpYmSmPgb6lTuZJSQs="; + cargoHash = "sha256-HQ7nQvxpfGTudOTGVaXRPqaxFrAOA2HnIcgFpmJsgDI="; buildAndTestSubdir = "src-tauri"; @@ -63,6 +63,8 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail "autoCheckUpdates: true" "autoCheckUpdates: false" \ --replace-fail "telemetryEnabled: true" "telemetryEnabled: false" + jq '.version = "${finalAttrs.version}"' package.json | sponge package.json + mkdir -p src-tauri/plugins/tauri-plugin-turso/dist-js cp -r ${finalAttrs.passthru.tursoPlugin} src-tauri/plugins/tauri-plugin-turso/dist-js jq '.scripts.build = "true"' \ @@ -74,7 +76,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargo-tauri.hook nodejs pnpmConfigHook - pnpm_10 + pnpm_11 pkg-config wrapGAppsHook3 autoPatchelfHook @@ -115,9 +117,9 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tauri-plugin-turso"; version = finalAttrs.version; src = "${finalAttrs.src}/apps/readest-app/src-tauri/plugins/tauri-plugin-turso"; - pnpm = pnpm_10; + pnpm = pnpm_11; fetcherVersion = 3; - hash = "sha256-Jf/UaEaLUg/v9ZRInBCEfkDY4d6nwyAIegCMKZe0iAQ="; + hash = "sha256-NEnZYXN83zYkkIJ5ZjzPqaaee+GE5jYGNGcaxzY9ae8="; }; passthru.tursoPlugin = stdenv.mkDerivation { @@ -126,7 +128,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = "${finalAttrs.src}/apps/readest-app/src-tauri/plugins/tauri-plugin-turso"; nativeBuildInputs = [ - pnpm_10 + pnpm_11 pnpmConfigHook nodejs ]; diff --git a/pkgs/by-name/s-/s-tui/package.nix b/pkgs/by-name/s-/s-tui/package.nix index ce24b0863ecb..e2e601a313f0 100644 --- a/pkgs/by-name/s-/s-tui/package.nix +++ b/pkgs/by-name/s-/s-tui/package.nix @@ -12,7 +12,9 @@ python3Packages.buildPythonPackage (finalAttrs: { pname = "s-tui"; version = "1.3.0"; - format = "setuptools"; + pyproject = true; + + build-system = with python3Packages; [ setuptools ]; src = fetchFromGitHub { owner = "amanusk"; @@ -21,7 +23,7 @@ python3Packages.buildPythonPackage (finalAttrs: { hash = "sha256-B5KQz+/RG+IROJah0jq+2e94DtnILwY2aH9qulWzHns="; }; - propagatedBuildInputs = [ + dependencies = [ python3Packages.urwid python3Packages.psutil stress diff --git a/pkgs/by-name/sd/sddm-astronaut/package.nix b/pkgs/by-name/sd/sddm-astronaut/package.nix index a16a3063289d..546d4bace4b1 100644 --- a/pkgs/by-name/sd/sddm-astronaut/package.nix +++ b/pkgs/by-name/sd/sddm-astronaut/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, kdePackages, formats, nix-update-script, @@ -26,6 +27,8 @@ stdenvNoCC.mkDerivation { dontWrapQtApps = true; + nativeBuildInputs = [ installFonts ]; + propagatedBuildInputs = with kdePackages; [ # avoid .dev outputs propagation qtsvg.out @@ -34,6 +37,8 @@ stdenvNoCC.mkDerivation { ]; installPhase = '' + runHook preInstall + mkdir -p ${basePath} cp -r $src/* ${basePath} '' @@ -46,6 +51,9 @@ stdenvNoCC.mkDerivation { + lib.optionalString (themeConfig != null) '' chmod u+w ${basePath}/Themes/ ln -sf ${configFile} ${basePath}/Themes/${embeddedTheme}.conf.user + '' + + '' + runHook postInstall ''; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/se/seadrive-fuse/package.nix b/pkgs/by-name/se/seadrive-fuse/package.nix index bc6db4358974..6e6ecd594e9c 100644 --- a/pkgs/by-name/se/seadrive-fuse/package.nix +++ b/pkgs/by-name/se/seadrive-fuse/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "seadrive-fuse"; - version = "3.0.22"; + version = "3.0.23"; src = fetchFromGitHub { owner = "haiwen"; repo = "seadrive-fuse"; rev = "v${finalAttrs.version}"; - hash = "sha256-2uw6MpB2whgcPcfplVUBR7XXJ1l/1Z6RMNOzieBPA74="; + hash = "sha256-s43AVVXwpF97tvwxwMDvc8t1KlrDVAv+Ta/QVRui6f8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/se/seadrive-gui/package.nix b/pkgs/by-name/se/seadrive-gui/package.nix index 27ee469cb575..b6b3374394c2 100644 --- a/pkgs/by-name/se/seadrive-gui/package.nix +++ b/pkgs/by-name/se/seadrive-gui/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "seadrive-gui"; - version = "3.0.22"; + version = "3.0.23"; src = fetchFromGitHub { owner = "haiwen"; repo = "seadrive-gui"; rev = "v${finalAttrs.version}"; - hash = "sha256-1RvNJMMPqxsHJx61lvbdpuKgmyo0r66cAMj5uk58AT4="; + hash = "sha256-FnZ96NkS31xC5iImZToz6lRjpJ0ui4UbrTGyA9ij7y8="; }; # Fix cmake modernization warning. diff --git a/pkgs/by-name/sl/slurm-spank-stunnel/backward-compat.patch b/pkgs/by-name/sl/slurm-spank-stunnel/backward-compat.patch new file mode 100644 index 000000000000..b173af0aafbb --- /dev/null +++ b/pkgs/by-name/sl/slurm-spank-stunnel/backward-compat.patch @@ -0,0 +1,15 @@ +diff --git a/slurm-spank-stunnel.c b/slurm-spank-stunnel.c +index b79cea0..c135bf5 100644 +--- a/slurm-spank-stunnel.c ++++ b/slurm-spank-stunnel.c +@@ -41,6 +41,10 @@ + #include + #include + ++#ifndef SLURM_BACKWARD_COMPAT ++#define SLURM_BACKWARD_COMPAT 1 ++#endif ++ + #include + #include + diff --git a/pkgs/by-name/sl/slurm-spank-stunnel/package.nix b/pkgs/by-name/sl/slurm-spank-stunnel/package.nix index 9f9faf653a5f..4ee7ded8530e 100644 --- a/pkgs/by-name/sl/slurm-spank-stunnel/package.nix +++ b/pkgs/by-name/sl/slurm-spank-stunnel/package.nix @@ -16,7 +16,10 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "15cpd49ccvzsmmr3gk8svm2nz461rvs4ybczckyf4yla0xzp06gj"; }; - patches = [ ./hostlist.patch ]; + patches = [ + ./hostlist.patch + ./backward-compat.patch + ]; buildPhase = '' gcc -I${lib.getDev slurm}/include -shared -fPIC -o stunnel.so slurm-spank-stunnel.c diff --git a/pkgs/by-name/sl/slurm-spank-x11/backward-compat.patch b/pkgs/by-name/sl/slurm-spank-x11/backward-compat.patch new file mode 100644 index 000000000000..2787692b63cc --- /dev/null +++ b/pkgs/by-name/sl/slurm-spank-x11/backward-compat.patch @@ -0,0 +1,15 @@ +diff --git a/slurm-spank-x11-plug.c b/slurm-spank-x11-plug.c +index bef6c14..feaf041 100644 +--- a/slurm-spank-x11-plug.c ++++ b/slurm-spank-x11-plug.c +@@ -36,6 +36,10 @@ + + #include + ++#ifndef SLURM_BACKWARD_COMPAT ++#define SLURM_BACKWARD_COMPAT 1 ++#endif ++ + #include + #include + diff --git a/pkgs/by-name/sl/slurm-spank-x11/package.nix b/pkgs/by-name/sl/slurm-spank-x11/package.nix index 381b9aaf88c2..5a5d694c9b3e 100644 --- a/pkgs/by-name/sl/slurm-spank-x11/package.nix +++ b/pkgs/by-name/sl/slurm-spank-x11/package.nix @@ -15,7 +15,10 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "1dmsr7whxcxwnlvl1x4s3bqr5cr6q5ssb28vqi67w5hj4sshisry"; }; - patches = [ ./hostlist.patch ]; + patches = [ + ./hostlist.patch + ./backward-compat.patch + ]; # Required for build with gcc-14 env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; diff --git a/pkgs/by-name/sl/slurm/package.nix b/pkgs/by-name/sl/slurm/package.nix index da347b5a949e..fc1a76af1245 100644 --- a/pkgs/by-name/sl/slurm/package.nix +++ b/pkgs/by-name/sl/slurm/package.nix @@ -30,7 +30,7 @@ libjwt, libyaml, json_c, - http-parser, + llhttp, # enable internal X11 support via libssh2 enableX11 ? true, enablePAM ? true, @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "slurm"; - version = "25-11-6-1"; + version = "26.05.0.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "slurm"; # The release tags use - instead of . rev = "slurm-${builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version}"; - hash = "sha256-8Op/HP0v+cqhdPP6ZLmw+e/SSlFUznydD2pHpqr6kfU="; + hash = "sha256-pEgSPaLGqPeNsw0DkxnZP4n6jx5fy+wTgAu0LZmxmW0="; }; outputs = [ @@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: { libyaml dbus libbpf - http-parser + llhttp s2n-tls ] ++ lib.optionals enableX11 [ xauth ] @@ -121,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--with-freeipmi=${freeipmi}" - "--with-http-parser=${http-parser}" + "--with-llhttp-parser=${lib.getDev llhttp}" "--with-hwloc=${lib.getDev hwloc}" "--with-json=${lib.getDev json_c}" "--with-jwt=${libjwt}" @@ -132,6 +132,7 @@ stdenv.mkDerivation (finalAttrs: { "--sysconfdir=/etc/slurm" "--with-pmix=${lib.getDev pmix}" "--with-bpf=${libbpf}" + "--enable-slurmrestd" "--with-s2n=${ symlinkJoin { name = s2n-tls.name; diff --git a/pkgs/by-name/sw/swi-prolog/package.nix b/pkgs/by-name/sw/swi-prolog/package.nix index 748f0699c8a3..bb43d50cc166 100644 --- a/pkgs/by-name/sw/swi-prolog/package.nix +++ b/pkgs/by-name/sw/swi-prolog/package.nix @@ -10,9 +10,9 @@ openssl, gmp, gperftools, - readline, libedit, libarchive, + libicns, # optional dependencies withDb ? true, @@ -78,7 +78,7 @@ let # minorVersion is even for stable, odd for unstable - version = "9.2.9"; + version = "10.0.2"; # This package provides several with* options, which replaces the old extraLibraries option. # This error should help users that still use this option find their way to these flags. @@ -125,18 +125,25 @@ stdenv.mkDerivation { owner = "SWI-Prolog"; repo = "swipl"; tag = "V${version}"; - hash = "sha256-M0stUwiD3Auz5OsmgVJFWg2RAswu42UUp8bafqZOC7A="; + hash = "sha256-w9BzcnXS2sqHsLXYEcfhZ1niKpifffiDtm8EcJ6cG9g="; fetchSubmodules = true; }; - # Add the packInstall path to the swipl pack search path postPatch = '' + # Add the packInstall path to the swipl pack search path echo "user:file_search_path(pack, '$out/lib/swipl/extra-pack')." >> boot/init.pl + + # iconutil is unavailable, replace with png2icns from libicns + substituteInPlace desktop/make_icns.sh \ + --replace-fail 'iconutil -c icns "$ICONSET_DIR" -o "$OUTPUT"' 'png2icns "$OUTPUT" "$INPUT"' ''; nativeBuildInputs = [ cmake ninja + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libicns ]; buildInputs = [ @@ -146,7 +153,6 @@ stdenv.mkDerivation { openssl gperftools gmp - readline libedit ] ++ optionalDependencies; diff --git a/pkgs/by-name/te/technitium-dns-server/dnssec-do-bit-fix.patch b/pkgs/by-name/te/technitium-dns-server/dnssec-do-bit-fix.patch new file mode 100644 index 000000000000..aaafec50add1 --- /dev/null +++ b/pkgs/by-name/te/technitium-dns-server/dnssec-do-bit-fix.patch @@ -0,0 +1,13 @@ +diff --git a/DnsServerCore/Dns/ZoneManagers/AuthZoneManager.cs b/DnsServerCore/Dns/ZoneManagers/AuthZoneManager.cs +index 352ea6c0..41a9a1c7 100644 +--- a/DnsServerCore/Dns/ZoneManagers/AuthZoneManager.cs ++++ b/DnsServerCore/Dns/ZoneManagers/AuthZoneManager.cs +@@ -3536,7 +3536,7 @@ namespace DnsServerCore.Dns.ZoneManagers + } + } + +- return new DnsDatagram(request.Identifier, true, DnsOpcode.StandardQuery, true, false, request.RecursionDesired, isRecursionAllowed, false, false, rCode, request.Question, answer, authority, additional, udpPayloadSize: _dnsServer.UdpPayloadSize, options: eDnsOptions); ++ return new DnsDatagram(request.Identifier, true, DnsOpcode.StandardQuery, true, false, request.RecursionDesired, isRecursionAllowed, false, false, rCode, request.Question, answer, authority, additional, _dnsServer.UdpPayloadSize, request.DnssecOk ? EDnsHeaderFlags.DNSSEC_OK : EDnsHeaderFlags.None, eDnsOptions); + } + } + diff --git a/pkgs/by-name/te/technitium-dns-server/package.nix b/pkgs/by-name/te/technitium-dns-server/package.nix index a5375f487124..f143be229523 100644 --- a/pkgs/by-name/te/technitium-dns-server/package.nix +++ b/pkgs/by-name/te/technitium-dns-server/package.nix @@ -41,6 +41,12 @@ buildDotnetModule rec { libmsquic ]; + # Confirmed correct by upstream, remove when fixed in a release: + # https://github.com/TechnitiumSoftware/DnsServer/issues/1967 + patches = [ + ./dnssec-do-bit-fix.patch + ]; + passthru.tests = { inherit (nixosTests) technitium-dns-server; }; diff --git a/pkgs/by-name/te/termtekst/package.nix b/pkgs/by-name/te/termtekst/package.nix index 0ae2be7536be..bcb0e3dd8378 100644 --- a/pkgs/by-name/te/termtekst/package.nix +++ b/pkgs/by-name/te/termtekst/package.nix @@ -8,25 +8,27 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "termtekst"; version = "1.0"; - format = "setuptools"; + pyproject = true; + + build-system = with python3Packages; [ setuptools ]; src = fetchFromGitHub { owner = "zevv"; repo = "termtekst"; - rev = "v${finalAttrs.version}"; - sha256 = "1gm7j5d49a60wm7px82b76f610i8pl8ccz4r6qsz90z4mp3lyw9b"; + tag = "v${finalAttrs.version}"; + hash = "sha256-K3FPx63kg/Q1Npl8xhC9KIJgnDlLoH5P5cCoRFqRp74="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ ncurses requests ]; patchPhase = '' substituteInPlace setup.py \ - --replace "assert" "assert 1==1 #" + --replace-fail "assert" "assert 1==1 #" substituteInPlace src/tt \ - --replace "locale.setlocale" "#locale.setlocale" + --replace-fail "locale.setlocale" "#locale.setlocale" ''; meta = { diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix index 814622c58420..941c5a516ef4 100644 --- a/pkgs/by-name/un/unciv/package.nix +++ b/pkgs/by-name/un/unciv/package.nix @@ -12,7 +12,7 @@ nix-update-script, }: let - version = "4.20.10"; + version = "4.20.11"; desktopItem = makeDesktopItem { name = "unciv"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-amAdOVNENwx7E62qBHUnHLC7a6nUMLdzcyxEPnRSsI0="; + hash = "sha256-O9A11GJyz6yApD7Nni11TEohT+8hRDG02k6lQWtBHgw="; }; dontUnpack = true; diff --git a/pkgs/by-name/ve/versatiles/package.nix b/pkgs/by-name/ve/versatiles/package.nix index dfcfc9333cbb..e45d33f266a8 100644 --- a/pkgs/by-name/ve/versatiles/package.nix +++ b/pkgs/by-name/ve/versatiles/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "versatiles"; - version = "4.1.4"; + version = "4.2.0"; src = fetchFromGitHub { owner = "versatiles-org"; repo = "versatiles-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-rM+ybYQTajF0YZoyJPKgc8wtJe5TWqMv8TeGBO/HC/E="; + hash = "sha256-BKRLOZpGe/Oewz8Nmsra1PVOUq63uKtF7ywCJDJR9RU="; }; - cargoHash = "sha256-PJ6tUd9ppSkv0FOWppR9RCc2TBbd1kr7ArasuFVx3OY="; + cargoHash = "sha256-WUpn9RIMCyoOEI7tuCX7CiH4VVdc4QxnFxAKbjf7f/I="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/interpreters/erlang/27.nix b/pkgs/development/interpreters/erlang/27.nix index 52b3e41cee8a..0cd3bf547172 100644 --- a/pkgs/development/interpreters/erlang/27.nix +++ b/pkgs/development/interpreters/erlang/27.nix @@ -1,6 +1,6 @@ genericBuilder: genericBuilder { - version = "27.3.4.12"; - hash = "sha256-RnCBGuqEEJ+3kkbiVNLSb8sAh2i9SNyH9ixkqtAbjsk="; + version = "27.3.4.13"; + hash = "sha256-2WF+EWq1S9IaDuUuG8IR09LjYvEq81E88oq6yFazkkM="; } diff --git a/pkgs/development/interpreters/erlang/28.nix b/pkgs/development/interpreters/erlang/28.nix index bc2c9546c894..3901f643f41a 100644 --- a/pkgs/development/interpreters/erlang/28.nix +++ b/pkgs/development/interpreters/erlang/28.nix @@ -1,6 +1,6 @@ genericBuilder: genericBuilder { - version = "28.5.0.1"; - hash = "sha256-tZQQCBDpDcrN9QX8Qwz6HqNVATck1+emGVOviEhqsLc="; + version = "28.5.0.2"; + hash = "sha256-H25iMB+CvAd8yXv8jydBOCYfMm0LEwN1otRearNthYI="; } diff --git a/pkgs/development/interpreters/erlang/29.nix b/pkgs/development/interpreters/erlang/29.nix index e3c2fbd2a90e..550183d18a9a 100644 --- a/pkgs/development/interpreters/erlang/29.nix +++ b/pkgs/development/interpreters/erlang/29.nix @@ -1,6 +1,6 @@ genericBuilder: genericBuilder { - version = "29.0.1"; - hash = "sha256-0I82VBCgA8KfdNYkNWyqcH+f0Kc6al11BAErtxfVDZo="; + version = "29.0.2"; + hash = "sha256-6tpe+jCOC1V2SOPMH1J8DHVXQqR4pqEjIiAcSitn8Hc="; } diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 24f145e288e4..646bf961f038 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -21,7 +21,6 @@ parallelBuild ? true, fetchFromGitHub, - fetchpatch2, gawk, gnum4, gnused, @@ -112,15 +111,6 @@ stdenv.mkDerivation { ++ optionals javacSupport [ openjdk11 ] ++ optionals enableSystemd [ systemd ]; - patches = lib.optionals (!wxSupport && major == "27") [ - # https://github.com/erlang/otp/pull/11162 - (fetchpatch2 { - name = "otp-27-doc-target-fix.patch"; - url = "https://github.com/erlang/otp/commit/7ce587b61a2557fca79f1c130794abf834f37ee1.patch?full_index=1"; - hash = "sha256-Ce6tWUzeF6TQMxus7ultxG2piFllw/xa5IPLCxSd024="; - }) - ]; - # disksup requires a shell postPatch = '' substituteInPlace lib/os_mon/src/disksup.erl --replace-fail '"sh ' '"${runtimeShell} ' diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 165a36622948..972733e888c1 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -77,7 +77,7 @@ let in { wt4 = generic { - version = "4.12.0"; - sha256 = "sha256-/SM/iTp/TQU8nq647UAHexFb3S5n6pk3lDkra3AEjis="; + version = "4.13.2"; + sha256 = "sha256-UK0r99f8ub7YPETiz3Ka/jCkJmF4qc7R8ZLkb/RWQCI="; }; } diff --git a/pkgs/development/python-modules/airos/default.nix b/pkgs/development/python-modules/airos/default.nix index 8e047308c96d..fad43abef05d 100644 --- a/pkgs/development/python-modules/airos/default.nix +++ b/pkgs/development/python-modules/airos/default.nix @@ -14,7 +14,7 @@ buildPythonPackage (finalAttrs: { pname = "airos"; - version = "0.6.7"; + version = "0.6.8"; pyproject = true; disabled = pythonOlder "3.13"; @@ -23,7 +23,7 @@ buildPythonPackage (finalAttrs: { owner = "CoMPaTech"; repo = "python-airos"; tag = "v${finalAttrs.version}"; - hash = "sha256-ad2rYKVnA3yMhXDwARg01EcAr1Et6ADgppkTEAGDI0I="; + hash = "sha256-TTEhZ0KJaWM7eyD3Kk646X5rEMIquLte41XqnTeO3lI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/arpy/default.nix b/pkgs/development/python-modules/arpy/default.nix index c349f5ceb9f8..f4dc4ca11a1a 100644 --- a/pkgs/development/python-modules/arpy/default.nix +++ b/pkgs/development/python-modules/arpy/default.nix @@ -2,21 +2,26 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "arpy"; version = "2.3.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "viraptor"; repo = "arpy"; - rev = version; + tag = finalAttrs.version; hash = "sha256-jD1XJJhcpJymn0CwZ65U06xLKm1JjHffmx/umEO7a5s="; }; + build-system = [ setuptools ]; + checkInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "arpy" ]; @@ -27,4 +32,4 @@ buildPythonPackage rec { license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ thornycrackers ]; }; -} +}) diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix index f08f32623fc1..89066c5cda16 100644 --- a/pkgs/development/python-modules/azure-common/default.nix +++ b/pkgs/development/python-modules/azure-common/default.nix @@ -9,19 +9,21 @@ isPy3k, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "1.1.28"; - format = "setuptools"; + pyproject = true; pname = "azure-common"; disabled = isPyPy; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; hash = "sha256-SsDNMhTja2obakQmhnIqXYzESWA6qDPz8PQL2oNnBKM="; }; - propagatedBuildInputs = [ azure-nspkg ] ++ lib.optionals (!isPy3k) [ setuptools ]; # need for namespace lookup + build-system = [ setuptools ]; + + dependencies = [ azure-nspkg ] ++ lib.optionals (!isPy3k) [ setuptools ]; # need for namespace lookup postInstall = lib.optionalString (!isPy3k) '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/${python.sitePackages}"/azure/__init__.py @@ -38,4 +40,4 @@ buildPythonPackage rec { maxwilson ]; }; -} +}) diff --git a/pkgs/development/python-modules/azure-cosmosdb-table/default.nix b/pkgs/development/python-modules/azure-cosmosdb-table/default.nix index 4af20e189a28..83b56b0483f3 100644 --- a/pkgs/development/python-modules/azure-cosmosdb-table/default.nix +++ b/pkgs/development/python-modules/azure-cosmosdb-table/default.nix @@ -8,19 +8,22 @@ azure-cosmosdb-nspkg, futures ? null, isPy3k, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-cosmosdb-table"; version = "1.0.6"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; - sha256 = "5f061d2ab8dcf2f0b4e965d5976e7b7aeb1247ea896911f0e1d29092aaaa29c7"; + inherit (finalAttrs) pname version; + hash = "sha256-XwYdKrjc8vC06WXVl257eusSR+qJaRHw4dKQkqqqKcc="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cryptography azure-common azure-storage-common @@ -37,4 +40,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ maxwilson ]; }; -} +}) diff --git a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix index 5917734993a1..c3fe9442a19b 100644 --- a/pkgs/development/python-modules/azure-mgmt-authorization/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-authorization/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, msrest, msrestazure, azure-common, @@ -10,18 +11,22 @@ isPy3k, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-authorization"; version = "4.0.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; hash = "sha256-abhavAmuZPxyl1vUNDEXDYx+tdFmdUuYqsXzhF3lfcQ="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ msrest msrestazure azure-common @@ -32,10 +37,12 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.authorization" ]; + meta = { description = "This is the Microsoft Azure Authorization Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ maxwilson ]; }; -} +}) diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix index abf27d6ca401..1e1ecd10b08a 100644 --- a/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix @@ -2,23 +2,28 @@ lib, buildPythonPackage, fetchPypi, + setuptools, msrestazure, azure-common, azure-mgmt-datalake-nspkg, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-datalake-analytics"; version = "0.6.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; - sha256 = "0d64c4689a67d6138eb9ffbaff2eda2bace7d30b846401673183dcb42714de8f"; + hash = "sha256-DWTEaJpn1hOOuf+6/y7aK6zn0wuEZAFnMYPctCcU3o8="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ msrestazure azure-common azure-mgmt-datalake-nspkg @@ -29,10 +34,12 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.datalake.analytics" ]; + meta = { description = "This is the Microsoft Azure Data Lake Analytics Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ maxwilson ]; }; -} +}) diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix index 33ea84578d07..f9c27c9929bb 100644 --- a/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datalake-nspkg/default.nix @@ -3,20 +3,25 @@ buildPythonPackage, fetchPypi, azure-mgmt-nspkg, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-datalake-nspkg"; version = "3.0.1"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; - sha256 = "deb192ba422f8b3ec272ce4e88736796f216f28ea5b03f28331d784b7a3f4880"; + hash = "sha256-3rGSukIviz7Ccs5OiHNnlvIW8o6lsD8oMx14S3o/SIA="; }; - propagatedBuildInputs = [ azure-mgmt-nspkg ]; + build-system = [ setuptools ]; + + dependencies = [ azure-mgmt-nspkg ]; # has no tests doCheck = false; @@ -27,4 +32,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ maxwilson ]; }; -} +}) diff --git a/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix b/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix index 3a4230b0bdbe..56e286dd4019 100644 --- a/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-devspaces/default.nix @@ -2,23 +2,28 @@ lib, buildPythonPackage, fetchPypi, + setuptools, msrestazure, azure-common, azure-mgmt-nspkg, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-devspaces"; version = "0.2.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; - sha256 = "0dvjsr9i87j1ggbj3dcmgifpk64xr5f5ziwf7z1fwkcx0szcid7k"; + hash = "sha256-87TIvgadTe7CP47HX1zJnZh5XXyVtSHXe0EeFFPWcjc="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ msrestazure azure-common azure-mgmt-nspkg @@ -27,10 +32,12 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.devspaces" ]; + meta = { description = "This is the Microsoft Azure Dev Spaces Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ maxwilson ]; }; -} +}) diff --git a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix index bb7cf727cdaa..4d2e0df42b4c 100644 --- a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchPypi, isPy3k, + setuptools, msrest, msrestazure, azure-common, @@ -10,18 +11,22 @@ azure-mgmt-nspkg, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-devtestlabs"; version = "9.0.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; - sha256 = "d8160d93fd3d947e5613c6919176b0edf72c94ac69679ea3b92cf27ff7398e64"; + hash = "sha256-2BYNk/09lH5WE8aRkXaw7fcslKxpZ56juSzyf/c5jmQ="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ msrest msrestazure azure-common @@ -31,6 +36,8 @@ buildPythonPackage rec { pythonNamespaces = [ "azure.mgmt" ]; + pythonImportsCheck = [ "azure.mgmt.devtestlabs" ]; + # has no tests doCheck = false; @@ -42,4 +49,4 @@ buildPythonPackage rec { maxwilson ]; }; -} +}) diff --git a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix index dcd12e7b7306..ad748df07389 100644 --- a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, msrest, msrestazure, azure-common, @@ -10,18 +11,22 @@ isPy3k, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-hanaonazure"; version = "1.0.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; - sha256 = "f2f8342fbfded8be4165fb0d6f010b68df074886811db3e2c9a50b360ee2dd3a"; + hash = "sha256-8vg0L7/e2L5BZfsNbwELaN8HSIaBHbPiyaULNg7i3To="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ msrest msrestazure azure-common @@ -32,10 +37,12 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.hanaonazure" ]; + meta = { description = "This is the Microsoft Azure SAP Hana on Azure Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ maxwilson ]; }; -} +}) diff --git a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix index 7ad7300aa707..abe83beecdf5 100644 --- a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix @@ -8,20 +8,25 @@ azure-mgmt-core, azure-mgmt-nspkg, isPy3k, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-iotcentral"; version = "9.0.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; - sha256 = "64df73df449a6f3717f3d0963e5869224ed3e6216c79de571493bea7c1b52cb6"; + hash = "sha256-ZN9z30SabzcX89CWPlhpIk7T5iFsed5XFJO+p8G1LLY="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ azure-common azure-mgmt-core msrest @@ -32,10 +37,12 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.iotcentral" ]; + meta = { description = "This is the Microsoft Azure IoTCentral Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ maxwilson ]; }; -} +}) diff --git a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix index ba0212522a9d..55f3581a98f1 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, msrest, msrestazure, azure-common, @@ -9,18 +10,22 @@ azure-mgmt-nspkg, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-iothubprovisioningservices"; version = "1.1.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; hash = "sha256-04OoJuff93L62G6IozpmHpEaUbHHHD6nKlkMHVoJvJ4="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ msrest msrestazure azure-common @@ -33,6 +38,8 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.iothubprovisioningservices" ]; + meta = { description = "This is the Microsoft Azure IoTHub Provisioning Services Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; @@ -41,4 +48,4 @@ buildPythonPackage rec { maxwilson ]; }; -} +}) diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix index 76d54e57b995..4c7e79bad362 100644 --- a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix @@ -2,24 +2,29 @@ lib, buildPythonPackage, fetchPypi, + setuptools, msrest, msrestazure, azure-common, azure-mgmt-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-loganalytics"; version = "12.0.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; - sha256 = "da128a7e0291be7fa2063848df92a9180cf5c16d42adc09d2bc2efd711536bfb"; + hash = "sha256-2hKKfgKRvn+iBjhI35KpGAz1wW1CrcCdK8Lv1xFTa/s="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ msrest msrestazure azure-common @@ -39,4 +44,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ maxwilson ]; }; -} +}) diff --git a/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix b/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix index 45255d441596..ecea97d1ff64 100644 --- a/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-machinelearningcompute/default.nix @@ -2,24 +2,29 @@ lib, buildPythonPackage, fetchPypi, + setuptools, msrest, msrestazure, azure-common, azure-mgmt-nspkg, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-machinelearningcompute"; version = "0.4.1"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; - sha256 = "7a52f85591114ef33a599dabbef840d872b7f599b7823e596af9490ec51b873f"; + hash = "sha256-elL4VZERTvM6WZ2rvvhA2HK39Zm3gj5ZavlJDsUbhz8="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ msrest msrestazure azure-common @@ -35,4 +40,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ maxwilson ]; }; -} +}) diff --git a/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix b/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix index 7c4fe820cbc1..b745239db374 100644 --- a/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-managementpartner/default.nix @@ -2,24 +2,29 @@ lib, buildPythonPackage, fetchPypi, + setuptools, msrestazure, azure-common, azure-mgmt-core, azure-mgmt-nspkg, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-managementpartner"; version = "1.0.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; - sha256 = "1cd591848454a115c216d216a3fb7802c1b5de04b105e2696e4237b0f8768f2f"; + hash = "sha256-HNWRhIRUoRXCFtIWo/t4AsG13gSxBeJpbkI3sPh2jy8="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ msrestazure azure-common azure-mgmt-core @@ -29,10 +34,12 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.managementpartner" ]; + meta = { description = "This is the Microsoft Azure ManagementPartner Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ maxwilson ]; }; -} +}) diff --git a/pkgs/development/python-modules/azure-mgmt-maps/default.nix b/pkgs/development/python-modules/azure-mgmt-maps/default.nix index 1bf20bdd1a14..713621e7c2eb 100644 --- a/pkgs/development/python-modules/azure-mgmt-maps/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-maps/default.nix @@ -6,19 +6,24 @@ fetchPypi, isodate, msrest, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-maps"; version = "2.1.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-XVaml4UuVBanYYHxjB1YT/PvExzgAPbD4gI3Hbc0dI0="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ isodate azure-common azure-mgmt-core @@ -35,8 +40,8 @@ buildPythonPackage rec { meta = { description = "This is the Microsoft Azure Maps Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; - changelog = "https://github.com/Azure/azure-sdk-for-python/blob/v${version}/sdk/maps/azure-mgmt-maps/CHANGELOG.md"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/v${finalAttrs.version}/sdk/maps/azure-mgmt-maps/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ maxwilson ]; }; -} +}) diff --git a/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix b/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix index b58181cdfcce..c1665509d223 100644 --- a/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix @@ -8,20 +8,25 @@ azure-mgmt-nspkg, isPy3k, azure-mgmt-core, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-marketplaceordering"; version = "1.1.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; - sha256 = "68b381f52a4df4435dacad5a97e1c59ac4c981f667dcca8f9d04453417d60ad8"; + hash = "sha256-aLOB9SpN9ENdrK1al+HFmsTJgfZn3MqPnQRFNBfWCtg="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ msrest msrestazure azure-common @@ -32,10 +37,12 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.marketplaceordering" ]; + meta = { description = "This is the Microsoft Azure Market Place Ordering Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ maxwilson ]; }; -} +}) diff --git a/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix b/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix index 9c15035259c5..10f3e7e3b1e8 100644 --- a/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-notificationhubs/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, msrest, msrestazure, azure-common, @@ -9,18 +10,22 @@ azure-mgmt-nspkg, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-notificationhubs"; version = "8.0.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; - sha256 = "4dd924f4704993e3ebf1d42e2be1cbe0b0d908e695857fa08c4369ae11d0eb36"; + hash = "sha256-Tdkk9HBJk+Pr8dQuK+HL4LDZCOaVhX+gjENprhHQ6zY="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ msrest msrestazure azure-common @@ -31,10 +36,12 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.notificationhubs" ]; + meta = { description = "This is the Microsoft Azure Notification Hubs Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ maxwilson ]; }; -} +}) diff --git a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix index fe0ca38f2636..1fc4634c1474 100644 --- a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, msrest, msrestazure, azure-common, @@ -10,18 +11,22 @@ isPy3k, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-rdbms"; version = "10.1.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; hash = "sha256-qH1AHIdshHNM3UiIr1UeShRhtLMo2YFq9gy4rFl58DU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ azure-common azure-mgmt-core msrest @@ -39,4 +44,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ maxwilson ]; }; -} +}) diff --git a/pkgs/development/python-modules/azure-mgmt-redis/default.nix b/pkgs/development/python-modules/azure-mgmt-redis/default.nix index 9c0200e90eed..60f829c75b4e 100644 --- a/pkgs/development/python-modules/azure-mgmt-redis/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-redis/default.nix @@ -5,20 +5,25 @@ buildPythonPackage, fetchPypi, isodate, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-redis"; version = "14.5.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "azure_mgmt_redis"; hash = "sha256-XDQ0yCSSaI4luTqvURPs/wuSt61toqT9RpVTD4KxUvo="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ isodate azure-common azure-mgmt-core @@ -32,8 +37,8 @@ buildPythonPackage rec { meta = { description = "This is the Microsoft Azure Redis Cache Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; - changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-redis_${version}/sdk/redis/azure-mgmt-redis/CHANGELOG.md"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-redis_${finalAttrs.version}/sdk/redis/azure-mgmt-redis/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ maxwilson ]; }; -} +}) diff --git a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix index 656939f3d4ef..ad28590746cf 100644 --- a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix @@ -2,24 +2,29 @@ lib, buildPythonPackage, fetchPypi, + setuptools, msrest, msrestazure, azure-common, azure-mgmt-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-signalr"; version = "1.2.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; hash = "sha256-jbFhVoJbObpvcVJr2VoUzY5CmSblJ6OK7Q3l17SARfg="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ msrest msrestazure azure-common @@ -29,10 +34,12 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.signalr" ]; + meta = { description = "This is the Microsoft Azure SignalR Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ maxwilson ]; }; -} +}) diff --git a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix index 20e7f761e5b9..15dd01bb3b28 100644 --- a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, msrest, msrestazure, azure-common, @@ -10,18 +11,22 @@ isPy3k, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "azure-mgmt-subscription"; version = "3.1.1"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; hash = "sha256-TiVbTOm5JDV7uMUAmzyIogFNMgOySV4iVvoCe/hOgA4="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ azure-common azure-mgmt-core msrest @@ -39,4 +44,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ maxwilson ]; }; -} +}) diff --git a/pkgs/development/python-modules/azure-nspkg/default.nix b/pkgs/development/python-modules/azure-nspkg/default.nix index e0ef56106320..09b9893ceaa9 100644 --- a/pkgs/development/python-modules/azure-nspkg/default.nix +++ b/pkgs/development/python-modules/azure-nspkg/default.nix @@ -2,19 +2,24 @@ lib, buildPythonPackage, fetchPypi, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { version = "3.0.2"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; pname = "azure-nspkg"; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; extension = "zip"; - sha256 = "e7d3cea6af63e667d87ba1ca4f8cd7cb4dfca678e4c55fc1cedb320760e39dd0"; + hash = "sha256-59POpq9j5mfYe6HKT4zXy038pnjkxV/BztsyB2DjndA="; }; + build-system = [ setuptools ]; + doCheck = false; meta = { @@ -26,4 +31,4 @@ buildPythonPackage rec { maxwilson ]; }; -} +}) diff --git a/pkgs/development/python-modules/beets-audible/default.nix b/pkgs/development/python-modules/beets-audible/default.nix index 071cd0b64ea9..954e76b284d9 100644 --- a/pkgs/development/python-modules/beets-audible/default.nix +++ b/pkgs/development/python-modules/beets-audible/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "beets-audible"; - version = "1.4.0"; + version = "1.5.0"; pyproject = true; src = fetchFromGitHub { owner = "Neurrone"; repo = "beets-audible"; tag = "v${version}"; - hash = "sha256-eyyj1zwdf7pINeULhhPvUnnkE2skE69fpWArZls0nLU="; + hash = "sha256-UAg+0h4OA5di4QIkVXE4yyrD/R4TZs/zL+usMNNyyM0="; }; build-system = [ diff --git a/pkgs/development/python-modules/bencoder/default.nix b/pkgs/development/python-modules/bencoder/default.nix index 195898ac5562..51ab63bab42e 100644 --- a/pkgs/development/python-modules/bencoder/default.nix +++ b/pkgs/development/python-modules/bencoder/default.nix @@ -2,17 +2,22 @@ lib, fetchPypi, buildPythonPackage, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "bencoder"; version = "0.2.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-rENvM/3X51stkFdJHSq+77VjHvsTyBNAPbCtsRq1L8I="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "bencoder" ]; # There are no tests. @@ -24,4 +29,4 @@ buildPythonPackage rec { license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ somasis ]; }; -} +}) diff --git a/pkgs/development/python-modules/checkdmarc/default.nix b/pkgs/development/python-modules/checkdmarc/default.nix index 636ce721286b..de61bab4f1c3 100644 --- a/pkgs/development/python-modules/checkdmarc/default.nix +++ b/pkgs/development/python-modules/checkdmarc/default.nix @@ -19,14 +19,14 @@ buildPythonPackage (finalAttrs: { pname = "checkdmarc"; - version = "5.15.4"; + version = "5.17.0"; pyproject = true; src = fetchFromGitHub { owner = "domainaware"; repo = "checkdmarc"; tag = finalAttrs.version; - hash = "sha256-MafEl+5uZS490ZZqi74alOnbLfDyMGb5RK5CtyHUS60="; + hash = "sha256-smKilbk+91da1Jh/e+eG6rP/YSCwS499qk3qHFQWH3A="; }; pythonRelaxDeps = [ @@ -54,8 +54,6 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "checkdmarc" ]; - enabledTestPaths = [ "tests.py" ]; - disabledTests = [ # Tests require network access "testBIMI" diff --git a/pkgs/development/python-modules/claude-agent-sdk/default.nix b/pkgs/development/python-modules/claude-agent-sdk/default.nix index c80115c60cbb..818be3c6bab0 100644 --- a/pkgs/development/python-modules/claude-agent-sdk/default.nix +++ b/pkgs/development/python-modules/claude-agent-sdk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage (finalAttrs: { pname = "claude-agent-sdk"; - version = "0.2.93"; + version = "0.2.95"; pyproject = true; src = fetchFromGitHub { owner = "anthropics"; repo = "claude-agent-sdk-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-QicWndxvYe2E9bYgIcPWVm2E9M5WRpH84C2biW/QhaE="; + hash = "sha256-lRKZJoNMXvC0uwp9yAOQSYQwNEV9AUivBO338QosVMc="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/deep-ep/default.nix b/pkgs/development/python-modules/deep-ep/default.nix index 0ad6abb30b53..e44a19e92407 100644 --- a/pkgs/development/python-modules/deep-ep/default.nix +++ b/pkgs/development/python-modules/deep-ep/default.nix @@ -4,8 +4,9 @@ fetchFromGitHub, # build-system - torch, + ninja, setuptools, + torch, # env cudaPackages, @@ -50,6 +51,7 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: { }; build-system = [ + ninja setuptools torch ]; diff --git a/pkgs/development/python-modules/easyprocess/default.nix b/pkgs/development/python-modules/easyprocess/default.nix index 7d904d67f813..fd533a2bf978 100644 --- a/pkgs/development/python-modules/easyprocess/default.nix +++ b/pkgs/development/python-modules/easyprocess/default.nix @@ -2,19 +2,26 @@ lib, buildPythonPackage, fetchPypi, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAtrrs: { pname = "easyprocess"; version = "1.1"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { pname = "EasyProcess"; - inherit version; + inherit (finalAtrrs) version; hash = "sha256-iFiYMCpXqrlIlz6LXTKkIpOSufstmGqx1P/VkOW6kOw="; }; + build-system = [ + setuptools + ]; + # No tests doCheck = false; @@ -24,4 +31,4 @@ buildPythonPackage rec { license = lib.licenses.bsdOriginal; maintainers = with lib.maintainers; [ layus ]; }; -} +}) diff --git a/pkgs/development/python-modules/fluss-api/default.nix b/pkgs/development/python-modules/fluss-api/default.nix index b346014af6d2..2bbce4d981b8 100644 --- a/pkgs/development/python-modules/fluss-api/default.nix +++ b/pkgs/development/python-modules/fluss-api/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "fluss-api"; - version = "0.2.4"; + version = "0.2.5"; pyproject = true; src = fetchFromGitHub { owner = "fluss"; repo = "Fluss_Python_Library"; tag = "v${finalAttrs.version}"; - hash = "sha256-zAhxx2X1DnfXlf+OzyACx6e3bQkoagffBPPnEe05xbM="; + hash = "sha256-LXuQUVHssQPA7QTFZm3gqs/WKsDz4HCAyG7ktWIrLBY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/frigidaire/default.nix b/pkgs/development/python-modules/frigidaire/default.nix index c85d37f900ab..c69c1d4dc228 100644 --- a/pkgs/development/python-modules/frigidaire/default.nix +++ b/pkgs/development/python-modules/frigidaire/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "frigidaire"; - version = "0.18.45"; + version = "0.18.46"; pyproject = true; src = fetchFromGitHub { owner = "bm1549"; repo = "frigidaire"; tag = finalAttrs.version; - hash = "sha256-cCfl9TQhcED/gfhLpB1Z6+lYSeY9PnuWHePWXm42vng="; + hash = "sha256-UyzVeJ+D9gFyru1DjwCoVTQQK26jP4rxFfiTpBdo36g="; }; postPatch = '' diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index 15ac55cb6783..65d8e16aec29 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -83,7 +83,7 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ rmcgibbo - philipwilk + jadewilk ]; }; } diff --git a/pkgs/development/python-modules/keystone-engine/default.nix b/pkgs/development/python-modules/keystone-engine/default.nix index b2b730e2b881..a9d537cbc8c1 100644 --- a/pkgs/development/python-modules/keystone-engine/default.nix +++ b/pkgs/development/python-modules/keystone-engine/default.nix @@ -3,19 +3,26 @@ stdenv, buildPythonPackage, fetchPypi, + setuptools, keystone, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "keystone-engine"; version = "0.9.2"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; sha256 = "1xahdr6bh3dw5swrc2r8kqa8ljhqlb7k2kxv5mrw5rhcmcnzcyig"; }; + build-system = [ + setuptools + ]; + setupPyBuildFlags = lib.optionals stdenv.hostPlatform.isLinux [ "--plat-name" "linux" @@ -37,4 +44,4 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ dump_stack ]; license = lib.licenses.gpl2Only; }; -} +}) diff --git a/pkgs/development/python-modules/lifx-async/default.nix b/pkgs/development/python-modules/lifx-async/default.nix index 7a0d8cef2351..fa473159c113 100644 --- a/pkgs/development/python-modules/lifx-async/default.nix +++ b/pkgs/development/python-modules/lifx-async/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "lifx-async"; - version = "5.4.8"; + version = "5.4.9"; pyproject = true; src = fetchFromGitHub { owner = "Djelibeybi"; repo = "lifx-async"; tag = "v${finalAttrs.version}"; - hash = "sha256-392gHHekZ+rfZzR21ISUqdFiLGFoQSkJeyn3oRSs3+g="; + hash = "sha256-DWclqWrCoUfFC2gu1CbrqHxx4BFP1jV597c4llq2B5A="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/modern-colorthief/default.nix b/pkgs/development/python-modules/modern-colorthief/default.nix index 875f640b8722..88c026250839 100644 --- a/pkgs/development/python-modules/modern-colorthief/default.nix +++ b/pkgs/development/python-modules/modern-colorthief/default.nix @@ -11,19 +11,19 @@ buildPythonPackage rec { pname = "modern-colorthief"; - version = "0.2.1"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "baseplate-admin"; repo = "modern_colorthief"; tag = version; - hash = "sha256-pBCL4ejBcqTWRxb5t/L4fiJLj8Jm8diwXE91RoQ/NSU="; + hash = "sha256-oQ0ZAL8GyzKfFoSBJS2LIck2Z1IzZCYrkOc9nXfqyyg="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-x9TxXE0BGXnTFCTbbctAKWlT37NE18IpevvTFzfb/G0="; + hash = "sha256-csGUiJKAZn8OF3lxfw5VPwZxWDXHpFC0rczkD1+P8Sk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nixl/default.nix b/pkgs/development/python-modules/nixl/default.nix index a2fb72e2ea57..96eeef4f6033 100644 --- a/pkgs/development/python-modules/nixl/default.nix +++ b/pkgs/development/python-modules/nixl/default.nix @@ -40,7 +40,10 @@ buildPythonPackage.override { inherit (nixl) stdenv; } (finalAttrs: { substituteInPlace pyproject.toml \ --replace-fail \ '"patchelf",' \ - "" + "" \ + --replace-fail \ + "torch==2.11.*" \ + "torch" ''; build-system = [ diff --git a/pkgs/development/python-modules/nptyping/default.nix b/pkgs/development/python-modules/nptyping/default.nix index b82f21fb51d9..83a07c808edd 100644 --- a/pkgs/development/python-modules/nptyping/default.nix +++ b/pkgs/development/python-modules/nptyping/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, + setuptools, beartype, invoke, numpy, @@ -10,15 +11,17 @@ feedparser, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "nptyping"; version = "2.5.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "ramonhagenaars"; repo = "nptyping"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-hz4YrcvARCAA7TXapmneIwle/F4pzcIYLPSmiFHC0VQ="; }; @@ -26,7 +29,9 @@ buildPythonPackage rec { ./numpy-2.0-compat.patch ]; - propagatedBuildInputs = [ numpy ]; + build-system = [ setuptools ]; + + dependencies = [ numpy ]; nativeCheckInputs = [ beartype @@ -63,11 +68,11 @@ buildPythonPackage rec { meta = { description = "Type hints for numpy"; homepage = "https://github.com/ramonhagenaars/nptyping"; - changelog = "https://github.com/ramonhagenaars/nptyping/blob/v${version}/HISTORY.md"; + changelog = "https://github.com/ramonhagenaars/nptyping/blob/v${finalAttrs.version}/HISTORY.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bcdarwin pandapip1 ]; }; -} +}) diff --git a/pkgs/development/python-modules/nvidia-ml-py/default.nix b/pkgs/development/python-modules/nvidia-ml-py/default.nix index faff24b826e5..abe4a675a1ca 100644 --- a/pkgs/development/python-modules/nvidia-ml-py/default.nix +++ b/pkgs/development/python-modules/nvidia-ml-py/default.nix @@ -11,14 +11,14 @@ buildPythonPackage (finalAttrs: { pname = "nvidia-ml-py"; - version = "13.595.45"; - + version = "13.610.43"; pyproject = true; + __structuredAttrs = true; src = fetchPypi { pname = "nvidia_ml_py"; inherit (finalAttrs) version; - hash = "sha256-yfNIl/4EQf81vI81uvgPgwogsPTmznHgoyW8Dmas8Hk="; + hash = "sha256-ZUN+tz1o0MYskxyk1FA4Ry+v8DvQuHKau6S4mfcNYPI="; }; patches = [ diff --git a/pkgs/development/python-modules/plover/4.nix b/pkgs/development/python-modules/plover/4.nix index bda985cb0122..eee8ac5e5dc8 100644 --- a/pkgs/development/python-modules/plover/4.nix +++ b/pkgs/development/python-modules/plover/4.nix @@ -70,6 +70,10 @@ buildPythonPackage (finalAttrs: { # Segfaults?! disabledTestPaths = [ "test/gui_qt/test_dictionaries_widget.py" ]; + postInstall = '' + install -Dm 444 linux/plover.desktop $out/share/applications/plover.desktop + ''; + preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; diff --git a/pkgs/development/python-modules/plover/5.nix b/pkgs/development/python-modules/plover/5.nix index 1abbf78609e9..7676abeb0ee2 100644 --- a/pkgs/development/python-modules/plover/5.nix +++ b/pkgs/development/python-modules/plover/5.nix @@ -124,6 +124,10 @@ buildPythonPackage (finalAttrs: { "test/gui_qt/test_i18n_files.py" # babel errors ]; + postInstall = '' + install -Dm 444 linux/plover.desktop $out/share/applications/plover.desktop + ''; + preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; diff --git a/pkgs/development/python-modules/proton-vpn-api-core/default.nix b/pkgs/development/python-modules/proton-vpn-api-core/default.nix index e0749cfa419c..05a702d03b4d 100644 --- a/pkgs/development/python-modules/proton-vpn-api-core/default.nix +++ b/pkgs/development/python-modules/proton-vpn-api-core/default.nix @@ -10,6 +10,7 @@ iproute2, jinja2, networkmanager, + packaging, proton-core, proton-vpn-local-agent, pycairo, @@ -27,14 +28,14 @@ buildPythonPackage rec { pname = "proton-vpn-api-core"; - version = "5.0.1"; + version = "5.2.4"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-api-core"; rev = "v${version}"; - hash = "sha256-XdQLgHKNqBNwY51niSiE1HHxLJ3efipS03IUiyHQCiY="; + hash = "sha256-Z1+HhHYrRcqo3IPodXk7GQyxb6XutBZBUeNLskLzAzI="; }; postPatch = '' @@ -61,6 +62,7 @@ buildPythonPackage rec { distro fido2 jinja2 + packaging proton-core proton-vpn-local-agent pycairo diff --git a/pkgs/development/python-modules/proton-vpn-local-agent/default.nix b/pkgs/development/python-modules/proton-vpn-local-agent/default.nix index f1204b9f6e51..754b72b7a848 100644 --- a/pkgs/development/python-modules/proton-vpn-local-agent/default.nix +++ b/pkgs/development/python-modules/proton-vpn-local-agent/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "proton-vpn-local-agent"; - version = "1.6.2"; + version = "1.6.3"; pyproject = false; withDistOutput = false; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "ProtonVPN"; repo = "local-agent-rs"; rev = version; - hash = "sha256-VmZ8nsKqP8jyNe7Rl+PHsXhsjgchq3rKmTtAqFEe7yM="; + hash = "sha256-y2FEfICwWa/GgaKkq8CR+lVDYIsk0HsuKuGUsUQZAFo="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -29,7 +29,7 @@ buildPythonPackage rec { src sourceRoot ; - hash = "sha256-MOCLMQ8mqv8Q3I3bIS0ynfpPmrULMA+80RHZBeu7r5s="; + hash = "sha256-y8I806dbC7n3eMFyrzGJokfVDwEGFdC7NgzSA0G8hkQ="; }; sourceRoot = "${src.name}/python-proton-vpn-local-agent"; diff --git a/pkgs/development/python-modules/pyquerylist/default.nix b/pkgs/development/python-modules/pyquerylist/default.nix index af03588470e7..0d91523a101f 100644 --- a/pkgs/development/python-modules/pyquerylist/default.nix +++ b/pkgs/development/python-modules/pyquerylist/default.nix @@ -45,6 +45,6 @@ buildPythonPackage { description = "Extension of base Python list that you can query"; homepage = "https://github.com/markmuetz/pyquerylist"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ philipwilk ]; + maintainers = with lib.maintainers; [ jadewilk ]; }; } diff --git a/pkgs/development/python-modules/pyscf/default.nix b/pkgs/development/python-modules/pyscf/default.nix index 9028317762b5..a248a1bb0d49 100644 --- a/pkgs/development/python-modules/pyscf/default.nix +++ b/pkgs/development/python-modules/pyscf/default.nix @@ -5,6 +5,8 @@ # build-sysetm cmake, + setuptools, + wheel, # build inputs blas, @@ -13,29 +15,40 @@ xcfun, # dependencies - cppe, h5py, numpy, scipy, + # optional-dependencies + cppe, + # tests pytestCheckHook, }: -buildPythonPackage { +buildPythonPackage (finalAttrs: { pname = "pyscf"; - version = "2.13.0"; - format = "setuptools"; + version = "2.13.1"; + pyproject = true; src = fetchFromGitHub { owner = "pyscf"; repo = "pyscf"; - rev = "e8642fb7220248bd750c34ef6adf88a9744977ee"; - hash = "sha256-RVv5vTmTtHDAbgOXHW1DUzYVsf+NvrYh9++WfNGJ07k="; + tag = "v${finalAttrs.version}"; + hash = "sha256-IEgbm7sZqxKxI+VPE9IoH+BAHkNgasGmRsdDykUFCeM="; }; # setup.py calls Cmake and passes the arguments in CMAKE_CONFIGURE_ARGS to cmake. - build-system = [ cmake ]; + build-system = [ + setuptools + wheel + cmake + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "cmake<4.0" "cmake" + ''; dontUseCmakeConfigure = true; preConfigure = '' export CMAKE_CONFIGURE_ARGS="-DBUILD_LIBCINT=0 -DBUILD_LIBXC=0 -DBUILD_XCFUN=0" @@ -50,13 +63,19 @@ buildPythonPackage { ]; dependencies = [ - cppe h5py numpy scipy ]; - nativeCheckInputs = [ pytestCheckHook ]; + optional-dependencies = { + cppe = [ cppe ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ] + ++ finalAttrs.passthru.optional-dependencies.cppe; pythonImportsCheck = [ "pyscf" ]; preCheck = '' # Set config used by tests to ensure reproducibility @@ -89,6 +108,7 @@ buildPythonPackage { "test_finite_diff_roks_grad" "test_finite_diff_df_roks_grad" "test_frac_particles" + "test_gwac_pade_frozen" "test_nosymm_sa4_newton" "test_pipek" "test_n3_cis_ewald" @@ -117,4 +137,4 @@ buildPythonPackage { ]; maintainers = [ lib.maintainers.sheepforce ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyscss/default.nix b/pkgs/development/python-modules/pyscss/default.nix index c3731ea6d970..278aa7b1c247 100644 --- a/pkgs/development/python-modules/pyscss/default.nix +++ b/pkgs/development/python-modules/pyscss/default.nix @@ -3,24 +3,29 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, + setuptools, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyscss"; version = "1.4.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchFromGitHub { repo = "pyScss"; owner = "Kronuz"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-z0y4z+/JE6rZWHAvps/taDZvutyVhxxs2gMujV5rNu4="; }; - nativeCheckInputs = [ pytestCheckHook ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ six ]; + dependencies = [ six ]; + + nativeCheckInputs = [ pytestCheckHook ]; # Test suite is broken. # See https://github.com/Kronuz/pyScss/issues/415 @@ -32,4 +37,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index 87496c5f6476..338a4364bd7b 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -2,32 +2,26 @@ lib, buildPythonPackage, fetchPypi, - pythonAtLeast, - ipykernel, - msgpack, - networkx, - nglview, - numpy, - psutil, - py-cpuinfo, - pydantic, - pytestCheckHook, - pyyaml, - qcelemental, - scipy, setuptools, setuptools-scm, + pyyaml, + py-cpuinfo, + psutil, + qcelemental, + pydantic, pydantic-settings, + packaging, + pytestCheckHook, }: buildPythonPackage rec { pname = "qcengine"; - version = "0.50.0rc2"; + version = "0.50.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-XIxHFemTXXsqCLAHizzrEt0tVdfp6vY0Pl4CHv+EzDM="; + hash = "sha256-x218Sq4QOoqTpcSM9TzQydhIn9LthflCuNh/P0stZmU="; }; build-system = [ @@ -36,28 +30,16 @@ buildPythonPackage rec { ]; dependencies = [ - msgpack - numpy - psutil - py-cpuinfo - pydantic pyyaml + py-cpuinfo + psutil qcelemental + pydantic pydantic-settings + packaging ]; - optional-dependencies = { - align = [ - networkx - scipy - ]; - viz = [ - ipykernel - nglview - ]; - }; - - nativeCheckInputs = [ pytestCheckHook ] ++ lib.concatAttrValues optional-dependencies; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "qcengine" ]; diff --git a/pkgs/development/python-modules/railroad-diagrams/default.nix b/pkgs/development/python-modules/railroad-diagrams/default.nix index 266b6644018a..72700efb323b 100644 --- a/pkgs/development/python-modules/railroad-diagrams/default.nix +++ b/pkgs/development/python-modules/railroad-diagrams/default.nix @@ -2,18 +2,23 @@ lib, buildPythonPackage, fetchPypi, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "railroad-diagrams"; version = "3.0.1"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-qRMyuskAyzw2czH6m2mfCJe8+GtyZPZUWGdd9DDQTOM="; }; + build-system = [ setuptools ]; + # This is a dependency of pyparsing, which is a dependency of pytest doCheck = false; @@ -25,4 +30,4 @@ buildPythonPackage rec { license = lib.licenses.cc0; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix index ab9304395e9b..c311a85153ad 100644 --- a/pkgs/development/python-modules/reflex/default.nix +++ b/pkgs/development/python-modules/reflex/default.nix @@ -98,14 +98,14 @@ in buildPythonPackage (finalAttrs: { pname = "reflex"; - version = "0.9.2"; + version = "0.9.4"; pyproject = true; src = fetchFromGitHub { owner = "reflex-dev"; repo = "reflex"; tag = "v${finalAttrs.version}"; - hash = "sha256-HY8FaOUU2kp/39OqO+7Xpepiu/6obxTMir11jGtRAkE="; + hash = "sha256-CTW8p8cPSZnTMgXk9F6oHvbfIiTtgKZVvRygUZbccJw="; }; build-system = [ @@ -193,6 +193,10 @@ buildPythonPackage (finalAttrs: { # AssertionError (mocked_open.call_count == 2) "test_delete_token_from_config" + + # circular imports (reflex-docgen) + "test_compiling_docs_does_not_evaluate_upload" + "test_enterprise_parent_breadcrumb_uses_overview_route" ]; disabledTestPaths = [ @@ -205,6 +209,7 @@ buildPythonPackage (finalAttrs: { # circular imports (reflex-docgen) "tests/units/docgen/test_class_and_component.py" "tests/units/docgen/test_markdown.py" + "tests/units/docgen/test_reflex_transformer.py" "docs/app/tests/test_doc_links.py" "docs/app/tests/test_docgen_double_eval.py" @@ -369,7 +374,6 @@ buildPythonPackage (finalAttrs: { mistletoe pyyaml finalAttrs.finalPackage # reflex - typing-extensions typing-inspection ]; reflex-hosting-cli.dependencies = [ diff --git a/pkgs/development/python-modules/sklearn-compat/default.nix b/pkgs/development/python-modules/sklearn-compat/default.nix index 59da0f123eb9..494a080ce458 100644 --- a/pkgs/development/python-modules/sklearn-compat/default.nix +++ b/pkgs/development/python-modules/sklearn-compat/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { description = "Ease multi-version support for scikit-learn compatible library"; homepage = "https://github.com/sklearn-compat/sklearn-compat"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ philipwilk ]; + maintainers = with lib.maintainers; [ jadewilk ]; }; } diff --git a/pkgs/development/python-modules/slack-bolt/default.nix b/pkgs/development/python-modules/slack-bolt/default.nix index 9f78da222d65..93e5b09cd7e4 100644 --- a/pkgs/development/python-modules/slack-bolt/default.nix +++ b/pkgs/development/python-modules/slack-bolt/default.nix @@ -103,6 +103,13 @@ buildPythonPackage (finalAttrs: { "test_failure" # TypeError "test_oauth" + # AssertionError + "test_buffer_size_overrides" + "test_buffer_size_overrides" + "test_default_params" + "test_default_params" + "test_parameter_overrides" + "test_parameter_overrides" ]; meta = { diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index a8b23ccc86b5..b6eeaa14fc7e 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -16,30 +16,30 @@ websockets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "slack-sdk"; - version = "3.41.0"; + version = "3.42.0"; pyproject = true; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; - tag = "v${version}"; - hash = "sha256-TH4wWQ1rCmlWgDtqX04FJKL95YgOKc543yJN/FLtKeA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-d0XuzBhn2Ex57xjeAF1q5RcwoWVsFWnlsWUufB3Um4g="; }; build-system = [ setuptools ]; - optional-dependencies.optional = [ - aiodns - aiohttp - boto3 - sqlalchemy - websocket-client - websockets - ]; - - pythonImportsCheck = [ "slack_sdk" ]; + optional-dependencies = { + optional = [ + aiodns + aiohttp + boto3 + sqlalchemy + websocket-client + websockets + ]; + }; nativeCheckInputs = [ aiosqlite @@ -47,7 +47,9 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook ] - ++ optional-dependencies.optional; + ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies); + + pythonImportsCheck = [ "slack_sdk" ]; disabledTests = [ # Requires internet access (to slack API) @@ -75,8 +77,8 @@ buildPythonPackage rec { meta = { description = "Slack Developer Kit for Python"; homepage = "https://slack.dev/python-slack-sdk/"; - changelog = "https://github.com/slackapi/python-slack-sdk/releases/tag/v${version}"; + changelog = "https://github.com/slackapi/python-slack-sdk/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/synthetic-home/default.nix b/pkgs/development/python-modules/synthetic-home/default.nix index 6c974e90bdd7..a8eb8c9450c7 100644 --- a/pkgs/development/python-modules/synthetic-home/default.nix +++ b/pkgs/development/python-modules/synthetic-home/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "synthetic-home"; - version = "5.0.2"; + version = "5.0.3"; pyproject = true; src = fetchFromGitHub { owner = "allenporter"; repo = "synthetic-home"; tag = finalAttrs.version; - hash = "sha256-u5suLTK7Cdp6IKVxnmiw8p+xQiXV5nfc6QUvpqCyxTk="; + hash = "sha256-oXZVnw4Oc0jC1TBVTV4EI3Ta1zsqLop+c8uyEzAFpLI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/torchmd-net/default.nix b/pkgs/development/python-modules/torchmd-net/default.nix new file mode 100644 index 000000000000..5651c4428ef9 --- /dev/null +++ b/pkgs/development/python-modules/torchmd-net/default.nix @@ -0,0 +1,96 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + setuptools-scm, + + # dependencies + ase, + h5py, + lightning, + numpy, + torch, + torch-geometric, + tqdm, + warp-lang, + + # tests + pytest-xdist, + pytestCheckHook, + writableTmpDirAsHomeHook, + llvmPackages, +}: + +buildPythonPackage (finalAttrs: { + pname = "torchmd-net"; + version = "3.0.3"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "torchmd"; + repo = "torchmd-net"; + tag = "v${finalAttrs.version}"; + hash = "sha256-FBeeNkc7mJQYmMwlsW3Un+3RHvErJM7rWKUqSCYYUCM="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + pythonRemoveDeps = [ + # Not a runtime dependency + "setuptools" + ]; + dependencies = [ + ase + h5py + lightning + numpy + torch + torch-geometric + tqdm + warp-lang + ]; + + pythonImportsCheck = [ "torchmdnet" ]; + + nativeCheckInputs = [ + pytest-xdist + pytestCheckHook + writableTmpDirAsHomeHook + ]; + + checkInputs = lib.optionals stdenv.cc.isClang [ + # torch._inductor.exc.InductorError: CppCompileError: C++ compile error + # fatal error: 'omp.h' file not found + llvmPackages.openmp + ]; + + disabledTests = [ + # Require internet access + "test_dataset_s66x8" + + # Failed: torch.compile failed on TorchScripted tensornet model: + # torch.compile does not support compiling torch.jit.script or torch.jit.freeze models directly. + "test_torchscript_then_compile" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # torch._inductor.exc.InductorError: ImportError: ... + # symbol not found in flat namespace '___kmpc_barrier' + "test_ase_calculator" + "test_torch_export_then_compile" + ]; + + meta = { + description = "Library to train state-of-the-art neural networks potentials (NNPs)"; + homepage = "https://github.com/torchmd/torchmd-net"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +}) diff --git a/pkgs/development/python-modules/ttp-templates/default.nix b/pkgs/development/python-modules/ttp-templates/default.nix index c0eef67aa1a9..f6818c7e6a73 100644 --- a/pkgs/development/python-modules/ttp-templates/default.nix +++ b/pkgs/development/python-modules/ttp-templates/default.nix @@ -3,22 +3,25 @@ buildPythonPackage, fetchFromGitHub, poetry-core, + pydantic, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ttp-templates"; - version = "0.5.1"; + version = "0.5.8"; pyproject = true; src = fetchFromGitHub { owner = "dmulyalin"; repo = "ttp_templates"; - tag = version; - hash = "sha256-lGlg8AgP7VtwZm5xfpEzs1VJSbfBdYns/l4ROP0LtEQ="; + tag = finalAttrs.version; + hash = "sha256-W6F0/CGm713HhCtgqv+tEDm5mlkx0JJRmnUc9j+Fnvs="; }; nativeBuildInputs = [ poetry-core ]; + dependencies = [ pydantic ]; + postPatch = '' # Drop circular dependency on ttp sed -i '/ttp =/d' pyproject.toml @@ -30,8 +33,8 @@ buildPythonPackage rec { meta = { description = "Template Text Parser Templates collections"; homepage = "https://github.com/dmulyalin/ttp_templates"; - changelog = "https://github.com/dmulyalin/ttp_templates/releases/tag/${version}"; + changelog = "https://github.com/dmulyalin/ttp_templates/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/types-docutils/default.nix b/pkgs/development/python-modules/types-docutils/default.nix index 81b5e5b4c172..80acde196439 100644 --- a/pkgs/development/python-modules/types-docutils/default.nix +++ b/pkgs/development/python-modules/types-docutils/default.nix @@ -7,17 +7,23 @@ buildPythonPackage rec { pname = "types-docutils"; - version = "0.22.3.20260223"; + version = "0.22.3.20260518"; pyproject = true; src = fetchPypi { pname = "types_docutils"; inherit version; - hash = "sha256-6Q6Gjagt9hXqIhfPNt/zHwlmDaoV/A+VavU/icE2RQE="; + hash = "sha256-LEW6Y6msZCRjNTWbaP6cJ2ApJkmcm2fK7DeAdF9qre4="; }; build-system = [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "'docutils-stubs' = [" "'*' = [" \ + --replace-fail "setuptools>=82.0.1" "setuptools" + ''; + # Module doesn't have tests doCheck = false; diff --git a/pkgs/development/python-modules/ultralytics/default.nix b/pkgs/development/python-modules/ultralytics/default.nix index ff79714c1304..1c7ff6bfe8df 100644 --- a/pkgs/development/python-modules/ultralytics/default.nix +++ b/pkgs/development/python-modules/ultralytics/default.nix @@ -34,14 +34,14 @@ buildPythonPackage (finalAttrs: { pname = "ultralytics"; - version = "8.4.48"; + version = "8.4.51"; pyproject = true; src = fetchFromGitHub { owner = "ultralytics"; repo = "ultralytics"; tag = "v${finalAttrs.version}"; - hash = "sha256-FNZSZylsx/du/3h2cq/246ZQVvuroEvPta6nokdyXQ4="; + hash = "sha256-vaedx45NlFi2RbrQj16M0bAWuSz+ZlVL8Ivykp54mQU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/usb-monitor/default.nix b/pkgs/development/python-modules/usb-monitor/default.nix index eb656bef25f3..263fae224053 100644 --- a/pkgs/development/python-modules/usb-monitor/default.nix +++ b/pkgs/development/python-modules/usb-monitor/default.nix @@ -1,21 +1,26 @@ { + lib, buildPythonPackage, fetchPypi, - lib, + setuptools, pyudev, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "usb-monitor"; version = "1.23"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "usb_monitor"; hash = "sha256-7xZ30JLPduY0y2SHWI7fvZHB27FbNFAMczHMXnaXl88="; }; + build-system = [ setuptools ]; + dependencies = [ pyudev ]; # has no tests @@ -30,4 +35,4 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ sifmelcara ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 0d9b5973218b..68fc8af2cca7 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "4.21.2"; + version = "4.21.3"; pyproject = true; disabled = pythonOlder "3.12"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "weaviate"; repo = "weaviate-python-client"; tag = "v${version}"; - hash = "sha256-ZynGooTKuZWjzxVB7By7LiafyRmFlYfh+JyzfXYeJog="; + hash = "sha256-1c1jjikWLD1o1bqUosEZFUi8/r7y+VBuafjXv5PXaic="; }; pythonRelaxDeps = [ diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index 879b233bb670..e6806816d1c8 100644 --- a/pkgs/pkgs-lib/formats.nix +++ b/pkgs/pkgs-lib/formats.nix @@ -23,6 +23,7 @@ let pipe singleton strings + toJSON toPretty types versionAtLeast @@ -37,6 +38,7 @@ let toKeyValue toLua mkLuaInline + toPlist ; inherit (lib.types) @@ -142,7 +144,7 @@ optionalAttrs allowAliases aliases runCommand name { nativeBuildInputs = [ jq ]; - value = builtins.toJSON value; + value = toJSON value; preferLocalBuild = true; __structuredAttrs = true; } @@ -167,7 +169,7 @@ optionalAttrs allowAliases aliases runCommand name { nativeBuildInputs = [ remarshal_0_17 ]; - value = builtins.toJSON value; + value = toJSON value; preferLocalBuild = true; __structuredAttrs = true; } @@ -192,7 +194,7 @@ optionalAttrs allowAliases aliases runCommand name { nativeBuildInputs = [ remarshal ]; - value = builtins.toJSON value; + value = toJSON value; preferLocalBuild = true; __structuredAttrs = true; } @@ -250,12 +252,23 @@ optionalAttrs allowAliases aliases description = "section of an INI file (attrs of " + atom.description + ")"; }; - maybeToList = + maybeCoerceList = listToValue: if listToValue != null then mapAttrs (key: val: if isList val then listToValue val else val) else id; + maybeCoerceAllLists = + listToValue: + if listToValue != null then + mapAttrs (_: mapAttrs (key: val: if isList val then listToValue val else val)) + else + id; + + ignoredArgs = [ + "listToValue" + "atomsCoercedToLists" + ]; in { ini = @@ -286,13 +299,8 @@ optionalAttrs allowAliases aliases generate = name: value: pipe value [ - (mapAttrs (_: maybeToList listToValue)) - (toINI ( - removeAttrs args [ - "listToValue" - "atomsCoercedToLists" - ] - )) + (maybeCoerceAllLists listToValue) + (toINI (removeAttrs args ignoredArgs)) (pkgs.writeText name) ]; }; @@ -341,15 +349,10 @@ optionalAttrs allowAliases aliases ... }: pkgs.writeText name ( - toINIWithGlobalSection - (removeAttrs args [ - "listToValue" - "atomsCoercedToLists" - ]) - { - globalSection = maybeToList listToValue globalSection; - sections = mapAttrs (_: maybeToList listToValue) sections; - } + toINIWithGlobalSection (removeAttrs args ignoredArgs) { + globalSection = maybeCoerceList listToValue globalSection; + sections = maybeCoerceAllLists listToValue sections; + } ); }; @@ -357,7 +360,7 @@ optionalAttrs allowAliases aliases { listsAsDuplicateKeys ? false, ... - }@args: + }: let atom = iniAtom { inherit listsAsDuplicateKeys; @@ -396,7 +399,7 @@ optionalAttrs allowAliases aliases // { generate = name: value: - lib.warn + warn "Direct use of `pkgs.formats.systemd` has been deprecated, please use `pkgs.formats.systemd { }` instead." rawFormat.generate name @@ -448,15 +451,15 @@ optionalAttrs allowAliases aliases attrsOf atom; generate = - name: value: let - transformedValue = + transformValue = if listToValue != null then - mapAttrs (key: val: if isList val then listToValue val else val) value + mapAttrs (key: val: if isList val then listToValue val else val) else - value; + id; + finalArgs = removeAttrs args [ "listToValue" ]; in - pkgs.writeText name (toKeyValue (removeAttrs args [ "listToValue" ]) transformedValue); + name: value: pkgs.writeText name (toKeyValue finalArgs (transformValue value)); }; @@ -468,7 +471,7 @@ optionalAttrs allowAliases aliases generate = name: value: pkgs.callPackage ( - { runCommand, remarshal }: + { runCommand }: runCommand name { nativeBuildInputs = [ json2x ]; @@ -496,8 +499,7 @@ optionalAttrs allowAliases aliases */ cdn = { }: - json { } - // { + { type = serializableValueWith { typeName = "CDN"; }; generate = @@ -507,7 +509,7 @@ optionalAttrs allowAliases aliases runCommand name { nativeBuildInputs = [ json2cdn ]; - value = builtins.toJSON value; + value = toJSON value; preferLocalBuild = true; __structuredAttrs = true; } @@ -553,9 +555,6 @@ optionalAttrs allowAliases aliases [Tuple]: */ elixirConf = - { - elixir ? pkgs.elixir, - }: let toElixir = value: @@ -622,12 +621,14 @@ optionalAttrs allowAliases aliases tuple = values: "{${listContent values}}"; toConf = - values: let keyConfig = rootKey: key: value: "config ${rootKey}, ${key}, ${toElixir value}"; keyConfigs = rootKey: values: mapAttrsToList (keyConfig rootKey) values; + in + values: + let rootConfigs = flatten (mapAttrsToList keyConfigs values); in '' @@ -636,6 +637,9 @@ optionalAttrs allowAliases aliases ${concatStringsSep "\n" rootConfigs} ''; in + { + elixir ? pkgs.elixir, + }: { type = let @@ -812,7 +816,7 @@ optionalAttrs allowAliases aliases '' ) { }; # Alias for mkLuaInline - lib.mkRaw = lib.mkLuaInline; + lib.mkRaw = mkLuaInline; }; nixConf = @@ -836,14 +840,12 @@ optionalAttrs allowAliases aliases float str path - package + types.package ]); in attrsOf atomType; generate = - name: value: let - # note that list type has been omitted here as the separator varies, see `nix.settings.*` mkValueString = v: @@ -871,8 +873,8 @@ optionalAttrs allowAliases aliases mkKeyValuePairs = attrs: concatStringsSep "\n" (mapAttrsToList mkKeyValue attrs); isExtra = key: hasPrefix "extra-" key; - in + name: value: pkgs.writeTextFile { inherit name; # workaround for https://github.com/NixOS/nix/issues/9487 @@ -885,7 +887,7 @@ optionalAttrs allowAliases aliases ${mkKeyValuePairs (filterAttrs (key: _: isExtra key) value)} ${extraOptions} ''; - checkPhase = lib.optionalString checkConfig ( + checkPhase = optionalString checkConfig ( if pkgs.stdenv.hostPlatform != pkgs.stdenv.buildPlatform then '' echo "Ignoring validation for cross-compilation" @@ -940,8 +942,8 @@ optionalAttrs allowAliases aliases python3 black ]; - imports = builtins.toJSON (value._imports or [ ]); - value = builtins.toJSON (removeAttrs value [ "_imports" ]); + imports = toJSON (value._imports or [ ]); + value = toJSON (removeAttrs value [ "_imports" ]); pythonGen = pkgs.writeText "pythonGen" '' import json import os @@ -1013,7 +1015,7 @@ optionalAttrs allowAliases aliases python3Packages.xmltodict libxml2Python ]; - value = builtins.toJSON value; + value = toJSON value; pythonGen = pkgs.writeText "pythonGen" '' import json import os @@ -1061,11 +1063,10 @@ optionalAttrs allowAliases aliases in valueType; - generate = name: value: pkgs.writeText name (lib.generators.toPlist { inherit escape; } value); + generate = name: value: pkgs.writeText name (toPlist { inherit escape; } value); }; hcl1 = - args: let # Helper function to recursively transform values for HCL1 canonicalization # Rule: If an attribute value is an attribute set, wrap it in a list @@ -1081,6 +1082,7 @@ optionalAttrs allowAliases aliases value; jsonFormat = json { }; in + args: jsonFormat // { generate = name: value: jsonFormat.generate name (mapAttrs (_: transform) value); diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 81d4ea6199d5..0fbc54e192ac 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { pname = "apache-httpd"; - version = "2.4.67"; + version = "2.4.68"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - hash = "sha256-Zs0gZjew1cRG+n2r51/gNSXaj7VYVYdsRiiM2IsTaqQ="; + hash = "sha256-aMdNTfOMJr7U372487rx61MvOHI1e+zBu6XRNva2PAY="; }; patches = [ @@ -164,6 +164,6 @@ stdenv.mkDerivation rec { homepage = "https://httpd.apache.org/"; license = lib.licenses.asl20; platforms = lib.platforms.linux ++ lib.platforms.darwin; - maintainers = [ ]; + maintainers = with lib.maintainers; [ arcayr ]; }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix index 1f1b78033cfe..434bcf24692a 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-lokiexplore-app"; - version = "2.0.4"; - zipHash = "sha256-hne6G+Hmih+SYo4A1Gk7yHRMPA1IoCJoPlclTOpMKJc="; + version = "2.1.0"; + zipHash = "sha256-fhZ+a2PjsR5MlfNbx+gtjRkpNGYOgdKTGZmqflhJImI="; meta = { description = "Browse Loki logs without the need for writing complex queries"; license = lib.licenses.agpl3Only; diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix index d7b9064a2a5b..4a01e7a37eb3 100644 --- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "volkovlabs-form-panel"; - version = "6.3.4"; - zipHash = "sha256-6VFhDmkShKxennSdprdxIWWp0D//MlE6EZr8bXj7naU="; + version = "6.3.5"; + zipHash = "sha256-bMqxVx0RiMWKMJ9XM2uQpZr1Fz8EOaCs9WW9hZ3AiFs="; meta = { description = "Plugin that allows inserting and updating application data, as well as modifying configuration directly from your Grafana dashboard"; license = lib.licenses.asl20; diff --git a/pkgs/test/pnpm/default.nix b/pkgs/test/pnpm/default.nix index 14c62ea820d3..27938a8a0405 100644 --- a/pkgs/test/pnpm/default.nix +++ b/pkgs/test/pnpm/default.nix @@ -1,7 +1,8 @@ -{ callPackage }: +{ callPackage, lib }: { pnpm-empty-lockfile = callPackage ./pnpm-empty-lockfile { }; pnpm-fixup-state-db = callPackage ./pnpm-fixup-state-db { }; + pnpm-workspaces = lib.recurseIntoAttrs (callPackage ./pnpm-workspaces { }); pnpm_11_v3 = callPackage ./pnpm_11_v3 { }; pnpm_11_v4 = callPackage ./pnpm_11_v4 { }; } diff --git a/pkgs/test/pnpm/pnpm-workspaces/default.nix b/pkgs/test/pnpm/pnpm-workspaces/default.nix new file mode 100644 index 000000000000..d856d03f6796 --- /dev/null +++ b/pkgs/test/pnpm/pnpm-workspaces/default.nix @@ -0,0 +1,57 @@ +{ + stdenv, + fetchPnpmDeps, + pnpm, + pnpmConfigHook, + testers, +}: +let + mkTest = + { structuredAttrs }: + stdenv.mkDerivation (finalAttrs: { + name = "pnpm-workspaces-${if structuredAttrs then "structured" else "legacy"}"; + + src = ./src; + + pnpmDeps = testers.invalidateFetcherByDrvHash fetchPnpmDeps { + pname = "pnpm-workspaces"; + inherit (finalAttrs) src pnpmWorkspaces; + inherit pnpm; + fetcherVersion = 4; + hash = "sha256-dIp6CNh1Kn4aqJWku1G/FUdn/u+epzhqlqwnAkB2uW0="; + }; + + pnpmWorkspaces = [ + "@pnpm-workspaces-test/a" + "@pnpm-workspaces-test/b" + ]; + + __structuredAttrs = structuredAttrs; + + nativeBuildInputs = [ + pnpm + pnpmConfigHook + ]; + + buildPhase = '' + runHook preBuild + + for package in a b; do + if [ -e "packages/$package/node_modules/@pnpm-workspaces-test/$package-dep" ]; then + echo "$package was installed (its dependency $package-dep is linked)" + else + echo "ERROR: $package was not installed" + exit 1 + fi + done + + touch $out + + runHook postBuild + ''; + }); +in +{ + legacy = mkTest { structuredAttrs = false; }; + structured = mkTest { structuredAttrs = true; }; +} diff --git a/pkgs/test/pnpm/pnpm-workspaces/src/package.json b/pkgs/test/pnpm/pnpm-workspaces/src/package.json new file mode 100644 index 000000000000..05343efc28e7 --- /dev/null +++ b/pkgs/test/pnpm/pnpm-workspaces/src/package.json @@ -0,0 +1,5 @@ +{ + "name": "pnpm-workspaces-test", + "version": "0.0.0", + "private": true +} diff --git a/pkgs/test/pnpm/pnpm-workspaces/src/packages/a-dep/package.json b/pkgs/test/pnpm/pnpm-workspaces/src/packages/a-dep/package.json new file mode 100644 index 000000000000..ce526ded8c2f --- /dev/null +++ b/pkgs/test/pnpm/pnpm-workspaces/src/packages/a-dep/package.json @@ -0,0 +1,4 @@ +{ + "name": "@pnpm-workspaces-test/a-dep", + "version": "0.0.0" +} diff --git a/pkgs/test/pnpm/pnpm-workspaces/src/packages/a/package.json b/pkgs/test/pnpm/pnpm-workspaces/src/packages/a/package.json new file mode 100644 index 000000000000..680b1bf88179 --- /dev/null +++ b/pkgs/test/pnpm/pnpm-workspaces/src/packages/a/package.json @@ -0,0 +1,7 @@ +{ + "name": "@pnpm-workspaces-test/a", + "version": "0.0.0", + "dependencies": { + "@pnpm-workspaces-test/a-dep": "workspace:*" + } +} diff --git a/pkgs/test/pnpm/pnpm-workspaces/src/packages/b-dep/package.json b/pkgs/test/pnpm/pnpm-workspaces/src/packages/b-dep/package.json new file mode 100644 index 000000000000..16b1ce859578 --- /dev/null +++ b/pkgs/test/pnpm/pnpm-workspaces/src/packages/b-dep/package.json @@ -0,0 +1,4 @@ +{ + "name": "@pnpm-workspaces-test/b-dep", + "version": "0.0.0" +} diff --git a/pkgs/test/pnpm/pnpm-workspaces/src/packages/b/package.json b/pkgs/test/pnpm/pnpm-workspaces/src/packages/b/package.json new file mode 100644 index 000000000000..a1d6a578df37 --- /dev/null +++ b/pkgs/test/pnpm/pnpm-workspaces/src/packages/b/package.json @@ -0,0 +1,7 @@ +{ + "name": "@pnpm-workspaces-test/b", + "version": "0.0.0", + "dependencies": { + "@pnpm-workspaces-test/b-dep": "workspace:*" + } +} diff --git a/pkgs/test/pnpm/pnpm-workspaces/src/pnpm-lock.yaml b/pkgs/test/pnpm/pnpm-workspaces/src/pnpm-lock.yaml new file mode 100644 index 000000000000..c584ae73ee0c --- /dev/null +++ b/pkgs/test/pnpm/pnpm-workspaces/src/pnpm-lock.yaml @@ -0,0 +1,25 @@ +lockfileVersion: '9.0' + +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + +importers: + + .: {} + + packages/a: + dependencies: + '@pnpm-workspaces-test/a-dep': + specifier: workspace:* + version: link:../a-dep + + packages/a-dep: {} + + packages/b: + dependencies: + '@pnpm-workspaces-test/b-dep': + specifier: workspace:* + version: link:../b-dep + + packages/b-dep: {} diff --git a/pkgs/test/pnpm/pnpm-workspaces/src/pnpm-workspace.yaml b/pkgs/test/pnpm/pnpm-workspaces/src/pnpm-workspace.yaml new file mode 100644 index 000000000000..18ec407efca7 --- /dev/null +++ b/pkgs/test/pnpm/pnpm-workspaces/src/pnpm-workspace.yaml @@ -0,0 +1,2 @@ +packages: + - 'packages/*' diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8017987d67c3..59f65f83ef84 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -533,6 +533,7 @@ mapAliases { clucene_core = warnAlias "'clucene_core' has been renamed to 'clucene-core'" clucene-core; # Added 2026-01-12 clucene_core_2 = warnAlias "'clucene_core_2' has been renamed to 'clucene-core_2'" clucene-core_2; # Added 2026-01-12 cmtk = throw "'cmtk' has been dropped due to being broken since September 2025, with no complaints by any users of the package."; # Added 2026-04-05 + coc-cmake = throw "'coc-cmake' has been removed, as it required pnpm 8 (EOL) and its upstream lockfile is incompatible with newer pnpm"; # Added 2026-06-10 coc-sumneko-lua = throw "'coc-sumneko-lua' has been removed due to unmaintained and broken package. 'lua_ls' can be used as a replacement"; # Added 2026-02-04 cockroachdb-bin = throw "'cockroachdb-bin' has been renamed to/replaced by 'cockroachdb'"; # Converted to throw 2025-10-27 code-browser-gtk2 = throw "'code-browser-gtk2' has been removed, as it was broken since 22.11"; # Added 2025-08-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 138c354620c2..b868a36633be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11532,4 +11532,9 @@ with pkgs; gpac-unstable = callPackage ../by-name/gp/gpac/package.nix { releaseChannel = "unstable"; }; + + clipse-x11 = callPackage ../by-name/cl/clipse/package.nix { + enableWayland = false; + enableX11 = true; + }; } diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix index 526dd4182702..f2066315efb5 100644 --- a/pkgs/top-level/config.nix +++ b/pkgs/top-level/config.nix @@ -422,7 +422,7 @@ let }; rewriteURL = mkOption { - type = types.functionTo (types.nullOr types.str); + type = types.nullOr (types.functionTo (types.nullOr types.str)); description = '' A hook to rewrite/filter URLs before they are fetched. @@ -432,8 +432,7 @@ let The intended use is to allow URL rewriting to insert company-internal mirrors, or work around company firewalls and similar network restrictions. ''; - default = lib.id; - defaultText = literalExpression "(url: url)"; + default = null; example = literalExpression '' { # Use Nix like it's 2024! ;-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 214fdea5ab3a..e7d75d57f326 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19961,6 +19961,8 @@ self: super: with self; { torchlibrosa = callPackage ../development/python-modules/torchlibrosa { }; + torchmd-net = callPackage ../development/python-modules/torchmd-net { }; + torchmetrics = callPackage ../development/python-modules/torchmetrics { }; torchprofile = callPackage ../development/python-modules/torchprofile { };