diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index a492595f6609..3e2a9d950e4f 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -288,3 +288,6 @@ b4532efe93882ae2e3fc579929a42a5a56544146 # nixfmt 1.0.0 62fe01651911043bd3db0add920af3d2935d9869 # !autorebase nix-shell --run treefmt 5a0711127cd8b916c3d3128f473388c8c79df0da # !autorebase nix-shell --run treefmt + +# systemd: nixfmt +b1c5cd3e794cdf89daa5e4f0086274a416a1cded diff --git a/.github/labeler.yml b/.github/labeler.yml index 95190ab16bf6..031fead8f534 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -28,6 +28,7 @@ - nixos/modules/services/x11/desktop-managers/cinnamon.nix - nixos/tests/cinnamon.nix - nixos/tests/cinnamon-wayland.nix + - pkgs/by-name/ci/cinnamon/**/* - pkgs/by-name/ci/cinnamon-*/**/* - pkgs/by-name/cj/cjs/**/* - pkgs/by-name/mu/muffin/**/* diff --git a/doc/module-system/module-system.chapter.md b/doc/module-system/module-system.chapter.md index 8c27aea15ffc..8e95580522b2 100644 --- a/doc/module-system/module-system.chapter.md +++ b/doc/module-system/module-system.chapter.md @@ -116,6 +116,16 @@ A nominal type marker, always `"configuration"`. The [`class` argument](#module-system-lib-evalModules-param-class). +#### `graph` {#module-system-lib-evalModules-return-value-graph} + +Represents all the modules that took part in the evaluation. +It is a list of `ModuleGraph` where `ModuleGraph` is defined as an attribute set with the following attributes: + +- `key`: `string` for the purpose of module deduplication and `disabledModules` +- `file`: `string` for the purpose of error messages and warnings +- `imports`: `[ ModuleGraph ]` +- `disabled`: `bool` + ## Module arguments {#module-system-module-arguments} Module arguments are the attribute values passed to modules when they are evaluated. diff --git a/doc/redirects.json b/doc/redirects.json index 8f7810698bbc..8210470b5bcb 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -487,6 +487,9 @@ "module-system-lib-evalModules-return-value-_configurationClass": [ "index.html#module-system-lib-evalModules-return-value-_configurationClass" ], + "module-system-lib-evalModules-return-value-graph": [ + "index.html#module-system-lib-evalModules-return-value-graph" + ], "part-stdenv": [ "index.html#part-stdenv" ], diff --git a/lib/modules.nix b/lib/modules.nix index c55d276d4970..cc3148b0eea7 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -245,25 +245,26 @@ let }; }; - merged = - let - collected = - collectModules class (specialArgs.modulesPath or "") (regularModules ++ [ internalModule ]) - ( - { - inherit - lib - options - specialArgs - ; - _class = class; - _prefix = prefix; - config = addErrorContext "if you get an infinite recursion here, you probably reference `config` in `imports`. If you are trying to achieve a conditional import behavior dependent on `config`, consider importing unconditionally, and using `mkEnableOption` and `mkIf` to control its effect." config; - } - // specialArgs - ); - in - mergeModules prefix (reverseList collected); + # This function takes an empty attrset as an argument. + # It could theoretically be replaced with its body, + # but such a binding is avoided to allow for earlier grabage collection. + doCollect = + { }: + collectModules class (specialArgs.modulesPath or "") (regularModules ++ [ internalModule ]) ( + { + inherit + lib + options + specialArgs + ; + _class = class; + _prefix = prefix; + config = addErrorContext "if you get an infinite recursion here, you probably reference `config` in `imports`. If you are trying to achieve a conditional import behavior dependent on `config`, consider importing unconditionally, and using `mkEnableOption` and `mkIf` to control its effect." config; + } + // specialArgs + ); + + merged = mergeModules prefix (reverseList (doCollect { }).modules); options = merged.matchedOptions; @@ -359,12 +360,13 @@ let options = checked options; config = checked (removeAttrs config [ "_module" ]); _module = checked (config._module); + inherit (doCollect { }) graph; inherit extendModules type class; }; in result; - # collectModules :: (class: String) -> (modulesPath: String) -> (modules: [ Module ]) -> (args: Attrs) -> [ Module ] + # collectModules :: (class: String) -> (modulesPath: String) -> (modules: [ Module ]) -> (args: Attrs) -> ModulesTree # # Collects all modules recursively through `import` statements, filtering out # all modules in disabledModules. @@ -424,8 +426,37 @@ let else m: m; + # isDisabled :: String -> [ { disabled, file } ] -> StructuredModule -> bool + # + # Figures out whether a `StructuredModule` is disabled. + isDisabled = + modulesPath: disabledList: + let + moduleKey = + file: m: + if isString m then + if substring 0 1 m == "/" then m else toString modulesPath + "/" + m + + else if isConvertibleWithToString m then + if m ? key && m.key != toString m then + throw "Module `${file}` contains a disabledModules item that is an attribute set that can be converted to a string (${toString m}) but also has a `.key` attribute (${m.key}) with a different value. This makes it ambiguous which module should be disabled." + else + toString m + + else if m ? key then + m.key + + else if isAttrs m then + throw "Module `${file}` contains a disabledModules item that is an attribute set, presumably a module, that does not have a `key` attribute. This means that the module system doesn't have any means to identify the module that should be disabled. Make sure that you've put the correct value in disabledModules: a string path relative to modulesPath, a path value, or an attribute set with a `key` attribute." + else + throw "Each disabledModules item must be a path, string, or a attribute set with a key attribute, or a value supported by toString. However, one of the disabledModules items in `${toString file}` is none of that, but is of type ${typeOf m}."; + + disabledKeys = concatMap ({ file, disabled }: map (moduleKey file) disabled) disabledList; + in + structuredModule: elem structuredModule.key disabledKeys; + /** - Collects all modules recursively into the form + Collects all modules recursively into a `[ StructuredModule ]` and a list of disabled modules: { disabled = [ ]; @@ -493,36 +524,32 @@ let modulesPath: { disabled, modules }: let - moduleKey = - file: m: - if isString m then - if substring 0 1 m == "/" then m else toString modulesPath + "/" + m - - else if isConvertibleWithToString m then - if m ? key && m.key != toString m then - throw "Module `${file}` contains a disabledModules item that is an attribute set that can be converted to a string (${toString m}) but also has a `.key` attribute (${m.key}) with a different value. This makes it ambiguous which module should be disabled." - else - toString m - - else if m ? key then - m.key - - else if isAttrs m then - throw "Module `${file}` contains a disabledModules item that is an attribute set, presumably a module, that does not have a `key` attribute. This means that the module system doesn't have any means to identify the module that should be disabled. Make sure that you've put the correct value in disabledModules: a string path relative to modulesPath, a path value, or an attribute set with a `key` attribute." - else - throw "Each disabledModules item must be a path, string, or a attribute set with a key attribute, or a value supported by toString. However, one of the disabledModules items in `${toString file}` is none of that, but is of type ${typeOf m}."; - - disabledKeys = concatMap ({ file, disabled }: map (moduleKey file) disabled) disabled; - keyFilter = filter (attrs: !elem attrs.key disabledKeys); + keyFilter = filter (attrs: !isDisabled modulesPath disabled attrs); in map (attrs: attrs.module) (genericClosure { startSet = keyFilter modules; operator = attrs: keyFilter attrs.modules; }); + toGraph = + modulesPath: + { disabled, modules }: + let + isDisabledModule = isDisabled modulesPath disabled; + + toModuleGraph = structuredModule: { + disabled = isDisabledModule structuredModule; + inherit (structuredModule) key; + file = structuredModule.module._file; + imports = map toModuleGraph structuredModule.modules; + }; + in + map toModuleGraph (filter (x: x.key != "lib/modules.nix") modules); in - modulesPath: initialModules: args: - filterModules modulesPath (collectStructuredModules unknownModule "" initialModules args); + modulesPath: initialModules: args: { + modules = filterModules modulesPath (collectStructuredModules unknownModule "" initialModules args); + graph = toGraph modulesPath (collectStructuredModules unknownModule "" initialModules args); + }; /** Wrap a module with a default location for reporting errors. diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index a4aa5201715c..301808ae6651 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -20,6 +20,10 @@ cd "$DIR"/modules pass=0 fail=0 +local-nix-instantiate() { + nix-instantiate --timeout 1 --eval-only --show-trace --read-write-mode --json "$@" +} + # loc # prints the location of the call of to the function that calls it # loc n @@ -55,7 +59,7 @@ evalConfig() { local attr=$1 shift local script="import ./default.nix { modules = [ $* ];}" - nix-instantiate --timeout 1 -E "$script" -A "$attr" --eval-only --show-trace --read-write-mode --json + local-nix-instantiate -E "$script" -A "$attr" } reportFailure() { @@ -106,6 +110,20 @@ globalErrorLogCheck() { } } +checkExpression() { + local path=$1 + local output + { + output="$(local-nix-instantiate --strict "$path" 2>&1)" && ((++pass)) + } || { + logStartFailure + echo "$output" + ((++fail)) + logFailure + logEndFailure + } +} + checkConfigError() { local errorContains=$1 local err="" @@ -337,6 +355,9 @@ checkConfigOutput '^12$' config.value ./declare-coerced-value-unsound.nix checkConfigError 'A definition for option .* is not of type .*. Definition values:\n\s*- In .*: "1000"' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix checkConfigError 'toInt: Could not convert .* to int' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix +# Check `graph` attribute +checkExpression './graph/test.nix' + # Check mkAliasOptionModule. checkConfigOutput '^true$' config.enable ./alias-with-priority.nix checkConfigOutput '^true$' config.enableAlias ./alias-with-priority.nix diff --git a/lib/tests/modules/graph/a.nix b/lib/tests/modules/graph/a.nix new file mode 100644 index 000000000000..e3c72afbe672 --- /dev/null +++ b/lib/tests/modules/graph/a.nix @@ -0,0 +1,8 @@ +{ + imports = [ + { + imports = [ { } ]; + } + ]; + disabledModules = [ ./b.nix ]; +} diff --git a/lib/tests/modules/graph/b.nix b/lib/tests/modules/graph/b.nix new file mode 100644 index 000000000000..a890d3138a18 --- /dev/null +++ b/lib/tests/modules/graph/b.nix @@ -0,0 +1,3 @@ +args: { + imports = [ { key = "explicit-key"; } ]; +} diff --git a/lib/tests/modules/graph/test.nix b/lib/tests/modules/graph/test.nix new file mode 100644 index 000000000000..748fb8db5f4d --- /dev/null +++ b/lib/tests/modules/graph/test.nix @@ -0,0 +1,64 @@ +let + lib = import ../../..; + + evaluation = lib.evalModules { + modules = [ + { } + (args: { }) + ./a.nix + ./b.nix + ]; + }; + + actual = evaluation.graph; + + expected = [ + { + key = ":anon-1"; + file = ""; + imports = [ ]; + disabled = false; + } + { + key = ":anon-2"; + file = ""; + imports = [ ]; + disabled = false; + } + { + key = toString ./a.nix; + file = toString ./a.nix; + imports = [ + { + key = "${toString ./a.nix}:anon-1"; + file = toString ./a.nix; + imports = [ + { + key = "${toString ./a.nix}:anon-1:anon-1"; + file = toString ./a.nix; + imports = [ ]; + disabled = false; + } + ]; + disabled = false; + } + ]; + disabled = false; + } + { + key = toString ./b.nix; + file = toString ./b.nix; + imports = [ + { + key = "explicit-key"; + file = toString ./b.nix; + imports = [ ]; + disabled = false; + } + ]; + disabled = true; + } + ]; +in +assert actual == expected; +null diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e266c71b9ff8..9e23d7401e46 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5966,6 +5966,12 @@ githubId = 58050402; name = "Jost Alemann"; }; + DDoSolitary = { + email = "DDoSolitary@gmail.com"; + github = "DDoSolitary"; + githubId = 25856103; + name = "DDoSolitary"; + }; dduan = { email = "daniel@duan.ca"; github = "dduan"; @@ -6602,6 +6608,12 @@ githubId = 129093; name = "Desmond O. Chang"; }; + DoctorDalek1963 = { + email = "dyson.dyson@icloud.com"; + github = "DoctorDalek1963"; + githubId = 69600500; + name = "Dyson Dyson"; + }; dod-101 = { email = "david.thievon@proton.me"; github = "DOD-101"; @@ -11947,6 +11959,12 @@ githubId = 51518420; name = "jitwit"; }; + jjacke13 = { + email = "vaios.k@pm.me"; + github = "jjacke13"; + githubId = 156372486; + name = "Vaios Karastathis"; + }; jjjollyjim = { email = "jamie@kwiius.com"; github = "JJJollyjim"; @@ -16157,6 +16175,13 @@ githubId = 318066; name = "Mirco Bauer"; }; + meenzen = { + name = "Samuel Meenzen"; + email = "samuel@meenzen.net"; + matrix = "@samuel:mnzn.dev"; + github = "meenzen"; + githubId = 22305878; + }; megheaiulian = { email = "iulian.meghea@gmail.com"; github = "megheaiulian"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 1cfaeefe71f6..06436b41b626 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -309,6 +309,7 @@ with lib.maintainers; raphaelr jamiemagee anpin + meenzen ]; scope = "Maintainers of the .NET build tools and packages"; shortName = "dotnet"; diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index c647ad73d380..01ad322de9c5 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -161,6 +161,8 @@ - `services.dnscrypt-proxy2` gains a `package` option to specify dnscrypt-proxy package to use. +- `services.nextcloud.configureRedis` now defaults to `true` in accordance with upstream recommendations to have caching for file locking. See the [upstream doc](https://docs.nextcloud.com/server/31/admin_manual/configuration_files/files_locking_transactional.html) for further details. + - `services.gitea` supports sending notifications with sendmail again. To do this, activate the parameter `services.gitea.mailerUseSendmail` and configure SMTP server. - `libvirt` now supports using `nftables` backend. diff --git a/nixos/lib/test-driver/src/test_driver/machine/ocr.py b/nixos/lib/test-driver/src/test_driver/machine/ocr.py index 5f74b2ccfbc1..9f56f9c901e4 100644 --- a/nixos/lib/test-driver/src/test_driver/machine/ocr.py +++ b/nixos/lib/test-driver/src/test_driver/machine/ocr.py @@ -12,10 +12,7 @@ def perform_ocr_on_screenshot(screenshot_path: Path) -> str: Perform OCR on a screenshot that contains text. Returns a string with all words that could be found. """ - variants = perform_ocr_variants_on_screenshot(screenshot_path, False)[0] - if len(variants) != 1: - raise MachineError(f"Received wrong number of OCR results: {len(variants)}") - return variants[0] + return perform_ocr_variants_on_screenshot(screenshot_path, False)[0] def perform_ocr_variants_on_screenshot( diff --git a/nixos/modules/config/resolvconf.nix b/nixos/modules/config/resolvconf.nix index 3ec0654dfc02..e5831c0a71db 100644 --- a/nixos/modules/config/resolvconf.nix +++ b/nixos/modules/config/resolvconf.nix @@ -174,8 +174,6 @@ in networking.resolvconf.subscriberFiles = [ "/etc/resolv.conf" ]; - networking.resolvconf.package = pkgs.openresolv; - environment.systemPackages = [ cfg.package ]; systemd.services.resolvconf = { diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 38881059011b..77e96c2d85a8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1683,6 +1683,7 @@ ./services/web-apps/simplesamlphp.nix ./services/web-apps/slskd.nix ./services/web-apps/snipe-it.nix + ./services/web-apps/snips-sh.nix ./services/web-apps/sogo.nix ./services/web-apps/stash.nix ./services/web-apps/stirling-pdf.nix diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix index fcfe21101839..877705641cf1 100644 --- a/nixos/modules/services/networking/dnsmasq.nix +++ b/nixos/modules/services/networking/dnsmasq.nix @@ -179,7 +179,7 @@ in touch ${stateDir}/dnsmasq.leases chown -R dnsmasq ${stateDir} ${lib.optionalString cfg.resolveLocalQueries "touch /etc/dnsmasq-{conf,resolv}.conf"} - dnsmasq --test + dnsmasq --test -C ${cfg.configFile} ''; serviceConfig = { Type = "dbus"; diff --git a/nixos/modules/services/networking/ntp/ntpd-rs.nix b/nixos/modules/services/networking/ntp/ntpd-rs.nix index f80ffa2d82cb..89735696616c 100644 --- a/nixos/modules/services/networking/ntp/ntpd-rs.nix +++ b/nixos/modules/services/networking/ntp/ntpd-rs.nix @@ -90,6 +90,49 @@ in "" "${lib.makeBinPath [ cfg.package ]}/ntp-daemon --config=${validateConfig configFile}" ]; + + CapabilityBoundingSet = [ + "CAP_SYS_TIME" + "CAP_NET_BIND_SERVICE" + ]; + AmbientCapabilities = [ + "CAP_SYS_TIME" + "CAP_NET_BIND_SERVICE" + ]; + LimitCORE = 0; + LimitNOFILE = 65535; + LockPersonality = true; + MemorySwapMax = 0; + MemoryZSwapMax = 0; + PrivateTmp = true; + ProcSubset = "pid"; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + Restart = "on-failure"; + RestartSec = "10s"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + "AF_NETLINK" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "@resources" + "@network-io" + "@clock" + ]; + NoNewPrivileges = true; + UMask = "0077"; }; }; @@ -103,6 +146,44 @@ in "" "${lib.makeBinPath [ cfg.package ]}/ntp-metrics-exporter --config=${validateConfig configFile}" ]; + + CapabilityBoundingSet = [ ]; + LimitCORE = 0; + LimitNOFILE = 65535; + LockPersonality = true; + MemorySwapMax = 0; + MemoryZSwapMax = 0; + PrivateTmp = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + PrivateDevices = true; + RestrictSUIDSGID = true; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "@network-io" + "~@privileged" + "~@resources" + "~@mount" + ]; + NoNewPrivileges = true; + UMask = "0077"; }; }; }; diff --git a/nixos/modules/services/networking/tailscale-derper.nix b/nixos/modules/services/networking/tailscale-derper.nix index 6e172a40a529..3f8c788f7f52 100644 --- a/nixos/modules/services/networking/tailscale-derper.nix +++ b/nixos/modules/services/networking/tailscale-derper.nix @@ -82,10 +82,11 @@ in locations."/" = { proxyPass = "http://127.0.0.1:${toString cfg.port}"; proxyWebsockets = true; - extraConfig = '' - keepalive_timeout 0; - proxy_buffering off; - ''; + extraConfig = # nginx + '' + proxy_buffering off; + proxy_read_timeout 3600s; + ''; }; }; }; diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index e57d853bb8cf..1e9360dc1f92 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -772,11 +772,14 @@ in configureRedis = lib.mkOption { type = lib.types.bool; - default = config.services.nextcloud.notify_push.enable; - defaultText = lib.literalExpression "config.services.nextcloud.notify_push.enable"; + default = true; description = '' Whether to configure Nextcloud to use the recommended Redis settings for small instances. + ::: {.note} + The Nextcloud system check recommends to configure either Redis or Memcache for file lock caching. + ::: + ::: {.note} The `notify_push` app requires Redis to be configured. If this option is turned off, this must be configured manually. ::: diff --git a/nixos/modules/services/web-apps/snips-sh.nix b/nixos/modules/services/web-apps/snips-sh.nix new file mode 100644 index 000000000000..c11cfa6588f5 --- /dev/null +++ b/nixos/modules/services/web-apps/snips-sh.nix @@ -0,0 +1,159 @@ +{ + config, + lib, + pkgs, + ... +}: +let + inherit (lib) + mkOption + mkEnableOption + mkPackageOption + mapAttrs + optional + boolToString + isBool + mkIf + getExe + types + ; + + cfg = config.services.snips-sh; +in +{ + meta.maintainers = with lib.maintainers; [ + isabelroses + NotAShelf + ]; + + options.services.snips-sh = { + enable = mkEnableOption "snips.sh"; + + package = mkPackageOption pkgs "snips-sh" { + example = "pkgs.snips-sh.override {withTensorflow = true;}"; + }; + + stateDir = mkOption { + type = types.path; + default = "/var/lib/snips-sh"; + description = "The state directory of the service."; + }; + + settings = mkOption { + type = types.submodule { + freeformType = types.attrsOf ( + types.nullOr ( + types.oneOf [ + types.str + types.int + types.bool + ] + ) + ); + + options = { + SNIPS_HTTP_INTERNAL = mkOption { + type = types.str; + description = "The internal HTTP address of the service"; + }; + + SNIPS_SSH_INTERNAL = mkOption { + type = types.str; + description = "The internal SSH address of the service"; + }; + }; + }; + + default = { }; + example = { + SNIPS_HTTP_INTERNAL = "http://0.0.0.0:8080"; + SNIPS_SSH_INTERNAL = "ssh://0.0.0.0:2222"; + }; + + description = '' + The configuration of snips-sh is done through environment variables, + therefore you must use upper snake case (e.g. {env}`SNIPS_HTTP_INTERNAL`). + + Based on the attributes passed to this config option an environment file will be generated + that is passed to snips-sh's systemd service. + + The available configuration options can be found in + [self-hosting guide](https://github.com/robherley/snips.sh/blob/main/docs/self-hosting.md#configuration) to + find about the environment variables you can use. + ''; + }; + + environmentFile = mkOption { + type = with types; nullOr path; + default = null; + example = "/etc/snips-sh.env"; + description = '' + Additional environment file as defined in {manpage}`systemd.exec(5)`. + + Sensitive secrets such as {env}`SNIPS_SSH_HOSTKEYPATH` and {env}`SNIPS_METRICS_STATSD` + may be passed to the service while avoiding potentially making them world-readable in the nix store or + to convert an existing non-nix installation with minimum hassle. + + Note that this file needs to be available on the host on which + `snips-sh` is running. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd = { + tmpfiles.settings."10-snips-sh" = { + "${cfg.stateDir}/data".D = { + mode = "0755"; + }; + }; + + services.snips-sh = { + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + + environment = mapAttrs (_: v: if isBool v then boolToString v else toString v) cfg.settings; + + serviceConfig = { + EnvironmentFile = optional (cfg.environmentFile != null) cfg.environmentFile; + ExecStart = getExe cfg.package; + LimitNOFILE = "1048576"; + AmbientCapabilities = "CAP_NET_BIND_SERVICE"; + WorkingDirectory = cfg.stateDir; + RuntimeDirectory = "snips-sh"; + StateDirectory = "snips-sh"; + StateDirectoryMode = "0700"; + Restart = "always"; + + # hardening + DynamicUser = true; + NoNewPrivileges = true; + ProtectSystem = "strict"; + ProtectHome = true; + ProtectHostname = true; + ProtectClock = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + PrivateTmp = true; + PrivateDevices = true; + PrivateUsers = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictSUIDSGID = true; + SystemCallFilter = "@system-service"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + CapabilityBoundingSet = "CAP_NET_BIND_SERVICE"; + RemoveIPC = true; + }; + }; + }; + }; +} diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix index f9c50bca7210..73da17d5a050 100644 --- a/nixos/modules/services/web-servers/caddy/default.nix +++ b/nixos/modules/services/web-servers/caddy/default.nix @@ -30,9 +30,11 @@ let ${optionalString ( hostOpts.useACMEHost != null ) "tls ${sslCertDir}/cert.pem ${sslCertDir}/key.pem"} - log { - ${hostOpts.logFormat} - } + ${optionalString (hostOpts.logFormat != null) '' + log { + ${hostOpts.logFormat} + } + ''} ${hostOpts.extraConfig} } diff --git a/nixos/modules/services/web-servers/caddy/vhost-options.nix b/nixos/modules/services/web-servers/caddy/vhost-options.nix index 73ef4b87ee52..9afa699ad037 100644 --- a/nixos/modules/services/web-servers/caddy/vhost-options.nix +++ b/nixos/modules/services/web-servers/caddy/vhost-options.nix @@ -56,7 +56,7 @@ in }; logFormat = mkOption { - type = types.lines; + type = types.nullOr types.lines; default = '' output file ${cfg.logDir}/access-${lib.replaceStrings [ "/" " " ] [ "_" "_" ] config.hostName}.log ''; diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index ef8e2000e21c..ddb9b00c3e49 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -66,7 +66,7 @@ in config = mkMerge [ (mkIf cfg.enable { - services.displayManager.sessionPackages = [ pkgs.cinnamon-common ]; + services.displayManager.sessionPackages = [ pkgs.cinnamon ]; services.xserver.displayManager.lightdm.greeters.slick = { enable = mkDefault true; @@ -114,7 +114,7 @@ in services.accounts-daemon.enable = true; services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); services.dbus.packages = with pkgs; [ - cinnamon-common + cinnamon cinnamon-screensaver nemo-with-extensions xapp @@ -166,7 +166,7 @@ in desktop-file-utils # common-files - cinnamon-common + cinnamon cinnamon-session cinnamon-desktop cinnamon-menus @@ -177,7 +177,7 @@ in # session requirements cinnamon-screensaver - # cinnamon-killer-daemon: provided by cinnamon-common + # cinnamon-killer-daemon: provided by cinnamon networkmanagerapplet # session requirement - also nm-applet not needed # packages @@ -225,7 +225,7 @@ in services.orca.enable = mkDefault (notExcluded pkgs.orca); - xdg.portal.configPackages = mkDefault [ pkgs.cinnamon-common ]; + xdg.portal.configPackages = mkDefault [ pkgs.cinnamon ]; # Override GSettings schemas environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 503ec07d6234..4ce282532ef7 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1353,6 +1353,7 @@ in snapcast = runTest ./snapcast.nix; snapper = runTest ./snapper.nix; snipe-it = runTest ./web-apps/snipe-it.nix; + snips-sh = runTest ./snips-sh.nix; soapui = runTest ./soapui.nix; soft-serve = runTest ./soft-serve.nix; sogo = runTest ./sogo.nix; diff --git a/nixos/tests/nextcloud/with-mysql-and-memcached.nix b/nixos/tests/nextcloud/with-mysql-and-memcached.nix index 5b2cd4976064..f05dcd0a9835 100644 --- a/nixos/tests/nextcloud/with-mysql-and-memcached.nix +++ b/nixos/tests/nextcloud/with-mysql-and-memcached.nix @@ -23,10 +23,10 @@ runTest ( services.nextcloud = { caching = { apcu = true; - redis = false; memcached = true; }; config.dbtype = "mysql"; + configureRedis = false; }; services.memcached.enable = true; diff --git a/nixos/tests/snips-sh.nix b/nixos/tests/snips-sh.nix new file mode 100644 index 000000000000..04e40472e412 --- /dev/null +++ b/nixos/tests/snips-sh.nix @@ -0,0 +1,27 @@ +{ lib, ... }: +{ + name = "snips-sh"; + + nodes.machine = { + services.snips-sh = { + enable = true; + settings = { + SNIPS_HTTP_INTERNAL = "http://0.0.0.0:8080"; + SNIPS_SSH_INTERNAL = "ssh://0.0.0.0:2222"; + }; + }; + }; + + testScript = '' + start_all() + + machine.wait_for_unit("snips-sh.service") + machine.wait_for_open_port(8080) + machine.succeed("curl --fail http://localhost:8080") + ''; + + meta.maintainers = with lib.maintainers; [ + isabelroses + NotAShelf + ]; +} diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index 51ca0eda2f00..59d20907f359 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "leo-editor"; - version = "6.8.4"; + version = "6.8.6.1"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "sha256-CSugdfkAMy6VFdNdSGR+iCrK/XhwseoiMQ4mfgu4F/E="; + sha256 = "sha256-3ojiIjsGJpPgVSUi0QhIddqwsDxfRWxhxAQ5YmzwZiQ="; }; dontBuild = true; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index a96fc9899e58..569a1c91b124 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -15103,6 +15103,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + tiny-glimmer-nvim = buildVimPlugin { + pname = "tiny-glimmer.nvim"; + version = "2025-07-01"; + src = fetchFromGitHub { + owner = "rachartier"; + repo = "tiny-glimmer.nvim"; + rev = "60a632536e0741c9cecb892f89fbe65a270dc7c7"; + sha256 = "0xa3ma6ps1q5766ib2iksc7bw8rpqn96llynb75njwj2kpadfcis"; + }; + meta.homepage = "https://github.com/rachartier/tiny-glimmer.nvim/"; + meta.hydraPlatforms = [ ]; + }; + tiny-inline-diagnostic-nvim = buildVimPlugin { pname = "tiny-inline-diagnostic.nvim"; version = "2025-07-16"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 81c757a90c11..bd3bb2a47c2e 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1159,6 +1159,7 @@ https://github.com/levouh/tint.nvim/,HEAD, https://github.com/tinted-theming/tinted-nvim/,HEAD, https://github.com/tinted-theming/tinted-vim/,HEAD, https://github.com/rachartier/tiny-devicons-auto-colors.nvim/,HEAD, +https://github.com/rachartier/tiny-glimmer.nvim/,HEAD, https://github.com/rachartier/tiny-inline-diagnostic.nvim/,HEAD, https://github.com/tomtom/tinykeymap_vim/,,tinykeymap https://github.com/tomtom/tlib_vim/,, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index bccdce35177f..25c542dd9985 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -902,8 +902,8 @@ let mktplcRef = { name = "catppuccin-vsc-icons"; publisher = "catppuccin"; - version = "1.21.0"; - hash = "sha256-rWExJ9XJ8nKki8TP0UNLCmslw+aCm1hR2h2xxhnY9bg="; + version = "1.23.0"; + hash = "sha256-jnn169toS1zaixiOrtWjgOvv3UskM13vfFcvaQEesjU="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Catppuccin.catppuccin-vsc-icons/changelog"; @@ -1614,8 +1614,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.28.0"; - hash = "sha256-pHLAA7i2HJC523lPotUy5Zwa3BTSTurC2BA+eevdH38="; + version = "0.29.2"; + hash = "sha256-+MkKUhyma/mc5MZa0+RFty5i7rox0EARPTm/uggQj6M="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/llvm-vs-code-extensions.lldb-dap/default.nix b/pkgs/applications/editors/vscode/extensions/llvm-vs-code-extensions.lldb-dap/default.nix index 00b1fbf8a7a6..110d5fa78058 100644 --- a/pkgs/applications/editors/vscode/extensions/llvm-vs-code-extensions.lldb-dap/default.nix +++ b/pkgs/applications/editors/vscode/extensions/llvm-vs-code-extensions.lldb-dap/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "lldb-dap"; publisher = "llvm-vs-code-extensions"; - version = "0.2.15"; - hash = "sha256-Xr/TUpte9JqdvQ8eoD0l8ztg0tR8qwX/Ju1eVU6Xc0s="; + version = "0.2.16"; + hash = "sha256-q0wBPSQHy/R8z5zb3iMdapzrn7c9y9X6Ow9CXY3lwtc="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix index e3b12570912f..e66f399e6dd4 100644 --- a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix +++ b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "dosbox-pure"; - version = "0-unstable-2025-07-28"; + version = "0-unstable-2025-08-03"; src = fetchFromGitHub { owner = "schellingb"; repo = "dosbox-pure"; - rev = "4b5f6c964aa56357e19632bf73d1875c2496fdd1"; - hash = "sha256-J1NSt2Q4+lWUVqROv5yAM/rXI5COl0FRux3xqFLw20g="; + rev = "935b33b892b55ab5e12a093795a6563af9eacb78"; + hash = "sha256-19ehYyVOnYg3b1cvuznYn3zB9rhp2xULKhdFN/FKE4U="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/emulators/libretro/cores/fmsx.nix b/pkgs/applications/emulators/libretro/cores/fmsx.nix index 09152627e8bc..dc072c5108a3 100644 --- a/pkgs/applications/emulators/libretro/cores/fmsx.nix +++ b/pkgs/applications/emulators/libretro/cores/fmsx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fmsx"; - version = "0-unstable-2024-10-21"; + version = "0-unstable-2025-07-31"; src = fetchFromGitHub { owner = "libretro"; repo = "fmsx-libretro"; - rev = "9eb5f25df5397212a3e3088ca1a64db0740bbe5f"; - hash = "sha256-Pac1tQvPxYETU+fYU17moBHGfjNtzZiOsOms1uFQAmE="; + rev = "fbe4dfc4c3e3f7eb27089def3d663a905b181845"; + hash = "sha256-1hZQO16SDB8n1wdTP67Kpns3izg/nPGl5M7wjFDBjGc="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix index d09b19cdfedf..9756b8159385 100644 --- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix +++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "genesis-plus-gx"; - version = "0-unstable-2025-07-18"; + version = "0-unstable-2025-08-03"; src = fetchFromGitHub { owner = "libretro"; repo = "Genesis-Plus-GX"; - rev = "0cfb7a22b129f42feb3b48095871c122acf45158"; - hash = "sha256-Fonxi2RQJ/iqSLAfun2anHCzVnM7TkJFkc8PtWkNsQY="; + rev = "a69c81e44a3a25e5a9254a18652eae2dad875003"; + hash = "sha256-vjh8NxoQgGU/u8XZLLQslYSlJdlMqU5quOjyWnUm3Ig="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix index cfac4250e3f1..db3b85fe376a 100644 --- a/pkgs/applications/emulators/libretro/cores/play.nix +++ b/pkgs/applications/emulators/libretro/cores/play.nix @@ -14,13 +14,13 @@ }: mkLibretroCore { core = "play"; - version = "0-unstable-2025-07-23"; + version = "0-unstable-2025-08-04"; src = fetchFromGitHub { owner = "jpd002"; repo = "Play-"; - rev = "78c184bca1063d5482cbfad924af72dd23ebbff1"; - hash = "sha256-0n6PQqepc7xKVMf8slN9aOodzBbt7J2c68z7200q07M="; + rev = "c7e327b5b86bfeaf13e89440a319ee5b0c039a3d"; + hash = "sha256-J7rCOl7vHX/2Jy/fPh8yDAf8xQc41wmkMcC9SSRqxF0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix deleted file mode 100644 index f7c86c5920d7..000000000000 --- a/pkgs/applications/graphics/paraview/default.nix +++ /dev/null @@ -1,137 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - fetchurl, - boost, - cmake, - ffmpeg, - libsForQt5, - gdal, - gfortran, - libXt, - makeWrapper, - ninja, - mpi, - python312, - tbb, - libGLU, - libGL, - withDocs ? true, -}: - -let - version = "5.13.2"; - - docFiles = [ - (fetchurl { - url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewTutorial-${version}.pdf"; - name = "Tutorial.pdf"; - hash = "sha256-jJ6YUT2rgVExfKv900LbSO+MDQ4u73K7cBScHxWoP+g="; - }) - (fetchurl { - url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewGettingStarted-${version}.pdf"; - name = "GettingStarted.pdf"; - hash = "sha256-ptPQA8By8Hj0qI5WRtw3ZhklelXeYeJwVaUdfd6msJM="; - }) - (fetchurl { - url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewCatalystGuide-${version}.pdf"; - name = "CatalystGuide.pdf"; - hash = "sha256-Pl7X5cBj3OralkOw5A29CtXnA+agYr6kWHf/+KZNHow="; - }) - ]; - -in -stdenv.mkDerivation rec { - pname = "paraview"; - inherit version; - - src = fetchFromGitLab { - domain = "gitlab.kitware.com"; - owner = "paraview"; - repo = "paraview"; - rev = "v${version}"; - hash = "sha256-29PLXVpvj8RLkSDWQgj5QjBZ6l1/0NoVx/qcJXOSssU="; - fetchSubmodules = true; - }; - - # Find the Qt platform plugin "minimal" - preConfigure = '' - export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} - ''; - - cmakeFlags = [ - "-DPARAVIEW_ENABLE_FFMPEG=ON" - "-DPARAVIEW_ENABLE_GDAL=ON" - "-DPARAVIEW_ENABLE_MOTIONFX=ON" - "-DPARAVIEW_ENABLE_VISITBRIDGE=ON" - "-DPARAVIEW_ENABLE_XDMF3=ON" - "-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON" - "-DPARAVIEW_USE_MPI=ON" - "-DPARAVIEW_USE_PYTHON=ON" - "-DVTK_SMP_IMPLEMENTATION_TYPE=TBB" - "-DVTKm_ENABLE_MPI=ON" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_BINDIR=bin" - "-DOpenGL_GL_PREFERENCE=GLVND" - "-GNinja" - ]; - - nativeBuildInputs = [ - cmake - makeWrapper - ninja - gfortran - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - libGLU - libGL - libXt - mpi - tbb - boost - ffmpeg - gdal - libsForQt5.qtbase - libsForQt5.qtx11extras - libsForQt5.qttools - libsForQt5.qtxmlpatterns - libsForQt5.qtsvg - ]; - - postInstall = - let - docDir = "$out/share/paraview-${lib.versions.majorMinor version}/doc"; - in - lib.optionalString withDocs '' - mkdir -p ${docDir}; - for docFile in ${lib.concatStringsSep " " docFiles}; do - cp $docFile ${docDir}/$(stripHash $docFile); - done; - ''; - - propagatedBuildInputs = [ - (python312.withPackages ( - ps: with ps; [ - numpy - matplotlib - mpi4py - ] - )) - ]; - - # 23k objects, >4h on a normal build slot - requiredSystemFeatures = [ "big-parallel" ]; - - meta = { - homepage = "https://www.paraview.org"; - description = "3D Data analysis and visualization application"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ guibert ]; - changelog = "https://www.kitware.com/paraview-${lib.concatStringsSep "-" (lib.versions.splitVersion version)}-release-notes"; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 268952e4747d..338b5fc316e8 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -70,17 +70,17 @@ python3.pkgs.buildPythonApplication { aiorpcx attrs bitstring + certifi cryptography dnspython jsonrpclib-pelix matplotlib pbkdf2 protobuf - py-scrypt pysocks qrcode requests - certifi + scrypt # plugins btchip-python ckcc-protocol diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index 20658e875909..f126b71e64f3 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "33.8.0"; + version = "33.8.1.2"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -173,11 +173,11 @@ stdenv.mkDerivation (finalAttrs: { { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-cdPFMYlVEr6D+0mH7Mg5nGpf0KvePGLm3Y/ZytdFHHA="; + hash = "sha256-qgabtZ/8nBaOGP0pIXd/byd9XCxulT8w+7uczJE4SAg="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-dgWKmkHl5B1ri3uev63MNz/+E767ip9wJ/YzSog8vdQ="; + hash = "sha256-qeA8EYRY9STsezWrvlVt73fgxPB0mynkxtTV71HFMgU="; }; }; diff --git a/pkgs/applications/networking/cluster/k3s/update-script.sh b/pkgs/applications/networking/cluster/k3s/update-script.sh index b1c7c2915d3c..0a1d06a656c0 100755 --- a/pkgs/applications/networking/cluster/k3s/update-script.sh +++ b/pkgs/applications/networking/cluster/k3s/update-script.sh @@ -61,17 +61,19 @@ fi cd "${NIXPKGS_K3S_PATH}/${MAJOR_VERSION}_${MINOR_VERSION}" CHARTS_URL=https://k3s.io/k3s-charts/assets +TRAEFIK_CRD_CHART_SHA256=$(nix-hash --type sha256 --base32 --flat <(curl -o - "${CHARTS_URL}/traefik-crd/${CHART_FILES[0]}")) +TRAEFIK_CHART_SHA256=$(nix-hash --type sha256 --base32 --flat <(curl -o - "${CHARTS_URL}/traefik/${CHART_FILES[1]}")) # Get metadata for both files rm -f chart-versions.nix.update cat > chart-versions.nix.update < 0 )); then + local disabledTestsFilters=("${disabledTests[@]/#/FullyQualifiedName!=}") + testFilters=( "${testFilters[@]}" "${disabledTestsFilters[@]//,/%2C}" ) + fi + + if (( ${#testFilters[@]} > 0 )); then + local OLDIFS="$IFS" IFS='&' + flags+=("--filter:${testFilters[*]}") + IFS="$OLDIFS" + fi + + local libraryPath="${LD_LIBRARY_PATH-}" + if (( ${#runtimeDeps[@]} > 0 )); then + local libraryPaths=("${runtimeDeps[@]/%//lib}") + local OLDIFS="$IFS" IFS=':' + libraryPath="${libraryPaths[*]}${libraryPath:+':'}$libraryPath" + IFS="$OLDIFS" + fi + + if [[ -n ${enableParallelBuilding-} ]]; then + local -r maxCpuFlag="$NIX_BUILD_CORES" + else + local -r maxCpuFlag="1" + fi + + local projectFile runtimeId + for projectFile in "${testProjectFiles[@]-${projectFiles[@]}}"; do + for runtimeId in "${runtimeIds[@]}"; do + local runtimeIdFlags=() + if [[ $projectFile == *.csproj ]]; then + runtimeIdFlags=("--runtime" "$runtimeId") + fi + + LD_LIBRARY_PATH=$libraryPath \ + dotnet test "$projectFile" \ + -maxcpucount:"$maxCpuFlag" \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --configuration "$dotnetBuildType" \ + --no-restore \ + --no-build \ + --logger "console;verbosity=normal" \ + "${runtimeIdFlags[@]}" \ + "${flags[@]}" + done + done + + runHook postCheck + + echo "Finished dotnetCheckHook" +} + +if [[ -z "${dontDotnetCheck-}" && -z "${checkPhase-}" ]]; then + checkPhase=dotnetCheckPhase +fi + +# For compatibility, convert makeWrapperArgs to an array unless we are using +# structured attributes. That is, we ensure that makeWrapperArgs is always an +# array. +# See https://github.com/NixOS/nixpkgs/blob/858f4db3048c5be3527e183470e93c1a72c5727c/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh#L1-L3 +# and https://github.com/NixOS/nixpkgs/pull/313005#issuecomment-2175482920 +# shellcheck disable=2206 +if [[ -z $__structuredAttrs ]]; then + makeWrapperArgs=( ${makeWrapperArgs-} ) +fi + +# First argument is the executable you want to wrap, +# the second is the destination for the wrapper. +wrapDotnetProgram() { + local -r dotnetRuntime=@dotnetRuntime@ + local -r wrapperPath=@wrapperPath@ + + # shellcheck disable=2016 + local -r dotnetFromEnvScript='dotnetFromEnv() { + local dotnetPath + if command -v dotnet 2>&1 >/dev/null; then + dotnetPath=$(which dotnet) && \ + dotnetPath=$(realpath "$dotnetPath") && \ + dotnetPath=$(dirname "$dotnetPath") && \ + export DOTNET_ROOT="$dotnetPath" + fi +} +dotnetFromEnv' + + # shellcheck disable=2206 + local -a runtimeDeps + concatTo runtimeDeps dotnetRuntimeDeps + + local wrapperFlags=() + if (( ${#runtimeDeps[@]} > 0 )); then + local libraryPath=("${dotnetRuntimeDeps[@]/%//lib}") + local OLDIFS="$IFS" IFS=':' + wrapperFlags+=("--suffix" "LD_LIBRARY_PATH" ":" "${libraryPath[*]}") + IFS="$OLDIFS" + fi + + if [[ -z ${dotnetSelfContainedBuild-} ]]; then + if [[ -n ${useDotnetFromEnv-} ]]; then + # if dotnet CLI is available, set DOTNET_ROOT based on it. Otherwise set to default .NET runtime + wrapperFlags+=("--suffix" "PATH" ":" "$wrapperPath") + wrapperFlags+=("--run" "$dotnetFromEnvScript") + if [[ -n $dotnetRuntime ]]; then + wrapperFlags+=("--set-default" "DOTNET_ROOT" "$dotnetRuntime/share/dotnet") + wrapperFlags+=("--suffix" "PATH" ":" "$dotnetRuntime/bin") + fi + elif [[ -n $dotnetRuntime ]]; then + wrapperFlags+=("--set" "DOTNET_ROOT" "$dotnetRuntime/share/dotnet") + wrapperFlags+=("--prefix" "PATH" ":" "$dotnetRuntime/bin") + fi + fi + + # shellcheck disable=2154 + makeWrapper "$1" "$2" \ + "${wrapperFlags[@]}" \ + "${gappsWrapperArgs[@]}" \ + "${makeWrapperArgs[@]}" + + echo "installed wrapper to $2" +} + +dotnetFixupPhase() { + local -r dotnetInstallPath="${dotnetInstallPath-$out/lib/$pname}" + + local executable executableBasename + + # check if dotnetExecutables is declared (including empty values, in which case we generate no executables) + # shellcheck disable=2154 + if declare -p dotnetExecutables &>/dev/null; then + # shellcheck disable=2206 + local -a executables + concatTo executables dotnetExecutables + for executable in "${executables[@]}"; do + executableBasename=$(basename "$executable") + + local path="$dotnetInstallPath/$executable" + + if test -x "$path"; then + wrapDotnetProgram "$path" "$out/bin/$executableBasename" + else + echo "Specified binary \"$executable\" is either not an executable or does not exist!" + echo "Looked in $path" + exit 1 + fi + done + else + while IFS= read -r -d '' executable; do + executableBasename=$(basename "$executable") + wrapDotnetProgram "$executable" "$out/bin/$executableBasename" \; + done < <(find "$dotnetInstallPath" ! -name "*.dll" -executable -type f -print0) + fi +} + +if [[ -z "${dontFixup-}" && -z "${dontDotnetFixup-}" ]]; then + appendToVar preFixupPhases dotnetFixupPhase +fi + +dotnetInstallPhase() { + echo "Executing dotnetInstallHook" + + runHook preInstall + + local -r dotnetInstallPath="${dotnetInstallPath-$out/lib/$pname}" + local -r dotnetBuildType="${dotnetBuildType-Release}" + + local -a projectFiles flags installFlags packFlags runtimeIds + concatTo projectFiles dotnetProjectFiles + concatTo flags dotnetFlags + concatTo installFlags dotnetInstallFlags + concatTo packFlags dotnetPackFlags + concatTo runtimeIds dotnetRuntimeIds + + if [[ -v dotnetSelfContainedBuild ]]; then + if [[ -n $dotnetSelfContainedBuild ]]; then + installFlags+=("--self-contained") + else + installFlags+=("--no-self-contained") + # https://learn.microsoft.com/en-us/dotnet/core/deploying/trimming/trim-self-contained + # Trimming is only available for self-contained build, so force disable it here + installFlags+=("-p:PublishTrimmed=false") + fi + fi + + if [[ -n ${dotnetUseAppHost-} ]]; then + installFlags+=("-p:UseAppHost=true") + fi + + if [[ -n ${enableParallelBuilding-} ]]; then + local -r maxCpuFlag="$NIX_BUILD_CORES" + else + local -r maxCpuFlag="1" + fi + + dotnetPublish() { + local -r projectFile="${1-}" + + for runtimeId in "${runtimeIds[@]}"; do + runtimeIdFlags=() + if [[ $projectFile == *.csproj || -n ${dotnetSelfContainedBuild-} ]]; then + runtimeIdFlags+=("--runtime" "$runtimeId") + fi + + dotnet publish ${1+"$projectFile"} \ + -maxcpucount:"$maxCpuFlag" \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + -p:OverwriteReadOnlyFiles=true \ + --output "$dotnetInstallPath" \ + --configuration "$dotnetBuildType" \ + --no-restore \ + --no-build \ + "${runtimeIdFlags[@]}" \ + "${flags[@]}" \ + "${installFlags[@]}" + done + } + + dotnetPack() { + local -r projectFile="${1-}" + + for runtimeId in "${runtimeIds[@]}"; do + dotnet pack ${1+"$projectFile"} \ + -maxcpucount:"$maxCpuFlag" \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + -p:OverwriteReadOnlyFiles=true \ + --output "$out/share/nuget/source" \ + --configuration "$dotnetBuildType" \ + --no-restore \ + --no-build \ + --runtime "$runtimeId" \ + "${flags[@]}" \ + "${packFlags[@]}" + done + } + + if (( ${#projectFiles[@]} == 0 )); then + dotnetPublish + else + local projectFile + for projectFile in "${projectFiles[@]}"; do + dotnetPublish "$projectFile" + done + fi + + if [[ -n ${packNupkg-} ]]; then + if (( ${#projectFiles[@]} == 0 )); then + dotnetPack + else + local projectFile + for projectFile in "${projectFiles[@]}"; do + dotnetPack "$projectFile" + done + fi + fi + + runHook postInstall + + echo "Finished dotnetInstallHook" +} + +if [[ -z "${dontDotnetInstall-}" && -z "${installPhase-}" ]]; then + installPhase=dotnetInstallPhase +fi diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix deleted file mode 100644 index a30b1b19fef7..000000000000 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - lib, - stdenv, - which, - coreutils, - zlib, - openssl, - makeSetupHook, - zip, - # Passed from ../default.nix - dotnet-sdk, - dotnet-runtime, -}: -{ - dotnetConfigureHook = makeSetupHook { - name = "dotnet-configure-hook"; - substitutions = { - dynamicLinker = "${stdenv.cc}/nix-support/dynamic-linker"; - libPath = lib.makeLibraryPath [ - stdenv.cc.cc - stdenv.cc.libc - dotnet-sdk.passthru.icu - zlib - openssl - ]; - }; - } ./dotnet-configure-hook.sh; - - dotnetBuildHook = makeSetupHook { - name = "dotnet-build-hook"; - } ./dotnet-build-hook.sh; - - dotnetCheckHook = makeSetupHook { - name = "dotnet-check-hook"; - } ./dotnet-check-hook.sh; - - dotnetInstallHook = makeSetupHook { - name = "dotnet-install-hook"; - substitutions = { - inherit zip; - }; - } ./dotnet-install-hook.sh; - - dotnetFixupHook = makeSetupHook { - name = "dotnet-fixup-hook"; - substitutions = { - dotnetRuntime = if (dotnet-runtime != null) then dotnet-runtime else null; - wrapperPath = lib.makeBinPath [ - which - coreutils - ]; - }; - } ./dotnet-fixup-hook.sh; -} diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh deleted file mode 100644 index c45204c574de..000000000000 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh +++ /dev/null @@ -1,91 +0,0 @@ -dotnetBuildHook() { - echo "Executing dotnetBuildHook" - - runHook preBuild - - local -r dotnetBuildType="${dotnetBuildType-Release}" - - if [[ -n $__structuredAttrs ]]; then - local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" ) - local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" ) - local dotnetFlagsArray=( "${dotnetFlags[@]}" ) - local dotnetBuildFlagsArray=( "${dotnetBuildFlags[@]}" ) - local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" ) - else - local dotnetProjectFilesArray=($dotnetProjectFiles) - local dotnetTestProjectFilesArray=($dotnetTestProjectFiles) - local dotnetFlagsArray=($dotnetFlags) - local dotnetBuildFlagsArray=($dotnetBuildFlags) - local dotnetRuntimeIdsArray=($dotnetRuntimeIds) - fi - - if [[ -n "${enableParallelBuilding-}" ]]; then - local -r maxCpuFlag="$NIX_BUILD_CORES" - local -r parallelBuildFlag="true" - else - local -r maxCpuFlag="1" - local -r parallelBuildFlag="false" - fi - - if [[ -v dotnetSelfContainedBuild ]]; then - if [[ -n $dotnetSelfContainedBuild ]]; then - dotnetBuildFlagsArray+=("-p:SelfContained=true") - else - dotnetBuildFlagsArray+=("-p:SelfContained=false") - fi - fi - - if [[ -n ${dotnetUseAppHost-} ]]; then - dotnetBuildFlagsArray+=("-p:UseAppHost=true") - fi - - local versionFlagsArray=() - if [[ -n ${version-} ]]; then - versionFlagsArray+=("-p:InformationalVersion=$version") - fi - - if [[ -n ${versionForDotnet-} ]]; then - versionFlagsArray+=("-p:Version=$versionForDotnet") - fi - - dotnetBuild() { - local -r projectFile="${1-}" - - for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do - local runtimeIdFlagsArray=() - if [[ $projectFile == *.csproj || -n ${dotnetSelfContainedBuild-} ]]; then - runtimeIdFlagsArray+=("--runtime" "$runtimeId") - fi - - dotnet build ${1+"$projectFile"} \ - -maxcpucount:"$maxCpuFlag" \ - -p:BuildInParallel="$parallelBuildFlag" \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - -p:OverwriteReadOnlyFiles=true \ - --configuration "$dotnetBuildType" \ - --no-restore \ - "${versionFlagsArray[@]}" \ - "${runtimeIdFlagsArray[@]}" \ - "${dotnetBuildFlagsArray[@]}" \ - "${dotnetFlagsArray[@]}" - done - } - - if (( ${#dotnetProjectFilesArray[@]} == 0 )); then - dotnetBuild - fi - - local projectFile - for projectFile in "${dotnetProjectFilesArray[@]}" "${dotnetTestProjectFilesArray[@]}"; do - dotnetBuild "$projectFile" - done - - runHook postBuild - - echo "Finished dotnetBuildHook" -} - -if [[ -z ${dontDotnetBuild-} && -z ${buildPhase-} ]]; then - buildPhase=dotnetBuildHook -fi diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh deleted file mode 100644 index 38ded5874ad2..000000000000 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh +++ /dev/null @@ -1,81 +0,0 @@ -dotnetCheckHook() { - echo "Executing dotnetCheckHook" - - runHook preCheck - - local -r dotnetBuildType="${dotnetBuildType-Release}" - - if [[ -n $__structuredAttrs ]]; then - local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" ) - local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" ) - local dotnetTestFlagsArray=( "${dotnetTestFlags[@]}" ) - local dotnetTestFiltersArray=( "${dotnetTestFilters[@]}" ) - local dotnetDisabledTestsArray=( "${dotnetDisabledTests[@]}" ) - local dotnetRuntimeDepsArray=( "${dotnetRuntimeDeps[@]}" ) - local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" ) - else - local dotnetProjectFilesArray=($dotnetProjectFiles) - local dotnetTestProjectFilesArray=($dotnetTestProjectFiles) - local dotnetTestFlagsArray=($dotnetTestFlags) - local dotnetTestFiltersArray=($dotnetTestFilters) - local dotnetDisabledTestsArray=($dotnetDisabledTests) - local dotnetRuntimeDepsArray=($dotnetRuntimeDeps) - local dotnetRuntimeIdsArray=($dotnetRuntimeIds) - fi - - if (( ${#dotnetDisabledTestsArray[@]} > 0 )); then - local disabledTestsFilters=("${dotnetDisabledTestsArray[@]/#/FullyQualifiedName!=}") - dotnetTestFiltersArray=( "${dotnetTestFiltersArray[@]}" "${disabledTestsFilters[@]//,/%2C}" ) - fi - - if (( ${#dotnetTestFiltersArray[@]} > 0 )); then - local OLDIFS="$IFS" IFS='&' - dotnetTestFlagsArray+=("--filter:${dotnetTestFiltersArray[*]}") - IFS="$OLDIFS" - fi - - local libraryPath="${LD_LIBRARY_PATH-}" - if (( ${#dotnetRuntimeDepsArray[@]} > 0 )); then - local libraryPathArray=("${dotnetRuntimeDepsArray[@]/%//lib}") - local OLDIFS="$IFS" IFS=':' - libraryPath="${libraryPathArray[*]}${libraryPath:+':'}$libraryPath" - IFS="$OLDIFS" - fi - - if [[ -n ${enableParallelBuilding-} ]]; then - local -r maxCpuFlag="$NIX_BUILD_CORES" - else - local -r maxCpuFlag="1" - fi - - local projectFile runtimeId - for projectFile in "${dotnetTestProjectFilesArray[@]-${dotnetProjectFilesArray[@]}}"; do - for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do - local runtimeIdFlagsArray=() - if [[ $projectFile == *.csproj ]]; then - runtimeIdFlagsArray=("--runtime" "$runtimeId") - fi - - LD_LIBRARY_PATH=$libraryPath \ - dotnet test "$projectFile" \ - -maxcpucount:"$maxCpuFlag" \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - --configuration "$dotnetBuildType" \ - --no-restore \ - --no-build \ - --logger "console;verbosity=normal" \ - "${runtimeIdFlagsArray[@]}" \ - "${dotnetTestFlagsArray[@]}" \ - "${dotnetFlagsArray[@]}" - done - done - - runHook postCheck - - echo "Finished dotnetCheckHook" -} - -if [[ -z "${dontDotnetCheck-}" && -z "${checkPhase-}" ]]; then - checkPhase=dotnetCheckHook -fi diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh deleted file mode 100644 index 542f0af79f63..000000000000 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh +++ /dev/null @@ -1,78 +0,0 @@ -dotnetConfigureHook() { - echo "Executing dotnetConfigureHook" - - runHook preConfigure - - local -r dynamicLinker=@dynamicLinker@ - local -r libPath=@libPath@ - - if [[ -n $__structuredAttrs ]]; then - local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" ) - local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" ) - local dotnetFlagsArray=( "${dotnetFlags[@]}" ) - local dotnetRestoreFlagsArray=( "${dotnetRestoreFlags[@]}" ) - local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" ) - else - local dotnetProjectFilesArray=($dotnetProjectFiles) - local dotnetTestProjectFilesArray=($dotnetTestProjectFiles) - local dotnetFlagsArray=($dotnetFlags) - local dotnetRestoreFlagsArray=($dotnetRestoreFlags) - local dotnetRuntimeIdsArray=($dotnetRuntimeIds) - fi - - if [[ -z ${enableParallelBuilding-} ]]; then - local -r parallelFlag="--disable-parallel" - fi - - if [[ -v dotnetSelfContainedBuild ]]; then - if [[ -n $dotnetSelfContainedBuild ]]; then - dotnetRestoreFlagsArray+=("-p:SelfContained=true") - else - dotnetRestoreFlagsArray+=("-p:SelfContained=false") - fi - fi - - dotnetRestore() { - local -r projectFile="${1-}" - for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do - dotnet restore ${1+"$projectFile"} \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - -p:NuGetAudit=false \ - --runtime "$runtimeId" \ - ${parallelFlag-} \ - "${dotnetRestoreFlagsArray[@]}" \ - "${dotnetFlagsArray[@]}" - done - } - - if [[ -f .config/dotnet-tools.json || -f dotnet-tools.json ]]; then - dotnet tool restore - fi - - # dotnetGlobalTool is set in buildDotnetGlobalTool to patch dependencies but - # avoid other project-specific logic. This is a hack, but the old behavior - # is worse as it relied on a bug: setting projectFile to an empty string - # made the hooks actually skip all project-specific logic. It’s hard to keep - # backwards compatibility with this odd behavior now since we are using - # arrays, so instead we just pass a variable to indicate that we don’t have - # projects. - if [[ -z ${dotnetGlobalTool-} ]]; then - if (( ${#dotnetProjectFilesArray[@]} == 0 )); then - dotnetRestore - fi - - local projectFile - for projectFile in "${dotnetProjectFilesArray[@]}" "${dotnetTestProjectFilesArray[@]}"; do - dotnetRestore "$projectFile" - done - fi - - runHook postConfigure - - echo "Finished dotnetConfigureHook" -} - -if [[ -z "${dontDotnetConfigure-}" && -z "${configurePhase-}" ]]; then - configurePhase=dotnetConfigureHook -fi diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh deleted file mode 100644 index 8d4315350ad5..000000000000 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh +++ /dev/null @@ -1,101 +0,0 @@ -# For compatibility, convert makeWrapperArgs to an array unless we are using -# structured attributes. That is, we ensure that makeWrapperArgs is always an -# array. -# See https://github.com/NixOS/nixpkgs/blob/858f4db3048c5be3527e183470e93c1a72c5727c/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh#L1-L3 -# and https://github.com/NixOS/nixpkgs/pull/313005#issuecomment-2175482920 -if [[ -z $__structuredAttrs ]]; then - makeWrapperArgs=( ${makeWrapperArgs-} ) -fi - -# First argument is the executable you want to wrap, -# the second is the destination for the wrapper. -wrapDotnetProgram() { - local -r dotnetRuntime=@dotnetRuntime@ - local -r wrapperPath=@wrapperPath@ - - local -r dotnetFromEnvScript='dotnetFromEnv() { - local dotnetPath - if command -v dotnet 2>&1 >/dev/null; then - dotnetPath=$(which dotnet) && \ - dotnetPath=$(realpath "$dotnetPath") && \ - dotnetPath=$(dirname "$dotnetPath") && \ - export DOTNET_ROOT="$dotnetPath" - fi -} -dotnetFromEnv' - - if [[ -n $__structuredAttrs ]]; then - local -r dotnetRuntimeDepsArray=( "${dotnetRuntimeDeps[@]}" ) - else - local -r dotnetRuntimeDepsArray=($dotnetRuntimeDeps) - fi - - local dotnetRuntimeDepsFlags=() - if (( ${#dotnetRuntimeDepsArray[@]} > 0 )); then - local libraryPathArray=("${dotnetRuntimeDepsArray[@]/%//lib}") - local OLDIFS="$IFS" IFS=':' - dotnetRuntimeDepsFlags+=("--suffix" "LD_LIBRARY_PATH" ":" "${libraryPathArray[*]}") - IFS="$OLDIFS" - fi - - local dotnetRootFlagsArray=() - if [[ -z ${dotnetSelfContainedBuild-} ]]; then - if [[ -n ${useDotnetFromEnv-} ]]; then - # if dotnet CLI is available, set DOTNET_ROOT based on it. Otherwise set to default .NET runtime - dotnetRootFlagsArray+=("--suffix" "PATH" ":" "$wrapperPath") - dotnetRootFlagsArray+=("--run" "$dotnetFromEnvScript") - if [[ -n $dotnetRuntime ]]; then - dotnetRootFlagsArray+=("--set-default" "DOTNET_ROOT" "$dotnetRuntime/share/dotnet") - dotnetRootFlagsArray+=("--suffix" "PATH" ":" "$dotnetRuntime/bin") - fi - elif [[ -n $dotnetRuntime ]]; then - dotnetRootFlagsArray+=("--set" "DOTNET_ROOT" "$dotnetRuntime/share/dotnet") - dotnetRootFlagsArray+=("--prefix" "PATH" ":" "$dotnetRuntime/bin") - fi - fi - - makeWrapper "$1" "$2" \ - "${dotnetRuntimeDepsFlags[@]}" \ - "${dotnetRootFlagsArray[@]}" \ - "${gappsWrapperArgs[@]}" \ - "${makeWrapperArgs[@]}" - - echo "installed wrapper to "$2"" -} - -dotnetFixupHook() { - local -r dotnetInstallPath="${dotnetInstallPath-$out/lib/$pname}" - - local executable executableBasename - - # check if dotnetExecutables is declared (including empty values, in which case we generate no executables) - if declare -p dotnetExecutables &>/dev/null; then - if [[ -n $__structuredAttrs ]]; then - local dotnetExecutablesArray=( "${dotnetExecutables[@]}" ) - else - local dotnetExecutablesArray=($dotnetExecutables) - fi - for executable in "${dotnetExecutablesArray[@]}"; do - executableBasename=$(basename "$executable") - - local path="$dotnetInstallPath/$executable" - - if test -x "$path"; then - wrapDotnetProgram "$path" "$out/bin/$executableBasename" - else - echo "Specified binary \"$executable\" is either not an executable or does not exist!" - echo "Looked in $path" - exit 1 - fi - done - else - while IFS= read -d '' executable; do - executableBasename=$(basename "$executable") - wrapDotnetProgram "$executable" "$out/bin/$executableBasename" \; - done < <(find "$dotnetInstallPath" ! -name "*.dll" -executable -type f -print0) - fi -} - -if [[ -z "${dontFixup-}" && -z "${dontDotnetFixup-}" ]]; then - appendToVar preFixupPhases dotnetFixupHook -fi diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh deleted file mode 100644 index 8b731b4feab1..000000000000 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh +++ /dev/null @@ -1,114 +0,0 @@ -dotnetInstallHook() { - echo "Executing dotnetInstallHook" - - runHook preInstall - - local -r dotnetInstallPath="${dotnetInstallPath-$out/lib/$pname}" - local -r dotnetBuildType="${dotnetBuildType-Release}" - - if [[ -n $__structuredAttrs ]]; then - local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" ) - local dotnetFlagsArray=( "${dotnetFlags[@]}" ) - local dotnetInstallFlagsArray=( "${dotnetInstallFlags[@]}" ) - local dotnetPackFlagsArray=( "${dotnetPackFlags[@]}" ) - local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" ) - else - local dotnetProjectFilesArray=($dotnetProjectFiles) - local dotnetFlagsArray=($dotnetFlags) - local dotnetInstallFlagsArray=($dotnetInstallFlags) - local dotnetPackFlagsArray=($dotnetPackFlags) - local dotnetRuntimeIdsArray=($dotnetRuntimeIds) - fi - - if [[ -v dotnetSelfContainedBuild ]]; then - if [[ -n $dotnetSelfContainedBuild ]]; then - dotnetInstallFlagsArray+=("--self-contained") - else - dotnetInstallFlagsArray+=("--no-self-contained") - # https://learn.microsoft.com/en-us/dotnet/core/deploying/trimming/trim-self-contained - # Trimming is only available for self-contained build, so force disable it here - dotnetInstallFlagsArray+=("-p:PublishTrimmed=false") - fi - fi - - if [[ -n ${dotnetUseAppHost-} ]]; then - dotnetInstallFlagsArray+=("-p:UseAppHost=true") - fi - - if [[ -n ${enableParallelBuilding-} ]]; then - local -r maxCpuFlag="$NIX_BUILD_CORES" - else - local -r maxCpuFlag="1" - fi - - dotnetPublish() { - local -r projectFile="${1-}" - - for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do - runtimeIdFlagsArray=() - if [[ $projectFile == *.csproj || -n ${dotnetSelfContainedBuild-} ]]; then - runtimeIdFlagsArray+=("--runtime" "$runtimeId") - fi - - dotnet publish ${1+"$projectFile"} \ - -maxcpucount:"$maxCpuFlag" \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - -p:OverwriteReadOnlyFiles=true \ - --output "$dotnetInstallPath" \ - --configuration "$dotnetBuildType" \ - --no-restore \ - --no-build \ - "${runtimeIdFlagsArray[@]}" \ - "${dotnetInstallFlagsArray[@]}" \ - "${dotnetFlagsArray[@]}" - done - } - - dotnetPack() { - local -r projectFile="${1-}" - - for runtimeId in "${dotnetRuntimeIdsArray[@]}"; do - dotnet pack ${1+"$projectFile"} \ - -maxcpucount:"$maxCpuFlag" \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - -p:OverwriteReadOnlyFiles=true \ - --output "$out/share/nuget/source" \ - --configuration "$dotnetBuildType" \ - --no-restore \ - --no-build \ - --runtime "$runtimeId" \ - "${dotnetPackFlagsArray[@]}" \ - "${dotnetFlagsArray[@]}" - done - } - - if (( ${#dotnetProjectFilesArray[@]} == 0 )); then - dotnetPublish - else - local projectFile - for projectFile in "${dotnetProjectFilesArray[@]}"; do - dotnetPublish "$projectFile" - done - fi - - if [[ -n ${packNupkg-} ]]; then - if (( ${#dotnetProjectFilesArray[@]} == 0 )); then - dotnetPack - else - local projectFile - for projectFile in "${dotnetProjectFilesArray[@]}"; do - dotnetPack "$projectFile" - done - fi - fi - - runHook postInstall - - echo "Finished dotnetInstallHook" -} - -if [[ -z "${dontDotnetInstall-}" && -z "${installPhase-}" ]]; then - installPhase=dotnetInstallHook -fi diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index 44632ea8ab7b..7108d39dfef7 100644 --- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix +++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "ananicy-rules-cachyos"; - version = "0-unstable-2025-07-06"; + version = "0-unstable-2025-08-06"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "339bee6f2de3de8e866c23b210baf6cabf153549"; - hash = "sha256-D/+/7NdfV8kHwYm5mJ6b7Vl3QCUdK2+NbZSefWTZt5k="; + rev = "80576999c92af3eb88ea2008d4a18d29393ed579"; + hash = "sha256-SdxOgm7purRxIU16RFuSgUzKIgi+7gJ2hJuCDVCjd54="; }; dontConfigure = true; diff --git a/pkgs/by-name/ap/api-linter/package.nix b/pkgs/by-name/ap/api-linter/package.nix index 1c3c32f50cf6..6eeb224c6b88 100644 --- a/pkgs/by-name/ap/api-linter/package.nix +++ b/pkgs/by-name/ap/api-linter/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "api-linter"; - version = "1.70.1"; + version = "1.70.2"; src = fetchFromGitHub { owner = "googleapis"; repo = "api-linter"; tag = "v${version}"; - hash = "sha256-Jztu8xQWLeJVSk+yx3julu0wkQNpgQtzZvrKP71T7Eg="; + hash = "sha256-2ILG+FW+58WnmL5Ts1K32ee0SR15yp9NnEtmEo6r6w8="; }; - vendorHash = "sha256-wIZdL393uPVqz0rJV5NU6SHm8RU5orrHREhKbjBHTYU="; + vendorHash = "sha256-CHObiSQudxZw5KjimQk8myTsLeQMBZU8SewW4I2dNsw="; subPackages = [ "cmd/api-linter" ]; diff --git a/pkgs/by-name/ar/arc-theme/package.nix b/pkgs/by-name/ar/arc-theme/package.nix index 8f6e90986c6f..d92f85e0c870 100644 --- a/pkgs/by-name/ar/arc-theme/package.nix +++ b/pkgs/by-name/ar/arc-theme/package.nix @@ -10,7 +10,7 @@ gnome-themes-extra, gtk-engine-murrine, inkscape, - cinnamon-common, + cinnamon, makeFontsConf, python3, }: @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { mesonFlags = [ # "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm,metacity" # "-Dvariants=light,darker,dark,lighter" - "-Dcinnamon_version=${cinnamon-common.version}" + "-Dcinnamon_version=${cinnamon.version}" "-Dgnome_shell_version=${gnome-shell.version}" # You will need to patch gdm to make use of this. "-Dgnome_shell_gresource=true" diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix index 9c3ceaa37a76..5b0b3c0ce928 100644 --- a/pkgs/by-name/ar/art/package.nix +++ b/pkgs/by-name/ar/art/package.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "art"; - version = "1.25.7"; + version = "1.25.8"; src = fetchFromGitHub { owner = "artpixls"; repo = "ART"; tag = version; - hash = "sha256-VrIayD7Gj0j5Rfs6sl2tZTqPFTvQcJHgUnGQ6IGiUmU="; + hash = "sha256-FsaTXGlQ390XgFrV4InF+xFr+Y9JgZefsR/AyHOuSsA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ar/artichoke/package.nix b/pkgs/by-name/ar/artichoke/package.nix index 7282ca4388be..25bfac1bca1b 100644 --- a/pkgs/by-name/ar/artichoke/package.nix +++ b/pkgs/by-name/ar/artichoke/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage { pname = "artichoke"; - version = "0-unstable-2025-07-28"; + version = "0-unstable-2025-08-03"; src = fetchFromGitHub { owner = "artichoke"; repo = "artichoke"; - rev = "148d3bf4bc361fa3214c02219e50e22e4cf2a3cf"; - hash = "sha256-CKCRFSg8ROMhKwiIDU9iAYY/HfGtYlW1zrtn7thxIzY="; + rev = "ff0b17820a5f64ea9e8b744cef4a9111df3ed252"; + hash = "sha256-0SUU/1gp7A0gjluc8ZyF9C4ZxAgNsM6jwuT3E8GxFQY="; }; - cargoHash = "sha256-a43awTdhOlu+KO3B6XQ7Vdv4NbZ3iffq4rpmBBgUcZ8="; + cargoHash = "sha256-JD+qt0pu5wxIuLa3Bd9eadQFE7dyKzqxsAKPebG7+Zg="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/az/azurite/package.nix b/pkgs/by-name/az/azurite/package.nix index ec273e15187c..5ad12be555d8 100644 --- a/pkgs/by-name/az/azurite/package.nix +++ b/pkgs/by-name/az/azurite/package.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "azurite"; - version = "3.34.0"; + version = "3.35.0"; src = fetchFromGitHub { owner = "Azure"; repo = "Azurite"; rev = "v${version}"; - hash = "sha256-6NECduq2ewed8bR4rlF5MW8mGcsgu8bqgA/DBt8ywtM="; + hash = "sha256-sVYiHQJ3nR5vM+oPAHzr/MjuNBMY14afqCHpw32WCiQ="; }; - npmDepsHash = "sha256-WRaD99CsIuH3BrO01eVuoEZo40VjuScnVzmlFcKpj8g="; + npmDepsHash = "sha256-UBHjb65Ud7IANsR30DokbI/16+dVjDEtfhqRPAQhGUw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ba/baresip/fix-modules-path.patch b/pkgs/by-name/ba/baresip/fix-modules-path.patch new file mode 100644 index 000000000000..b02c830057c2 --- /dev/null +++ b/pkgs/by-name/ba/baresip/fix-modules-path.patch @@ -0,0 +1,29 @@ +commit 46479c52695cc5f8c01370fd2594468666c45c8e +Author: rnhmjoj +Date: Sun Aug 3 00:18:47 2025 +0200 + + Fix the modules path at build time + + The location of the modules is determined by reading the `module_path` + setting, which is set to "$out/lib/baresip/modules" when the + configuration file is generated during the first run. If the package is + updated and the store path changes, baresip breaks completely, forcing + the user to manually fix the configuration. + + This patch fixes the location of the modules at build time, ignoring the + `module_path` setting, to avoid this issue. + +diff --git a/src/module.c b/src/module.c +index 9f2135c6..b62d0bdd 100644 +--- a/src/module.c ++++ b/src/module.c +@@ -141,8 +141,7 @@ int module_init(const struct conf *conf) + if (!conf) + return EINVAL; + +- if (conf_get(conf, "module_path", &path)) +- pl_set_str(&path, "."); ++ pl_set_str(&path, MOD_PATH); + + err = conf_apply(conf, "module", module_handler, &path); + if (err) diff --git a/pkgs/by-name/ba/baresip/package.nix b/pkgs/by-name/ba/baresip/package.nix index 904042be942e..1bf303ffbc9e 100644 --- a/pkgs/by-name/ba/baresip/package.nix +++ b/pkgs/by-name/ba/baresip/package.nix @@ -29,21 +29,29 @@ zlib, dbusSupport ? true, }: + stdenv.mkDerivation rec { - version = "3.10.1"; + version = "3.24.0"; pname = "baresip"; + src = fetchFromGitHub { owner = "baresip"; repo = "baresip"; rev = "v${version}"; - hash = "sha256-0huZP1hopHaN5R1Hki6YutpvoASfIHzHMl/Y4czHHMo="; + hash = "sha256-32XyMblHF+ST+TpIbdyPFdRtWnIugYMr4lYZnfeFm/c="; }; + + patches = [ + ./fix-modules-path.patch + ]; + prePatch = '' substituteInPlace cmake/FindGTK3.cmake --replace-fail GTK3_CFLAGS_OTHER "" '' + lib.optionalString (!dbusSupport) '' substituteInPlace cmake/modules.cmake --replace-fail 'list(APPEND MODULES ctrl_dbus)' "" ''; + nativeBuildInputs = [ cmake pkg-config @@ -102,72 +110,75 @@ stdenv.mkDerivation rec { -D__need_timeval -D__need_timespec -D__need_time_t ''; - doInstallCheck = true; # CMake feature detection is prone to breakage between upgrades: # spot-check that the optional modules we care about were compiled - postInstallCheck = lib.concatMapStringsSep "\n" (m: "test -x $out/lib/baresip/modules/${m}.so") [ - "account" - "alsa" - "aubridge" - "auconv" - "aufile" - "auresamp" - "ausine" - "avcodec" - "avfilter" - "avformat" - "cons" - "contact" - "ctrl_dbus" - "ctrl_tcp" - "debug_cmd" - "dtls_srtp" - "ebuacip" - "echo" - "evdev" - "fakevideo" - "g711" - "g722" - "g726" - "gst" - "gtk" - "httpd" - "httpreq" - "ice" - "l16" - "menu" - "mixausrc" - "mixminus" - "multicast" - "mwi" - "natpmp" - "netroam" - "pcp" - "pipewire" - "plc" - "portaudio" - "presence" - "rtcpsummary" - "sdl" - "selfview" - "serreg" - "snapshot" - "sndfile" - "srtp" - "stdio" - "stun" - "swscale" - "syslog" - "turn" - "uuid" - "v4l2" - "vidbridge" - "vidinfo" - "vp8" - "vp9" - "vumeter" - "x11" - ]; + installCheckPhase = '' + runHook preInstallCheck + ${lib.concatMapStringsSep "\n" (m: "test -x $out/lib/baresip/modules/${m}.so") [ + "account" + "alsa" + "aubridge" + "auconv" + "aufile" + "auresamp" + "ausine" + "avcodec" + "avfilter" + "avformat" + "cons" + "contact" + "ctrl_dbus" + "ctrl_tcp" + "debug_cmd" + "dtls_srtp" + "ebuacip" + "echo" + "evdev" + "fakevideo" + "g711" + "g722" + "g726" + "gst" + "gtk" + "httpd" + "httpreq" + "ice" + "l16" + "menu" + "mixausrc" + "mixminus" + "multicast" + "mwi" + "natpmp" + "netroam" + "pcp" + "pipewire" + "plc" + "portaudio" + "presence" + "rtcpsummary" + "sdl" + "selfview" + "serreg" + "snapshot" + "sndfile" + "srtp" + "stdio" + "stun" + "swscale" + "syslog" + "turn" + "uuid" + "v4l2" + "vidbridge" + "vidinfo" + "vp8" + "vp9" + "vumeter" + "x11" + ]} + runHook postInstallCheck + ''; meta = { description = "Modular SIP User-Agent with audio and video support"; @@ -175,6 +186,7 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ raskin ehmry + rnhmjoj ]; mainProgram = "baresip"; license = lib.licenses.bsd3; diff --git a/pkgs/by-name/bl/bluemap/package.nix b/pkgs/by-name/bl/bluemap/package.nix index 40ce46ad9c40..fbb826c89b9e 100644 --- a/pkgs/by-name/bl/bluemap/package.nix +++ b/pkgs/by-name/bl/bluemap/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "bluemap"; - version = "5.10"; + version = "5.11"; src = fetchurl { url = "https://github.com/BlueMap-Minecraft/BlueMap/releases/download/v${version}/BlueMap-${version}-cli.jar"; - hash = "sha256-vz6ReXfgqWYnyFQNBgqaWLZ0sOJqHOmFcAnuwbbOmGA="; + hash = "sha256-DhsnuwVDvIb7eR4Hs2jOTufY2ysd+Awo0b8xg84quGU="; }; dontUnpack = true; diff --git a/pkgs/by-name/bn/bngblaster/package.nix b/pkgs/by-name/bn/bngblaster/package.nix index 349ef5c28691..0c69a0030677 100644 --- a/pkgs/by-name/bn/bngblaster/package.nix +++ b/pkgs/by-name/bn/bngblaster/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bngblaster"; - version = "0.9.22"; + version = "0.9.23"; src = fetchFromGitHub { owner = "rtbrick"; repo = "bngblaster"; rev = finalAttrs.version; - hash = "sha256-vLvPiHwrFLqNV9ReeFAr0YBn8HUt6SazanpwZ1q09oU="; + hash = "sha256-qo48OW02IMAAxMYTYguv5jKvy/GPq1WKgcluSrMIt2E="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix index c1480ed4f380..385ca3818024 100644 --- a/pkgs/by-name/ca/cargo-xwin/package.nix +++ b/pkgs/by-name/ca/cargo-xwin/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-xwin"; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { owner = "rust-cross"; repo = "cargo-xwin"; rev = "v${version}"; - hash = "sha256-rmbu3WNwCmgojAWAthIQ9/XiSS04d9DoZwGRGAuRfDw="; + hash = "sha256-qWHpExVt/a20GrP2uVvGbubF+Nr71Ob6abGLcnlpKJc="; }; - cargoHash = "sha256-7xpkxJh5KVJVw6wQZGr2daU1qg0e969EWflf4Z/01oY="; + cargoHash = "sha256-HctMp95J8ovYuvh7m5wxrNt+ZCVCzwPSSm71Ma1cVxI="; meta = with lib; { description = "Cross compile Cargo project to Windows MSVC target with ease"; diff --git a/pkgs/by-name/cf/cf-hero/package.nix b/pkgs/by-name/cf/cf-hero/package.nix new file mode 100644 index 000000000000..e4e16e814785 --- /dev/null +++ b/pkgs/by-name/cf/cf-hero/package.nix @@ -0,0 +1,34 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule (finalAttrs: { + pname = "cf-hero"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "musana"; + repo = "CF-Hero"; + tag = "v${finalAttrs.version}"; + hash = "sha256-n0kcapHBz6Dap6KKJByCwBZmXmcO/aK88X78Yit6rx4="; + }; + + vendorHash = "sha256-Yf+iZ3UIpP9EtOWW1jh3h3zTFK1D7mcOh113Q4fbAhA="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "Tool that uses multiple data sources to discover the origin IP addresses of Cloudflare-protected web applications"; + homepage = "https://github.com/musana/CF-Hero"; + changelog = "https://github.com/musana/CF-Hero/releases/tag/${finalAttrs.src.tag}"; + # No licensing details present, https://github.com/musana/CF-Hero/issues/16 + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "cf-hero"; + }; +}) diff --git a/pkgs/by-name/ch/chhoto-url/package.nix b/pkgs/by-name/ch/chhoto-url/package.nix index e1af552d8fe9..2f73b19d3f68 100644 --- a/pkgs/by-name/ch/chhoto-url/package.nix +++ b/pkgs/by-name/ch/chhoto-url/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "chhoto-url"; - version = "6.2.11"; + version = "6.2.12"; src = fetchFromGitHub { owner = "SinTan1729"; repo = "chhoto-url"; tag = finalAttrs.version; - hash = "sha256-3VQmTQ6ZlDTRL3nx/sQxWLKgW8ee0Ts+C1CiWkiX2/g="; + hash = "sha256-hV/YWxOPRTojVTFIXwzqImBKyQ1dCDq5+bgCdS7T1p0="; }; sourceRoot = "${finalAttrs.src.name}/actix"; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/" ''; - cargoHash = "sha256-QIqLzk/vAOrW0ain0Oq9tnqzCSyK4yDOYsjmil3xPc4="; + cargoHash = "sha256-9wXbd56KOQ7suZqtg2cSFf2FGQJADFMHJbwAAxJ2V4g="; postInstall = '' mkdir -p $out/share/chhoto-url diff --git a/pkgs/by-name/ch/chroma/package.nix b/pkgs/by-name/ch/chroma/package.nix index 929dbbb88b85..d795feef29fe 100644 --- a/pkgs/by-name/ch/chroma/package.nix +++ b/pkgs/by-name/ch/chroma/package.nix @@ -10,7 +10,7 @@ in buildGoModule rec { pname = "chroma"; - version = "2.19.0"; + version = "2.20.0"; # To update: # nix-prefetch-git --rev v${version} https://github.com/alecthomas/chroma.git > src.json @@ -21,7 +21,7 @@ buildGoModule rec { inherit (srcInfo) sha256; }; - vendorHash = "sha256-Gqldcp68Rn4wkfQptbmKUjkwLSb+qaFboJNfmWVkrPU="; + vendorHash = "sha256-GiaVgqhhrexSnBWVtQ+/cwdykHVDxR95BFMkrH1s+8Q="; modRoot = "./cmd/chroma"; diff --git a/pkgs/by-name/ch/chroma/src.json b/pkgs/by-name/ch/chroma/src.json index 1a5fd3cf2246..c705d660c1cb 100644 --- a/pkgs/by-name/ch/chroma/src.json +++ b/pkgs/by-name/ch/chroma/src.json @@ -1,12 +1,13 @@ { "url": "https://github.com/alecthomas/chroma.git", - "rev": "adeac8f5dbfb6806a51bcf07eefd89fc8a0aee6a", - "date": "2025-07-01T09:59:45+10:00", - "path": "/nix/store/063ldbczafhxq02g5n28bxr1xnl6fwgd-chroma", - "sha256": "1r50gqbizi7l1l07syx9wgfyx1k8gzspmsbpk42jnwgw3h9dcw42", - "hash": "sha256-gnDWEhz8cSsFmXfpevV/aIbu3eOpe30ADfTEHxd+oOQ=", + "rev": "303b65df3f2d2151cee24bcf9f9b625db474ef51", + "date": "2025-08-04T13:55:06+10:00", + "path": "/nix/store/1f8p33h1srs9knj6sn6mc5rf0wcybf4g-chroma", + "sha256": "05w4hnfcxqdlsz7mkc0m3jbp1aj67wzyhq5jh8ldfgnyjnlafia3", + "hash": "sha256-Q0WnqJXePtcogrJg6D8/RqpwlxwVsFnP17ThzpyFhBc=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, + "fetchTags": false, "leaveDotGit": false } diff --git a/pkgs/by-name/ci/cinnamon-desktop/package.nix b/pkgs/by-name/ci/cinnamon-desktop/package.nix index a58b09a422d3..ece170d57a4c 100644 --- a/pkgs/by-name/ci/cinnamon-desktop/package.nix +++ b/pkgs/by-name/ci/cinnamon-desktop/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { postPatch = '' chmod +x install-scripts/meson_install_schemas.py # patchShebangs requires executable file patchShebangs install-scripts/meson_install_schemas.py - sed "s|/usr/share|/run/current-system/sw/share|g" -i ./schemas/* # NOTE: unless this causes a circular dependency, we could link it to cinnamon-common/share/cinnamon + sed "s|/usr/share|/run/current-system/sw/share|g" -i ./schemas/* # NOTE: unless this causes a circular dependency, we could link it to cinnamon/share/cinnamon ''; meta = with lib; { diff --git a/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix b/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix index e2984b5e00a3..ecbe130d8f5f 100644 --- a/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix +++ b/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix @@ -15,7 +15,7 @@ cinnamon-desktop, cinnamon-session, cinnamon-settings-daemon, - cinnamon-common, + cinnamon, bulky, }: @@ -35,7 +35,7 @@ let cinnamon-desktop cinnamon-session cinnamon-settings-daemon - cinnamon-common + cinnamon gnome-terminal gsettings-desktop-schemas gtk3 diff --git a/pkgs/by-name/ci/cinnamon-screensaver/package.nix b/pkgs/by-name/ci/cinnamon-screensaver/package.nix index 50e97ecea209..14fc59669d4a 100644 --- a/pkgs/by-name/ci/cinnamon-screensaver/package.nix +++ b/pkgs/by-name/ci/cinnamon-screensaver/package.nix @@ -9,7 +9,7 @@ dbus, gettext, cinnamon-desktop, - cinnamon-common, + cinnamon, intltool, libxslt, gtk3, @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "6.4.0"; + version = "6.4.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon-screensaver"; rev = version; - hash = "sha256-XlEu/aBwNeu+CC6IRnFTF6LUnb7VY2+OOGsdCvQYweA="; + hash = "sha256-CK4WP5IafNII81e8HxUNN3Vp36Ln78Xvv5lIMvL+nbk="; }; patches = [ @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { pam cairo cinnamon-desktop - cinnamon-common + cinnamon libgnomekbd caribou ]; diff --git a/pkgs/by-name/ci/cinnamon-common/libdir.patch b/pkgs/by-name/ci/cinnamon/libdir.patch similarity index 100% rename from pkgs/by-name/ci/cinnamon-common/libdir.patch rename to pkgs/by-name/ci/cinnamon/libdir.patch diff --git a/pkgs/by-name/ci/cinnamon-common/package.nix b/pkgs/by-name/ci/cinnamon/package.nix similarity index 96% rename from pkgs/by-name/ci/cinnamon-common/package.nix rename to pkgs/by-name/ci/cinnamon/package.nix index 567e51445700..5d47b88cc244 100644 --- a/pkgs/by-name/ci/cinnamon-common/package.nix +++ b/pkgs/by-name/ci/cinnamon/package.nix @@ -73,16 +73,15 @@ let ] ); in -# TODO (after 25.05 branch-off): Rename to pkgs.cinnamon stdenv.mkDerivation rec { - pname = "cinnamon-common"; - version = "6.4.7"; + pname = "cinnamon"; + version = "6.4.10"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-WBdzlourYf2oEXUMbzNcNNsc8lBo6ujAy/K1Y6nGOjU="; + hash = "sha256-8yg39x5rWxJ2IcDFO4AjqrctPSjqdUSfmrKbjT3Yx+0="; }; patches = [ diff --git a/pkgs/by-name/ci/cinnamon-common/use-sane-install-dir.patch b/pkgs/by-name/ci/cinnamon/use-sane-install-dir.patch similarity index 100% rename from pkgs/by-name/ci/cinnamon-common/use-sane-install-dir.patch rename to pkgs/by-name/ci/cinnamon/use-sane-install-dir.patch diff --git a/pkgs/by-name/cj/cjs/package.nix b/pkgs/by-name/cj/cjs/package.nix index 6a55db2dea23..ac0a5d2f22e2 100644 --- a/pkgs/by-name/cj/cjs/package.nix +++ b/pkgs/by-name/cj/cjs/package.nix @@ -8,7 +8,7 @@ glib, readline, libsysprof-capture, - spidermonkey_115, + spidermonkey_128, meson, mesonEmulatorHook, dbus, @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "cjs"; - version = "6.4.0"; + version = "128.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cjs"; rev = version; - hash = "sha256-2lkIWroOo3hxu9/L/Ty7CADzVrZ0ohyHVmm65NoNlD4="; + hash = "sha256-B9N/oNRvsnr3MLkpcH/aBST6xOJSFdvSUFuD6EldE38="; }; outputs = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { cairo readline libsysprof-capture - spidermonkey_115 + spidermonkey_128 ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index 9c756ed22392..89a9bbd637d2 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -6,13 +6,13 @@ "packages": { "": { "dependencies": { - "@anthropic-ai/claude-code": "^1.0.69" + "@anthropic-ai/claude-code": "^1.0.71" } }, "node_modules/@anthropic-ai/claude-code": { - "version": "1.0.69", - "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.69.tgz", - "integrity": "sha512-kF86lNI9o6rt14cEDw16G89rHz4pL0lv/sASztV8XenEeQ/6VUZ5Jk+icYg6XTQKe33BsdtNKFS3IL3iLyzQyw==", + "version": "1.0.71", + "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.71.tgz", + "integrity": "sha512-2Z1HU8TiOSRZSZdHCPs+ih942cteUQ9Yx1EHHW5fO9y+gwxPYDR8Xbh/rAJMl/G58cJIn2jRiZmkWcGMN+Iqqg==", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 0fcca8929992..e4dab3449ef5 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "claude-code"; - version = "1.0.69"; + version = "1.0.71"; nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz"; - hash = "sha256-uZbe7N3FSAVxNxL7npujJcBFH6ZjnwDz327bZWN2IEM="; + hash = "sha256-ZJUvscbEaWHILL77R5/sPdNcxCLc2BL9P6tR+S7QnHg="; }; - npmDepsHash = "sha256-a06NT96pVOiz06ZZ9r+1s+oF9U/I7SRJFFAw1e0NkMY="; + npmDepsHash = "sha256-wQ/DRPefziSRv6aFZXRpmz2vC6mQRqgc7r3++cDpYSg="; postPatch = '' cp ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix index 11111b5322ea..c80f1fa3d25e 100644 --- a/pkgs/by-name/co/code-cursor/package.nix +++ b/pkgs/by-name/co/code-cursor/package.nix @@ -16,20 +16,20 @@ let sources = { x86_64-linux = fetchurl { - url = "https://downloads.cursor.com/production/a1fa6fc7d2c2f520293aad84aaa38d091dee6fef/linux/x64/Cursor-1.3.8-x86_64.AppImage"; - hash = "sha256-qR1Wu3H0JUCKIoUP/QFC1YyYiRaQ9PVN7ZT9TjHwn1k="; + url = "https://downloads.cursor.com/production/54c27320fab08c9f5dd5873f07fca101f7a3e076/linux/x64/Cursor-1.3.9-x86_64.AppImage"; + hash = "sha256-0kkTL6ZCnLxGBQSVoZ7UEOBNtTZVQolVAk/2McCV0Rw="; }; aarch64-linux = fetchurl { - url = "https://downloads.cursor.com/production/a1fa6fc7d2c2f520293aad84aaa38d091dee6fef/linux/arm64/Cursor-1.3.8-aarch64.AppImage"; - hash = "sha256-UrUstEFP8W8Y9WUCR5kt3434bKCBBK/NaSu2UK8+gII="; + url = "https://downloads.cursor.com/production/54c27320fab08c9f5dd5873f07fca101f7a3e076/linux/arm64/Cursor-1.3.9-aarch64.AppImage"; + hash = "sha256-5g26fm+tpm8xQTutygI20TcUHL08gKlG0uZSHixK2Ao="; }; x86_64-darwin = fetchurl { - url = "https://downloads.cursor.com/production/a1fa6fc7d2c2f520293aad84aaa38d091dee6fef/darwin/x64/Cursor-darwin-x64.dmg"; - hash = "sha256-FGjqbOdr1HSjVlDYP/+vp4bVQoqdJww3U4t59QLg1kk="; + url = "https://downloads.cursor.com/production/54c27320fab08c9f5dd5873f07fca101f7a3e076/darwin/x64/Cursor-darwin-x64.dmg"; + hash = "sha256-IJV35JNpoUybArz2NhvX8IzDUmvzN+GVq/MyDtXgVeI="; }; aarch64-darwin = fetchurl { - url = "https://downloads.cursor.com/production/a1fa6fc7d2c2f520293aad84aaa38d091dee6fef/darwin/arm64/Cursor-darwin-arm64.dmg"; - hash = "sha256-tsVPS48APst7kbEh7cjhJ2zYKcKBDdjH+NXMpAe4Ixs="; + url = "https://downloads.cursor.com/production/54c27320fab08c9f5dd5873f07fca101f7a3e076/darwin/arm64/Cursor-darwin-arm64.dmg"; + hash = "sha256-TYdv8UKoBtv0WUHWBqJtpG9vHDkEBBPLS/7BZhdxR1M="; }; }; @@ -39,7 +39,7 @@ in inherit useVSCodeRipgrep; commandLineArgs = finalCommandLineArgs; - version = "1.3.8"; + version = "1.3.9"; pname = "cursor"; # You can find the current VSCode version in the About dialog: diff --git a/pkgs/by-name/co/codebuff/package-lock.json b/pkgs/by-name/co/codebuff/package-lock.json index 497642fbb38d..6e2a8c5789ea 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.441" + "codebuff": "^1.0.451" } }, "node_modules/chownr": { @@ -18,9 +18,9 @@ } }, "node_modules/codebuff": { - "version": "1.0.441", - "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.441.tgz", - "integrity": "sha512-2/u30sGXiEd1caB+doYWy34lbv8DJhQ2SomHXpCmmeEKITUgd9ckdVMLaaEgrR/FIUHyFBcu7aCVzmwsBEfnuQ==", + "version": "1.0.451", + "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.451.tgz", + "integrity": "sha512-LYzX+cu1zMnU/qntnRMQzQ+iPT436OYphFyIrEvx5DarfEEns5UIMDyWp0E9PWxbU4WsJfHJnL6srYxC/T8hUg==", "cpu": [ "x64", "arm64" diff --git a/pkgs/by-name/co/codebuff/package.nix b/pkgs/by-name/co/codebuff/package.nix index affe6a4129e8..1c134a5a052a 100644 --- a/pkgs/by-name/co/codebuff/package.nix +++ b/pkgs/by-name/co/codebuff/package.nix @@ -6,14 +6,14 @@ buildNpmPackage rec { pname = "codebuff"; - version = "1.0.441"; + version = "1.0.451"; src = fetchzip { url = "https://registry.npmjs.org/codebuff/-/codebuff-${version}.tgz"; - hash = "sha256-l57ZQTvvIR8mpFJGJeF6AqE6sbjIUkQdjlvdQ4UAQ9g="; + hash = "sha256-98NiHDb0PrK71I28y7DwDJf2i+mKTQBp22PY4WJh5ig="; }; - npmDepsHash = "sha256-/LiXKA0HdFg3K7xyioL0SKjWicktCpih1oJkEPLDzIA="; + npmDepsHash = "sha256-qtBi5OT7UBsCIriO6Fk33gLOFNp5Ae0bT9qN+37b2sg="; postPatch = '' cp ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index 0fe7f41b3b9f..266b0a02d045 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -14,18 +14,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.11.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-t7FgR84alnJGhN/dsFtUySFfOpGoBlRfP+D/Q6JPz5M="; + hash = "sha256-qpYkD8fpnlTJ7RLAQrfswLFc58l/KY0x8NgGl/msG/I="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; - cargoHash = "sha256-SNl6UXzvtVR+ep7CIoCcpvET8Hs7ew1fmHqOXbzN7kU="; + cargoHash = "sha256-oPWkxEMnffDZ7cmjWmmYGurYnHn4vYu64BhG7NhrxhE="; nativeBuildInputs = [ installShellFiles @@ -49,6 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=includes_base_instructions_override_in_request" # Fails with 'stream ended unexpectedly: InternalAgentDied' "--skip=includes_user_instructions_message_in_request" # Fails with 'stream ended unexpectedly: InternalAgentDied' "--skip=originator_config_override_is_used" # Fails with 'stream ended unexpectedly: InternalAgentDied' + "--skip=azure_overrides_assign_properties_used_for_responses_url" # Panics "--skip=test_conversation_create_and_send_message_ok" # Version 0.0.0 hardcoded "--skip=test_send_message_session_not_found" # Version 0.0.0 hardcoded "--skip=test_send_message_success" # Version 0.0.0 hardcoded diff --git a/pkgs/applications/blockchains/cryptop/default.nix b/pkgs/by-name/cr/cryptop/package.nix similarity index 75% rename from pkgs/applications/blockchains/cryptop/default.nix rename to pkgs/by-name/cr/cryptop/package.nix index c4689d82f4ca..07430c794792 100644 --- a/pkgs/applications/blockchains/cryptop/default.nix +++ b/pkgs/by-name/cr/cryptop/package.nix @@ -1,13 +1,9 @@ { lib, - buildPythonApplication, + python3Packages, fetchPypi, - requests, - requests-cache, - setuptools, }: - -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "cryptop"; version = "0.2.0"; format = "setuptools"; @@ -17,7 +13,7 @@ buildPythonApplication rec { sha256 = "0akrrz735vjfrm78plwyg84vabj0x3qficq9xxmy9kr40fhdkzpb"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3Packages; [ setuptools requests requests-cache @@ -29,7 +25,7 @@ buildPythonApplication rec { meta = { homepage = "https://github.com/huwwp/cryptop"; description = "Command line Cryptocurrency Portfolio"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ bhipple ]; mainProgram = "cryptop"; }; diff --git a/pkgs/by-name/cs/csharpier/package.nix b/pkgs/by-name/cs/csharpier/package.nix index 7c5043cad4ee..97bebd35bab1 100644 --- a/pkgs/by-name/cs/csharpier/package.nix +++ b/pkgs/by-name/cs/csharpier/package.nix @@ -2,10 +2,10 @@ buildDotnetGlobalTool { pname = "csharpier"; - version = "1.0.3"; + version = "1.1.1"; executables = "csharpier"; - nugetHash = "sha256-DJe3zpzFCBjmsNmLMgIC1clLxo/exPZ+xHUmdpKMaMo="; + nugetHash = "sha256-B0ijqWm3eZ31T+C5zRr4TkmfPsOfseaHpGPYZf5Yiw4="; meta = with lib; { description = "Opinionated code formatter for C#"; diff --git a/pkgs/by-name/de/deepsource/package.nix b/pkgs/by-name/de/deepsource/package.nix index 00f5b34b76f9..87581be72ce7 100644 --- a/pkgs/by-name/de/deepsource/package.nix +++ b/pkgs/by-name/de/deepsource/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "deepsource"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "DeepSourceCorp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-GWIQT6VIvU4ZIHwK3v2bGasE4mJc2cMpUAJvIQ2zJR4="; + hash = "sha256-kmP3U6SRvolmi7QA0rFNTg+w+DJEQUHOmbSE4sdEBK4="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/dn/dnscontrol/package.nix b/pkgs/by-name/dn/dnscontrol/package.nix index e0ce8ce31bf0..f32409a95402 100644 --- a/pkgs/by-name/dn/dnscontrol/package.nix +++ b/pkgs/by-name/dn/dnscontrol/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "4.22.0"; + version = "4.23.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = "dnscontrol"; tag = "v${version}"; - hash = "sha256-5K2o0qa+19ur6axDrVkhDDoTMzRO/oNYIGJciIKGvII="; + hash = "sha256-Jaa+geO2836kQHTRhaQru367iQvqac6sgnpL9244dkw="; }; - vendorHash = "sha256-hniL/pFbYOjpLuAHdH0gD0kFKnW9d/pN7283m9V3e/0="; + vendorHash = "sha256-PbOqi9vfz46lwoP3aUPl/JKDJtYYF7IwnN9lppZ8KYA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/do/docker-language-server/package.nix b/pkgs/by-name/do/docker-language-server/package.nix index b8e6f88bca78..4b94c4966937 100644 --- a/pkgs/by-name/do/docker-language-server/package.nix +++ b/pkgs/by-name/do/docker-language-server/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "docker-language-server"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "docker"; repo = "docker-language-server"; tag = "v${version}"; - hash = "sha256-ht63NilujpbDhBjkzCNpY95AAuwqya37qchgqKLlTw8="; + hash = "sha256-cxLg0fLUC4dj3QUax+vIsJENRXNifbXMoRkldM44i+0="; }; - vendorHash = "sha256-w7CDl27178oe/DpfqSbNbyOsR3D34EpcCMZNQ7i3JE4="; + vendorHash = "sha256-xvRHxi7aem88mrmdAmSyRNtBUSZD4rjUut2VjPeoejg="; nativeCheckInputs = [ docker diff --git a/pkgs/by-name/do/dosage-tracker/package.nix b/pkgs/by-name/do/dosage-tracker/package.nix index f31b2603c289..192d9017452c 100644 --- a/pkgs/by-name/do/dosage-tracker/package.nix +++ b/pkgs/by-name/do/dosage-tracker/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosage"; - version = "1.9.9"; + version = "1.9.10"; src = fetchFromGitHub { owner = "diegopvlk"; repo = "Dosage"; tag = "v${finalAttrs.version}"; - hash = "sha256-UVcbZgPk35VsYvyzIJrR79vAhSByJjn8kh+y0KQcwpM="; + hash = "sha256-aLZ1Jl2h5KmZQ8zNyNqivAkf4Gjqh2eQfoKLabdXhBI="; }; # https://github.com/NixOS/nixpkgs/issues/318830 diff --git a/pkgs/by-name/do/dotenv-cli/package.nix b/pkgs/by-name/do/dotenv-cli/package.nix index 4204344e9e68..169c9ea0b3fe 100644 --- a/pkgs/by-name/do/dotenv-cli/package.nix +++ b/pkgs/by-name/do/dotenv-cli/package.nix @@ -10,18 +10,18 @@ }: stdenv.mkDerivation rec { pname = "dotenv-cli"; - version = "9.0.0"; + version = "10.0.0"; src = fetchFromGitHub { owner = "entropitor"; repo = "dotenv-cli"; rev = "v${version}"; - hash = "sha256-mpVObsilwVCq1V2Z11uqK1T7VgwpfTYng2vqrTqJZE4="; + hash = "sha256-prSGIEHf6wRqOFVsn3Ws25yG7Ga2YEbiU/IMP3QeLXU="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-ak6QD9Z0tE0XgFVt3QkjZxk2kelUFPX9bEF855RiY2w="; + hash = "sha256-rbG1oM1mEZSB/eYp87YMi6v9ves5YR7u7rkQRlziz7I="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix index 239cdab1a6b9..cb2ba10c41ae 100644 --- a/pkgs/by-name/do/dotenvx/package.nix +++ b/pkgs/by-name/do/dotenvx/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "dotenvx"; - version = "1.48.3"; + version = "1.48.4"; src = fetchFromGitHub { owner = "dotenvx"; repo = "dotenvx"; tag = "v${version}"; - hash = "sha256-5clMrH9r7CltZ2oEfDvyubFroOq/YVRaPkBfRnMyHNc="; + hash = "sha256-reWOFI17YSaCTFriCpJELdDj9K2MintKt9OBy/2aXE4="; }; - npmDepsHash = "sha256-O8w5gyG2PDUSGuAcSQ4ccvkYhb9pQL5NjWXjSoXk6gQ="; + npmDepsHash = "sha256-XPkqJVkShCzft4LEobCUgbsyl5W/vHXRPNPKltFO5hc="; dontNpmBuild = true; diff --git a/pkgs/by-name/du/duckstation-bin/package.nix b/pkgs/by-name/du/duckstation-bin/package.nix deleted file mode 100644 index 8349b98ef84f..000000000000 --- a/pkgs/by-name/du/duckstation-bin/package.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchurl, - unzip, -}: - -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "duckstation-bin"; - version = "0.1-7371"; - - src = fetchurl { - url = "https://github.com/stenzek/duckstation/releases/download/v${finalAttrs.version}/duckstation-mac-release.zip"; - hash = "sha256-ukORbTG0lZIsUInkEnyPB9+PwFxxK5hbgj9D6tjOEAY="; - }; - - nativeBuildInputs = [ unzip ]; - - dontPatch = true; - dontConfigure = true; - dontBuild = true; - - sourceRoot = "."; - - installPhase = '' - runHook preInstall - mkdir -p $out/Applications - cp -r DuckStation.app $out/Applications/DuckStation.app - runHook postInstall - ''; - - passthru = { - updateScript = ./update.sh; - }; - - meta = { - homepage = "https://github.com/stenzek/duckstation"; - description = "Fast PlayStation 1 emulator for x86-64/AArch32/AArch64"; - changelog = "https://github.com/stenzek/duckstation/releases/tag/v${finalAttrs.version}"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ matteopacini ]; - platforms = lib.platforms.darwin; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; -}) diff --git a/pkgs/by-name/du/duckstation-bin/update.sh b/pkgs/by-name/du/duckstation-bin/update.sh deleted file mode 100755 index 50d6017f7ccc..000000000000 --- a/pkgs/by-name/du/duckstation-bin/update.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq gnused - -set -euo pipefail - -cd "$(dirname "$0")" || exit 1 - -# Grab latest version, ignoring "latest" and "preview" tags -LATEST_VER="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/stenzek/duckstation/releases" | jq -r '.[].tag_name' | grep '^v' | head -n 1 | sed 's/^v//')" -CURRENT_VER="$(grep -oP 'version = "\K[^"]+' package.nix)" - -if [[ "$LATEST_VER" == "$CURRENT_VER" ]]; then - echo "duckstation-bin is up-to-date" - exit 0 -fi - -HASH="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/stenzek/duckstation/releases/download/v${LATEST_VER}/duckstation-mac-release.zip")")" - -sed -i "s#hash = \".*\"#hash = \"$HASH\"#g" package.nix -sed -i "s#version = \".*\";#version = \"$LATEST_VER\";#g" package.nix diff --git a/pkgs/by-name/du/duckstation/001-fix-test-inclusion.diff b/pkgs/by-name/du/duckstation/001-fix-test-inclusion.diff deleted file mode 100644 index b2dabe0262db..000000000000 --- a/pkgs/by-name/du/duckstation/001-fix-test-inclusion.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 879d46bc..95570f6b 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -20,5 +20,5 @@ if(BUILD_REGTEST) - endif() - - if(BUILD_TESTS) -- add_subdirectory(common-tests EXCLUDE_FROM_ALL) -+ add_subdirectory(common-tests) - endif() diff --git a/pkgs/by-name/du/duckstation/002-hardcode-vars.diff b/pkgs/by-name/du/duckstation/002-hardcode-vars.diff deleted file mode 100644 index edba33fce7ce..000000000000 --- a/pkgs/by-name/du/duckstation/002-hardcode-vars.diff +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/src/scmversion/gen_scmversion.sh b/src/scmversion/gen_scmversion.sh -index 9122cd8..50ed8f9 100755 ---- a/src/scmversion/gen_scmversion.sh -+++ b/src/scmversion/gen_scmversion.sh -@@ -10,10 +10,10 @@ else - fi - - --HASH=$(git rev-parse HEAD) --BRANCH=$(git rev-parse --abbrev-ref HEAD | tr -d '\r\n') --TAG=$(git describe --dirty | tr -d '\r\n') --DATE=$(git log -1 --date=iso8601-strict --format=%cd) -+HASH="@gitHash@" -+BRANCH="@gitBranch@" -+TAG="@gitTag@" -+DATE="@gitDate@" - - cd $CURDIR - diff --git a/pkgs/by-name/du/duckstation/003-fix-NEON-intrinsics.patch b/pkgs/by-name/du/duckstation/003-fix-NEON-intrinsics.patch deleted file mode 100644 index 571a15d4aad6..000000000000 --- a/pkgs/by-name/du/duckstation/003-fix-NEON-intrinsics.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 19e094e5c7aaaf375a13424044521701e85c8313 Mon Sep 17 00:00:00 2001 -From: OPNA2608 -Date: Thu, 9 Jan 2025 17:46:25 +0100 -Subject: [PATCH] Fix usage of NEON intrinsics - ---- - src/common/gsvector_neon.h | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/common/gsvector_neon.h b/src/common/gsvector_neon.h -index e4991af5e..61b8dc09b 100644 ---- a/src/common/gsvector_neon.h -+++ b/src/common/gsvector_neon.h -@@ -867,7 +867,7 @@ public: - - ALWAYS_INLINE int mask() const - { -- const uint32x2_t masks = vshr_n_u32(vreinterpret_u32_s32(v2s), 31); -+ const uint32x2_t masks = vshr_n_u32(vreinterpret_u32_f32(v2s), 31); - return (vget_lane_u32(masks, 0) | (vget_lane_u32(masks, 1) << 1)); - } - -@@ -2882,7 +2882,7 @@ public: - ALWAYS_INLINE GSVector4 gt64(const GSVector4& v) const - { - #ifdef CPU_ARCH_ARM64 -- return GSVector4(vreinterpretq_f32_f64(vcgtq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s)))); -+ return GSVector4(vreinterpretq_f32_u64(vcgtq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s)))); - #else - GSVector4 ret; - ret.U64[0] = (F64[0] > v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0; -@@ -2894,7 +2894,7 @@ public: - ALWAYS_INLINE GSVector4 eq64(const GSVector4& v) const - { - #ifdef CPU_ARCH_ARM64 -- return GSVector4(vreinterpretq_f32_f64(vceqq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s)))); -+ return GSVector4(vreinterpretq_f32_u64(vceqq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s)))); - #else - GSVector4 ret; - ret.U64[0] = (F64[0] == v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0; -@@ -2906,7 +2906,7 @@ public: - ALWAYS_INLINE GSVector4 lt64(const GSVector4& v) const - { - #ifdef CPU_ARCH_ARM64 -- return GSVector4(vreinterpretq_f32_f64(vcgtq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s)))); -+ return GSVector4(vreinterpretq_f32_u64(vcgtq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s)))); - #else - GSVector4 ret; - ret.U64[0] = (F64[0] < v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0; -@@ -2918,7 +2918,7 @@ public: - ALWAYS_INLINE GSVector4 ge64(const GSVector4& v) const - { - #ifdef CPU_ARCH_ARM64 -- return GSVector4(vreinterpretq_f32_f64(vcgeq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s)))); -+ return GSVector4(vreinterpretq_f32_u64(vcgeq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s)))); - #else - GSVector4 ret; - ret.U64[0] = (F64[0] >= v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0; -@@ -2930,7 +2930,7 @@ public: - ALWAYS_INLINE GSVector4 le64(const GSVector4& v) const - { - #ifdef CPU_ARCH_ARM64 -- return GSVector4(vreinterpretq_f32_f64(vcleq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s)))); -+ return GSVector4(vreinterpretq_f32_u64(vcleq_f64(vreinterpretq_f64_f32(v4s), vreinterpretq_f64_f32(v.v4s)))); - #else - GSVector4 ret; - ret.U64[0] = (F64[0] <= v.F64[0]) ? 0xFFFFFFFFFFFFFFFFULL : 0; --- -2.47.0 - diff --git a/pkgs/by-name/du/duckstation/package.nix b/pkgs/by-name/du/duckstation/package.nix deleted file mode 100644 index c84a3cdf5a0f..000000000000 --- a/pkgs/by-name/du/duckstation/package.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ - lib, - stdenv, - llvmPackages, - SDL2, - callPackage, - cmake, - cpuinfo, - cubeb, - curl, - extra-cmake-modules, - libXrandr, - libbacktrace, - libwebp, - makeWrapper, - ninja, - pkg-config, - qt6, - vulkan-loader, - wayland, - wayland-scanner, -}: - -let - sources = callPackage ./sources.nix { }; - inherit (qt6) - qtbase - qtsvg - qttools - qtwayland - wrapQtAppsHook - ; -in -llvmPackages.stdenv.mkDerivation (finalAttrs: { - inherit (sources.duckstation) pname version src; - - patches = [ - # Tests are not built by default - ./001-fix-test-inclusion.diff - # Patching yet another script that fills data based on git commands . . . - ./002-hardcode-vars.diff - # Fix NEON intrinsics usage - ./003-fix-NEON-intrinsics.patch - ./remove-cubeb-vendor.patch - ]; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ninja - pkg-config - qttools - wayland-scanner - wrapQtAppsHook - ]; - - buildInputs = [ - SDL2 - cpuinfo - cubeb - curl - libXrandr - libbacktrace - libwebp - qtbase - qtsvg - qtwayland - sources.discord-rpc-patched - sources.lunasvg - sources.shaderc-patched - sources.soundtouch-patched - sources.spirv-cross-patched - wayland - ]; - - cmakeFlags = [ - (lib.cmakeBool "BUILD_TESTS" true) - ]; - - strictDeps = true; - - doInstallCheck = true; - - postPatch = '' - gitHash=$(cat .nixpkgs-auxfiles/git_hash) \ - gitBranch=$(cat .nixpkgs-auxfiles/git_branch) \ - gitTag=$(cat .nixpkgs-auxfiles/git_tag) \ - gitDate=$(cat .nixpkgs-auxfiles/git_date) \ - substituteAllInPlace src/scmversion/gen_scmversion.sh - ''; - - # error: cannot convert 'int16x8_t' to '__Int32x4_t' - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isAarch64 "-flax-vector-conversions"; - - installCheckPhase = '' - runHook preInstallCheck - - $out/share/duckstation/common-tests - - runHook postInstallCheck - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share - - cp -r bin $out/share/duckstation - ln -s $out/share/duckstation/duckstation-qt $out/bin/ - - install -Dm644 $src/scripts/org.duckstation.DuckStation.desktop $out/share/applications/org.duckstation.DuckStation.desktop - install -Dm644 $src/scripts/org.duckstation.DuckStation.png $out/share/pixmaps/org.duckstation.DuckStation.png - - runHook postInstall - ''; - - qtWrapperArgs = - let - libPath = lib.makeLibraryPath ([ - sources.shaderc-patched - sources.spirv-cross-patched - vulkan-loader - ]); - in - [ - "--prefix LD_LIBRARY_PATH : ${libPath}" - ]; - - # https://github.com/stenzek/duckstation/blob/master/scripts/appimage/apprun-hooks/default-to-x11.sh - # Can't avoid the double wrapping, the binary wrapper from qtWrapperArgs doesn't support --run - postFixup = '' - source "${makeWrapper}/nix-support/setup-hook" - wrapProgram $out/bin/duckstation-qt \ - --run 'if [[ -z $I_WANT_A_BROKEN_WAYLAND_UI ]]; then export QT_QPA_PLATFORM=xcb; fi' - ''; - - meta = { - homepage = "https://github.com/stenzek/duckstation"; - description = "Fast PlayStation 1 emulator for x86-64/AArch32/AArch64"; - license = lib.licenses.gpl3Only; - mainProgram = "duckstation-qt"; - maintainers = with lib.maintainers; [ - guibou - ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch b/pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch deleted file mode 100644 index e740b0619338..000000000000 --- a/pkgs/by-name/du/duckstation/remove-cubeb-vendor.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt -index af35687..8347825 100644 ---- a/dep/CMakeLists.txt -+++ b/dep/CMakeLists.txt -@@ -22,9 +22,8 @@ add_subdirectory(rcheevos EXCLUDE_FROM_ALL) - disable_compiler_warnings_for_target(rcheevos) - add_subdirectory(rapidyaml EXCLUDE_FROM_ALL) - disable_compiler_warnings_for_target(rapidyaml) --add_subdirectory(cubeb EXCLUDE_FROM_ALL) --disable_compiler_warnings_for_target(cubeb) --disable_compiler_warnings_for_target(speex) -+find_package(cubeb REQUIRED GLOBAL) -+add_library(cubeb ALIAS cubeb::cubeb) - add_subdirectory(kissfft EXCLUDE_FROM_ALL) - disable_compiler_warnings_for_target(kissfft) - -diff --git a/src/util/cubeb_audio_stream.cpp b/src/util/cubeb_audio_stream.cpp -index 85579c4..339190a 100644 ---- a/src/util/cubeb_audio_stream.cpp -+++ b/src/util/cubeb_audio_stream.cpp -@@ -261,9 +261,9 @@ std::vector> AudioStream::GetCubebDriverName - std::vector> names; - names.emplace_back(std::string(), TRANSLATE_STR("AudioStream", "Default")); - -- const char** cubeb_names = cubeb_get_backend_names(); -- for (u32 i = 0; cubeb_names[i] != nullptr; i++) -- names.emplace_back(cubeb_names[i], cubeb_names[i]); -+ cubeb_backend_names backends = cubeb_get_backend_names(); -+ for (u32 i = 0; i < backends.count; i++) -+ names.emplace_back(backends.names[i], backends.names[i]); - return names; - } - diff --git a/pkgs/by-name/du/duckstation/shaderc-patched.nix b/pkgs/by-name/du/duckstation/shaderc-patched.nix deleted file mode 100644 index 3211925699e1..000000000000 --- a/pkgs/by-name/du/duckstation/shaderc-patched.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - fetchpatch, - duckstation, - shaderc, -}: - -shaderc.overrideAttrs (old: { - pname = "shaderc-patched-for-duckstation"; - patches = (old.patches or [ ]) ++ [ - (fetchpatch { - url = "file://${duckstation.src}/scripts/shaderc-changes.patch"; - hash = "sha256-Ps/D+CdSbjVWg3ZGOEcgbpQbCNkI5Nuizm4E5qiM9Wo="; - excludes = [ - "CHANGES" - "CMakeLists.txt" - "libshaderc/CMakeLists.txt" - ]; - }) - ]; -}) diff --git a/pkgs/by-name/du/duckstation/sources.nix b/pkgs/by-name/du/duckstation/sources.nix deleted file mode 100644 index 8261f08de9be..000000000000 --- a/pkgs/by-name/du/duckstation/sources.nix +++ /dev/null @@ -1,166 +0,0 @@ -{ - lib, - duckstation, - fetchFromGitHub, - fetchpatch, - shaderc, - spirv-cross, - discord-rpc, - stdenv, - cmake, - ninja, -}: - -{ - duckstation = - let - self = { - pname = "duckstation"; - version = "0.1-7465"; - src = fetchFromGitHub { - owner = "stenzek"; - repo = "duckstation"; - rev = "aa955b8ae28314ae061613f0ddf13183a98aca03"; - # - # Some files are filled by using Git commands; it requires deepClone. - # More info at `checkout_ref` function in nix-prefetch-git. - # However, `.git` is a bit nondeterministic (and Git itself makes no - # guarantees whatsoever). - # Then, in order to enhance reproducibility, what we will do here is: - # - # - Execute the desired Git commands; - # - Save the obtained info into files; - # - Remove `.git` afterwards. - # - deepClone = true; - postFetch = '' - cd $out - mkdir -p .nixpkgs-auxfiles/ - git rev-parse HEAD > .nixpkgs-auxfiles/git_hash - git rev-parse --abbrev-ref HEAD | tr -d '\r\n' > .nixpkgs-auxfiles/git_branch - git describe --dirty | tr -d '\r\n' > .nixpkgs-auxfiles/git_tag - git log -1 --date=iso8601-strict --format=%cd > .nixpkgs-auxfiles/git_date - find $out -name .git -print0 | xargs -0 rm -fr - ''; - hash = "sha256-ixrlr7Rm6GZAn/kh2sSeCCiK/qdmQ5+5jbbhAKjTx/E="; - }; - }; - in - self; - - shaderc-patched = shaderc.overrideAttrs ( - old: - let - version = "2024.3-unstable-2024-08-24"; - src = fetchFromGitHub { - owner = "stenzek"; - repo = "shaderc"; - rev = "f60bb80e255144e71776e2ad570d89b78ea2ab4f"; - hash = "sha256-puZxkrEVhhUT4UcCtEDmtOMX4ugkB6ooMhKRBlb++lE="; - }; - in - { - pname = "shaderc-patched-for-duckstation"; - inherit version src; - patches = (old.patches or [ ]); - cmakeFlags = (old.cmakeFlags or [ ]) ++ [ - (lib.cmakeBool "SHADERC_SKIP_EXAMPLES" true) - (lib.cmakeBool "SHADERC_SKIP_TESTS" true) - ]; - outputs = [ - "out" - "lib" - "dev" - ]; - postFixup = ''''; - } - ); - spirv-cross-patched = spirv-cross.overrideAttrs ( - old: - let - version = "1.3.290.0"; - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "SPIRV-Cross"; - rev = "vulkan-sdk-${version}"; - hash = "sha256-h5My9PbPq1l03xpXQQFolNy7G1RhExtTH6qPg7vVF/8="; - }; - in - { - pname = "spirv-cross-patched-for-duckstation"; - inherit version src; - patches = (old.patches or [ ]); - cmakeFlags = (old.cmakeFlags or [ ]) ++ [ - (lib.cmakeBool "SPIRV_CROSS_CLI" false) - (lib.cmakeBool "SPIRV_CROSS_ENABLE_CPP" false) - (lib.cmakeBool "SPIRV_CROSS_ENABLE_C_API" true) - (lib.cmakeBool "SPIRV_CROSS_ENABLE_GLSL" true) - (lib.cmakeBool "SPIRV_CROSS_ENABLE_HLSL" false) - (lib.cmakeBool "SPIRV_CROSS_ENABLE_MSL" false) - (lib.cmakeBool "SPIRV_CROSS_ENABLE_REFLECT" false) - (lib.cmakeBool "SPIRV_CROSS_ENABLE_TESTS" false) - (lib.cmakeBool "SPIRV_CROSS_ENABLE_UTIL" true) - (lib.cmakeBool "SPIRV_CROSS_SHARED" true) - (lib.cmakeBool "SPIRV_CROSS_STATIC" false) - ]; - } - ); - discord-rpc-patched = discord-rpc.overrideAttrs (old: { - pname = "discord-rpc-patched-for-duckstation"; - version = "3.4.0-unstable-2024-08-02"; - src = fetchFromGitHub { - owner = "stenzek"; - repo = "discord-rpc"; - rev = "144f3a3f1209994d8d9e8a87964a989cb9911c1e"; - hash = "sha256-VyL8bEjY001eHWcEoUPIAFDAmaAbwcNb1hqlV2a3cWs="; - }; - patches = (old.patches or [ ]); - }); - - soundtouch-patched = stdenv.mkDerivation (finalAttrs: { - pname = "soundtouch-patched-for-duckstation"; - version = "2.2.3-unstable-2024-08-02"; - src = fetchFromGitHub { - owner = "stenzek"; - repo = "soundtouch"; - rev = "463ade388f3a51da078dc9ed062bf28e4ba29da7"; - hash = "sha256-hvBW/z+fmh/itNsJnlDBtiI1DZmUMO9TpHEztjo2pA0="; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; - - meta = { - homepage = "https://github.com/stenzek/soundtouch"; - description = "SoundTouch Audio Processing Library (forked from https://codeberg.org/soundtouch/soundtouch)"; - license = lib.licenses.lgpl21; - platforms = lib.platforms.linux; - }; - - }); - - lunasvg = stdenv.mkDerivation (finalAttrs: { - pname = "lunasvg-patched-for-duckstation"; - version = "2.4.1-unstable-2024-08-24"; - src = fetchFromGitHub { - owner = "stenzek"; - repo = "lunasvg"; - rev = "9af1ac7b90658a279b372add52d6f77a4ebb482c"; - hash = "sha256-ZzOe84ZF5JRrJ9Lev2lwYOccqtEGcf76dyCDBDTvI2o="; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; - - meta = { - homepage = "https://github.com/stenzek/lunasvg"; - description = "Standalone SVG rendering library in C++"; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - }; - }); -} diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix index 1749c5c7d787..a4a325303032 100644 --- a/pkgs/by-name/en/enzyme/package.nix +++ b/pkgs/by-name/en/enzyme/package.nix @@ -7,13 +7,13 @@ }: llvmPackages.stdenv.mkDerivation rec { pname = "enzyme"; - version = "0.0.187"; + version = "0.0.188"; src = fetchFromGitHub { owner = "EnzymeAD"; repo = "Enzyme"; rev = "v${version}"; - hash = "sha256-vdLt7LtVkgcgoUzzl5jb7ERIyQMpY+iSwJpdQpWxoJw="; + hash = "sha256-CoImpu1Hwn11s+6GeYPIyaIHz7kdjrBMpbxAUzaJWZU="; }; postPatch = '' diff --git a/pkgs/by-name/et/ethercat/package.nix b/pkgs/by-name/et/ethercat/package.nix index d31cead97136..13fb5bff4816 100644 --- a/pkgs/by-name/et/ethercat/package.nix +++ b/pkgs/by-name/et/ethercat/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ethercat"; - version = "1.6.6"; + version = "1.6.7"; src = fetchFromGitLab { owner = "etherlab.org"; repo = "ethercat"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-11Y4qGJlbZYnFZ3pI18kjE2aIht30ZtN4eTsYhWqg+g="; + hash = "sha256-UNd8PLdudI5TMdKKNH6BQP2VQ0LSPvsA/sEYnIuZRRA="; }; separateDebugInfo = true; diff --git a/pkgs/by-name/fh/fh/package.nix b/pkgs/by-name/fh/fh/package.nix index fde448661513..754e226bd150 100644 --- a/pkgs/by-name/fh/fh/package.nix +++ b/pkgs/by-name/fh/fh/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "fh"; - version = "0.1.24"; + version = "0.1.25"; src = fetchFromGitHub { owner = "DeterminateSystems"; repo = "fh"; rev = "v${version}"; - hash = "sha256-t7IZlG7rKNbkt2DIU5H0/B0+b4e9YEVJx14ijpOycCw="; + hash = "sha256-YVtFzJMdHpshtRqBDVw3Kr88psAPfcdOI0XVDGnFkq0="; }; - cargoHash = "sha256-IXzqcIVk7F/MgWofzlwEkXfu7s8e7GdjYhdFbXUTeeo="; + cargoHash = "sha256-D/8YYv9V1ny9AWFkVPgcE9doq+OxN+yiCCt074FKgn0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ga/garnet/deps.json b/pkgs/by-name/ga/garnet/deps.json index 9e5c1b7001a2..67c016f383cc 100644 --- a/pkgs/by-name/ga/garnet/deps.json +++ b/pkgs/by-name/ga/garnet/deps.json @@ -31,8 +31,8 @@ }, { "pname": "KeraLua", - "version": "1.4.4", - "hash": "sha256-MF7DBdc8xNiEcauNer7YFRgjbUU4ANmc2uQKrzVDRDs=" + "version": "1.4.6", + "hash": "sha256-7lXJhhQlEuRoaF18XiZYJDyhA8RIWpYWNB9kr4aARQc=" }, { "pname": "Microsoft.Bcl.AsyncInterfaces", diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix index 211eff07fb64..af25400a3657 100644 --- a/pkgs/by-name/ga/garnet/package.nix +++ b/pkgs/by-name/ga/garnet/package.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "garnet"; - version = "1.0.79"; + version = "1.0.80"; src = fetchFromGitHub { owner = "microsoft"; repo = "garnet"; tag = "v${version}"; - hash = "sha256-EXI/6yctbAX2tcUYsb9sHXed5pik/uttXoY0gCnH9H8="; + hash = "sha256-9B2Ai+W6+rZ8xLrrO7d8jd6LYWaMGIq3a+lz8rY32uA="; }; projectFile = "main/GarnetServer/GarnetServer.csproj"; diff --git a/pkgs/by-name/ge/gearlever/package.nix b/pkgs/by-name/ge/gearlever/package.nix index 0841811a9a57..df4279d13344 100644 --- a/pkgs/by-name/ge/gearlever/package.nix +++ b/pkgs/by-name/ge/gearlever/package.nix @@ -23,14 +23,14 @@ python3Packages.buildPythonApplication rec { pname = "gearlever"; - version = "3.3.4"; + version = "3.4.0"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "mijorus"; repo = "gearlever"; tag = version; - hash = "sha256-n7R4BiNxEy2uL6yg5h/L+l/EiQFTc5uND4ZVdERll08="; + hash = "sha256-3kTgYlsVumTVH5X6h3YvS0tdex/OGQyn5MzevQ+GuH4="; }; postPatch = diff --git a/pkgs/by-name/ge/gersemi/package.nix b/pkgs/by-name/ge/gersemi/package.nix index b7047664dcc2..68c3d58cd5e5 100644 --- a/pkgs/by-name/ge/gersemi/package.nix +++ b/pkgs/by-name/ge/gersemi/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "gersemi"; - version = "0.21.0"; + version = "0.22.1"; format = "pyproject"; src = fetchFromGitHub { owner = "BlankSpruce"; repo = "gersemi"; tag = version; - hash = "sha256-TOrnaYvI4U7+q7ANNThZ3M3XhZS/Y8m48mNAqwjjBsg="; + hash = "sha256-ckK0Tv1aUHJcM1RH20ejBvq49xksUZmqveCcMmpnVGo="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix index ec168edcb5df..bc51f396b661 100644 --- a/pkgs/by-name/gh/gh-gei/package.nix +++ b/pkgs/by-name/gh/gh-gei/package.nix @@ -7,13 +7,13 @@ buildDotnetModule rec { pname = "gh-gei"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "github"; repo = "gh-gei"; rev = "v${version}"; - hash = "sha256-mV7lqwC8S5ms79IIcmgDIsUlPKaLSWElXZ00Tm8qs4Y="; + hash = "sha256-AMmeuobgJ+DSRG4zS7RP5l3/BraqQxXB+ygLDc3XnOs="; }; dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx; diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix index 6ff1e7aef05a..204a7075b6e9 100644 --- a/pkgs/by-name/gh/ghostfolio/package.nix +++ b/pkgs/by-name/gh/ghostfolio/package.nix @@ -11,13 +11,13 @@ buildNpmPackage rec { pname = "ghostfolio"; - version = "2.185.0"; + version = "2.189.0"; src = fetchFromGitHub { owner = "ghostfolio"; repo = "ghostfolio"; tag = version; - hash = "sha256-jnC2u9ZZcOSux6UUzW9Ot02aFWeGYhrdCC9d4xM0efA="; + hash = "sha256-rHqg7ziUdir6jWL4Xo/n9I2lNCmpBWFI34LQAS5mPsM="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -27,7 +27,7 @@ buildNpmPackage rec { ''; }; - npmDepsHash = "sha256-FCH0v9jRviH33mfIVX8967X1u494qToHraYVn5pbSPw="; + npmDepsHash = "sha256-hRDBNt2JIdjWYJLmW5BkW5wJ8yzcqQRwS2jRJKFrZL0="; nativeBuildInputs = [ prisma diff --git a/pkgs/by-name/gi/gitmux/package.nix b/pkgs/by-name/gi/gitmux/package.nix index 34d9b718e0cd..8c8eb0f9aae0 100644 --- a/pkgs/by-name/gi/gitmux/package.nix +++ b/pkgs/by-name/gi/gitmux/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "gitmux"; - version = "0.11.3"; + version = "0.11.5"; src = fetchFromGitHub { owner = "arl"; repo = "gitmux"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Jw2yl95vCQ5JcRGvBeLlGuAagTHUf+IEF7XvzehcMvU="; + sha256 = "sha256-TObnmV/NiMCcyC9zG0OcCuCqUChQZmpqPptQUDtF85A="; }; vendorHash = "sha256-MvvJGB9KPMYeqYclmAAF6qlU7vrJFMPToogbGDRoCpU="; diff --git a/pkgs/by-name/go/go-mockery/package.nix b/pkgs/by-name/go/go-mockery/package.nix index 88b5fb146541..4979e3a000e1 100644 --- a/pkgs/by-name/go/go-mockery/package.nix +++ b/pkgs/by-name/go/go-mockery/package.nix @@ -10,17 +10,17 @@ buildGoModule (finalAttrs: { pname = "go-mockery"; - version = "3.5.1"; + version = "3.5.2"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; tag = "v${finalAttrs.version}"; - hash = "sha256-x7WniZ4wpnuzUHM2ZC2P7Ns67bIp4V4F9f4xQEJONEk="; + hash = "sha256-/OMUL/C/uUKT5GvEd3ylpS72XfGTnD+J7EuOR1LovB0="; }; proxyVendor = true; - vendorHash = "sha256-cNMknwlU7ENwN67CtyU1YgYIXCJbh4b7Z3oUK7kkEkk="; + vendorHash = "sha256-PAJymNrl83knDXP9ukUbfEdtabE4+k16Ygzwvfu5ZR8="; ldflags = [ "-s" diff --git a/pkgs/by-name/go/gosmee/package.nix b/pkgs/by-name/go/gosmee/package.nix index 91ae45ec3f46..f84542002a00 100644 --- a/pkgs/by-name/go/gosmee/package.nix +++ b/pkgs/by-name/go/gosmee/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gosmee"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "chmouel"; repo = "gosmee"; rev = "v${version}"; - hash = "sha256-MoSfEnciYn+Lv695aZUl27o8VtmmKf0KbELLJb06hqY="; + hash = "sha256-RJYa6bpd3OUhHhj1vECy8LKSyfIdl2SHedhGgsJclSo="; }; vendorHash = null; diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix index 50f3b15b0b8a..ef1c8738dd2d 100644 --- a/pkgs/by-name/ha/handheld-daemon/package.nix +++ b/pkgs/by-name/ha/handheld-daemon/package.nix @@ -100,7 +100,6 @@ python3Packages.buildPythonApplication rec { changelog = "https://github.com/hhd-dev/hhd/releases/tag/${src.tag}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ - appsforartists toast ]; mainProgram = "hhd"; diff --git a/pkgs/by-name/hd/hdrhistogram_c/package.nix b/pkgs/by-name/hd/hdrhistogram_c/package.nix new file mode 100644 index 000000000000..f1d128e6a1f6 --- /dev/null +++ b/pkgs/by-name/hd/hdrhistogram_c/package.nix @@ -0,0 +1,32 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hdrhistogram_c"; + version = "0.11.8"; + + src = fetchFromGitHub { + owner = "HdrHistogram"; + repo = "HdrHistogram_c"; + tag = finalAttrs.version; + hash = "sha256-TFlrC4bgK8o5KRZcLMlYU5EO9Oqaqe08PjJgmsUl51M="; + }; + + buildInputs = [ zlib ]; + nativeBuildInputs = [ cmake ]; + + doCheck = true; + + meta = { + description = "C port or High Dynamic Range (HDR) Histogram"; + homepage = "https://github.com/HdrHistogram/HdrHistogram_c"; + changelog = "https://github.com/HdrHistogram/HdrHistogram_c/releases/tag/${finalAttrs.version}"; + license = lib.licenses.publicDomain; + maintainers = with lib.maintainers; [ jherland ]; + }; +}) diff --git a/pkgs/by-name/he/heimdall-gui/package.nix b/pkgs/by-name/he/heimdall-gui/package.nix new file mode 100644 index 000000000000..6a54d496fe50 --- /dev/null +++ b/pkgs/by-name/he/heimdall-gui/package.nix @@ -0,0 +1,7 @@ +{ + heimdall, +}: + +heimdall.override { + enableGUI = true; +} diff --git a/pkgs/by-name/io/iotas/package.nix b/pkgs/by-name/io/iotas/package.nix index 79ec2898aefd..eb3c7776c320 100644 --- a/pkgs/by-name/io/iotas/package.nix +++ b/pkgs/by-name/io/iotas/package.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { pname = "iotas"; - version = "0.11.0"; + version = "0.11.2"; pyproject = false; src = fetchFromGitLab { @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { owner = "World"; repo = "iotas"; tag = version; - hash = "sha256-9YYKVBjidHBWyUqFvxo3tNx5DQkpililCDLZofESYRw="; + hash = "sha256-nDmofssoaB3BKh6X3Lpi5xftyo9Zw3IUoD3wte0wPM4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ip/ip2asn/package.nix b/pkgs/by-name/ip/ip2asn/package.nix new file mode 100644 index 000000000000..cac2fd031c1e --- /dev/null +++ b/pkgs/by-name/ip/ip2asn/package.nix @@ -0,0 +1,61 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + nix-update-script, + versionCheckHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "ip2asn"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "x123"; + repo = "ip2asn"; + tag = finalAttrs.version; + hash = "sha256-2wuxBwllrkPdmmBCt7DPQ38E2k3igAjbICun51bhopY="; + }; + + cargoHash = "sha256-fYg0aIU8usueMg6cMWUcwMIFCinHdm6H7k9ywZGYfg8="; + + passthru.updateScript = nix-update-script { }; + + cargoBuildFlags = [ + "-p" + "ip2asn-cli" + ]; + + # disable network based tests that download data + cargoTestFlags = [ + "-p" + "ip2asn-cli" + "--" + "--skip" + "auto_update_tests::test_auto_update_triggers_download" + "--skip" + "auto_update_tests::test_auto_update_skips_check_for_recent_cache" + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + meta = { + description = "CLI tool for mapping IP addresses to Autonomous System information"; + homepage = "https://github.com/x123/ip2asn/tree/master/ip2asn-cli"; + changelog = "https://github.com/x123/ip2asn/blob/${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ x123 ]; + mainProgram = "ip2asn"; + }; +}) diff --git a/pkgs/by-name/ja/jasp-desktop/cmake.patch b/pkgs/by-name/ja/jasp-desktop/cmake.patch index 60cf1814a031..48b297b21548 100644 --- a/pkgs/by-name/ja/jasp-desktop/cmake.patch +++ b/pkgs/by-name/ja/jasp-desktop/cmake.patch @@ -1,5 +1,34 @@ +diff --git a/Tools/CMake/Install.cmake b/Tools/CMake/Install.cmake +index edd96b0..1fbdb3c 100644 +--- a/Tools/CMake/Install.cmake ++++ b/Tools/CMake/Install.cmake +@@ -229,24 +229,10 @@ if(LINUX) + install(DIRECTORY ${CMAKE_SOURCE_DIR}/Resources/ + DESTINATION ${JASP_INSTALL_RESOURCEDIR}) + +- install( +- DIRECTORY ${MODULES_BINARY_PATH}/binary_pkgs ${MODULES_BINARY_PATH}/manifests ${MODULES_BINARY_PATH}/module_libs ${MODULES_BINARY_PATH}/Tools +- DESTINATION ${JASP_INSTALL_MODULEDIR} +- REGEX ${FILES_EXCLUDE_PATTERN} EXCLUDE +- REGEX ${FOLDERS_EXCLUDE_PATTERN} EXCLUDE) +- + install( + FILES ${MODULES_BINARY_PATH}/modules-settings.json + DESTINATION ${JASP_INSTALL_MODULEDIR} + ) +- # we do not need renv-root in an install +- #install(DIRECTORY ${MODULES_RENV_ROOT_PATH}/ +- # DESTINATION ${JASP_INSTALL_PREFIX}/lib64/renv-root) +- +-if(NOT FLATPAK_USED) #because flatpak already puts renv-cache in /app/lib64 anyway +- install(DIRECTORY ${MODULES_RENV_CACHE_PATH}/ +- DESTINATION ${JASP_INSTALL_PREFIX}/lib64/renv-cache) +-endif() + + #Flatpak wrapper that sets some environment variables that JASP needs + install(PROGRAMS ${CMAKE_SOURCE_DIR}/Tools/flatpak/org.jaspstats.JASP diff --git a/Tools/CMake/Libraries.cmake b/Tools/CMake/Libraries.cmake -index a95ef78..6ee84cd 100644 +index a6673d9..a079021 100644 --- a/Tools/CMake/Libraries.cmake +++ b/Tools/CMake/Libraries.cmake @@ -67,7 +67,7 @@ if((NOT LibArchive_FOUND) AND (NOT WIN32)) @@ -20,8 +49,32 @@ index a95ef78..6ee84cd 100644 HINTS ${LIBREADSTAT_LIBRARY_DIRS} REQUIRED) if(EXISTS ${LIBREADSTAT_LIBRARIES}) +diff --git a/Tools/CMake/Modules.cmake b/Tools/CMake/Modules.cmake +index ca8e040..875db1f 100644 +--- a/Tools/CMake/Modules.cmake ++++ b/Tools/CMake/Modules.cmake +@@ -13,19 +13,6 @@ configure_file(${PROJECT_SOURCE_DIR}/Modules/modules-settings.json + configure_file(${PROJECT_SOURCE_DIR}/Modules/install-modules.R.in + ${SCRIPT_DIRECTORY}/install-modules.R @ONLY) + +-#create modules install target +-add_custom_target( +- Modules +- USES_TERMINAL +- WORKING_DIRECTORY ${R_HOME_PATH} +- DEPENDS ${JASP_MODULE_BUNDLE_MANAGER_LIBRARY}/jaspModuleBundleManager +- DEPENDS ${SCRIPT_DIRECTORY}/install-modules.R +- COMMAND ${CMAKE_COMMAND} -E env "JASP_R_HOME=${R_HOME_PATH}" ${R_EXECUTABLE} --slave --no-restore --no-save +- --file=${SCRIPT_DIRECTORY}/install-modules.R +- BYPRODUCTS ${MODULES_BINARY_PATH}/bundles-downloaded.txt +- BYPRODUCTS ${MODULES_BINARY_PATH}/bundles-installed.txt +- COMMENT "------ Installing Modules" +-) + + + diff --git a/Tools/CMake/Programs.cmake b/Tools/CMake/Programs.cmake -index bfdc8dc..af5ac03 100644 +index 4e7c052..abb5b48 100644 --- a/Tools/CMake/Programs.cmake +++ b/Tools/CMake/Programs.cmake @@ -38,8 +38,9 @@ if(NOT WIN32) @@ -37,35 +90,26 @@ index bfdc8dc..af5ac03 100644 message(CHECK_START "Looking for 'gfortran'") find_program( diff --git a/Tools/CMake/R.cmake b/Tools/CMake/R.cmake -index 9ae27d4..64fd96a 100644 +index 42e7b88..405b434 100644 --- a/Tools/CMake/R.cmake +++ b/Tools/CMake/R.cmake -@@ -841,11 +841,6 @@ message(STATUS "R_CPP_INCLUDES_LIBRARY = ${R_CPP_INCLUDES_LIBRARY}") - configure_file(${PROJECT_SOURCE_DIR}/Modules/setup_renv.R.in - ${SCRIPT_DIRECTORY}/setup_renv.R @ONLY) +@@ -867,14 +867,6 @@ else() + configure_file(${PROJECT_SOURCE_DIR}/Modules/install-renv.R.in + ${SCRIPT_DIRECTORY}/install-renv.R @ONLY) +- -execute_process( - COMMAND_ECHO STDOUT - #ERROR_QUIET OUTPUT_QUIET - WORKING_DIRECTORY ${R_HOME_PATH} -- COMMAND ${R_EXECUTABLE} --slave --no-restore --no-save --file=${SCRIPT_DIRECTORY}/setup_renv.R) +- COMMAND +- ${R_EXECUTABLE} --slave --no-restore --no-save --file=${SCRIPT_DIRECTORY}/install-renv.R +-) if(APPLE) # Patch renv -@@ -867,11 +862,6 @@ endif() - configure_file(${PROJECT_SOURCE_DIR}/Modules/setup_rcpp_rinside.R.in - ${SCRIPT_DIRECTORY}/setup_rcpp_rinside.R @ONLY) - --execute_process( -- COMMAND_ECHO STDOUT -- #ERROR_QUIET OUTPUT_QUIET -- WORKING_DIRECTORY ${R_HOME_PATH} -- COMMAND ${R_EXECUTABLE} --slave --no-restore --no-save --file=${SCRIPT_DIRECTORY}/setup_rcpp_rinside.R) - - if(APPLE) - # Patch RInside and RCpp -@@ -892,8 +882,8 @@ endif() - +@@ -937,8 +929,8 @@ execute_process( + include(FindRPackagePath) -find_package_path(RCPP_PATH ${R_CPP_INCLUDES_LIBRARY} "Rcpp") diff --git a/pkgs/by-name/ja/jasp-desktop/modules.nix b/pkgs/by-name/ja/jasp-desktop/modules.nix index c211946d76d9..040b3a258947 100644 --- a/pkgs/by-name/ja/jasp-desktop/modules.nix +++ b/pkgs/by-name/ja/jasp-desktop/modules.nix @@ -7,19 +7,18 @@ with rPackages; let - jaspColumnEncoder-src = fetchFromGitHub { - owner = "jasp-stats"; - repo = "jaspColumnEncoder"; - rev = "c54987bb25de8963866ae69ad3a6ae5a9a9f1240"; - hash = "sha256-aWfRG7DXO1MYFvmMLkX/xtHvGeIhFRcRDrVBrhkvYuI="; - }; + buildRPackage' = args: buildRPackage ({ name = "${args.pname}-${args.version}"; } // args); - jaspGraphs = buildRPackage { - name = "jaspGraphs-${jasp-version}"; - version = jasp-version; + jaspGraphs = buildRPackage' { + pname = "jaspGraphs"; + version = "0.19.2-unstable-2025-07-25"; - src = jasp-src; - sourceRoot = "${jasp-src.name}/Engine/jaspGraphs"; + src = fetchFromGitHub { + owner = "jasp-stats"; + repo = "jaspGraphs"; + rev = "e721a631c8357d42c1371a978db7cb5765bc7044"; + hash = "sha256-DOOKHBVTF9bVhAa/LZCH1J7A821H4mGEfy6KAEtDBNk="; + }; propagatedBuildInputs = [ ggplot2 @@ -35,8 +34,15 @@ let ]; }; - jaspBase = buildRPackage { - name = "jaspBase-${jasp-version}"; + jaspColumnEncoder-src = fetchFromGitHub { + owner = "jasp-stats"; + repo = "jaspColumnEncoder"; + rev = "32c53153da95087feb109c0f5f69534ffa3f32b7"; + hash = "sha256-VOMcoXpLH24auQfZCWW6hQ10u6n2GxuEQHMaXrvGTnI="; + }; + + jaspBase = buildRPackage' { + pname = "jaspBase"; version = jasp-version; src = jasp-src; @@ -44,9 +50,6 @@ let env.INCLUDE_DIR = "../inst/include/jaspColumnEncoder"; - # necessary for R 4.4.0 - hardeningDisable = [ "format" ]; - postPatch = '' mkdir -p inst/include cp -r --no-preserve=all ${jaspColumnEncoder-src} inst/include/jaspColumnEncoder @@ -79,14 +82,17 @@ let ]; }; - stanova = buildRPackage { - name = "stanova"; + stanova = buildRPackage' { + pname = "stanova"; + version = "0.3-unstable-2021-06-06"; + src = fetchFromGitHub { owner = "bayesstuff"; repo = "stanova"; rev = "988ad8e07cda1674b881570a85502be7795fbd4e"; hash = "sha256-tAeHqTHao2KVRNFBDWmuF++H31aNN6O1ss1Io500QBY="; }; + propagatedBuildInputs = [ emmeans lme4 @@ -96,14 +102,17 @@ let ]; }; - bstats = buildRPackage { - name = "bstats"; + bstats = buildRPackage' { + pname = "bstats"; + version = "0.0.0.9004-unstable-2023-09-08"; + src = fetchFromGitHub { owner = "AlexanderLyNL"; repo = "bstats"; rev = "42d34c18df08d233825bae34fdc0dfa0cd70ce8c"; hash = "sha256-N2KmbTPbyvzsZTWBRE2x7bteccnzokUWDOB4mOWUdJk="; }; + propagatedBuildInputs = [ hypergeo purrr @@ -111,14 +120,17 @@ let ]; }; - flexplot = buildRPackage { - name = "flexplot"; + flexplot = buildRPackage' { + pname = "flexplot"; + version = "0.25.5"; + src = fetchFromGitHub { owner = "dustinfife"; repo = "flexplot"; - rev = "303a03968f677e71c99a5e22f6352c0811b7b2fb"; - hash = "sha256-iT5CdtNk0Oi8gga76L6YtyWGACAwpN8A/yTBy7JJERc="; + rev = "9a39de871d48364dd5f096b2380a4c9907adf4c3"; + hash = "sha256-yf5wbhfffztT5iF6h/JSg4NSbuaexk+9JEOfT5Is1vE="; }; + propagatedBuildInputs = [ cowplot MASS @@ -141,14 +153,17 @@ let }; # conting has been removed from CRAN - conting' = buildRPackage { - name = "conting"; + conting' = buildRPackage' { + pname = "conting"; + version = "1.7.9999"; + src = fetchFromGitHub { owner = "vandenman"; repo = "conting"; rev = "03a4eb9a687e015d602022a01d4e638324c110c8"; hash = "sha256-Sp09YZz1WGyefn31Zy1qGufoKjtuEEZHO+wJvoLArf0="; }; + propagatedBuildInputs = [ mvtnorm gtools @@ -158,14 +173,22 @@ let }; buildJaspModule = - name: deps: - buildRPackage { - name = "${name}-${jasp-version}"; - version = jasp-version; - src = jasp-src; - sourceRoot = "${jasp-src.name}/Modules/${name}"; + { + pname, + version, + hash, + deps, + }: + buildRPackage' { + inherit pname version; + src = fetchFromGitHub { + name = "${pname}-${version}-source"; + owner = "jasp-stats"; + repo = pname; + tag = "v${version}"; + inherit hash; + }; propagatedBuildInputs = deps; - # some packages have a .Rprofile that tries to activate renv # we disable this by removing .Rprofile postPatch = '' @@ -174,477 +197,677 @@ let }; in { - engine = { - inherit jaspBase jaspGraphs; - }; + inherit jaspBase; modules = rec { - jaspAcceptanceSampling = buildJaspModule "jaspAcceptanceSampling" [ - abtest - BayesFactor - conting' - ggplot2 - jaspBase - jaspGraphs - plyr - stringr - vcd - vcdExtra - AcceptanceSampling - ]; - jaspAnova = buildJaspModule "jaspAnova" [ - afex - BayesFactor - boot - car - colorspace - emmeans - effectsize - ggplot2 - jaspBase - jaspDescriptives - jaspGraphs - jaspTTests - KernSmooth - matrixStats - multcomp - multcompView - mvShapiroTest - onewaytests - plyr - stringi - stringr - restriktor - ]; - jaspAudit = buildJaspModule "jaspAudit" [ - bstats - extraDistr - ggplot2 - ggrepel - jaspBase - jaspGraphs - jfa - ]; - jaspBain = buildJaspModule "jaspBain" [ - bain - lavaan - ggplot2 - semPlot - stringr - jaspBase - jaspGraphs - jaspSem - ]; - jaspBFF = buildJaspModule "jaspBFF" [ - BFF - jaspBase - jaspGraphs - ]; - jaspBfpack = buildJaspModule "jaspBfpack" [ - BFpack - bain - ggplot2 - stringr - coda - jaspBase - jaspGraphs - ]; - jaspBsts = buildJaspModule "jaspBsts" [ - Boom - bsts - ggplot2 - jaspBase - jaspGraphs - matrixStats - reshape2 - ]; - jaspCircular = buildJaspModule "jaspCircular" [ - jaspBase - jaspGraphs - circular - ggplot2 - ]; - jaspCochrane = buildJaspModule "jaspCochrane" [ - jaspBase - jaspGraphs - jaspDescriptives - jaspMetaAnalysis - ]; - jaspDescriptives = buildJaspModule "jaspDescriptives" [ - ggplot2 - ggrepel - jaspBase - jaspGraphs - jaspTTests - forecast - flexplot - ggrain - ggpp - ggtext - dplyr - ]; - jaspDistributions = buildJaspModule "jaspDistributions" [ - car - fitdistrplus - ggplot2 - goftest - gnorm - jaspBase - jaspGraphs - MASS - sgt - sn - ]; - jaspEquivalenceTTests = buildJaspModule "jaspEquivalenceTTests" [ - BayesFactor - ggplot2 - jaspBase - jaspGraphs - metaBMA - TOSTER - jaspTTests - ]; - jaspFactor = buildJaspModule "jaspFactor" [ - ggplot2 - jaspBase - jaspGraphs - jaspSem - lavaan - psych - qgraph - reshape2 - semPlot - GPArotation - Rcsdp - semTools - ]; - jaspFrequencies = buildJaspModule "jaspFrequencies" [ - abtest - BayesFactor - bridgesampling - conting' - multibridge - ggplot2 - interp - jaspBase - jaspGraphs - plyr - stringr - vcd - vcdExtra - ]; - jaspJags = buildJaspModule "jaspJags" [ - coda - ggplot2 - ggtext - hexbin - jaspBase - jaspGraphs - rjags - runjags - scales - stringr - ]; - jaspLearnBayes = buildJaspModule "jaspLearnBayes" [ - extraDistr - ggplot2 - HDInterval - jaspBase - jaspGraphs - MASS - MCMCpack - MGLM - scales - ggalluvial - ragg - rjags - runjags - ggdist - png - posterior - ]; - jaspLearnStats = buildJaspModule "jaspLearnStats" [ - extraDistr - ggplot2 - jaspBase - jaspGraphs - jaspDistributions - jaspDescriptives - jaspTTests - ggforce - tidyr - igraph - HDInterval - metafor - ]; - jaspMachineLearning = buildJaspModule "jaspMachineLearning" [ - kknn - AUC - cluster - colorspace - DALEX - dbscan - e1071 - fpc - gbm - Gmedian - ggparty - ggdendro - ggnetwork - ggplot2 - ggrepel - ggridges - glmnet - jaspBase - jaspGraphs - MASS - mclust - mvnormalTest - neuralnet - network - partykit - plyr - randomForest - rpart - ROCR - Rtsne - signal - VGAM - ]; - jaspMetaAnalysis = buildJaspModule "jaspMetaAnalysis" [ - dplyr - ggplot2 - jaspBase - jaspGraphs - MASS - metaBMA - metafor - psych - purrr - rstan - stringr - tibble - tidyr - weightr - BayesTools - RoBMA - metamisc - ggmcmc - pema - clubSandwich - CompQuadForm - sp - dfoptim - nleqslv - patchwork - ]; - jaspMixedModels = buildJaspModule "jaspMixedModels" [ - afex - emmeans - ggplot2 - ggpol - jaspBase - jaspGraphs - lme4 - loo - mgcv - rstan - rstanarm - stanova - withr - ]; - jaspNetwork = buildJaspModule "jaspNetwork" [ - bootnet - BDgraph - corpcor - dplyr - foreach - ggplot2 - gtools - HDInterval - huge - IsingSampler - jaspBase - jaspGraphs - mvtnorm - qgraph - reshape2 - snow - stringr - ]; - jaspPower = buildJaspModule "jaspPower" [ - pwr - jaspBase - jaspGraphs - ]; - jaspPredictiveAnalytics = buildJaspModule "jaspPredictiveAnalytics" [ - jaspBase - jaspGraphs - bsts - bssm - precrec - reshape2 - Boom - lubridate - prophet - BART - EBMAforecast - imputeTS - scoringRules - scoringutils - ]; - jaspProcess = buildJaspModule "jaspProcess" [ - blavaan - dagitty - ggplot2 - ggraph - jaspBase - jaspGraphs - jaspJags - runjags - ]; - jaspProphet = buildJaspModule "jaspProphet" [ - rstan - ggplot2 - jaspBase - jaspGraphs - prophet - scales - ]; - jaspQualityControl = buildJaspModule "jaspQualityControl" [ - car - cowplot - daewr - desirability - DoE_base - EnvStats - FAdist - fitdistrplus - FrF2 - ggplot2 - ggrepel - goftest - ggpp - irr - jaspBase - jaspDescriptives - jaspGraphs - mle_tools - psych - qcc - rsm - Rspc - tidyr - tibble - vipor - weibullness - ]; - jaspRegression = buildJaspModule "jaspRegression" [ - BAS - boot - bstats - combinat - emmeans - ggplot2 - ggrepel - hmeasure - jaspAnova - jaspBase - jaspDescriptives - jaspGraphs - jaspTTests - lmtest - logistf - MASS - matrixStats - mdscore - ppcor - purrr - Rcpp - statmod - VGAM - ]; - jaspReliability = buildJaspModule "jaspReliability" [ - Bayesrel - coda - ggplot2 - ggridges - irr - jaspBase - jaspGraphs - LaplacesDemon - lme4 - MASS - psych - mirt - ]; - jaspRobustTTests = buildJaspModule "jaspRobustTTests" [ - RoBTT - ggplot2 - jaspBase - jaspGraphs - ]; - jaspSem = buildJaspModule "jaspSem" [ - forcats - ggplot2 - lavaan - cSEM - reshape2 - jaspBase - jaspGraphs - semPlot - semTools - stringr - tibble - tidyr - SEMsens - ]; - jaspSummaryStatistics = buildJaspModule "jaspSummaryStatistics" [ - BayesFactor - bstats - jaspBase - jaspFrequencies - jaspGraphs - jaspRegression - jaspTTests - jaspAnova - jaspDescriptives - SuppDists - bayesplay - ]; - jaspSurvival = buildJaspModule "jaspSurvival" [ - survival - ggsurvfit - jaspBase - jaspGraphs - ]; - jaspTTests = buildJaspModule "jaspTTests" [ - BayesFactor - car - ggplot2 - jaspBase - jaspGraphs - logspline - plotrix - plyr - ]; - jaspTestModule = buildJaspModule "jaspTestModule" [ - jaspBase - jaspGraphs - svglite - stringi - ]; - jaspTimeSeries = buildJaspModule "jaspTimeSeries" [ - jaspBase - jaspGraphs - jaspDescriptives - forecast - ]; - jaspVisualModeling = buildJaspModule "jaspVisualModeling" [ - flexplot - jaspBase - jaspGraphs - jaspDescriptives - ]; + jaspAcceptanceSampling = buildJaspModule { + pname = "jaspAcceptanceSampling"; + version = "0.95.0"; + hash = "sha256-MzuijLBrCd/aIACzyEWWbQoyuYl/c7iMplsIpScbqK4="; + deps = [ + abtest + BayesFactor + conting' + ggplot2 + jaspBase + jaspGraphs + plyr + stringr + vcd + vcdExtra + AcceptanceSampling + ]; + }; + jaspAnova = buildJaspModule { + pname = "jaspAnova"; + version = "0.95.0"; + hash = "sha256-elunqlNy7krnoL31aeS4B7SkpKCD42S8Z8HsPeFTjEM="; + deps = [ + afex + BayesFactor + boot + car + colorspace + emmeans + effectsize + ggplot2 + jaspBase + jaspDescriptives + jaspGraphs + jaspTTests + KernSmooth + matrixStats + multcomp + multcompView + mvShapiroTest + onewaytests + plyr + stringi + stringr + restriktor + ]; + }; + jaspAudit = buildJaspModule { + pname = "jaspAudit"; + version = "0.95.0"; + hash = "sha256-CqrjrNm7DEyzOTg69TzksYczGBSCvhHfdfZ/HaNkhcI="; + deps = [ + bstats + extraDistr + ggplot2 + ggrepel + jaspBase + jaspGraphs + jfa + ]; + }; + jaspBain = buildJaspModule { + pname = "jaspBain"; + version = "0.95.0"; + hash = "sha256-E6j7dH6jbXWhR03QVQjY30/pylrMHU6PNX13gr5KvV4="; + deps = [ + bain + lavaan + ggplot2 + semPlot + stringr + jaspBase + jaspGraphs + jaspSem + ]; + }; + jaspBFF = buildJaspModule { + pname = "jaspBFF"; + version = "0.95.0"; + hash = "sha256-fgAUdzgSNt34WL/U3/0ac1kTB5PYAvmpXeQUuNEUhuE="; + deps = [ + BFF + jaspBase + jaspGraphs + ]; + }; + jaspBfpack = buildJaspModule { + pname = "jaspBfpack"; + version = "0.95.0"; + hash = "sha256-4c7ORf0epHSdv6AB1UVMwiSEwCfVHAg0jzifBdHInoc="; + deps = [ + BFpack + bain + ggplot2 + stringr + coda + jaspBase + jaspGraphs + ]; + }; + jaspBsts = buildJaspModule { + pname = "jaspBsts"; + version = "0.95.0"; + hash = "sha256-pClbOuA255mHJSy7/TpQE+oaYQbxJut9AqZRMqm8Rhg="; + deps = [ + Boom + bsts + ggplot2 + jaspBase + jaspGraphs + matrixStats + reshape2 + ]; + }; + jaspCircular = buildJaspModule { + pname = "jaspCircular"; + version = "0.95.0"; + hash = "sha256-Sx63VGtOZvwHF1jIjnd6aPmN1WtHHf35iQ0dzCWs1eU="; + deps = [ + jaspBase + jaspGraphs + circular + ggplot2 + ]; + }; + jaspCochrane = buildJaspModule { + pname = "jaspCochrane"; + version = "0.95.0"; + hash = "sha256-ZYMe1BJ0+HKKyHVY5riEcGE+6vZsAurWzHmPF5I7nk8="; + deps = [ + jaspBase + jaspGraphs + jaspDescriptives + jaspMetaAnalysis + ]; + }; + jaspDescriptives = buildJaspModule { + pname = "jaspDescriptives"; + version = "0.95.0"; + hash = "sha256-gaGgSSv1D0GB8Rmzg9TYl460TjWHkK0abHDm5DHhOJg="; + deps = [ + ggplot2 + ggrepel + jaspBase + jaspGraphs + jaspTTests + forecast + flexplot + ggrain + ggpp + ggtext + dplyr + tidyplots + ggpubr + forcats + patchwork + ]; + }; + + jaspDistributions = buildJaspModule { + pname = "jaspDistributions"; + version = "0.95.0"; + hash = "sha256-jtPYx2wOAY7ItrkPqyMsKp7sTrL9M1TtTmR0IjxU1nw="; + deps = [ + car + fitdistrplus + ggplot2 + goftest + gnorm + jaspBase + jaspGraphs + MASS + nortest + sgt + sn + ]; + }; + jaspEquivalenceTTests = buildJaspModule { + pname = "jaspEquivalenceTTests"; + version = "0.95.0"; + hash = "sha256-b/I6lb6I8rzOyyRgmsQTBMfHXfJDkrZPdwe5Kh2IVnc="; + deps = [ + BayesFactor + ggplot2 + jaspBase + jaspGraphs + metaBMA + TOSTER + jaspTTests + ]; + }; + jaspEsci = buildJaspModule { + pname = "jaspEsci"; + version = "0.95.0"; + hash = "sha256-0YBC54VdVNuGdkfjWEIJnW3n/Wbch4E6tkauVm45/9c="; + deps = [ + jaspBase + jaspGraphs + esci + glue + vdiffr + legendry + ]; + }; + jaspFactor = buildJaspModule { + pname = "jaspFactor"; + version = "0.95.0"; + hash = "sha256-gK4GdwADrPt2UB/UUx+2Kx5IOlFolYjNArrYpTGK9ic="; + deps = [ + ggplot2 + jaspBase + jaspGraphs + jaspSem + lavaan + psych + qgraph + reshape2 + semPlot + GPArotation + Rcsdp + semTools + ]; + }; + jaspFrequencies = buildJaspModule { + pname = "jaspFrequencies"; + version = "0.95.0"; + hash = "sha256-aK4t+q6NRHGiszJa6rWx1bQddxzwynM9TOckxofdgsw"; + deps = [ + abtest + BayesFactor + bridgesampling + conting' + multibridge + ggplot2 + interp + jaspBase + jaspGraphs + plyr + stringr + vcd + vcdExtra + ]; + }; + jaspJags = buildJaspModule { + pname = "jaspJags"; + version = "0.95.0"; + hash = "sha256-DxLy3NgqvLIROBut30ne3hCUd67rCRutgM7zGvwkKNU="; + deps = [ + coda + ggplot2 + ggtext + hexbin + jaspBase + jaspGraphs + rjags + runjags + scales + stringr + ]; + }; + jaspLearnBayes = buildJaspModule { + pname = "jaspLearnBayes"; + version = "0.95.0"; + hash = "sha256-mka93YglICKxPXNO85Kv/gzSRAMuTkWcnAlwIExDpi0="; + deps = [ + extraDistr + ggplot2 + HDInterval + jaspBase + jaspGraphs + MASS + MCMCpack + MGLM + scales + ggalluvial + ragg + rjags + runjags + ggdist + png + posterior + ]; + }; + jaspLearnStats = buildJaspModule { + pname = "jaspLearnStats"; + version = "0.95.0"; + hash = "sha256-AcdSmAGr1ITZV/OXNpyOz0wwBlho76lvEGgt5FUHnsg="; + deps = [ + extraDistr + ggplot2 + jaspBase + jaspGraphs + jaspDistributions + jaspDescriptives + jaspTTests + ggforce + tidyr + igraph + HDInterval + metafor + ]; + }; + jaspMachineLearning = buildJaspModule { + pname = "jaspMachineLearning"; + version = "0.95.0"; + hash = "sha256-oCsXrcEAteFGfFHU65FV3jm1majA1q1w+TYCwAsvf70="; + deps = [ + kknn + AUC + cluster + colorspace + DALEX + dbscan + e1071 + fpc + gbm + Gmedian + ggparty + ggdendro + ggnetwork + ggplot2 + ggrepel + ggridges + glmnet + jaspBase + jaspGraphs + MASS + mclust + mvnormalTest + neuralnet + network + partykit + plyr + randomForest + rpart + ROCR + Rtsne + signal + VGAM + ]; + }; + jaspMetaAnalysis = buildJaspModule { + pname = "jaspMetaAnalysis"; + version = "0.95.0"; + hash = "sha256-5zmLCx6HuM/oBxfaAgo4y7/CYJJkiJEP9RvAsc1h/5w="; + deps = [ + dplyr + ggplot2 + jaspBase + jaspGraphs + jaspSem + MASS + metaBMA + metafor + metaSEM + psych + purrr + rstan + stringr + tibble + tidyr + weightr + BayesTools + RoBMA + metamisc + ggmcmc + pema + clubSandwich + CompQuadForm + sp + dfoptim + nleqslv + patchwork + ]; + }; + jaspMixedModels = buildJaspModule { + pname = "jaspMixedModels"; + version = "0.95.0"; + hash = "sha256-EbB7rwlfRiGPI+QIi8/SygxJgsU5nOpZ2ZEg+mETX5Y="; + deps = [ + afex + emmeans + ggplot2 + ggpol + jaspBase + jaspGraphs + lme4 + loo + mgcv + rstan + rstanarm + stanova + withr + ]; + }; + jaspNetwork = buildJaspModule { + pname = "jaspNetwork"; + version = "0.95.0"; + hash = "sha256-1RDkKRgNV6cToM2pVdHwIDE41UpFV0snIU54BEesVJw="; + deps = [ + bootnet + easybgm + corpcor + dplyr + foreach + ggplot2 + gtools + HDInterval + huge + IsingSampler + jaspBase + jaspGraphs + mvtnorm + qgraph + reshape2 + snow + stringr + ]; + }; + jaspPower = buildJaspModule { + pname = "jaspPower"; + version = "0.95.0"; + hash = "sha256-sLLJ6yqKbFlXrHPlm2G7NuHp+/kBl+kPRvi6vAy32Ds="; + deps = [ + pwr + jaspBase + jaspGraphs + ]; + }; + jaspPredictiveAnalytics = buildJaspModule { + pname = "jaspPredictiveAnalytics"; + version = "0.95.0"; + hash = "sha256-850PruQnCGab0g3Vdlh1LSqWYLFJUCbGNt3gWjEWP34="; + deps = [ + jaspBase + jaspGraphs + bsts + bssm + precrec + reshape2 + Boom + lubridate + prophet + BART + EBMAforecast + imputeTS + scoringRules + scoringutils + ]; + }; + jaspProcess = buildJaspModule { + pname = "jaspProcess"; + version = "0.95.0"; + hash = "sha256-LUlk9Iy538Zenzy+W1oJiCr7dcrBQVrl4gzflwnJVyc="; + deps = [ + blavaan + dagitty + ggplot2 + ggraph + jaspBase + jaspGraphs + jaspJags + runjags + ]; + }; + jaspProphet = buildJaspModule { + pname = "jaspProphet"; + version = "0.95.0"; + hash = "sha256-lCgqH3CfZxRImq5VndZepiy/JaXJHHh1Haj+7XhZUSE="; + deps = [ + rstan + ggplot2 + jaspBase + jaspGraphs + prophet + scales + ]; + }; + jaspQualityControl = buildJaspModule { + pname = "jaspQualityControl"; + version = "0.95.0"; + hash = "sha256-6SvLe++9ipvHfX0Hi1xeBeoQeq+PdG9YTE5sewhqUHA="; + deps = [ + car + cowplot + daewr + desirability + DoE_base + EnvStats + FAdist + fitdistrplus + FrF2 + ggplot2 + ggrepel + goftest + ggpp + irr + jaspBase + jaspDescriptives + jaspGraphs + mle_tools + psych + qcc + rsm + Rspc + tidyr + tibble + vipor + weibullness + ]; + }; + jaspRegression = buildJaspModule { + pname = "jaspRegression"; + version = "0.95.0"; + hash = "sha256-9Q5Ei9vjFaDte//1seCj9++ftbDctkHzP8ZpGVETXH0="; + deps = [ + BAS + boot + bstats + combinat + emmeans + ggplot2 + ggrepel + hmeasure + jaspAnova + jaspBase + jaspDescriptives + jaspGraphs + jaspTTests + lmtest + logistf + MASS + matrixStats + mdscore + ppcor + purrr + Rcpp + statmod + VGAM + ]; + }; + jaspReliability = buildJaspModule { + pname = "jaspReliability"; + version = "0.95.0"; + hash = "sha256-wxx1ECm7QKDvLLKQZbEVYTHfyn3ieks69HSP/cg5dDQ="; + deps = [ + Bayesrel + coda + ggplot2 + ggridges + irr + jaspBase + jaspGraphs + LaplacesDemon + lme4 + MASS + psych + mirt + ]; + }; + jaspRobustTTests = buildJaspModule { + pname = "jaspRobustTTests"; + version = "0.95.0"; + hash = "sha256-nw+7eZycdJ+DHlLaTSBWdHocnaZk95PBqYj8sVFlPSg="; + deps = [ + RoBTT + ggplot2 + jaspBase + jaspGraphs + ]; + }; + jaspSem = buildJaspModule { + pname = "jaspSem"; + version = "0.95.0"; + hash = "sha256-+cgP6KqSK4tXQ+Dg6OTEoXfzEJFNdnwAat6tyWyzSkU="; + deps = [ + forcats + ggplot2 + lavaan + cSEM + reshape2 + jaspBase + jaspGraphs + semPlot + semTools + stringr + tibble + tidyr + SEMsens + ]; + }; + jaspSummaryStatistics = buildJaspModule { + pname = "jaspSummaryStatistics"; + version = "0.95.0"; + hash = "sha256-VuBDJtkDifDeatY3eX5RBd5ix6fB0QnJ1ZoM7am9SOA="; + deps = [ + BayesFactor + bstats + jaspBase + jaspFrequencies + jaspGraphs + jaspRegression + jaspTTests + jaspAnova + jaspDescriptives + SuppDists + bayesplay + ]; + }; + jaspSurvival = buildJaspModule { + pname = "jaspSurvival"; + version = "0.95.0"; + hash = "sha256-IVN3Tcd+OgD4pancwyNomQMOfOvUnKIWG/nxKdjNxcw="; + deps = [ + survival + ggsurvfit + flexsurv + jaspBase + jaspGraphs + ]; + }; + jaspTTests = buildJaspModule { + pname = "jaspTTests"; + version = "0.95.0"; + hash = "sha256-CLrfa5X/q2Ruc+y3ruHnT/NhYQ4ESvxtJCH2JM/hf4o="; + deps = [ + BayesFactor + car + ggplot2 + jaspBase + jaspGraphs + logspline + plotrix + plyr + ]; + }; + jaspTestModule = buildJaspModule { + pname = "jaspTestModule"; + version = "0.95.0"; + hash = "sha256-r+VzUxfvWYl/Fppq/TxCw1jI8F3dohsvb6qwlQHlFDA="; + deps = [ + jaspBase + jaspGraphs + svglite + stringi + ]; + }; + jaspTimeSeries = buildJaspModule { + pname = "jaspTimeSeries"; + version = "0.95.0"; + hash = "sha256-hQh9p6mX3NlkToh4uQRbPtwpNLlVwsILxH+9D2caZXk="; + deps = [ + jaspBase + jaspGraphs + jaspDescriptives + forecast + ]; + }; + jaspVisualModeling = buildJaspModule { + pname = "jaspVisualModeling"; + version = "0.95.0"; + hash = "sha256-MX3NvfVoFPp2NLWYIYIoCdWKHxpcRhfyMCWj3VdIBC0="; + deps = [ + flexplot + jaspBase + jaspGraphs + jaspDescriptives + ]; + }; }; } diff --git a/pkgs/by-name/ja/jasp-desktop/package.nix b/pkgs/by-name/ja/jasp-desktop/package.nix index 8304009e20ee..9ab3be87e49d 100644 --- a/pkgs/by-name/ja/jasp-desktop/package.nix +++ b/pkgs/by-name/ja/jasp-desktop/package.nix @@ -14,6 +14,7 @@ boost, freexl, libarchive, + librdata, qt6, R, readstat, @@ -21,14 +22,14 @@ }: let - version = "0.19.3"; + version = "0.95.0"; src = fetchFromGitHub { owner = "jasp-stats"; repo = "jasp-desktop"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-p489Q3jMQ7UWOCdAGskRF9KSLoRSatUwGVfj0/g4aPo="; + hash = "sha256-RR7rJJb0qKqZs7K3zP6GxlDXpmSNnGQ3WDExUgm9pKQ="; }; moduleSet = import ./modules.nix { @@ -37,7 +38,7 @@ let jasp-version = version; }; - inherit (moduleSet) engine modules; + inherit (moduleSet) jaspBase modules; # Merges ${R}/lib/R with all used R packages (even propagated ones) customREnv = buildEnv { @@ -45,12 +46,12 @@ let paths = [ "${R}/lib/R" rPackages.RInside - engine.jaspBase # Should already be propagated from modules, but include it again, just in case + jaspBase # Should already be propagated from modules, but include it again, just in case ] ++ lib.attrValues modules; }; - modulesDir = linkFarm "jasp-${version}-modules" ( + moduleLibs = linkFarm "jasp-${version}-module-libs" ( lib.mapAttrsToList (name: drv: { name = name; path = "${drv}/library"; @@ -89,6 +90,7 @@ stdenv.mkDerivation { customREnv freexl libarchive + librdata readstat qt6.qtbase @@ -102,20 +104,17 @@ stdenv.mkDerivation { env.NIX_LDFLAGS = "-L${rPackages.RInside}/library/RInside/lib"; postInstall = '' - # Remove unused cache locations - rm -r $out/lib64 $out/Modules - # Remove flatpak proxy script rm $out/bin/org.jaspstats.JASP substituteInPlace $out/share/applications/org.jaspstats.JASP.desktop \ --replace-fail "Exec=org.jaspstats.JASP" "Exec=JASP" # symlink modules from the store - ln -s ${modulesDir} $out/Modules + ln -s ${moduleLibs} $out/Modules/module_libs ''; passthru = { - inherit modules engine; + inherit jaspBase modules; env = customREnv; }; diff --git a/pkgs/by-name/ld/ld-audit-search-mod/package.nix b/pkgs/by-name/ld/ld-audit-search-mod/package.nix new file mode 100644 index 000000000000..6ad048662edb --- /dev/null +++ b/pkgs/by-name/ld/ld-audit-search-mod/package.nix @@ -0,0 +1,44 @@ +{ + cmake, + fetchFromGitHub, + lib, + stdenv, + storeDir ? builtins.storeDir, + spdlog, + yaml-cpp, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "ld-audit-search-mod"; + version = "0-unstable-2025-06-19"; + + src = fetchFromGitHub { + repo = "ld-audit-search-mod"; + owner = "DDoSolitary"; + rev = "261f475f154d0f1f0766d6756af9c714eeeb14ea"; + hash = "sha256-c6ub+m4ihIE3gh6yHtLfJIVqm12C46wThrBCqp8SOLE="; + sparseCheckout = [ "src" ]; + }; + sourceRoot = "${finalAttrs.src.name}/src"; + + buildInputs = [ + spdlog + yaml-cpp + ]; + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + (lib.cmakeFeature "NIX_RTLD_NAME" (builtins.baseNameOf stdenv.cc.bintools.dynamicLinker)) + (lib.cmakeFeature "NIX_STORE_DIR" storeDir) + ]; + + meta = { + inherit (finalAttrs.src.meta) homepage; + description = "Audit module that modifies ld.so library search behavior"; + license = lib.licenses.mit; + maintainers = [ + lib.maintainers.atry + lib.maintainers.DDoSolitary + ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/li/librdata/gettext-fix.patch b/pkgs/by-name/li/librdata/gettext-fix.patch new file mode 100644 index 000000000000..9f048d9b7e83 --- /dev/null +++ b/pkgs/by-name/li/librdata/gettext-fix.patch @@ -0,0 +1,12 @@ +diff --git a/configure.ac b/configure.ac +index 19bd5be..d12a927 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -14,7 +14,6 @@ AC_ARG_ENABLE([sanitizers], AS_HELP_STRING([--enable-sanitizers], [Enable addres + [SANITIZERS="-fsanitize=address,bool,float-cast-overflow,integer-divide-by-zero,return,returns-nonnull-attribute,shift-exponent,signed-integer-overflow,unreachable,vla-bound -fsanitize-coverage=trace-pc-guard,indirect-calls,trace-cmp"], [SANITIZERS=""]) + AC_SUBST([SANITIZERS]) + +-AM_ICONV + + AC_CANONICAL_HOST + AS_CASE([$host], diff --git a/pkgs/by-name/li/librdata/package.nix b/pkgs/by-name/li/librdata/package.nix new file mode 100644 index 000000000000..fc077f2fb698 --- /dev/null +++ b/pkgs/by-name/li/librdata/package.nix @@ -0,0 +1,32 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, +}: + +stdenv.mkDerivation { + pname = "librdata"; + version = "0-unstable-2023-10-03"; + + src = fetchFromGitHub { + owner = "WizardMac"; + repo = "librdata"; + rev = "33bd276ecb0bbcd8997ccc71a544149b3da0d940"; + hash = "sha256-njTlKK++v7IbaRWJw8hWpE4tXh8MjPRijacqor7Rwes="; + }; + + patches = [ ./gettext-fix.patch ]; + + strictDeps = true; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = { + description = "Read and write R data frames from C"; + homepage = "https://github.com/WizardMac/librdata"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/by-name/li/libre/package.nix b/pkgs/by-name/li/libre/package.nix index 1058fe8b16d1..5ace0617d47d 100644 --- a/pkgs/by-name/li/libre/package.nix +++ b/pkgs/by-name/li/libre/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation rec { - version = "3.10.0"; + version = "3.24.0"; pname = "libre"; src = fetchFromGitHub { owner = "baresip"; repo = "re"; rev = "v${version}"; - sha256 = "sha256-OWVDuKlF7YLipDURC46s14WOLWWagUqWg20sH0kSIA4="; + sha256 = "sha256-wcntgFKpVxDlRMF8a7s9UxeXihguiGxTL/PGv9ImB80="; }; buildInputs = [ diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 609616167dc1..c7171ec7f1d7 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -42,14 +42,14 @@ in # as bootloader for various platforms and corresponding binary and helper files. stdenv.mkDerivation (finalAttrs: { pname = "limine"; - version = "9.5.1"; + version = "9.5.4"; # We don't use the Git source but the release tarball, as the source has a # `./bootstrap` script performing network access to download resources. # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://github.com/limine-bootloader/limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz"; - hash = "sha256-UgY8S+XGlSnO1k98JWBfSN0/IY3LANVFgJwI1kdPAcU="; + hash = "sha256-X0dStbsBJyFDUG25G4PUZInp+yVG3+p3bfhwQL280ig="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/li/linkchecker/package.nix b/pkgs/by-name/li/linkchecker/package.nix index 12f5b5d6fef3..e94747d4eaa3 100644 --- a/pkgs/by-name/li/linkchecker/package.nix +++ b/pkgs/by-name/li/linkchecker/package.nix @@ -1,54 +1,55 @@ { + python3Packages, lib, fetchFromGitHub, - python3, gettext, + pdfSupport ? true, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "linkchecker"; - version = "10.2.1"; + version = "10.6.0"; pyproject = true; src = fetchFromGitHub { owner = "linkchecker"; repo = "linkchecker"; tag = "v${version}"; - hash = "sha256-z7Qp74cai8GfsxB4n9dSCWQepp0/4PimFiRJQBaVSoo="; + hash = "sha256-CzDShtqcGO2TP5qNVf2zkI3Yyh80I+pSVIFzmi3AaGQ="; }; nativeBuildInputs = [ gettext ]; - build-system = with python3.pkgs; [ + build-system = with python3Packages; [ hatchling hatch-vcs polib # translations ]; - dependencies = with python3.pkgs; [ - argcomplete - beautifulsoup4 - dnspython - requests - ]; + dependencies = + with python3Packages; + [ + argcomplete + beautifulsoup4 + dnspython + requests + ] + ++ lib.optional pdfSupport pdfminer-six; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python3Packages; [ pyopenssl parameterized pytestCheckHook + pyftpdlib ]; + # Needed for tests to be able to create a ~/.local/share/linkchecker/plugins directory + preCheck = '' + export HOME=$(mktemp -d) + ''; + disabledTests = [ - "TestLoginUrl" "test_timeit2" # flakey, and depends sleep being precise to the milisecond - "test_internet" # uses network, fails on Darwin (not sure why it doesn't fail on linux) - "test_markdown" # uses sys.version_info for conditional testing - "test_itms_services" # uses sys.version_info for conditional testing - ]; - - disabledTestPaths = [ - "tests/checker/telnetserver.py" - "tests/checker/test_telnet.py" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/lk/lkl/fix-hijack-and-zpoline-parallel-builds.patch b/pkgs/by-name/lk/lkl/fix-hijack-and-zpoline-parallel-builds.patch new file mode 100644 index 000000000000..1ed9b4a97b7a --- /dev/null +++ b/pkgs/by-name/lk/lkl/fix-hijack-and-zpoline-parallel-builds.patch @@ -0,0 +1,48 @@ +From 4ee5d9b78ca1425b4473ede98602b656f28027e8 Mon Sep 17 00:00:00 2001 +From: David Disseldorp +Date: Fri, 4 Jul 2025 15:51:14 +1000 +Subject: [PATCH] lkl: fix hijack and zpoline parallel builds + +This is a follow up change for commit 3c97822a40cb1 ("lkl: add tests +build barrier") tracked via https://github.com/lkl/linux/issues/558. +The hijack and zpoline libraries also share object files, so need a +barrier to avoid parallel build failures. + +Signed-off-by: David Disseldorp +--- + tools/lkl/Makefile | 7 ++++--- + tools/lkl/Targets | 2 ++ + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/tools/lkl/Makefile b/tools/lkl/Makefile +index 9ca22b7605e3ad..dfe7f6aef5fe02 100644 +--- a/tools/lkl/Makefile ++++ b/tools/lkl/Makefile +@@ -176,10 +176,11 @@ headers_install: $(TARGETS) + include/lkl_config.h $(DESTDIR)$(INCDIR) ; \ + cp -r $(OUTPUT)include/lkl $(DESTDIR)$(INCDIR) + +-libraries_install: $(libs-y:%=$(OUTPUT)%$(SOSUF)) $(OUTPUT)liblkl.a +- $(call QUIET_INSTALL, libraries) \ ++libraries_install: $(call expand-targets,$(libs-y),$(SOSUF)) $(OUTPUT)liblkl.a ++ # filter out special .WAIT targets from install ++ $(if $(filter .%,$^),,$(call QUIET_INSTALL, libraries) \ + install -d $(DESTDIR)$(LIBDIR) ; \ +- install -m 644 $^ $(DESTDIR)$(LIBDIR) ++ install -m 644 $^ $(DESTDIR)$(LIBDIR)) + + programs_install: $(call expand-targets,$(progs-y),$(EXESUF)) + $(call QUIET_INSTALL, programs) \ +diff --git a/tools/lkl/Targets b/tools/lkl/Targets +index 3d30bd8be3c840..089a832ee23627 100644 +--- a/tools/lkl/Targets ++++ b/tools/lkl/Targets +@@ -2,6 +2,8 @@ libs-y += lib/liblkl + + ifneq ($(LKL_HOST_CONFIG_BSD),y) + libs-$(LKL_HOST_CONFIG_POSIX) += lib/hijack/liblkl-hijack ++# hijack and zpoline targets share object files, breaking parallel builds ++libs-$(LKL_HOST_CONFIG_POSIX) += .WAIT + libs-$(LKL_HOST_CONFIG_POSIX) += lib/hijack/liblkl-zpoline + endif + LDFLAGS_lib/hijack/liblkl-hijack-y += -shared -nodefaultlibs diff --git a/pkgs/by-name/lk/lkl/package.nix b/pkgs/by-name/lk/lkl/package.nix index 5c545428ef5e..2585c2d3a62a 100644 --- a/pkgs/by-name/lk/lkl/package.nix +++ b/pkgs/by-name/lk/lkl/package.nix @@ -43,6 +43,14 @@ stdenv.mkDerivation { libarchive ]; + patches = [ + # Fix corruption in hijack and zpoline libraries when building in parallel, + # because both hijack and zpoline share object files, which may result in + # missing symbols. + # https://github.com/lkl/linux/pull/612/commits/4ee5d9b78ca1425b4473ede98602b656f28027e8 + ./fix-hijack-and-zpoline-parallel-builds.patch + ]; + postPatch = '' # Fix a /usr/bin/env reference in here that breaks sandboxed builds patchShebangs arch/lkl/scripts diff --git a/pkgs/by-name/lo/lock/package.nix b/pkgs/by-name/lo/lock/package.nix index 26985e209485..a6b9f8450d9f 100644 --- a/pkgs/by-name/lo/lock/package.nix +++ b/pkgs/by-name/lo/lock/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lock"; - version = "1.6.7"; + version = "1.7.0"; src = fetchFromGitHub { owner = "konstantintutsch"; repo = "Lock"; tag = "v${finalAttrs.version}"; - hash = "sha256-5wbt+zZANWNbKJtcptovkPsGMUjGHmiX2vniLRqrQNc="; + hash = "sha256-RuxlMPboNODfSQXeGQWCpeNDI3HQNjx+ILsKAEttL6A="; }; strictDeps = true; diff --git a/pkgs/by-name/ly/ly/package.nix b/pkgs/by-name/ly/ly/package.nix index 931dcc94576a..da8a7908cf37 100644 --- a/pkgs/by-name/ly/ly/package.nix +++ b/pkgs/by-name/ly/ly/package.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "ly"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "AnErrupTion"; repo = "ly"; tag = "v${finalAttrs.version}"; - hash = "sha256-q/MFI02YdAkPdkbi8FtsM46MNalraz2MJf4Oav3fCZA="; + hash = "sha256-xD1FLW8LT+6szfjZbP++qJThf4xxbmw4jRHB8TdrG70="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ma/mantra/package.nix b/pkgs/by-name/ma/mantra/package.nix index fb4716103863..23ccad5f42c6 100644 --- a/pkgs/by-name/ma/mantra/package.nix +++ b/pkgs/by-name/ma/mantra/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "mantra"; - version = "2.0"; + version = "3.1"; src = fetchFromGitHub { owner = "MrEmpy"; repo = "Mantra"; tag = "v${version}"; - hash = "sha256-fBcoKoTBGCyJS8+mzKXLGxcxmRsCcZFZEyMTnA5Rkbw="; + hash = "sha256-DnErXuMbCRK3WxhdyPj0dOUtGnCcmynPk/hYmOsOKVU="; }; vendorHash = null; diff --git a/pkgs/applications/misc/meerk40t/camera.nix b/pkgs/by-name/me/meerk40t-camera/package.nix similarity index 67% rename from pkgs/applications/misc/meerk40t/camera.nix rename to pkgs/by-name/me/meerk40t-camera/package.nix index 6e33c8077c66..befee442bf31 100644 --- a/pkgs/applications/misc/meerk40t/camera.nix +++ b/pkgs/by-name/me/meerk40t-camera/package.nix @@ -1,13 +1,10 @@ { lib, - python3, + python3Packages, fetchPypi, }: -let - inherit (python3.pkgs) buildPythonPackage; -in -buildPythonPackage rec { +python3Packages.buildPythonPackage rec { pname = "meerk40t-camera"; version = "0.1.9"; format = "setuptools"; @@ -21,7 +18,7 @@ buildPythonPackage rec { sed -i '/meerk40t/d' setup.py ''; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3Packages; [ opencv4 ]; @@ -31,10 +28,10 @@ buildPythonPackage rec { doCheck = false; - meta = with lib; { + meta = { description = "MeerK40t camera plugin"; - license = licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/meerk40t/meerk40t-camera"; - maintainers = with maintainers; [ hexa ]; + maintainers = with lib.maintainers; [ hexa ]; }; } diff --git a/pkgs/applications/misc/meerk40t/default.nix b/pkgs/by-name/me/meerk40t/package.nix similarity index 90% rename from pkgs/applications/misc/meerk40t/default.nix rename to pkgs/by-name/me/meerk40t/package.nix index a7c9c9aa4b9f..810655eb1d47 100644 --- a/pkgs/applications/misc/meerk40t/default.nix +++ b/pkgs/by-name/me/meerk40t/package.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "meerk40t"; - repo = pname; + repo = "MeerK40t"; tag = version; hash = "sha256-7igY6qEHDUAyyKK+T0WFNfGPYy8VnMLYaWHyBE8EMSs="; }; @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { dontWrapGApps = true; # https://github.com/meerk40t/meerk40t/blob/main/setup.py - propagatedBuildInputs = + dependencies = with python3Packages; [ meerk40t-camera @@ -75,12 +75,12 @@ python3Packages.buildPythonApplication rec { export HOME=$TMPDIR ''; - meta = with lib; { - changelog = "https://github.com/meerk40t/meerk40t/releases/tag/${src.tag}"; + meta = { + changelog = "https://github.com/meerk40t/meerk40t/releases/tag/${version}"; description = "MeerK40t LaserCutter Software"; mainProgram = "meerk40t"; homepage = "https://github.com/meerk40t/meerk40t"; - license = licenses.mit; - maintainers = with maintainers; [ hexa ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; }; } diff --git a/pkgs/by-name/mi/mitra/package.nix b/pkgs/by-name/mi/mitra/package.nix index 68b987678fb3..7c9f91a7456f 100644 --- a/pkgs/by-name/mi/mitra/package.nix +++ b/pkgs/by-name/mi/mitra/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "mitra"; - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "silverpill"; repo = "mitra"; rev = "v${version}"; - hash = "sha256-FSgB2h52dpfO3GdBoCKlb8jl8eR2pQ1vWuQZdXoS0jo="; + hash = "sha256-xSgwCKjYuF6nUo4P7NrGocyhqBbBV/sx2BGKjWCEtB0="; }; - cargoHash = "sha256-GFrhTbW+o18VmB+wyokpPXIV9XlcjSdHwckZEHNX+KY="; + cargoHash = "sha256-dwaW69Mxn4GVFqOI+UUGkJG9yc3SWob0FcC1oMGsHg8="; # require running database doCheck = false; diff --git a/pkgs/by-name/mo/monkeysAudio/package.nix b/pkgs/by-name/mo/monkeysAudio/package.nix index aa441fec1e73..20c1ea19c5c7 100644 --- a/pkgs/by-name/mo/monkeysAudio/package.nix +++ b/pkgs/by-name/mo/monkeysAudio/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "11.22"; + version = "11.30"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-O60fNcz3/CsinL7NbEprtMhEcFK0NNZIuIG3hfqOW3Y="; + hash = "sha256-GnC2w1hhQlvpxa254M15xOVsqKUuIjXfgUxwgA7zcxc="; stripRoot = false; }; diff --git a/pkgs/by-name/mo/monophony/package.nix b/pkgs/by-name/mo/monophony/package.nix index 3d56ed07fd4f..1376064f9ac1 100644 --- a/pkgs/by-name/mo/monophony/package.nix +++ b/pkgs/by-name/mo/monophony/package.nix @@ -12,14 +12,14 @@ }: python3Packages.buildPythonApplication rec { pname = "monophony"; - version = "3.3.3"; + version = "3.4.0"; pyproject = true; src = fetchFromGitLab { owner = "zehkira"; repo = "monophony"; rev = "v${version}"; - hash = "sha256-ET0cygX/r/YXGWpPU01FnBoLRtjo1ddXEiVIva71aE8="; + hash = "sha256-EchbebFSSOBrgk9nilDgzp5jAeEa0tHlJZ5l4wYpw0g="; }; sourceRoot = "${src.name}/source"; diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix index b22688a1d1de..f21fcd84b5c9 100644 --- a/pkgs/by-name/mo/moonlight/package.nix +++ b/pkgs/by-name/mo/moonlight/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "moonlight"; - version = "1.3.25"; + version = "1.3.26"; src = fetchFromGitHub { owner = "moonlight-mod"; repo = "moonlight"; tag = "v${finalAttrs.version}"; - hash = "sha256-raqn8TVqD/VFgPw6kiv69JoBmUUVp9Ltj9n2EeEg85U="; + hash = "sha256-NcwRidwb/ask65LE86os4RkhyoPQo5sLu0sJs/NboK4="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ nodejs_22 ]; fetcherVersion = 2; - hash = "sha256-KZOAbU6IBytkZzwB8jbSwmlkM69uhjNUEKmIu5/DySI="; + hash = "sha256-LUUpcC2eS8VvzguicIn9xsKql9w3533xxUJ+l7e7Anc="; }; env = { diff --git a/pkgs/by-name/n9/n98-magerun2/package.nix b/pkgs/by-name/n9/n98-magerun2/package.nix index cbba74364510..baa1f07955ec 100644 --- a/pkgs/by-name/n9/n98-magerun2/package.nix +++ b/pkgs/by-name/n9/n98-magerun2/package.nix @@ -7,16 +7,16 @@ php83.buildComposerProject2 (finalAttrs: { pname = "n98-magerun2"; - version = "9.0.1"; + version = "9.0.2"; src = fetchFromGitHub { owner = "netz98"; repo = "n98-magerun2"; tag = finalAttrs.version; - hash = "sha256-Lq9TEwhcsoO4Cau2S7i/idEZYIzBeI0iXX1Ol7LnbAo="; + hash = "sha256-v6Be9yODeac4ZLYfHXZTLMcfzjKGDXD7jz7kmI/z8wo="; }; - vendorHash = "sha256-JxUVqQjSBh8FYW1JbwooHHkzDRtMRaCuVO6o45UMzOk="; + vendorHash = "sha256-vaRRxtHu/ZFc+Z38KJjm0iUncFYUfRLkk7A3+T1p4+I="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; diff --git a/pkgs/by-name/nt/ntfy-sh/package.nix b/pkgs/by-name/nt/ntfy-sh/package.nix index e35f59a6d09a..0a437fd65e31 100644 --- a/pkgs/by-name/nt/ntfy-sh/package.nix +++ b/pkgs/by-name/nt/ntfy-sh/package.nix @@ -17,7 +17,7 @@ buildGoModule ( ui = buildNpmPackage { inherit (finalAttrs) src version; pname = "ntfy-sh-ui"; - npmDepsHash = "sha256-oiOv4d+Gxk43gUAZXrTpcsfuEEpGyJMYS19ZRHf9oF8="; + npmDepsHash = "sha256-LmEJ7JuaAdjB816VspVXAQC+I46lpNAjwfLTxeNeLPc="; prePatch = '' cd web/ @@ -37,16 +37,16 @@ buildGoModule ( in { pname = "ntfy-sh"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "binwiederhier"; repo = "ntfy"; tag = "v${finalAttrs.version}"; - hash = "sha256-D4wLIGVItH5lZlfmgd2+QsqB4PHlyX4ORpwT1NGdV60="; + hash = "sha256-8BqJ2/u+g5P68ekYu/ztzjdQ91c8dIazeNdLRFpqVy0="; }; - vendorHash = "sha256-7+nvkyLcdQZ/B4Lly4ygcOGxSLkXXqCqu7xvCB4+8Wo="; + vendorHash = "sha256-3adQNZ2G0wKW3aV+gsGo/il6NsrIhGPbI7P4elWrKZQ="; doCheck = false; diff --git a/pkgs/by-name/oc/oci-cli/package.nix b/pkgs/by-name/oc/oci-cli/package.nix index 8d43945a4dda..c63398ee6cbe 100644 --- a/pkgs/by-name/oc/oci-cli/package.nix +++ b/pkgs/by-name/oc/oci-cli/package.nix @@ -25,14 +25,14 @@ in py.pkgs.buildPythonApplication rec { pname = "oci-cli"; - version = "3.63.0"; + version = "3.63.3"; pyproject = true; src = fetchFromGitHub { owner = "oracle"; repo = "oci-cli"; tag = "v${version}"; - hash = "sha256-29jEfzS/hJQKX6P3VL/Wy+0/3DFmOKFj4RTTGkVhXXM="; + hash = "sha256-Z9KVHD0LEz/6Mu6+pSlWZ8ie2p/qJ9DuFkG3xqxN0G4="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix index 12ba7e6d22c0..65e7d615ecf9 100644 --- a/pkgs/by-name/ok/okteto/package.nix +++ b/pkgs/by-name/ok/okteto/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "okteto"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; tag = finalAttrs.version; - hash = "sha256-gGtQrhetIWV7ZvnmPYcGzz718uGyAdRiraiKODrJS4w="; + hash = "sha256-ZMvZP7p/Ew3TvPLV5U1v0TG0FCWU8VTAcSMtOJLrWVQ="; }; - vendorHash = "sha256-P+N8PYh6+qj1sEp1s9yswA3HOVlI87+XOj6j9hijSuw="; + vendorHash = "sha256-Pun9LgQAv/wlX0CwU4AJuEkMeZgPTL+ExmUevURvjYE="; postPatch = '' # Disable some tests that need file system & network access. diff --git a/pkgs/by-name/op/opa-envoy-plugin/package.nix b/pkgs/by-name/op/opa-envoy-plugin/package.nix index 8698fefe0d47..efa934195f52 100644 --- a/pkgs/by-name/op/opa-envoy-plugin/package.nix +++ b/pkgs/by-name/op/opa-envoy-plugin/package.nix @@ -14,13 +14,13 @@ assert buildGoModule rec { pname = "opa-envoy-plugin"; - version = "1.6.0-envoy-2"; + version = "1.7.1-envoy"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa-envoy-plugin"; tag = "v${version}"; - hash = "sha256-pYyGbZKrdQj1Bw6q4c8wcfqOzgX/WE0hn/qODxFItB0="; + hash = "sha256-q4Cs5/QtGTWj8Ljr1R7BD6GWge6+/hUDAF/M2N/tgWE="; }; vendorHash = null; diff --git a/pkgs/by-name/os/osrm-backend/package.nix b/pkgs/by-name/os/osrm-backend/package.nix index accbb1f514c7..db8e0cba01d8 100644 --- a/pkgs/by-name/os/osrm-backend/package.nix +++ b/pkgs/by-name/os/osrm-backend/package.nix @@ -45,8 +45,12 @@ stdenv.mkDerivation rec { expat ]; - # Needed with GCC 12 - env.NIX_CFLAGS_COMPILE = "-Wno-error=uninitialized"; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=uninitialized" + # Needed with GCC 14 + "-Wno-error=maybe-uninitialized" + ]; postInstall = '' mkdir -p $out/share/osrm-backend diff --git a/pkgs/by-name/pa/paraview/package.nix b/pkgs/by-name/pa/paraview/package.nix new file mode 100644 index 000000000000..1c45ad96b1a3 --- /dev/null +++ b/pkgs/by-name/pa/paraview/package.nix @@ -0,0 +1,120 @@ +{ + lib, + stdenv, + fetchurl, + cmake, + ninja, + qt6Packages, + protobuf, + vtk-full, + testers, +}: +let + paraviewFilesUrl = "https://www.paraview.org/files"; + doc = fetchurl { + url = "${paraviewFilesUrl}/v6.0/ParaViewGettingStarted-6.0.0.pdf"; + name = "GettingStarted.pdf"; + hash = "sha256-2ghvb0UXa0Z/YGWzCchB1NKowRdlC/ZQCI3y0tZUdbo="; + }; + examples = fetchurl { + # see https://gitlab.kitware.com/paraview/paraview-superbuild/-/blob/v6.0.0/versions.cmake?ref_type=tags#L21 + url = "${paraviewFilesUrl}/data/ParaViewTutorialData-20220629.tar.gz"; + hash = "sha256-OCLvWlwhBL9R981zXWZueMyXVeiqbxsmUYcwIu1doQ4="; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "paraview"; + version = "6.0.0"; + + src = fetchurl { + url = "${paraviewFilesUrl}/v${lib.versions.majorMinor finalAttrs.version}/ParaView-v${finalAttrs.version}.tar.xz"; + hash = "sha256-DuB65jd+Xpd2auv4WOuXWGaKUt8EHzGefJdQN6Y78Yk="; + }; + + # When building paraview with external vtk, we can not infer resource_dir + # from the path of vtk's libraries. Thus hardcoding the resource_dir. + # See https://gitlab.kitware.com/paraview/paraview/-/issues/23043. + postPatch = '' + substituteInPlace Remoting/Core/vtkPVFileInformation.cxx \ + --replace-fail "return resource_dir;" "return \"$out/share/paraview\";" + ''; + + nativeBuildInputs = [ + cmake + ninja + qt6Packages.wrapQtAppsHook + vtk-full.vtkPackages.python3Packages.pythonRecompileBytecodeHook + ]; + + # propagation required by paraview-config.cmake + propagatedBuildInputs = [ + qt6Packages.qttools + qt6Packages.qt5compat + protobuf + vtk-full + ]; + + cmakeFlags = [ + (lib.cmakeBool "PARAVIEW_VERSIONED_INSTALL" false) + (lib.cmakeBool "PARAVIEW_BUILD_WITH_EXTERNAL" true) + (lib.cmakeBool "PARAVIEW_USE_EXTERNAL_VTK" true) + (lib.cmakeBool "PARAVIEW_USE_QT" true) + (lib.cmakeBool "PARAVIEW_USE_MPI" true) + (lib.cmakeBool "PARAVIEW_USE_PYTHON" true) + (lib.cmakeBool "PARAVIEW_ENABLE_WEB" true) + (lib.cmakeBool "PARAVIEW_ENABLE_CATALYST" true) + (lib.cmakeBool "PARAVIEW_ENABLE_VISITBRIDGE" true) + (lib.cmakeBool "PARAVIEW_ENABLE_ADIOS2" true) + (lib.cmakeBool "PARAVIEW_ENABLE_FFMPEG" true) + (lib.cmakeBool "PARAVIEW_ENABLE_FIDES" true) + (lib.cmakeBool "PARAVIEW_ENABLE_ALEMBIC" true) + (lib.cmakeBool "PARAVIEW_ENABLE_LAS" true) + (lib.cmakeBool "PARAVIEW_ENABLE_GDAL" true) + (lib.cmakeBool "PARAVIEW_ENABLE_PDAL" true) + (lib.cmakeBool "PARAVIEW_ENABLE_OPENTURNS" true) + (lib.cmakeBool "PARAVIEW_ENABLE_MOTIONFX" true) + (lib.cmakeBool "PARAVIEW_ENABLE_OCCT" true) + (lib.cmakeBool "PARAVIEW_ENABLE_XDMF3" true) + (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin") + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") + (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") + (lib.cmakeFeature "CMAKE_INSTALL_DOCDIR" "share/paraview/doc") + ]; + + postInstall = '' + install -Dm644 ${doc} $out/share/paraview/doc/${doc.name} + mkdir -p $out/share/paraview/examples + tar --strip-components=1 -xzf ${examples} -C $out/share/paraview/examples + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + install -Dm644 ../Qt/Components/Resources/Icons/pvIcon.svg $out/share/icons/hicolor/scalable/apps/paraview.svg + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + ln -s ../Applications/paraview.app/Contents/MacOS/paraview $out/bin/paraview + ''; + + passthru.tests = { + cmake-config = testers.hasCmakeConfigModules { + moduleNames = [ "ParaView" ]; + + package = finalAttrs.finalPackage; + + nativeBuildInputs = [ + qt6Packages.wrapQtAppsHook + ]; + }; + }; + + meta = { + description = "3D Data analysis and visualization application"; + homepage = "https://www.paraview.org"; + changelog = "https://www.kitware.com/paraview-${lib.concatStringsSep "-" (lib.versions.splitVersion finalAttrs.version)}-release-notes"; + mainProgram = "paraview"; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + guibert + qbisi + ]; + }; +}) diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix index 9d14d111067c..b0cac4c2e54f 100644 --- a/pkgs/by-name/ph/phel/package.nix +++ b/pkgs/by-name/ph/phel/package.nix @@ -7,16 +7,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phel"; - version = "0.18.1"; + version = "0.19.1"; src = fetchFromGitHub { owner = "phel-lang"; repo = "phel-lang"; tag = "v${finalAttrs.version}"; - hash = "sha256-YwmDTj1uc71rpp5Iq/7cDq0gLLy8Bh96bu0RaYqi5J0="; + hash = "sha256-uJnxCReo/GR/zAwQEV1Gp9Hv6ydGbf4EiVNL7q0cRRw="; }; - vendorHash = "sha256-zZK4v9IncoOurf2yUeFqwmAkqsMBlLfuZTUm9cWQBCA="; + vendorHash = "sha256-/7A71XQdMfirqfN9VIKFZxJ1HNBva5c2NOsbo6NMRzQ="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index 9c54b6b68acd..a19db2e1c133 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -10,16 +10,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpunit"; - version = "12.2.7"; + version = "12.3.0"; src = fetchFromGitHub { owner = "sebastianbergmann"; repo = "phpunit"; tag = finalAttrs.version; - hash = "sha256-pSmxvDGsD2NFKwP0tA8LTBxfZEXDJFwLACdmK//6Ks8="; + hash = "sha256-t1BABpCkWqnjIE25HNzh/oWE5uYRUtm824t3dPtWq8w="; }; - vendorHash = "sha256-py1mJRNb8Wcsw9sq0sGZc7lHzi52Ui4HmTUeAvTaXwY="; + vendorHash = "sha256-nXVaLzbUDqrmWW+uvuHkUBBC0Spp8UxX40ifTbUq8MA="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pi/pinta/package.nix b/pkgs/by-name/pi/pinta/package.nix index 61a7888805fe..b179a3e85e6f 100644 --- a/pkgs/by-name/pi/pinta/package.nix +++ b/pkgs/by-name/pi/pinta/package.nix @@ -57,6 +57,7 @@ buildDotnetModule rec { # Build translations dotnet build Pinta \ + --no-restore \ -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ -target:CompileTranslations,PublishTranslations \ diff --git a/pkgs/by-name/pl/plasmusic-toolbar/package.nix b/pkgs/by-name/pl/plasmusic-toolbar/package.nix index 689822e6500c..3e115a19e3ab 100644 --- a/pkgs/by-name/pl/plasmusic-toolbar/package.nix +++ b/pkgs/by-name/pl/plasmusic-toolbar/package.nix @@ -7,13 +7,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "plasmusic-toolbar"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "ccatterina"; repo = "plasmusic-toolbar"; tag = "v${finalAttrs.version}"; - hash = "sha256-Epix3gqQGc8MXMcoQ1YxrEXafuPZUOTKdute5eoJ2nI="; + hash = "sha256-Kjzutah8CIHN3NZcxGB1FXlCNn5dnTQxJITUptaXNrs="; }; installPhase = '' diff --git a/pkgs/by-name/pl/platform-folders/package.nix b/pkgs/by-name/pl/platform-folders/package.nix index 5fa41c391595..7c5efe394074 100644 --- a/pkgs/by-name/pl/platform-folders/package.nix +++ b/pkgs/by-name/pl/platform-folders/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "platform-folders"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "sago007"; repo = "PlatformFolders"; rev = version; - hash = "sha256-ruhAP9kjwm6pIFJ5a6oy6VE5W39bWQO3qSrT5IUtiwA="; + hash = "sha256-8dKW9nmxiqt47Z9RBNuHjFRyOhwmi+9mR7prUOxXIRE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix index 01c22a518f07..840989b77280 100644 --- a/pkgs/by-name/po/portfolio/package.nix +++ b/pkgs/by-name/po/portfolio/package.nix @@ -34,11 +34,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "PortfolioPerformance"; - version = "0.78.0"; + version = "0.78.1"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-f5xPXBzwa9VOutiG5uYQ5FqC6Avd+VAIyDlLW7db82Y="; + hash = "sha256-R6Z201767c61S/KAMtArzIuPjQbXMVym8KLZKMVdr+M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pr/protoc-gen-entgrpc/package.nix b/pkgs/by-name/pr/protoc-gen-entgrpc/package.nix index f7eed9ab1c33..14d9cce6540a 100644 --- a/pkgs/by-name/pr/protoc-gen-entgrpc/package.nix +++ b/pkgs/by-name/pr/protoc-gen-entgrpc/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "protoc-gen-entgrpc"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "ent"; repo = "contrib"; rev = "v${version}"; - sha256 = "sha256-8BQXjoVTasCReAc3XWBgeoYmL9zLj+uvf9TRKBYaAr4="; + sha256 = "sha256-kI+/qbWvOxcHKee7jEFBs5Bb+5MPGunAsB6d1j9fhp8="; }; - vendorHash = "sha256-jdjcnDfEAP33oQSn5nqgFqE+uwKBXp3gJWTNiiH/6iw="; + vendorHash = "sha256-tOt6Uxo4Z2zJrTjyTPoqHGfUgxFmtB+xP+kB+S6ez84="; subPackages = [ "entproto/cmd/protoc-gen-entgrpc" ]; diff --git a/pkgs/by-name/pr/protoc-gen-go/package.nix b/pkgs/by-name/pr/protoc-gen-go/package.nix index a119d4ee6fcc..5e2615bb1309 100644 --- a/pkgs/by-name/pr/protoc-gen-go/package.nix +++ b/pkgs/by-name/pr/protoc-gen-go/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "protoc-gen-go"; - version = "1.36.6"; + version = "1.36.7"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf-go"; rev = "v${version}"; - hash = "sha256-6Wx1XoHZS1RM0hpgVE85U7huVS4IK+AroTE2zpZR4VI="; + hash = "sha256-8ePIQ62ewJ1Bp+rG+R7o8Vx++zp8VK0MeEb8ASGZQ7E="; }; vendorHash = "sha256-nGI/Bd6eMEoY0sBwWEtyhFowHVvwLKjbT4yfzFz6Z3E="; diff --git a/pkgs/by-name/pu/pulumi-esc/package.nix b/pkgs/by-name/pu/pulumi-esc/package.nix index 6af30e42da25..63327480a74c 100644 --- a/pkgs/by-name/pu/pulumi-esc/package.nix +++ b/pkgs/by-name/pu/pulumi-esc/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "pulumi-esc"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "pulumi"; repo = "esc"; rev = "v${version}"; - hash = "sha256-mBFxR3Sl89TVE+G/+pr5KlMl2oWUmQr41VfZpOyNU6k="; + hash = "sha256-rdoq+Zx+NVJZrVon/OfJIAvEyCWEawSHRLxLBUFR9uY="; }; subPackages = "cmd/esc"; diff --git a/pkgs/by-name/r2/r2modman/package.nix b/pkgs/by-name/r2/r2modman/package.nix index d9504d7c99de..1a858483234b 100644 --- a/pkgs/by-name/r2/r2modman/package.nix +++ b/pkgs/by-name/r2/r2modman/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "r2modman"; - version = "3.2.1"; + version = "3.2.3"; src = fetchFromGitHub { owner = "ebkr"; repo = "r2modmanPlus"; rev = "v${finalAttrs.version}"; - hash = "sha256-l1xrp+Gl26kiWqh5pIKp4QiETrzr5mTrUP10T0DhUCw="; + hash = "sha256-0LlZsyUSVuDakbNUzJ1ZUBe9KxWNd0ONKkPafwbCINY="; }; offlineCache = fetchYarnDeps { diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix index 8fdc51f28bcf..86d4e9278f86 100644 --- a/pkgs/by-name/ra/railway/package.nix +++ b/pkgs/by-name/ra/railway/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "railway"; - version = "4.5.6"; + version = "4.6.1"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-xoBGYdcef1xBlPlUOPudhX0t59OBbNavcg5CeRJiQIY="; + hash = "sha256-+nweRMHwQbt/Nn/i0P3s7kziP7Z8RnEszqcVzjTthes="; }; - cargoHash = "sha256-o/wbBp2gIl+Dyxnee7mChVzv5qmrVAcG95i9YMxd5AI="; + cargoHash = "sha256-u86v7DeWCdeODP+mHL0mYvas1lpCEWuI15ua1LUzDak="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ra/rattler-build/package.nix b/pkgs/by-name/ra/rattler-build/package.nix index c82bac90aa1a..97c5f1233196 100644 --- a/pkgs/by-name/ra/rattler-build/package.nix +++ b/pkgs/by-name/ra/rattler-build/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rattler-build"; - version = "0.44.0"; + version = "0.45.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "rattler-build"; tag = "v${finalAttrs.version}"; - hash = "sha256-VgthpzZNFBIV4SwikmHJkRsuEP0j16hVt+CxOBuOy6s="; + hash = "sha256-nk4orzkmgKQ6UfRpA9suh7FxiPh4P+F4NagY22if5Iw="; }; - cargoHash = "sha256-HO4DXuCs/Jtz7kzp3jn/X/75Zdh9gS0ZO3eS9GFCbXA="; + cargoHash = "sha256-LvdFKguUMplNbJLh6CTy6enfg1PGqjawku/tBjwf30o="; doCheck = false; # test requires network access diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix index 3f64f88924bb..af344a2e1608 100644 --- a/pkgs/by-name/re/renode-unstable/package.nix +++ b/pkgs/by-name/re/renode-unstable/package.nix @@ -7,11 +7,11 @@ renode.overrideAttrs ( finalAttrs: _: { pname = "renode-unstable"; - version = "1.15.3+20250801git3f8169b88"; + version = "1.16.0+20250805git769469683"; src = fetchurl { url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-dotnet.tar.gz"; - hash = "sha256-1GtLD69h0oYLXqs5n+0Vzc00WtK6mdPR9BkP4tjOmW8="; + hash = "sha256-UZSfdJ14igoqaFCwCZmy29MfKZcxr7j8RtI/epHs2WI="; }; passthru.updateScript = diff --git a/pkgs/by-name/re/renode/package.nix b/pkgs/by-name/re/renode/package.nix index 1a4c4d79f987..edf34d337346 100644 --- a/pkgs/by-name/re/renode/package.nix +++ b/pkgs/by-name/re/renode/package.nix @@ -51,11 +51,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "renode"; - version = "1.15.3"; + version = "1.16.0"; src = fetchurl { url = "https://github.com/renode/renode/releases/download/v${finalAttrs.version}/renode-${finalAttrs.version}.linux-dotnet.tar.gz"; - hash = "sha256-0CZWIwIG85nT7uSHhmBkH21S5mTx2womYWV0HG+g8Mk="; + hash = "sha256-oNlTz5LBggPkjKM4TJO2UDKQdt2Ga7rBTdgyGjN8/zA="; }; nativeBuildInputs = [ @@ -102,7 +102,10 @@ stdenv.mkDerivation (finalAttrs: { description = "Virtual development framework for complex embedded systems"; homepage = "https://renode.io"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ otavio ]; + maintainers = with lib.maintainers; [ + otavio + znaniye + ]; platforms = [ "x86_64-linux" ]; }; }) diff --git a/pkgs/by-name/re/restate/package.nix b/pkgs/by-name/re/restate/package.nix index 552c3d2e0abf..19adc8192e57 100644 --- a/pkgs/by-name/re/restate/package.nix +++ b/pkgs/by-name/re/restate/package.nix @@ -25,16 +25,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "restate"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "restatedev"; repo = "restate"; tag = "v${finalAttrs.version}"; - hash = "sha256-0p3pH2lQnb3oOsGtKP8olVUefobGa3DsnB2LMx06+no="; + hash = "sha256-s7HoPuye31zATAtekWAqJz8gc/vy+vWoM68QwpjdH3o="; }; - cargoHash = "sha256-9EeS599rZLLKkdBS1bTX7y7CTmeTBlgHZ8c0WBlbZmk="; + cargoHash = "sha256-jkwi533Vem62vxq47EXIy/2mTHMB61DGmUyQfm3/BCE="; env = { PROTOC = lib.getExe protobuf; diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix index 65a8b8b72d03..65e12de00778 100644 --- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix +++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "roddhjav-apparmor-rules"; - version = "0-unstable-2025-07-29"; + version = "0-unstable-2025-08-04"; src = fetchFromGitHub { owner = "roddhjav"; repo = "apparmor.d"; - rev = "fc421183a024cb3abb4c3343ed7a1954f53e4511"; - hash = "sha256-V4sjCCie5LKXQTrso8ysFDCQJ60BUx/+OHuB9ntFLUs="; + rev = "d57b86769653ae2651533dbc2a1ffe25b119b801"; + hash = "sha256-+bcjZVwsuHnKtKkM+4vd5fY6xLidpOKXMxMQuBLwbKo="; }; dontConfigure = true; diff --git a/pkgs/by-name/ru/rusty-psn/package.nix b/pkgs/by-name/ru/rusty-psn/package.nix index cb9d21b9766c..3a3304f5f956 100644 --- a/pkgs/by-name/ru/rusty-psn/package.nix +++ b/pkgs/by-name/ru/rusty-psn/package.nix @@ -20,16 +20,16 @@ rustPlatform.buildRustPackage rec { pname = "rusty-psn"; - version = "0.5.8"; + version = "0.5.9"; src = fetchFromGitHub { owner = "RainbowCookie32"; repo = "rusty-psn"; tag = "v${version}"; - hash = "sha256-n2h+sgqNZhFgUa4MFp501W4YPtlWN94GhP9Rlu5plBA="; + hash = "sha256-Al0cT4WaOX7gxOkD5ciRntbGLCCDFSjj83E4n8nXp6I="; }; - cargoHash = "sha256-ffqTzu8/ra6SwvqDne/g9EgISGlEBSleEGn6gQ/DWAY="; + cargoHash = "sha256-FaKUQk/Q2hE0lZ11QSKA2P2BLlBNih47zzuwpMsblhw="; # Tests require network access doCheck = false; diff --git a/pkgs/by-name/sc/schemat/package.nix b/pkgs/by-name/sc/schemat/package.nix index d15226c28f31..24dfc89e8da8 100644 --- a/pkgs/by-name/sc/schemat/package.nix +++ b/pkgs/by-name/sc/schemat/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "schemat"; - version = "0.4.2"; + version = "0.4.5"; src = fetchFromGitHub { owner = "raviqqe"; repo = "schemat"; tag = "v${finalAttrs.version}"; - hash = "sha256-JOrBQvrnA/qSmI+jJjGjcxEWFDCfiUmtJaZPI3N0rMk="; + hash = "sha256-gGHAkNFEkcbWqel3kr6fUiUDHwZJdf9FLHfQjD9RPUc="; }; - cargoHash = "sha256-zGP8m05g6zEQ/dx9ChLhUCM2x9q3bltPW+9ku05rzCE="; + cargoHash = "sha256-qbn/s5wMRt0Qj/H4SVP8fCcb5cMAXETzuPm68NdgkBE="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/se/secretspec/package.nix b/pkgs/by-name/se/secretspec/package.nix index e659f665026f..a1d7d2c748d0 100644 --- a/pkgs/by-name/se/secretspec/package.nix +++ b/pkgs/by-name/se/secretspec/package.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "secretspec"; - version = "0.2.0"; + version = "0.3.0"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-6a3BerjcLn86XCakyYlMm4FUUQTc7iq/hCvZEbHnp4g="; + hash = "sha256-CYIAbp6O2e8WQcaffJ6fNY0hyKduu9mfH4xkC6ZEEWU="; }; - cargoHash = "sha256-4sKja7dED1RuiRYA2BNqvvYlJhPFiM8IzAgQVeSa9Oc="; + cargoHash = "sha256-cKV4rrIBKPPNfBeHdZ6K8+2yU5gznPGSlFcHfKVCnNM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus ]; diff --git a/pkgs/by-name/sh/sherlock-launcher/package.nix b/pkgs/by-name/sh/sherlock-launcher/package.nix index f16eda87dca0..96f481984d75 100644 --- a/pkgs/by-name/sh/sherlock-launcher/package.nix +++ b/pkgs/by-name/sh/sherlock-launcher/package.nix @@ -13,6 +13,7 @@ gdk-pixbuf, librsvg, nix-update-script, + wrapGAppsHook4, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -29,6 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ pkg-config glib + wrapGAppsHook4 ]; buildInputs = [ diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix index ff66f0d21c8e..f13a40c87f29 100644 --- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix +++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix @@ -1,7 +1,7 @@ { callPackage, commandLineArgs }: callPackage ./generic.nix { inherit commandLineArgs; } { pname = "signal-desktop-bin"; - version = "7.59.0"; + version = "7.64.0"; libdir = "usr/lib64/signal-desktop"; bindir = "usr/bin"; @@ -10,6 +10,6 @@ callPackage ./generic.nix { inherit commandLineArgs; } { bsdtar -xf $downloadedFile -C "$out" ''; - url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09213968-signal-desktop/signal-desktop-7.59.0-1.fc42.aarch64.rpm"; - hash = "sha256-nGpSWlTJ1M6UL7V3o57KByfh55LL/p3I9h+XmoJhuec="; + url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09358233-signal-desktop/signal-desktop-7.64.0-1.fc42.aarch64.rpm"; + hash = "sha256-VWDw1eSYze23obCU/R4chesJvZZo1JbDGvR82Jg99og="; } diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix index d4344a3a30e3..0f6235e4eae9 100644 --- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix +++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "signal-desktop-bin"; - version = "7.59.0"; + version = "7.64.0"; src = fetchurl { url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg"; - hash = "sha256-maBZqSklxa1Vg3U6xbQxYx+McPTWa4WdBCKh4tq6W4g="; + hash = "sha256-Ir0p2M3P8bUNi16i4aGO8RmUD20mYKbVD+4twHEOMJc="; }; sourceRoot = "."; diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix index 32f8f782b044..e6a4bd11bb3d 100644 --- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix +++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix @@ -1,12 +1,12 @@ { callPackage, commandLineArgs }: callPackage ./generic.nix { inherit commandLineArgs; } rec { pname = "signal-desktop-bin"; - version = "7.59.0"; + version = "7.64.0"; libdir = "opt/Signal"; bindir = libdir; extractPkg = "dpkg-deb -x $downloadedFile $out"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-SgTbV7KrGVdN87hgfjxamKikBxVHPIiaXAV2K3kljsU="; + hash = "sha256-3mibhZJpY/yo4RzZ6LQbI5xUlGgK6zGtB48Q8yDgflc="; } diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix index 2381bb3967e2..a1e81a57f949 100644 --- a/pkgs/by-name/sk/skim/package.nix +++ b/pkgs/by-name/sk/skim/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "skim"; - version = "0.20.3"; + version = "0.20.4"; outputs = [ "out" @@ -24,14 +24,14 @@ rustPlatform.buildRustPackage rec { owner = "skim-rs"; repo = "skim"; tag = "v${version}"; - hash = "sha256-DyrndFT4gPLLdBtvS/QI0UDMtKKeK8oX2K2h4/6xvb0="; + hash = "sha256-KgJ22Q0+tAfO6fHLYBM5mxqYJjjfmIb7hY+FcQM4j3c="; }; postPatch = '' sed -i -e "s|expand(':h:h')|'$out'|" plugin/skim.vim ''; - cargoHash = "sha256-BcWszU7S0imGlXgQ5e1L9yLfXzYzseK0z2BnqIqKkzg="; + cargoHash = "sha256-H9hCYPpsefLu35RIr3qURmrwnAOIevsd2E5LkK6Ay+4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sn/snips-sh/package.nix b/pkgs/by-name/sn/snips-sh/package.nix index 4058628c9a54..cfbe3ffc2068 100644 --- a/pkgs/by-name/sn/snips-sh/package.nix +++ b/pkgs/by-name/sn/snips-sh/package.nix @@ -5,6 +5,7 @@ sqlite, libtensorflow, withTensorflow ? false, + nixosTests, }: buildGoModule rec { pname = "snips-sh"; @@ -22,6 +23,8 @@ buildGoModule rec { buildInputs = [ sqlite ] ++ (lib.optional withTensorflow libtensorflow); + passthru.tests = nixosTests.snips-sh; + meta = { description = "Passwordless, anonymous SSH-powered pastebin with a human-friendly TUI and web UI"; license = lib.licenses.mit; diff --git a/pkgs/by-name/sn/snpeff/package.nix b/pkgs/by-name/sn/snpeff/package.nix index c5706f22fd11..554c517fd2f1 100644 --- a/pkgs/by-name/sn/snpeff/package.nix +++ b/pkgs/by-name/sn/snpeff/package.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation rec { mkdir -p $out/bin makeWrapper ${jre}/bin/java $out/bin/snpeff --add-flags "-jar $out/libexec/snpeff/snpEff.jar" makeWrapper ${jre}/bin/java $out/bin/snpsift --add-flags "-jar $out/libexec/snpeff/SnpSift.jar" + # camelCase is the default + ln -s $out/bin/snpeff $out/bin/snpEff + ln -s $out/bin/snpsift $out/bin/snpSift ''; meta = with lib; { diff --git a/pkgs/development/tools/database/sqlitebrowser/macos.patch b/pkgs/by-name/sq/sqlitebrowser/macos.patch similarity index 100% rename from pkgs/development/tools/database/sqlitebrowser/macos.patch rename to pkgs/by-name/sq/sqlitebrowser/macos.patch diff --git a/pkgs/by-name/sq/sqlitebrowser/package.nix b/pkgs/by-name/sq/sqlitebrowser/package.nix new file mode 100644 index 000000000000..4318bc279d81 --- /dev/null +++ b/pkgs/by-name/sq/sqlitebrowser/package.nix @@ -0,0 +1,70 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + libsForQt5, + sqlcipher, +}: + +let + qt' = libsForQt5; # upstream has adopted qt6, but no released version supports it + +in +stdenv.mkDerivation (finalAttrs: { + pname = "sqlitebrowser"; + version = "3.13.1"; + + src = fetchFromGitHub { + owner = "sqlitebrowser"; + repo = "sqlitebrowser"; + tag = "v${finalAttrs.version}"; + hash = "sha256-bpZnO8i8MDgOm0f93pBmpy1sZLJQ9R4o4ZLnGfT0JRg="; + }; + + patches = lib.optional stdenv.hostPlatform.isDarwin ./macos.patch; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail '"Unknown"' '"${finalAttrs.src.rev}"' + ''; + + buildInputs = [ + qt'.qtbase + qt'.qcustomplot + qt'.qscintilla + sqlcipher + ] + ++ lib.optional stdenv.hostPlatform.isDarwin qt'.qtmacextras; + + nativeBuildInputs = [ + cmake + pkg-config + qt'.qttools + qt'.wrapQtAppsHook + ]; + + cmakeFlags = [ + "-Wno-dev" + (lib.cmakeBool "sqlcipher" true) + (lib.cmakeBool "ENABLE_TESTING" (finalAttrs.finalPackage.doCheck or false)) + (lib.cmakeBool "FORCE_INTERNAL_QSCINTILLA" false) + (lib.cmakeBool "FORCE_INTERNAL_QCUSTOMPLOT" false) + (lib.cmakeBool "FORCE_INTERNAL_QHEXEDIT" true) # TODO: package qhexedit + (lib.cmakeFeature "QSCINTILLA_INCLUDE_DIR" "${lib.getDev qt'.qscintilla}/include") + ]; + + env.LANG = "C.UTF-8"; + + doCheck = true; + + meta = { + description = "DB Browser for SQLite"; + mainProgram = "sqlitebrowser"; + homepage = "https://sqlitebrowser.org/"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ peterhoeg ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index 3e1eab82a26a..c1adec89769b 100644 --- a/pkgs/by-name/st/stevenblack-blocklist/package.nix +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stevenblack-blocklist"; - version = "3.16.6"; + version = "3.16.9"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; tag = finalAttrs.version; - hash = "sha256-QrJGRXmyOz7sAxDeefZ/vdeX07RwNqX00WPuw6KOnsI="; + hash = "sha256-GLQLaiWBVdRatbq6OaydAddDREHPlHs/kr1QvQp/n1g="; }; outputs = [ diff --git a/pkgs/by-name/su/sunsetr/Cargo.lock b/pkgs/by-name/su/sunsetr/Cargo.lock new file mode 100644 index 000000000000..8266aa015faa --- /dev/null +++ b/pkgs/by-name/su/sunsetr/Cargo.lock @@ -0,0 +1,1818 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" + +[[package]] +name = "anstyle-parse" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882" +dependencies = [ + "anstyle", + "once_cell_polyfill", + "windows-sys 0.59.0", +] + +[[package]] +name = "anyhow" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" + +[[package]] +name = "autocfg" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" + +[[package]] +name = "bit-set" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" + +[[package]] +name = "bitflags" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" + +[[package]] +name = "bumpalo" +version = "3.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" + +[[package]] +name = "bytes" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" + +[[package]] +name = "cc" +version = "1.2.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "chrono" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", + "windows-link", +] + +[[package]] +name = "chrono-tz" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6139a8597ed92cf816dfb33f5dd6cf0bb93a6adc938f11039f371bc5bcd26c3" +dependencies = [ + "chrono", + "phf", +] + +[[package]] +name = "cities" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee8bec2115436fa4c2d3fb2e7286482c16e812fd781f2e40ffb8d1f66186e4c2" + +[[package]] +name = "colorchoice" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" + +[[package]] +name = "convert_case" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "crossterm" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b" +dependencies = [ + "bitflags", + "crossterm_winapi", + "derive_more", + "document-features", + "mio", + "parking_lot", + "rustix 1.0.8", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + +[[package]] +name = "derive_more" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "dirs" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.60.2", +] + +[[package]] +name = "document-features" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d" +dependencies = [ + "litrs", +] + +[[package]] +name = "downcast" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" + +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "either" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + +[[package]] +name = "env_filter" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "jiff", + "log", +] + +[[package]] +name = "equivalent" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" + +[[package]] +name = "errno" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad" +dependencies = [ + "libc", + "windows-sys 0.60.2", +] + +[[package]] +name = "fastrand" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" + +[[package]] +name = "fixedbitset" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" + +[[package]] +name = "float_next_after" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "fragile" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dd6caf6059519a65843af8fe2a3ae298b14b80179855aeb4adc2c1934ee619" + +[[package]] +name = "fs2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "futures" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" + +[[package]] +name = "futures-executor" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + +[[package]] +name = "futures-sink" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" + +[[package]] +name = "futures-task" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" + +[[package]] +name = "futures-util" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "geometry-rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fe577bea4aec9757361ef0ea2e38ff05aa65b887858229e998b2cdfe16ee65" +dependencies = [ + "float_next_after", +] + +[[package]] +name = "getrandom" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.1+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasi 0.14.2+wasi-0.2.4", +] + +[[package]] +name = "hashbrown" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "iana-time-zone" +version = "0.1.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "log", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "indexmap" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itertools" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +dependencies = [ + "either", +] + +[[package]] +name = "jiff" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49" +dependencies = [ + "jiff-static", + "log", + "portable-atomic", + "portable-atomic-util", + "serde", +] + +[[package]] +name = "jiff-static" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "js-sys" +version = "0.3.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +dependencies = [ + "once_cell", + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libc" +version = "0.2.174" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" + +[[package]] +name = "libredox" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4488594b9328dee448adb906d8b126d9b7deb7cf5c22161ee591610bb1be83c0" +dependencies = [ + "bitflags", + "libc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" + +[[package]] +name = "linux-raw-sys" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" + +[[package]] +name = "litrs" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5e54036fe321fd421e10d732f155734c4e4afd610dd556d9a82833ab3ee0bed" + +[[package]] +name = "lock_api" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" + +[[package]] +name = "memchr" +version = "2.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" + +[[package]] +name = "mio" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" +dependencies = [ + "libc", + "log", + "wasi 0.11.1+wasi-snapshot-preview1", + "windows-sys 0.59.0", +] + +[[package]] +name = "mockall" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39a6bfcc6c8c7eed5ee98b9c3e33adc726054389233e201c95dab2d41a3839d2" +dependencies = [ + "cfg-if", + "downcast", + "fragile", + "mockall_derive", + "predicates", + "predicates-tree", +] + +[[package]] +name = "mockall_derive" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25ca3004c2efe9011bd4e461bd8256445052b9615405b4f7ea43fc8ca5c20898" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "multimap" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084" + +[[package]] +name = "nix" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" +dependencies = [ + "bitflags", + "cfg-if", + "cfg_aliases", + "libc", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "once_cell" +version = "1.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "once_cell_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "parking_lot" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "petgraph" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772" +dependencies = [ + "fixedbitset", + "indexmap", +] + +[[package]] +name = "phf" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "913273894cec178f401a31ec4b656318d95473527be05c0752cc41cdc32be8b7" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_shared" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06005508882fb681fd97892ecff4b7fd0fee13ef1aa569f8695dae7ab9099981" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" + +[[package]] +name = "portable-atomic" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" + +[[package]] +name = "portable-atomic-util" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" +dependencies = [ + "portable-atomic", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "predicates" +version = "3.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5d19ee57562043d37e82899fade9a22ebab7be9cef5026b07fda9cdd4293573" +dependencies = [ + "anstyle", + "predicates-core", +] + +[[package]] +name = "predicates-core" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa" + +[[package]] +name = "predicates-tree" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72dd2d6d381dfb73a193c7fca536518d7caee39fc8503f74e7dc0be0531b425c" +dependencies = [ + "predicates-core", + "termtree", +] + +[[package]] +name = "prettyplease" +version = "0.2.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff24dfcda44452b9816fff4cd4227e1bb73ff5a2f1bc1105aa92fb8565ce44d2" +dependencies = [ + "proc-macro2", + "syn", +] + +[[package]] +name = "proc-macro2" +version = "1.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proptest" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fcdab19deb5195a31cf7726a210015ff1496ba1464fd42cb4f537b8b01b471f" +dependencies = [ + "bit-set", + "bit-vec", + "bitflags", + "lazy_static", + "num-traits", + "rand", + "rand_chacha", + "rand_xorshift", + "regex-syntax", + "rusty-fork", + "tempfile", + "unarray", +] + +[[package]] +name = "prost" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf" +dependencies = [ + "heck", + "itertools", + "log", + "multimap", + "once_cell", + "petgraph", + "prettyplease", + "prost", + "prost-types", + "regex", + "syn", + "tempfile", +] + +[[package]] +name = "prost-derive" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "prost-types" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16" +dependencies = [ + "prost", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quick-xml" +version = "0.37.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + +[[package]] +name = "rand" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" +dependencies = [ + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" +dependencies = [ + "getrandom 0.3.3", +] + +[[package]] +name = "rand_xorshift" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a" +dependencies = [ + "rand_core", +] + +[[package]] +name = "redox_syscall" +version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8af0dde094006011e6a740d4879319439489813bd0bcdc7d821beaeeff48ec" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b" +dependencies = [ + "getrandom 0.2.16", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "rustix" +version = "0.38.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" +dependencies = [ + "bitflags", + "errno", + "libc", + "linux-raw-sys 0.4.15", + "windows-sys 0.59.0", +] + +[[package]] +name = "rustix" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8" +dependencies = [ + "bitflags", + "errno", + "libc", + "linux-raw-sys 0.9.4", + "windows-sys 0.60.2", +] + +[[package]] +name = "rustversion" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" + +[[package]] +name = "rusty-fork" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" +dependencies = [ + "fnv", + "quick-error", + "tempfile", + "wait-timeout", +] + +[[package]] +name = "scc" +version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22b2d775fb28f245817589471dd49c5edf64237f4a19d10ce9a92ff4651a27f4" +dependencies = [ + "sdd", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sdd" +version = "3.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca" + +[[package]] +name = "serde" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_spanned" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" +dependencies = [ + "serde", +] + +[[package]] +name = "serial_test" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9" +dependencies = [ + "futures", + "log", + "once_cell", + "parking_lot", + "scc", + "serial_test_derive", +] + +[[package]] +name = "serial_test_derive" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" +dependencies = [ + "libc", + "mio", + "signal-hook", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" +dependencies = [ + "libc", +] + +[[package]] +name = "siphasher" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + +[[package]] +name = "slab" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d" + +[[package]] +name = "smallvec" +version = "1.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" + +[[package]] +name = "sunrise" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0733c9f1eaa06ed6d103d88e21f784449d08a6733c2ca2b39381cbcbcfe89272" +dependencies = [ + "chrono", +] + +[[package]] +name = "sunsetr" +version = "0.6.1" +dependencies = [ + "anyhow", + "chrono", + "chrono-tz", + "cities", + "crossterm", + "dirs", + "env_logger", + "fs2", + "mockall", + "nix", + "proptest", + "regex", + "serde", + "serial_test", + "signal-hook", + "sunrise", + "sunsetr", + "tempfile", + "termios", + "toml", + "tzf-rs", + "wayland-client", + "wayland-protocols-wlr", +] + +[[package]] +name = "syn" +version = "2.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" +dependencies = [ + "fastrand", + "getrandom 0.3.3", + "once_cell", + "rustix 1.0.8", + "windows-sys 0.59.0", +] + +[[package]] +name = "termios" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b" +dependencies = [ + "libc", +] + +[[package]] +name = "termtree" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683" + +[[package]] +name = "thiserror" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "toml" +version = "0.8.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "toml_write", + "winnow", +] + +[[package]] +name = "toml_write" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" + +[[package]] +name = "tzf-rel" +version = "0.0.2025-b" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb5c10d0e0d00ad6552ae5feab676ba03858ba9ccf4494743b7f242984419d4" + +[[package]] +name = "tzf-rs" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bb74389502c5223e56831ef510cd85b961659d1518deca5be257ce6f5301c4f" +dependencies = [ + "anyhow", + "bytes", + "geometry-rs", + "prost", + "prost-build", + "tzf-rel", +] + +[[package]] +name = "unarray" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" + +[[package]] +name = "unicode-ident" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" + +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "wait-timeout" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11" +dependencies = [ + "libc", +] + +[[package]] +name = "wasi" +version = "0.11.1+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" + +[[package]] +name = "wasi" +version = "0.14.2+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +dependencies = [ + "wit-bindgen-rt", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +dependencies = [ + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" +dependencies = [ + "bumpalo", + "log", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "wayland-backend" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe770181423e5fc79d3e2a7f4410b7799d5aab1de4372853de3c6aa13ca24121" +dependencies = [ + "cc", + "downcast-rs", + "rustix 0.38.44", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978fa7c67b0847dbd6a9f350ca2569174974cd4082737054dbb7fbb79d7d9a61" +dependencies = [ + "bitflags", + "log", + "rustix 0.38.44", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols" +version = "0.32.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "779075454e1e9a521794fed15886323ea0feda3f8b0fc1390f5398141310422a" +dependencies = [ + "bitflags", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cb6cdc73399c0e06504c437fe3cf886f25568dd5454473d565085b36d6a8bbf" +dependencies = [ + "bitflags", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "896fdafd5d28145fce7958917d69f2fd44469b1d4e861cb5961bcbeebc6d1484" +dependencies = [ + "proc-macro2", + "quick-xml", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.31.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbcebb399c77d5aa9fa5db874806ee7b4eba4e73650948e8f93963f128896615" +dependencies = [ + "pkg-config", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-link", + "windows-result", + "windows-strings", +] + +[[package]] +name = "windows-implement" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-interface" +version = "0.59.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-link" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" + +[[package]] +name = "windows-result" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-strings" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +dependencies = [ + "windows-targets 0.53.2", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm 0.52.6", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.53.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef" +dependencies = [ + "windows_aarch64_gnullvm 0.53.0", + "windows_aarch64_msvc 0.53.0", + "windows_i686_gnu 0.53.0", + "windows_i686_gnullvm 0.53.0", + "windows_i686_msvc 0.53.0", + "windows_x86_64_gnu 0.53.0", + "windows_x86_64_gnullvm 0.53.0", + "windows_x86_64_msvc 0.53.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_i686_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" + +[[package]] +name = "winnow" +version = "0.7.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95" +dependencies = [ + "memchr", +] + +[[package]] +name = "wit-bindgen-rt" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +dependencies = [ + "bitflags", +] + +[[package]] +name = "zerocopy" +version = "0.8.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/pkgs/by-name/su/sunsetr/package.nix b/pkgs/by-name/su/sunsetr/package.nix new file mode 100644 index 000000000000..22480bf81898 --- /dev/null +++ b/pkgs/by-name/su/sunsetr/package.nix @@ -0,0 +1,34 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "sunsetr"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "psi4j"; + repo = "sunsetr"; + tag = "v${finalAttrs.version}"; + hash = "sha256-kFIfNVA1UJrle/5udi8+9uDgq9fArUdudM/v8QpGuaM="; + }; + + cargoLock.lockFile = ./Cargo.lock; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + checkFlags = [ + "--skip=config::tests::test_geo_toml_exists_before_config_creation" + ]; + + meta = { + mainProgram = "sunsetr"; + description = "Automatic blue light filter for Hyprland, Niri, and everything Wayland"; + homepage = "https://github.com/psi4j/sunsetr"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.DoctorDalek1963 ]; + }; +}) diff --git a/pkgs/by-name/ta/tana/package.nix b/pkgs/by-name/ta/tana/package.nix index 48c92f4e6ed9..bb072cb504c3 100644 --- a/pkgs/by-name/ta/tana/package.nix +++ b/pkgs/by-name/ta/tana/package.nix @@ -62,7 +62,7 @@ let stdenv.cc.cc stdenv.cc.libc ]; - version = "1.0.37"; + version = "1.0.38"; in stdenv.mkDerivation { pname = "tana"; @@ -70,7 +70,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/tanainc/tana-desktop-releases/releases/download/v${version}/tana_${version}_amd64.deb"; - hash = "sha256-S7aihKoeP1zJpMd+mdb6D9QEtFBghyVU+K0nSzGd2ew="; + hash = "sha256-40yhEOgIfb2PalrNYn10QMW5oHsxJZwHRoal8//GDnk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ta/task-keeper/package.nix b/pkgs/by-name/ta/task-keeper/package.nix index 45fbb404ec6b..75dd0646e308 100644 --- a/pkgs/by-name/ta/task-keeper/package.nix +++ b/pkgs/by-name/ta/task-keeper/package.nix @@ -8,19 +8,19 @@ rustPlatform.buildRustPackage rec { pname = "task-keeper"; - version = "0.29.3"; + version = "0.30.1"; src = fetchFromGitHub { owner = "linux-china"; repo = "task-keeper"; tag = "v${version}"; - hash = "sha256-89KR1u4aTd32tGPiW4qUUk9eC7d9pGSBuZ8C8QVgMQ4="; + hash = "sha256-/ZmwCvoYdX733c5QkUE0KuUdHeibJkXD5wNHR7Cr7aU="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; - cargoHash = "sha256-eLdGLKem/Sh9cQ7TRbKymUIldpctBKk1JBjWiSwLloo="; + cargoHash = "sha256-Z56p2jeHvNAT4Pwl8kt1l9RopYCKk5Tt/XWZ7AqIFYw="; # tests depend on many packages (java, node, python, sbt, ...) - which I'm not currently willing to set up 😅 doCheck = false; diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix index a9b3ba9fb0d1..99ed16059053 100644 --- a/pkgs/by-name/te/television/package.nix +++ b/pkgs/by-name/te/television/package.nix @@ -2,22 +2,35 @@ lib, rustPlatform, fetchFromGitHub, + makeWrapper, testers, television, nix-update-script, + extraPackages ? [ ], }: rustPlatform.buildRustPackage (finalAttrs: { pname = "television"; - version = "0.11.9"; + version = "0.13.2"; src = fetchFromGitHub { owner = "alexpasmantier"; repo = "television"; tag = finalAttrs.version; - hash = "sha256-9ug3MFBAvdOpA7Cw5eqCjS2gWK0InqlfUAOItE0o40s="; + hash = "sha256-Ur6UTd3XsI2ZyVboQA9r3WDkl7hd1wQ0NCgTlYFF/C0="; }; - cargoHash = "sha256-n417hrDLpBD7LhtHfqHPgr9N+gkdC9nw+iDnNRcTqQQ="; + cargoHash = "sha256-LfaYRrJ4ZXoNVDsI650t+A7mWB9+2+znATp+mqDwTiE="; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = lib.optionalString (extraPackages != [ ]) '' + wrapProgram $out/bin/tv \ + --prefix PATH : ${lib.makeBinPath extraPackages} + ''; + + # TODO(@getchoo): Investigate selectively disabling some tests, or fixing them + # https://github.com/NixOS/nixpkgs/pull/423662#issuecomment-3156362941 + doCheck = false; passthru = { tests.version = testers.testVersion { diff --git a/pkgs/by-name/ti/tidy-viewer/package.nix b/pkgs/by-name/ti/tidy-viewer/package.nix index 5917a06ec4dd..a10f60404767 100644 --- a/pkgs/by-name/ti/tidy-viewer/package.nix +++ b/pkgs/by-name/ti/tidy-viewer/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "tidy-viewer"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitHub { owner = "alexhallam"; repo = "tv"; rev = version; - sha256 = "sha256-OnvRiQ5H/Vsmfu+F1i68TowjrDwQLQtV1sC6Jrp4xA4="; + sha256 = "sha256-ZiwZS7fww1dphEhJsScFfu1sBs35CB9LsGnI3qsyvrk="; }; - cargoHash = "sha256-k/8crmGkFOLcakL5roYrSBVoYyGMELh1Mu/X6SlUeds="; + cargoHash = "sha256-Cd3yNqDZcvaO8H9IwSOvZ+HGQ85fubbBYztOCgy60ls="; # this test parses command line arguments # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix index a4b112529459..363303666a79 100644 --- a/pkgs/by-name/to/tombi/package.nix +++ b/pkgs/by-name/to/tombi/package.nix @@ -7,19 +7,19 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tombi"; - version = "0.4.37"; + version = "0.4.42"; src = fetchFromGitHub { owner = "tombi-toml"; repo = "tombi"; tag = "v${finalAttrs.version}"; - hash = "sha256-K2JIP9dqeAbfc4NefN8zdvzvRqGnH7qTLUzD11vDnd0="; + hash = "sha256-EOUi8yIXRJag9U2RzXWgX8vmOO7OJ/hmCpx7BvKsml4="; }; # Tests relies on the presence of network doCheck = false; cargoBuildFlags = [ "--package tombi-cli" ]; - cargoHash = "sha256-Vkj0BXvY9hGS2pq8mz0ZKhZBQLakh+hIIZ8Py5cgtl8="; + cargoHash = "sha256-Hwa+P0Qt3W171EzhuEdzY85w3XuHv6s4MCFkH4Ejqa8="; postPatch = '' substituteInPlace Cargo.toml \ diff --git a/pkgs/by-name/tr/trayscale/package.nix b/pkgs/by-name/tr/trayscale/package.nix index 10dbcda3d9ea..1ad444e02763 100644 --- a/pkgs/by-name/tr/trayscale/package.nix +++ b/pkgs/by-name/tr/trayscale/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "trayscale"; - version = "0.18.1"; + version = "0.18.3"; src = fetchFromGitHub { owner = "DeedleFake"; repo = "trayscale"; tag = "v${version}"; - hash = "sha256-zbqn0BBL/r03lpZsHszooFkLolS4FdXM8JC6mSlNlVg="; + hash = "sha256-rk4JfK0wBvWLis9XvaZuwAoMyLfoySt3SHLJChYl0SE="; }; - vendorHash = "sha256-FifYgTWDfUFQShon4PyiiA0UgSQPmwwRaLdEKJrOZcc="; + vendorHash = "sha256-8Um5Ps1EEVShJEeCRkGE3pJi2/5PxgEVNqq3JsKdivA="; subPackages = [ "cmd/trayscale" ]; diff --git a/pkgs/by-name/uh/uhd/package.nix b/pkgs/by-name/uh/uhd/package.nix index 07e1e9bb5c73..5ae9f1caa877 100644 --- a/pkgs/by-name/uh/uhd/package.nix +++ b/pkgs/by-name/uh/uhd/package.nix @@ -27,6 +27,7 @@ enableUsrp1 ? true, enableUsrp2 ? true, enableX300 ? true, + enableX400 ? true, enableN300 ? true, enableN320 ? true, enableE300 ? true, @@ -138,6 +139,7 @@ stdenv.mkDerivation (finalAttrs: { (cmakeBool "ENABLE_USRP1" enableUsrp1) (cmakeBool "ENABLE_USRP2" enableUsrp2) (cmakeBool "ENABLE_X300" enableX300) + (cmakeBool "ENABLE_X400" enableX400) (cmakeBool "ENABLE_N300" enableN300) (cmakeBool "ENABLE_N320" enableN320) (cmakeBool "ENABLE_E300" enableE300) diff --git a/pkgs/by-name/vi/vial/package.nix b/pkgs/by-name/vi/vial/package.nix index 4586ca25d039..a1e6c450d136 100644 --- a/pkgs/by-name/vi/vial/package.nix +++ b/pkgs/by-name/vi/vial/package.nix @@ -4,12 +4,12 @@ appimageTools, }: let - version = "0.7.4"; + version = "0.7.5"; pname = "Vial"; src = fetchurl { url = "https://github.com/vial-kb/vial-gui/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage"; - hash = "sha256-SxZC+ihJsmIQAZ31G6wS42qTxdt1/8lx80bHox3sy28="; + hash = "sha256-sN8i/MOPhaLZ4iJNKz/MdpRIGTZVV/G5qD7o+ID8dAM="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index a0cfd095817c..cbc548582c4d 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-3j6Kqlo/nsc+gjSrW5Afuamnh0qb9TnG+sFN4E5pnxc=", - "version": "0.2025.07.30.08.12.stable_02" + "hash": "sha256-s4SHM2pU1CZPJZFiWE5VDeSEprLsSYChFazNGOpz+oo=", + "version": "0.2025.08.06.08.12.stable_01" }, "linux_x86_64": { - "hash": "sha256-GbkTghYchdUdYdvPNAqPv+PD7UJ2sgVc7+AAA+5bHGI=", - "version": "0.2025.07.30.08.12.stable_02" + "hash": "sha256-u0TH9u1o+g3GngEMg6r78fSZH778kGcKe5tB/lpExZE=", + "version": "0.2025.08.06.08.12.stable_01" }, "linux_aarch64": { - "hash": "sha256-xIf12oEOHQE1+Sz3L/nrqli2tlP0+wWFA9dA+HHNrr0=", - "version": "0.2025.07.30.08.12.stable_02" + "hash": "sha256-smg2QiXRlADGBKxl9Wlq2yWsCCi3JwjxhwR13yG70mA=", + "version": "0.2025.08.06.08.12.stable_01" } } diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json index fe4fae664deb..e1501138ee2b 100644 --- a/pkgs/by-name/wi/windsurf/info.json +++ b/pkgs/by-name/wi/windsurf/info.json @@ -1,20 +1,20 @@ { "aarch64-darwin": { - "version": "1.11.2", + "version": "1.11.3", "vscodeVersion": "1.99.3", - "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/a2714d538be16de1c91a0bc6fa1f52acdb0a07d2/Windsurf-darwin-arm64-1.11.2.zip", - "sha256": "d0deea25454cef4fda962436980dcf9a7d374e30e681933e1b036258179e8cd1" + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/b623f33d83cdc5b0d5eaf6ebc9e4d8193a0b5f50/Windsurf-darwin-arm64-1.11.3.zip", + "sha256": "83df03ffe0ef8e03301355f101192e81734841e8c658b2bc2fb238e7a83679d4" }, "x86_64-darwin": { - "version": "1.11.2", + "version": "1.11.3", "vscodeVersion": "1.99.3", - "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/a2714d538be16de1c91a0bc6fa1f52acdb0a07d2/Windsurf-darwin-x64-1.11.2.zip", - "sha256": "e874198d263dbbfcc46283151d50a20187460d7c42c1988b6165016b17a33351" + "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/b623f33d83cdc5b0d5eaf6ebc9e4d8193a0b5f50/Windsurf-darwin-x64-1.11.3.zip", + "sha256": "e5bda964d69f52bf49d92bd0f2e0a824c2c45dc708f2dcfd93b9797d5fecb80c" }, "x86_64-linux": { - "version": "1.11.2", + "version": "1.11.3", "vscodeVersion": "1.99.3", - "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/a2714d538be16de1c91a0bc6fa1f52acdb0a07d2/Windsurf-linux-x64-1.11.2.tar.gz", - "sha256": "b0b5439245ca9c05ac4a600da2835757641820005c219c971a294acb91f3f114" + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/b623f33d83cdc5b0d5eaf6ebc9e4d8193a0b5f50/Windsurf-linux-x64-1.11.3.tar.gz", + "sha256": "d4f5848f152c5c185c9aa7c89a34700455d41d7388592fa90e05c0329f1943bd" } } diff --git a/pkgs/by-name/xe/xenia-canary/package.nix b/pkgs/by-name/xe/xenia-canary/package.nix index 540db1ad546b..d66bc9521c37 100644 --- a/pkgs/by-name/xe/xenia-canary/package.nix +++ b/pkgs/by-name/xe/xenia-canary/package.nix @@ -19,14 +19,14 @@ }: llvmPackages_20.stdenv.mkDerivation { pname = "xenia-canary"; - version = "0-unstable-2025-07-27"; + version = "0-unstable-2025-08-06"; src = fetchFromGitHub { owner = "xenia-canary"; repo = "xenia-canary"; fetchSubmodules = true; - rev = "4e8e789876329e03697d1542718fbc21b5053aa5"; - hash = "sha256-sfNkMeOEvmBbFv2mDnKs3UGPxFRvts9wcgcA23endUI="; + rev = "e9b24642541f0203d369fedd74900cbbaddeac1e"; + hash = "sha256-q3NJvt19mi6Ve5rMHAtzP3P/ryiypCAuiEsVVCDKn8M="; }; dontConfigure = true; diff --git a/pkgs/by-name/ya/yaralyzer/package.nix b/pkgs/by-name/ya/yaralyzer/package.nix index 53f45a74cfc0..c6e488308fea 100644 --- a/pkgs/by-name/ya/yaralyzer/package.nix +++ b/pkgs/by-name/ya/yaralyzer/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "yaralyzer"; - version = "1.0.0"; + version = "1.0.6"; pyproject = true; src = fetchFromGitHub { owner = "michelcrypt4d4mus"; repo = "yaralyzer"; tag = "v${version}"; - hash = "sha256-HrYO7Fz9aLabx7nsilo/b/xe6OOzIq0P2PzVFtAPNEU="; + hash = "sha256-zaC33dlwjMNvvXnxqrEJvk3Umh+4hYsbDWoW6n6KmCk="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index b651ddd6dff1..fb0f068266db 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -99,7 +99,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.197.6"; + version = "0.198.2"; outputs = [ "out" @@ -112,7 +112,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-+QynG2YvAxl3v6Rb89+wv4wSSrBKYKeYfmoQ6pGLa4w="; + hash = "sha256-0BX8LFoW4VpTN2jSJqp/Y+urpLy8Llxyvfr5O4brCSA="; }; patches = [ @@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail "inner.redirect(policy)" "inner.redirect_policy(policy)" ''; - cargoHash = "sha256-O5HUOVtaxUdanh83JjauUskMnEv+y7BWY6S7T4WbgyE="; + cargoHash = "sha256-H8ns6LrHHgND41KyhpXjdtLToIEHBu0I3vNRLAjtPTY="; nativeBuildInputs = [ cmake diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix index d86dfd42f8fd..abb1bada08d1 100644 --- a/pkgs/development/compilers/dotnet/vmr.nix +++ b/pkgs/development/compilers/dotnet/vmr.nix @@ -230,6 +230,8 @@ stdenv.mkDerivation rec { substituteInPlace \ src/runtime/src/coreclr/ilasm/CMakeLists.txt \ --replace-fail 'set_source_files_properties( prebuilt/asmparse.cpp PROPERTIES COMPILE_FLAGS "-O0" )' "" + '' + + lib.optionalString (lib.versionOlder version "10") '' # https://github.com/dotnet/source-build/issues/4444 xmlstarlet ed \ @@ -237,8 +239,6 @@ stdenv.mkDerivation rec { -s '//Project/Target/MSBuild[@Targets="Restore"]' \ -t attr -n Properties -v "NUGET_PACKAGES='\$(CurrentRepoSourceBuildPackageCache)'" \ src/aspnetcore/eng/Tools.props - '' - + lib.optionalString (lib.versionOlder version "10") '' # patch packages installed from npm cache xmlstarlet ed \ --inplace \ diff --git a/pkgs/development/compilers/dotnet/wrapper.nix b/pkgs/development/compilers/dotnet/wrapper.nix index 2fcaa17f3c6a..6de2acb85620 100644 --- a/pkgs/development/compilers/dotnet/wrapper.nix +++ b/pkgs/development/compilers/dotnet/wrapper.nix @@ -18,6 +18,8 @@ replaceVars, nugetPackageHook, xmlstarlet, + pkgs, + recurseIntoAttrs, }: type: unwrapped: stdenvNoCC.mkDerivation (finalAttrs: { @@ -280,6 +282,17 @@ stdenvNoCC.mkDerivation (finalAttrs: { }; } // lib.optionalAttrs (type == "sdk") ({ + buildDotnetModule = recurseIntoAttrs ( + (pkgs.appendOverlays [ + (self: super: { + dotnet-sdk = finalAttrs.finalPackage; + dotnet-runtime = finalAttrs.finalPackage.runtime; + }) + ]).callPackage + ../../../test/dotnet/default.nix + { } + ); + console = lib.recurseIntoAttrs { # yes, older SDKs omit the comma cs = mkConsoleTests "C#" "cs" "Hello,?\\ World!"; diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index 7777d9da57f1..4931643a5c1d 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.23.11"; + version = "1.23.12"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-KWOBYHpIOoqGZ9dpUzF1L5Sh8jHCBOJSfS8i4ePRJH0="; + hash = "sha256-4czpN5ok6JVxSkEsfd0VfSYU2e2+g6hESbbhhAtPEiY="; }; strictDeps = true; diff --git a/pkgs/development/compilers/go/1.25.nix b/pkgs/development/compilers/go/1.25.nix index e16420b80e38..5ca1b35dcebf 100644 --- a/pkgs/development/compilers/go/1.25.nix +++ b/pkgs/development/compilers/go/1.25.nix @@ -28,11 +28,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.25rc2"; + version = "1.25rc3"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-5jFKMjTEwDuNAGvNHRRZTZKBcNGES23/3V+lojM0SeE="; + hash = "sha256-Rw4LjnCmjyhV59AJ8TXsgLPRgIXSxOU323Xmrkliv3Q="; }; strictDeps = true; diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix index 646e6fe16267..544ba040f042 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "asf-search"; - version = "9.0.7"; + version = "9.0.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "asfadmin"; repo = "Discovery-asf_search"; tag = "v${version}"; - hash = "sha256-qfP02OQ3RQx8EZsrbrSvlFkz16MZsTT7phemrKo8vEI="; + hash = "sha256-1ZJsVcbqvB0DpcVyCWaEdYEnDXDDIupiprcIZlRCWDo="; }; pythonRelaxDeps = [ "tenacity" ]; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 35dea3a7130e..6fb1c4692905 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.40.3"; + version = "1.40.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-0IyFSdOam+ft9PRs6j2IdzPWI9CexUHwocbiOgZXLuE="; + hash = "sha256-17alwgsvFrR7RChEr8po4K7t9t3aZnvFbLUGsEtUXdA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ciscoconfparse2/default.nix b/pkgs/development/python-modules/ciscoconfparse2/default.nix index 166eaba86ea4..731c78292b68 100644 --- a/pkgs/development/python-modules/ciscoconfparse2/default.nix +++ b/pkgs/development/python-modules/ciscoconfparse2/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "ciscoconfparse2"; - version = "0.8.17"; + version = "0.8.29"; pyproject = true; src = fetchFromGitHub { owner = "mpenning"; repo = "ciscoconfparse2"; tag = version; - hash = "sha256-G6FR2v/FJE0ySpNXJ9603O16UjSqOkRB2+7xNoLBJAM="; + hash = "sha256-Dvryv3VPdyRuvIPksEnSlKnCJU70j2xd2aWpwXUGbUY="; }; pythonRelaxDeps = [ @@ -84,5 +84,7 @@ buildPythonPackage rec { changelog = "https://github.com/mpenning/ciscoconfparse2/blob/${src.tag}/CHANGES.md"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; + # https://github.com/mpenning/ciscoconfparse2/issues/19 + broken = lib.versionAtLeast hier-config.version "3"; }; } diff --git a/pkgs/development/python-modules/cloup/default.nix b/pkgs/development/python-modules/cloup/default.nix index a11b1a75ae14..06d946e3fc80 100644 --- a/pkgs/development/python-modules/cloup/default.nix +++ b/pkgs/development/python-modules/cloup/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "cloup"; - version = "3.0.7"; + version = "3.0.8"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-yFLgoFQapDPGqzGpuLUD9j2Ygekd2vA4TWknll8rQhw="; + hash = "sha256-+RwICnJRlt33T+q9YlAmb0Zul/wW3+Iadiz2vGvrPss="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/cnvkit/default.nix b/pkgs/development/python-modules/cnvkit/default.nix index 4911f8b004cd..eb6375367297 100644 --- a/pkgs/development/python-modules/cnvkit/default.nix +++ b/pkgs/development/python-modules/cnvkit/default.nix @@ -3,9 +3,9 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, - + python, + makeWrapper, # dependencies - R, biopython, matplotlib, numpy, @@ -13,15 +13,15 @@ pomegranate, pyfaidx, pysam, - rPackages, reportlab, + rPackages, scikit-learn, scipy, - + R, # tests pytestCheckHook, -}: +}: buildPythonPackage rec { pname = "cnvkit"; version = "0.9.12"; @@ -47,11 +47,38 @@ buildPythonPackage rec { "pomegranate" ]; - # Numpy 2 compatibility - postPatch = '' - substituteInPlace skgenome/intersect.py \ - --replace-fail "np.string_" "np.bytes_" - ''; + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = [ + R + ]; + + postPatch = + let + rscript = lib.getExe' R "Rscript"; + in + # Numpy 2 compatibility + '' + substituteInPlace skgenome/intersect.py \ + --replace-fail "np.string_" "np.bytes_" + '' + # Patch shebang lines in R scripts + + '' + substituteInPlace cnvlib/segmentation/flasso.py \ + --replace-fail "#!/usr/bin/env Rscript" "#!${rscript}" + + substituteInPlace cnvlib/segmentation/cbs.py \ + --replace-fail "#!/usr/bin/env Rscript" "#!${rscript}" + + substituteInPlace cnvlib/segmentation/__init__.py \ + --replace-fail 'rscript_path="Rscript"' 'rscript_path="${rscript}"' + + substituteInPlace cnvlib/commands.py \ + --replace-fail 'default="Rscript"' 'default="${rscript}"' + + ''; dependencies = [ biopython @@ -61,12 +88,42 @@ buildPythonPackage rec { pomegranate pyfaidx pysam - rPackages.DNAcopy reportlab + rPackages.DNAcopy scikit-learn scipy ]; + # Make sure R can find the DNAcopy package + postInstall = '' + wrapProgram $out/bin/cnvkit.py \ + --set R_LIBS_SITE "${rPackages.DNAcopy}/library" \ + --set MPLCONFIGDIR "/tmp/matplotlib-config" + ''; + + installCheckPhase = '' + runHook preInstallCheck + + ${python.executable} -m pytest --deselect=test/test_commands.py::CommandTests::test_batch \ + --deselect=test/test_commands.py::CommandTests::test_segment_hmm + + cd test + # Set matplotlib config directory for the tests + export MPLCONFIGDIR="/tmp/matplotlib-config" + export HOME="/tmp" + mkdir -p "$MPLCONFIGDIR" + + # Use the installed binary - it's already wrapped with R_LIBS_SITE + make cnvkit="$out/bin/cnvkit.py" || { + echo "Make tests failed" + exit 1 + } + + runHook postInstallCheck + ''; + + doInstallCheck = true; + pythonImportsCheck = [ "cnvlib" ]; nativeCheckInputs = [ @@ -74,13 +131,6 @@ buildPythonPackage rec { R ]; - disabledTests = [ - # AttributeError: module 'pomegranate' has no attribute 'NormalDistribution' - # https://github.com/etal/cnvkit/issues/815 - "test_batch" - "test_segment_hmm" - ]; - meta = { homepage = "https://cnvkit.readthedocs.io"; description = "Python library and command-line software toolkit to infer and visualize copy number from high-throughput DNA sequencing data"; diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix index 43668b02ce9f..6d2a10f875a1 100644 --- a/pkgs/development/python-modules/deebot-client/default.nix +++ b/pkgs/development/python-modules/deebot-client/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "deebot-client"; - version = "13.5.0"; + version = "13.6.0"; pyproject = true; disabled = pythonOlder "3.13"; @@ -29,12 +29,12 @@ buildPythonPackage rec { owner = "DeebotUniverse"; repo = "client.py"; tag = version; - hash = "sha256-sQCUxctFTa3olNxXdSbFh/xo5ISOAivQ6XvvOmLysB4="; + hash = "sha256-/8IBXPqDHgAa7v5+c1co9cABXXaZJZhZy5N2TzVKG7Q="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-Uk9JIrN1w+bwFSG04I3EQGbBV5SArb7G7jcKpVA+ME4="; + hash = "sha256-pJSbNgDLq+c3KLVXXZGr7jc7crrbZLcyO//sXJK/bA4="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/fastapi-mcp/default.nix b/pkgs/development/python-modules/fastapi-mcp/default.nix index 0767727a927b..844ba0f6de2d 100644 --- a/pkgs/development/python-modules/fastapi-mcp/default.nix +++ b/pkgs/development/python-modules/fastapi-mcp/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "fastapi-mcp"; - version = "0.3.7"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "tadata-org"; repo = "fastapi_mcp"; tag = "v${version}"; - hash = "sha256-WQ+Y/TM5fz0lHjCKvEuYGY6hzxo2ePcgRnq7piNC+KQ="; + hash = "sha256-TCmM5n6BF3CWEuGVSZnUL2rTYitKtn4vSCkiQvKFLKw="; }; build-system = [ @@ -74,7 +74,7 @@ buildPythonPackage rec { meta = { description = "Expose your FastAPI endpoints as Model Context Protocol (MCP) tools, with Auth"; homepage = "https://github.com/tadata-org/fastapi_mcp"; - changelog = "https://github.com/tadata-org/fastapi_mcp/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/tadata-org/fastapi_mcp/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; }; diff --git a/pkgs/development/python-modules/hko/default.nix b/pkgs/development/python-modules/hko/default.nix new file mode 100644 index 000000000000..8c683da8edb2 --- /dev/null +++ b/pkgs/development/python-modules/hko/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + poetry-core, + aiohttp, +}: + +buildPythonPackage rec { + pname = "hko"; + version = "0.3.2"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-6FzdaSaw7sX52wM8HbHFGtKdR2JBg3B2cMZnP7RfQzs="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ aiohttp ]; + + # Tests require network access + doCheck = false; + + pythonImportsCheck = [ "hko" ]; + + meta = { + description = "Unofficial Python wrapper for the Hong Kong Observatory public API"; + homepage = "https://github.com/MisterCommand/python-hko"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +} diff --git a/pkgs/development/python-modules/inkbird-ble/default.nix b/pkgs/development/python-modules/inkbird-ble/default.nix index f7ff5abfac28..b2a31ed4c13c 100644 --- a/pkgs/development/python-modules/inkbird-ble/default.nix +++ b/pkgs/development/python-modules/inkbird-ble/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "inkbird-ble"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "inkbird-ble"; tag = "v${version}"; - hash = "sha256-J3BT4KZ5Kzoc8vwbsXbhZJ+qkeggYomGE0JedxNTPaQ="; + hash = "sha256-Dwp65FKtqJbgux+T3Ql09sDy6m8CCeK26aDKM3I3eJo="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/ipycanvas/default.nix b/pkgs/development/python-modules/ipycanvas/default.nix index 2a0e06c9ec02..eba53b1b7e9c 100644 --- a/pkgs/development/python-modules/ipycanvas/default.nix +++ b/pkgs/development/python-modules/ipycanvas/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "ipycanvas"; - version = "0.13.3"; + version = "0.14.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ToZ8UJsB9cTPwAn32SHjLloSoCmshW54wE/xW2VpLEo="; + hash = "sha256-kh8UgiWLWSm1mTF7XBKZMdgOFr41+jgwCjLnqkz+n4k="; }; # We relax dependencies here instead of pulling in a patch because upstream diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix index faaab1ce7e80..f395d6b61d2c 100644 --- a/pkgs/development/python-modules/langgraph-cli/default.nix +++ b/pkgs/development/python-modules/langgraph-cli/default.nix @@ -8,7 +8,10 @@ # dependencies click, + langgraph, + langgraph-runtime-inmem, langgraph-sdk, + python-dotenv, # testing pytest-asyncio, @@ -40,21 +43,20 @@ buildPythonPackage rec { langgraph-sdk ]; - # Not yet. Depemnds on `langgraph-runtime-inmem` which isn't in github yet - # https://github.com/langchain-ai/langgraph/issues/5802 - # optional-dependencies = { - # "inmem" = [ - # langgraph-api - # langgraph-runtime-inmem - # python-dotenv - # ] - # } + optional-dependencies = { + "inmem" = [ + langgraph + langgraph-runtime-inmem + python-dotenv + ]; + }; nativeCheckInputs = [ pytest-asyncio pytestCheckHook docker-compose - ]; + ] + ++ lib.flatten (builtins.attrValues optional-dependencies); enabledTestPaths = [ "tests/unit_tests" ]; diff --git a/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix b/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix new file mode 100644 index 000000000000..87d660138956 --- /dev/null +++ b/pkgs/development/python-modules/langgraph-runtime-inmem/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + hatchling, + blockbuster, + langgraph, + langgraph-checkpoint, + sse-starlette, + starlette, + structlog, +}: + +buildPythonPackage rec { + pname = "langgraph-runtime-inmem"; + version = "0.6.8"; + pyproject = true; + + # Not available in any repository + src = fetchPypi { + pname = "langgraph_runtime_inmem"; + inherit version; + hash = "sha256-chPmwJ+tUJoRK5xX9+r6mbYf95ZbX4Z3mP6Ra19nBxM="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + blockbuster + langgraph + langgraph-checkpoint + sse-starlette + starlette + structlog + ]; + + # Can remove after blockbuster version bump + # https://github.com/NixOS/nixpkgs/pull/431547 + pythonRelaxDeps = [ + "blockbuster" + ]; + + pythonImportsCheck = [ + "langgraph_runtime_inmem" + ]; + + # no tests + doCheck = false; + + meta = { + description = "Inmem implementation for the LangGraph API server"; + homepage = "https://pypi.org/project/langgraph-runtime-inmem/"; + # no changelog + license = lib.licenses.elastic20; + maintainers = with lib.maintainers; [ sarahec ]; + }; +} diff --git a/pkgs/development/python-modules/lib50/default.nix b/pkgs/development/python-modules/lib50/default.nix index 4dedfc40b05b..37a8b51eb111 100644 --- a/pkgs/development/python-modules/lib50/default.nix +++ b/pkgs/development/python-modules/lib50/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "lib50"; - version = "3.0.12"; + version = "3.1.1"; pyproject = true; # latest GitHub release is several years old. Pypi is up to date. src = fetchPypi { pname = "lib50"; inherit version; - hash = "sha256-Fc4Hb1AbSeetK3gH1/dRCUfHGDlMzfzgF1cnK3Se01U="; + hash = "sha256-DSAYgtce9lU9dlfLejdIH9K8jVeNaPl0wSqStMgwUD4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/logutils/default.nix b/pkgs/development/python-modules/logutils/default.nix index e3480e9fe5d3..71ba14b499a1 100644 --- a/pkgs/development/python-modules/logutils/default.nix +++ b/pkgs/development/python-modules/logutils/default.nix @@ -42,14 +42,17 @@ buildPythonPackage rec { "test_hashandlers" ]; - disabledTestPaths = - lib.optionals (stdenv.hostPlatform.isDarwin) [ - # Exception: unable to connect to Redis server - "tests/test_redis.py" - ] - ++ lib.optionals (pythonAtLeast "3.13") [ - "tests/test_dictconfig.py" - ]; + disabledTestPaths = [ + # Disable redis tests on all systems for now + "tests/test_redis.py" + ] + # lib.optionals (stdenv.hostPlatform.isDarwin) [ + # # Exception: unable to connect to Redis server + # "tests/test_redis.py" + # ] + ++ lib.optionals (pythonAtLeast "3.13") [ + "tests/test_dictconfig.py" + ]; pythonImportsCheck = [ "logutils" ]; diff --git a/pkgs/development/python-modules/mcp/default.nix b/pkgs/development/python-modules/mcp/default.nix index 82e3584482c8..97ab3ceefe0c 100644 --- a/pkgs/development/python-modules/mcp/default.nix +++ b/pkgs/development/python-modules/mcp/default.nix @@ -40,14 +40,14 @@ buildPythonPackage rec { pname = "mcp"; - version = "1.12.2"; + version = "1.12.4"; pyproject = true; src = fetchFromGitHub { owner = "modelcontextprotocol"; repo = "python-sdk"; tag = "v${version}"; - hash = "sha256-K3S+2Z4yuo8eAOo8gDhrI8OOfV6ADH4dAb1h8PqYntc="; + hash = "sha256-FHVhufv4O7vM/9fNHyDU4L15dNLFMmoVaYd98Iw6l2o="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mcpadapt/default.nix b/pkgs/development/python-modules/mcpadapt/default.nix index 83fc4979cd11..08c8832a6c76 100644 --- a/pkgs/development/python-modules/mcpadapt/default.nix +++ b/pkgs/development/python-modules/mcpadapt/default.nix @@ -12,18 +12,20 @@ pytestCheckHook, python-dotenv, smolagents, + soundfile, + torchaudio, }: buildPythonPackage rec { pname = "mcpadapt"; - version = "0.1.10"; + version = "0.1.12"; pyproject = true; src = fetchFromGitHub { owner = "grll"; repo = "mcpadapt"; tag = "v${version}"; - hash = "sha256-605e28p1rlJ5teCLxL/Lh8p5zV7cPuSzZWwfkE1gM5I="; + hash = "sha256-mU/zcNEHmPfSMEMgjj4u0iwmXBH2cJzGEANPxyiR1l0="; }; build-system = [ hatchling ]; @@ -35,12 +37,18 @@ buildPythonPackage rec { ]; optional-dependencies = { + audio = [ + torchaudio + soundfile + ]; + # crewai = [ crewai ]; langchain = [ langchain # langchain-anthropic langgraph ]; llamaindex = [ llama-index ]; + smolagents = [ smolagents ]; }; pythonImportsCheck = [ "mcpadapt" ]; diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index b92b558c588c..1ef0824e39b0 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -130,8 +130,8 @@ rec { "sha256-xrpy1Eq+Kleg0oYEQY/UDXvUUdZp9B6rz4OrXo/A9bA="; mypy-boto3-appstream = - buildMypyBoto3Package "appstream" "1.40.0" - "sha256-TuIQx9qeu+JL1+Y3Gp83J4am1IYua7Ps40mqN8YLln8="; + buildMypyBoto3Package "appstream" "1.40.4" + "sha256-AgYaQp4AQUly5DO83NgCojU7cKOP5LdStYr1X3lMAE0="; mypy-boto3-appsync = buildMypyBoto3Package "appsync" "1.40.0" @@ -178,8 +178,8 @@ rec { "sha256-YZKJblhTzoW0I/ozKw+RzELF9nJ0+3Z/zjZhb/lEd80="; mypy-boto3-budgets = - buildMypyBoto3Package "budgets" "1.40.0" - "sha256-nY9RvXgjyeNsiuVtM+2pWsc0kGuAggZNpkF7SXkHVwk="; + buildMypyBoto3Package "budgets" "1.40.4" + "sha256-6kCRDur13G+GTZK8R7gknc1J3L/E3YA4/xi+9qQhVp0="; mypy-boto3-ce = buildMypyBoto3Package "ce" "1.40.0" @@ -446,8 +446,8 @@ rec { "sha256-p+NFAi4x4J6S4v0f2u0awDG+lb2V7r3XwgYwl5CvhHo="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.40.0" - "sha256-iyPAkVpfnqz2RX12klUOTH2NaFO/tAfiWFXLF+FHGe0="; + buildMypyBoto3Package "ec2" "1.40.4" + "sha256-fotmSGj+r85lJZPKq4UOc3OvCdnX0pO+qSQVQozxGJw="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.40.0" @@ -974,8 +974,8 @@ rec { "sha256-DduRVsWhYZPX+mQAj1j1kA00rilUHKA4SnmehgS4hYU="; mypy-boto3-opensearchserverless = - buildMypyBoto3Package "opensearchserverless" "1.40.0" - "sha256-IKxLTdH0V590cXVZ1JNdp3Hg4sFEs2ZAiAir4eicpZ4="; + buildMypyBoto3Package "opensearchserverless" "1.40.4" + "sha256-nkt68bkNRfKMeO9TJV/P5PGzy8ps4CZpYcF2LmDUs2c="; mypy-boto3-opsworks = buildMypyBoto3Package "opsworks" "1.40.0" diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix index 41723897cc1c..53590690dbec 100644 --- a/pkgs/development/python-modules/orbax-checkpoint/default.nix +++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix @@ -36,14 +36,14 @@ buildPythonPackage rec { pname = "orbax-checkpoint"; - version = "0.11.20"; + version = "0.11.21"; pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "orbax"; tag = "v${version}"; - hash = "sha256-ZZTmWW0PZHk8Evhk6JnbAyl7RQOAxN4GwXUv5M6GfIQ="; + hash = "sha256-hb7Y/usg4JFRKsahKNV8rvjMGAN4xYEaaWsedGKcK+Y="; }; sourceRoot = "${src.name}/checkpoint"; diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index f674461d928c..5c2fab375a15 100644 --- a/pkgs/development/python-modules/pomegranate/default.nix +++ b/pkgs/development/python-modules/pomegranate/default.nix @@ -3,20 +3,15 @@ stdenv, buildPythonPackage, fetchFromGitHub, - - # build-system + fetchpatch, + pytestCheckHook, setuptools, - - # dependencies apricot-select, networkx, numpy, scikit-learn, scipy, torch, - - # tests - pytestCheckHook, }: buildPythonPackage rec { @@ -27,34 +22,10 @@ buildPythonPackage rec { src = fetchFromGitHub { repo = "pomegranate"; owner = "jmschrei"; - # tag = "v${version}"; - # No tag for 1.1.2 - rev = "e9162731f4f109b7b17ecffde768734cacdb839b"; - hash = "sha256-vVoAoZ+mph11ZfINT+yxRyk9rXv6FBDgxBz56P2K95Y="; + tag = "v${version}"; + hash = "sha256-p2Gn0FXnsAHvRUeAqx4M1KH0+XvDl3fmUZZ7MiMvPSs="; }; - # _pickle.UnpicklingError: Weights only load failed. - # https://pytorch.org/docs/stable/generated/torch.load.html - postPatch = '' - substituteInPlace \ - tests/distributions/test_bernoulli.py \ - tests/distributions/test_categorical.py \ - tests/distributions/test_exponential.py \ - tests/distributions/test_gamma.py \ - tests/distributions/test_independent_component.py \ - tests/distributions/test_normal_diagonal.py \ - tests/distributions/test_normal_full.py \ - tests/distributions/test_poisson.py \ - tests/distributions/test_student_t.py \ - tests/distributions/test_uniform.py \ - tests/test_bayes_classifier.py \ - tests/test_gmm.py \ - tests/test_kmeans.py \ - --replace-fail \ - 'torch.load(".pytest.torch")' \ - 'torch.load(".pytest.torch", weights_only=False)' - ''; - build-system = [ setuptools ]; dependencies = [ @@ -72,11 +43,20 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTestPaths = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + patches = [ + # Fix tests for pytorch 2.6 + (fetchpatch { + name = "python-2.6.patch"; + url = "https://github.com/jmschrei/pomegranate/pull/1142/commits/9ff5d5e2c959b44e569937e777b26184d1752a7b.patch"; + hash = "sha256-BXsVhkuL27QqK/n6Fa9oJCzrzNcL3EF6FblBeKXXSts="; + }) + ]; + + pytestFlagsArray = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # AssertionError: Arrays are not almost equal to 6 decimals - "=tests/distributions/test_normal_full.py::test_fit" - "=tests/distributions/test_normal_full.py::test_from_summaries" - "=tests/distributions/test_normal_full.py::test_serialization" + "--deselect=tests/distributions/test_normal_full.py::test_fit" + "--deselect=tests/distributions/test_normal_full.py::test_from_summaries" + "--deselect=tests/distributions/test_normal_full.py::test_serialization" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/presto-python-client/default.nix b/pkgs/development/python-modules/presto-python-client/default.nix index 1a02b277f178..d9541c08954b 100644 --- a/pkgs/development/python-modules/presto-python-client/default.nix +++ b/pkgs/development/python-modules/presto-python-client/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, click, - future, httpretty, pytestCheckHook, requests, @@ -28,7 +27,6 @@ buildPythonPackage rec { dependencies = [ click - future requests requests-kerberos six diff --git a/pkgs/development/python-modules/py-ocsf-models/default.nix b/pkgs/development/python-modules/py-ocsf-models/default.nix index 326906f3ab5e..51b9e629b86f 100644 --- a/pkgs/development/python-modules/py-ocsf-models/default.nix +++ b/pkgs/development/python-modules/py-ocsf-models/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "py-ocsf-models"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "prowler-cloud"; repo = "py-ocsf-models"; tag = version; - hash = "sha256-9aKZtSolUARl70QdavQ6mkW7jk3OlOAIoy/8I6o1+0M="; + hash = "sha256-6mVu508FyLUUqKTKSFHXnsna/KDMh3RXVQ051sqozQs="; }; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/py-scrypt/default.nix b/pkgs/development/python-modules/py-scrypt/default.nix deleted file mode 100644 index bf2bf239145a..000000000000 --- a/pkgs/development/python-modules/py-scrypt/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - openssl, -}: - -buildPythonPackage rec { - pname = "py-scrypt"; - version = "0.8.27"; - format = "setuptools"; - - src = fetchPypi { - pname = "scrypt"; - inherit version; - hash = "sha256-p7Y3hI7VGMHqKzGp7Kqj9JYWWY2EQt6HBs8fAfur8Kc="; - }; - - buildInputs = [ openssl ]; - doCheck = false; - - meta = with lib; { - description = "Bindings for scrypt key derivation function library"; - homepage = "https://pypi.python.org/pypi/scrypt"; - maintainers = [ ]; - license = licenses.bsd2; - }; -} diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix index 3213913fe641..236d7c69e553 100644 --- a/pkgs/development/python-modules/pylance/default.nix +++ b/pkgs/development/python-modules/pylance/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "pylance"; - version = "0.32.0"; + version = "0.32.1"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lance"; tag = "v${version}"; - hash = "sha256-hVWyZv978hDjAOdk4S9S9RJOkxqhOL0ZBpi4wGk0h1c="; + hash = "sha256-P40m8ak0A2l4zGAYcbvXGidQpIT3+ayERbleWcVuLbE="; }; sourceRoot = "${src.name}/python"; @@ -51,7 +51,7 @@ buildPythonPackage rec { src sourceRoot ; - hash = "sha256-ZUNAZsOpLdpdsKhIp/6QD3Ys7MOeO6H3ve8au7g+riU="; + hash = "sha256-rCaLREl2LSfpu0vwa1Vx2rQ7phWsGz58RTjo6yfHKLU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyobjc-core/default.nix b/pkgs/development/python-modules/pyobjc-core/default.nix index 4f5c0f3a1e13..968a60515fc4 100644 --- a/pkgs/development/python-modules/pyobjc-core/default.nix +++ b/pkgs/development/python-modules/pyobjc-core/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyobjc-core"; - version = "11.0"; + version = "11.1"; pyproject = true; src = fetchFromGitHub { owner = "ronaldoussoren"; repo = "pyobjc"; tag = "v${version}"; - hash = "sha256-RhB0Ht6vyDxYwDGS+A9HZL9ySIjWlhdB4S+gHxvQQBg="; + hash = "sha256-2qPGJ/1hXf3k8AqVLr02fVIM9ziVG9NMrm3hN1de1Us="; }; sourceRoot = "${src.name}/pyobjc-core"; @@ -31,18 +31,6 @@ buildPythonPackage rec { darwin.DarwinTools # sw_vers ]; - # See https://github.com/ronaldoussoren/pyobjc/pull/641. Unfortunately, we - # cannot just pull that diff with fetchpatch due to https://discourse.nixos.org/t/how-to-apply-patches-with-sourceroot/59727. - postPatch = '' - for file in Modules/objc/test/*.m; do - substituteInPlace "$file" --replace "[[clang::suppress]]" "" - done - - substituteInPlace setup.py \ - --replace-fail "-buildversion" "-buildVersion" \ - --replace-fail "-productversion" "-productVersion" - ''; - env.NIX_CFLAGS_COMPILE = toString [ "-I${darwin.libffi.dev}/include" "-Wno-error=cast-function-type-mismatch" diff --git a/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix b/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix index e6904460f4d1..a395f1069420 100644 --- a/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix +++ b/pkgs/development/python-modules/pyobjc-framework-Cocoa/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyobjc-framework-Cocoa"; - version = "11.0"; + version = "11.1"; pyproject = true; src = fetchFromGitHub { owner = "ronaldoussoren"; repo = "pyobjc"; tag = "v${version}"; - hash = "sha256-RhB0Ht6vyDxYwDGS+A9HZL9ySIjWlhdB4S+gHxvQQBg="; + hash = "sha256-2qPGJ/1hXf3k8AqVLr02fVIM9ziVG9NMrm3hN1de1Us="; }; sourceRoot = "${src.name}/pyobjc-framework-Cocoa"; @@ -25,7 +25,6 @@ buildPythonPackage rec { buildInputs = [ darwin.libffi - darwin.DarwinTools ]; nativeBuildInputs = [ @@ -37,7 +36,9 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyobjc_setup.py \ --replace-fail "-buildversion" "-buildVersion" \ - --replace-fail "-productversion" "-productVersion" + --replace-fail "-productversion" "-productVersion" \ + --replace-fail "/usr/bin/sw_vers" "sw_vers" \ + --replace-fail "/usr/bin/xcrun" "xcrun" ''; dependencies = [ pyobjc-core ]; @@ -47,7 +48,13 @@ buildPythonPackage rec { "-Wno-error=unused-command-line-argument" ]; - pythonImportsCheck = [ "Cocoa" ]; + pythonImportsCheck = [ + "Cocoa" + "CoreFoundation" + "Foundation" + "AppKit" + "PyObjCTools" + ]; meta = with lib; { description = "PyObjC wrappers for the Cocoa frameworks on macOS"; diff --git a/pkgs/development/python-modules/pysoma/default.nix b/pkgs/development/python-modules/pysoma/default.nix index c27991b8ca09..e568b82024b0 100644 --- a/pkgs/development/python-modules/pysoma/default.nix +++ b/pkgs/development/python-modules/pysoma/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pysoma"; - version = "0.0.13"; + version = "0.0.14"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1bS9zafuqxwcuqpM/AA3ZjNbFpxBNXtoHYFsQOWmLXQ="; + hash = "sha256-DlyOQmhseCIeaYlzTmkQBSlDjJlPZn7FRExil5gQjdY="; }; # Project has no test diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index 459edd42b611..8b36477d2342 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "qcengine"; - version = "0.32.0"; + version = "0.33.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-HvvWak7a2djF6wDJaHsBltaG1dTGbKH7wjsngO+fh2U="; + hash = "sha256-Ute8puO2qc679ttZgzQRnVO8OuBmYnqLT3y7faHpRgA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix index eb702067ae81..1adb4250c10f 100644 --- a/pkgs/development/python-modules/qdrant-client/default.nix +++ b/pkgs/development/python-modules/qdrant-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qdrant-client"; - version = "1.14.3"; + version = "1.15.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = "qdrant-client"; tag = "v${version}"; - hash = "sha256-OcSR8iYwX1az5BFVNp6xHpVE//Nyk4Nk97SaxAMJQRI="; + hash = "sha256-tZu6NeoStPwZ1f+AlVws8iS3UwpKikxE6Es7WKlFQfw="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/readabilipy/default.nix b/pkgs/development/python-modules/readabilipy/default.nix index e220f5caff29..65bca92865c5 100644 --- a/pkgs/development/python-modules/readabilipy/default.nix +++ b/pkgs/development/python-modules/readabilipy/default.nix @@ -44,9 +44,9 @@ buildPythonPackage rec { dontNpmBuild = true; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ beautifulsoup4 html5lib lxml @@ -75,6 +75,18 @@ buildPythonPackage rec { "tests/test_benchmarking.py" ]; + disabledTests = [ + # IndexError: list index out of range + "test_html_blacklist" + "test_prune_div_with_one_empty_span" + "test_prune_div_with_one_whitespace_paragraph" + "test_empty_page" + "test_contentless_page" + "test_extract_title" + "test_iframe_containing_tags" + "test_iframe_with_source" + ]; + passthru = { tests.version = testers.testVersion { package = readabilipy; @@ -85,10 +97,10 @@ buildPythonPackage rec { meta = with lib; { description = "HTML content extractor"; - mainProgram = "readabilipy"; homepage = "https://github.com/alan-turing-institute/ReadabiliPy"; changelog = "https://github.com/alan-turing-institute/ReadabiliPy/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "readabilipy"; }; } diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 1e1adb006e79..0680cd1e6b16 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.14.5"; + version = "0.14.6"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; tag = version; - hash = "sha256-i1/1Z8JngoGQ/VwjMAHJ7RJhS3dfpXApE1DdfTfIz8E="; + hash = "sha256-7RCE1E1pWUdb7hW9N7nX9+e5dXX49nn+rTnkoS+ghJE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sabctools/default.nix b/pkgs/development/python-modules/sabctools/default.nix index 4f07633db51f..821a6c29438b 100644 --- a/pkgs/development/python-modules/sabctools/default.nix +++ b/pkgs/development/python-modules/sabctools/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { pname = "sabctools"; - version = "8.2.5"; + version = "8.2.6"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ZEC813/JpGPEFL+nXKFAXFfUrrhECCIqONe27LwS00g="; + hash = "sha256-olZSIjfP2E1tkCG8WzEZfrBJuDEp3PZyFFE5LJODEZE="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/scalar-fastapi/default.nix b/pkgs/development/python-modules/scalar-fastapi/default.nix index 29f0037601d2..51bc7aac30ba 100644 --- a/pkgs/development/python-modules/scalar-fastapi/default.nix +++ b/pkgs/development/python-modules/scalar-fastapi/default.nix @@ -23,13 +23,13 @@ buildPythonPackage rec { pname = "scalar-fastapi"; - version = "1.2.2"; + version = "1.2.3"; pyproject = true; src = fetchPypi { pname = "scalar_fastapi"; inherit version; - hash = "sha256-r5GoX6f7Ru078WcRvGNyhyYDxL1w4yjbfHvlf+ZF/sc="; + hash = "sha256-z5ujaUfqGwQC/B+jEfMKaQs547rt7x97RVPPVwAtrOs="; }; build-system = [ diff --git a/pkgs/development/python-modules/scrypt/default.nix b/pkgs/development/python-modules/scrypt/default.nix index df3ad53ff9cb..d85aaa43cb71 100644 --- a/pkgs/development/python-modules/scrypt/default.nix +++ b/pkgs/development/python-modules/scrypt/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "scrypt"; - version = "0.8.27"; + version = "0.9.4"; pyproject = true; src = fetchFromGitHub { owner = "holgern"; repo = "py-scrypt"; tag = "v${version}"; - hash = "sha256-r5tXRq4VFieqw3Plx6W5imDIeGIldW1BREdm6/Kav3M="; + hash = "sha256-4jVXaPD57RMe4ef1PVgZwPGAhEHL3RGlu2DSC6lGuR4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix index 4a79c6daf465..4872c23b0d31 100644 --- a/pkgs/development/python-modules/sentence-transformers/default.nix +++ b/pkgs/development/python-modules/sentence-transformers/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "sentence-transformers"; - version = "5.0.0"; + version = "5.1.0"; pyproject = true; src = fetchFromGitHub { owner = "UKPLab"; repo = "sentence-transformers"; tag = "v${version}"; - hash = "sha256-7HdeNyB3hMJEwHenN2hUEGG2MdQ++nF3nyAYJv7jhyA="; + hash = "sha256-snowpTdHelcFjo1+hvqpoVt5ROB0f91yt0GsIvA5cso="; }; build-system = [ setuptools ]; @@ -122,6 +122,7 @@ buildPythonPackage rec { "tests/test_pretrained_stsb.py" "tests/test_sentence_transformer.py" "tests/test_train_stsb.py" + "tests/util/test_hard_negatives.py" ]; # Sentence-transformer needs a writable hf_home cache diff --git a/pkgs/development/python-modules/smp/default.nix b/pkgs/development/python-modules/smp/default.nix index 8f4ec2f8fe41..37eb2452d93f 100644 --- a/pkgs/development/python-modules/smp/default.nix +++ b/pkgs/development/python-modules/smp/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "smp"; - version = "3.3.1"; + version = "3.3.2"; pyproject = true; src = fetchFromGitHub { owner = "JPHutchins"; repo = "smp"; tag = version; - hash = "sha256-TjucQm07nbfuFrVOHGOVA/f1rQRQfU8ws8VVC+U/kp8="; + hash = "sha256-klMFJOKGSy6s16M+9wQhSvLSWdNPO/IMNdY5RW+wyFc="; }; build-system = [ @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = { description = "Simple Management Protocol (SMP) for remotely managing MCU firmware"; homepage = "https://github.com/JPHutchins/smp"; - changelog = "https://github.com/JPHutchins/smp/releases/tag/${version}"; + changelog = "https://github.com/JPHutchins/smp/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ otavio ]; }; diff --git a/pkgs/development/python-modules/smpclient/default.nix b/pkgs/development/python-modules/smpclient/default.nix index a9a7210b8b7c..2e339d7e3f33 100644 --- a/pkgs/development/python-modules/smpclient/default.nix +++ b/pkgs/development/python-modules/smpclient/default.nix @@ -1,31 +1,35 @@ { lib, - buildPythonPackage, - fetchFromGitHub, - poetry-core, async-timeout, bleak, + buildPythonPackage, + fetchFromGitHub, intelhex, + poetry-core, + poetry-dynamic-versioning, pyserial, - smp, pytest-asyncio, pytestCheckHook, + smp, }: buildPythonPackage rec { pname = "smpclient"; - version = "4.5.0"; + version = "5.0.0"; pyproject = true; src = fetchFromGitHub { owner = "intercreate"; repo = "smpclient"; tag = version; - hash = "sha256-Z0glcCy3JsL45iT8Q82Vtxozi3hv6xaRJvJ3BkHX4PQ="; + hash = "sha256-NQRVEvi/B+KdhPIzw8pm22uXpYPkoaatkCNFnEcibzo="; }; + pythonRelaxDeps = [ "smp" ]; + build-system = [ poetry-core + poetry-dynamic-versioning ]; dependencies = [ @@ -41,13 +45,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonRelaxDeps = [ - "smp" - ]; - - pythonImportsCheck = [ - "smpclient" - ]; + pythonImportsCheck = [ "smpclient" ]; meta = { description = "Simple Management Protocol (SMP) Client for remotely managing MCU firmware"; diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index bc547c7101ce..83b0d6422235 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -7,9 +7,7 @@ ifaddr, lxml, mock, - nix-update-script, pytestCheckHook, - pythonOlder, requests, requests-mock, setuptools, @@ -18,16 +16,14 @@ buildPythonPackage rec { pname = "soco"; - version = "0.30.10"; + version = "0.30.11"; pyproject = true; - disabled = pythonOlder "3.6"; - src = fetchFromGitHub { owner = "SoCo"; repo = "SoCo"; tag = "v${version}"; - hash = "sha256-BTDKn6JVqXfLiry6jES/OnsO3SGniEMWW2osf9veukU="; + hash = "sha256-x5WKG2KFBr0FQu28160qHB2ckKdpx0cKhgYTH6sLnuw="; }; build-system = [ setuptools ]; @@ -49,12 +45,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "soco" ]; - passthru.updateScript = nix-update-script { }; - meta = with lib; { description = "CLI and library to control Sonos speakers"; homepage = "http://python-soco.com/"; - changelog = "https://github.com/SoCo/SoCo/releases/tag/v${version}"; + changelog = "https://github.com/SoCo/SoCo/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ lovesegfault ]; }; diff --git a/pkgs/development/python-modules/speak2mary/default.nix b/pkgs/development/python-modules/speak2mary/default.nix new file mode 100644 index 000000000000..cb5bd25a4ffc --- /dev/null +++ b/pkgs/development/python-modules/speak2mary/default.nix @@ -0,0 +1,31 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, +}: + +buildPythonPackage rec { + pname = "speak2mary"; + version = "1.5.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-5W2E/leT/IiXFVXD+LSPE99zGlz+yKm5XCv830rt8O0="; + }; + + build-system = [ setuptools ]; + + # Tests require a running MaryTTS server + doCheck = false; + + pythonImportsCheck = [ "speak2mary" ]; + + meta = { + description = "Python wrapper for a running MaryTTS server"; + homepage = "https://github.com/Poeschl/speak2mary"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +} diff --git a/pkgs/development/python-modules/torch/bin/binary-hashes.nix b/pkgs/development/python-modules/torch/bin/binary-hashes.nix index 3a7d0926ba26..8001f6822c03 100644 --- a/pkgs/development/python-modules/torch/bin/binary-hashes.nix +++ b/pkgs/development/python-modules/torch/bin/binary-hashes.nix @@ -7,81 +7,81 @@ version: builtins.getAttr version { - "2.7.1" = { + "2.8.0" = { x86_64-linux-39 = { - name = "torch-2.7.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torch-2.7.1%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl"; - hash = "sha256-c4rJs6155iohJW49JQzuhY3pVfk/ifqxFNqNGRk0fQY="; + name = "torch-2.8.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torch-2.8.0%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl"; + hash = "sha256-uTV6h1laPXsqVlumArlzkqN8VvC4VpjwzPCixY++9ew="; }; x86_64-linux-310 = { - name = "torch-2.7.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torch-2.7.1%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; - hash = "sha256-1sPLoZjck/k0IqhUX0imaXiQNm5LlwH1Q1H8J+IwS9M="; + name = "torch-2.8.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torch-2.8.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; + hash = "sha256-DJaZnRXPHxPdfJE+CyGpo1VTjmz8EIYaFxWDICkvWVQ="; }; x86_64-linux-311 = { - name = "torch-2.7.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torch-2.7.1%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; - hash = "sha256-wwHcKARYr9lUUK95SSTJj+B1It0Uj/OEc5uBDj4xefI="; + name = "torch-2.8.0-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torch-2.8.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; + hash = "sha256-A5udzda9uqEKilzWviLEyz41iaNB5fkEy7Vxyij1W+0="; }; x86_64-linux-312 = { - name = "torch-2.7.1-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torch-2.7.1%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; - hash = "sha256-C2T30KbypzntBSupWfe2fGdwKMlWbOUZl/n5D+Vz3ao="; + name = "torch-2.8.0-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torch-2.8.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; + hash = "sha256-Q1T8Bbt5sgjWmVoEyhzu9qlUexxDNENVdDU9OBxVCHw="; }; x86_64-linux-313 = { - name = "torch-2.7.1-cp313-cp313-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torch-2.7.1%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; - hash = "sha256-lWBCX56hrxeRUH6Mpw1bns9i/tfKImqV/NWNDrLMp48="; + name = "torch-2.8.0-cp313-cp313-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torch-2.8.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; + hash = "sha256-OoUjaaON7DQ9RezQvDZg95uIoj4Mh40YcH98E79JU48="; }; aarch64-darwin-39 = { - name = "torch-2.7.1-cp39-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.1-cp39-none-macosx_11_0_arm64.whl"; - hash = "sha256-NRvpBdG6aT8xe+YDRB5O2VgO2ajX7hez2uYPov9Jv/c="; + name = "torch-2.8.0-cp39-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.8.0-cp39-none-macosx_11_0_arm64.whl"; + hash = "sha256-a+wfJAlodJ4ju7fqj2YXoI/D2xtMdmtczq34ootBl9k="; }; aarch64-darwin-310 = { - name = "torch-2.7.1-cp310-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.1-cp310-none-macosx_11_0_arm64.whl"; - hash = "sha256-+MO+4mGwyOCQ9jR0kNxu4q6/1mHrDz9q6uBtmS2O1W8="; + name = "torch-2.8.0-cp310-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.8.0-cp310-none-macosx_11_0_arm64.whl"; + hash = "sha256-pGe0n+iTpqbM6J467lVu39xkpyLXGV/f3XXOyd6hN3k="; }; aarch64-darwin-311 = { - name = "torch-2.7.1-cp311-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.1-cp311-none-macosx_11_0_arm64.whl"; - hash = "sha256-aKNSx/Q1q7XLR+LAMtzRASdyriustvyLg7DBsRh0qzo="; + name = "torch-2.8.0-cp311-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.8.0-cp311-none-macosx_11_0_arm64.whl"; + hash = "sha256-PQUBfRm8mXQSiORYiIKDpEsO6IHVPwX3L4sc/qiZgSI="; }; aarch64-darwin-312 = { - name = "torch-2.7.1-cp312-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.1-cp312-none-macosx_11_0_arm64.whl"; - hash = "sha256-e0+LK4O9CPfTmQJamnsyO9u1PSBWbx4NWEaJu5LYL5o="; + name = "torch-2.8.0-cp312-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.8.0-cp312-none-macosx_11_0_arm64.whl"; + hash = "sha256-pHt5hr7j9hrSF9ioziRgWAmrQluvNJ+X3nWIFe3S71Q="; }; aarch64-darwin-313 = { - name = "torch-2.7.1-cp313-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.1-cp313-none-macosx_11_0_arm64.whl"; - hash = "sha256-fs2GighkaOG890uR20JcHClRqc/NBZLExzN3t+Qkha4="; + name = "torch-2.8.0-cp313-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.8.0-cp313-none-macosx_11_0_arm64.whl"; + hash = "sha256-BX79MKZ3jS7l4jdM1jpj9jMRqm8zMh5ifGVd9gq905A="; }; aarch64-linux-39 = { - name = "torch-2.7.1-cp39-cp39-manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.1%2Bcpu-cp39-cp39-manylinux_2_28_aarch64.whl"; - hash = "sha256-pFUcuXuD31+T/A11ODMlNYKFgeHbLxea/ChwJ6+91ug="; + name = "torch-2.8.0-cp39-cp39-manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.8.0%2Bcpu-cp39-cp39-manylinux_2_28_aarch64.whl"; + hash = "sha256-6si371x8oQba7F6CnfqMpWykdgHbE7QC0mCIYa06uSY="; }; aarch64-linux-310 = { - name = "torch-2.7.1-cp310-cp310-manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.1%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl"; - hash = "sha256-wN8Xzul2U9CaToRIijPSEhf5skIIWDxVzyjwBFqrB2Y="; + name = "torch-2.8.0-cp310-cp310-manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.8.0%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl"; + hash = "sha256-shSYWLg0Cu6x8wVuC/9bgrluQ7WW/kmp26MYRSImEhM="; }; aarch64-linux-311 = { - name = "torch-2.7.1-cp311-cp311-manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.1%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl"; - hash = "sha256-X+YEW49Ca/LQQm5P4AnxZnqVTsKuuC8b0L9gxteoVEU="; + name = "torch-2.8.0-cp311-cp311-manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.8.0%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl"; + hash = "sha256-aAEp797uw9tdo/iO5dKMGx4QO3dK70D51jjizOj42Ng="; }; aarch64-linux-312 = { - name = "torch-2.7.1-cp312-cp312-manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.1%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl"; - hash = "sha256-O/LbWt93tDOETwgIh63gScRwXd+f4aMgI/+E/3Napa0="; + name = "torch-2.8.0-cp312-cp312-manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.8.0%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl"; + hash = "sha256-YQ9gDBAjhuWBMn1e/BjA1u3suYILQUDSYWM1SpnNgA0="; }; aarch64-linux-313 = { - name = "torch-2.7.1-cp313-cp313-manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.1%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl"; - hash = "sha256-6xdkZ5KsQ3T/yH5CNp9F0h7/F8eQholjuQSD7wtttO8="; + name = "torch-2.8.0-cp313-cp313-manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.8.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl"; + hash = "sha256-pQZLXiN3LI0WQGjMfBLgGnX697lI7NlaDUAH10h+XyU="; }; }; } diff --git a/pkgs/development/python-modules/torch/bin/default.nix b/pkgs/development/python-modules/torch/bin/default.nix index 315094905b60..eb03276cf909 100644 --- a/pkgs/development/python-modules/torch/bin/default.nix +++ b/pkgs/development/python-modules/torch/bin/default.nix @@ -34,7 +34,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "2.7.1"; + version = "2.8.0"; in buildPythonPackage { inherit version; diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index 67ca7358dfbb..5334f94ffd81 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "torchaudio"; - version = "2.7.1"; + version = "2.8.0"; format = "wheel"; src = diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix index da82062146cb..f0bb5feaa82b 100644 --- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix +++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -7,81 +7,81 @@ version: builtins.getAttr version { - "2.7.1" = { + "2.8.0" = { x86_64-linux-39 = { - name = "torchaudio-2.7.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.1%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl"; - hash = "sha256-DBRNX/tO7IbHn/ETar2RvT+DfzBCcTeV4QdYrtxC3Og="; + name = "torchaudio-2.8.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchaudio-2.8.0%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl"; + hash = "sha256-2QZsae7B8pPC/wqAW/UEc3OQzL9rd8jmfa+DTbhv2kU="; }; x86_64-linux-310 = { - name = "torchaudio-2.7.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.1%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; - hash = "sha256-K6CBbu5lnjQ4UanF3GDI4euBmjlpspJo+rJ9MUMnPXg="; + name = "torchaudio-2.8.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchaudio-2.8.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; + hash = "sha256-oBYelShaC3Ft4hD+4DkhUdYB59o8yGWVAI2Car/0iow="; }; x86_64-linux-311 = { - name = "torchaudio-2.7.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.1%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; - hash = "sha256-hOxyfx/a/fhd0cAYptO/q+tWZbEOC18nOmdetzD1nOU="; + name = "torchaudio-2.8.0-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchaudio-2.8.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; + hash = "sha256-9ECd9WfQcjp6OonTLHVSoX4P9vE36iag0mjGZSWbKZU="; }; x86_64-linux-312 = { - name = "torchaudio-2.7.1-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.1%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; - hash = "sha256-DB1Af5NNRPh5NbE5mR2IcvgfiPimvpt70lkYv3ROK+Y="; + name = "torchaudio-2.8.0-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchaudio-2.8.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; + hash = "sha256-FFuKDCHPyqFwXGcXPF1DkIfg4SDV2pvDRHRvk3kB0kM="; }; x86_64-linux-313 = { - name = "torchaudio-2.7.1-cp313-cp313-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.1%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; - hash = "sha256-fpfqil1eVhCNHAcUFmE7xhoONTHC5rpqm2RiMtbkEIg="; + name = "torchaudio-2.8.0-cp313-cp313-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchaudio-2.8.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; + hash = "sha256-QQu46kYiXv5ljl0no4AsGBoiVZEwA2IaXSWlGsqAGNk="; }; aarch64-darwin-39 = { - name = "torchaudio-2.7.1-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-oHEA/iz3r0+mnYywRqK3QEZhJiGhpUivpa8caeAur4E="; + name = "torchaudio-2.8.0-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-UiKJ4s1X55QB/VzK6bG8D/LkfzUpCSrfWs9XQn6gxqk="; }; aarch64-darwin-310 = { - name = "torchaudio-2.7.1-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-RzmvV9DrlDR9HGobVmi+eKc4Ov6Cbd4YoEiDufnyY7E="; + name = "torchaudio-2.8.0-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-wvRM8nn2c8/N2PV2w0nu6L7fjKqzUaXdeLMpcMw0ohI="; }; aarch64-darwin-311 = { - name = "torchaudio-2.7.1-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-1aYviMYpA1kT9QbfA/cQxI/Iu5Y3GRkz8nxnCI1coTY="; + name = "torchaudio-2.8.0-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-ySdoV9JBxt4levdlwPUfwBGvOMtyVAFJUSGygJEwB88="; }; aarch64-darwin-312 = { - name = "torchaudio-2.7.1-cp312-cp312-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp312-cp312-macosx_11_0_arm64.whl"; - hash = "sha256-kwbc/EWGzr12R6k/6aRI55HE+Dk02mFrlDO3VZeh+Xg="; + name = "torchaudio-2.8.0-cp312-cp312-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp312-cp312-macosx_11_0_arm64.whl"; + hash = "sha256-3e+UvxgeZEfLsF84vqyo9sW7jSud3O0ao0UgJbn8cNM="; }; aarch64-darwin-313 = { - name = "torchaudio-2.7.1-cp313-cp313-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp313-cp313-macosx_11_0_arm64.whl"; - hash = "sha256-5fBZmlB/RoNUaHjtlmfhsy18o8ipV+TBXGswI3jvTe4="; + name = "torchaudio-2.8.0-cp313-cp313-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp313-cp313-macosx_11_0_arm64.whl"; + hash = "sha256-+FHTLpTKBeRw8MYOJXJuweDrccsspaAga3/QMnLMw8g="; }; aarch64-linux-39 = { - name = "torchaudio-2.7.1-cp39-cp39-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp39-cp39-manylinux_2_28_aarch64.whl"; - hash = "sha256-6LLaEaf3eCsAuCPJnoEusA7os0Va1HT4/UKg2gvE9Go="; + name = "torchaudio-2.8.0-cp39-cp39-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp39-cp39-manylinux_2_28_aarch64.whl"; + hash = "sha256-739/+oKLjYul06VpuCX8BGlojh6JYr9ld9U4vYrxOH0="; }; aarch64-linux-310 = { - name = "torchaudio-2.7.1-cp310-cp310-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp310-cp310-manylinux_2_28_aarch64.whl"; - hash = "sha256-wInb/BTF9HCRt78/a/K7rJO4ZhkpnQTZwQL0rVN1iZA="; + name = "torchaudio-2.8.0-cp310-cp310-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp310-cp310-manylinux_2_28_aarch64.whl"; + hash = "sha256-08G4WyagmDLROfbW2mtmyutR0uFuCPhYdmXESp4aqPk="; }; aarch64-linux-311 = { - name = "torchaudio-2.7.1-cp311-cp311-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp311-cp311-manylinux_2_28_aarch64.whl"; - hash = "sha256-U7xLoS50aL40p8ou6DfuXIvVdVslwS9mWvkznK434mU="; + name = "torchaudio-2.8.0-cp311-cp311-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp311-cp311-manylinux_2_28_aarch64.whl"; + hash = "sha256-RXPGBClQwgJ442CKmjgFC6C8cuAEnhu/0knK+FmoAps="; }; aarch64-linux-312 = { - name = "torchaudio-2.7.1-cp312-cp312-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp312-cp312-manylinux_2_28_aarch64.whl"; - hash = "sha256-1mvXayJv3UE1yXZQ4bfrY/t2WbTtDjp3iJjkHbuiG2E="; + name = "torchaudio-2.8.0-cp312-cp312-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp312-cp312-manylinux_2_28_aarch64.whl"; + hash = "sha256-hi4uQL8J2GXl3wgKhMGjm7zvQOQxQPSxc36zo4nTs48="; }; aarch64-linux-313 = { - name = "torchaudio-2.7.1-cp313-cp313-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp313-cp313-manylinux_2_28_aarch64.whl"; - hash = "sha256-Jx9xeETlx/ngXIMo3oF7+Q9G2DKBx5HpT1TU7eovWBc="; + name = "torchaudio-2.8.0-cp313-cp313-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp313-cp313-manylinux_2_28_aarch64.whl"; + hash = "sha256-CVNam3J8B5PNB8Gs6Z8/NTYmKBvMPjDC8jFOPrydP5Y="; }; }; } diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix index ddc59e0bc060..08c8964a51f8 100644 --- a/pkgs/development/python-modules/torchmetrics/default.nix +++ b/pkgs/development/python-modules/torchmetrics/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "torchmetrics"; - version = "1.8.0"; + version = "1.8.1"; pyproject = true; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "torchmetrics"; tag = "v${version}"; - hash = "sha256-zoKULi12vIKMzPRE6I4Rtq4dVQL/GfNFjHR+BId1ADg="; + hash = "sha256-Qisp5RTfcKr6W9K6FDFUHMqICSpVshsrZWwpDEgTTQM="; }; dependencies = [ diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index 1e2d08b4b36c..8626ead3ac02 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -23,7 +23,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.22.1"; + version = "0.23.0"; in buildPythonPackage { inherit version; diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix index 6457b1621cd8..545ff5bac535 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -7,81 +7,81 @@ version: builtins.getAttr version { - "0.22.1" = { + "0.23.0" = { x86_64-linux-39 = { - name = "torchvision-0.22.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.1%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl"; - hash = "sha256-UfJbwdKLA32YoUFckXRBcmJE2KAJcZB+bfsA7MwxNl8="; + name = "torchvision-0.23.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchvision-0.23.0%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl"; + hash = "sha256-eE/JDLlw5aKbJLZEHkYfW/YWhGMFuXk/o4cKnyltTA4="; }; x86_64-linux-310 = { - name = "torchvision-0.22.1-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.1%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; - hash = "sha256-U49NtmcobZObTu4KZtMe0htRGGZoAGsOD/4gM47MfgA="; + name = "torchvision-0.23.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchvision-0.23.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; + hash = "sha256-RgvI1w9jvbQzpzUd7MLBrhkD9/N45KdhT8joyXpcNqo="; }; x86_64-linux-311 = { - name = "torchvision-0.22.1-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.1%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; - hash = "sha256-klaKxGsTqMiLYViYALG5xGKb4JHqfOCA/G/GIuEeCRU="; + name = "torchvision-0.23.0-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchvision-0.23.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; + hash = "sha256-k/G19WsgzWhpvKQJQ95P08qczFbhtX9HxnHeHNqznNs="; }; x86_64-linux-312 = { - name = "torchvision-0.22.1-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.1%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; - hash = "sha256-9k75u5HXGrNdg4SRKhn3QZ41koaFvGdUTVj0UUgzQ3M="; + name = "torchvision-0.23.0-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchvision-0.23.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; + hash = "sha256-nLPBOZevy0QFfKENlDxsTLowaK/eDzcJZavOnIn8/6k="; }; x86_64-linux-313 = { - name = "torchvision-0.22.1-cp313-cp313-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.1%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; - hash = "sha256-vE/vGTkXtR22tAms0//eyShth3uqwK7l3Pu3JZLQC/w="; + name = "torchvision-0.23.0-cp313-cp313-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchvision-0.23.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; + hash = "sha256-xjmC8Zc7pnezfmZj3w4Hy1OBRZtvBXLCypXuvY3+t0I="; }; aarch64-darwin-39 = { - name = "torchvision-0.22.1-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-i+lBtNNcCrqBm+cP27vtjOtgQBzmmWuM+quhMAzmImM="; + name = "torchvision-0.23.0-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-sZDbIF+QIGwjD8L5HL39VzMzS6vA4NGb3bkKQLjPJsI="; }; aarch64-darwin-310 = { - name = "torchvision-0.22.1-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-O0fYNp7laMBneVwNoLQHjzmp3+pvO8HzrIdTDf2h3VY="; + name = "torchvision-0.23.0-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-cmaHHaygCtRtHAc+VdlyF50SpY+lya3smj25u+1xKEo="; }; aarch64-darwin-311 = { - name = "torchvision-0.22.1-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-St32JuK1f8Iv1tMpzxNG1HRJdnLmr4ODt7W2NvupSlM="; + name = "torchvision-0.23.0-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-Saog4h8MK9RYxx17RJd2y9XxZpPdWAcZWoIGEriiKbc="; }; aarch64-darwin-312 = { - name = "torchvision-0.22.1-cp312-cp312-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp312-cp312-macosx_11_0_arm64.whl"; - hash = "sha256-FT8XkOUFvW2hI+Ie7m6D4uFV3wXA/n1WNHMDBn2FQ8U="; + name = "torchvision-0.23.0-cp312-cp312-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp312-cp312-macosx_11_0_arm64.whl"; + hash = "sha256-4OLASpFAPo3Tr5dWxqAkodnA7ZwNWSqDFN7Y9P4w1EA="; }; aarch64-darwin-313 = { - name = "torchvision-0.22.1-cp313-cp313-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp313-cp313-macosx_11_0_arm64.whl"; - hash = "sha256-nDrjMZYkxDzIEnAg9GwUqoeEBngfCJm7YoOuR0r+r78="; + name = "torchvision-0.23.0-cp313-cp313-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp313-cp313-macosx_11_0_arm64.whl"; + hash = "sha256-HDfjJeCaGEtzDD71FCTzg+xXRTeNwOyiRFIKyilyJgA="; }; aarch64-linux-39 = { - name = "torchvision-0.22.1-cp39-cp39-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp39-cp39-manylinux_2_28_aarch64.whl"; - hash = "sha256-FUor3DehYSLCAk8vd+ZfWYYCC0DAE1FcaUtdNX+smaE="; + name = "torchvision-0.23.0-cp39-cp39-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp39-cp39-manylinux_2_28_aarch64.whl"; + hash = "sha256-bHTLwcvuJt1PNfmJzYDczEBBHyWN7kdrKYcd7ktIOvA="; }; aarch64-linux-310 = { - name = "torchvision-0.22.1-cp310-cp310-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp310-cp310-manylinux_2_28_aarch64.whl"; - hash = "sha256-mQ3k1lekHtcWgM2L4umOvKtVNx8wmT3JvS5nZEH3GA4="; + name = "torchvision-0.23.0-cp310-cp310-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp310-cp310-manylinux_2_28_aarch64.whl"; + hash = "sha256-McWDuidCajoE7KjAVFBSQQXBVk20G+ZjL3U270BabeI="; }; aarch64-linux-311 = { - name = "torchvision-0.22.1-cp311-cp311-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp311-cp311-manylinux_2_28_aarch64.whl"; - hash = "sha256-i0pTpgZ9Y626DFLyuN0ikNtknWQgIWdO5DwMki8Mamk="; + name = "torchvision-0.23.0-cp311-cp311-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp311-cp311-manylinux_2_28_aarch64.whl"; + hash = "sha256-Adwz7iTHkUiu582880roo8naFnSlkeeBV3txbSM7H6Y="; }; aarch64-linux-312 = { - name = "torchvision-0.22.1-cp312-cp312-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp312-cp312-manylinux_2_28_aarch64.whl"; - hash = "sha256-lkQU7vGUWdVaEOiG4vylBndVDiQ1htFnj2Xj9va6xHo="; + name = "torchvision-0.23.0-cp312-cp312-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp312-cp312-manylinux_2_28_aarch64.whl"; + hash = "sha256-bdfE0ymg4DFXgDAxvIViIMYVXvCMJtT1u6yTis7PCUg="; }; aarch64-linux-313 = { - name = "torchvision-0.22.1-cp313-cp313-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp313-cp313-manylinux_2_28_aarch64.whl"; - hash = "sha256-SmFKakCNLtdCCNDqbCii+7aCkOmn3yBsX+8/C2hl0wc="; + name = "torchvision-0.23.0-cp313-cp313-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp313-cp313-manylinux_2_28_aarch64.whl"; + hash = "sha256-L3/WwV82l+gGJ7d5NPd3BfO8Dpgni5ibJlXeAfaQPh0="; }; }; } diff --git a/pkgs/development/python-modules/triggercmd/default.nix b/pkgs/development/python-modules/triggercmd/default.nix new file mode 100644 index 000000000000..760a72323be1 --- /dev/null +++ b/pkgs/development/python-modules/triggercmd/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + requests, + websocket-client, + pyjwt, +}: + +buildPythonPackage rec { + pname = "triggercmd"; + version = "0.0.27"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-4MTRtDo4kD/1Bifw8wx++TZ3K2M4TMVRyvwqGL5cHC8="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + requests + websocket-client + pyjwt + ]; + + # Tests require network access and authentication tokens + doCheck = false; + + pythonImportsCheck = [ "triggercmd" ]; + + meta = { + description = "Python agent for TRIGGERcmd cloud service"; + homepage = "https://github.com/rvmey/triggercmd-python-agent"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +} diff --git a/pkgs/development/python-modules/types-html5lib/default.nix b/pkgs/development/python-modules/types-html5lib/default.nix index 869dd0f9ff63..992b8e7496ac 100644 --- a/pkgs/development/python-modules/types-html5lib/default.nix +++ b/pkgs/development/python-modules/types-html5lib/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-html5lib"; - version = "1.1.11.20250516"; + version = "1.1.11.20250708"; pyproject = true; src = fetchPypi { pname = "types_html5lib"; inherit version; - hash = "sha256-ZQQ6ZxjJf31SVnzAzfQe+/wzsfksbAxeGfYKfsaa5yA="; + hash = "sha256-JDIXIP26xxzuUNWkvsm3RISVtyF5dM/+P88e3k7vev4="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/wavinsentio/default.nix b/pkgs/development/python-modules/wavinsentio/default.nix index add20789e5b9..8532e94d4742 100644 --- a/pkgs/development/python-modules/wavinsentio/default.nix +++ b/pkgs/development/python-modules/wavinsentio/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "wavinsentio"; - version = "0.5.0"; + version = "0.5.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-YSofEjDehuNlenkAsQzLkX67Um4pkMSeZmVZgNA06vw="; + hash = "sha256-FlxeOaqQkJBWQtEUudbwlCzkK6HWmWTIxjgaI80BlxQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index fce0a2c3baca..84f96cdfc1e7 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -35,6 +35,8 @@ buildPythonPackage rec { version = "65.1"; pyproject = true; + __darwinAllowLocalNetworking = true; + src = fetchFromGitHub { owner = "Kozea"; repo = "WeasyPrint"; @@ -112,10 +114,5 @@ buildPythonPackage rec { homepage = "https://weasyprint.org/"; license = lib.licenses.bsd3; teams = [ lib.teams.apm ]; - badPlatforms = [ - # Fatal Python error: Segmentation fault - # "...weasyprint/pdf/fonts.py", line 221 in _harfbuzz_subset - lib.systems.inspect.patterns.isDarwin - ]; }; } diff --git a/pkgs/development/python-modules/whodap/default.nix b/pkgs/development/python-modules/whodap/default.nix index d4de5f0333f5..4287b66a5f06 100644 --- a/pkgs/development/python-modules/whodap/default.nix +++ b/pkgs/development/python-modules/whodap/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "whodap"; - version = "0.1.12"; + version = "0.1.13"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pogzyb"; repo = "whodap"; - tag = "v${version}"; - hash = "sha256-kw7bmkpDNb/PK/Q2tSbG+ju0G+6tdSy3RaNDaNOVYnE="; + tag = version; + hash = "sha256-VSFtHjdG9pJAryGUgwI0NxxaW0JiXEHU7aVvXYxymtc="; }; propagatedBuildInputs = [ httpx ]; @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python RDAP utility for querying and parsing information about domain names"; homepage = "https://github.com/pogzyb/whodap"; - changelog = "https://github.com/pogzyb/whodap/releases/tag/v${version}"; + changelog = "https://github.com/pogzyb/whodap/releases/tag/${src.tag}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 8c9d734b5dc5..749bca4f0e89 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "1.10.3"; + version = "1.11.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "sigma67"; repo = "ytmusicapi"; tag = version; - hash = "sha256-0JTuTGHAWG4lMKMvvtuNTRiYlfPsbhCNoGS0TJBZdCc="; + hash = "sha256-7GaxWLGmyxy5RlLoqXXmTM67eoIDf9IB3qjohZcNupU="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix deleted file mode 100644 index 5a39d5126526..000000000000 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - qtbase, - qttools, - sqlcipher, - wrapQtAppsHook, - qtmacextras, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "sqlitebrowser"; - version = "3.13.1"; - - src = fetchFromGitHub { - owner = "sqlitebrowser"; - repo = "sqlitebrowser"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-bpZnO8i8MDgOm0f93pBmpy1sZLJQ9R4o4ZLnGfT0JRg="; - }; - - patches = lib.optional stdenv.hostPlatform.isDarwin ./macos.patch; - - # We should be using qscintilla from nixpkgs instead of the vendored version, - # but qscintilla is currently in a bit of a mess as some consumers expect a - # -qt4 or -qt5 prefix while others do not. - # We *really* should get that cleaned up. - buildInputs = [ - qtbase - sqlcipher - ] - ++ lib.optional stdenv.hostPlatform.isDarwin qtmacextras; - - nativeBuildInputs = [ - cmake - qttools - wrapQtAppsHook - ]; - - cmakeFlags = [ - "-Dsqlcipher=1" - (lib.cmakeBool "ENABLE_TESTING" (finalAttrs.finalPackage.doCheck or false)) - ]; - - doCheck = true; - - meta = with lib; { - description = "DB Browser for SQLite"; - mainProgram = "sqlitebrowser"; - homepage = "https://sqlitebrowser.org/"; - license = licenses.gpl3; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix index a3ebc1d70688..e2c8c4f5b456 100644 --- a/pkgs/development/tools/devbox/default.nix +++ b/pkgs/development/tools/devbox/default.nix @@ -7,13 +7,13 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "jetify-com"; repo = pname; rev = version; - hash = "sha256-LAYGjpaHxlolzzpilD3DOvd+J0eNJ0p+VdRayGQvUWo="; + hash = "sha256-ANbIwR3XiphHbaeg3YtwtHZ9UbwK3BOnPb5ZF1EJtEw="; }; ldflags = [ @@ -27,7 +27,7 @@ buildGoModule rec { # integration tests want file system access doCheck = false; - vendorHash = "sha256-cBRdJUviqtzX1W85/rZr23W51mdjoEPCwXxF754Dhqw="; + vendorHash = "sha256-0lDPK9InxoQzndmQvhKCYvqEt2NL2A+rt3sGg+o1HTY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/os-specific/linux/ch9344/default.nix b/pkgs/os-specific/linux/ch9344/default.nix index 2f290467ace7..3a6d448b784f 100644 --- a/pkgs/os-specific/linux/ch9344/default.nix +++ b/pkgs/os-specific/linux/ch9344/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { patches = [ ./fix-linux-6-12-build.patch ./fix-linux-6-15-build.patch + ./fix-linux-6-16-build.patch ]; sourceRoot = "${src.name}/driver"; diff --git a/pkgs/os-specific/linux/ch9344/fix-linux-6-16-build.patch b/pkgs/os-specific/linux/ch9344/fix-linux-6-16-build.patch new file mode 100644 index 000000000000..a66e4c4251e2 --- /dev/null +++ b/pkgs/os-specific/linux/ch9344/fix-linux-6-16-build.patch @@ -0,0 +1,16 @@ +diff --git a/ch9344.c b/ch9344.c +index 36402c0..9f0df54 100644 +--- a/ch9344.c ++++ b/ch9344.c +@@ -929,7 +929,11 @@ static void timer_function(unsigned long arg) + static void timer_function(struct timer_list *t) + { + unsigned char *buffer; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0)) ++ struct ch9344_ttyport *ttyport = timer_container_of(ttyport, t, timer); ++#else + struct ch9344_ttyport *ttyport = from_timer(ttyport, t, timer); ++#endif + int fifolen = kfifo_len(&ttyport->rfifo); + int len; + diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index 1768aa98e226..192f8ff35901 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -16,11 +16,11 @@ }: stdenv.mkDerivation rec { pname = "trace-cmd"; - version = "3.3.2"; + version = "3.3.3"; src = fetchzip { url = "https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v${version}.tar.gz"; - hash = "sha256-35BEzuevGiRQFqvWOQK1m20juhSd5101a8bBsNtM8Eo="; + hash = "sha256-B3bwHV+f6IuoNESz5B4ij5KsIcCcpUPmoSnJeJj0J0Y="; }; # Don't build and install html documentation diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 2ea83e49054b..d183f505b3c6 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -7,11 +7,6 @@ crt ? stdenv.hostPlatform.libc, }: -assert lib.assertOneOf "crt" crt [ - "msvcrt" - "ucrt" -]; - stdenv.mkDerivation { pname = "mingw-w64"; inherit (mingw_w64_headers) version src meta; diff --git a/pkgs/os-specific/windows/mingw-w64/headers.nix b/pkgs/os-specific/windows/mingw-w64/headers.nix index 2cb86651fc86..a60455b38700 100644 --- a/pkgs/os-specific/windows/mingw-w64/headers.nix +++ b/pkgs/os-specific/windows/mingw-w64/headers.nix @@ -1,20 +1,17 @@ { lib, + nixosTests, stdenvNoCC, fetchurl, crt ? stdenvNoCC.hostPlatform.libc, }: -assert lib.assertOneOf "crt" crt [ - "msvcrt" - "ucrt" -]; stdenvNoCC.mkDerivation (finalAttrs: { pname = "mingw_w64-headers"; - version = "12.0.0"; + version = "13.0.0"; src = fetchurl { url = "mirror://sourceforge/mingw-w64/mingw-w64-v${finalAttrs.version}.tar.bz2"; - hash = "sha256-zEGJiqxLbo3Vz/1zMbnZUVuRLfRCCjphK16ilVu+7S8="; + hash = "sha256-Wv6CKvXE7b9n2q9F7sYdU49J7vaxlSTeZIl8a5WCjK8="; }; configureFlags = [ @@ -25,6 +22,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { cd mingw-w64-headers ''; + passthru = { + tests = { + inherit (nixosTests) wine; + }; + updateScript = ./update.nu; + }; + meta = { homepage = "https://www.mingw-w64.org/"; downloadPage = "https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/"; diff --git a/pkgs/os-specific/windows/mingw-w64/update.nu b/pkgs/os-specific/windows/mingw-w64/update.nu new file mode 100755 index 000000000000..4862aae5e37e --- /dev/null +++ b/pkgs/os-specific/windows/mingw-w64/update.nu @@ -0,0 +1,77 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i nu -p nushell nix + +use std/log + +def replace [ p: path old: string new: string ] { + open $p + | str replace $old $new + | save -f $p +} + +def eval [ attr: string ] { + with-env { + NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM: 1 + } { + nix eval -f ./. $attr --json + } + | from json +} + +def main [] { + # List of all the link in the RSS feed for + # https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/ + let links = http get https://sourceforge.net/projects/mingw-w64/rss?path=/mingw-w64/mingw-w64-release/ + | from xml + | get content.content.0 + | where tag == item + | get content + | flatten + | where tag == title + | get content + | flatten + | get content + + # Select only files ending in "tar.bz2", then select the largest value + # We only consider values with at least two digits cause they are at + # 13.0 and sorting strings doesn't work well if they aren't the same length + let newest = $links + | where { ($in | str ends-with "tar.bz2") and ($in =~ v[0-9][0-9]\.) } + | sort -r + | get 0 + + # Extract the newest version out of the URL + let new_version = $newest + | split column / + | get column4.0 + | split column - + | get column3.0 + | str replace .tar.bz2 "" + | str trim -c v + + # Get the current version in the drv + let current_version = eval "windows.mingw_w64_headers.version" + + if $new_version == $current_version { + log info "Current mingw-w64 version matches the latest, exiting..." + return + } else { + log info $"Current version is ($current_version)\nLatest version is ($new_version)" + } + + # Get the current hash + let current_hash = eval "windows.mingw_w64_headers.src.outputHash" + + # Set to the new version + replace ./pkgs/os-specific/windows/mingw-w64/headers.nix $current_version $new_version + + # The nix derivation creates the URL from the version, so just grab that. + let new_url = eval "windows.mingw_w64_headers.src.url" + + # Prefetch to get the new hash + let new_hash = nix-prefetch-url --type sha256 $new_url + | nix hash to-sri --type sha256 $in + + # Set the hash + replace ./pkgs/os-specific/windows/mingw-w64/headers.nix $current_hash $new_hash +} diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 71e3e6c97e1e..0e7bcb3768c8 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -22,9 +22,9 @@ let nixosTest = nixosTests.kafka.base.kafka_4_0; }; "3_9" = { - kafkaVersion = "3.9.0"; + kafkaVersion = "3.9.1"; scalaVersion = "2.13"; - sha256 = "sha256-q8REAt3xA+OPGbDktE5l2pqDG6nlj9dyUEGxqhaO6NE="; + sha256 = "sha256-3UOZgW5niUbKt2470WhhA1VeabyPKrhobNpxqhW8MaM="; jre = jdk17_headless; nixosTest = nixosTests.kafka.base.kafka_3_9; }; @@ -36,9 +36,9 @@ let nixosTest = nixosTests.kafka.base.kafka_3_8; }; "3_7" = { - kafkaVersion = "3.7.1"; + kafkaVersion = "3.7.2"; scalaVersion = "2.13"; - sha256 = "sha256-YqyuShQ92YPcfrSATVdEugxQsZm1CPWZ7wAQIOJVj8k="; + sha256 = "sha256-eZgLcO2D8R4so3qU1k6+QS1ImeI+YKAsJdQILzooLW8="; jre = jdk17_headless; nixosTest = nixosTests.kafka.base.kafka_3_7; }; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index c7da58267d92..860bcd7a25c2 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2292,7 +2292,8 @@ ]; "hko" = ps: with ps; [ - ]; # missing inputs: hko + hko + ]; "hlk_sw16" = ps: with ps; [ hlk-sw16 @@ -3405,7 +3406,8 @@ ]; "marytts" = ps: with ps; [ - ]; # missing inputs: speak2mary + speak2mary + ]; "mastodon" = ps: with ps; [ mastodon-py @@ -6159,7 +6161,8 @@ ]; "triggercmd" = ps: with ps; [ - ]; # missing inputs: triggercmd + triggercmd + ]; "tts" = ps: with ps; [ ha-ffmpeg @@ -7142,6 +7145,7 @@ "history" "history_stats" "hive" + "hko" "hlk_sw16" "holiday" "home_connect" @@ -7287,6 +7291,7 @@ "mailgun" "manual" "manual_mqtt" + "marytts" "mastodon" "matrix" "matter" @@ -7681,6 +7686,7 @@ "transmission" "transport_nsw" "trend" + "triggercmd" "tts" "tuya" "twentemilieu" diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index f453e61510c3..aed866aa454b 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -202,17 +202,15 @@ let # to be built eventually, we would still like to get the error early and without # having to wait while nix builds a derivation that might not be used. # See also https://github.com/NixOS/nix/issues/4629 - optionalAttrs (attrs ? disallowedReferences) { - disallowedReferences = map unsafeDerivationToUntrackedOutpath attrs.disallowedReferences; - } - // optionalAttrs (attrs ? disallowedRequisites) { - disallowedRequisites = map unsafeDerivationToUntrackedOutpath attrs.disallowedRequisites; - } - // optionalAttrs (attrs ? allowedReferences) { - allowedReferences = mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedReferences; - } - // optionalAttrs (attrs ? allowedRequisites) { - allowedRequisites = mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedRequisites; + { + ${if (attrs ? disallowedReferences) then "disallowedReferences" else null} = + map unsafeDerivationToUntrackedOutpath attrs.disallowedReferences; + ${if (attrs ? disallowedRequisites) then "disallowedRequisites" else null} = + map unsafeDerivationToUntrackedOutpath attrs.disallowedRequisites; + ${if (attrs ? allowedReferences) then "allowedReferences" else null} = + mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedReferences; + ${if (attrs ? allowedRequisites) then "allowedRequisites" else null} = + mapNullable unsafeDerivationToUntrackedOutpath attrs.allowedRequisites; }; makeDerivationArgument = @@ -478,8 +476,8 @@ let derivationArg = removeAttrs attrs removedOrReplacedAttrNames - // (optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) { - name = + // { + ${if (attrs ? name || (attrs ? pname && attrs ? version)) then "name" else null} = let # Indicate the host platform of the derivation if cross compiling. # Fixed-output derivations like source tarballs shouldn't get a host @@ -507,8 +505,7 @@ let ) "The `version` attribute cannot be null."; "${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}" ); - }) - // { + builder = attrs.realBuilder or stdenv.shell; args = attrs.args or [ @@ -556,28 +553,33 @@ let inherit doCheck doInstallCheck; inherit outputs; - } - // optionalAttrs (__contentAddressed) { - inherit __contentAddressed; - # Provide default values for outputHashMode and outputHashAlgo because - # most people won't care about these anyways - outputHashAlgo = attrs.outputHashAlgo or "sha256"; - outputHashMode = attrs.outputHashMode or "recursive"; - } - // optionalAttrs (enableParallelBuilding) { - inherit enableParallelBuilding; - enableParallelChecking = attrs.enableParallelChecking or true; - enableParallelInstalling = attrs.enableParallelInstalling or true; - } - // optionalAttrs (hardeningDisable != [ ] || hardeningEnable != [ ] || stdenv.hostPlatform.isMusl) { - NIX_HARDENING_ENABLE = builtins.concatStringsSep " " enabledHardeningOptions; - } - // + + # When the derivations is content addressed provide default values + # for outputHashMode and outputHashAlgo because most people won't + # care about these anyways + ${if __contentAddressed then "__contentAddressed" else null} = __contentAddressed; + ${if __contentAddressed then "outputHashAlgo" else null} = attrs.outputHashAlgo or "sha256"; + ${if __contentAddressed then "outputHashMode" else null} = attrs.outputHashMode or "recursive"; + + ${if enableParallelBuilding then "enableParallelBuilding" else null} = enableParallelBuilding; + ${if enableParallelBuilding then "enableParallelChecking" else null} = + attrs.enableParallelChecking or true; + ${if enableParallelBuilding then "enableParallelInstalling" else null} = + attrs.enableParallelInstalling or true; + + ${ + if (hardeningDisable != [ ] || hardeningEnable != [ ] || stdenv.hostPlatform.isMusl) then + "NIX_HARDENING_ENABLE" + else + null + } = + builtins.concatStringsSep " " enabledHardeningOptions; + # TODO: remove platform condition # Enabling this check could be a breaking change as it requires to edit nix.conf # NixOS module already sets gccarch, unsure of nix installers and other distributions - optionalAttrs - ( + ${ + if stdenv.buildPlatform ? gcc.arch && !( stdenv.buildPlatform.isAarch64 @@ -589,12 +591,15 @@ let stdenv.buildPlatform.gcc.arch == "armv8-a" ) ) - ) - { - requiredSystemFeatures = attrs.requiredSystemFeatures or [ ] ++ [ - "gccarch-${stdenv.buildPlatform.gcc.arch}" - ]; - } + then + "requiredSystemFeatures" + else + null + } = + attrs.requiredSystemFeatures or [ ] ++ [ + "gccarch-${stdenv.buildPlatform.gcc.arch}" + ]; + } // optionalAttrs (stdenv.buildPlatform.isDarwin) ( let allDependencies = concatLists (concatLists dependencies); diff --git a/pkgs/test/dotnet/use-dotnet-from-env/default.nix b/pkgs/test/dotnet/use-dotnet-from-env/default.nix index 97f4b139a673..5e9d20aa1c97 100644 --- a/pkgs/test/dotnet/use-dotnet-from-env/default.nix +++ b/pkgs/test/dotnet/use-dotnet-from-env/default.nix @@ -26,7 +26,7 @@ let ''; }); - runtimeVersion = lib.getVersion dotnet-runtime; + runtimeVersion = lib.head (lib.splitString "-" (lib.getVersion dotnet-runtime)); runtimeVersionFile = builtins.toFile "dotnet-version.txt" runtimeVersion; in { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6e468e2593ac..2bcd0d4e169d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -446,7 +446,7 @@ mapAliases { CHOWTapeModel = chow-tape-model; # Added 2024-06-12 chromatic = throw "chromatic has been removed due to being unmaintained and failing to build"; # Added 2025-04-18 chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27 - cinnamon = throw "The cinnamon scope has been removed and all packages have been moved to the top-level"; # Added 2024-11-25 + cinnamon-common = cinnamon; # Added 2025-08-06 citra = throw "citra has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 citra-nightly = throw "citra-nightly has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 citra-canary = throw "citra-canary has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 @@ -588,6 +588,8 @@ mapAliases { dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03 dtv-scan-tables_tvheadend = dtv-scan-tables; # Added 2023-03-03 du-dust = dust; # Added 2024-01-19 + duckstation = throw "'duckstation' has been removed due to being unmaintained"; # Added 2025-08-03 + duckstation-bin = throw "'duckstation-bin' has been removed due to being unmaintained"; # Added 2025-08-03 dump1090 = dump1090-fa; # Added 2024-02-12 dwfv = throw "'dwfv' has been removed due to lack of upstream maintenance"; dylibbundler = throw "'dylibbundler' has been renamed to/replaced by 'macdylibbundler'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index affbe5f5ed3d..caaf9ff7f3f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3202,8 +3202,6 @@ with pkgs; heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack { }; - heimdall-gui = heimdall.override { enableGUI = true; }; - headscale = callPackage ../servers/headscale { }; highlight = callPackage ../tools/text/highlight { @@ -7479,8 +7477,6 @@ with pkgs; protobuf = protobuf_21; }; - sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { }; - sqlite-utils = with python3Packages; toPythonApplication sqlite-utils; sqlmap = with python3Packages; toPythonApplication sqlmap; @@ -12301,10 +12297,6 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; - meerk40t = callPackage ../applications/misc/meerk40t { }; - - meerk40t-camera = callPackage ../applications/misc/meerk40t/camera.nix { }; - libmt32emu = callPackage ../applications/audio/munt/libmt32emu.nix { }; mt32emu-qt = libsForQt5.callPackage ../applications/audio/munt/mt32emu-qt.nix { }; @@ -13119,6 +13111,7 @@ with pkgs; }; palemoon-bin = callPackage ../applications/networking/browsers/palemoon/bin.nix { }; + palemoon-gtk2-bin = palemoon-bin.override { withGTK3 = false; }; pantalaimon = callPackage ../applications/networking/instant-messengers/pantalaimon { }; @@ -13128,8 +13121,6 @@ with pkgs; parsec-bin = callPackage ../applications/misc/parsec/bin.nix { }; - paraview = libsForQt5.callPackage ../applications/graphics/paraview { }; - pekwm = callPackage ../by-name/pe/pekwm/package.nix { awk = gawk; grep = gnugrep; @@ -14171,8 +14162,6 @@ with pkgs; inherit (darwin) autoSignDarwinBinariesHook; }; - cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { }; - elements = libsForQt5.callPackage ../applications/blockchains/elements { withGui = true; inherit (darwin) autoSignDarwinBinariesHook; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 759d13f186ff..86a82c4d1153 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -616,7 +616,7 @@ mapAliases ({ Pyro5 = pyro5; # added 2023-02-19 PyRSS2Gen = pyrss2gen; # added 2023-02-19 pyruckus = throw "pyruckus has been removed, it was deprecrated in favor of aioruckus."; # added 2023-09-07 - py_scrypt = py-scrypt; # added 2024-01-07 + py-scrypt = scrypt; # added 2025-08-07 pysha3 = throw "pysha3 has been removed, use safe-pysha3 instead"; # added 2023-05-20 pysimplegui = throw "pysimplegui update to v5 broke the package, it now needs a license key to decrypt the source code"; # added 2024-09-16 pysmart-smartx = pysmart; # added 2021-10-22 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5566867bdfd2..b1cc0ff1a562 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6584,6 +6584,8 @@ self: super: with self; { hkavr = callPackage ../development/python-modules/hkavr { }; + hko = callPackage ../development/python-modules/hko { }; + hledger-utils = callPackage ../development/python-modules/hledger-utils { }; hlk-sw16 = callPackage ../development/python-modules/hlk-sw16 { }; @@ -7890,6 +7892,8 @@ self: super: with self; { langgraph-prebuilt = callPackage ../development/python-modules/langgraph-prebuilt { }; + langgraph-runtime-inmem = callPackage ../development/python-modules/langgraph-runtime-inmem { }; + langgraph-sdk = callPackage ../development/python-modules/langgraph-sdk { }; langid = callPackage ../development/python-modules/langid { }; @@ -12270,8 +12274,6 @@ self: super: with self; { py-schluter = callPackage ../development/python-modules/py-schluter { }; - py-scrypt = callPackage ../development/python-modules/py-scrypt { }; - py-serializable = callPackage ../development/python-modules/py-serializable { }; py-slvs = callPackage ../development/python-modules/py-slvs { }; @@ -16863,6 +16865,8 @@ self: super: with self; { spdx-tools = callPackage ../development/python-modules/spdx-tools { }; + speak2mary = callPackage ../development/python-modules/speak2mary { }; + speaklater = callPackage ../development/python-modules/speaklater { }; speaklater3 = callPackage ../development/python-modules/speaklater3 { }; @@ -18348,6 +18352,8 @@ self: super: with self; { trie = callPackage ../development/python-modules/trie { }; + triggercmd = callPackage ../development/python-modules/triggercmd { }; + trimesh = callPackage ../development/python-modules/trimesh { }; trino-python-client = callPackage ../development/python-modules/trino-python-client { };