diff --git a/doc/languages-frameworks/gradle.section.md b/doc/languages-frameworks/gradle.section.md index b2058ef87491..762c8003a7a7 100644 --- a/doc/languages-frameworks/gradle.section.md +++ b/doc/languages-frameworks/gradle.section.md @@ -17,11 +17,11 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "pdftk-java"; repo = "pdftk"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ciKotTHSEcITfQYKFZ6sY2LZnXGChBJy0+eno8B3YHY="; }; - nativeBuildInputs = [ gradle ]; + nativeBuildInputs = [ gradle makeWrapper ]; # if the package has dependencies, mitmCache must be set mitmCache = gradle.fetchDeps { @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/{bin,share/pdftk} cp build/libs/pdftk-all.jar $out/share/pdftk - makeWrapper ${jre}/bin/java $out/bin/pdftk \ + makeWrapper ${lib.getExe jre} $out/bin/pdftk \ --add-flags "-jar $out/share/pdftk/pdftk-all.jar" cp ${finalAttrs.src}/pdftk.1 $out/share/man/man1 @@ -74,6 +74,7 @@ package. Using the pdftk example above: ```nix { lib , stdenv +, gradle # ... , pdftk }: @@ -87,30 +88,22 @@ stdenv.mkDerivation (finalAttrs: { }) ``` -This allows you to `override` any arguments of the `pkg` used for -the update script (for example, `pkg = pdftk.override { enableSomeFlag = -true };`), so this is the preferred way. +This allows you to `override` any arguments of the `pkg` used for the update script (for example, `pkg = pdftk.override { enableSomeFlag = true };)`. -The second is to create a `let` binding for the package, like this: +The second is to use `finalAttrs.finalPackage` like this: ```nix -let self = stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { # ... mitmCache = gradle.fetchDeps { - pkg = self; + pkg = finalAttrs.finalPackage; data = ./deps.json; }; -}; in self +}) ``` +The limitation of this method is that you cannot override the `pkg` derivations's arguments. -This is useful if you can't easily pass the derivation as its own -argument, or if your `mkDerivation` call is responsible for building -multiple packages. - -In the former case, the update script will stay the same even if the -derivation is called with different arguments. In the latter case, the -update script will change depending on the derivation arguments. It's up -to you to decide which one would work best for your derivation. +In the former case, the update script will stay the same even if the derivation is called with different arguments. In the latter case, the update script will change depending on the derivation arguments. It's up to you to decide which one would work best for your derivation. ## Update Script {#gradle-update-script} diff --git a/lib/systems/architectures.nix b/lib/systems/architectures.nix index d277ac9ce70f..a448398449d3 100644 --- a/lib/systems/architectures.nix +++ b/lib/systems/architectures.nix @@ -29,6 +29,7 @@ rec { alderlake = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "fma" ]; sapphirerapids = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "avx512" "fma" ]; emeraldrapids = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "avx512" "fma" ]; + sierraforest = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "fma" ]; # x86_64 AMD btver1 = [ "sse3" "ssse3" "sse4_1" "sse4_2" ]; btver2 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" ]; @@ -82,6 +83,7 @@ rec { # CX16 does not exist on alderlake, while it does on nearly all other intel CPUs alderlake = [ ]; + sierraforest = [ "alderlake" ] ++ inferiors.alderlake; # x86_64 AMD # TODO: fill this (need testing) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index c655d4b993b7..0c102cf6ba36 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -493,6 +493,8 @@ - `services.kmonad` now creates a determinate symlink (in `/dev/input/by-id/`) to each of KMonad virtual devices. +- `services.gitea` now supports CAPTCHA usage through the `services.gitea.captcha` variable. + - `bind.cacheNetworks` now only controls access for recursive queries, where it previously controlled access for all queries. - [`services.mongodb.enableAuth`](#opt-services.mongodb.enableAuth) now uses the newer [mongosh](https://github.com/mongodb-js/mongosh) shell instead of the legacy shell to configure the initial superuser. You can configure the mongosh package to use through the [`services.mongodb.mongoshPackage`](#opt-services.mongodb.mongoshPackage) option. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 14aed8fdb3af..0c7cd28ccf69 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -199,6 +199,7 @@ ./programs/firefox.nix ./programs/firejail.nix ./programs/fish.nix + ./programs/flashprog.nix ./programs/flashrom.nix ./programs/flexoptix-app.nix ./programs/foot diff --git a/nixos/modules/programs/flashprog.nix b/nixos/modules/programs/flashprog.nix new file mode 100644 index 000000000000..be153c1b6f18 --- /dev/null +++ b/nixos/modules/programs/flashprog.nix @@ -0,0 +1,28 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.programs.flashprog; +in +{ + options.programs.flashprog = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Installs flashprog and configures udev rules for programmers + used by flashprog. + ''; + }; + package = lib.mkPackageOption pkgs "flashprog" { }; + }; + + config = lib.mkIf cfg.enable { + services.udev.packages = [ cfg.package ]; + environment.systemPackages = [ cfg.package ]; + }; +} diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix index 4cdce9eec9cb..cf886c2e6a55 100644 --- a/nixos/modules/security/acme/default.nix +++ b/nixos/modules/security/acme/default.nix @@ -1017,11 +1017,13 @@ in { # systemd clean --what=state is used to delete the account, so long as the user # then runs one of the cert services, there won't be any issues. accountTargets = lib.mapAttrs' (hash: confs: let - leader = "acme-${(builtins.head confs).cert}.service"; - dependantServices = map (conf: "acme-${conf.cert}.service") (builtins.tail confs); + dnsConfs = builtins.filter (conf: cfg.certs.${conf.cert}.dnsProvider != null) confs; + leaderConf = if dnsConfs != [ ] then builtins.head dnsConfs else builtins.head confs; + leader = "acme-${leaderConf.cert}.service"; + followers = map (conf: "acme-${conf.cert}.service") (builtins.filter (conf: conf != leaderConf) confs); in lib.nameValuePair "acme-account-${hash}" { - requiredBy = dependantServices; - before = dependantServices; + requiredBy = followers; + before = followers; requires = [ leader ]; after = [ leader ]; }) (lib.groupBy (conf: conf.accountHash) (lib.attrValues certConfigs)); diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index d43250c88268..d8f72a4cb9fd 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -163,6 +163,58 @@ in }; }; + captcha = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enables Gitea to display a CAPTCHA challenge on registration. + ''; + }; + + secretFile = mkOption { + type = types.nullOr types.str; + default = null; + example = "/var/lib/secrets/gitea/captcha_secret"; + description = "Path to a file containing the CAPTCHA secret key."; + }; + + siteKey = mkOption { + type = types.nullOr types.str; + default = null; + example = "my_site_key"; + description = "CAPTCHA site key to use for Gitea."; + }; + + url = mkOption { + type = types.nullOr types.str; + default = null; + example = "https://google.com/recaptcha"; + description = "CAPTCHA url to use for Gitea. Only relevant for `recaptcha` and `mcaptcha`."; + }; + + type = mkOption { + type = types.enum [ "image" "recaptcha" "hcaptcha" "mcaptcha" "cfturnstile" ]; + default = "image"; + example = "recaptcha"; + description = "The type of CAPTCHA to use for Gitea."; + }; + + requireForLogin = mkOption { + type = types.bool; + default = false; + example = true; + description = "Displays a CAPTCHA challenge whenever a user logs in."; + }; + + requireForExternalRegistration = mkOption { + type = types.bool; + default = false; + example = true; + description = "Displays a CAPTCHA challenge for users that register externally."; + }; + }; + dump = { enable = mkOption { type = types.bool; @@ -404,9 +456,30 @@ in and `ensureDatabases` doesn't have any effect. ''; } + { + assertion = cfg.captcha.enable -> cfg.captcha.type != "image" -> (cfg.captcha.secretFile != null && cfg.captcha.siteKey != null); + message = '' + Using a CAPTCHA service that is not `image` requires providing a CAPTCHA secret through + the `captcha.secretFile` option and a CAPTCHA site key through the `captcha.siteKey` option. + ''; + } + { + assertion = cfg.captcha.url != null -> (builtins.elem cfg.captcha.type ["mcaptcha" "recaptcha"]); + message = '' + `captcha.url` is only relevant when `captcha.type` is `mcaptcha` or `recaptcha`. + ''; + } ]; - services.gitea.settings = { + services.gitea.settings = let + captchaPrefix = optionalString cfg.captcha.enable ({ + image = "IMAGE"; + recaptcha = "RECAPTCHA"; + hcaptcha = "HCAPTCHA"; + mcaptcha = "MCAPTCHA"; + cfturnstile = "CF_TURNSTILE"; + }."${cfg.captcha.type}"); + in { "cron.update_checker".ENABLED = lib.mkDefault false; database = mkMerge [ @@ -450,6 +523,24 @@ in INSTALL_LOCK = true; }; + service = mkIf cfg.captcha.enable (mkMerge [ + { + ENABLE_CAPTCHA = true; + CAPTCHA_TYPE = cfg.captcha.type; + REQUIRE_CAPTCHA_FOR_LOGIN = cfg.captcha.requireForLogin; + REQUIRE_EXTERNAL_REGISTRATION_CAPTCHA = cfg.captcha.requireForExternalRegistration; + } + (mkIf (cfg.captcha.secretFile != null) { + "${captchaPrefix}_SECRET" = "#captchasecret#"; + }) + (mkIf (cfg.captcha.siteKey != null) { + "${captchaPrefix}_SITEKEY" = cfg.captcha.siteKey; + }) + (mkIf (cfg.captcha.url != null) { + "${captchaPrefix}_URL" = cfg.captcha.url; + }) + ]); + mailer = mkIf (cfg.mailerPasswordFile != null) { PASSWD = "#mailerpass#"; }; @@ -592,6 +683,10 @@ in ${lib.optionalString (cfg.metricsTokenFile != null) '' ${replaceSecretBin} '#metricstoken#' '${cfg.metricsTokenFile}' '${runConfig}' ''} + + ${lib.optionalString (cfg.captcha.secretFile != null) '' + ${replaceSecretBin} '#captchasecret#' '${cfg.captcha.secretFile}' '${runConfig}' + ''} chmod u-w '${runConfig}' } (umask 027; gitea_setup) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index ddab9f24b0b8..54e1273ad9db 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -415,6 +415,8 @@ in KexAlgorithms = lib.mkOption { type = lib.types.nullOr (lib.types.listOf lib.types.str); default = [ + "mlkem768x25519-sha256" + "sntrup761x25519-sha512" "sntrup761x25519-sha512@openssh.com" "curve25519-sha256" "curve25519-sha256@libssh.org" diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 2d32cf451706..62fb1d200413 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -21,7 +21,7 @@ let # note that the dot in front of `${path}` is the hostname, which is # required. then "--unix-socket ${cfg.guiAddress} http://.${path}" - # no adjustements are needed if cfg.guiAddress is a network address + # no adjustments are needed if cfg.guiAddress is a network address else "${cfg.guiAddress}${path}" ; @@ -68,7 +68,7 @@ let /* Syncthing's rest API for the folders and devices is almost identical. Hence we iterate them using lib.pipe and generate shell commands for both at - the sime time. */ + the same time. */ (lib.pipe { # The attributes below are the only ones that are different for devices / # folders. diff --git a/nixos/modules/services/web-apps/mobilizon.nix b/nixos/modules/services/web-apps/mobilizon.nix index c78f7104715d..539f64ba94c6 100644 --- a/nixos/modules/services/web-apps/mobilizon.nix +++ b/nixos/modules/services/web-apps/mobilizon.nix @@ -393,6 +393,7 @@ in serviceConfig = { Type = "oneshot"; User = config.services.postgresql.superUser; + Restart = "on-failure"; }; }; diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 05c916751303..0852111437b4 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -179,7 +179,7 @@ let type = types.attrsOf types.path; default = { }; description = '' - Hooks that will be placed under /var/lib/libvirt/hooks/lxc.d/ + Hooks that will be placed under /var/lib/libvirt/hooks/network.d/ and called for networks begin/end events. Please see https://libvirt.org/hooks.html for documentation. ''; diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index 1160c05b6101..b398bf1f4480 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "amarok"; - version = "3.1.1"; + version = "3.2.2"; src = fetchurl { url = "mirror://kde/stable/amarok/${finalAttrs.version}/amarok-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-CrilxE8v6OcEdnWlfmQM54fxyAE0rB5VX8vvzZRyLmY="; + sha256 = "sha256-/N48N9H4FezIiTD+bR6k1LCx7Tsz/NMt9VQq+HTdKrA="; }; outputs = [ diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix index c90219bb7890..15cd25a1926f 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix @@ -10,19 +10,19 @@ vimUtils, }: let - version = "0.0.18"; + version = "0.0.19"; src = fetchFromGitHub { owner = "yetone"; repo = "avante.nvim"; tag = "v${version}"; - hash = "sha256-HSXqD+bC0sdvNbmV8hIU99cLrVyIMAzbWf5cqUpIhZU="; + hash = "sha256-/WvkMsyhaYa3TLOg6QBVz1dvHO4vr1PdeSF7zVIOUcY="; }; avante-nvim-lib = rustPlatform.buildRustPackage { pname = "avante-nvim-lib"; inherit version src; useFetchCargoVendor = true; - cargoHash = "sha256-XDxWeEbsDf4r346OkQkZPmYLANgtydspPk1uLrnvrnY="; + cargoHash = "sha256-XDxWeEbsDf4r346OkQkZPmYLANgtydspPk1uLrnvrnY"; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/lockfile.json b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/lockfile.json index 9e8262714b99..0907b601296f 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/lockfile.json +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/lockfile.json @@ -1,7 +1,7 @@ { - "version": "1.15.34", + "version": "1.16.6", "linux-x64": { - "hash": "sha256-QoITLhgIYcoYpYzDqvss+aSh0/ZQc9V6+QSSBRGg1wc=", + "hash": "sha256-/ONaevRlpGc4xaYr9vV8maZUP3HbjmgUk/AbXAJM4tg=", "binaries": [ "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/servicehub-controller-net60.linux-x64/Microsoft.ServiceHub.Controller", "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-code-servicehost.linux-x64/Microsoft.VisualStudio.Code.ServiceHost", @@ -10,7 +10,7 @@ ] }, "linux-arm64": { - "hash": "sha256-aluG7CfqG5CNKG7FZqdp5vNa9bZ+OYQa5y7JoVvCSh0=", + "hash": "sha256-yhzozbnTsAddbx0Hior/DnN+vjRFWtIW8Z4zu1xfrhY=", "binaries": [ "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/servicehub-controller-net60.linux-arm64/Microsoft.ServiceHub.Controller", "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-code-servicehost.linux-arm64/Microsoft.VisualStudio.Code.ServiceHost", @@ -19,7 +19,7 @@ ] }, "darwin-x64": { - "hash": "sha256-nm3qEpVfzpVhZCrCtrjYSYNDCSGmmIE/uufh/n6yZ+M=", + "hash": "sha256-PZwhzd9yVAJiVz5g7ogICUIgwJvS2MyGQMZbNN+7QRM=", "binaries": [ "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/servicehub-controller-net60.darwin-x64/Microsoft.ServiceHub.Controller", "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-x64/Microsoft.VisualStudio.Code.ServiceHost", @@ -28,7 +28,7 @@ ] }, "darwin-arm64": { - "hash": "sha256-1AHY13x77au2MjUEKbzuIyukKXLwmEYZwh4sFyApcbI=", + "hash": "sha256-iR0jJnkcA12+CJUI0ECrRSR2+j2emtfmLt2Uz4ke7YY=", "binaries": [ "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/servicehub-controller-net60.darwin-arm64/Microsoft.ServiceHub.Controller", "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-arm64/Microsoft.VisualStudio.Code.ServiceHost", diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 93f5f1d7dd83..65a00af75d99 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,9 +1,9 @@ { "chromium": { - "version": "133.0.6943.98", + "version": "133.0.6943.126", "chromedriver": { - "hash_darwin": "sha256-OD/E+h4APHs8qBXdDyhBtZ42D3PvbBJHhbRXMxWY/34=", - "hash_darwin_aarch64": "sha256-H3JEby9RZPT2cCmuzOvc7n6+SOy1EMcH0v71g7Z1yio=" + "hash_darwin": "sha256-UeRQgrMG89DHywbvWUnjjlhkkyKR9eFE1i3ESPAElls=", + "hash_darwin_aarch64": "sha256-cpJOw+f+AybAtLu7w+g+Vojmjkl+r3sHzt4x6TjbBJI=" }, "deps": { "depot_tools": { @@ -19,8 +19,8 @@ "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "da53563ceb66412e2637507c8724bd0cab05e453", - "hash": "sha256-yltjJNXU+YQD/sFEa8+ZKqUJpVZ2Yi0YDx27bnekcng=", + "rev": "cffa127ce7b6be72885391527c15b452056a2e81", + "hash": "sha256-WOd3FsqaZlKEroWg763LQhQS5S1964vAoZWxstxGS3U=", "recompress": true }, "src/third_party/clang-format/script": { @@ -575,8 +575,8 @@ }, "src/third_party/pdfium": { "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "b57762c6c6ad261024f11fc724687593c03cce67", - "hash": "sha256-ksN/7volHAeQLJSFQMV/YOfkXyZ97GSawXp31uca4oc=" + "rev": "a6637ded97c46aa4879769b1a6b0f2128e6ea257", + "hash": "sha256-Y2quVCJS62YFwxBSB42Wg03QQ10M8C1GTrRvhr73IN8=" }, "src/third_party/perfetto": { "url": "https://android.googlesource.com/platform/external/perfetto.git", @@ -785,13 +785,13 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "79c3c1ab7faee8247b740b4ec660a998f2881633", - "hash": "sha256-fmd2mIjJs6l9zRTJ2bFIMQNnApFN3epeS+57TBlF/Uk=" + "rev": "4e04a09a1a0ef90841656e210e976bfc2a81ed57", + "hash": "sha256-XbeU9L2IRHMP5pTzM3MPW1L2PMHViNRP/6u/HcBq96M=" } } }, "ungoogled-chromium": { - "version": "133.0.6943.98", + "version": "133.0.6943.126", "deps": { "depot_tools": { "rev": "423f1e1914ab4aa7b2bdf804e216d4c097853ba2", @@ -802,16 +802,16 @@ "hash": "sha256-T2dcISln9WCODoI/LsE2ldkRfFdMwVOmqqjQinAmZss=" }, "ungoogled-patches": { - "rev": "133.0.6943.98-1", - "hash": "sha256-lSRJD8tKmZ89MJr6MkldV8/50iB/l8FEwl6ZM/KtZHA=" + "rev": "133.0.6943.126-1", + "hash": "sha256-bOtkMuGYu/iovgj0ZOecxQBmBvUhbF0px/M3Zp7ixKI=" }, "npmHash": "sha256-oVoTruhxTymYiGkELd2Oa1wOfjGLtChQZozP4GzOO1A=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "da53563ceb66412e2637507c8724bd0cab05e453", - "hash": "sha256-yltjJNXU+YQD/sFEa8+ZKqUJpVZ2Yi0YDx27bnekcng=", + "rev": "cffa127ce7b6be72885391527c15b452056a2e81", + "hash": "sha256-WOd3FsqaZlKEroWg763LQhQS5S1964vAoZWxstxGS3U=", "recompress": true }, "src/third_party/clang-format/script": { @@ -1366,8 +1366,8 @@ }, "src/third_party/pdfium": { "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "b57762c6c6ad261024f11fc724687593c03cce67", - "hash": "sha256-ksN/7volHAeQLJSFQMV/YOfkXyZ97GSawXp31uca4oc=" + "rev": "a6637ded97c46aa4879769b1a6b0f2128e6ea257", + "hash": "sha256-Y2quVCJS62YFwxBSB42Wg03QQ10M8C1GTrRvhr73IN8=" }, "src/third_party/perfetto": { "url": "https://android.googlesource.com/platform/external/perfetto.git", @@ -1576,8 +1576,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "79c3c1ab7faee8247b740b4ec660a998f2881633", - "hash": "sha256-fmd2mIjJs6l9zRTJ2bFIMQNnApFN3epeS+57TBlF/Uk=" + "rev": "4e04a09a1a0ef90841656e210e976bfc2a81ed57", + "hash": "sha256-XbeU9L2IRHMP5pTzM3MPW1L2PMHViNRP/6u/HcBq96M=" } } } diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 7a61313f4425..419101f4126b 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -68,8 +68,8 @@ rec { }; kops_1_30 = mkKops rec { - version = "1.30.3"; - sha256 = "sha256-gTae30V03zB5FfkRaGuRB9aBzb2ouXEKs8OV8KovOpM="; + version = "1.30.4"; + sha256 = "sha256-f+VdgQj6tHWrn+LG6qkArjcADYfpKjuOp+bU0BTYsWY="; rev = "v${version}"; }; } diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index b8d547a21b18..55a98cdfd0de 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -82,7 +82,7 @@ rec { # Upstream partially documents used Go versions here # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md - nomad = nomad_1_8; + nomad = nomad_1_9; nomad_1_7 = generic { buildGoModule = buildGo122Module; @@ -110,9 +110,9 @@ rec { nomad_1_9 = generic { buildGoModule = buildGo123Module; - version = "1.9.5"; - sha256 = "sha256-NIv3QPSYoYrDQxxtNDHc3DdBLb45oUdA5Jyjke+XzD8="; - vendorHash = "sha256-y4WBOSfkRYNQRWu5B/j2JBLPAxJ1fyLD0DEAjB10Sl8="; + version = "1.9.6"; + sha256 = "sha256-j+3ecQsFicdYX4GddwaKEwoIFu88kdjI5Kl8bHUQQwE="; + vendorHash = "sha256-frHIP86NsW6C9GRdPaZQc3PilolXJ2ojaNZYlrMcbOg="; license = lib.licenses.bsl11; passthru.tests.nomad = nixosTests.nomad; preCheck = '' diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 134fe3782799..23a6319ba1eb 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -166,6 +166,7 @@ let alderlake = versionAtLeast ccVersion "12.0"; sapphirerapids = versionAtLeast ccVersion "11.0"; emeraldrapids = versionAtLeast ccVersion "13.0"; + sierraforest = versionAtLeast ccVersion "13.0"; # AMD znver1 = true; diff --git a/pkgs/by-name/al/alt-tab-macos/package.nix b/pkgs/by-name/al/alt-tab-macos/package.nix index e669f75d5244..3ea1aa088bb9 100644 --- a/pkgs/by-name/al/alt-tab-macos/package.nix +++ b/pkgs/by-name/al/alt-tab-macos/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "alt-tab-macos"; - version = "7.19.1"; + version = "7.20.0"; src = fetchurl { url = "https://github.com/lwouis/alt-tab-macos/releases/download/v${finalAttrs.version}/AltTab-${finalAttrs.version}.zip"; - hash = "sha256-eT/HZDBDtOh9uQEffLhlBXfWuPSM/bnpgp5OFnSuCBk="; + hash = "sha256-B1cRQWXjlvj0/4HNyymT8dKySFflNRhH4O9J37CyhqM="; }; sourceRoot = "."; diff --git a/pkgs/by-name/be/bearer/package.nix b/pkgs/by-name/be/bearer/package.nix index 0171b16322c9..924bc54d3bf5 100644 --- a/pkgs/by-name/be/bearer/package.nix +++ b/pkgs/by-name/be/bearer/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "bearer"; - version = "1.48.0"; + version = "1.49.0"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; tag = "v${version}"; - hash = "sha256-M9Usz+qQH4QNA/0TgtvjuqwnaCpyxr9OMIc8pJ/FjDE="; + hash = "sha256-mIjIcJzu3BatV4OQ18yHvwuUjS+zJHe4EFPYEFUwCjo="; }; - vendorHash = "sha256-A0zy5O2+afhn6jAfLd/k7wvL3z1PVI0e6bO39cnYrhM="; + vendorHash = "sha256-+2iiMb2+/a3GCUMVA9boJJxuFgB3NmxpTePyMEA46jw="; subPackages = [ "cmd/bearer" ]; diff --git a/pkgs/by-name/bi/bio-gappa/package.nix b/pkgs/by-name/bi/bio-gappa/package.nix index fdb38563321e..329ffab3fed3 100644 --- a/pkgs/by-name/bi/bio-gappa/package.nix +++ b/pkgs/by-name/bi/bio-gappa/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bio-gappa"; - version = "0.8.5"; + version = "0.9.0"; src = fetchFromGitHub { owner = "lczech"; repo = "gappa"; rev = "v${finalAttrs.version}"; - hash = "sha256-YuvJyLMfGUKXvJyMe/HadrCc6HRnn4bipepX2FOuGfM="; + hash = "sha256-WV8PO0v+e14tyjEm+xQGveQ0Pslgeh+osEMCqF8mue0="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch b/pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch index b6307f43ed27..4102caca56ae 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch +++ b/pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch @@ -1,8 +1,8 @@ -diff --git a/apps/desktop/src/key-management/biometrics/biometric.unix.main.ts b/apps/desktop/src/key-management/biometrics/biometric.unix.main.ts -index 8962e7f3ec..a7291420f2 100644 ---- a/apps/desktop/src/key-management/biometrics/biometric.unix.main.ts -+++ b/apps/desktop/src/key-management/biometrics/biometric.unix.main.ts -@@ -109,7 +109,7 @@ export default class BiometricUnixMain implements OsBiometricService { +diff --git a/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts b/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts +index 791b4d6f88..dfee0bbf8d 100644 +--- a/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts ++++ b/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts +@@ -115,7 +115,7 @@ export default class OsBiometricsServiceLinux implements OsBiometricService { // The user needs to manually set up the polkit policy outside of the sandbox // since we allow access to polkit via dbus for the sandboxed clients, the authentication works from // the sandbox, once the policy is set up outside of the sandbox. diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 40912b780968..ab168b804a28 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -3,7 +3,7 @@ buildNpmPackage, cargo, copyDesktopItems, - electron_33, + electron_34, fetchFromGitHub, gnome-keyring, jq, @@ -23,7 +23,7 @@ let description = "Secure and free password manager for all of your devices"; icon = "bitwarden"; - electron = electron_33; + electron = electron_34; bitwardenDesktopNativeArch = { @@ -36,13 +36,13 @@ let in buildNpmPackage rec { pname = "bitwarden-desktop"; - version = "2025.1.1"; + version = "2025.2.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-0NXrTBkCyo9Hw+fyFTfXfa1efBlaM6xWd9Uvsbathpw="; + hash = "sha256-+RMeo+Kyum1WNm7citUe9Uk5yOtfhMPPlQRtnYL3Pj8="; }; patches = [ @@ -66,8 +66,13 @@ buildNpmPackage rec { "--engine-strict" "--legacy-peer-deps" ]; + + npmRebuildFlags = [ + # FIXME one of the esbuild versions fails to download @esbuild/linux-x64 + "--ignore-scripts" + ]; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-DDsPkvLGOhjmdYEOmhZfe4XHGFyowvWO24YcCA5griM="; + npmDepsHash = "sha256-fYZJA6qV3mqxO2g+yxD0MWWQc9QYmdWJ7O7Vf88Qpbs="; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; @@ -79,7 +84,7 @@ buildNpmPackage rec { ) patches; patchFlags = [ "-p4" ]; sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-IL8+n+rhRbvRO1jxJSy9PjUMb/tI4S/gzpUNOojBPWk="; + hash = "sha256-OldVFMI+rcGAbpDg7pHu/Lqbw5I6/+oXULteQ9mXiFc="; }; cargoRoot = "apps/desktop/desktop_native"; @@ -162,7 +167,7 @@ buildNpmPackage rec { # This may break in the future but its better than copy-pasting it manually. mkdir -p $out/share/polkit-1/actions/ pushd apps/desktop/src/key-management/biometrics - awk '/const polkitPolicy = `/{gsub(/^.*`/, ""); print; str=1; next} str{if (/`;/) str=0; gsub(/`;/, ""); print}' biometric.unix.main.ts > $out/share/polkit-1/actions/com.bitwarden.Bitwarden.policy + awk '/const polkitPolicy = `/{gsub(/^.*`/, ""); print; str=1; next} str{if (/`;/) str=0; gsub(/`;/, ""); print}' os-biometrics-linux.service.ts > $out/share/polkit-1/actions/com.bitwarden.Bitwarden.policy popd pushd apps/desktop/resources/icons diff --git a/pkgs/by-name/by/byedpi/package.nix b/pkgs/by-name/by/byedpi/package.nix index 65dc374819fc..226b402eb609 100644 --- a/pkgs/by-name/by/byedpi/package.nix +++ b/pkgs/by-name/by/byedpi/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "byedpi"; - version = "0.16.4"; + version = "0.16.6"; src = fetchFromGitHub { owner = "hufrea"; repo = "byedpi"; tag = "v${finalAttrs.version}"; - hash = "sha256-l9Clkdq4E8mgCQM4AsdDv6pB/3SBChp71P0yQKRtMSY="; + hash = "sha256-8iGmEfc/7ZLZmMdxuH6SjO1Wb/KuiLUJeYjrtnplalE="; }; installPhase = '' diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix index 54490c56a6ee..df976af41474 100644 --- a/pkgs/by-name/cd/cdncheck/package.nix +++ b/pkgs/by-name/cd/cdncheck/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cdncheck"; - version = "1.1.1"; + version = "1.1.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cdncheck"; tag = "v${version}"; - hash = "sha256-vz/PAu/YMrlUQ6oXERNm1bl3fZ0YDrvYCv64Qe0+zUo="; + hash = "sha256-4dW0HcJuEJt9Yf3SccCJbPGYQMRo+eGAxhUhfbdcYD8="; }; vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4="; diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index 905fd2bfa585..cb51223eb4e1 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -25,14 +25,14 @@ with py.pkgs; python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.370"; + version = "3.2.372"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-IaE2Mg8Fk1Xb3ujPRHTY1N4ev75qM8Kj5o7IPtKuNsk="; + hash = "sha256-c7qhfWs68BMkOrhaJprdgZXQJe0i2wSuc/0WRCHFQeY="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/cl/clusterctl/package.nix b/pkgs/by-name/cl/clusterctl/package.nix index 199199163add..dd1b1d0010bd 100644 --- a/pkgs/by-name/cl/clusterctl/package.nix +++ b/pkgs/by-name/cl/clusterctl/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-XNGSO9czfF+fCMNoF6BIboQeKKvysyF6e7sC7lY+1Ds="; + hash = "sha256-4n+7/4ZMD0VzlD4PzEWVDut+rt8/4Vz3gAgCDAj+SVs="; }; - vendorHash = "sha256-89fq5ANspfHw7aU6b3L7Kdt0Y7oVLpUYxhHmnVdLP/Q="; + vendorHash = "sha256-SdLeME6EFraGUXE1zUdEfxTETUKLDmecYpWEg5DE4PQ="; subPackages = [ "cmd/clusterctl" ]; diff --git a/pkgs/by-name/co/composer-require-checker/package.nix b/pkgs/by-name/co/composer-require-checker/package.nix index e454634e00a4..2a4473205f9f 100644 --- a/pkgs/by-name/co/composer-require-checker/package.nix +++ b/pkgs/by-name/co/composer-require-checker/package.nix @@ -6,16 +6,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "composer-require-checker"; - version = "4.15.0"; + version = "4.16.1"; # Upstream no longer provides the composer.lock in their release artifact src = fetchgit { url = "https://github.com/maglnet/ComposerRequireChecker"; tag = finalAttrs.version; - hash = "sha256-ku4IXiUNFfTie+umVOWx8v5vcmO51uRM/n7XN50cSjE="; + hash = "sha256-UAofdc8mqSnJXhCTABSf9JZERqur86lzNDI66EHgEQE="; }; - vendorHash = "sha256-AdRnqecNoDteuhGp/gWCg/xKxBRnv8I2FkuJYs4WslE="; + vendorHash = "sha256-bNeQEfwXly3LFuEKeSK6J6pRfQF6TNwUqu3SdTswmFI="; meta = { description = "CLI tool to check whether a specific composer package uses imported symbols that aren't part of its direct composer dependencies"; diff --git a/pkgs/by-name/ea/earthlyls/package.nix b/pkgs/by-name/ea/earthlyls/package.nix index da1c33c626e0..274c71c9d748 100644 --- a/pkgs/by-name/ea/earthlyls/package.nix +++ b/pkgs/by-name/ea/earthlyls/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "earthlyls"; - version = "0.5.3"; + version = "0.5.5"; src = fetchFromGitHub { owner = "glehmann"; repo = "earthlyls"; rev = version; - hash = "sha256-wn+6Aa4xTC5o4S+N7snB/vlyw0i23XkmaXUmrhfXuaA="; + hash = "sha256-GnFzfCjT4kjb9WViKIFDkIU7zVpiI6HDuUeddgHGQuc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Xc1m5WpZEKBP8fGtrQmwHFdqxdQ6wZzgSihSmXnLOhE="; + cargoHash = "sha256-sWbYN92Jfr/Pr3qoHWkew/ASIdq8DQg0WHpdyklGBLo="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/en/ente-cli/package.nix b/pkgs/by-name/en/ente-cli/package.nix index 42fde2888a6d..0f89c077239b 100644 --- a/pkgs/by-name/en/ente-cli/package.nix +++ b/pkgs/by-name/en/ente-cli/package.nix @@ -9,7 +9,7 @@ testers, }: let - version = "0.2.2"; + version = "0.2.3"; canExecute = stdenv.buildPlatform.canExecute stdenv.hostPlatform; in @@ -21,7 +21,7 @@ buildGoModule { owner = "ente-io"; repo = "ente"; tag = "cli-v${version}"; - hash = "sha256-ynbljYl73XwCnt3RUNmOYdrN8FX3sJ+3qDhWa8m2YJs="; + hash = "sha256-qKMFoNtD5gH0Y+asD0LR5d3mxGpr2qVWXIUzJTSezeI="; sparseCheckout = [ "cli" ]; }; diff --git a/pkgs/by-name/er/errcheck/package.nix b/pkgs/by-name/er/errcheck/package.nix index 7ec574b4b4ce..fd0a880cce74 100644 --- a/pkgs/by-name/er/errcheck/package.nix +++ b/pkgs/by-name/er/errcheck/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "errcheck"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "kisielk"; repo = "errcheck"; rev = "v${version}"; - hash = "sha256-KEDUXZ720fntrQ8XIpbArU8Q1xEiOw32nYcNhXnQO7Q="; + hash = "sha256-DhOoJL4InJHl4ImIrhV086a++srC5E4LF2VQb838+L8="; }; - vendorHash = "sha256-rO2FoFksN3OdKXwlJBuISs6FmCtepc4FDLdOa5AHvC4="; + vendorHash = "sha256-znkT0S13wCB47InP2QBCZqeWxDdEeIwQPoVWoxiAosQ="; subPackages = [ "." ]; diff --git a/pkgs/by-name/fl/flashprog/package.nix b/pkgs/by-name/fl/flashprog/package.nix index 260effa1a4e7..67c5805073a2 100644 --- a/pkgs/by-name/fl/flashprog/package.nix +++ b/pkgs/by-name/fl/flashprog/package.nix @@ -1,5 +1,6 @@ { fetchgit, + fetchpatch, lib, libftdi1, libgpiod, @@ -24,6 +25,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-S+UKDtpKYenwm+zR+Bg8HHxb2Jr7mFHAVCZdZTqCyRQ="; }; + patches = [ + # fixes compiler warnings on Darwin + (fetchpatch { + url = "https://review.sourcearcade.org/changes/flashprog~309/revisions/2/patch?download"; + hash = "sha256-eiEenR8+CHCJcNx9YY09I7gxRGUQWmaQlmXtykvXyMU="; + decode = "base64 -d"; + }) + ]; + nativeBuildInputs = [ meson ninja @@ -45,10 +55,15 @@ stdenv.mkDerivation (finalAttrs: { libgpiod ]; + postInstall = '' + cd "$src" + install -Dm644 util/50-flashprog.rules "$out/lib/udev/rules.d/50-flashprog.rules" + ''; + meta = with lib; { homepage = "https://flashprog.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; - license = with licenses; [ gpl2Plus ]; + license = with licenses; [ gpl2 ]; maintainers = with maintainers; [ felixsinger funkeleinhorn diff --git a/pkgs/by-name/gf/gf/package.nix b/pkgs/by-name/gf/gf/package.nix index 7a3ce5677280..ec50399ac3bc 100644 --- a/pkgs/by-name/gf/gf/package.nix +++ b/pkgs/by-name/gf/gf/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation { pname = "gf"; - version = "0-unstable-2024-08-21"; + version = "0-unstable-2025-02-04"; src = fetchFromGitHub { repo = "gf"; owner = "nakst"; - rev = "40f2ae604f3b94b7f818680ac53d4683c629bcf3"; - hash = "sha256-Z8hW/GQjnnojoLeetrBlMnAJ9sP9ELv1lSQJjYPxtRc="; + rev = "9c1686439f97ae6e1ca8f1fb785b545303adfebc"; + hash = "sha256-0uABsjAVn+wAN8hMkM38CepSV4gYtIL0WHDq25TohZ0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix index b9ab55fc993b..b345d6a776bc 100644 --- a/pkgs/by-name/im/imhex/package.nix +++ b/pkgs/by-name/im/imhex/package.nix @@ -27,15 +27,15 @@ }: let - version = "1.36.2"; - patterns_version = "1.36.2"; + version = "1.37.0"; + patterns_version = "1.37.0"; patterns_src = fetchFromGitHub { name = "ImHex-Patterns-source-${patterns_version}"; owner = "WerWolv"; repo = "ImHex-Patterns"; - rev = "ImHex-v${patterns_version}"; - hash = "sha256-MKw9BsOhbaojmQGdl+Wkit/ot5Xsym+AvCTHY2vZHmY="; + tag = "ImHex-v${patterns_version}"; + hash = "sha256-2NgMYaG6+XKp0fIHAn3vAcoXXa3EF4HV01nI+t1IL1U="; }; in @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "WerWolv"; repo = "ImHex"; tag = "v${finalAttrs.version}"; - hash = "sha256-e7ppx2MdtTPki/Q+1kWswHkFLNRcO0Y8+q9VzpgUoVE="; + hash = "sha256-6Pm34NSmSHKwvOUJNDbHs7i7WE7HHZbQ0LpWaHxRAYo="; }; strictDeps = true; @@ -137,6 +137,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ kashw2 cafkafk + govanify ]; platforms = with lib.platforms; linux ++ darwin; }; diff --git a/pkgs/by-name/it/itch-dl/package.nix b/pkgs/by-name/it/itch-dl/package.nix new file mode 100644 index 000000000000..9eaf7acdeb91 --- /dev/null +++ b/pkgs/by-name/it/itch-dl/package.nix @@ -0,0 +1,49 @@ +{ + fetchFromGitHub, + lib, + python3Packages, +}: + +python3Packages.buildPythonApplication rec { + pname = "itch-dl"; + version = "0.5.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "DragoonAethis"; + repo = "itch-dl"; + tag = version; + hash = "sha256-MkhXM9CQXbVcnztMPnBscryXWSaSQUeoG6KtVuS8YEo="; + }; + + nativeBuildInputs = with python3Packages; [ + pythonRelaxDepsHook + ]; + + build-system = with python3Packages; [ + poetry-core + ]; + + dependencies = with python3Packages; [ + beautifulsoup4 + lxml + pydantic + requests + tqdm + urllib3 + ]; + + pythonRelaxDeps = [ + "pydantic" + "urllib3" + ]; + + meta = { + description = "Itch.io game downloader with website, game jam, collection and library support"; + mainProgram = "itch-dl"; + homepage = "https://github.com/DragoonAethis/itch-dl"; + changelog = "https://github.com/DragoonAethis/itch-dl/releases/tag/${src.tag}"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ jopejoe1 ]; + }; +} diff --git a/pkgs/by-name/ku/kubedb-cli/package.nix b/pkgs/by-name/ku/kubedb-cli/package.nix index 5ee91afb4066..3b8ede1ec336 100644 --- a/pkgs/by-name/ku/kubedb-cli/package.nix +++ b/pkgs/by-name/ku/kubedb-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.51.0"; + version = "0.52.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; tag = "v${version}"; - hash = "sha256-e3kP1N6uhLKrOWfvl29vVB9D/bpj1W+1dGlaAuc8es0="; + hash = "sha256-3NnQLgrcxiz2KqRMbQWxgwbe1JPFF1VforGvMwhZfoo="; }; vendorHash = null; diff --git a/pkgs/by-name/md/mdbook-katex/package.nix b/pkgs/by-name/md/mdbook-katex/package.nix index 1771778f5f76..42378e78607a 100644 --- a/pkgs/by-name/md/mdbook-katex/package.nix +++ b/pkgs/by-name/md/mdbook-katex/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.9.2"; + version = "0.9.3"; src = fetchCrate { inherit pname version; - hash = "sha256-O2hFv/9pqrs8cSDvHLAUnXx4mX6TN8hvPLroWgoCgwE="; + hash = "sha256-5EYskcYEDZENK7ehws36+5MrTY2rNTXoFnWYOC+LuiQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-EoWsjuvvWeAI3OnVRJQT2hwoYq4BNqqvitH9LT0XGnA="; + cargoHash = "sha256-j0BdEnPP7/0i1hg7GNgc+F4EeElVm6AZIWZNelYZLIU="; meta = { description = "Preprocessor for mdbook, rendering LaTeX equations to HTML at build time"; diff --git a/pkgs/by-name/ob/obsidian/package.nix b/pkgs/by-name/ob/obsidian/package.nix index 3d691d5a02cf..acf085e3d947 100644 --- a/pkgs/by-name/ob/obsidian/package.nix +++ b/pkgs/by-name/ob/obsidian/package.nix @@ -13,7 +13,7 @@ }: let pname = "obsidian"; - version = "1.8.4"; + version = "1.8.7"; appname = "Obsidian"; meta = with lib; { description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -37,9 +37,9 @@ let url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; hash = if stdenv.hostPlatform.isDarwin then - "sha256-kg0gH4LW78uKUxnvE1CG8B1BvJzyO8vlP6taLvmGw/s=" + "sha256-odpuje7yiEztYG8Yt7oUhR7N7wkdXo8OlglTTMeCz4k=" else - "sha256-bvmvzVyHrjh1Yj3JxEfry521CMX3E2GENmXddEeLwiE="; + "sha256-tOP3kXWVmL8aH5QP8E6VtJAf4sLEgVRuXidRU1iJkM8="; }; icon = fetchurl { diff --git a/pkgs/by-name/oc/ocelot-desktop/package.nix b/pkgs/by-name/oc/ocelot-desktop/package.nix new file mode 100644 index 000000000000..a8441efb34eb --- /dev/null +++ b/pkgs/by-name/oc/ocelot-desktop/package.nix @@ -0,0 +1,149 @@ +{ + lib, + stdenv, + fetchurl, + + makeBinaryWrapper, + makeDesktopItem, + copyDesktopItems, + + jre, + + # deps + alsa-lib, + libjack2, + libpulseaudio, + pipewire, + libGL, + libX11, + libXcursor, + libXext, + libXrandr, + libXxf86vm, + + # runtime (path) + xrandr, + + # native + unzip, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "ocelot-desktop"; + version = "1.13.1"; + + __darwinAllowLocalNetworking = true; + + # Cannot build from source because sbt/scala support is completely non-existent in nixpkgs + src = fetchurl { + url = "https://gitlab.com/api/v4/projects/9941848/packages/generic/ocelot-desktop/v${finalAttrs.version}/ocelot-desktop-v${finalAttrs.version}.jar"; + hash = "sha256-aXjz2H4vO8D7BGHxhanbmpxqd8op31v1Gwk/si4CBfg="; + }; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + preferLocal = true; + + nativeBuildInputs = [ + makeBinaryWrapper + copyDesktopItems + unzip + ]; + + installPhase = + let + # does darwin need any deps? + runtimeLibs = lib.optionals stdenv.hostPlatform.isLinux [ + # openal + alsa-lib + libjack2 + libpulseaudio + pipewire + + # lwjgl + libGL + libX11 + libXcursor + libXext + libXrandr + libXxf86vm + ]; + runtimePrograms = lib.optionals stdenv.hostPlatform.isLinux [ + # https://github.com/LWJGL/lwjgl/issues/128 + xrandr + ]; + in + '' + runHook preInstall + + mkdir -p $out/{bin,share/${finalAttrs.pname}} + install -Dm644 ${finalAttrs.src} $out/share/${finalAttrs.pname}/ocelot-desktop.jar + + makeBinaryWrapper ${jre}/bin/java $out/bin/ocelot-desktop \ + --set JAVA_HOME ${jre.home} \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeLibs}" \ + --prefix PATH : "${lib.makeBinPath runtimePrograms}" \ + --add-flags "-jar $out/share/${finalAttrs.pname}/ocelot-desktop.jar" + + # copy icons from zip file + # ocelot/desktop/images/icon*.png + # 16,32,64,128,256 + + for size in 16 32 64 128 256; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + unzip -p $out/share/${finalAttrs.pname}/ocelot-desktop.jar \ + ocelot/desktop/images/icon"$size".png > $out/share/icons/hicolor/"$size"x"$size"/apps/ocelot-desktop.png + done + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "ocelot-desktop"; + desktopName = "Ocelot Desktop"; + genericName = "OpenComputers Emulator"; + comment = "An advanced OpenComputers emulator"; + tryExec = "ocelot-desktop"; + exec = "ocelot-desktop -w %f"; + icon = "ocelot-desktop"; + startupNotify = true; + startupWMClass = "Ocelot Desktop"; # (maybe broken) + terminal = false; + keywords = [ + "Ocelot" + "OpenComputers" + "Emulator" + "oc" + "lua" + "OpenOS" + "ocemu" + "mc" + "Minecraft" + ]; + categories = [ + "Development" + "Emulator" + ]; + mimeTypes = [ + "inode/directory" + ]; + }) + ]; + + meta = { + description = "An advanced OpenComputers emulator"; + homepage = "https://ocelot.fomalhaut.me/desktop"; + changelog = "https://gitlab.com/cc-ru/ocelot/ocelot-desktop/-/releases/v${finalAttrs.version}"; + license = lib.licenses.mit; + mainProgram = "ocelot-desktop"; + platforms = with lib.platforms; linux ++ darwin; + badPlatforms = [ + # missing compatible lwjgl.dylib + "aarch64-darwin" + ]; + maintainers = with lib.maintainers; [ griffi-gh ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + }; +}) diff --git a/pkgs/by-name/pc/pcloud/package.nix b/pkgs/by-name/pc/pcloud/package.nix index a418ac534d51..351a2e6af053 100644 --- a/pkgs/by-name/pc/pcloud/package.nix +++ b/pkgs/by-name/pc/pcloud/package.nix @@ -39,13 +39,13 @@ let pname = "pcloud"; - version = "1.14.9"; - code = "XZjcLF5ZnbPpMxAlI5FuU39vntbjAhMhVEVV"; + version = "1.14.10"; + code = "XZLHKH5Z2KieO7jdb34LVHFY8okPD8bpqXM7"; # Archive link's codes: https://www.pcloud.com/release-notes/linux.html src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=pcloud-${version}.zip"; - hash = "sha256-9YgXF2oAbIN8k33wveCPnc4fU3mYv1RB2/jeHmbockY="; + hash = "sha256-yIsUScXGmIoZc1Mawq/SVrpJWMYFn1G/ovukLWMYVa8="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/pi/pixi-pack/package.nix b/pkgs/by-name/pi/pixi-pack/package.nix index b0dd0001fc7c..d3f3f0f4c0d6 100644 --- a/pkgs/by-name/pi/pixi-pack/package.nix +++ b/pkgs/by-name/pi/pixi-pack/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "pixi-pack"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "Quantco"; repo = "pixi-pack"; tag = "v${version}"; - hash = "sha256-gzP/01pck14cMN0PopoCO27dxncWz4yIZFAzXU+4IQ0="; + hash = "sha256-fTQSSrmfWvyGD1+YM2I6Lly6gYwMlB/h8VRbDsvG3mU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-dTpwlE/o7YzLWfJSEOgHfI64l9XNLt3gC1GE4IhL66o="; + cargoHash = "sha256-ujrEUXQGaESNSZndBblM/4e/zl376FRdj4Hp3AA2yJA="; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/ra/rasm/package.nix b/pkgs/by-name/ra/rasm/package.nix index 2c84af6b1509..31551db83407 100644 --- a/pkgs/by-name/ra/rasm/package.nix +++ b/pkgs/by-name/ra/rasm/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "rasm"; - version = "2.3.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "EdouardBERGE"; repo = "rasm"; rev = "v${version}"; - hash = "sha256-AV01XbjbF2pyIJ7lO/4mzWSREC2+aX4w5YJ8AI3GrqI="; + hash = "sha256-Yi4E8sgaQmUkQL7sxpbGDG6IPsL9RfMW2xXBCBhYXwg="; }; # by default the EXEC variable contains `rasm.exe` diff --git a/pkgs/by-name/ri/rippkgs/package.nix b/pkgs/by-name/ri/rippkgs/package.nix index 33055ab193c1..dc40f4a09d6a 100644 --- a/pkgs/by-name/ri/rippkgs/package.nix +++ b/pkgs/by-name/ri/rippkgs/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "rippkgs"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "replit"; repo = "rippkgs"; tag = "v${version}"; - hash = "sha256-CQGmTXzAj3wA7UTwdeL7gujbT4duS8QE5yZzGKwvzog="; + hash = "sha256-nRaGbJg1zCHTL8y/Tk5dM1dSu2v06ECsZYyMPIQTlvg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-RW7FBg5aLaNVFDEM4IvpS5gnb2luqWH2ya/7gKKOp4A="; + cargoHash = "sha256-bSgQ/dmOffWOYpgeNn0vTdzrM/aFkD3znN9c1u/sjQ0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/se/serpl/package.nix b/pkgs/by-name/se/serpl/package.nix index 7603bc865374..24cc7ae109c5 100644 --- a/pkgs/by-name/se/serpl/package.nix +++ b/pkgs/by-name/se/serpl/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, gitUpdater, makeWrapper, + ast-grep, ripgrep, }: let @@ -19,6 +20,8 @@ rustPlatform.buildRustPackage { hash = "sha256-koD5aFqL+XVxc5Iq3reTYIHiPm0z7hAQ4K59IfbY4Hg="; }; + buildFeatures = [ "ast_grep" ]; + nativeBuildInputs = [ makeWrapper ]; useFetchCargoVendor = true; @@ -27,7 +30,12 @@ rustPlatform.buildRustPackage { postFixup = '' # Serpl needs ripgrep to function properly. wrapProgram $out/bin/serpl \ - --prefix PATH : "${lib.strings.makeBinPath [ ripgrep ]}" + --prefix PATH : "${ + lib.strings.makeBinPath [ + ripgrep + ast-grep + ] + }" ''; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/by-name/st/stac-validator/package.nix b/pkgs/by-name/st/stac-validator/package.nix index 90d77f4d2e27..9abb9da75c03 100644 --- a/pkgs/by-name/st/stac-validator/package.nix +++ b/pkgs/by-name/st/stac-validator/package.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonPackage rec { pname = "stac-validator"; - version = "3.4.0"; + version = "3.5.0"; pyproject = true; disabled = python3Packages.pythonOlder "3.8"; @@ -14,11 +14,15 @@ python3Packages.buildPythonPackage rec { owner = "stac-utils"; repo = "stac-validator"; tag = "v${version}"; - hash = "sha256-e3v8WvVbZcxN91w+YNUmSILZ1nZ9Vy1UbEpCQkTMQpQ="; + hash = "sha256-/MConEN+fcY3JKqP/24k0l/m2FHNhIqG7k42ldSPZ1U="; }; build-system = [ python3Packages.setuptools ]; + pythonRelaxDeps = [ + "click" + ]; + dependencies = with python3Packages; [ click jsonschema diff --git a/pkgs/by-name/sv/svdtools/package.nix b/pkgs/by-name/sv/svdtools/package.nix index d26f0e747a43..6d510db665d7 100644 --- a/pkgs/by-name/sv/svdtools/package.nix +++ b/pkgs/by-name/sv/svdtools/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "svdtools"; - version = "0.4.3"; + version = "0.4.4"; src = fetchCrate { inherit version pname; - hash = "sha256-ftT9EgICfy8vnb6XWEUUtX351+f5aex8xaY11nnWcAY="; + hash = "sha256-gZK0PdvubxyDD9wqhz3vuXeP33ibsZE5AZin7H2mnNQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-aNdEvmHnc0LqcjIJbh8gi3SfHnFPnlkO5CwO38ezfr8="; + cargoHash = "sha256-gunDbKMGd0f+TDt5tqh5siw0jnTtlpohteA4NNQHj24="; meta = with lib; { description = "Tools to handle vendor-supplied, often buggy SVD files"; diff --git a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix index 18c2494b8965..812b1b7f5a79 100644 --- a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix +++ b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix @@ -1,23 +1,23 @@ { - version = "1.19.2"; + version = "1.20.0"; x86_64-linux = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.19.2/linux/amd64/sysdig-cli-scanner"; - hash = "sha256-H8qYf6s2OTHjHwhZlqXkrYxdCWuuqPhKXRDkpCYGfhM="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.20.0/linux/amd64/sysdig-cli-scanner"; + hash = "sha256-zN8s7Ztc1yz6bbLlbIesnbv6CfrsB8VFaXyixPVR40E="; }; aarch64-linux = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.19.2/linux/arm64/sysdig-cli-scanner"; - hash = "sha256-uC1U9Zbt8mSSiEWKWWMJawdYQwIW6N7rxnmduO1E5DA="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.20.0/linux/arm64/sysdig-cli-scanner"; + hash = "sha256-b1SE9q1NZQeHjjX3dyXzCc5/ZuiOWKON623eu8TlzhI="; }; x86_64-darwin = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.19.2/darwin/amd64/sysdig-cli-scanner"; - hash = "sha256-byLOKPD4DuSd5LYTPr81XBHUW5cM+ngxTxon1A2rfPQ="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.20.0/darwin/amd64/sysdig-cli-scanner"; + hash = "sha256-Rwq8en8dt1VKoPdHWTIYr67ppBlFI+br/H8jKepfqKQ="; }; aarch64-darwin = { - url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.19.2/darwin/arm64/sysdig-cli-scanner"; - hash = "sha256-rKlsodq5YJT4k69iDLvkELYUV7kQ24cgDh5sGrsT9ns="; + url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.20.0/darwin/arm64/sysdig-cli-scanner"; + hash = "sha256-LWlCemjODa29NA+/Skzw8hWtbOmtMWYSI3G3e1PvUDo="; }; } diff --git a/pkgs/by-name/tu/turbo-unwrapped/package.nix b/pkgs/by-name/tu/turbo-unwrapped/package.nix index 8223b592248c..6c2d6f4c7549 100644 --- a/pkgs/by-name/tu/turbo-unwrapped/package.nix +++ b/pkgs/by-name/tu/turbo-unwrapped/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage rec { pname = "turbo-unwrapped"; - version = "2.3.4"; + version = "2.4.2"; src = fetchFromGitHub { owner = "vercel"; repo = "turbo"; tag = "v${version}"; - hash = "sha256-cvwYBdvBxkntCXA4FJMc54Rca+zoZEjyWZUQoMH9Qdc="; + hash = "sha256-wXQY9W15J7+Plv3IvB8XaZd+Hn0TP2qDOB36bPJwfpY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-e9xq3xc8Rtuq3e/3IEwj9eR9SEj5N4bvsu4PFubm8mM="; + cargoHash = "sha256-L56ubw2tQ3y2KBbbnUdnS9xZzQNMDKdCzKC0n12yl6o="; nativeBuildInputs = [ diff --git a/pkgs/by-name/tu/turso-cli/package.nix b/pkgs/by-name/tu/turso-cli/package.nix index b050c1ef68d7..d8532a4a0347 100644 --- a/pkgs/by-name/tu/turso-cli/package.nix +++ b/pkgs/by-name/tu/turso-cli/package.nix @@ -8,13 +8,13 @@ }: buildGoModule rec { pname = "turso-cli"; - version = "0.97.2"; + version = "0.98.0"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-6Ci1QESSN6wNpUAQoWtTyHWrGaI/3xs/jGCSkJsYC8o="; + hash = "sha256-/e1AZVTSS7xH0oa2akPN/Tf3F/Jp2JaWj3qcnk9f458="; }; vendorHash = "sha256-tBO21IgUczwMgrEyV7scV3YTY898lYHASaLeXqvBopU="; diff --git a/pkgs/by-name/tw/twilio-cli/package.nix b/pkgs/by-name/tw/twilio-cli/package.nix index acfa7428ceba..16bacec316d2 100644 --- a/pkgs/by-name/tw/twilio-cli/package.nix +++ b/pkgs/by-name/tw/twilio-cli/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.22.10"; + version = "5.22.11"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - hash = "sha256-ZesjUeAoOuNWITzM1qjWsvh2DMehyy8XJDhecylx4V4="; + hash = "sha256-SeSv16lZ2Dmfngkq1TtvzlM3oIJkVPsdnkc1hRuSZU4="; }; buildInputs = [ nodejs-slim ]; diff --git a/pkgs/by-name/wo/workshop-runner/package.nix b/pkgs/by-name/wo/workshop-runner/package.nix index 0723c1b2515c..ed44154c1f0f 100644 --- a/pkgs/by-name/wo/workshop-runner/package.nix +++ b/pkgs/by-name/wo/workshop-runner/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "workshop-runner"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "mainmatter"; repo = "rust-workshop-runner"; rev = "v${version}"; - hash = "sha256-8Qq3kXFR4z9k7I6b9hN1JKOGNkzydo/wA99/X17iSkk="; + hash = "sha256-PfQPRbOPK1Y/j8Xtg78oDzBFUx8eiM3ZwRul/ao0SgI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-lbmmmMDlQDf91D1ivpaJCo4Dw0eJ9QTzKBNuYieDwH8="; + cargoHash = "sha256-opV2IrqMIwdgrXY6V0jxFtrdP8NVmdlUdsLdfFNimt0="; meta = { description = "CLI tool to drive test-driven Rust workshops"; diff --git a/pkgs/by-name/xe/xeol/package.nix b/pkgs/by-name/xe/xeol/package.nix index 086b30c9c6d9..eb66888eb3a6 100644 --- a/pkgs/by-name/xe/xeol/package.nix +++ b/pkgs/by-name/xe/xeol/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "xeol"; - version = "0.10.4"; + version = "0.10.7"; src = fetchFromGitHub { owner = "xeol-io"; repo = "xeol"; tag = "v${version}"; - hash = "sha256-zm8PIYWFLEiWuZGt5Fev35d8EYOfzduIXX6SmJZ27o0="; + hash = "sha256-I7+gR4y0wVpQeDoRH2OYr38PGuyZ/lk5M3bX0VeAqfQ="; }; vendorHash = "sha256-hPWjXTxk/jRkzvLYNgVlgj0hjzfikwel1bxSqWquVhk="; diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 818afbe97867..f4dba881b345 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -96,7 +96,7 @@ let in rustPlatform.buildRustPackage rec { pname = "zed-editor"; - version = "0.173.11"; + version = "0.174.4"; outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server"; @@ -104,7 +104,7 @@ rustPlatform.buildRustPackage rec { owner = "zed-industries"; repo = "zed"; tag = "v${version}"; - hash = "sha256-iHojGnVW8cNRVwHghDAymPrznFYWaC4n/WfjRYGsHtw="; + hash = "sha256-Nvd4SvjnuyepYY/B8s7gafp3ZlOheOFqnIwncoq2Dhg="; }; patches = [ @@ -124,7 +124,7 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-Gen/WJUoYgGYDYS1hW563dQc8zDMMQnvF0Mk49TNWJo="; + cargoHash = "sha256-9rnnYf0bJr0BzBXL3sI5yRnCMKgWMfbvvRdbyaqZVi0="; nativeBuildInputs = [ diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 68ffb2677cef..733c11750984 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -258,13 +258,6 @@ rec { llvmPackages = llvmPackages_15; }; - crystal_1_12 = generic { - version = "1.12.1"; - sha256 = "sha256-Q6uI9zPZ3IOGyUuWdC179GPktPGFPRbRWKtOF4YWCBw="; - binary = binaryCrystal_1_10; - llvmPackages = llvmPackages_18; - }; - crystal_1_14 = generic { version = "1.14.1"; sha256 = "sha256-cQWK92BfksOW8GmoXn4BmPGJ7CLyLAeKccOffQMh5UU="; diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index 093e9c9d295d..39ff6f2d5686 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiolifx-themes"; - version = "0.6.5"; + version = "0.6.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Djelibeybi"; repo = "aiolifx-themes"; tag = "v${version}"; - hash = "sha256-mqxqlfpxfR5IH3MbYsLhBE36qkM7MgnyXdR0dlMr+t8="; + hash = "sha256-Y0UJYxeYcKhDLcQOm/7vju9OD8f58oDPJ5l5Ep7Flcc="; }; build-system = [ poetry-core ]; @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Color themes for LIFX lights running on aiolifx"; homepage = "https://github.com/Djelibeybi/aiolifx-themes"; - changelog = "https://github.com/Djelibeybi/aiolifx-themes/releases/tag/v${version}"; + changelog = "https://github.com/Djelibeybi/aiolifx-themes/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ lukegb ]; }; diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix index b41a55fc219c..15d9bee935be 100644 --- a/pkgs/development/python-modules/aiortm/default.nix +++ b/pkgs/development/python-modules/aiortm/default.nix @@ -4,22 +4,20 @@ aioresponses, buildPythonPackage, ciso8601, - click, fetchFromGitHub, mashumaro, - poetry-core, pytest-asyncio, pytest-cov-stub, pytestCheckHook, pythonOlder, - rich, + setuptools, typer, yarl, }: buildPythonPackage rec { pname = "aiortm"; - version = "0.9.45"; + version = "0.10.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -28,29 +26,30 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiortm"; tag = "v${version}"; - hash = "sha256-5PbfadI80hIdqUh/7tenTD3buiM7tcGauDqhv2uHNDs="; + hash = "sha256-YclrU24eyk88eOc/nlgeWJ/Fo9SveCzRqQCKYAA9Y9s="; }; pythonRelaxDeps = [ "typer" ]; - build-system = [ poetry-core ]; + build-system = [ setuptools ]; dependencies = [ aiohttp ciso8601 - click mashumaro - rich - typer yarl ]; + optional-dependencies = { + cli = [ typer ]; + }; + nativeCheckInputs = [ aioresponses pytest-asyncio pytest-cov-stub pytestCheckHook - ]; + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "aiortm" ]; @@ -58,7 +57,7 @@ buildPythonPackage rec { description = "Library for the Remember the Milk API"; homepage = "https://github.com/MartinHjelmare/aiortm"; changelog = "https://github.com/MartinHjelmare/aiortm/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ fab ]; mainProgram = "aiortm"; }; diff --git a/pkgs/development/python-modules/ancp-bids/default.nix b/pkgs/development/python-modules/ancp-bids/default.nix index 9b8c610dfcfd..751704006be0 100644 --- a/pkgs/development/python-modules/ancp-bids/default.nix +++ b/pkgs/development/python-modules/ancp-bids/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "ancp-bids"; - version = "0.2.6"; + version = "0.2.9"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ANCPLabOldenburg"; repo = pname; tag = version; - hash = "sha256-JxF1W4yMPFIQXPH7QHfcHssWMP/Uci07e66WE5qVJx4="; + hash = "sha256-vmw8SAikvbaHnPOthBQxTbyvDwnnZwCOV97aUogIgxw="; }; build-system = [ setuptools ]; @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://ancpbids.readthedocs.io"; description = "Read/write/validate/query BIDS datasets"; - changelog = "https://github.com/ANCPLabOldenburg/ancp-bids/releases/tag/${version}"; + changelog = "https://github.com/ANCPLabOldenburg/ancp-bids/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/androidtvremote2/default.nix b/pkgs/development/python-modules/androidtvremote2/default.nix index de94696c0a3f..2e40d4dab65f 100644 --- a/pkgs/development/python-modules/androidtvremote2/default.nix +++ b/pkgs/development/python-modules/androidtvremote2/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "androidtvremote2"; - version = "0.1.2"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "androidtvremote2"; tag = "v${version}"; - hash = "sha256-4iVM7BCqOFHrW2BvPakXxp3MfZa+WlB7g/ix239NldE="; + hash = "sha256-mvkOz57R2OLYUeSD2GSyslgbWFHPOzdO4DpSMemUT5U="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/asdf-astropy/default.nix b/pkgs/development/python-modules/asdf-astropy/default.nix index 47e42cee8738..ff7d3b23719c 100644 --- a/pkgs/development/python-modules/asdf-astropy/default.nix +++ b/pkgs/development/python-modules/asdf-astropy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "asdf-astropy"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,15 +28,15 @@ buildPythonPackage rec { owner = "astropy"; repo = "asdf-astropy"; tag = version; - hash = "sha256-xtDpKlAExMTYNopS9cAhLU2ZnHhtHHaV3KjWCq0yapE="; + hash = "sha256-hP77qhNTE89cuz9Z8vWlWYo2En0SV4uoHaBnxQDNEvI="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ asdf asdf-coordinates-schemas asdf-standard @@ -61,7 +61,7 @@ buildPythonPackage rec { meta = with lib; { description = "Extension library for ASDF to provide support for Astropy"; homepage = "https://github.com/astropy/asdf-astropy"; - changelog = "https://github.com/astropy/asdf-astropy/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/astropy/asdf-astropy/blob/${src.tag}/CHANGES.rst"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 0ce3352f54a2..3c149cd96a0a 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.36.21"; + version = "1.36.23"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-DLQbzGBJDI8vaRbSRoObABcYT//zH2X8LpIFvs6vU7o="; + hash = "sha256-4JAW8G2vd5TRGBWJG5YvWIxRPF9e5sCrLARcN195jJo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 06b3da567146..8578be6c480b 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.36.21"; + version = "1.36.23"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-tJUgpxxHu1bftNr+p1HEDg/vzXBw/vfqfw1UzJF9gqo="; + hash = "sha256-IoPPbpJqMj0qK6AyIiiWDbf0AGHf7hl4WBGDWdhAKBY="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index d510f1fbd13d..6843cec106ff 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cyclopts"; - version = "3.7.0"; + version = "3.9.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "BrianPugh"; repo = "cyclopts"; tag = "v${version}"; - hash = "sha256-Zv0q8m7BS9MF2xyRRgVn1Bc8iwycmaXbP9S6yNl0yUk="; + hash = "sha256-08+LuMVayVpZQ/7Mw/zdYrnMovKwoBc2kgPE1D7wTWM="; }; build-system = [ diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index fe6dc53da4c8..df1ed39d0dff 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "geoalchemy2"; - version = "0.17.0"; + version = "0.17.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "geoalchemy"; repo = "geoalchemy2"; tag = version; - hash = "sha256-MxoX5WGJATIvzfeuHFqYGlnaxPNzvqD/v82Zm4Iav1g="; + hash = "sha256-ze0AWwlmBsMUhbmaCNUeEwhFcLxRDeal0IDO421++ck="; }; build-system = [ @@ -66,7 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Toolkit for working with spatial databases"; homepage = "https://geoalchemy-2.readthedocs.io/"; - changelog = "https://github.com/geoalchemy/geoalchemy2/releases/tag/${version}"; + changelog = "https://github.com/geoalchemy/geoalchemy2/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ nickcao ]; }; diff --git a/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix b/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix index d231c6ec3cab..6933c020c487 100644 --- a/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix +++ b/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-network-connectivity"; - version = "2.6.0"; + version = "2.7.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "google_cloud_network_connectivity"; - hash = "sha256-tEO50cklPrVOT6gUZ1uvTzyLx4XrysnPvDbD2Wgj7ZI="; + hash = "sha256-RzYM+qqALaTtxyOJQz7G6xqUUznSg+7uVN/ZUOjSg90="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 343eca87786f..09808261b134 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.12.0"; + version = "1.13.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_org_policy"; inherit version; - hash = "sha256-xM9fJH21AbNOrNZG1Ahs+NuhKOxCuKv41mSrJQXjH2Y="; + hash = "sha256-ajFHKQI6fD/X/gYrasb1qwZNbOzrFyJg8mUaxa9CeM4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index ce6b2df45ccc..5f7d42c2d116 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.30.0"; + version = "2.31.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_speech"; inherit version; - hash = "sha256-7GPL1MK72wMGRioPMAgvRJXe3FBvDEoaKZDubmNGVEw="; + hash = "sha256-15mMJqlF9Ykzxg4tOAPtBZPrQWusnUOBwDBZ0QJy7wM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index b9daea61b4ac..1a5550d505ba 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.66"; + version = "0.67"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; tag = "v${version}"; - hash = "sha256-9VX+g7p9YmwahikVnQQ1kbm82VZLm5nqMQktQhbflBw="; + hash = "sha256-R/T6rvL+UKajF8RKYTQc8WndKqRsqFdiPoKaA2ti6yI="; }; build-system = [ diff --git a/pkgs/development/python-modules/jsonargparse/default.nix b/pkgs/development/python-modules/jsonargparse/default.nix index b02ad887e890..55543c75dfb6 100644 --- a/pkgs/development/python-modules/jsonargparse/default.nix +++ b/pkgs/development/python-modules/jsonargparse/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "jsonargparse"; - version = "4.36.0"; + version = "4.37.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "omni-us"; repo = "jsonargparse"; tag = "v${version}"; - hash = "sha256-wtYE6DQ6EgTFJjzx3IdavnV6TUIGmvPM3PR/+9oeJAk="; + hash = "sha256-ApM4M4VMAvhrZ2KFk7js3snBx+hV5xzufGFuuN14iQM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix index 1fd803cbbd99..68ed2081bc1c 100644 --- a/pkgs/development/python-modules/lacuscore/default.nix +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "lacuscore"; - version = "1.12.10"; + version = "1.13.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "LacusCore"; tag = "v${version}"; - hash = "sha256-IKH7c1/MgjlfJ9tKVeTXW8MdLIc7P+jitvQkZn9f75Y="; + hash = "sha256-4+YA+kWdohroFO1EMw7Nwy5w+bTGRrkaOwv1iaV9pZ0="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/langchain-chroma/default.nix b/pkgs/development/python-modules/langchain-chroma/default.nix index 53641f07cf33..f074d7f3f53a 100644 --- a/pkgs/development/python-modules/langchain-chroma/default.nix +++ b/pkgs/development/python-modules/langchain-chroma/default.nix @@ -6,28 +6,28 @@ langchain-core, langchain-tests, numpy, - poetry-core, + pdm-backend, pytestCheckHook, pytest-asyncio, }: buildPythonPackage rec { pname = "langchain-chroma"; - version = "0.2.0"; + version = "0.2.2"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-chroma==${version}"; - hash = "sha256-9YxWLc8SaxTl7LwbK0FGzl2WtkWJzTHxm3VRYFGB5To="; + hash = "sha256-GFDaUA0E25YDHYLwrpsAuOiBWFvHByl61XhwK5NmJbg="; }; sourceRoot = "${src.name}/libs/partners/chroma"; patches = [ ./001-async-test.patch ]; - build-system = [ poetry-core ]; + build-system = [ pdm-backend ]; pythonRelaxDeps = [ "numpy" ]; diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index f7e43dae3162..0af7ae2e6267 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - poetry-core, + pdm-backend, # dependencies aiohttp, @@ -13,16 +13,13 @@ langchain, langchain-core, langsmith, + numpy, pydantic-settings, pyyaml, requests, sqlalchemy, tenacity, - # optional-dependencies - typer, - numpy, - # tests httpx, langchain-tests, @@ -39,19 +36,19 @@ buildPythonPackage rec { pname = "langchain-community"; - version = "0.3.15"; + version = "0.3.17"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-community==${version}"; - hash = "sha256-2/Zrl/wED/zm1m+NqgAD4AdrEh/LjFOeQoOSSM05e+s="; + hash = "sha256-+10Q8em74G5RU6VtDqhQJuDsjJ4/EjGM4a3xQzs3Qzo="; }; sourceRoot = "${src.name}/libs/community"; - build-system = [ poetry-core ]; + build-system = [ pdm-backend ]; pythonRelaxDeps = [ "numpy" @@ -66,6 +63,7 @@ buildPythonPackage rec { langchain langchain-core langsmith + numpy pydantic-settings pyyaml requests @@ -73,11 +71,6 @@ buildPythonPackage rec { tenacity ]; - optional-dependencies = { - cli = [ typer ]; - numpy = [ numpy ]; - }; - pythonImportsCheck = [ "langchain_community" ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index d1a5c9f77b64..ef6e79ac0220 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -5,19 +5,17 @@ fetchFromGitHub, # build-system - poetry-core, + pdm-backend, # dependencies jsonpatch, langsmith, packaging, + pydantic, pyyaml, tenacity, typing-extensions, - # optional-dependencies - pydantic, - # tests freezegun, grandalf, @@ -37,19 +35,19 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "0.3.31"; + version = "0.3.35"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-core==${version}"; - hash = "sha256-u+Za7NtXVP0Mg6K65CuRLx8OrVpBXEe1ayP0uMUNJG4="; + hash = "sha256-bwNSeXQJsfbc4c8mSd0GtlVsQ/HRilNiyP6XLcEzL20="; }; sourceRoot = "${src.name}/libs/core"; - build-system = [ poetry-core ]; + build-system = [ pdm-backend ]; pythonRelaxDeps = [ "tenacity" ]; @@ -57,15 +55,12 @@ buildPythonPackage rec { jsonpatch langsmith packaging + pydantic pyyaml tenacity typing-extensions ]; - optional-dependencies = { - pydantic = [ pydantic ]; - }; - pythonImportsCheck = [ "langchain_core" ]; # avoid infinite recursion diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix index 14530258f51a..9cbbaabf86eb 100644 --- a/pkgs/development/python-modules/langchain-openai/default.nix +++ b/pkgs/development/python-modules/langchain-openai/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - poetry-core, + pdm-backend, # dependencies langchain-core, @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "langchain-openai"; - version = "0.3.1"; + version = "0.3.5"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-openai==${version}"; - hash = "sha256-WvHSeWdBuxbfMNmfoNMzEbhJ5rirQ4JwlWUa0Tgrlrg="; + hash = "sha256-we9LPZeR/eIr+4uDXbBlTm43iapC+MCB0BrbH49Uknw="; }; sourceRoot = "${src.name}/libs/partners/openai"; @@ -45,7 +45,7 @@ buildPythonPackage rec { --replace-fail "--cov=langchain_openai" "" ''; - build-system = [ poetry-core ]; + build-system = [ pdm-backend ]; dependencies = [ langchain-core diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix index e3088d5acccb..746c953d873b 100644 --- a/pkgs/development/python-modules/langchain-text-splitters/default.nix +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, # build-system - poetry-core, + pdm-backend, # dependencies langchain-core, @@ -17,19 +17,19 @@ buildPythonPackage rec { pname = "langchain-text-splitters"; - version = "0.3.5"; + version = "0.3.6"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-text-splitters==${version}"; - hash = "sha256-2IoNUixZ/+o6ONJpqFa3Z5CLpxj6b6z8dh89kxh2rP4="; + hash = "sha256-mYaIVE/v+t7TJw/l87IJcFh893OTIew6jl6OVj0gXCo="; }; sourceRoot = "${src.name}/libs/text-splitters"; - build-system = [ poetry-core ]; + build-system = [ pdm-backend ]; dependencies = [ langchain-core ]; diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 1c84fceb2e70..39cb8a41908d 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -2,27 +2,27 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonOlder, # build-system - poetry-core, + pdm-backend, # buildInputs bash, # dependencies aiohttp, + async-timeout, langchain-core, langchain-text-splitters, langsmith, + numpy, pydantic, pyyaml, requests, sqlalchemy, tenacity, - # optional-dependencies - numpy, - # tests freezegun, httpx, @@ -40,19 +40,19 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.3.15"; + version = "0.3.18"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain==${version}"; - hash = "sha256-lANGoMABH1f9Tl/GgMMr7eTCji9q3uqD+Mwjr4nd2Dg="; + hash = "sha256-oJ4lUbQqHNEqd9UdgLH0ZmTkdZpUbJ7UNsQyIrs8JvI="; }; sourceRoot = "${src.name}/libs/langchain"; - build-system = [ poetry-core ]; + build-system = [ pdm-backend ]; buildInputs = [ bash ]; @@ -66,12 +66,13 @@ buildPythonPackage rec { langchain-core langchain-text-splitters langsmith + numpy pydantic pyyaml requests sqlalchemy tenacity - ]; + ] ++ lib.optional (pythonOlder "3.11") async-timeout; optional-dependencies = { numpy = [ numpy ]; diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix index f92751824544..5f092dee3231 100644 --- a/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "llama-index-readers-file"; - version = "0.4.4"; + version = "0.4.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_file"; inherit version; - hash = "sha256-4Haz+h5o7qFZTUfOwfZLOE+2Bn8ml8qKriK0ohrSfKc="; + hash = "sha256-POXIrX8oW7f/goxbLiAIiFasZc+WZAKH7Kdwtpoh34g="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix index 6cc2b0804cb9..0a4db11e4e1c 100644 --- a/pkgs/development/python-modules/mailchecker/default.nix +++ b/pkgs/development/python-modules/mailchecker/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "6.0.15"; + version = "6.0.16"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kC1ILRtdQQbt0u7MBnNAxots5OJHkJZDgThPZ9NbnlU="; + hash = "sha256-XZT70Nc1L/WGPM4tRgOrjs1N1AUD4O1V/evjcqS5qOk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix index f4cd85fd778c..4d3ac68bb345 100644 --- a/pkgs/development/python-modules/meilisearch/default.nix +++ b/pkgs/development/python-modules/meilisearch/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "meilisearch"; - version = "0.33.1"; + version = "0.34.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "meilisearch"; repo = "meilisearch-python"; tag = "v${version}"; - hash = "sha256-8x6Q0nGFz1pJ1jPfbepE7YL6z/HPkeyRYvwS9jJblRI="; + hash = "sha256-2AiQorAkDKHiq4DhwzUjJPCj6KCB6A2FAMgEqSrSrRg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix index 08ec5b909432..249d3190dd4b 100644 --- a/pkgs/development/python-modules/model-checker/default.nix +++ b/pkgs/development/python-modules/model-checker/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "model-checker"; - version = "0.7.17"; + version = "0.8.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "model_checker"; inherit version; - hash = "sha256-u9WHYglZG+SytH2qiUJV7YI+zCZ6UIdORXgSgcYgFYc="; + hash = "sha256-zOAyPK70OS55D6aKG4uVhmuNAZ+JUJDEHuk97tnnuK0="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index b79f7a46a8e2..cc332fbaa41d 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -66,8 +66,8 @@ rec { "sha256-i04sOKNlMSATWWF3LXzvxrVf0H4oM542RBNZd4Zt6tc="; mypy-boto3-amplify = - buildMypyBoto3Package "amplify" "1.36.0" - "sha256-mtmY1VpEEo3Nrcbjs7lO0YLsGxAEZ7gRn8MhJEUWQiU="; + buildMypyBoto3Package "amplify" "1.36.22" + "sha256-8PT6vH55v0HTFzpXq9zLOzgEZP1+FwA1fDpE4yTzEjY="; mypy-boto3-amplifybackend = buildMypyBoto3Package "amplifybackend" "1.36.0" @@ -166,8 +166,8 @@ rec { "sha256-mvC8pHHoNIK8xgiwGuoRcYsr1UkP57ZwQtuvRfYazk8="; mypy-boto3-batch = - buildMypyBoto3Package "batch" "1.36.3" - "sha256-LGhvJhNkuXjvJ99QYgrFSzbaUZRh0ROui5JvL7OYTeo="; + buildMypyBoto3Package "batch" "1.36.23" + "sha256-FBjHqVc9cjhDd3JiHeBPTO9xvYq5musA/X1DiwYuzfw="; mypy-boto3-billingconductor = buildMypyBoto3Package "billingconductor" "1.36.0" @@ -414,8 +414,8 @@ rec { "sha256-si7pjgKzxg++SfVdOsIQP37rXG84IZM0ltcwc2+wn3I="; mypy-boto3-dms = - buildMypyBoto3Package "dms" "1.36.21" - "sha256-N6MW2zZyoAHYkhe6bwPa4VK/tlzfFPZaPEYAjBcH180="; + buildMypyBoto3Package "dms" "1.36.22" + "sha256-Pc4KEedGm6ASBM0nBnOrnyTgv46rQ3D+hRsdP2x/xvs="; mypy-boto3-docdb = buildMypyBoto3Package "docdb" "1.36.0" @@ -502,8 +502,8 @@ rec { "sha256-j61F+3E2FfQ7hpsnT9M/7maaL/uKNNlRhm8cKH5RoAo="; mypy-boto3-emr-containers = - buildMypyBoto3Package "emr-containers" "1.36.0" - "sha256-2YTbWlv98Ldoj7w/MDcKNH40V88NjSYN+CwnZugufE4="; + buildMypyBoto3Package "emr-containers" "1.36.23" + "sha256-fLHB86UPQH/q6nItMngOxiXZyC34n+giryXQcuypPQw="; mypy-boto3-emr-serverless = buildMypyBoto3Package "emr-serverless" "1.36.3" @@ -866,8 +866,8 @@ rec { "sha256-Zs7r18i4H2k2XnqvRN/d+b5W+0bjfNonNL1EI1rK7aw="; mypy-boto3-medialive = - buildMypyBoto3Package "medialive" "1.36.19" - "sha256-546c5x+TddUlNzw5Wqruap7O8zvAXlgvszHo/psBRuo="; + buildMypyBoto3Package "medialive" "1.36.23" + "sha256-BoQr6Zei1WNmBGt6/AIp2OHCzX7VicNnn16jfpWWPVU="; mypy-boto3-mediapackage = buildMypyBoto3Package "mediapackage" "1.36.0" diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 15862aa0f3a1..3041b8b0a9e9 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.6.0"; + version = "0.6.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; tag = version; - hash = "sha256-3n+CoB8SLSjpmif2qBd9+gyF55JpwtJQuxcJEyXaWtk="; + hash = "sha256-TKn35rrWsHo/5bGriMcPx+lPvhWzmVXU3EG4KU/ebwI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ocifs/default.nix b/pkgs/development/python-modules/ocifs/default.nix index af0194f2f0c8..55d9ddc790dd 100644 --- a/pkgs/development/python-modules/ocifs/default.nix +++ b/pkgs/development/python-modules/ocifs/default.nix @@ -6,6 +6,7 @@ fsspec, oci, pythonOlder, + requests, }: buildPythonPackage rec { @@ -22,11 +23,12 @@ buildPythonPackage rec { hash = "sha256-IGl9G4NyzhcqrfYfgeZin+wt1OwHmh6780MPfZBwsXA="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ fsspec oci + requests ]; # Module has no tests @@ -38,7 +40,7 @@ buildPythonPackage rec { description = "Oracle Cloud Infrastructure Object Storage fsspec implementation"; homepage = "https://ocifs.readthedocs.io"; changelog = "https://github.com/oracle/ocifs/releases/tag/v${version}"; - license = with licenses; [ upl ]; + license = licenses.upl; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/photutils/default.nix b/pkgs/development/python-modules/photutils/default.nix index 648fd21a2a20..cb0f50f27ce1 100644 --- a/pkgs/development/python-modules/photutils/default.nix +++ b/pkgs/development/python-modules/photutils/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "photutils"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "astropy"; repo = "photutils"; tag = version; - hash = "sha256-p1MQgIYmiTekKV6oNKql/dnp5CAahXzecrTl25tz1g0="; + hash = "sha256-DNdbCISuBAy3jbKgwWA0Adq2gpRP3AacU1ZorcBkjZo="; }; build-system = [ diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index 10495f4898c4..38279a37a568 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.27.8"; + version = "1.28.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; tag = "v${version}"; - hash = "sha256-iIUwBX3MQHeEmYwesW2Dm45tr9FYyq9GtLGbyV784RA="; + hash = "sha256-WgxGS54OMv6JRsB9IRmKzQIPeoVcvpl28V5vvvEQ6WU="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/prometheus-async/default.nix b/pkgs/development/python-modules/prometheus-async/default.nix index 9f35acd96b1a..a8c89b503d61 100644 --- a/pkgs/development/python-modules/prometheus-async/default.nix +++ b/pkgs/development/python-modules/prometheus-async/default.nix @@ -1,52 +1,45 @@ { lib, + aiohttp, buildPythonPackage, fetchFromGitHub, - - flit-core, - + hatch-vcs, + hatchling, prometheus-client, + pytest-asyncio, + pytestCheckHook, + twisted, typing-extensions, wrapt, - aiohttp, - twisted, - - pytestCheckHook, - pytest-asyncio, }: buildPythonPackage rec { pname = "prometheus-async"; - version = "22.1.0"; + version = "25.1.0"; pyproject = true; src = fetchFromGitHub { owner = "hynek"; repo = "prometheus-async"; rev = version; - hash = "sha256-2C4qr0gLYHndd49UfjtuF/v05Hl2PuyegPUhCAmd5/E="; + hash = "sha256-e/BVxATpafxddq26Rt7XTiK4ajY+saUApXbmTG0/I6I="; }; - nativeBuildInputs = [ - flit-core + build-system = [ + hatch-vcs + hatchling ]; - propagatedBuildInputs = [ + dependencies = [ prometheus-client typing-extensions wrapt ]; optional-dependencies = { - aiohttp = [ - aiohttp - ]; - consul = [ - aiohttp - ]; - twisted = [ - twisted - ]; + aiohttp = [ aiohttp ]; + consul = [ aiohttp ]; + twisted = [ twisted ]; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index e48bb58fe4fb..99493b64b27e 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20250213"; + version = "1.0.2.20250219"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gbT6n/jr+GgYDh0046DsTiQesJ6jp7WQS/wvwe/0NCw="; + hash = "sha256-sFhC19nKDpZBj5W/RgWPC9XdwlHoJAuY1tBEgO+r52o="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 417e035062f7..186c692f435c 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.67"; + version = "0.2.68"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-sz6fI1iSa6aRk5QSsKrSncDI2XFTNbpSjMt2ch8+gfA="; + hash = "sha256-Vl+bASC473mOSL9mTWKWwfH9n7iT0BFcUd9D/rLB3/Y="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyloadapi/default.nix b/pkgs/development/python-modules/pyloadapi/default.nix index 934a5f06401f..fe0c95b42727 100644 --- a/pkgs/development/python-modules/pyloadapi/default.nix +++ b/pkgs/development/python-modules/pyloadapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyloadapi"; - version = "1.4.0"; + version = "1.4.1"; pyproject = true; disabled = pythonOlder "3.12"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "tr4nt0r"; repo = "pyloadapi"; tag = "v${version}"; - hash = "sha256-USSTXHHhtUc8QF9U3t3rARXn5Iqo6KOGBa3VAfRMbiQ="; + hash = "sha256-UEzVbgMd/kplKGPxZjo9bk8WFtkFW463dd3D+e7S3bI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index a25c6387e559..22af195333a6 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1319"; + version = "3.0.1320"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-AwWUvIx+BWfUelhGjYvzxLc08nNx/NXYDip5Et/hMdo="; + hash = "sha256-2ZT6uTUP6oEuHlkxp5EJxZNw3hN8LUUDV9Mt8dNXF58="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/yaramod/default.nix b/pkgs/development/python-modules/yaramod/default.nix index a40ce157c785..7012ed6ad906 100644 --- a/pkgs/development/python-modules/yaramod/default.nix +++ b/pkgs/development/python-modules/yaramod/default.nix @@ -21,14 +21,14 @@ let in buildPythonPackage rec { pname = "yaramod"; - version = "4.0.2"; + version = "4.3.0"; pyproject = true; src = fetchFromGitHub { owner = "avast"; repo = "yaramod"; tag = "v${version}"; - hash = "sha256-npEg6eJpxX4ZTS7KFRIBoVVk+JnA6vTqU7aD3zmnxk0="; + hash = "sha256-cgqVUBSDjT7xuCnSY76v8pAvA3W8tFu0fJZaFAF2caU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index cae0692bd32f..9ae0e9d47450 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.2.52"; + version = "0.2.54"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = "yfinance"; tag = version; - hash = "sha256-bXscFrrsIz/mGqV00VqPN1URyJB7G/jH5bzcKWus44g="; + hash = "sha256-Jdp1X62cPalAHRGU4nsQEZGSicbZsZnYjW1idYX13tA="; }; build-system = [ setuptools ]; diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 92ac3e6b4c08..c99ec363944b 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.18.3"; + version = "1.18.4"; src = fetchFromGitHub { rev = version; owner = "wesnoth"; repo = "wesnoth"; - hash = "sha256-Uk8omtXYZaneyBr4TASRtIKEyJLGwfKWu9vRQNVpdVA="; + hash = "sha256-c3BoTFnSUqtp71QeSCsC2teVuzsQwV8hOJtIcZdP+1E="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 45b65560eb81..3e642a252c66 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "10.18.0"; + version = "10.19.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; tag = "v${version}"; - hash = "sha256-gO0l7Gx/lw/r5VZ2PgglTFv+XyfRyefG6YM/EFdty8o="; + hash = "sha256-uHF8YjA1j3bbAmdqthObeewmJGepyGsf/o4UBjXt3l8="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-NGO4SB2wl5ivehHgm+cQnTee4XTwaztLTno5POpCVuw="; + vendorHash = "sha256-FfJFbgjrBddAtSq8eLsCM+GXMWbSNU4EyjExv7C8W54="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/servers/mobilizon/0001-fix-version.patch b/pkgs/servers/mobilizon/0001-fix-version.patch index da4d8f436a52..8bf6b2dcda86 100644 --- a/pkgs/servers/mobilizon/0001-fix-version.patch +++ b/pkgs/servers/mobilizon/0001-fix-version.patch @@ -7,7 +7,7 @@ index 8338abf8..883e6987 100644 use Mix.Project - @version "5.1.0" -+ @version "5.1.1" ++ @version "5.1.2" def project do [ diff --git a/pkgs/servers/mobilizon/common.nix b/pkgs/servers/mobilizon/common.nix index f6fa1a72cb76..1bf19e3245d4 100644 --- a/pkgs/servers/mobilizon/common.nix +++ b/pkgs/servers/mobilizon/common.nix @@ -1,13 +1,14 @@ -{ fetchFromGitLab }: rec { +{ fetchFromGitLab }: +rec { pname = "mobilizon"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitLab { domain = "framagit.org"; owner = "framasoft"; repo = pname; - rev = version; - sha256 = "sha256-zH/F+8rqzlMh0itVBOgDDzAx6n1nJH81lMzaBfjzhXU="; + tag = version; + sha256 = "sha256-5xHLk5/ogtRN3mfJPP1/gIVlALerT9KEUHjLA2Ou3aM="; }; } diff --git a/pkgs/servers/mobilizon/default.nix b/pkgs/servers/mobilizon/default.nix index f8ae27a81ece..390f9879bbff 100644 --- a/pkgs/servers/mobilizon/default.nix +++ b/pkgs/servers/mobilizon/default.nix @@ -8,6 +8,7 @@ git, cmake, nixosTests, + nixfmt-rfc-style, mobilizon-frontend, ... }: @@ -20,9 +21,8 @@ mixRelease rec { inherit (common) pname version src; patches = [ - # Version 5.1.1 failed to bump their internal package version, + # Version 5.1.2 failed to bump their internal package version, # which causes issues with static file serving in the NixOS module. - # See https://github.com/NixOS/nixpkgs/pull/370277 ./0001-fix-version.patch # Mobilizon uses chunked Transfer-Encoding for the media proxy but also # sets the Content-Length header. This is a HTTP/1.1 protocol violation @@ -153,11 +153,12 @@ mixRelease rec { ''; passthru = { - tests.smoke-test = nixosTests.mobilizon; + tests = { inherit (nixosTests) mobilizon; }; updateScript = writeShellScriptBin "update.sh" '' set -eou pipefail ${mix2nix}/bin/mix2nix '${src}/mix.lock' > pkgs/servers/mobilizon/mix.nix + ${nixfmt-rfc-style}/bin/nixfmt pkgs/servers/mobilizon/mix.nix ''; elixirPackage = beamPackages.elixir; }; @@ -165,6 +166,7 @@ mixRelease rec { meta = with lib; { description = "Mobilizon is an online tool to help manage your events, your profiles and your groups"; homepage = "https://joinmobilizon.org/"; + changelog = "https://framagit.org/framasoft/mobilizon/-/releases/${src.tag}"; license = licenses.agpl3Plus; maintainers = with maintainers; [ minijackson diff --git a/pkgs/servers/sql/percona-server/8_0.nix b/pkgs/servers/sql/percona-server/8_0.nix index 1e7946b0b4de..45f5a5b99a69 100644 --- a/pkgs/servers/sql/percona-server/8_0.nix +++ b/pkgs/servers/sql/percona-server/8_0.nix @@ -142,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' moveToOutput "lib/*.a" $static so=${stdenv.hostPlatform.extensions.sharedLibrary} - ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so + ln -s libperconaserverclient$so $out/lib/libmysqlclient_r$so wrapProgram $out/bin/mysqld_safe --prefix PATH : ${ lib.makeBinPath [ diff --git a/pkgs/servers/sql/percona-server/8_4.nix b/pkgs/servers/sql/percona-server/8_4.nix index 068c5b946700..5a5a6d57726c 100644 --- a/pkgs/servers/sql/percona-server/8_4.nix +++ b/pkgs/servers/sql/percona-server/8_4.nix @@ -162,7 +162,7 @@ stdenv.mkDerivation (finalAttrs: { '' moveToOutput "lib/*.a" $static so=${stdenv.hostPlatform.extensions.sharedLibrary} - ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so + ln -s libperconaserverclient$so $out/lib/libmysqlclient_r$so wrapProgram $out/bin/mysqld_safe --prefix PATH : ${ lib.makeBinPath [ diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix index 867f31a7203e..bea6d96121d6 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "ibus-anthy"; - version = "1.5.16"; + version = "1.5.17"; src = fetchurl { url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-FVIiFLWK2ISsydmx2hPxXbfc12w7GKiFCQRuXsYT0a4="; + sha256 = "sha256-nh0orX2ivl4NnA6w2Pt1V/yJdwqiI3Jy3r4Ze9YavUA="; }; buildInputs = [ diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix index b473188a6a57..42a92b11b2fd 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "ibus-table-others"; - version = "1.3.18"; + version = "1.3.19"; src = fetchurl { url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-4ZM5WZPh6Y5M50KDS+86j00v4pWTRdcdVYh4DcEYXAA="; + hash = "sha256-3kNEM3RaSQX5doerqALtKHQ9P+Jt8twC5inNFmDS/gg="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c37765c1530b..5ffd746d66f4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -254,6 +254,7 @@ mapAliases { crystal_1_7 = throw "'crystal_1_7' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13 crystal_1_8 = throw "'crystal_1_8' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13 crystal_1_9 = throw "'crystal_1_9' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13 + crystal_1_12 = throw "'crystal_1_12' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-19 clash-geoip = throw "'clash-geoip' has been removed. Consider using 'dbip-country-lite' instead."; # added 2024-10-19 clash-verge = throw "'clash-verge' has been removed, as it was broken and unmaintained. Consider using 'clash-verge-rev' or 'clash-nyanpasu' instead"; # Added 2024-09-17 clasp = clingo; # added 2022-12-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e04f164aaf6..22603fc0ede7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5705,7 +5705,6 @@ with pkgs; inherit (darwin.apple_sdk_11_0.callPackage ../development/compilers/crystal { }) crystal_1_11 - crystal_1_12 crystal_1_14 crystal_1_15 crystal; @@ -14580,10 +14579,6 @@ with pkgs; obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {}); wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix { }; - obsidian = callPackage ../by-name/ob/obsidian/package.nix { - electron = electron_33; - }; - okms-cli = callPackage ../by-name/ok/okms-cli/package.nix { buildGoModule = buildGo123Module; };