diff --git a/doc/builders/packages/emacs.section.md b/doc/builders/packages/emacs.section.md index d46f890858f4..c50c7815537d 100644 --- a/doc/builders/packages/emacs.section.md +++ b/doc/builders/packages/emacs.section.md @@ -26,10 +26,6 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t { packageOverrides = pkgs: with pkgs; rec { myEmacsConfig = writeText "default.el" '' - ;; initialize package - - (require 'package) - (package-initialize 'noactivate) (eval-when-compile (require 'use-package)) @@ -103,7 +99,7 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t This provides a fairly full Emacs start file. It will load in addition to the user's personal config. You can always disable it by passing `-q` to the Emacs command. -Sometimes `emacs.pkgs.withPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in `pkgs/top-level/emacs-packages.nix`). But you can't control these priorities when some package is installed as a dependency. You can override it on a per-package-basis, providing all the required dependencies manually, but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package, you can use `overrideScope`. +Sometimes `emacs.pkgs.withPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to GNU-devel ELPA, and the highest for packages manually defined in `pkgs/applications/editors/emacs/elisp-packages/manual-packages`). But you can't control these priorities when some package is installed as a dependency. You can override it on a per-package-basis, providing all the required dependencies manually, but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package, you can use `overrideScope`. ```nix overrides = self: super: rec { diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0b82c9c59f77..15cd47f6cc02 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1060,6 +1060,11 @@ github = "an-empty-string"; githubId = 681716; }; + angaz = { + name = "Angus Dippenaar"; + github = "angaz"; + githubId = 10219618; + }; angristan = { email = "angristan@pm.me"; github = "angristan"; @@ -14165,6 +14170,12 @@ githubId = 121178; name = "Raphael Robatsch"; }; + rapiteanu = { + email = "rapiteanu.catalin@gmail.com"; + github = "Steinhagen"; + githubId = 4029937; + name = "Viorel-Cătălin Răpițeanu"; + }; raquelgb = { email = "raquel.garcia.bautista@gmail.com"; github = "raquelgb"; diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 623576ce4ff2..04f4fddff8b5 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -30,6 +30,8 @@ - [Anuko Time Tracker](https://github.com/anuko/timetracker), a simple, easy to use, open source time tracking system. Available as [services.anuko-time-tracker](#opt-services.anuko-time-tracker.enable). +- [Prometheus MySQL exporter](https://github.com/prometheus/mysqld_exporter), a MySQL server exporter for Prometheus. Available as [services.prometheus.exporters.mysqld](#opt-services.prometheus.exporters.mysqld.enable). + - [sitespeed-io](https://sitespeed.io), a tool that can generate metrics (timings, diagnostics) for websites. Available as [services.sitespeed-io](#opt-services.sitespeed-io.enable). - [Jool](https://nicmx.github.io/Jool/en/index.html), an Open Source implementation of IPv4/IPv6 translation on Linux. Available as [networking.jool.enable](#opt-networking.jool.enable). @@ -66,6 +68,8 @@ - `python3.pkgs.fetchPypi` (and `python3Packages.fetchPypi`) has been deprecated in favor of top-level `fetchPypi`. +- `pass` now does not contain `password-store.el`. Users should get `password-store.el` from Emacs lisp package set `emacs.pkgs.password-store`. + - `mariadb` now defaults to `mariadb_1011` instead of `mariadb_106`, meaning the default version was upgraded from 10.6.x to 10.11.x. See the [upgrade notes](https://mariadb.com/kb/en/upgrading-from-mariadb-10-6-to-mariadb-10-11/) for potential issues. - `getent` has been moved from `glibc`'s `bin` output to its own dedicated output, reducing closure size for many dependents. Dependents using the `getent` alias should not be affected; others should move from using `glibc.bin` or `getBin glibc` to `getent` (which also improves compatibility with non-glibc platforms). diff --git a/nixos/modules/services/editors/emacs.md b/nixos/modules/services/editors/emacs.md index 72364b295144..9db1bd594175 100644 --- a/nixos/modules/services/editors/emacs.md +++ b/nixos/modules/services/editors/emacs.md @@ -286,11 +286,11 @@ The server should now be ready to serve Emacs clients. ### Starting the client {#module-services-emacs-starting-client} -Ensure that the emacs server is enabled, either by customizing the +Ensure that the Emacs server is enabled, either by customizing the {var}`server-mode` variable, or by adding `(server-start)` to {file}`~/.emacs`. -To connect to the emacs daemon, run one of the following: +To connect to the Emacs daemon, run one of the following: ``` emacsclient FILENAME emacsclient --create-frame # opens a new frame (window) @@ -339,24 +339,10 @@ This will add the symlink ## Configuring Emacs {#module-services-emacs-configuring} -The Emacs init file should be changed to load the extension packages at -startup: +If you want to only use extension packages from Nixpkgs, you can add +`(setq package-archives nil)` to your init file. -::: {.example #module-services-emacs-package-initialisation} -### Package initialization in `.emacs` - -``` -(require 'package) - -;; optional. makes unpure packages archives unavailable -(setq package-archives nil) - -(setq package-enable-at-startup nil) -(package-initialize) -``` -::: - -After the declarative emacs package configuration has been tested, +After the declarative Emacs package configuration has been tested, previously downloaded packages can be cleaned up by removing {file}`~/.emacs.d/elpa` (do make a backup first, in case you forgot a package). diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index f5b97c51186a..8bb017894ee2 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -50,6 +50,7 @@ let "mikrotik" "minio" "modemmanager" + "mysqld" "nextcloud" "nginx" "nginxlog" @@ -296,6 +297,12 @@ in Please specify either 'services.prometheus.exporters.mail.configuration' or 'services.prometheus.exporters.mail.configFile'. ''; + } { + assertion = cfg.mysqld.runAsLocalSuperUser -> config.services.mysql.enable; + message = '' + The exporter is configured to run as 'services.mysql.user', but + 'services.mysql.enable' is set to false. + ''; } { assertion = cfg.sql.enable -> ( (cfg.sql.configFile == null) != (cfg.sql.configuration == null) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/mysqld.nix b/nixos/modules/services/monitoring/prometheus/exporters/mysqld.nix new file mode 100644 index 000000000000..849c514de681 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/mysqld.nix @@ -0,0 +1,60 @@ +{ config, lib, pkgs, options }: +let + cfg = config.services.prometheus.exporters.mysqld; + inherit (lib) types mkOption mdDoc mkIf mkForce cli concatStringsSep optionalString escapeShellArgs; +in { + port = 9104; + extraOpts = { + telemetryPath = mkOption { + type = types.str; + default = "/metrics"; + description = mdDoc '' + Path under which to expose metrics. + ''; + }; + + runAsLocalSuperUser = mkOption { + type = types.bool; + default = false; + description = mdDoc '' + Whether to run the exporter as {option}`services.mysql.user`. + ''; + }; + + configFile = mkOption { + type = types.path; + example = "/var/lib/prometheus-mysqld-exporter.cnf"; + description = mdDoc '' + Path to the services config file. + + See for more information about + the available options. + + ::: {.warn} + Please do not store this file in the nix store if you choose to include any credentials here, + as it would be world-readable. + ::: + ''; + }; + }; + + serviceOpts = { + serviceConfig = { + DynamicUser = !cfg.runAsLocalSuperUser; + User = mkIf cfg.runAsLocalSuperUser (mkForce config.services.mysql.user); + LoadCredential = mkIf (cfg.configFile != null) (mkForce ("config:" + cfg.configFile)); + ExecStart = concatStringsSep " " [ + "${pkgs.prometheus-mysqld-exporter}/bin/mysqld_exporter" + "--web.listen-address=${cfg.listenAddress}:${toString cfg.port}" + "--web.telemetry-path=${cfg.telemetryPath}" + (optionalString (cfg.configFile != null) ''--config.my-cnf=''${CREDENTIALS_DIRECTORY}/config'') + (escapeShellArgs cfg.extraFlags) + ]; + RestrictAddressFamilies = [ + # The exporter can be configured to talk to a local mysql server via a unix socket. + "AF_UNIX" + ]; + }; + }; +} + diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix b/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix index 7808c8861a76..28add020f5cc 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix @@ -33,6 +33,15 @@ in Make sure that this file is readable by the exporter user. ''; }; + tokenFile = mkOption { + type = types.path; + example = "/path/to/token-file"; + default = ""; + description = lib.mdDoc '' + File containing the token for connecting to Nextcloud. + Make sure that this file is readable by the exporter user. + ''; + }; timeout = mkOption { type = types.str; default = "5s"; @@ -47,12 +56,14 @@ in ExecStart = '' ${pkgs.prometheus-nextcloud-exporter}/bin/nextcloud-exporter \ --addr ${cfg.listenAddress}:${toString cfg.port} \ - --username ${cfg.username} \ --timeout ${cfg.timeout} \ --server ${cfg.url} \ - --password ${escapeShellArg "@${cfg.passwordFile}"} \ - ${concatStringsSep " \\\n " cfg.extraFlags} - ''; + ${if cfg.tokenFile == "" then '' + --username ${cfg.username} \ + --password ${escapeShellArg "@${cfg.passwordFile}"} \ + '' else '' + --auth-token ${escapeShellArg "@${cfg.tokenFile}"} \ + ''} ${concatStringsSep " \\\n " cfg.extraFlags}''; }; }; } diff --git a/nixos/modules/services/web-apps/netbox.nix b/nixos/modules/services/web-apps/netbox.nix index 5f42f42a9af9..6d89ffc2a7b7 100644 --- a/nixos/modules/services/web-apps/netbox.nix +++ b/nixos/modules/services/web-apps/netbox.nix @@ -169,6 +169,13 @@ in { AUTH_LDAP_FIND_GROUP_PERMS = True ''; }; + keycloakClientSecret = lib.mkOption { + type = with lib.types; nullOr path; + default = null; + description = lib.mdDoc '' + File that contains the keycloak client secret. + ''; + }; }; config = lib.mkIf cfg.enable { @@ -227,7 +234,10 @@ in { extraConfig = '' with open("${cfg.secretKeyFile}", "r") as file: SECRET_KEY = file.readline() - ''; + '' + (lib.optionalString (cfg.keycloakClientSecret != null) '' + with open("${cfg.keycloakClientSecret}", "r") as file: + SOCIAL_AUTH_KEYCLOAK_SECRET = file.readline() + ''); }; services.redis.servers.netbox.enable = true; diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index d86f8ac634e8..5734e54de023 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -716,6 +716,41 @@ let ''; }; + mysqld = { + exporterConfig = { + enable = true; + runAsLocalSuperUser = true; + configFile = pkgs.writeText "test-prometheus-exporter-mysqld-config.my-cnf" '' + [client] + user = exporter + password = snakeoilpassword + ''; + }; + metricProvider = { + services.mysql = { + enable = true; + package = pkgs.mariadb; + initialScript = pkgs.writeText "mysql-init-script.sql" '' + CREATE USER 'exporter'@'localhost' + IDENTIFIED BY 'snakeoilpassword' + WITH MAX_USER_CONNECTIONS 3; + GRANT PROCESS, REPLICATION CLIENT, SLAVE MONITOR, SELECT ON *.* TO 'exporter'@'localhost'; + ''; + }; + }; + exporterTest = '' + wait_for_unit("prometheus-mysqld-exporter.service") + wait_for_open_port(9104) + wait_for_unit("mysql.service") + succeed("curl -sSf http://localhost:9104/metrics | grep 'mysql_up 1'") + systemctl("stop mysql.service") + succeed("curl -sSf http://localhost:9104/metrics | grep 'mysql_up 0'") + systemctl("start mysql.service") + wait_for_unit("mysql.service") + succeed("curl -sSf http://localhost:9104/metrics | grep 'mysql_up 1'") + ''; + }; + nextcloud = { exporterConfig = { enable = true; diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index 4a70f96994a0..ac9d4f2e26a1 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { - version = "10.17"; + version = "10.19"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${ builtins.concatStringsSep "" (lib.strings.splitString "." version)}_SDK.zip"; - sha256 = "sha256-yWoYeOGELXub/3kLC51SNPMC91u1aWAtdRsU6fRuX98="; + sha256 = "sha256-kuK6Uok5PAK66OtY+Uu1R7g8T7geA9edn2Sv6LN2pXc="; stripRoot = false; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/noson/default.nix b/pkgs/applications/audio/noson/default.nix index f1b932013a6e..1bcd06eec425 100644 --- a/pkgs/applications/audio/noson/default.nix +++ b/pkgs/applications/audio/noson/default.nix @@ -8,6 +8,7 @@ , qtgraphicaleffects , qtquickcontrols2 , wrapQtAppsHook +, makeWrapper }: stdenv.mkDerivation (finalAttrs: { @@ -24,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake wrapQtAppsHook + makeWrapper ]; buildInputs = [ @@ -36,7 +38,9 @@ stdenv.mkDerivation (finalAttrs: { # wrapQtAppsHook doesn't automatically find noson-gui dontWrapQtApps = true; + preFixup = '' + wrapProgram "$out/bin/noson-app" --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio ]} wrapQtApp "$out/lib/noson/noson-gui" ''; diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 5373f6a1276a..59317daa6e60 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.61"; + version = "1.62.2"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-V3i6Bn2urd4l3O0GhOobDutnnXBTjYGYb0Bsa5URbxc="; + sha256 = "sha256-k2rX5ysV3jgCWn0ffe5xSYo9oO6RLakTapE/SnvOPVI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/blockchains/lightwalletd/default.nix b/pkgs/applications/blockchains/lightwalletd/default.nix index 5d540a16f1dc..040d08e752b6 100644 --- a/pkgs/applications/blockchains/lightwalletd/default.nix +++ b/pkgs/applications/blockchains/lightwalletd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lightwalletd"; - version = "0.4.15"; + version = "0.4.16"; src = fetchFromGitHub { owner = "zcash"; repo = "lightwalletd"; rev = "v${version}"; - hash = "sha256-tkM9uTmobKXD7Il/uvmLLckPgdkmgwsNsjlARJQiY5A="; + hash = "sha256-M9xfV2T8L+nssrJj29QmPiErNMpfpT8BY/30Vj8wPjY="; }; vendorHash = "sha256-z5Hs+CkPswWhz+Ya5MyHKA3MZzQkvS7WOxNckElkg6U="; diff --git a/pkgs/applications/editors/codux/default.nix b/pkgs/applications/editors/codux/default.nix index ff068b259353..9d487a6b0d68 100644 --- a/pkgs/applications/editors/codux/default.nix +++ b/pkgs/applications/editors/codux/default.nix @@ -5,11 +5,11 @@ let pname = "codux"; - version = "15.6.1"; + version = "15.9.0"; src = fetchurl { url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; - sha256 = "sha256-a8zv5pVtS80J2PTrUiW8AA3rJ+rPAAzaaT5DVBLK5JE="; + sha256 = "sha256-bKZShjWs2osyARBZrBgmEN7JZFi/YpXI3p8lM+GrIfc="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index a5f1a1bf4a0a..fe42b61f1a6e 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -185,12 +185,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2023-08-04"; + version = "2023-08-21"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "6a4e01d85337c781cf6fe37e19f87e41869adfad"; - sha256 = "02lpzjk5vdlxcbvgvmk8xap2hnq1wmqgb6j6mni58vxw061wqzi8"; + rev = "3ded37f92807d8c6ad831d5af2c4ff22bfd32fc8"; + sha256 = "0ajc1bpdikc4751wbq9f6wwy72102gjz46bj8rysffkvak7jhbgm"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2023-08-19"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "e71b32faec68f04a0f0a27fe8c15c96503039b1f"; - sha256 = "0pdr8ympcsdlhb0w4sq5w0gwgnl4k5g190q8cjx1pcm6q20a38hj"; + rev = "c7c6353db3208608786503cbade1e9f8d3531f15"; + sha256 = "1nji29s3gjdrfdj21x1vpsfs7ai7q1a8k76mk90nppf2dx15ixpw"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -365,24 +365,24 @@ final: prev: SpaceCamp = buildVimPluginFrom2Nix { pname = "SpaceCamp"; - version = "2023-06-22"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "jaredgorski"; repo = "SpaceCamp"; - rev = "3e37187e1e5731d7d36980db3f92e7332406813a"; - sha256 = "0akdf7zv9pywdnqf4zp345irsbdfhy2rqvx759n13d403hwwya6z"; + rev = "8945b4a2bfaaa16fbcee9f1d7c00cb9c1256b591"; + sha256 = "1c57cpdkhq15yzzfpk4pi2d5bjmb9j2gx1np3v23wgmfzhmkj6d1"; }; meta.homepage = "https://github.com/jaredgorski/SpaceCamp/"; }; SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2023-08-09"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "100aa31e52b13e69d61caeb1796581e4bbb3b9ca"; - sha256 = "1ygswc0l9q8m3h3b42ik5zkhf820xpzs1iiivf2x7wpqc8589j2v"; + rev = "7e81ce1019626977f7dbab44fb2abb5517993359"; + sha256 = "11pz313swwv065nkvk2z7hgakijjg696dq7g1a056abk33hs9rh9"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -559,12 +559,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2023-08-15"; + version = "2023-08-20"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "fe38101db7253e450f67893583d1a5dfeefd9ee5"; - sha256 = "05njcamri4ql4xf48ms563g74x1aq4c9g1fvkmdpv8z99aybqwqw"; + rev = "115ad17ace047cab20ccc67f79c943aaf3f0f291"; + sha256 = "0jjvrq43dcl055rjsiwpm2qka9qsn1ldlcg7i45vhbg2jzqih97g"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -583,12 +583,12 @@ final: prev: alpha-nvim = buildVimPluginFrom2Nix { pname = "alpha-nvim"; - version = "2023-08-16"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "goolord"; repo = "alpha-nvim"; - rev = "7a6b9487dba044a43fde534bf5036f0fda5b6b23"; - sha256 = "11yp7zncby1wmic5hji1vb6b62l2xvi30cycbds05y11xycgdcm0"; + rev = "63a860e7ed3ae41ee92481ea65a48fb35431ae21"; + sha256 = "0mns3cymfisnd603mwxc30psbsm9m41gwqaai1r3w9iijy5axfkz"; }; meta.homepage = "https://github.com/goolord/alpha-nvim/"; }; @@ -751,24 +751,24 @@ final: prev: asyncrun-vim = buildVimPluginFrom2Nix { pname = "asyncrun.vim"; - version = "2023-08-04"; + version = "2023-08-20"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "0f99f96b1a408c37ea6f78e5990554328bc22dd1"; - sha256 = "0g60ibvdkyw7ybx45b7x8rkbrzy0lsi245g6n5vqd1fcfk6m7n4d"; + rev = "42385d54b8546c163b946fd50eed2103ef7993c9"; + sha256 = "1brqg6315z4rwsjv28yf86lynzshzpwxys248mpfzyhkz5jfad1y"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; asynctasks-vim = buildVimPluginFrom2Nix { pname = "asynctasks.vim"; - version = "2023-08-17"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asynctasks.vim"; - rev = "f47d55b4ce43bd80ad6e64cfc47e7dfa2cd2ad3e"; - sha256 = "0lkhzf03i3g20470afgqblj4vcwb8pwppr36lyaipfn9kaaqx4gy"; + rev = "8bd5e987c84ed6a16b9fd4ca96ed54f05bb45662"; + sha256 = "1ryvxfq65vb9rk8jig6fkhv81inqfh2gvy4l50ggqw35ksd0mj3c"; }; meta.homepage = "https://github.com/skywind3000/asynctasks.vim/"; }; @@ -931,12 +931,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2023-07-05"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "8cca17ea0ced3ba564e5da972a25600edafe7d7b"; - sha256 = "1fr0207nxmcdpc7whlmmryy4qs7nl5mp1p6h1qi0jv51r705xrpw"; + rev = "352c09f3e59065299a6e66386f0fe11bb8d5c601"; + sha256 = "1j0iyfybczlnf07fkp7479aiv1q6h2h4mb0r7h2cg3h0i6vprvq0"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -967,12 +967,12 @@ final: prev: base46 = buildVimPluginFrom2Nix { pname = "base46"; - version = "2023-08-16"; + version = "2023-08-20"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "673b13166dceb59f02123ade4765df877ada920c"; - sha256 = "0prhlx9qjyr6xy5j267wkxkm2ibdz2s08yzfkg7khjg6v9vqzvv4"; + rev = "930ee200607169a54419d81c9dbee43366495202"; + sha256 = "0ngqr01hlccdih4s1vzncr7pwj2zrgdn7gg1flxhbrbx1nb1kdg7"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1231,12 +1231,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2023-08-19"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "aada30b77949729de049a2ff5b5b3c189e3dae88"; - sha256 = "0c62hwb5z5ccga51sh33i6ldpra5h0fqdnam716xcpvkb0mn8kip"; + rev = "17cc6d5a8e772f681718a7d4f8a7437a8e6c0508"; + sha256 = "0zclpqj7yxjvbbh6crdgwd3jk6swqk10ql6zy08x0zd4a4y7xlg0"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1303,12 +1303,12 @@ final: prev: clangd_extensions-nvim = buildVimPluginFrom2Nix { pname = "clangd_extensions.nvim"; - version = "2023-08-10"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "p00f"; repo = "clangd_extensions.nvim"; - rev = "5c8a7d6311ae6b0ed1e1fc66569fe67278a418fc"; - sha256 = "0vxrkyymhmf29xdkfffxbp1z66in6cf2yajmrj0mssy6d1ag9cvj"; + rev = "323b00de2ee18cad1ac45eb95e680386c4ff4366"; + sha256 = "1q0ah3q15cfybrb2anf7c1jc0v72r5f2fmnc01dsm9y3wyyix8ch"; }; meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/"; }; @@ -2023,12 +2023,12 @@ final: prev: codeium-vim = buildVimPluginFrom2Nix { pname = "codeium.vim"; - version = "2023-08-18"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "436a7aa6f15502b20d06c420ba6cd944cc65ea8a"; - sha256 = "0fdmqd6d7i4bp40q1xhxvjfzaj8llw94fkl7gc22pspl0vh9w1rd"; + rev = "0b4a13613c871c66648fd1e1f33a4911a0b15e72"; + sha256 = "0b70q4k5jc0id4wryg3qzrm1aa8r44qlkb6r8ddh7x6pyrkwny65"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2311,48 +2311,48 @@ final: prev: copilot-lua = buildVimPluginFrom2Nix { pname = "copilot.lua"; - version = "2023-08-15"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "b3798d85322b1aaa56cad9d651d2d1aaec6298e9"; - sha256 = "1r5g9ps6s7by4ilv9qyp2q2dxwm4wmf08va5n0gj7amgzqlvj51g"; + rev = "0fa30d6846aae1af1c94a9ead93fa7dcf8affbe6"; + sha256 = "1m0kchzg84rps19fiwb3sddhf6gzmfyzcpdh7h9b34ma4qdga5gv"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; copilot-vim = buildVimPluginFrom2Nix { pname = "copilot.vim"; - version = "2023-08-17"; + version = "2023-08-21"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "f2a4acd62587c62910bda0b79405c585af43c002"; - sha256 = "07bdhssinhnd6ff3b2glq93nb0i6sfjwd6b1q3bsacxkvy686wwj"; + rev = "172955782814a49fbebca2d1a2ccce2059103329"; + sha256 = "12pynm0v1ci5yjwqlkljbq4wpc7w4gpilg0iagb3b3ihmzi1wvcx"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2023-08-13"; + version = "2023-08-22"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "2068660517dc7a3e46d15ae1f349464d3120d3a4"; - sha256 = "01pr1q4qfnf1v6b3bchra67x6qwlbq53qfhdzmynw5zl6mwa4v4w"; + rev = "af92b636ceee8c657463fd816146b28d43ace732"; + sha256 = "1s959yh5fh6d20im54ihn9a4b7pp036r6s7g0vacylg6975s5dd1"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2023-08-13"; + version = "2023-08-22"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "61110d912431713240633322fe9bb57f5668c23d"; - sha256 = "1wj0pkqfgj90isq0s1iaxyrw7ybas7flkg1lj4ylimy2108lvqr6"; + rev = "7df79a99f2b2070bc90db60242d372d0e5fc60bf"; + sha256 = "04hkxn21c9qws3l5qcr1ig3bqlsv4nkaqxjkfjgxpp8phc0ys7m1"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2371,12 +2371,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-08-19"; + version = "2023-08-22"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "8050a9baa964f71594f81358ce84d38cee1cd0ad"; - sha256 = "0qgwga52sw8kv8b38mkpy77b3irrnbpb3c5jsd35vkn4j0vsq319"; + rev = "cb44d4df9caa4a5a1534f4919d9f595e7c9bf6bf"; + sha256 = "19li3q3qbbak06ll2wclzyfmygdi521b6yizpdqhmc3k49fr8il0"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2527,12 +2527,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2023-07-26"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "c17d3210b3dec8798b4fc82a11c542989251f85d"; - sha256 = "1ay3jap0darihkwd71iszw939k8vpjb0chs58p75kxh07212wlv9"; + rev = "9134d7befd50ff920ede5b0f7d6c3dbb9f7c0ecb"; + sha256 = "09mys6n9hwlbwy48nxndjrr6y0bg67nai36fpjxydqq2i3ijq897"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; @@ -2623,24 +2623,24 @@ final: prev: denops-vim = buildVimPluginFrom2Nix { pname = "denops.vim"; - version = "2023-08-06"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "9f1b8cf0d516ee0a0e26f50bdbd935c29a8f4588"; - sha256 = "0a1q365cs3p90x0b8rdqja9ssgcl7ndqpb37pqldrmwccxik953c"; + rev = "bfdc079db08ed99a68f5a4b0d046fcea1b5e5515"; + sha256 = "0rbbk7in33s28g4rdsb97mlg5ix7jc8r45d7mvrz02s1cay7g4l1"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol.nvim"; - version = "2023-08-03"; + version = "2023-08-21"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "8b82f690c65450a391dc16e7567ab0627293701c"; - sha256 = "0xjq9k74k4vjk6ndsfh5sq69d6gnzdj06i3d2l53rd4qjr78f9mp"; + rev = "51d2367d3373457327e583819c00381387b8c51e"; + sha256 = "1pns3j5f4ls2hdcwydka3r9qp43rr4p392pkcxz807jyrzjzrbdi"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -2925,12 +2925,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2023-08-16"; + version = "2023-08-21"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "db97e667e03294bfa9f15e544e78f3082247bf79"; - sha256 = "1nfyp8zbc6d2j3k4x16iblc3vvfdhvfqcqx7p576cjz61ll8ww34"; + rev = "7e5a85c186027cab1e825d018f07c350177077fc"; + sha256 = "0jzlrk8dbijwzv5gc80s4bh3ji3bcxxdfffk5jbzlijjs76cpwl9"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -3009,12 +3009,12 @@ final: prev: dropbar-nvim = buildVimPluginFrom2Nix { pname = "dropbar.nvim"; - version = "2023-08-13"; + version = "2023-08-22"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "c47d7644a8a4bb0acbd9178d197cd245b238d45d"; - sha256 = "0pp4jbg20cz7rbixzb0g8xn5hinr04lls2q62sa4h31r9p43lsrr"; + rev = "8825367c86cdcd8577732419ef68258c9ad6d398"; + sha256 = "0mdsipr6cr5dgypys794q6pqarc0mbl526ch7gs6ilagxrll4i9w"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3094,24 +3094,24 @@ final: prev: efmls-configs-nvim = buildVimPluginFrom2Nix { pname = "efmls-configs-nvim"; - version = "2023-08-17"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "cc0a737ccd69fcb85cb2dfd7f3133a8b4c7adc9c"; - sha256 = "0wxm588q5yqab6pbwz3acqychbzncdixv3clk7gb4knh44v59lp1"; + rev = "cd8876b5afe602f90e53e5d92555980e6b379be4"; + sha256 = "0rjrn0ak3v3q1j8sc7yslxrzp8c5zs0p9ii65483ggvi4fdmyzw7"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; }; elixir-tools-nvim = buildVimPluginFrom2Nix { pname = "elixir-tools.nvim"; - version = "2023-08-10"; + version = "2023-08-21"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "25872cb8bdb840484933abc0c2a3444800716cc6"; - sha256 = "198jdgfdrs2rpbv8g4np15pj6iybwbjq7xg0v2xr1hdgvndc7nx1"; + rev = "8b13b298691ae8cfdcaf66deb43b509a49d202c0"; + sha256 = "0vw4nsaifr3hq9b5jyhv1bnv3dndw1rp922vw8jlhysbpp8hpii2"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; }; @@ -3372,12 +3372,12 @@ final: prev: flatten-nvim = buildVimPluginFrom2Nix { pname = "flatten.nvim"; - version = "2023-08-10"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "willothy"; repo = "flatten.nvim"; - rev = "6813ad3c49b74fbeb5bc851c7d269b611fc86dd3"; - sha256 = "0xk7pyysmq1w1dicq2pml3ls08wwzxaa9fq7fyhziivy7a8qv2ps"; + rev = "b362e13e22a452db913aab1fb2ee2d8546526d90"; + sha256 = "10vxc5bk0zykfg5dhgmsqmw2k6701b7ppg80y3krnn7phzi3hwr8"; }; meta.homepage = "https://github.com/willothy/flatten.nvim/"; }; @@ -3600,12 +3600,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2023-08-14"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "257aafb3c3a3475821db74d1a48ea5b097ac53a9"; - sha256 = "0d1pijv7x8ylapisq7i6bsznx8hd6syyfqakgj1pfykw8s474b1l"; + rev = "b7bda51ba7d0c07aaa30e8428a6531e939f6c3a3"; + sha256 = "073mgny8xfv1ndhqh241092g6xv1mw4r16ybjjkifv89kdzz53rj"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3708,12 +3708,12 @@ final: prev: git-conflict-nvim = buildVimPluginFrom2Nix { pname = "git-conflict.nvim"; - version = "2023-08-14"; + version = "2023-08-21"; src = fetchFromGitHub { owner = "akinsho"; repo = "git-conflict.nvim"; - rev = "562e8fdf5a4a2c73c55640bcf660be33db669d2a"; - sha256 = "1jw28m6r7yvv2lsr4m7c7q7jrc46rpibz5kd4iziig0q9gsqk5s5"; + rev = "f83d81e706d7ebfb914457ea72eee159e0e16fae"; + sha256 = "1cx5z0anqnq6pskxpj9w180ykv452krkhzh3nly999gpckimdxza"; }; meta.homepage = "https://github.com/akinsho/git-conflict.nvim/"; }; @@ -3768,12 +3768,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2023-08-19"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "749267aaa863c30d721c9913699c5d94e0c07dd3"; - sha256 = "1ysc9igrzxin0s16bk71l72ql1jzilhps0pc6mbj9padk3xi3iy4"; + rev = "79127db3b127f5d125f35e0d44ba60715edf2842"; + sha256 = "1dhgvcrnx9mph46mjc1m7h49xyny5gzmwbrii8v0cc40hbqgqnwq"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -4008,23 +4008,23 @@ final: prev: hardtime-nvim = buildVimPluginFrom2Nix { pname = "hardtime.nvim"; - version = "2023-08-20"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "6826c1fe8bebc63a6886833ca4ffed2fc6ec3382"; - sha256 = "0xdyh7xd58jnh97p0vps5pzpfpzd2yifrfj4crgxhq8vm3bp2w6b"; + rev = "3548e7d08c659308d9923effdaa8fa4cc0725c9a"; + sha256 = "1xqd92ihzi37c9kkbdbxfws8hb4c1r8fi8sqmz4m4wj9nr4siqwr"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; hare-vim = buildVimPluginFrom2Nix { pname = "hare.vim"; - version = "2023-08-07"; + version = "2023-08-21"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/hare.vim"; - rev = "78ad3aef2d9ba3371fde0978de27393930799847"; - sha256 = "14biq4v52pavpag87g2y8ygb74qril55lf7s4xbbr4wg37fbji7q"; + rev = "fed1a198b4abdfd7c0f68ab7c6b369460e08fd8d"; + sha256 = "1md59105irdzlzwiqfl53hlvqj1a4zn21wqvxcbfc937wvk1xsw7"; }; meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; }; @@ -4043,12 +4043,12 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2023-08-06"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "a5481383f82a8f866552bc75b4295351ea3ad905"; - sha256 = "16a41a9b31x5hax5iqyj1lxc4fxhcrp4ig54f77s4czwfd08qj2j"; + rev = "7f87f2eecb0be3fcc92750ffc2c5ec8966e6f19c"; + sha256 = "1by2jkpizwbw8fiw16v9p5h8s68l3fl7glc6sbfkggfmpjfq6mav"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4378,12 +4378,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2023-07-07"; + version = "2023-08-22"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "4541d690816cb99a7fc248f1486aa87f3abce91c"; - sha256 = "1f83fwbd97a26wsnfilv7fq2a3vb19yi5012j4xsmbyv329i3wvr"; + rev = "9637670896b68805430e2f72cf5d16be5b97a22a"; + sha256 = "01h49q9j3hh5mi3hxsaipfsc03ypgg14r79fbm6sy63rh8a66jnl"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -4763,12 +4763,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2023-08-11"; + version = "2023-08-22"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "67580fab5bed73920fa3fdd712fc8e805c389c3d"; - sha256 = "1wpklaiyk0hcipmrc1ampqn6x4qhag2srrb7cz22smh74bhw66cd"; + rev = "ae64b8df32599f7bb32cfd8d6edccccc98971226"; + sha256 = "0ar6rprk7q1vv2qynb5f213mag9z1avy0d9ixws4pkl22nzj15za"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -5147,12 +5147,12 @@ final: prev: lsp-zero-nvim = buildVimPluginFrom2Nix { pname = "lsp-zero.nvim"; - version = "2023-08-08"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "fc3a15047a5b831c83143d90cd25d0b7bcfd0111"; - sha256 = "0rzipjbzb57hwgclbpjww9vgn3x2arp8a831lfc4a0ij8cr223cc"; + rev = "60b0e84f3793f7e8bcc9ec52f9c239fd497b2cd2"; + sha256 = "1dxlqn3zi0vwi8180gz4ang5hm0ds4faiii03kw88xsnzkzlrd6h"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -5218,12 +5218,12 @@ final: prev: lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga.nvim"; - version = "2023-08-19"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "93a2ae4c03d1f1c138f5a38f1cbc3808479b434e"; - sha256 = "0pzpqlb5q253md220whnj7llchh7w174vn9f7d3d4n5cldninkmn"; + rev = "ff88be60da8712b5bd9c3d1c6be0eee3b4bbd804"; + sha256 = "1csm7wb2n0cvdgls5068y35vnd4pdc7v340d026yzydxxq01cdl3"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -5375,12 +5375,12 @@ final: prev: mason-lspconfig-nvim = buildVimPluginFrom2Nix { pname = "mason-lspconfig.nvim"; - version = "2023-08-19"; + version = "2023-08-20"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "7e8208a4d936f93303cc229af865a2cd226c807f"; - sha256 = "0g3jcssr9603i0khqyijgizb3427h67x2zqwrrcwsmm6c4n7c7mg"; + rev = "2997f467881ac4faa6f8c5e7065e3a672297c8ad"; + sha256 = "0gi1rk1xihs4k528jff2axjjn0kg7vraihwlwhb9m362c5w14k9l"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -5495,12 +5495,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-08-19"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "ab94192dd36b35c6752aac7154c7130922c27af7"; - sha256 = "0pyrrfhhwcvbp9g729krjf0hf0a5qnjpggxqwmmbdarfkw5lwkv0"; + rev = "06bf1784d88b112de14ce29aa604e2ae3fe1e359"; + sha256 = "0z37zk6zlph8cl7wknzkgan0rppyq0kk7qngc4g2ibw12qc1z5wa"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5543,24 +5543,24 @@ final: prev: mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2023-08-01"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "d4202fea214267ed4e31ce9c8df3115600db28c7"; - sha256 = "0z5zmmyaph1h6aakdjxn2c7wi3hsshwvdafxbk8iijc31n37lf6n"; + rev = "4a8067468b4372d58f519eb55708b524a893d67d"; + sha256 = "19x472gv6x7pz3ln91s2n4r31b0s435g5rzwrdvzv5dmairgxxiq"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; modicator-nvim = buildVimPluginFrom2Nix { pname = "modicator.nvim"; - version = "2023-06-29"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "mawkler"; repo = "modicator.nvim"; - rev = "2c19ec450532159fa4cf8f89a01d3de07d929c59"; - sha256 = "0k40hxc8vi745rpxnsrwlv437rfydgiad7nmzi44iskarm0la257"; + rev = "f0edf906a230a4ca37a32aa510d4cd346db46548"; + sha256 = "1gk97yr60s7i6kc7z4m2vxcqb6s5lb9ypgib6vy61g34vk6fld1d"; }; meta.homepage = "https://github.com/mawkler/modicator.nvim/"; }; @@ -5867,12 +5867,12 @@ final: prev: neo-tree-nvim = buildVimPluginFrom2Nix { pname = "neo-tree.nvim"; - version = "2023-08-19"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "71e36bb4e3e964de35121ec2c1c83f0992e429ec"; - sha256 = "17jd2p3y9gm69dli1180lcbhsw3ab5x6xvzcq9q3sas64bhn88al"; + rev = "8a0f795bac6618e4fe59eda61b15f8c95d9625ad"; + sha256 = "167qs1djqi5yf9sr0j9wl46hmylrlqxjr6h41anzw0s9fyz4651n"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -5915,24 +5915,24 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-08-18"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "47dacc6d8f74936f7719351b025421df740c789b"; - sha256 = "07g3jdigjk6mgwmmgmr1v97kfrb9iljgi4dbl62f6slcyq0jz6n1"; + rev = "e6598ad9b6287d7aac2c41f338fc1a6db9df6e5b"; + sha256 = "1vg8bqg0ra9m0gfc5r453a8lb243yvhc7n2sgqggdrxzw58q4clf"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2023-08-12"; + version = "2023-08-20"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "159e3e24fc018e16a937286488be17602aff8e3c"; - sha256 = "1fyg3s8sqavmg5gqvpfdrywbyx8rfg2qrkc7qlhgs767k6dnp1vw"; + rev = "0c285d7a7c06a6ee88db70871a274797693fce42"; + sha256 = "1vmgj3dd728wbg4hxzaqrvzypbpkxhawdsqy43lp1bbq27b008bf"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -5951,12 +5951,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2023-08-19"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "7cba95de79476d28c19e8ee34b303ad60fdef59f"; - sha256 = "18jixqv9mcvc873gs39g6fd84s0lpyglqk25gy00siznyjl2mcis"; + rev = "d764b406a1a6f3db13a28bef10e139a09fcc14dd"; + sha256 = "1akqk8vkvq5cib42vlblp80d7xlqd656damhky16l3hwvg598c74"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6143,12 +6143,13 @@ final: prev: neotest-elixir = buildVimPluginFrom2Nix { pname = "neotest-elixir"; - version = "2023-02-03"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "jfpedroza"; repo = "neotest-elixir"; - rev = "72ead0e41aa88582631ff7a14c13095b87c7ff75"; - sha256 = "1ys33qrgs5iw2f00k8d3da2dy49bxfp1yanzk9l6970q8mq9xfd3"; + rev = "7904f8c0fedbe615ee3d75beb810d3e1426b05c6"; + sha256 = "13lsns5wdkp9ay4a11pp6hvhd8isqd5vzag89alwlazsdnmirmvd"; + fetchSubmodules = true; }; meta.homepage = "https://github.com/jfpedroza/neotest-elixir/"; }; @@ -6167,12 +6168,12 @@ final: prev: neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; - version = "2023-08-16"; + version = "2023-08-20"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "c01757f54365208a63f54cea989206060f02b746"; - sha256 = "18marmxy907x9anxjjq9jddbbvmn4g3qcl2b37n9gl5lkfadfbjh"; + rev = "ebea2f66e35d2c19cd2a9a0808b6caa8ff53d341"; + sha256 = "1lkijcfvf7z37yir9rb65293snq3zw42pw24yncgj79mhypc47bq"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -6227,24 +6228,24 @@ final: prev: neotest-python = buildVimPluginFrom2Nix { pname = "neotest-python"; - version = "2023-07-04"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-python"; - rev = "054f22129405e747adfc2cbeddfcc59537df50ba"; - sha256 = "163p8wqx81dsxj1vjgpkdk0sj8hgf725rfrhx70rfdrx8sn2cdv9"; + rev = "81d2265efac717bb567bc15cc652ae10801286b3"; + sha256 = "0ymi6rkb7qsqh1jvyvnpvnqix3c0p79kydww9va0cnj1ylfhqwp4"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-python/"; }; neotest-rspec = buildVimPluginFrom2Nix { pname = "neotest-rspec"; - version = "2023-08-19"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-rspec"; - rev = "e3ca0279b721a704cf1fb9f3560fc2474256d3a4"; - sha256 = "0bp65cbkljnl7aa5s15va982w4xa7wabsa4h3bv32w9d7bc81ahz"; + rev = "5638880f0adcdb5366fe57a477dfa94074463709"; + sha256 = "17104fdfiv8iw9g2l2yvkakmqa1pkyb6dj6yh5qnczpylwilkgci"; }; meta.homepage = "https://github.com/olimorris/neotest-rspec/"; }; @@ -6467,12 +6468,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-06-29"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "64976a5ac70a9a43f3b1b42c5b1564f7f0e4077e"; - sha256 = "0gvhazyc9cdzd1c6a2i740h1b50h947vbk3rz195sryi3zb7l2pb"; + rev = "2a52e793d4f293c0e1d61ee5794e3ff62bfbbb5d"; + sha256 = "0fnc2kbxi8bs939dqbjgggx8nhs9qjbvqvj3rbbxbab902pzhgi6"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -6599,24 +6600,24 @@ final: prev: numb-nvim = buildVimPluginFrom2Nix { pname = "numb.nvim"; - version = "2023-03-04"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "nacro90"; repo = "numb.nvim"; - rev = "2c89245d1185e02fec1494c45bc765a38b6b40b3"; - sha256 = "1js9d16736dcrx1v1x4syxpb3g815mc0y4k09hd8mi97qcincwa9"; + rev = "3f7d4a74bd456e747a1278ea1672b26116e0824d"; + sha256 = "1h4ap13q85vy7mz44z1q8wzzvs7arbafkml9nwfx5vhyfyw4c8sn"; }; meta.homepage = "https://github.com/nacro90/numb.nvim/"; }; nvchad = buildVimPluginFrom2Nix { pname = "nvchad"; - version = "2023-08-10"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "d3d9aa251a9dd94881cdbc48c5852b3eaba969b8"; - sha256 = "0wcigy2xbffx45gzdj383y8y671x8hnj1fb123l22i8whb6vd69w"; + rev = "9c013a6aac6925172e88d2ca17fbd8c1a548560d"; + sha256 = "07cijykmj79hxpkzhmi0hgl0v6cr9fr6f88rc8d9l95rj8s8ck9l"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -6851,24 +6852,24 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2023-08-01"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "1c63f37f95cd4fb54512898168138d9a75d1516a"; - sha256 = "1z2l62byg7676m8kzg3539cf3r0wdm3rxlc0ibq45pl1pnx20wb9"; + rev = "4377a05b9476587b7b485d6a9d9745768c4e4b37"; + sha256 = "0mvlh0wdycdk07384i68gyxsafy437pbyryaqf3zbnw95r0z1va9"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-go = buildVimPluginFrom2Nix { pname = "nvim-dap-go"; - version = "2023-08-18"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "leoluz"; repo = "nvim-dap-go"; - rev = "9c0eb2b3c8ca63b54009a42a915be657fe7a8734"; - sha256 = "0dnlpad2qbd1k9343b4jn6f9iyl1a8jzarl3pjylch4scb6b5k9v"; + rev = "1b508e9db330108d3b5d62a6d9cc01fe6bbdd4e0"; + sha256 = "00dfcskbj25w4wilrpbq6g1l2zrxf1awplsfqp9nhnzs1ivbg9yb"; }; meta.homepage = "https://github.com/leoluz/nvim-dap-go/"; }; @@ -7090,12 +7091,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2023-08-19"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "30325d8fc3ce985395f22598c8b4f0b092e644ba"; - sha256 = "1sa6z0dg65sx96vd35rqnv9jcxpnr83nsb6v79vr0nkxy26jambl"; + rev = "29df35ea2ac5af0f85d8f0f40bddbd7fdaa8c492"; + sha256 = "162lq8vzl2hswjb6pw7315ziskan1walix9fimagvp9qcdv34m28"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -7126,12 +7127,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-08-19"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "67f151e84daddc86cc65f5d935e592f76b9f4496"; - sha256 = "1wxlk3ymrm53ippw203q43rqvbc27zjy1ncda1qyhrl00dzgvv0p"; + rev = "f7922e59aeb9bc3e31a660ea4e7405ffa3fc2c3a"; + sha256 = "008jx1hnb6xn85wx1c0brlmvzp6flyk4b7id30ccsv78h6s9bqfx"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7210,12 +7211,12 @@ final: prev: nvim-navbuddy = buildVimPluginFrom2Nix { pname = "nvim-navbuddy"; - version = "2023-07-31"; + version = "2023-08-20"; src = fetchFromGitHub { owner = "SmiteshP"; repo = "nvim-navbuddy"; - rev = "15184582a786d6b32b2724a4799891d0d69f0cdd"; - sha256 = "0rfw1alah02ws569akhkq8rfkwy89p30mzh4pr4v8d70d42zy2kr"; + rev = "b31887435ab7df0f8d646e61c854b61c125596ad"; + sha256 = "08y1gnabvwjm2d6ixk275c64v1d03sgl71q0m3722sdcry5l0236"; }; meta.homepage = "https://github.com/SmiteshP/nvim-navbuddy/"; }; @@ -7342,12 +7343,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2023-08-17"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "f826e74d6c20f535a7fa6a94308eacb99c07aba8"; - sha256 = "1kais5iqm4s4i6mwl02rn2ji1c58ni25fq4w0jd9n9cf2w7n8bch"; + rev = "25b46b2dd55aa52e78e73d22f48a743eb75cced4"; + sha256 = "0c84klbi7z94ck3pq3dskaqa6lzzdyyv6cy7a3mclqqckpqmy2g6"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -7366,12 +7367,12 @@ final: prev: nvim-snippy = buildVimPluginFrom2Nix { pname = "nvim-snippy"; - version = "2023-05-15"; + version = "2023-08-20"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "7b50933b44ebefc85bf1734eadc4fcfcbbc781c7"; - sha256 = "0pgwr8c3qkrg5zjyy0i99yclh7s2fbinr2nkwi3w2i9i6q04jmcx"; + rev = "ee3b830787538f259b84867c8971c4284abc4a8d"; + sha256 = "1la88yl3k8nbjskqxhy494d0a4mdhnvxglxsqc225jsyx6h6pj42"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -7390,12 +7391,12 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2023-08-19"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "eb17a856a6f17e03d8d610cbc00cd9f2f39e3fd7"; - sha256 = "0lbdbcck08bca9pgm6kspwfpqpjlyv6295cfdjy1936yfiia5gpc"; + rev = "411cee67fe3f8242023eb8d9edafefbbfb2d06f1"; + sha256 = "0xsyca5sw0shql0d1lf8vrr2pfmr0a0k1cl7sspan2f56qsckb2y"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; @@ -7462,36 +7463,36 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-08-18"; + version = "2023-08-20"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "dea82ae2071a8d6412ca31e8fc48da5accad1a1d"; - sha256 = "1qsm11mas5b0n13zlvq4w7xl250y9cqwwvxk2g47154y61bq2jpd"; + rev = "920868dba13466586897a8f40220eca6b2caac41"; + sha256 = "1jgpahmnfzb2g428irgyg1nsidha8jymd7lm80bckqkc8xr5li94"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-08-19"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "8fa7ce35afe88b8294e6ced757aa14ec98414568"; - sha256 = "1v1s75r9y9lxdi67xcrlqrgp1cjx607wjvvnk5abk7z6p9w0x6g4"; + rev = "4d41d9bfb09dd0836ce6910404e3cd570500c9ca"; + sha256 = "05b9dfphqm726x3619vfm702q0csjnvr9011xix07074hmg0ygxl"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2023-08-18"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "5dd8c2121170f806c3d0689d9e0dd24250e4f342"; - sha256 = "1fs0j613g9pz3k4xmang10qrdrlnc6lysy3my6z0ary8wqws45ax"; + rev = "ce583c89c8db8d34cd5dff0dc91e13b446fdbe50"; + sha256 = "1zcwfkhhk0g4vmdyy77pzc6x30xjaqaclx7gxclajrchhnihgvhb"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -7534,12 +7535,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2023-08-17"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "56272167a6dead91c47c02dbdbfe1ae5643c59f5"; - sha256 = "0jxsmg1xw0jfy8i9y3anpbdr8c1smcab82kh22nz9www6pa4m2xs"; + rev = "e3e2b6de4ccf781fb653a3a1d397aeb4a0095609"; + sha256 = "1458q2a7xvvf12fa7az6gnq7bhnci2czqpazljjqz181pp2wcrl0"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -7605,12 +7606,12 @@ final: prev: nvim-ufo = buildVimPluginFrom2Nix { pname = "nvim-ufo"; - version = "2023-08-14"; + version = "2023-08-22"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "aebd36bf5447862671356fcd5d4a8708ce6c9470"; - sha256 = "0bfsm0dvjd2i5qhs0j3kilsiw4bxdi33n0520yw6brlhr0k2v954"; + rev = "0c0e1e0af68a608b15d18125be92953c553a5f27"; + sha256 = "1apxhw0ic2l4rzgj9cikn2dsdn99mh41dzm4ijiixs56s8sfycpi"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; @@ -7665,14 +7666,14 @@ final: prev: nvim_context_vt = buildVimPluginFrom2Nix { pname = "nvim_context_vt"; - version = "2023-07-05"; + version = "2023-08-24"; src = fetchFromGitHub { - owner = "haringsrob"; + owner = "andersevenrud"; repo = "nvim_context_vt"; - rev = "f44f46ecad6e6983fd04dac84c5a5c03815d3427"; - sha256 = "0a8bdi6d58m5v851gkyph4qngxzsa5saizhsp1klpjnj57akz078"; + rev = "44e34d85238e5d964848854ba8b30f986a00ea21"; + sha256 = "1phy6qb7048dklyi17fvw51pxln2r25y37sdx0gwbqfpmy62d0mp"; }; - meta.homepage = "https://github.com/haringsrob/nvim_context_vt/"; + meta.homepage = "https://github.com/andersevenrud/nvim_context_vt/"; }; nvimdev-nvim = buildVimPluginFrom2Nix { @@ -7725,24 +7726,24 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2023-06-30"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "22328c578bc013fa4b0cef3d00af35efe0c0f256"; - sha256 = "08ik7v5gfpy52z09wbx1rbdhcz1v1c41i5l9kx4p25rxw8g9cl8v"; + rev = "3d749d3f2466870bae996c0a2d44f7517b1da2b0"; + sha256 = "11y3vvxq1mi3d6l151hjw24vqzmmpwii1xhi2qqjjicqr2mc09da"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-08-13"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "8f7807946a67b5f1a515946f82251e33651bae29"; - sha256 = "0sbbghvwyw0zxwpvasci8cz7waf5zbvncvajjc2mbv4d1lvr82vc"; + rev = "2fde9d84fcead6c61a59388fe29bd3135c39fa94"; + sha256 = "0cbbwgb6pqz7xdfmc3n70ibgqwqarwn93z4jfacazpidcg9dassy"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -7774,12 +7775,12 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2023-08-07"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "09b71d84bd2524438e48c0aa5b54d855cc72af32"; - sha256 = "1crlzkgdpxsvcvc1djc9ai3abm1szkrwrsknzxa7zdx4w1jlvpvs"; + rev = "7bd3558c17045b95c961d28861c1b3bd9bdc992a"; + sha256 = "0nf1x635a2g8jj16mq1w3gsbidg7paglivasizspa8dsfxw36rag"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -7798,12 +7799,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2023-08-15"; + version = "2023-08-21"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "45d12deedc61a19f9e3ed0e8dcb0be91928f723b"; - sha256 = "1z6ih5ng29m8xsg11y3rl0211g202sppgdz674ls5z1fwk8kaf5y"; + rev = "c81dff789f7623c431d1f43cf334237e52bbfd61"; + sha256 = "193yw6bk7psa979cpp1ram0ipw49kj0xsr25mk5m78xh8pivgg1g"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -7882,12 +7883,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2023-07-25"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "6b6eb8eabbed4d95568fd1f5374a3dff7ed51a3b"; - sha256 = "1snqqrpck8wgkc67dzcy6y0y9n37sipkaq6fxxy1h71d8363vkwd"; + rev = "6f2e3904c76e946259e130ae7fa9b9e7ec735d73"; + sha256 = "1d9jkyvjaqk8yjg0wk3d3asln6jhj1chrb8bjqhcjdj5k00cwf80"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -7906,12 +7907,12 @@ final: prev: overseer-nvim = buildVimPluginFrom2Nix { pname = "overseer.nvim"; - version = "2023-08-13"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "667dc5f0048d299fc41c13c8c3b5ef2cb2909a4d"; - sha256 = "1yh64phvxkra171a8948bfddx7jgrvw38z1apagkczczg06r8imm"; + rev = "2f4b05b553867259bfcf19d8631af4d9318a561f"; + sha256 = "1r7fi1c1i9lqxknh1bgprj748k810fpkklgf0klfc95bzzjc4njp"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -7943,12 +7944,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer.nvim"; - version = "2023-08-18"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "90f794d01dd5f50404f8ef6e1d22377ba5180787"; - sha256 = "0mhg4z99ksbnf1hhcnyg7v9rsrzsmr81z3jry1jifflwcc9s7fcw"; + rev = "ea0cc3c59f67c440c5ff0bbe4fb9420f4350b9a3"; + sha256 = "0lvpflpm7mhv39dglxdvmilj72xgxx5j614ll06mcxycv2k3xcvw"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -8099,12 +8100,12 @@ final: prev: plenary-nvim = buildNeovimPlugin { pname = "plenary.nvim"; - version = "2023-07-17"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "267282a9ce242bbb0c5dc31445b6d353bed978bb"; - sha256 = "10pw38dfzjrwzwkby9jmghafwwcph3az5z3h9c8v5kjh8iqls6x1"; + rev = "0dbe561ae023f02c2fb772b879e905055b939ce3"; + sha256 = "0j42b4q25l8yypa92zkdf9jargjszyvw5f83l3qxbh0vy9ly1j2d"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -8303,6 +8304,18 @@ final: prev: meta.homepage = "https://github.com/AlphaTechnolog/pywal.nvim/"; }; + quarto-nvim = buildVimPluginFrom2Nix { + pname = "quarto-nvim"; + version = "2023-07-17"; + src = fetchFromGitHub { + owner = "quarto-dev"; + repo = "quarto-nvim"; + rev = "35f86035e7b3846dbf168267ffe0021c3d312259"; + sha256 = "0a46bqca0f8rqd71kym07nn3vq4qfasw20fhi6s8gywmd658hx9k"; + }; + meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; + }; + quick-scope = buildVimPluginFrom2Nix { pname = "quick-scope"; version = "2023-08-08"; @@ -8363,6 +8376,17 @@ final: prev: meta.homepage = "https://github.com/luochen1990/rainbow/"; }; + rainbow-delimiters-nvim = buildVimPluginFrom2Nix { + pname = "rainbow-delimiters.nvim"; + version = "2023-08-25"; + src = fetchgit { + url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; + rev = "f30dd6c58eddca41ed9a9b112aa4be4828939c4d"; + sha256 = "19717p6rqfzkm4hycc1jh70gsidd651pkbd0vp7cdky7mqf59nrb"; + }; + meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; + }; + rainbow_parentheses-vim = buildVimPluginFrom2Nix { pname = "rainbow_parentheses.vim"; version = "2013-03-05"; @@ -8437,12 +8461,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2023-08-18"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "b1cc851bcb4e3c624abbe2a725237eef6bea765c"; - sha256 = "1y13ayb48hnz7fpw3ani56pbibkbq99fdaf3llbh0gs4m1j23923"; + rev = "2cfd6ddb0acece95d9658560ae9740b98ef70dbb"; + sha256 = "1pcfxl5350qwrlrr5j784pzy4w5b1v9w1yjjcpk0fghv2wi99isk"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -8653,12 +8677,12 @@ final: prev: scope-nvim = buildVimPluginFrom2Nix { pname = "scope.nvim"; - version = "2023-08-16"; + version = "2023-08-22"; src = fetchFromGitHub { owner = "tiagovla"; repo = "scope.nvim"; - rev = "48c88376a9dbed96aaf33268b369c14850836fad"; - sha256 = "0s6ai8hnsm4wy5x61ylf0fxn6cxv00shmddwbjy5f3hbdp9rxsd6"; + rev = "b783c77175a3026d19152fd938a5cc066c2f6676"; + sha256 = "1v6j30vd21lmrrdrw2hza9mwph078n0h0fcby44ri8p0f900kpfr"; }; meta.homepage = "https://github.com/tiagovla/scope.nvim/"; }; @@ -8761,12 +8785,12 @@ final: prev: sg-nvim = buildVimPluginFrom2Nix { pname = "sg.nvim"; - version = "2023-08-16"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "sg.nvim"; - rev = "6fc56ef3b488531243f071645ebf3caa5d93e7f0"; - sha256 = "1991bpipndjnn2gc6igcw2q65675nm49mcdxmdp33ingrjlkny6v"; + rev = "fb2a7ba26ae56961886d0048879dac30e07aca59"; + sha256 = "13rzia4zky9zsjkdv9g1pf57l6z1rkjsrbj7hg8z4ssjz99yrnq0"; }; meta.homepage = "https://github.com/sourcegraph/sg.nvim/"; }; @@ -9002,12 +9026,12 @@ final: prev: sphinx-nvim = buildVimPluginFrom2Nix { pname = "sphinx.nvim"; - version = "2022-10-27"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "stsewd"; repo = "sphinx.nvim"; - rev = "ec53a6e7104c6bef75982fce15bcab546c590f7e"; - sha256 = "15pxzq74sx9zwwpcfy478mq558s2kwv78pgzqz4jw03hd0ms2c1k"; + rev = "d4eceb35975d379c6b380111627c5d4531f77d08"; + sha256 = "0j4v1ckc7p5bsh81yhcc35yv1lqkn2kicy84pbk556ksx60pgvgs"; }; meta.homepage = "https://github.com/stsewd/sphinx.nvim/"; }; @@ -9063,12 +9087,12 @@ final: prev: srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2023-07-26"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "cf2c61ff3448be41b264ee850eeac16cacd7e5a9"; - sha256 = "0gpdsnzwk9hvr2302rc62nxsvv895525q6iy7pzracjqlh29ljbq"; + rev = "cb1647d170eaa76d7a1919e38a7b6f89a77a3a87"; + sha256 = "1i27s2gxky3l2wxfg22gi1dj9hjx41xff2211fhbwxmswwlkjj1v"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -9087,12 +9111,12 @@ final: prev: ssr-nvim = buildVimPluginFrom2Nix { pname = "ssr.nvim"; - version = "2023-08-11"; + version = "2023-08-20"; src = fetchFromGitHub { owner = "cshuaimin"; repo = "ssr.nvim"; - rev = "027a89f84283a9051427d4f319720336535c2e82"; - sha256 = "1b8nllqvi12kg1ixzipwdxnc68qr034s9r4wqnydwccdi1cw6pdd"; + rev = "b2f35df231c6b090f6eb023ddf2ad0cb88d90eb4"; + sha256 = "1zkpzf82ln9ymwrrm3zyy763idmm3bqg6vswbgh2sac8xsdfnj56"; }; meta.homepage = "https://github.com/cshuaimin/ssr.nvim/"; }; @@ -9267,12 +9291,12 @@ final: prev: switch-vim = buildVimPluginFrom2Nix { pname = "switch.vim"; - version = "2023-04-25"; + version = "2023-08-22"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "switch.vim"; - rev = "6b6cfda7ba751617599fcf3a96c1694e7924255d"; - sha256 = "1filijmx87g6yiv9bfgf89yiffqwq2qmvw5f73zfq0sh3pyxk6ja"; + rev = "68d269301181835788dcdcb6d5bca337fb954395"; + sha256 = "0llpr59wgagr1mvaml80pqbci025phgdfn84zn82s1mmgaa4xjl3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/switch.vim/"; @@ -9521,12 +9545,12 @@ final: prev: telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency.nvim"; - version = "2023-08-13"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "3aee7e0c6b05f85729cfae2fb62941088e47fe53"; - sha256 = "1byf6biwmcbawnwp03ms42kn41g9c3abgij8y9yxmdia5pms0zm2"; + rev = "e7825aaf576c22045b7a181ba89b9019104319cf"; + sha256 = "01l3d0ip8fid0jppn5iiwwf1c586s18z66v7byfiyx5gb8f6ybpr"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -10040,12 +10064,12 @@ final: prev: treesj = buildVimPluginFrom2Nix { pname = "treesj"; - version = "2023-08-13"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "7ee1250292491dfdd8ac7eda4e1d373a8c2be7de"; - sha256 = "1yqm5f4g3r02a6pkvpx35v9ls45j3hj0qgdmh2wdw72lq8c6ww4x"; + rev = "bff8c32b826e188fa558e94c7c93ac17a8ef0365"; + sha256 = "0m30d7d9bgs7ni2npgzd7h83l47a9phi4qs3g1za4znqsjj2wmbd"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -10208,12 +10232,12 @@ final: prev: unison = buildVimPluginFrom2Nix { pname = "unison"; - version = "2023-08-19"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "1f1536341db8ac33615c35463f609818679e6d5f"; - sha256 = "0fjach9262xylvbbq4plwgjph0bq0afq1l4i6j923n9pd9y75d62"; + rev = "9882d5445cdaca7fc5975f7a703492ba42ed9ab1"; + sha256 = "0xcmhykvxwmk4fxdb6q0gyim8jwlinyrjfn0zsk17hxvachff9cy"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -10304,12 +10328,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2023-08-13"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "38acf1128b0bd4f8b2f79c8644d1cda9dc297d9d"; - sha256 = "1n023my6hb856l8369sgqs6mc36lr47acjlimyadfd4m9s555sya"; + rev = "8b671c02525b6772ba9a8a38d17d0f06bfcb06bd"; + sha256 = "1v7gav6nzlzsv9jwyqbwbw73cch9m5ccq47nkrgmk702nyv7sq7s"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -10700,12 +10724,12 @@ final: prev: vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2022-08-22"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "8911f86284315cd574e807424bcea62fd99c588a"; - sha256 = "013f2p7jf9gj4xxs789906zrflpjv2kqa1whbg7y4viqs6j62y9l"; + rev = "31c593b8025f62f184418dd658c3a358a8d0ef70"; + sha256 = "14l7v8jg4kq8qh9j64nxir4a7d9ls0zp6zk3rjzbzf9viqyw1bp5"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; @@ -11156,12 +11180,12 @@ final: prev: vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2023-07-28"; + version = "2023-08-22"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "4c233043b4bfd5fde2d65f72db01e53e8726c5df"; - sha256 = "15a9dz459z01j1h1p13fls04j8jbbzkypmw9axk03ld2g0h47yxk"; + rev = "03b8f306895137721d9e34ff8d3054cced89661a"; + sha256 = "059z2gmi32vl078nna58w56fkgn66y80jjb30qigr4gxlgn4r1y5"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -11766,6 +11790,18 @@ final: prev: meta.homepage = "https://github.com/wsdjeg/vim-fetch/"; }; + vim-figlet = buildVimPluginFrom2Nix { + pname = "vim-figlet"; + version = "2022-12-08"; + src = fetchFromGitHub { + owner = "fadein"; + repo = "vim-figlet"; + rev = "f3141c1961e8c991cdc5ee5d9c070727d6013648"; + sha256 = "0h4lavkg57q7cwsrlj36q2624sm7n7k6n70pl47vbwyl7d0cbga8"; + }; + meta.homepage = "https://github.com/fadein/vim-figlet/"; + }; + vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; version = "2023-03-26"; @@ -12056,12 +12092,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2023-08-10"; + version = "2023-08-21"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "ca29cf84515431ba74dcf9abe6d403809b513e3b"; - sha256 = "13nsq9ch0jn79xnmhah3hi4v2dyaaypqgkw1x95az20apr19sv0f"; + rev = "ec8f05bb24eb8324253b97f75d99114ad6565231"; + sha256 = "045rby8wwhfb32bf6mla2imzbq1a2mn5ikqi1mmyl5as6hvhs0i2"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -12658,12 +12694,12 @@ final: prev: vim-lastplace = buildVimPluginFrom2Nix { pname = "vim-lastplace"; - version = "2023-08-17"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "farmergreg"; repo = "vim-lastplace"; - rev = "54fa1450f5c7c93f2793e5e8fffbd1863c002ad1"; - sha256 = "0mbzg1j2cwj9i5qr550gcg2cf0wiiz0rfbmkv9s4kj1wjrm9213b"; + rev = "bb3191b134ade9d1f01014e17c3df91e8911dd5c"; + sha256 = "0sv05v6q1lkc4xklqly0hf2p4w4schan3gvcf1s6493697hvcc4h"; }; meta.homepage = "https://github.com/farmergreg/vim-lastplace/"; }; @@ -12958,12 +12994,12 @@ final: prev: vim-markbar = buildVimPluginFrom2Nix { pname = "vim-markbar"; - version = "2023-07-18"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "Yilin-Yang"; repo = "vim-markbar"; - rev = "00f8620cd53f569dca26594e9c94534f03fe16d6"; - sha256 = "0h0m7mmc5x15mpq3af3n95nqfzhhb2mnw0rbxpr0xizjc2hcpg9z"; + rev = "7df6d0e918b610b798368a5af33825b787e0d20f"; + sha256 = "0814n9jqcv62hky04fywgby86ibfp434w4ij03vk5y2z9hgii8bd"; }; meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/"; }; @@ -14315,12 +14351,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2023-05-06"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "76e35f37aa9e47a8b7f2909de222844ae38c7007"; - sha256 = "0dz3z8aldwy6zg0abscm8x3w2f6h0sichysb9cm2nrn3gkmv21bq"; + rev = "d37486881a0a771b844a235bc3e025046088690d"; + sha256 = "0f16mlg18i6gp51w8pmq18dkvbylfnz916za4ahjjpwwcg7sg6ni"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -14736,12 +14772,12 @@ final: prev: vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; - version = "2023-01-10"; + version = "2023-08-20"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "cdd66d6a37d991bba7997d593586fc51a5b37aa8"; - sha256 = "12jb59c9x3xbhfc9xps64dq3h9a5gsjfb60hv8kd8k2hl3jmnpc0"; + rev = "addb64a772cb4a3ae1f1363583012b2cada2cd66"; + sha256 = "0vnsjcslz3w02jlkvpnld8wjb73qpninylp0alpniwqyjm43nrl9"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -14772,12 +14808,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2023-08-19"; + version = "2023-08-20"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "0fcbe14fdfc3b86b8a41f7cdaa67dd2041cb77fe"; - sha256 = "04jgb3l84767c6b485475fddgz5vhf3268h07xbdq4pdkykmxafw"; + rev = "87283a2358f4aa27735c6ade7d5cb0e24fe03381"; + sha256 = "1kp6hbrg9x9h4gc0bbzpid9kfdyxxvai0nhhg2bpfabzxibw4nyp"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -15649,12 +15685,12 @@ final: prev: yats-vim = buildVimPluginFrom2Nix { pname = "yats.vim"; - version = "2023-08-12"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "8878bdd7fc01eec647267d4433a763474b6a5db4"; - sha256 = "0070r63v9kjl3cx9w8xsilyww9nwyharc6l274y7mg4bfhddpbr3"; + rev = "2b6950c7143790e6930b8cf32d60c6858a50d47c"; + sha256 = "0385gak2sil6z8n20s5kdmnnpyw7ds5c2qcfr0pmyaz3dlyfx2ih"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; @@ -15794,12 +15830,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2023-08-10"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "490078b1593c6609e6a50ad5001e7902ea601824"; - sha256 = "03nwnc8q65nqjvrxj5fg8c95ywqb94xyim2hxald95agiickv6rd"; + rev = "2e3e5ebcdc24ef0d5b14a0a999dbbe7936512c46"; + sha256 = "0h8byffxzd0kjj01j928hj0jkqkq0rjwz90fpq0si9n0yk2zdlnj"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -15818,12 +15854,12 @@ final: prev: dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2023-06-19"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "3e52a0682a53dd7c2c53133d45948f5a49c5fd9a"; - sha256 = "1rvfafi9l2m7bhr4lpccvmyyrf572k61y1bj3jr8vh10i21pmxf0"; + rev = "248e649f2fbd262292ee4196cadb5b7f38168f37"; + sha256 = "0lmch8zyxcq22v4988sb1wasvfj9fgq869wlpzi2kg60fw9d8zpd"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -15866,12 +15902,12 @@ final: prev: nightfly = buildVimPluginFrom2Nix { pname = "nightfly"; - version = "2023-08-19"; + version = "2023-08-20"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "456d7b392cd0fa6c94aefe8aa083ab1a7b4083bc"; - sha256 = "1qj78f7d3ahhlqfbx5dw69x20v7jnjccdnrfk93c3yjn25bhd677"; + rev = "06eaaaa8717538a7ce96b13c137da8c9eaa84ec8"; + sha256 = "08g7dwa1qlg7gj10y2sggq4558fl3cywvq4zhqnzygxlnb66rjpd"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 3e64ae39c4ec..db68d7e52fe7 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -5,12 +5,12 @@ { ada = buildGrammar { language = "ada"; - version = "0.0.0+rev=ba7951a"; + version = "0.0.0+rev=f67bc66"; src = fetchFromGitHub { owner = "briot"; repo = "tree-sitter-ada"; - rev = "ba7951a8f3fb08f9ea923625153e7670c89f30b4"; - hash = "sha256-Rs+7wSsoV9ol0zV8occOeuvJaIofAe7qDXLmOxrjVw0="; + rev = "f67bc6622a9b9bc879b2808164abdbaf99d65d4a"; + hash = "sha256-jgTHVUC3b0i2k/foNaEZ3UKVkfREUF4oIZ3QIVBbvy0="; }; meta.homepage = "https://github.com/briot/tree-sitter-ada"; }; @@ -27,12 +27,12 @@ }; arduino = buildGrammar { language = "arduino"; - version = "0.0.0+rev=a2aa2b3"; + version = "0.0.0+rev=db929fc"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-arduino"; - rev = "a2aa2b38301960822c5384cd10a07c2026e9d44e"; - hash = "sha256-VtY+SaWIkLHv48jewmU0k1AtPwqpthWbNkpTHtCS98Y="; + rev = "db929fc6822b9b9e1211678d508f187894ce0345"; + hash = "sha256-PXBXtsyqAIgykaU/LLIakokmmWqTdicsUG4A8hA28yU="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino"; }; @@ -60,12 +60,12 @@ }; bash = buildGrammar { language = "bash"; - version = "0.0.0+rev=8077be4"; + version = "0.0.0+rev=8e286e7"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "8077be4c5504f2618f1280295bc4ae20a75988c1"; - hash = "sha256-i31QbosmsI1CUGAHOqeNGVeqoct13+i24CUtaGwdT7o="; + rev = "8e286e7673e3fa7ad94ab3159c2b83395d302af4"; + hash = "sha256-hM5joJjLxThJBStiTLE71MpIDXblgkRS8G4fmMvKdeY="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; @@ -280,12 +280,12 @@ }; css = buildGrammar { language = "css"; - version = "0.0.0+rev=5f2c94b"; + version = "0.0.0+rev=fec7d37"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-css"; - rev = "5f2c94b897601b4029fedcce7db4c6d76ce8a128"; - hash = "sha256-HBCxnetErHqhSJeEIHFTaSqt8aJgJ4+OOgw8p+NDVDo="; + rev = "fec7d3757ab8f46a0ffe298be99b16ad5b9fa229"; + hash = "sha256-f3+pvJtULuJ6SHcmrMYyvreSAeEsq3L2+5V3dhloaj8="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-css"; }; @@ -337,12 +337,12 @@ }; dart = buildGrammar { language = "dart"; - version = "0.0.0+rev=e398400"; + version = "0.0.0+rev=bcef6d5"; src = fetchFromGitHub { owner = "UserNobody14"; repo = "tree-sitter-dart"; - rev = "e398400a0b785af3cf571f5a57eccab242f0cdf9"; - hash = "sha256-+DFqJFR5raOnNG1oyGfO+tzpBXYBk0BBc8GbEkpEBhU="; + rev = "bcef6d57d0dd4df37bc9d8b1920ea4963c724826"; + hash = "sha256-wTeHw/7og4GJSXISCBSL6foxzecFFB/fK03bzGup0sM="; }; meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart"; }; @@ -546,6 +546,17 @@ }; meta.homepage = "https://github.com/FoamScience/tree-sitter-foam"; }; + forth = buildGrammar { + language = "forth"; + version = "0.0.0+rev=e7d1f8a"; + src = fetchFromGitHub { + owner = "AlexanderBrevig"; + repo = "tree-sitter-forth"; + rev = "e7d1f8a351fd5e95d9a89a8e87878c49ca14a5b0"; + hash = "sha256-AoV/DoQl2j4U0evWrM7ke544sei8VpdednWojwbhicU="; + }; + meta.homepage = "https://github.com/AlexanderBrevig/tree-sitter-forth"; + }; fortran = buildGrammar { language = "fortran"; version = "0.0.0+rev=6828cf3"; @@ -680,12 +691,12 @@ }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=4780c2b"; + version = "0.0.0+rev=7491ce4"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "4780c2b689a5a5bd0ccfd78403510e9cf4a0f2fc"; - hash = "sha256-lbdQSqLtjM1AtdmlAebCH0CewYPENIQHb7oyXNuUM6U="; + rev = "7491ce41c982ce74a54744ac21a2e4c360325fbb"; + hash = "sha256-z00CEiWUQhNiUobOjFTzZgAp+/Jkjbma7Rwx6/0orWc="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -834,12 +845,12 @@ }; heex = buildGrammar { language = "heex"; - version = "0.0.0+rev=9bf4ae4"; + version = "0.0.0+rev=4a36c9a"; src = fetchFromGitHub { owner = "connorlay"; repo = "tree-sitter-heex"; - rev = "9bf4ae444a8779839ecbca3b6b896dee426b10ae"; - hash = "sha256-ghknZmki1eBSzxY9omZN6wgLpvoJEYXBpvkVxxqLiIc="; + rev = "4a36c9a388505180da6ee0eda1d8afb8c83481c8"; + hash = "sha256-6gdAxNI81jbN8XZALRw31kFQRZg8ge/O7QRprLZpWOg="; }; meta.homepage = "https://github.com/connorlay/tree-sitter-heex"; }; @@ -922,12 +933,12 @@ }; hurl = buildGrammar { language = "hurl"; - version = "0.0.0+rev=0eca909"; + version = "0.0.0+rev=cd1a0ad"; src = fetchFromGitHub { owner = "pfeiferj"; repo = "tree-sitter-hurl"; - rev = "0eca909c8338364992e04c4862ac6afc5342cbb8"; - hash = "sha256-6FiLZKnZ2DMS1Gcaelw5bJxflfZSyPzGV1pJfvO1pcM="; + rev = "cd1a0ada92cc73dd0f4d7eedc162be4ded758591"; + hash = "sha256-vu/zK/AILJXPn18TmQSKoap7BtUOwhCxAX9v8ekVrIo="; }; meta.homepage = "https://github.com/pfeiferj/tree-sitter-hurl"; }; @@ -966,23 +977,23 @@ }; java = buildGrammar { language = "java"; - version = "0.0.0+rev=0b3f9cf"; + version = "0.0.0+rev=38be6ec"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-java"; - rev = "0b3f9cfe10a973df0530533313fdbef6c2c92bfa"; - hash = "sha256-dSRXjHfJOCrwm6HXlEz+prlKH7k+5B99S8vWyH49KzQ="; + rev = "38be6eccc1b86d6ec5dca0976659e807fd4dc28d"; + hash = "sha256-0kOLAVsrCUfpU8sZGRVrr+D3bGWj8bH2qce/ygrIw2w="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-java"; }; javascript = buildGrammar { language = "javascript"; - version = "0.0.0+rev=c69aaba"; + version = "0.0.0+rev=f1e5a09"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; - rev = "c69aabab53609d00e8e198ab902e4fde4b8e449f"; - hash = "sha256-6cyKT4yASueb+nNj8EqZbF7LZYZasMOYvq5ki2a0zQk="; + rev = "f1e5a09b8d02f8209a68249c93f0ad647b228e6e"; + hash = "sha256-VbK2asd1CavcBYGia30MomQh+KOgKgz5ax10V6nEVEs="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; @@ -999,12 +1010,12 @@ }; jsdoc = buildGrammar { language = "jsdoc"; - version = "0.0.0+rev=189a6a4"; + version = "0.0.0+rev=d01984d"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-jsdoc"; - rev = "189a6a4829beb9cdbe837260653b4a3dfb0cc3db"; - hash = "sha256-Zhl9mEpJE9Qy3MVScE2JK4i8OFZUXl5KMhKMS4bw+mI="; + rev = "d01984de49927c979b46ea5c01b78c8ddd79baf9"; + hash = "sha256-O7iDoOlXi+HLesS/sKcYfb+EJLR6gfRkwA657aRRg4c="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-jsdoc"; }; @@ -1054,12 +1065,12 @@ }; julia = buildGrammar { language = "julia"; - version = "0.0.0+rev=ab0f70c"; + version = "0.0.0+rev=bb7e587"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-julia"; - rev = "ab0f70c0a919d38b41822305a8ca80e527c94e4f"; - hash = "sha256-+rD3kL3nSzdsj/P6pWf5i+XQugZsxUc0vz6JZIk/lr8="; + rev = "bb7e587837fdeda74dd510256253d60f59a1e2cd"; + hash = "sha256-rtv2rNBUYcp8vwicMbX2ZQBB1vH7SKc+Lsc0LF1oFYA="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia"; }; @@ -1221,12 +1232,12 @@ }; matlab = buildGrammar { language = "matlab"; - version = "0.0.0+rev=c8723b3"; + version = "0.0.0+rev=6071891"; src = fetchFromGitHub { owner = "acristoffers"; repo = "tree-sitter-matlab"; - rev = "c8723b33970deda54257e640779714fb181d4d5f"; - hash = "sha256-iSpOB5hnd7iKmuhAzAYYbFgP5MiiD57yvAHHG8PS9HA="; + rev = "6071891a8c39600203eba20513666cf93b4d650a"; + hash = "sha256-H6eCCZtE1MbSpHyvdcVbG3piBijM499imiNDIhCoTJA="; }; meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab"; }; @@ -1675,6 +1686,17 @@ }; meta.homepage = "https://github.com/Fymyte/tree-sitter-rasi"; }; + re2c = buildGrammar { + language = "re2c"; + version = "0.0.0+rev=47aa19c"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-re2c"; + rev = "47aa19cf5f7aba2ed30e2b377f7172df76e819a6"; + hash = "sha256-Mwnm8kN0xfAdGG00aUYrqPU0zyWbc6QH9Zlgb4on+do="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-re2c"; + }; regex = buildGrammar { language = "regex"; version = "0.0.0+rev=2354482"; @@ -1765,23 +1787,23 @@ }; rust = buildGrammar { language = "rust"; - version = "0.0.0+rev=0a70e15"; + version = "0.0.0+rev=39eaeb4"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "0a70e15da977489d954c219af9b50b8a722630ee"; - hash = "sha256-CrNY+4nsYQOzzVR7X+yuo4+5s6K3VHtVQyWfledKJ1U="; + rev = "39eaeb41e17572c17e35bb050d6bf2da17568dbf"; + hash = "sha256-2WPL7ap2fHEi0+pNnJlHLxKBqPrHsve+DzJSCqw/gpw="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=3a67773"; + version = "0.0.0+rev=d50b6ca"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "3a67773e205eb43c993cc5d43f633ddb79eb1653"; - hash = "sha256-S5vXtvdpQMh8Beacpm07zRaHoJCa+ZiH2j5IB6idOng="; + rev = "d50b6ca5cc3d925e3d1f497199cb8d8383ddae8a"; + hash = "sha256-fzruLddcKTqC47CKCZhznDoyGIA1fPdqxqmzgmd9RkM="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -1876,12 +1898,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=3dfa1b1"; + version = "0.0.0+rev=6fa7161"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "3dfa1b1fafac51e3ffc39064eafb26b5111861a2"; - hash = "sha256-sDXYfILv+7/fGIaWp4SOfsjZ67Mi3UPnpt9NEapKZ+M="; + rev = "6fa716163fcf183e4938c75f427379ceba881fbe"; + hash = "sha256-AmfWf7qJyoUVBLxZuIdNSWP1C7GAcKeO9EoV3HFUzwI="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -1907,6 +1929,17 @@ }; meta.homepage = "https://github.com/amaanq/tree-sitter-starlark"; }; + strace = buildGrammar { + language = "strace"; + version = "0.0.0+rev=ef4a74c"; + src = fetchFromGitHub { + owner = "sigmaSd"; + repo = "tree-sitter-strace"; + rev = "ef4a74c43565572db9c06596d99ccb0210db13e5"; + hash = "sha256-H/zu440AcF1l0yW4a3PEMfUMsJUxW0UEohOQPlX1rD0="; + }; + meta.homepage = "https://github.com/sigmaSd/tree-sitter-strace"; + }; supercollider = buildGrammar { language = "supercollider"; version = "0.0.0+rev=3b35bd0"; @@ -2268,12 +2301,12 @@ }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=f30b02c"; + version = "0.0.0+rev=8efecc2"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "f30b02c4bf363b797de39ae63375a4f357718ae9"; - hash = "sha256-562MgzH/hGvCBctNj34jXrsmwHXJt4Hxb2lsZ/IeN74="; + rev = "8efecc27b58d3266e3946ea5c8fb8b3ef853914d"; + hash = "sha256-A/GXdXvOkSu9DI6h1EZNrfciYGtsSJ68uU0M2akaUKU="; }; location = "libs/tree-sitter-wing"; generate = true; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 0751740059af..e5be182529f7 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -966,7 +966,7 @@ self: super: { pname = "sg-nvim-rust"; inherit (old) version src; - cargoHash = "sha256-f14cGAGZFs4DG8FBKYDz1NY38TOuENW9Co2fywGc74E="; + cargoHash = "sha256-qwllMt4va9j8Sfh2+xYcfRtQgypNKZLDT3gRD7dUQ+w="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 2c92d2c9d6fc..638f22515c0f 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -628,7 +628,7 @@ https://github.com/norcalli/nvim-terminal.lua/,, https://github.com/klen/nvim-test/,, https://github.com/kyazdani42/nvim-tree.lua/,, https://github.com/nvim-treesitter/nvim-treesitter/,, -https://github.com/romgrk/nvim-treesitter-context/,, +https://github.com/nvim-treesitter/nvim-treesitter-context/,, https://github.com/RRethy/nvim-treesitter-endwise/,HEAD, https://github.com/eddiebergman/nvim-treesitter-pyfold/,, https://github.com/nvim-treesitter/nvim-treesitter-refactor/,, @@ -696,11 +696,13 @@ https://github.com/purescript-contrib/purescript-vim/,, https://github.com/python-mode/python-mode/,, https://github.com/vim-python/python-syntax/,, https://github.com/AlphaTechnolog/pywal.nvim/,, +https://github.com/quarto-dev/quarto-nvim/,, https://github.com/unblevable/quick-scope/,, https://github.com/stefandtw/quickfix-reflector.vim/,, https://github.com/dannyob/quickfixstatus/,, https://github.com/jbyuki/quickmath.nvim/,HEAD, https://github.com/luochen1990/rainbow/,, +https://gitlab.com/HiPhish/rainbow-delimiters.nvim,HEAD, https://github.com/kien/rainbow_parentheses.vim/,, https://github.com/vim-scripts/random.vim/,, https://github.com/winston0410/range-highlight.nvim/,, @@ -873,7 +875,6 @@ https://github.com/catppuccin/vim/,HEAD,catppuccin-vim https://github.com/inkarkat/vim-AdvancedSorters/,,vim-advanced-sorters https://github.com/Konfekt/vim-CtrlXA/,, https://github.com/konfekt/vim-DetectSpellLang/,, -https://github.com/fadein/vim-figlet/,HEAD, https://github.com/dpelle/vim-LanguageTool/,, https://github.com/inkarkat/vim-ReplaceWithRegister/,, https://github.com/inkarkat/vim-ReplaceWithSameIndentRegister/,, @@ -993,6 +994,7 @@ https://github.com/tommcdo/vim-exchange/,, https://github.com/terryma/vim-expand-region/,, https://github.com/int3/vim-extradite/,, https://github.com/wsdjeg/vim-fetch/,, +https://github.com/fadein/vim-figlet/,HEAD, https://github.com/tpope/vim-fireplace/,, https://github.com/dag/vim-fish/,, https://github.com/tpope/vim-flagship/,, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index d0bd58584798..05f2b8b659f3 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2961,6 +2961,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=RoweWilsonFrederiskHolme.wikitext"; homepage = "https://github.com/Frederisk/Wikitext-VSCode-Extension"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.rapiteanu ]; }; }; diff --git a/pkgs/applications/emulators/box64/default.nix b/pkgs/applications/emulators/box64/default.nix index 38ff3db999f6..35ed421469a9 100644 --- a/pkgs/applications/emulators/box64/default.nix +++ b/pkgs/applications/emulators/box64/default.nix @@ -15,13 +15,13 @@ assert withDynarec -> stdenv.hostPlatform.isAarch64; stdenv.mkDerivation rec { pname = "box64"; - version = "0.2.2"; + version = "0.2.4"; src = fetchFromGitHub { owner = "ptitSeb"; repo = pname; rev = "v${version}"; - hash = "sha256-aIvL0H0k0/lz2lCLxB17RxNm0cxVozYthy0z85/FuUE="; + hash = "sha256-iCZv/WvqZkH6i23fSLA/p0nG5/CgzjyU5glVgje4c3w="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix index a3572e782b0d..10d5193893cb 100644 --- a/pkgs/applications/file-managers/felix-fm/default.nix +++ b/pkgs/applications/file-managers/felix-fm/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "kyoheiu"; - repo = pname; + repo = "felix"; rev = "v${version}"; - sha256 = "sha256-3oXF9BG3BjGOeXqJHo3+fpcqcTOKrLED7Y3VQ06tnNA="; + hash = "sha256-d01AbHAIelwjVnVX5hn4QY0sp9n9Ez4ImYqNO/RBmEU="; }; - cargoHash = "sha256-2XMVappHbf1ZPtQO8zy8Z0n9wshDM4d30qkmG8OBoUY="; + cargoHash = "sha256-n8cVdGvh3/lQ6pF0ukxsog+XpIdpjuxGcgkDkM/3IFk="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/graphics/artem/default.nix b/pkgs/applications/graphics/artem/default.nix index cd59cfb60f15..de6f593fc453 100644 --- a/pkgs/applications/graphics/artem/default.nix +++ b/pkgs/applications/graphics/artem/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "artem"; - version = "2.0.1_2"; + version = "2.0.2"; src = fetchFromGitHub { owner = "finefindus"; repo = "artem"; rev = "v${version}"; - hash = "sha256-R7ouOFeLKnTZI6NbAg8SkkSo4zh9AwPiMPNqhPthpCk="; + hash = "sha256-t8L1lylaacEHGg3wxVgiB2XmBHDGzql774oHrg/vUC0="; }; - cargoHash = "sha256-sbIINbuIbu38NrYr87ljJJD7Y9Px0o6Qv/MGX8N54Rc="; + cargoHash = "sha256-rsgl8g6AqNmdq2gJ3PHvKMb7eid8ewtheajGWSWbeBw="; nativeBuildInputs = [ installShellFiles @@ -36,11 +36,6 @@ rustPlatform.buildRustPackage rec { "--skip=full_file_compare_html" ]; - # Cargo.lock is outdated - postConfigure = '' - cargo metadata --offline - ''; - postInstall = '' installManPage $releaseDir/build/artem-*/out/artem.1 installShellCompletion $releaseDir/build/artem-*/out/artem.{bash,fish} \ diff --git a/pkgs/applications/graphics/blockbench-electron/default.nix b/pkgs/applications/graphics/blockbench-electron/default.nix index 5afd0f1d876f..50a10310546d 100644 --- a/pkgs/applications/graphics/blockbench-electron/default.nix +++ b/pkgs/applications/graphics/blockbench-electron/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_22 }: +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_25 }: stdenv.mkDerivation rec { pname = "blockbench-electron"; - version = "4.5.2"; + version = "4.8.1"; src = fetchurl { url = "https://github.com/JannisX11/blockbench/releases/download/v${version}/Blockbench_${version}.AppImage"; - sha256 = "sha256-uUgVBdYMCF31+L/FV4ADIpUdEAmnW59KfscQxUStPWM="; + sha256 = "sha256-CE2wDOt1WBcYmPs4sEyZ3LYvKLequFZH0B3huMYHlwA="; name = "${pname}-${version}.AppImage"; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - makeWrapper ${electron_22}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron_25}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}" ''; diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index cd3b73b6b482..fbc99ad20852 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "xournalpp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0xsNfnKdGl34qeN0KZbII9w6PzC1HvvO7mtlNlRvUqQ="; + sha256 = "sha256-dnFNGWPpK/eoW4Ib1E5w/kPy5okPxAja1v4rf0KpVKM="; }; nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/kde/akonadi-calendar.nix b/pkgs/applications/kde/akonadi-calendar.nix index 95ee121b59f1..c149ac905dd8 100644 --- a/pkgs/applications/kde/akonadi-calendar.nix +++ b/pkgs/applications/kde/akonadi-calendar.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi, akonadi-contacts, kcalendarcore, kcalutils, kcontacts, - kidentitymanagement, kio, kmailtransport, + kidentitymanagement, kio, kmailtransport, messagelib }: mkDerivation { @@ -14,7 +14,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ akonadi akonadi-contacts kcalendarcore kcalutils kcontacts kidentitymanagement - kio kmailtransport + kio kmailtransport messagelib ]; outputs = [ "out" "dev" ]; postInstall = '' diff --git a/pkgs/applications/kde/angelfish.nix b/pkgs/applications/kde/angelfish.nix index f5fa9f66412b..7e187fe5c3fd 100644 --- a/pkgs/applications/kde/angelfish.nix +++ b/pkgs/applications/kde/angelfish.nix @@ -4,6 +4,7 @@ , cmake , corrosion , extra-cmake-modules +, futuresql , kconfig , kcoreaddons , kdbusaddons @@ -13,6 +14,7 @@ , knotifications , kpurpose , kwindowsystem +, qcoro , qtfeedback , qtquickcontrols2 , qqc2-desktop-style @@ -22,7 +24,7 @@ , srcs # provided as callPackage input to enable easier overrides through overlays -, cargoSha256 ? "sha256-Wthw7foadXO6jYJO1TB4OOYtpwnp8iCdda4tdiYg41A=" +, cargoSha256 ? "sha256-FI94TU3MgIl1tcjwJnzb2PKO1rbZ3uRB1mzXXkNU95I=" }: mkDerivation rec { @@ -45,6 +47,7 @@ mkDerivation rec { ]; buildInputs = [ + futuresql kconfig kcoreaddons kdbusaddons @@ -54,6 +57,7 @@ mkDerivation rec { knotifications kpurpose kwindowsystem + qcoro qtfeedback qtquickcontrols2 qqc2-desktop-style diff --git a/pkgs/applications/misc/arianna/default.nix b/pkgs/applications/kde/arianna.nix similarity index 68% rename from pkgs/applications/misc/arianna/default.nix rename to pkgs/applications/kde/arianna.nix index d8faf1e9a292..e1a099800380 100644 --- a/pkgs/applications/misc/arianna/default.nix +++ b/pkgs/applications/kde/arianna.nix @@ -1,51 +1,52 @@ { lib , mkDerivation -, fetchurl , cmake , extra-cmake-modules -, pkg-config -, baloo -, kfilemetadata -, kirigami2 -, kirigami-addons -, kitemmodels -, kquickcharts -, plasma-framework -, qqc2-desktop-style , qtbase +, qtdeclarative , qtquickcontrols2 -, qtwebsockets +, qtwebchannel , qtwebengine +, qtwebsockets +, baloo +, karchive +, kconfig +, kcoreaddons +, kdbusaddons +, kfilemetadata +, ki18n +, kirigami-addons +, kquickcharts +, kwindowsystem +, qqc2-desktop-style }: -mkDerivation rec { +mkDerivation { pname = "arianna"; - version = "1.1.0"; - - src = fetchurl { - url = "mirror://kde/stable/arianna/arianna-${version}.tar.xz"; - hash = "sha256-C60PujiUTyw2DwImu8PVmU687CP9CuWZ+d8LuZKthKY="; - }; nativeBuildInputs = [ cmake extra-cmake-modules - pkg-config ]; buildInputs = [ - baloo - kfilemetadata - kirigami2 - kirigami-addons - kitemmodels - kquickcharts - plasma-framework - qqc2-desktop-style qtbase + qtdeclarative qtquickcontrols2 - qtwebsockets + qtwebchannel qtwebengine + qtwebsockets + baloo + karchive + kconfig + kcoreaddons + kdbusaddons + kfilemetadata + ki18n + kirigami-addons + kquickcharts + kwindowsystem + qqc2-desktop-style ]; meta = with lib; { diff --git a/pkgs/applications/kde/audiotube.nix b/pkgs/applications/kde/audiotube.nix index 0bd22ee06f63..ca36d51ac3c9 100644 --- a/pkgs/applications/kde/audiotube.nix +++ b/pkgs/applications/kde/audiotube.nix @@ -4,12 +4,14 @@ , extra-cmake-modules , wrapGAppsHook +, futuresql , gst_all_1 , kcoreaddons , kcrash , ki18n , kirigami2 , kirigami-addons +, qcoro , qtimageformats , qtmultimedia , qtquickcontrols2 @@ -27,11 +29,13 @@ mkDerivation rec { ]; buildInputs = [ + futuresql kcoreaddons kcrash ki18n kirigami2 kirigami-addons + qcoro qtimageformats qtmultimedia qtquickcontrols2 diff --git a/pkgs/applications/kde/cantor.nix b/pkgs/applications/kde/cantor.nix index 1c9a9f718a76..0acfa430eaa7 100644 --- a/pkgs/applications/kde/cantor.nix +++ b/pkgs/applications/kde/cantor.nix @@ -93,12 +93,7 @@ mkDerivation { qtWrapperArgs = [ "--prefix PATH : ${placeholder "out"}/bin" - ]; - - postInstall = lib.optionalString withSage '' - wrapProgram $out/share/cantor/sagebackend/cantor-execsage \ - --prefix PATH : ${sage-with-env}/bin - ''; + ] ++ lib.optional withSage "--prefix PATH : ${sage-with-env}/bin"; meta = with lib; { description = "Front end to powerful mathematics and statistics packages"; diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index f6988f9831df..e61e99751d0d 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -73,6 +73,7 @@ let akonadiconsole = callPackage ./akonadiconsole.nix {}; akregator = callPackage ./akregator.nix {}; analitza = callPackage ./analitza.nix {}; + arianna = callPackage ./arianna.nix {}; ark = callPackage ./ark {}; baloo-widgets = callPackage ./baloo-widgets.nix {}; bomber = callPackage ./bomber.nix {}; @@ -99,7 +100,7 @@ let kaccounts-providers = callPackage ./kaccounts-providers.nix {}; kaddressbook = callPackage ./kaddressbook.nix {}; kalarm = callPackage ./kalarm.nix {}; - kalendar = callPackage ./kalendar.nix {}; + merkuro = callPackage ./merkuro.nix {}; kalzium = callPackage ./kalzium.nix {}; kamoso = callPackage ./kamoso.nix {}; kapman = callPackage ./kapman.nix {}; @@ -134,7 +135,6 @@ let kdiamond = callPackage ./kdiamond.nix {}; keditbookmarks = callPackage ./keditbookmarks.nix {}; kfind = callPackage ./kfind.nix {}; - kfloppy = callPackage ./kfloppy.nix {}; kgeography = callPackage ./kgeography.nix {}; kget = callPackage ./kget.nix {}; kgpg = callPackage ./kgpg.nix {}; diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 0acdb529fc38..393a3a440d26 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/release-service/23.04.3/src -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/release-service/23.08.0/src -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/kdenlive/default.nix b/pkgs/applications/kde/kdenlive/default.nix index 885b1c1d8cc4..bcd8ba360a82 100644 --- a/pkgs/applications/kde/kdenlive/default.nix +++ b/pkgs/applications/kde/kdenlive/default.nix @@ -17,6 +17,7 @@ , knotifyconfig , kplotting , ktextwidgets +, mediainfo , mlt , shared-mime-info , libv4l @@ -58,6 +59,7 @@ mkDerivation { knotifyconfig kplotting ktextwidgets + mediainfo mlt phonon-backend-gstreamer qtdeclarative @@ -77,9 +79,11 @@ mkDerivation { # Both MLT and FFMpeg paths must be set or Kdenlive will complain that it # doesn't find them. See: # https://github.com/NixOS/nixpkgs/issues/83885 - patches = [ ./mlt-path.patch ./ffmpeg-path.patch ]; - inherit mlt; + patches = [ ./dependency-paths.patch ]; + + inherit mlt mediainfo; ffmpeg = ffmpeg-full; + postPatch = # Module Qt5::Concurrent must be included in `find_package` before it is used. '' diff --git a/pkgs/applications/kde/kdenlive/dependency-paths.patch b/pkgs/applications/kde/kdenlive/dependency-paths.patch new file mode 100644 index 000000000000..ba3f7e6c8de9 --- /dev/null +++ b/pkgs/applications/kde/kdenlive/dependency-paths.patch @@ -0,0 +1,46 @@ +diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg +index 029849e5f..8befe4888 100644 +--- a/src/kdenlivesettings.kcfg ++++ b/src/kdenlivesettings.kcfg +@@ -517,7 +517,7 @@ + + + +- ++ @mlt@/share/mlt/profiles + + + +@@ -527,27 +527,27 @@ + + + +- ++ @mlt@/bin/melt + + + + +- ++ @ffmpeg@/bin/ffmpeg + + + + +- ++ @ffmpeg@/bin/ffplay + + + + +- ++ @ffmpeg@/bin/ffprobe + + + + +- ++ @mediainfo@/bin/mediainfo + + + diff --git a/pkgs/applications/kde/kdenlive/ffmpeg-path.patch b/pkgs/applications/kde/kdenlive/ffmpeg-path.patch deleted file mode 100644 index a0cef882f596..000000000000 --- a/pkgs/applications/kde/kdenlive/ffmpeg-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg -index 5edad5ae7..d35347a40 100644 ---- a/src/kdenlivesettings.kcfg -+++ b/src/kdenlivesettings.kcfg -@@ -403,17 +403,17 @@ - - - -- -+ @ffmpeg@/bin/ffmpeg - - - - -- -+ @ffmpeg@/bin/ffplay - - - - -- -+ @ffmpeg@/bin/ffprobe - - - diff --git a/pkgs/applications/kde/kdenlive/mlt-path.patch b/pkgs/applications/kde/kdenlive/mlt-path.patch deleted file mode 100644 index 9bfb66c1a839..000000000000 --- a/pkgs/applications/kde/kdenlive/mlt-path.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ruN old/src/kdenlivesettings.kcfg new/src/kdenlivesettings.kcfg ---- old/src/kdenlivesettings.kcfg 2019-09-10 23:20:27.555392353 -0400 -+++ new/src/kdenlivesettings.kcfg 2019-09-10 23:25:47.533964155 -0400 -@@ -378,14 +378,14 @@ - - - -- -+ - -- -+ - - diff --git a/pkgs/applications/kde/kfloppy.nix b/pkgs/applications/kde/kfloppy.nix deleted file mode 100644 index a88fd9283e06..000000000000 --- a/pkgs/applications/kde/kfloppy.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ mkDerivation, lib, extra-cmake-modules, kdoctools, kcompletion, kxmlgui }: - -mkDerivation { - pname = "kfloppy"; - meta = with lib; { - homepage = "https://kde.org/applications/en/utilities/org.kde.kfloppy"; - description = "Utility to format 3.5\" and 5.25\" floppy disks"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - kdoctools - kcompletion - kxmlgui - ]; -} diff --git a/pkgs/applications/kde/kalendar.nix b/pkgs/applications/kde/merkuro.nix similarity index 86% rename from pkgs/applications/kde/kalendar.nix rename to pkgs/applications/kde/merkuro.nix index 30303cc497b2..b8d3107eb614 100644 --- a/pkgs/applications/kde/kalendar.nix +++ b/pkgs/applications/kde/merkuro.nix @@ -41,8 +41,8 @@ , messagelib }: -mkDerivation rec { - pname = "kalendar"; +mkDerivation { + pname = "merkuro"; nativeBuildInputs = [ cmake @@ -89,14 +89,11 @@ mkDerivation rec { ]; propagatedUserEnvPkgs = [ akonadi kdepim-runtime akonadi-search ]; - postFixup = '' - wrapProgram "$out/bin/kalendar" \ - --prefix PATH : "${lib.makeBinPath [ akonadi kdepim-runtime akonadi-search ]}" - ''; + qtWrapperArgs = [''--prefix PATH : "${lib.makeBinPath [ akonadi kdepim-runtime akonadi-search ]}"'']; meta = with lib; { description = "A calendar application using Akonadi to sync with external services (Nextcloud, GMail, ...)"; - homepage = "https://apps.kde.org/kalendar/"; + homepage = "https://invent.kde.org/pim/merkuro"; license = licenses.gpl3Plus; maintainers = with maintainers; [ Thra11 ]; platforms = platforms.linux; diff --git a/pkgs/applications/kde/neochat.nix b/pkgs/applications/kde/neochat.nix index 0b9f3c57f610..4df33add6795 100644 --- a/pkgs/applications/kde/neochat.nix +++ b/pkgs/applications/kde/neochat.nix @@ -1,6 +1,5 @@ { mkDerivation , lib -, fetchpatch , cmake , extra-cmake-modules @@ -33,14 +32,6 @@ mkDerivation { pname = "neochat"; - patches = [ - (fetchpatch { - name = "libquotient-0.8.patch"; - url = "https://invent.kde.org/network/neochat/-/commit/d9d5e17be2a2057ab2ee545561fab721cb211f7f.patch"; - hash = "sha256-y1PEehFCW+69OH8YvL3SUGOb8Hhyf8xwRvSZzJ5J5Wc="; - }) - ]; - nativeBuildInputs = [ cmake extra-cmake-modules diff --git a/pkgs/applications/kde/skanpage.nix b/pkgs/applications/kde/skanpage.nix index d06ff7746bb9..fc16723ce4de 100644 --- a/pkgs/applications/kde/skanpage.nix +++ b/pkgs/applications/kde/skanpage.nix @@ -1,15 +1,15 @@ { lib , mkDerivation -, fetchurl , extra-cmake-modules , kirigami2 , ktextwidgets , libksane , qtquickcontrols2 , kpurpose +, kquickimageedit }: -mkDerivation rec { +mkDerivation { pname = "skanpage"; nativeBuildInputs = [ extra-cmake-modules ]; @@ -20,13 +20,13 @@ mkDerivation rec { libksane qtquickcontrols2 kpurpose + kquickimageedit ]; meta = with lib; { description = "KDE utility to scan images and multi-page documents"; homepage = "https://apps.kde.org/skanpage"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix index 7e9c80cd64ab..8505e34920df 100644 --- a/pkgs/applications/kde/spectacle.nix +++ b/pkgs/applications/kde/spectacle.nix @@ -5,21 +5,12 @@ , knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi , qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator , qcoro, qtquickcontrols2, wayland, plasma-wayland-protocols, kpurpose, kpipewire -, wrapGAppsHook, fetchpatch +, wrapGAppsHook }: mkDerivation { pname = "spectacle"; - patches = [ - # backport fix for region capture with multi-display high-dpi setups - # FIXME: remove in 23.08 - (fetchpatch { - url = "https://invent.kde.org/graphics/spectacle/-/commit/d0886c85445fad227b256152a549cb33bd97b776.patch"; - hash = "sha256-t0+X1pzjlS2OWduMwQBoYbjh+o/SF4hOkAqzz/MJw3E="; - }) - ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; buildInputs = [ kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 32de119a7b14..26f1ceb121f5 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -1,2054 +1,1958 @@ # DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/kde +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/kde/fetch.sh { fetchurl, mirror }: { akonadi = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akonadi-23.04.3.tar.xz"; - sha256 = "0jpp91d5rlblq6r981wxizmsv512kc43lfk8y29bdky6j4idflrb"; - name = "akonadi-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/akonadi-23.08.0.tar.xz"; + sha256 = "1qv1fwjmqxwwfp4xvrvv60jyy1vvayc9x320jgmr78rp2cizi602"; + name = "akonadi-23.08.0.tar.xz"; }; }; akonadi-calendar = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akonadi-calendar-23.04.3.tar.xz"; - sha256 = "166xm57jcy7d2dv2pfy4lllzic4giin31szxz7xq3a7ixsd6g7cs"; - name = "akonadi-calendar-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/akonadi-calendar-23.08.0.tar.xz"; + sha256 = "1a7s5rd2h50i1wxl0fl99139c4alday69j13gdmw87v5swn0lskf"; + name = "akonadi-calendar-23.08.0.tar.xz"; }; }; akonadi-calendar-tools = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akonadi-calendar-tools-23.04.3.tar.xz"; - sha256 = "1msbvmq664wij1rcivmgw14kpw5x4xz57567xl0q60j584v2wq07"; - name = "akonadi-calendar-tools-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/akonadi-calendar-tools-23.08.0.tar.xz"; + sha256 = "02mjbncx66bw64i0n2kmfk7b3w5ki7b54jhc3wvqlk8bd8rbswx4"; + name = "akonadi-calendar-tools-23.08.0.tar.xz"; }; }; akonadi-contacts = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akonadi-contacts-23.04.3.tar.xz"; - sha256 = "10vlzj56ps1pysf7g6i14v8wp2wkxh53055r2v4iq4cpq3mzayc6"; - name = "akonadi-contacts-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/akonadi-contacts-23.08.0.tar.xz"; + sha256 = "01r7h5dxqjq4lzjf5lw52hcli6gapvnixhksj8igl279pm33p4kp"; + name = "akonadi-contacts-23.08.0.tar.xz"; }; }; akonadi-import-wizard = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akonadi-import-wizard-23.04.3.tar.xz"; - sha256 = "0dj7cvxnvld2h9nbg6v0bn3p81fx73dgj6kbpginavci52kgk240"; - name = "akonadi-import-wizard-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/akonadi-import-wizard-23.08.0.tar.xz"; + sha256 = "01rsc25vfm4iwiyan27780lim0jiqfrszkkh0a14cg93kmakndsm"; + name = "akonadi-import-wizard-23.08.0.tar.xz"; }; }; akonadi-mime = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akonadi-mime-23.04.3.tar.xz"; - sha256 = "1r33v2q49s7l90id4jqg0lar9p1j5k0cbnzsaqdksavzpzkcklh5"; - name = "akonadi-mime-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/akonadi-mime-23.08.0.tar.xz"; + sha256 = "0lbkygq2hrpb2yz5mwchnxzzr09m7lvl4y115bg33yp4iqb1bvwa"; + name = "akonadi-mime-23.08.0.tar.xz"; }; }; akonadi-notes = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akonadi-notes-23.04.3.tar.xz"; - sha256 = "0s5a414cdcz37srys2w3c2z5c63ha9ivsqj0srnfwwv0pxix266v"; - name = "akonadi-notes-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/akonadi-notes-23.08.0.tar.xz"; + sha256 = "0gb8pydmh484n7ds6vwb3pblhjbbwip747vflnsf749c21vhqn5c"; + name = "akonadi-notes-23.08.0.tar.xz"; }; }; akonadi-search = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akonadi-search-23.04.3.tar.xz"; - sha256 = "1hpclfcb7almvajscm2az36bw9rrhkp3ywb9h0j9h8ims2gm60m7"; - name = "akonadi-search-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/akonadi-search-23.08.0.tar.xz"; + sha256 = "1vvb65a290zarhb7jzga9d0xyg1xpz52ln83ygf95m6awwjprl59"; + name = "akonadi-search-23.08.0.tar.xz"; }; }; akonadiconsole = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akonadiconsole-23.04.3.tar.xz"; - sha256 = "005wq3rxgi37zb2gg6vawyav473q23q0d6l6pilnzsjw5rc1r3lk"; - name = "akonadiconsole-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/akonadiconsole-23.08.0.tar.xz"; + sha256 = "1af0s3jwn5vgl88rvavqgnzx7mbqxdp3kxraqhhi8h3ngxdf0l6y"; + name = "akonadiconsole-23.08.0.tar.xz"; }; }; akregator = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akregator-23.04.3.tar.xz"; - sha256 = "0g916453zip8i5g61pf8ib68fiqfbmr1i1lhbnwmsv1cryx035w9"; - name = "akregator-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/akregator-23.08.0.tar.xz"; + sha256 = "0l6ycd8dygy46s1g0cy5harj4wqll1pklcp8zb3bc751jfcrajr8"; + name = "akregator-23.08.0.tar.xz"; }; }; alligator = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/alligator-23.04.3.tar.xz"; - sha256 = "0xnykm6m4mab9vdlbc0dfik6iizb032n1rcyj6mxkj2q5k0gl8h4"; - name = "alligator-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/alligator-23.08.0.tar.xz"; + sha256 = "014d43ivaql21mz6jxdbyg1j2gccpv2d39cmn55dm08djv22xk1d"; + name = "alligator-23.08.0.tar.xz"; }; }; analitza = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/analitza-23.04.3.tar.xz"; - sha256 = "1lcs0bncn8pl593dh0kki7knwbzyyai5dz3kf2gb7wp4liz48k1m"; - name = "analitza-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/analitza-23.08.0.tar.xz"; + sha256 = "00b2cgksy1whn42li6ky3jdznwkxaa9ndncw1rfydg220db6zi6v"; + name = "analitza-23.08.0.tar.xz"; }; }; angelfish = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/angelfish-23.04.3.tar.xz"; - sha256 = "0pk6rzy0i5sx2yg8pdc36jvamxah7j2czxb0njjycx760pzn61ah"; - name = "angelfish-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/angelfish-23.08.0.tar.xz"; + sha256 = "00xvpi3jba8gxp3hzlm1rb4m3qf1fx2ixz1lyvamkyvm8rp6b9pj"; + name = "angelfish-23.08.0.tar.xz"; + }; + }; + arianna = { + version = "23.08.0"; + src = fetchurl { + url = "${mirror}/stable/release-service/23.08.0/src/arianna-23.08.0.tar.xz"; + sha256 = "1iyzsa10750dyw5l4mhsz11la6i2217kzj7alkz258nai3bj69s4"; + name = "arianna-23.08.0.tar.xz"; }; }; ark = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ark-23.04.3.tar.xz"; - sha256 = "081swq9f87yxg4dxdl5i4hszhr0q4ph402in397zfa5vpyspzy41"; - name = "ark-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ark-23.08.0.tar.xz"; + sha256 = "09i58hzn83g30zln3wgwcjp2k0ygkgabnfq4izhsvgkkm4bgkz21"; + name = "ark-23.08.0.tar.xz"; }; }; artikulate = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/artikulate-23.04.3.tar.xz"; - sha256 = "0klp20clcpdm14wc2r14h6f7zrma34a22cz16mdc5c9k8dmalsz9"; - name = "artikulate-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/artikulate-23.08.0.tar.xz"; + sha256 = "1rwyxg7h4bfmd3mb9ddv818sq78k84clb0kdz4jacs0601vycp89"; + name = "artikulate-23.08.0.tar.xz"; }; }; audiocd-kio = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/audiocd-kio-23.04.3.tar.xz"; - sha256 = "0kl0j5qy54q88cbclwqj0rn8hj3gzjhzk7bimjgw5w0xy3cw6kql"; - name = "audiocd-kio-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/audiocd-kio-23.08.0.tar.xz"; + sha256 = "1kkcny6dqd7a64j60znbadx6s6wa6jriah8a7dggr4kzr9p6fbx2"; + name = "audiocd-kio-23.08.0.tar.xz"; }; }; audiotube = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/audiotube-23.04.3.tar.xz"; - sha256 = "1qbb34qi81j2r2sblgs0qry9diijizlbs12gwg9hmiybrdkk6qh4"; - name = "audiotube-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/audiotube-23.08.0.tar.xz"; + sha256 = "1y06c0qyl1amll2dwjwaffnjag6lz9fypwl20rzwd1k2ivsssv0v"; + name = "audiotube-23.08.0.tar.xz"; }; }; baloo-widgets = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/baloo-widgets-23.04.3.tar.xz"; - sha256 = "01k8kmzr2vgd567v4js080cnyl2i43zh6zz25ml76z77lywlfzz6"; - name = "baloo-widgets-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/baloo-widgets-23.08.0.tar.xz"; + sha256 = "0p6n05v92rb8dnss3zx08xqhadg8vf2cd0n80xq169flvvf6syzl"; + name = "baloo-widgets-23.08.0.tar.xz"; }; }; blinken = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/blinken-23.04.3.tar.xz"; - sha256 = "1bxw0bp6cj93gcwcb19ansz6xz4y53rah2pa6kq18xzafkrzrihm"; - name = "blinken-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/blinken-23.08.0.tar.xz"; + sha256 = "1wlyybv1x2qcffiq0hx9pcsc8zc4iiswa8390apcr415shrfd334"; + name = "blinken-23.08.0.tar.xz"; }; }; bomber = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/bomber-23.04.3.tar.xz"; - sha256 = "0qgixhmlkcjni5i9391hjg3sfc3ps24lmk9v8199lmnplrybklqj"; - name = "bomber-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/bomber-23.08.0.tar.xz"; + sha256 = "19n0n4m4jr9x5jf35w5ylhh2ip7ax3vymjsma868z27kidpkssc2"; + name = "bomber-23.08.0.tar.xz"; }; }; bovo = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/bovo-23.04.3.tar.xz"; - sha256 = "1zds6d4rmcf4sa2sfhyp1i5n7s7cgslikvbra4pz2kpi0hmvihi1"; - name = "bovo-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/bovo-23.08.0.tar.xz"; + sha256 = "01glqz3qfd4mpq6wmhqwr0gx2dxbgzsi9jwfqvzwp3ch3snpri38"; + name = "bovo-23.08.0.tar.xz"; }; }; calendarsupport = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/calendarsupport-23.04.3.tar.xz"; - sha256 = "1zk6kv5nhcd7a5llzh31890xpqdg522ahjdgbwsm7pcp62y0nbsj"; - name = "calendarsupport-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/calendarsupport-23.08.0.tar.xz"; + sha256 = "0cqjmq1v9g87z0qmjwk5k32i0kg2dzr1dsvpyhkgr022gd02qxdr"; + name = "calendarsupport-23.08.0.tar.xz"; }; }; calindori = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/calindori-23.04.3.tar.xz"; - sha256 = "1vadyrpf0f6mkgplwpfyn8z13fj7ny2zac85583czhnjci3aqvdd"; - name = "calindori-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/calindori-23.08.0.tar.xz"; + sha256 = "17dzlgs3n5404iaq6c6ghyvh8pp0myxmjzwwqk9l0k10wq8zr3df"; + name = "calindori-23.08.0.tar.xz"; }; }; cantor = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/cantor-23.04.3.tar.xz"; - sha256 = "0c1drzkvmk4ifxzhch8qz5la14nbv7q0scx0vldp9k78ldgliwlw"; - name = "cantor-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/cantor-23.08.0.tar.xz"; + sha256 = "04yzh8i61nj0s1qpiry0qhjpjj5z1qqv6vpslyw365sx737mklz5"; + name = "cantor-23.08.0.tar.xz"; }; }; cervisia = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/cervisia-23.04.3.tar.xz"; - sha256 = "18dc0441lq87cz9xwwph5vqbqkhq291r3dpkik8894rkxsmkja1c"; - name = "cervisia-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/cervisia-23.08.0.tar.xz"; + sha256 = "0qiv9klnkrxf5vrcjxz4b29hyi52w1dgb1fvw22p0sqpkc8gph68"; + name = "cervisia-23.08.0.tar.xz"; }; }; colord-kde = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/colord-kde-23.04.3.tar.xz"; - sha256 = "19hnmlwmms1jlk6b7z88fsibf80sl462wgx1gin8czp0f7v5pkz0"; - name = "colord-kde-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/colord-kde-23.08.0.tar.xz"; + sha256 = "0nz76ikygvwvjjjx3sc3abq2aafq8fr5hhfb7gmcjpcz6w8vgw7z"; + name = "colord-kde-23.08.0.tar.xz"; }; }; dolphin = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/dolphin-23.04.3.tar.xz"; - sha256 = "0bys24i2a3a65ahq5p3q1zr2px8jqip1gjn5m7rngq4hcddb1ji8"; - name = "dolphin-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/dolphin-23.08.0.tar.xz"; + sha256 = "1pjrzzj0hrzsmlzxxhl5clph1m2pdba805q38rrjzin0hgpg7c2a"; + name = "dolphin-23.08.0.tar.xz"; }; }; dolphin-plugins = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/dolphin-plugins-23.04.3.tar.xz"; - sha256 = "0h1b559icj5g3xrx5697a9rncpdcmsjg774c6m36ild56bwc048v"; - name = "dolphin-plugins-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/dolphin-plugins-23.08.0.tar.xz"; + sha256 = "1piz4jqxz2smn3fkyaqg48jbk76s4vsrgnhskvib515cfr4hhhy4"; + name = "dolphin-plugins-23.08.0.tar.xz"; }; }; dragon = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/dragon-23.04.3.tar.xz"; - sha256 = "0mliddp0nyxz91wzy8md0p0i45mlhffip4zqjl4db55x4p6wh4y8"; - name = "dragon-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/dragon-23.08.0.tar.xz"; + sha256 = "185rwi0l49spnbrzcafv4z90zj10c38r5li53aba3pqsk6ff6n0p"; + name = "dragon-23.08.0.tar.xz"; }; }; elisa = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/elisa-23.04.3.tar.xz"; - sha256 = "1ry4mhj7wc31xq9fip3amv8fj631m213zz0qg44h68q77sik4422"; - name = "elisa-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/elisa-23.08.0.tar.xz"; + sha256 = "19kdchfcw3pvcyaib2fac46zsfa6gnj2sw5wjm7wwbks5af7kck4"; + name = "elisa-23.08.0.tar.xz"; }; }; eventviews = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/eventviews-23.04.3.tar.xz"; - sha256 = "1nh8a7jy0sjsyi41pxhxwjkq6fr4yy9rqgcjjbj01dnx1ykz3d7l"; - name = "eventviews-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/eventviews-23.08.0.tar.xz"; + sha256 = "0ghilcv9m8q2k0myc6l14nz5rg1nkvp2aypb58lma6fi8x8111b2"; + name = "eventviews-23.08.0.tar.xz"; }; }; falkon = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/falkon-23.04.3.tar.xz"; - sha256 = "11r1iwimdzabfah68gsvw6xi67cj539anqa6s1rg33agsi5y56d3"; - name = "falkon-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/falkon-23.08.0.tar.xz"; + sha256 = "0wg5n53si1ybajzh5nnsfx9z9dkhrzl05l1q19004m62z3l8d9b2"; + name = "falkon-23.08.0.tar.xz"; }; }; ffmpegthumbs = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ffmpegthumbs-23.04.3.tar.xz"; - sha256 = "02wvhjqqird55xcs4kkj0s7nam4vqh3khjz5f1mjqfnk62sj1plx"; - name = "ffmpegthumbs-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ffmpegthumbs-23.08.0.tar.xz"; + sha256 = "1vdywm5r21ag287xihhzzrybni9p3kcy45d0a1nn65ll2285mqnh"; + name = "ffmpegthumbs-23.08.0.tar.xz"; }; }; filelight = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/filelight-23.04.3.tar.xz"; - sha256 = "1mwl1dkknvqw9hd5jsh4cdx1zd8f6rxca0vyq01wrx44q9p6dn1n"; - name = "filelight-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/filelight-23.08.0.tar.xz"; + sha256 = "1qknny5jivzm9ac7r4z957hprnj1qq08ghi42l395lmqfpwwy5ic"; + name = "filelight-23.08.0.tar.xz"; }; }; ghostwriter = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ghostwriter-23.04.3.tar.xz"; - sha256 = "1q3rhm6jnkbfylifj5km7hiygyib9c3m718kdsmyxas6k6vjx9rp"; - name = "ghostwriter-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ghostwriter-23.08.0.tar.xz"; + sha256 = "1bxcb1dx3xf0lv13wk3qkzq071gwl9p1npmkmdbjx2q6vrrfzxy4"; + name = "ghostwriter-23.08.0.tar.xz"; }; }; granatier = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/granatier-23.04.3.tar.xz"; - sha256 = "1zyadmgnpgsx728gzd55qyijsm13pb9cxs1y4l4c4m9lnz4y183v"; - name = "granatier-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/granatier-23.08.0.tar.xz"; + sha256 = "0hyv3jv0bcmilmd28bhpah0lm0si34n27lmwm4fm80wkcr3n7jwr"; + name = "granatier-23.08.0.tar.xz"; }; }; grantlee-editor = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/grantlee-editor-23.04.3.tar.xz"; - sha256 = "1skv2hki0rck7596ci026bi3kss5fl4zrh3walsh44422yqkbj2a"; - name = "grantlee-editor-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/grantlee-editor-23.08.0.tar.xz"; + sha256 = "0pbdl2n1ym1cksv5j5ifhi10p5hhnmrismrrhq8v9xpw7bpc627b"; + name = "grantlee-editor-23.08.0.tar.xz"; }; }; grantleetheme = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/grantleetheme-23.04.3.tar.xz"; - sha256 = "01kkj3y6xhc792jaxnkglkwvlqx9ckn5yhlfrpqff5hlf5x9vn4w"; - name = "grantleetheme-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/grantleetheme-23.08.0.tar.xz"; + sha256 = "1mq0afzqgid2vkpdskkdbcx1ylfmcrbw4m9gzkfaa7c8ffmlp57s"; + name = "grantleetheme-23.08.0.tar.xz"; }; }; gwenview = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/gwenview-23.04.3.tar.xz"; - sha256 = "0vijsq4174p4asdjq47bzdp2xkfn8hpg7b4dgp3yvapfxwjgp148"; - name = "gwenview-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/gwenview-23.08.0.tar.xz"; + sha256 = "19wa33r1vk45dbnr64l3nlixr5vppypk2h11limvm2ndhwzxwzq2"; + name = "gwenview-23.08.0.tar.xz"; }; }; incidenceeditor = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/incidenceeditor-23.04.3.tar.xz"; - sha256 = "1pqfl7gqz7ibpns2gpwqpvzhsba7xj4ilhi4ax1vn3m086iyh3a0"; - name = "incidenceeditor-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/incidenceeditor-23.08.0.tar.xz"; + sha256 = "1p1v65qglrwf0q4brwvmq4328i9dfnjspv001ip56bnxrps2kfpn"; + name = "incidenceeditor-23.08.0.tar.xz"; }; }; itinerary = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/itinerary-23.04.3.tar.xz"; - sha256 = "132x68wc4pallxgkvridfsimfq5m2g47fj9lcgz1kq4gdsidzf6i"; - name = "itinerary-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/itinerary-23.08.0.tar.xz"; + sha256 = "0y87md72yd6f9yn31kj09ibfril5pj3cyds5cq3j3z59yhhgd665"; + name = "itinerary-23.08.0.tar.xz"; }; }; juk = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/juk-23.04.3.tar.xz"; - sha256 = "1q0r0iv4nn6jd0g8db54r7xdw7kdw1ja0z1ggxl1sy0k60m9c4q3"; - name = "juk-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/juk-23.08.0.tar.xz"; + sha256 = "04dppr21vj4nnb0jmbnc9afk4jwhfj3dj0cf375l1kdglxa4ncc1"; + name = "juk-23.08.0.tar.xz"; }; }; k3b = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/k3b-23.04.3.tar.xz"; - sha256 = "1kr1hw4pws87zzwyrwrg2ysdn11qf0qhwi1vc9b0k8jkjmmdplmb"; - name = "k3b-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/k3b-23.08.0.tar.xz"; + sha256 = "1zvwlxf3k63b29d0xzq4bgi206g0wnp5j0z00lxy9rnm275gwhz6"; + name = "k3b-23.08.0.tar.xz"; }; }; kaccounts-integration = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kaccounts-integration-23.04.3.tar.xz"; - sha256 = "1mn64xw5r2magy5y0qmg5r907jz1y8jar0qqkc6s1zjjr3s3knac"; - name = "kaccounts-integration-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kaccounts-integration-23.08.0.tar.xz"; + sha256 = "1by9pjjd6zpjjd9j5w8h8aqhzib5d0l3xp9dgvlw4afhbp5dv73g"; + name = "kaccounts-integration-23.08.0.tar.xz"; }; }; kaccounts-providers = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kaccounts-providers-23.04.3.tar.xz"; - sha256 = "1lrmj6r09ypnpl2s586i4rd3fk3760qlxyrhh91k43wkb8i6m8f0"; - name = "kaccounts-providers-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kaccounts-providers-23.08.0.tar.xz"; + sha256 = "08jv0z1586rfwrd9jrs7fk2xwjfmkmia1kaz904linxmmhv97zsh"; + name = "kaccounts-providers-23.08.0.tar.xz"; }; }; kaddressbook = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kaddressbook-23.04.3.tar.xz"; - sha256 = "0zjbri91dh9vnwi6jqkbmyq667yzn8g4kw5v47qn8id2629zj6jq"; - name = "kaddressbook-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kaddressbook-23.08.0.tar.xz"; + sha256 = "1aw3zwjxyml6bvsld1qndkarvr11y43dif296qr21cplns48d5r1"; + name = "kaddressbook-23.08.0.tar.xz"; }; }; kajongg = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kajongg-23.04.3.tar.xz"; - sha256 = "16v87x0qikfk9jpp8dfxnb7mnjzzi0qlkp5lbn2xypkfhqaz99fi"; - name = "kajongg-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kajongg-23.08.0.tar.xz"; + sha256 = "1x7gx6fg1irdrwp7lbgm5m2vair2zyijcj1bbabvm4kl28d3r85j"; + name = "kajongg-23.08.0.tar.xz"; }; }; kalarm = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kalarm-23.04.3.tar.xz"; - sha256 = "120q5y889i9wdg9mxl51v8wz6nvdbhv178bhpscrb307ing538g0"; - name = "kalarm-23.04.3.tar.xz"; - }; - }; - kalendar = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kalendar-23.04.3.tar.xz"; - sha256 = "1w56glv8m1rlk86v78h69d21ydxb6i61g1dk6mcizjr5rvi4liy0"; - name = "kalendar-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kalarm-23.08.0.tar.xz"; + sha256 = "0wghnj5g3sq7vg9r328dqkqzl0hizxs93l9kma8h85hnf5ns9any"; + name = "kalarm-23.08.0.tar.xz"; }; }; kalgebra = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kalgebra-23.04.3.tar.xz"; - sha256 = "04ygs073za4jjfp38am962jmyycx3hs8yswcnl91v9nx2lcpzdw5"; - name = "kalgebra-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kalgebra-23.08.0.tar.xz"; + sha256 = "0rrzhnrjmc0fjgbpbw3mpfbspbyfa4gr6pqkhgy3sb313wamvk9r"; + name = "kalgebra-23.08.0.tar.xz"; }; }; kalk = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kalk-23.04.3.tar.xz"; - sha256 = "191x0vgbbq26qm36fph246alhyw3afdbbnyjg95mh3y0f3lw1n8d"; - name = "kalk-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kalk-23.08.0.tar.xz"; + sha256 = "15jig1y7s21aiv3dg2702qvdxy6k6k5yrrz9nhq5n839kgy3jn8g"; + name = "kalk-23.08.0.tar.xz"; }; }; kalzium = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kalzium-23.04.3.tar.xz"; - sha256 = "041mrly5yzdxxlj9r04s10a6i4amlslw57j1ysj0k4vzh5js27zw"; - name = "kalzium-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kalzium-23.08.0.tar.xz"; + sha256 = "0vj69kc4svw3c0l7j7kasrcn8dj7ky5qryg6aydmbbckbikj778y"; + name = "kalzium-23.08.0.tar.xz"; }; }; kamera = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kamera-23.04.3.tar.xz"; - sha256 = "09qqigcklp8d2pqibf8kxfras025zhpviwaaky69sd7nmqqd7gi9"; - name = "kamera-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kamera-23.08.0.tar.xz"; + sha256 = "1i4rchmj188acavi9yx7w8pmpqsdkz0iza60w2p3x32p5saw5arq"; + name = "kamera-23.08.0.tar.xz"; }; }; kamoso = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kamoso-23.04.3.tar.xz"; - sha256 = "1f06331qigf5wi6lgir5ij8h1fsdn54v32fyw2mgf0hg05xndrcl"; - name = "kamoso-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kamoso-23.08.0.tar.xz"; + sha256 = "1izvgzsxy680cqz1j9j9haj5lfr9nas7xzjlwj1p7zfhawrqb75j"; + name = "kamoso-23.08.0.tar.xz"; }; }; kanagram = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kanagram-23.04.3.tar.xz"; - sha256 = "1w6qmm32m9j0ffqlqhn95q899pxvgx2xckd1s11n8v8f4s193p9k"; - name = "kanagram-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kanagram-23.08.0.tar.xz"; + sha256 = "18yajg5mx9frab79amgxdf096kkn91hcfh04b0bipbn6k36kkl9n"; + name = "kanagram-23.08.0.tar.xz"; }; }; kapman = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kapman-23.04.3.tar.xz"; - sha256 = "0ildsd7pig3lm9n616kw5mpl8hbwidsnbzdfifx8nnffslrr4bv7"; - name = "kapman-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kapman-23.08.0.tar.xz"; + sha256 = "027c2w72ljy8xlb3gqpab818j23qf7qsldxssflzlj0mh7igvgwh"; + name = "kapman-23.08.0.tar.xz"; }; }; kapptemplate = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kapptemplate-23.04.3.tar.xz"; - sha256 = "1kdi948w5x328nalxcf17rnmxsp7mx3p7a58f7c65cf2y4ap9vwm"; - name = "kapptemplate-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kapptemplate-23.08.0.tar.xz"; + sha256 = "1r2kbh9r1b0nhzsipsnp2ppa817g324p39pwpnrsc0zyi52mdack"; + name = "kapptemplate-23.08.0.tar.xz"; }; }; kasts = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kasts-23.04.3.tar.xz"; - sha256 = "0qpc04c841ry2f12pb1bc22qk9ncxmb0b2ji3m60il4ivgwarq9b"; - name = "kasts-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kasts-23.08.0.tar.xz"; + sha256 = "0sayr85lwj2xwmcx8r1kdmf7isjdn5a5shn58n930sishpcplhjn"; + name = "kasts-23.08.0.tar.xz"; }; }; kate = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kate-23.04.3.tar.xz"; - sha256 = "0yyhh21pvzsaz7swmghdchzsfk089axhqkjwjv1m8j4q3q3rhv86"; - name = "kate-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kate-23.08.0.tar.xz"; + sha256 = "1cb8il661x9s7cn5dzc8az073s30s119mlnwglisglawzqn0v4ry"; + name = "kate-23.08.0.tar.xz"; }; }; katomic = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/katomic-23.04.3.tar.xz"; - sha256 = "0a571058r9s2y6pyyapxfvlbpr6grabpl7x1lqlg3hfzyc7gl2h1"; - name = "katomic-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/katomic-23.08.0.tar.xz"; + sha256 = "0arryssaaw5m5mhq6hym8zjzxx0zr45jyh07ya1cmcx5r2505xl8"; + name = "katomic-23.08.0.tar.xz"; }; }; kbackup = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kbackup-23.04.3.tar.xz"; - sha256 = "121w54ivmq8qnxc97g47i8vq4nkivypp84pqs9rs5bid4cpfvh9p"; - name = "kbackup-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kbackup-23.08.0.tar.xz"; + sha256 = "0i91rr2sh8qs4gxwv1bmfarjppyvbba1pv7i0wcvj6lmaz6h3yna"; + name = "kbackup-23.08.0.tar.xz"; }; }; kblackbox = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kblackbox-23.04.3.tar.xz"; - sha256 = "0h7byd7g52yvmz3gxrzp2frs4iifm0r6lq8fjz2nxbl1rkw9ljbp"; - name = "kblackbox-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kblackbox-23.08.0.tar.xz"; + sha256 = "1axyzchy4cv5gci01w2kj7vg0sddafcx4zvwy07m2nb46niahcvy"; + name = "kblackbox-23.08.0.tar.xz"; }; }; kblocks = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kblocks-23.04.3.tar.xz"; - sha256 = "1z5f2zpnmfh05vlmjw85jj2d0sfxl5w1kg30ky6gmgmmfzj2sjzx"; - name = "kblocks-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kblocks-23.08.0.tar.xz"; + sha256 = "1fr54i2jw058pxsrba8vy48yyzqcipb3aw40zw3093bglmiig1ql"; + name = "kblocks-23.08.0.tar.xz"; }; }; kbounce = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kbounce-23.04.3.tar.xz"; - sha256 = "06b0q4f4yn8m8gy7wgax54ldwnkgykr8yfr2h0ih8mfg3w8xsx7s"; - name = "kbounce-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kbounce-23.08.0.tar.xz"; + sha256 = "13lwykx2dvjqa8qviwpr5w3dvprb6p5mf1ygqvw7476mdp8709jx"; + name = "kbounce-23.08.0.tar.xz"; }; }; kbreakout = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kbreakout-23.04.3.tar.xz"; - sha256 = "08fq0s1c71ag6jzyxz6spc5ylmzpbqpyqi9lqjk0x7y7brkfk9fq"; - name = "kbreakout-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kbreakout-23.08.0.tar.xz"; + sha256 = "1mwdajfaxfawswk0c9r5b78q1rhh6q1v3wbfbllg4k2lnmp40b4x"; + name = "kbreakout-23.08.0.tar.xz"; }; }; kbruch = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kbruch-23.04.3.tar.xz"; - sha256 = "0gr5d5xlrca71lrjqxnllsw4wji21y8wnzpq685f1nkkkhamxk37"; - name = "kbruch-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kbruch-23.08.0.tar.xz"; + sha256 = "0ipmbzy9iqb5mng80vv8hcj8ay7v9yj762xzsscf444dhdy78vad"; + name = "kbruch-23.08.0.tar.xz"; }; }; kcachegrind = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kcachegrind-23.04.3.tar.xz"; - sha256 = "175bag1mfidp7bdsjb3zinib76jy8h881rqxgmkn90gmv4fqy62b"; - name = "kcachegrind-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kcachegrind-23.08.0.tar.xz"; + sha256 = "1087a4mwq3a2fqii0kcxl4i94wcni491n3x53i3c25bi5qypsmvw"; + name = "kcachegrind-23.08.0.tar.xz"; }; }; kcalc = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kcalc-23.04.3.tar.xz"; - sha256 = "04mqicwqn6h99jgh1zl0wsgk1rdkswzxaq8b8yz5hq654dsyq6y1"; - name = "kcalc-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kcalc-23.08.0.tar.xz"; + sha256 = "1q7c7v2m84c7kbgfjgsm0qy8jyz19l0plk6rff1qmfqx3y20glny"; + name = "kcalc-23.08.0.tar.xz"; }; }; kcalutils = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kcalutils-23.04.3.tar.xz"; - sha256 = "1j7f5ai25zcxggw3dvky624asxim5bkd6a35rcdzkjhj1qwk3vll"; - name = "kcalutils-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kcalutils-23.08.0.tar.xz"; + sha256 = "1wqp0d40pqn1vaqhv7x5qzp9nx43a96l9yk9vyh3yg9q8jfgajgy"; + name = "kcalutils-23.08.0.tar.xz"; }; }; kcharselect = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kcharselect-23.04.3.tar.xz"; - sha256 = "05z80j8bwrj1zfpy376gsx30bv7bxsa3lyvrqsz197w1g8vp5gix"; - name = "kcharselect-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kcharselect-23.08.0.tar.xz"; + sha256 = "0b4ay70rc0wzz05ld3rm8yf2wq2gkmxgysnak34nj62iadz52rf5"; + name = "kcharselect-23.08.0.tar.xz"; }; }; kclock = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kclock-23.04.3.tar.xz"; - sha256 = "1rn1v7y7kjmly703qlk0jhsqk5kiixrf7z339h38l7b32r8vdm9r"; - name = "kclock-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kclock-23.08.0.tar.xz"; + sha256 = "08v180yl7da7i8q5ll0i3dqlh6pqnirsrcq5lfbb2mvczxsr1frw"; + name = "kclock-23.08.0.tar.xz"; }; }; kcolorchooser = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kcolorchooser-23.04.3.tar.xz"; - sha256 = "1ripvn2li74rwngicay9c78j0slia1rpsi1f43rbb36p9af02lwq"; - name = "kcolorchooser-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kcolorchooser-23.08.0.tar.xz"; + sha256 = "15vxyd8xwg8m1jbmag5897094hs8a7ipsa04ss3yd4zd9g4bx0fp"; + name = "kcolorchooser-23.08.0.tar.xz"; }; }; kcron = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kcron-23.04.3.tar.xz"; - sha256 = "107rx45d4gzkxiab8i87jk0qvyagwlrynq0k7098w5zfxg603vgg"; - name = "kcron-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kcron-23.08.0.tar.xz"; + sha256 = "1y9zga7mniadnzkqpyqy61hiznzib5p0ycfv8bbx1q5bx7cnkslh"; + name = "kcron-23.08.0.tar.xz"; }; }; kde-dev-scripts = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kde-dev-scripts-23.04.3.tar.xz"; - sha256 = "079wvyr7qjbxgywdzd9mydn7l4wq9jx20dv2j3iwq5cq9scwfgvm"; - name = "kde-dev-scripts-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kde-dev-scripts-23.08.0.tar.xz"; + sha256 = "0mdi1jpx6lxg7g8jfz8z5sdyv7kf6yfk8mhr3xv3mmmnb3qpkkx0"; + name = "kde-dev-scripts-23.08.0.tar.xz"; }; }; kde-dev-utils = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kde-dev-utils-23.04.3.tar.xz"; - sha256 = "0gadxs9qxqkla6rwirpyckfh718m8lslvwi4lc0xsn3nkjprj7kl"; - name = "kde-dev-utils-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kde-dev-utils-23.08.0.tar.xz"; + sha256 = "0x03czwbr134kp9b6bgm91jqyja6wh5mkfs95afirb0h4v7xmr0i"; + name = "kde-dev-utils-23.08.0.tar.xz"; }; }; kde-inotify-survey = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kde-inotify-survey-23.04.3.tar.xz"; - sha256 = "1l9lvjwqrc05fz75d7whkkxk5hy1ra6n5mf8dj0p8k0xxnxhs178"; - name = "kde-inotify-survey-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kde-inotify-survey-23.08.0.tar.xz"; + sha256 = "1hc8rlbrb7k5m3j3cwbxi5a51c15ax1lv593il5bbbz6yr36dhiq"; + name = "kde-inotify-survey-23.08.0.tar.xz"; }; }; kdebugsettings = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdebugsettings-23.04.3.tar.xz"; - sha256 = "02igg8ry1cxa83pdj6pgwzw7hpjwfrfk57d9ybgfvy2x08d5kvqz"; - name = "kdebugsettings-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdebugsettings-23.08.0.tar.xz"; + sha256 = "1a8h8fn55jsyf56l5s6y3cag1v4wm1cwk2hdfrjl3zi5j0vqln4d"; + name = "kdebugsettings-23.08.0.tar.xz"; }; }; kdeconnect-kde = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdeconnect-kde-23.04.3.tar.xz"; - sha256 = "1gcmqqj752h3lmcpvc7cm6k6bpb158ha7i5ysp0kqvf8cmpi5ydz"; - name = "kdeconnect-kde-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdeconnect-kde-23.08.0.tar.xz"; + sha256 = "1sfm04k81992skb5s1n968nj8zd07yyk0p5qqnhyyacrz5scchcb"; + name = "kdeconnect-kde-23.08.0.tar.xz"; }; }; kdeedu-data = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdeedu-data-23.04.3.tar.xz"; - sha256 = "0qki2anbhwrmfcyin0n2hx2xmax3ybks59g4lcxbganyk3k64yfc"; - name = "kdeedu-data-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdeedu-data-23.08.0.tar.xz"; + sha256 = "1322hc5iavnv181i5kydvfvfdap3j6a5m9q2id7g6il5iwvpq04d"; + name = "kdeedu-data-23.08.0.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdegraphics-mobipocket-23.04.3.tar.xz"; - sha256 = "13hn6dh5d4vsblvg6wyyvbmcyl0yyqr8srilik86wilp58qbsrdv"; - name = "kdegraphics-mobipocket-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdegraphics-mobipocket-23.08.0.tar.xz"; + sha256 = "1yvrg6z9gjicqnr64la5k3acb8p1x0d9mc1xrhy8gsxpj67wdb8m"; + name = "kdegraphics-mobipocket-23.08.0.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdegraphics-thumbnailers-23.04.3.tar.xz"; - sha256 = "16z6sf8v9874ng5b6b6wzvnlqncp7xz2fqpc93vs7sby8rwsdpy0"; - name = "kdegraphics-thumbnailers-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdegraphics-thumbnailers-23.08.0.tar.xz"; + sha256 = "0csl6kh2j6sdsq812an10vlrg6cirm5v195dxgc3na1y6ncjk250"; + name = "kdegraphics-thumbnailers-23.08.0.tar.xz"; }; }; kdenetwork-filesharing = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdenetwork-filesharing-23.04.3.tar.xz"; - sha256 = "19izy4bjz5xzibabhf0dvijag7ig7vf3pz1c2dphspsbqkgpjanb"; - name = "kdenetwork-filesharing-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdenetwork-filesharing-23.08.0.tar.xz"; + sha256 = "0airv4vgb6ivl74hhhsm26f6isjkrr7222l01kqcxv4dwf0jkmyf"; + name = "kdenetwork-filesharing-23.08.0.tar.xz"; }; }; kdenlive = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdenlive-23.04.3.tar.xz"; - sha256 = "0jy95mbsifcv5kg80dw6nn86qcs5vy1652w4ig2wd2f7q864wfri"; - name = "kdenlive-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdenlive-23.08.0.tar.xz"; + sha256 = "01yjwikvjs75khr12s86sw2ly9c51vrb7zgh9q0phxbz3p6gcqsz"; + name = "kdenlive-23.08.0.tar.xz"; }; }; kdepim-addons = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdepim-addons-23.04.3.tar.xz"; - sha256 = "1nai47wccf1shrgvywslqdkxk066zdkpb1grf3qzh8q77za2kmqz"; - name = "kdepim-addons-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdepim-addons-23.08.0.tar.xz"; + sha256 = "189fmzgvshnld3j7y98g70z9qyrkizk0nfl5im5wamrcn77vwpv1"; + name = "kdepim-addons-23.08.0.tar.xz"; }; }; kdepim-runtime = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdepim-runtime-23.04.3.tar.xz"; - sha256 = "1wvwibq6zzjlhh8yqrlqras0m8i01ynlwj9z6l3f0g0hyyz5nkw4"; - name = "kdepim-runtime-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdepim-runtime-23.08.0.tar.xz"; + sha256 = "16i2sbqzvmsjb20xjlbp92jaig66bg9ws52dk7d45r2j8ppb9qli"; + name = "kdepim-runtime-23.08.0.tar.xz"; }; }; kdesdk-kio = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdesdk-kio-23.04.3.tar.xz"; - sha256 = "0sxdjpwxwbbinmpz0pq2icm2h9cv9k0yzha0szf1ighfc7kyqwbs"; - name = "kdesdk-kio-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdesdk-kio-23.08.0.tar.xz"; + sha256 = "17wmzkbmq6p60dabnb3bkx7f6z04wkj271fpyhlijj5ma3w6dl88"; + name = "kdesdk-kio-23.08.0.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdesdk-thumbnailers-23.04.3.tar.xz"; - sha256 = "04fw6lrilccvi71y70zz0nag41gdpfp49556c6vx3nv3ndm28wfa"; - name = "kdesdk-thumbnailers-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdesdk-thumbnailers-23.08.0.tar.xz"; + sha256 = "1add5r1vaqp1r5m37636pzvik15imz7k3qnskyrw60jzyk9fyq9m"; + name = "kdesdk-thumbnailers-23.08.0.tar.xz"; }; }; kdev-php = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdev-php-23.04.3.tar.xz"; - sha256 = "1nrdf5iyhcfy77fynaq65y06z3n3z7v2qzd9zp74ngb4j3x3ks1p"; - name = "kdev-php-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdev-php-23.08.0.tar.xz"; + sha256 = "0dwxczpbxn3in08cmyf393k7xh83qmj95kbm0fbxigpadxy76ykg"; + name = "kdev-php-23.08.0.tar.xz"; }; }; kdev-python = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdev-python-23.04.3.tar.xz"; - sha256 = "1i1rba7405gfzywh7in915s27b6gn2f8m76kc6ra63dvh75qpyyi"; - name = "kdev-python-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdev-python-23.08.0.tar.xz"; + sha256 = "1s0zw2b8kb16nii2da8sx2vx1x4s130nlc9fwvc63jin8f01ynmx"; + name = "kdev-python-23.08.0.tar.xz"; }; }; kdevelop = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdevelop-23.04.3.tar.xz"; - sha256 = "0m1q5nhx7wd4b8850ikw7dk6zka57gapf78wawjv2h1hijxcyf4v"; - name = "kdevelop-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdevelop-23.08.0.tar.xz"; + sha256 = "0spfg8a4carrdl9fmf60qr85dzxah2g6vy3zxhqaadd4kcsrjz1h"; + name = "kdevelop-23.08.0.tar.xz"; }; }; kdf = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdf-23.04.3.tar.xz"; - sha256 = "11ndcbfkq5fhb1lfij0mmm43fw49sh0z3nw644sll0smcwic76aa"; - name = "kdf-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdf-23.08.0.tar.xz"; + sha256 = "1x5gfa7bs8fyq2pqvnriswwlak78pq61np2whsmh07njq8s6frdq"; + name = "kdf-23.08.0.tar.xz"; }; }; kdialog = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdialog-23.04.3.tar.xz"; - sha256 = "042az7d9ngar6xp7gv3xcmlns9hpbvs39dkymanqgc0riwa1mvsx"; - name = "kdialog-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdialog-23.08.0.tar.xz"; + sha256 = "1h4mid01v732iw8gd86r88l8n9yq55dwlixk9lz239i17hzr8l0n"; + name = "kdialog-23.08.0.tar.xz"; }; }; kdiamond = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdiamond-23.04.3.tar.xz"; - sha256 = "038lpp387m45zcy49rgmisiz5ajrvxwxnf424wllrjkihxy1siyn"; - name = "kdiamond-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kdiamond-23.08.0.tar.xz"; + sha256 = "0ps4wf3gz7zrkplsqa9b5a0523f55a5m2b41vnfmkcg3fkdpn4n0"; + name = "kdiamond-23.08.0.tar.xz"; }; }; keditbookmarks = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/keditbookmarks-23.04.3.tar.xz"; - sha256 = "08cgyfbnszr5l3xg8a15rml3n8ldszdzm9xqnmjpifrzj5qbw9va"; - name = "keditbookmarks-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/keditbookmarks-23.08.0.tar.xz"; + sha256 = "1fvi81qpf3nvgp0lqyqgbk1mhwf6s4m6k6ivd1d4zhlcq93wwjf6"; + name = "keditbookmarks-23.08.0.tar.xz"; }; }; keysmith = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/keysmith-23.04.3.tar.xz"; - sha256 = "1rfp516adliyc57nx4ha1rp8v2z340ygsvblh5sqmsdsg2ivjklj"; - name = "keysmith-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/keysmith-23.08.0.tar.xz"; + sha256 = "1xa0r9c28m87chk90kaxs1xs73s6y6m6a9na1j6p15zad1lxjn81"; + name = "keysmith-23.08.0.tar.xz"; }; }; kfind = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kfind-23.04.3.tar.xz"; - sha256 = "03g9cn0wp3f2n9zwzbc5sbcria4hcp2ls77fbxyj3wkady3m50if"; - name = "kfind-23.04.3.tar.xz"; - }; - }; - kfloppy = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kfloppy-23.04.3.tar.xz"; - sha256 = "1q33bjvp376amgryjwday3qqkx41q5p7vyqkbwpgb2x97gk7q94x"; - name = "kfloppy-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kfind-23.08.0.tar.xz"; + sha256 = "0wsym0gi32fr35dr0c2ib6h7pgm5h9cbibgm5knrs18fsncqkj5i"; + name = "kfind-23.08.0.tar.xz"; }; }; kfourinline = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kfourinline-23.04.3.tar.xz"; - sha256 = "0chfjp0k4ps5f6vy8nxqc2xlj4xql08llxnzsz6c2x611n69aszm"; - name = "kfourinline-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kfourinline-23.08.0.tar.xz"; + sha256 = "17xx3yraiarkll24yxw0n7vg1ygsix8kjiwk3w2dc8xlgg36smhh"; + name = "kfourinline-23.08.0.tar.xz"; }; }; kgeography = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kgeography-23.04.3.tar.xz"; - sha256 = "16vvfz7rw2d5zslifrk4s6vvm5502rcjjg60z67nplfckx1vi4a5"; - name = "kgeography-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kgeography-23.08.0.tar.xz"; + sha256 = "1rz973mlc5jiyn0xgxpwvvk015g68mmk71xwgdhd785al1hi0nwi"; + name = "kgeography-23.08.0.tar.xz"; }; }; kget = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kget-23.04.3.tar.xz"; - sha256 = "1n9wnm1si4g4rv8zaqpr8m3c2aav0mj8i7z96m78dk1apippx77r"; - name = "kget-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kget-23.08.0.tar.xz"; + sha256 = "1w5y5cphzjz2j9vfc9qnzxn6wcbp2gw9i30jxchnvrp0lzzfi30n"; + name = "kget-23.08.0.tar.xz"; }; }; kgoldrunner = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kgoldrunner-23.04.3.tar.xz"; - sha256 = "0acavby9lwbqbx577a3az9lcahchngcs15571va2ndnq1r16paxf"; - name = "kgoldrunner-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kgoldrunner-23.08.0.tar.xz"; + sha256 = "1sn5h0ng1ixislq010x6yv6npby19i9abg4swk3dadij52fgm4yd"; + name = "kgoldrunner-23.08.0.tar.xz"; }; }; kgpg = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kgpg-23.04.3.tar.xz"; - sha256 = "1ihxw1s4sq7cp5pm6rddcmvqk0v5gfg4v38b6yg8hyjg655x63jz"; - name = "kgpg-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kgpg-23.08.0.tar.xz"; + sha256 = "14qqv67vp16v3i9bhyhjvbgpr4c7xsfmn4pzcdwpjrqscy54713a"; + name = "kgpg-23.08.0.tar.xz"; }; }; khangman = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/khangman-23.04.3.tar.xz"; - sha256 = "1rzl6kfb7457w4s0wgkk07s0vr8nngivhpfr6q0m4261qf7b17zw"; - name = "khangman-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/khangman-23.08.0.tar.xz"; + sha256 = "1xjsmf161z0xlaxpxm9p7n1477qcka8fzvcdj7gsrk55p519idsl"; + name = "khangman-23.08.0.tar.xz"; }; }; khelpcenter = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/khelpcenter-23.04.3.tar.xz"; - sha256 = "10rivj5c14v5hwk87z41gwk830sy35fz0jg1jpay43jzw0ss995y"; - name = "khelpcenter-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/khelpcenter-23.08.0.tar.xz"; + sha256 = "1g1y4hcxcd2aw7f5wymsdma1zjpmkhqvsnwn8yj1yj9gzh35wwcn"; + name = "khelpcenter-23.08.0.tar.xz"; }; }; kidentitymanagement = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kidentitymanagement-23.04.3.tar.xz"; - sha256 = "03bfz0x35wiynla39iysxa5g3rckmy9nj2z1f439v9sblcqbvz3p"; - name = "kidentitymanagement-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kidentitymanagement-23.08.0.tar.xz"; + sha256 = "10hnbnc2iwa73m2nk4b2vj1r1g6y29cqijkx0ldqxim3q6f2pqi6"; + name = "kidentitymanagement-23.08.0.tar.xz"; }; }; kig = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kig-23.04.3.tar.xz"; - sha256 = "18ml5ca8mmqb1a0j18pf9ajpj20rs5i0knvz4rssjfzibf9v6cbs"; - name = "kig-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kig-23.08.0.tar.xz"; + sha256 = "1gf5ffxaxz26pbawc0j2ymkasg7r55dinp9n267x31ljfk96vl16"; + name = "kig-23.08.0.tar.xz"; }; }; kigo = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kigo-23.04.3.tar.xz"; - sha256 = "0qx9plrs588210rdgvb2bkm5yjw4pna9q7v38cb166nfgkh6gv63"; - name = "kigo-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kigo-23.08.0.tar.xz"; + sha256 = "1klhc1lyl32av1bzrd0j6y3n2vjf3ng1jkx6pr95w0mys3nz3z0w"; + name = "kigo-23.08.0.tar.xz"; }; }; killbots = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/killbots-23.04.3.tar.xz"; - sha256 = "0ygg2cmp7wqzw9nsn768vzgjs8i44k3skwcn2abg1jj5k64wp9cb"; - name = "killbots-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/killbots-23.08.0.tar.xz"; + sha256 = "0ihrrb1zngr1b9xwl65b631cb5d7w3na9f7k0dhih32j2rd1mc6z"; + name = "killbots-23.08.0.tar.xz"; }; }; kimagemapeditor = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kimagemapeditor-23.04.3.tar.xz"; - sha256 = "05c30x7gihljw9vxpq2ag68bfyikh5gj17xbckkkg6l01qk6lqdc"; - name = "kimagemapeditor-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kimagemapeditor-23.08.0.tar.xz"; + sha256 = "1lj7pbccghniakbxcb4dyffb2q5s62r880cls08pw1hmnih558cq"; + name = "kimagemapeditor-23.08.0.tar.xz"; }; }; kimap = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kimap-23.04.3.tar.xz"; - sha256 = "08s2891f2cnf5f7q034lmqv3vnh3v61l7bsyssdx711jfbswg9ik"; - name = "kimap-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kimap-23.08.0.tar.xz"; + sha256 = "0rn2xg6nrnr33d6lljfqdvc65dn2rmglv6j03cqml5cqck1cm0l7"; + name = "kimap-23.08.0.tar.xz"; }; }; kio-admin = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kio-admin-23.04.3.tar.xz"; - sha256 = "1vpl0bmgf23zvigbmxvmmpl01p99n81g4640qdjfx2f9854qqzz0"; - name = "kio-admin-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kio-admin-23.08.0.tar.xz"; + sha256 = "157l499087gcw70wmdiaapqf5yipknsbqvpv2jjbb8p2vgp8q1pc"; + name = "kio-admin-23.08.0.tar.xz"; }; }; kio-extras = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kio-extras-23.04.3.tar.xz"; - sha256 = "1ygxfq62idpgf1dlic1245y5gf0fnkrpbqxd230xmxi7a35za8qd"; - name = "kio-extras-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kio-extras-23.08.0.tar.xz"; + sha256 = "02a84v4d9d2rns65j4yq1dspmifbh5h0mr1v14i9znffz3pfn72s"; + name = "kio-extras-23.08.0.tar.xz"; }; }; kio-gdrive = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kio-gdrive-23.04.3.tar.xz"; - sha256 = "0s7kz25z46gh1rv85i2ndbgv8nhbjlwc7ypd8fsd4lqgf025h0ns"; - name = "kio-gdrive-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kio-gdrive-23.08.0.tar.xz"; + sha256 = "1cngw7hyyryr0d1yj8r7l5ijdx9xxjw43c426m8rxm8w6x640mcz"; + name = "kio-gdrive-23.08.0.tar.xz"; }; }; kio-zeroconf = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kio-zeroconf-23.04.3.tar.xz"; - sha256 = "0b7p5ivfcggs63y5hmyy5fwjxs63ghhkrs603h7hmj24apfwk15a"; - name = "kio-zeroconf-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kio-zeroconf-23.08.0.tar.xz"; + sha256 = "1920kl6r8jm8zp0q9c5civ7gx0a3kj13i9hlingjp042lwbww9z2"; + name = "kio-zeroconf-23.08.0.tar.xz"; }; }; kipi-plugins = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kipi-plugins-23.04.3.tar.xz"; - sha256 = "12785nyni2jj6phyr7xwnspr179pkaq17pzs985azxjm4wsjn5bz"; - name = "kipi-plugins-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kipi-plugins-23.08.0.tar.xz"; + sha256 = "0v9sm5c4d8g5ih9wbsmbfvxgjk7divjklfbwkv3pyhzvbqspai0p"; + name = "kipi-plugins-23.08.0.tar.xz"; }; }; kirigami-gallery = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kirigami-gallery-23.04.3.tar.xz"; - sha256 = "0j719ggd1kd9qwqsc5wd256l8yiqivq1ifkfsisc14llawb7m0h2"; - name = "kirigami-gallery-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kirigami-gallery-23.08.0.tar.xz"; + sha256 = "06l6izavxlsgdkmi798ynk9b1sfw74cwhhdga4q92qvy3ick311x"; + name = "kirigami-gallery-23.08.0.tar.xz"; }; }; kiriki = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kiriki-23.04.3.tar.xz"; - sha256 = "13lzpbhkp48r9m0bcrzfqacz9xvc89xavf3yn3ql50g3jjlkq41v"; - name = "kiriki-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kiriki-23.08.0.tar.xz"; + sha256 = "030nw63s8xmvmgngb6w04yv6h0yj6cqvl7qybwhrrahxr3906jzs"; + name = "kiriki-23.08.0.tar.xz"; }; }; kiten = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kiten-23.04.3.tar.xz"; - sha256 = "0l3cgcamkrfyjdqy4x38lc18p1acn97xyhm01q91pbr644gyiy25"; - name = "kiten-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kiten-23.08.0.tar.xz"; + sha256 = "1fhx9hbciw622wpqj5lhdb9vws4p2l6zrbmzmxkx7djxdym41hra"; + name = "kiten-23.08.0.tar.xz"; }; }; kitinerary = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kitinerary-23.04.3.tar.xz"; - sha256 = "0fcqix7hgmv7qcfxzmqy61kg7dqi5zas5vqfs7pfycgcxma0g869"; - name = "kitinerary-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kitinerary-23.08.0.tar.xz"; + sha256 = "1m7yhm4yrvhbpggigfrm2xd41rg91zwvs0rbnfsrpnhr2wm8qb1r"; + name = "kitinerary-23.08.0.tar.xz"; }; }; kjournald = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kjournald-23.04.3.tar.xz"; - sha256 = "0mnfn3b8792hajfwfxm701n67knvvz46kvr6pm1jwwz5l6hbwncq"; - name = "kjournald-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kjournald-23.08.0.tar.xz"; + sha256 = "19mcj53gxlipd6ny6dzyqxq0i6v1838wxl79dj9gwgvmqrr1vd4i"; + name = "kjournald-23.08.0.tar.xz"; }; }; kjumpingcube = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kjumpingcube-23.04.3.tar.xz"; - sha256 = "09bh57vzjnn56dnhpp4szx72wyskc5g714vlyp6c27vr27xry8fi"; - name = "kjumpingcube-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kjumpingcube-23.08.0.tar.xz"; + sha256 = "0grzrw3mi94fc00flq8alrf1z2pksk0r0xafazi1i9ibv789d899"; + name = "kjumpingcube-23.08.0.tar.xz"; }; }; kldap = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kldap-23.04.3.tar.xz"; - sha256 = "0hp5j02kwh91xf0n6zqzgam7g50r54hzbkli5i7c0rxdb1g28ihm"; - name = "kldap-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kldap-23.08.0.tar.xz"; + sha256 = "14457ld8rdvs2s2nrbpnvf7vcqrpbxxnzbqbxg8z7swpn695w235"; + name = "kldap-23.08.0.tar.xz"; }; }; kleopatra = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kleopatra-23.04.3.tar.xz"; - sha256 = "0lcl20yihsa8dq0s24akp5z0290vh9nxjjjdwqk88nz8vmsr29i0"; - name = "kleopatra-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kleopatra-23.08.0.tar.xz"; + sha256 = "0pr56q1cb26453zxxya8lxhchp2v05631ic4v9fqbwfmgchj13xq"; + name = "kleopatra-23.08.0.tar.xz"; }; }; klettres = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/klettres-23.04.3.tar.xz"; - sha256 = "09vklxcj7hhbb1m9b5gpd73qcxnkvh94v49cn84d9hdnm7gbsb23"; - name = "klettres-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/klettres-23.08.0.tar.xz"; + sha256 = "1wqnmpl9ilv4bl8cp55kqbcnbqm9k2g93z0ilv313k8wlx79djld"; + name = "klettres-23.08.0.tar.xz"; }; }; klickety = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/klickety-23.04.3.tar.xz"; - sha256 = "0ngbjn3dlw4257p2gzlhm8rlljqgzjmb160wiw6j4yz1mxd75fr2"; - name = "klickety-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/klickety-23.08.0.tar.xz"; + sha256 = "118pf0zj4a0q1hca0ym70q85ac5fsjkki2g04x1hjrzkcv51q8zz"; + name = "klickety-23.08.0.tar.xz"; }; }; klines = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/klines-23.04.3.tar.xz"; - sha256 = "1dny7wsj90c3vbgbrpxvxfy44j9ip3vdylc7889ckzbliivipxk4"; - name = "klines-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/klines-23.08.0.tar.xz"; + sha256 = "0al1ri7g20r8w7ijk1pdgpvn32z9nfrr19rj2hrm2wg2349kvqdq"; + name = "klines-23.08.0.tar.xz"; }; }; kmag = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmag-23.04.3.tar.xz"; - sha256 = "13ar37yv3gk5451cdqrgbm91jm50qw4559sx25fv95g2i9wa7z74"; - name = "kmag-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kmag-23.08.0.tar.xz"; + sha256 = "0swj9zaamrv8jp38hmd8fisnaljjr1i1vplrbvipxr2sg2f3zlip"; + name = "kmag-23.08.0.tar.xz"; }; }; kmahjongg = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmahjongg-23.04.3.tar.xz"; - sha256 = "1q2aq8y3c4a84rjvqk4gz6mlyflfnzw6im68p96wmcn98s5gsc22"; - name = "kmahjongg-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kmahjongg-23.08.0.tar.xz"; + sha256 = "1i20mxciwvgb5d0zg7via8rk4yzx7n35c8gphd0lyf27s8rc0kpr"; + name = "kmahjongg-23.08.0.tar.xz"; }; }; kmail = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmail-23.04.3.tar.xz"; - sha256 = "16gz0i7na1pkyly9jnvavyffkawxf5irr92rd50w68p01b82dhc6"; - name = "kmail-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kmail-23.08.0.tar.xz"; + sha256 = "052pz9rhb2s0cf86ms1br8sl3f7iwb6k864d64b3wd5xvhbcsf55"; + name = "kmail-23.08.0.tar.xz"; }; }; kmail-account-wizard = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmail-account-wizard-23.04.3.tar.xz"; - sha256 = "1840zjgrqwk2zgqbb33gl9nvigsrmk5grzvzg5cw116h7lb7z7xx"; - name = "kmail-account-wizard-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kmail-account-wizard-23.08.0.tar.xz"; + sha256 = "14y0q8xm0m59pqh783y9iji5ngf7ckhyfrh9kmj2i972m3dzh2db"; + name = "kmail-account-wizard-23.08.0.tar.xz"; }; }; kmailtransport = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmailtransport-23.04.3.tar.xz"; - sha256 = "14vmm9vla8i477jq40z73lc4klx6mm03y2xnljvx1v4inm3cpw2c"; - name = "kmailtransport-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kmailtransport-23.08.0.tar.xz"; + sha256 = "0ifaqbjpfmislngl92qssnssjd9maz44lzlihp8cnnn2kd1xw3pg"; + name = "kmailtransport-23.08.0.tar.xz"; }; }; kmbox = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmbox-23.04.3.tar.xz"; - sha256 = "05hdfjwp6ay2j16rxp55k3fywwf7kxiig4dv9fh51iysglmzzn76"; - name = "kmbox-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kmbox-23.08.0.tar.xz"; + sha256 = "1v5s0vs2n316qk0kr737i9kcmx15b7z1yhgbdwhmllyb2cybn6s4"; + name = "kmbox-23.08.0.tar.xz"; }; }; kmime = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmime-23.04.3.tar.xz"; - sha256 = "1i38g0s98d24882kxyjay965nz3d3fjhb3mv1p4sllm2lnffrq2d"; - name = "kmime-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kmime-23.08.0.tar.xz"; + sha256 = "0z7zk9q0j0i4ddcnlgqb8p82vnwwxqw5l9hpmlyd8bsdxghd8wp4"; + name = "kmime-23.08.0.tar.xz"; }; }; kmines = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmines-23.04.3.tar.xz"; - sha256 = "0x301dsppn0sav31ds5hpbfkbbisjg640ri13103s1jn0y2b90b9"; - name = "kmines-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kmines-23.08.0.tar.xz"; + sha256 = "10wrx0xlnx3d27hyb3j33cdrqis8lvmd8h0x6vm7xrw9pbfnhfzk"; + name = "kmines-23.08.0.tar.xz"; }; }; kmix = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmix-23.04.3.tar.xz"; - sha256 = "09pfsa6y1phm6z24da60s47gc18w4cvv7r8sxh5qfww7b0dnhixj"; - name = "kmix-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kmix-23.08.0.tar.xz"; + sha256 = "013jwxd0l3vdfqjqd3g52p5jpql67f50qhnfnr2vygmz5xb65p8k"; + name = "kmix-23.08.0.tar.xz"; }; }; kmousetool = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmousetool-23.04.3.tar.xz"; - sha256 = "1prh9xdzwx0mx93g9cbjy55hxwcci90hvrv2ckj4dqdnv5fv4h21"; - name = "kmousetool-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kmousetool-23.08.0.tar.xz"; + sha256 = "1nijq9d2chvil677npx9pj155v6xl5iklyi2696jndfw9v30hsy1"; + name = "kmousetool-23.08.0.tar.xz"; }; }; kmouth = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmouth-23.04.3.tar.xz"; - sha256 = "0qyzq4cvcsacb7hr6n79i3rzyjr0m3c8lrf8fwbzdivswpk8wss3"; - name = "kmouth-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kmouth-23.08.0.tar.xz"; + sha256 = "031kj9n1p9x927z373b1yhfnhi2r8spp5lb4gxfngfxnh41cadrx"; + name = "kmouth-23.08.0.tar.xz"; }; }; kmplot = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmplot-23.04.3.tar.xz"; - sha256 = "1wln4agx0mkbs82nynb5m63z798s3rlyymf9llcvrhqqpvi9416b"; - name = "kmplot-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kmplot-23.08.0.tar.xz"; + sha256 = "0if00w89a4zjsbjxagz49jkqbir9l4fqn7rzrxx3ji6pgk5817yf"; + name = "kmplot-23.08.0.tar.xz"; }; }; knavalbattle = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/knavalbattle-23.04.3.tar.xz"; - sha256 = "1brj2dvymgpf74vbsrs2m81lxxfxsly9pafd13g8rkzdx3hn1n0q"; - name = "knavalbattle-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/knavalbattle-23.08.0.tar.xz"; + sha256 = "0vfzp4bcmxgz1llza7vigffa2zcgs2k2qmxahqbb076fy6qmqgqr"; + name = "knavalbattle-23.08.0.tar.xz"; }; }; knetwalk = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/knetwalk-23.04.3.tar.xz"; - sha256 = "1xqqwsbm3f8bmid7afbnacxlg1hih644f0nw0i87pr746m1sskgz"; - name = "knetwalk-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/knetwalk-23.08.0.tar.xz"; + sha256 = "0wh746q4hnyf4zq2rh1i8y22b3a8a5qwrp3rwl1b8aq6fwhfwypl"; + name = "knetwalk-23.08.0.tar.xz"; }; }; knights = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/knights-23.04.3.tar.xz"; - sha256 = "09vc765fb01vqcxyg1qqik8z76r9mmb02axy9a5wmjdf1k4y9cia"; - name = "knights-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/knights-23.08.0.tar.xz"; + sha256 = "1qjlssvdiri6y4grl4w1dzg65gnkwdpvlamhz7q8fbrbifr10im6"; + name = "knights-23.08.0.tar.xz"; }; }; knotes = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/knotes-23.04.3.tar.xz"; - sha256 = "0f2a9xy2w909y792hwwnmsqvxx91azn6f0j0xl2mlmav00a4w6za"; - name = "knotes-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/knotes-23.08.0.tar.xz"; + sha256 = "03mvz47c8arjzmjlmr91gw9gnad6f6smspbzr0niwhsgns7brcqq"; + name = "knotes-23.08.0.tar.xz"; }; }; koko = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/koko-23.04.3.tar.xz"; - sha256 = "1n76fpj955rqg98z46plhv2lwlvwskvgwqws0fslmn9vxfnzv989"; - name = "koko-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/koko-23.08.0.tar.xz"; + sha256 = "18i7kw8x6wg1ak1l0qn83kdfkq5p7fc0zkf71jyzbs30jgx3lird"; + name = "koko-23.08.0.tar.xz"; }; }; kolf = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kolf-23.04.3.tar.xz"; - sha256 = "0wbdpclc6nimjzs2pqbzaxnqn516hci1yk1dgig0jgdy1jv2nyhv"; - name = "kolf-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kolf-23.08.0.tar.xz"; + sha256 = "1k6zv6lgld5cvv73bkr1sb50hihvrjhwf8irw11wing808fcg1w9"; + name = "kolf-23.08.0.tar.xz"; }; }; kollision = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kollision-23.04.3.tar.xz"; - sha256 = "0g9nz3df8nibcwlrjlyw306dnrx58nlga2lljn7a9acpmvbp6qgi"; - name = "kollision-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kollision-23.08.0.tar.xz"; + sha256 = "0j8fyh0k48wh3rhbv0vid4lh9a439cyiqg7d0kpz5v93271vj99b"; + name = "kollision-23.08.0.tar.xz"; }; }; kolourpaint = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kolourpaint-23.04.3.tar.xz"; - sha256 = "1ab9v6ksb185f6jfhhk578qazhmy8hx6s8vjr9xyh7k3jilayj9v"; - name = "kolourpaint-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kolourpaint-23.08.0.tar.xz"; + sha256 = "1d53m63nmphd81vv5a75kaqx75z8sdfgasbi8yrppgp423157j8v"; + name = "kolourpaint-23.08.0.tar.xz"; }; }; kompare = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kompare-23.04.3.tar.xz"; - sha256 = "058rr0n5r9czxqs6ixacx0bm8hglwjmhfpf5xf1zr0fjgcirlrwy"; - name = "kompare-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kompare-23.08.0.tar.xz"; + sha256 = "1fkhb3ap3xmyjy8ixybdgbllq4948zsjxqypxczjxjalc3mpijz1"; + name = "kompare-23.08.0.tar.xz"; }; }; kongress = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kongress-23.04.3.tar.xz"; - sha256 = "1yns427iivbn7s3lw11jpf9qgsv6wdbc827apdsg5lp35n8dvr0p"; - name = "kongress-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kongress-23.08.0.tar.xz"; + sha256 = "1773qavz9g4jxwxb5qvj64pcfr0j4yd3r9wqb3a291p3fspi5flk"; + name = "kongress-23.08.0.tar.xz"; }; }; konqueror = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/konqueror-23.04.3.tar.xz"; - sha256 = "0qynyslgjqa0yqcfsq7957i7a2rbqc0fbr5vcycmib9593wi9ip0"; - name = "konqueror-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/konqueror-23.08.0.tar.xz"; + sha256 = "1xgrmag0x9hhhxwih1zzcf89jm2f60cbih5sc291daayfjb907x3"; + name = "konqueror-23.08.0.tar.xz"; }; }; konquest = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/konquest-23.04.3.tar.xz"; - sha256 = "0svzaibs8v1xd36ysj3wk7sxma26fl5pz6yp774jg0g9zi9rlkff"; - name = "konquest-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/konquest-23.08.0.tar.xz"; + sha256 = "090ksydgn56f1hym1s3sv58n5l3n990idl9149xpf7q33zfvwnlp"; + name = "konquest-23.08.0.tar.xz"; }; }; konsole = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/konsole-23.04.3.tar.xz"; - sha256 = "1k68y1i3g3bsz1dz81jhkx1q2fb13rbm5ywh632bcyln0c6l0vz0"; - name = "konsole-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/konsole-23.08.0.tar.xz"; + sha256 = "177sfgs5jpaih6zpk4wfax6ic9qh3zlq6bi2h7mr7jsd8pcnplii"; + name = "konsole-23.08.0.tar.xz"; }; }; kontact = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kontact-23.04.3.tar.xz"; - sha256 = "05kfdz0pfyfq28cvxjc05v2j89n4yj2hik1qx1qp99ydb0hbk69y"; - name = "kontact-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kontact-23.08.0.tar.xz"; + sha256 = "116dmf6pkcix00dwj7rajxbb3jjfp7xiwd6w2g08w6ir9n2fgncr"; + name = "kontact-23.08.0.tar.xz"; }; }; kontactinterface = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kontactinterface-23.04.3.tar.xz"; - sha256 = "16fg24hz9vx912cffc94x5zx4jv3k72mbxgp5ck50lydypx6rfns"; - name = "kontactinterface-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kontactinterface-23.08.0.tar.xz"; + sha256 = "1q4yc240hzmdqg2y384cg8gfqbq0hf93fn2y8ihq02chn1iqyxp3"; + name = "kontactinterface-23.08.0.tar.xz"; }; }; kontrast = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kontrast-23.04.3.tar.xz"; - sha256 = "08qwvc2b5bj3012lvwxainbw7d34mkbwwznj3661ydsnfjyxxs92"; - name = "kontrast-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kontrast-23.08.0.tar.xz"; + sha256 = "018p2k8b332pgc0lc0jrhpajy6wdz3va77g59x6yjq16qkm3njxa"; + name = "kontrast-23.08.0.tar.xz"; }; }; konversation = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/konversation-23.04.3.tar.xz"; - sha256 = "1ip0jlz71fad5l0ppbc6w914hqk7h626s12ssbb9p1c2yvlr1j1v"; - name = "konversation-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/konversation-23.08.0.tar.xz"; + sha256 = "1zjl9fppl8k53i5f5fpgnnxqg7dmfh8kv0a19x9dm5wrxv4rf60x"; + name = "konversation-23.08.0.tar.xz"; }; }; kopeninghours = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kopeninghours-23.04.3.tar.xz"; - sha256 = "14m4wl79b4qad42l1capz59pslfcrm25jshyhmcqzhqb0wzwkav9"; - name = "kopeninghours-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kopeninghours-23.08.0.tar.xz"; + sha256 = "15vx9qq93vbq9lpynmvysbqa5cdr83547mrs6zhjzz9s0xm05qy9"; + name = "kopeninghours-23.08.0.tar.xz"; }; }; kopete = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kopete-23.04.3.tar.xz"; - sha256 = "1ps6g440p1dy2zwbj23f0mzw1d78r02aj88fy3i5sws9p9ra92gi"; - name = "kopete-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kopete-23.08.0.tar.xz"; + sha256 = "13sygr3bq7ynwijcw7mjv8b9vsvhk0fsz5jzl9zlpg7z8mv9wf89"; + name = "kopete-23.08.0.tar.xz"; }; }; korganizer = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/korganizer-23.04.3.tar.xz"; - sha256 = "1vp1jsmna059vvfj7xaj9fhhhq0lz9k0pphczkfbwm3gy6nzcavz"; - name = "korganizer-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/korganizer-23.08.0.tar.xz"; + sha256 = "18213j807nbmyjr2583pcmvp7mql35fgwg2ngn4la30q2b1av4l8"; + name = "korganizer-23.08.0.tar.xz"; }; }; kosmindoormap = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kosmindoormap-23.04.3.tar.xz"; - sha256 = "1winrgc3698wjpil0hblw7bgbgaxgjh6h3dsl1kwc77w14f6vql3"; - name = "kosmindoormap-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kosmindoormap-23.08.0.tar.xz"; + sha256 = "1w9h7rbsb4dwxbbp0jx5cp1fvnzaj0bl2bqpvcyc6n2203v6dkad"; + name = "kosmindoormap-23.08.0.tar.xz"; }; }; kpat = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kpat-23.04.3.tar.xz"; - sha256 = "15c34vv0vdlsgrjy4i0v6ghk95c0x0h6jl0qn2bin9lgvvba3bkl"; - name = "kpat-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kpat-23.08.0.tar.xz"; + sha256 = "1q7lygdzklh6gqlm0hjd4qyw6bfglaq0d04r9yqw2ihy5dyn7wcp"; + name = "kpat-23.08.0.tar.xz"; }; }; kpimtextedit = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kpimtextedit-23.04.3.tar.xz"; - sha256 = "1rrs19bwl8qvasridysbbgsgdy9hyjlpi26hw77hli5ixkflj85b"; - name = "kpimtextedit-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kpimtextedit-23.08.0.tar.xz"; + sha256 = "15xq92d0ximnln1yk0s4fa4byhkbbgm3m0c6f4dsjdim2x57ldk3"; + name = "kpimtextedit-23.08.0.tar.xz"; }; }; kpkpass = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kpkpass-23.04.3.tar.xz"; - sha256 = "1l3k33yzfjzarc2rpf576ib86ifzrfmsvpcdmv060dy0k8lbm1k9"; - name = "kpkpass-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kpkpass-23.08.0.tar.xz"; + sha256 = "02s6gzq4qny9n5k5jcrvlpsjf6ac0wla9q24cgn52cvf85z704wp"; + name = "kpkpass-23.08.0.tar.xz"; }; }; kpmcore = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kpmcore-23.04.3.tar.xz"; - sha256 = "0cz0pz84sxa7lvkq8v25775z7x7g6pz9sq7c90pfv8h9qsz8q1l9"; - name = "kpmcore-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kpmcore-23.08.0.tar.xz"; + sha256 = "11wkcwf8971v37pz678lcx04darh5x6pzr8qdxdgf00sfv27lcld"; + name = "kpmcore-23.08.0.tar.xz"; }; }; kpublictransport = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kpublictransport-23.04.3.tar.xz"; - sha256 = "04fa9ismgkhskpmjf6b8gvra2z0jpsigz79b93m1snxm4046xihb"; - name = "kpublictransport-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kpublictransport-23.08.0.tar.xz"; + sha256 = "0lzjczj9lpxq00ady02xmdnclqg6sdhw08smhxa59pzj50m5qffg"; + name = "kpublictransport-23.08.0.tar.xz"; }; }; kqtquickcharts = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kqtquickcharts-23.04.3.tar.xz"; - sha256 = "12812djkanz0y4sxnpm3xmkjpjf4spvjsykaxby4cnsag3jpjr1v"; - name = "kqtquickcharts-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kqtquickcharts-23.08.0.tar.xz"; + sha256 = "0x9j2xggc7rw1nqyy66qx61fksqcrmzgns90an7yrcckmgivllfl"; + name = "kqtquickcharts-23.08.0.tar.xz"; }; }; krdc = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/krdc-23.04.3.tar.xz"; - sha256 = "0jva74n11fpm4ix4sbi0y1xnbly97lnap7dfj0bliw5s2d0sdjr0"; - name = "krdc-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/krdc-23.08.0.tar.xz"; + sha256 = "1ii828489kijdfnc4ac5i9mj89mcq2zw8qmf965yalagxphjp3sx"; + name = "krdc-23.08.0.tar.xz"; }; }; krecorder = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/krecorder-23.04.3.tar.xz"; - sha256 = "1dxz896jkammfigwg3nyz5mzm4npxxzgdnpqimi06swd76bjyd3k"; - name = "krecorder-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/krecorder-23.08.0.tar.xz"; + sha256 = "078nq5y0vrvzpqpbh10yg6p3w8g82z69xqlysc6vy8nvkcs3ghm6"; + name = "krecorder-23.08.0.tar.xz"; }; }; kreversi = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kreversi-23.04.3.tar.xz"; - sha256 = "1mb1xrywk5p7ipjml1g2mjqfs7rlpa41if3yc7p9zcrkcasnbffv"; - name = "kreversi-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kreversi-23.08.0.tar.xz"; + sha256 = "1b4i74i7fvkscxp2i8jjdm5f0rnggilcl8l75xvrjz3h06h0576s"; + name = "kreversi-23.08.0.tar.xz"; }; }; krfb = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/krfb-23.04.3.tar.xz"; - sha256 = "0qbrvf2wa3af1z1dpq3pqkngfbrfdgqfz8xs1qpdpyb7jxnphry7"; - name = "krfb-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/krfb-23.08.0.tar.xz"; + sha256 = "0j5qz5yb0xvlzyy6sm3v1xk4m9h1aqb4xx0k2mxpcy4m23lhyi60"; + name = "krfb-23.08.0.tar.xz"; }; }; kross-interpreters = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kross-interpreters-23.04.3.tar.xz"; - sha256 = "1cr78xz318dnqjrkfr4xbvbra6d5fssgj57vl8zybz15dyh6fbic"; - name = "kross-interpreters-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kross-interpreters-23.08.0.tar.xz"; + sha256 = "09dl86ll5v8k19sfg4jhvzl4g9f2ypnq6v9wiads41051bgx987h"; + name = "kross-interpreters-23.08.0.tar.xz"; }; }; kruler = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kruler-23.04.3.tar.xz"; - sha256 = "079kmi66xms6a9x6p3csrvqia57ip9d8r9cjdgdqx6bnn0gfc0w3"; - name = "kruler-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kruler-23.08.0.tar.xz"; + sha256 = "010yifsv5mcg9idsvfjziy2qdfqhzna2nwpzc22kfpxc3fgcfnha"; + name = "kruler-23.08.0.tar.xz"; }; }; ksanecore = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ksanecore-23.04.3.tar.xz"; - sha256 = "19dd54y9mkb8lmxwz8wvmnvgq9gky3md2la9fpanxwzq2bh4237i"; - name = "ksanecore-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ksanecore-23.08.0.tar.xz"; + sha256 = "1nmx6490yr49lm39jwh941b25y5i3p7f4j66v0zbg7mq3752ggsn"; + name = "ksanecore-23.08.0.tar.xz"; }; }; kshisen = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kshisen-23.04.3.tar.xz"; - sha256 = "0bfk6nbwl35sfqxhf7cdv3n61ybi5962i2lvg7m1vlpp21q0diz8"; - name = "kshisen-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kshisen-23.08.0.tar.xz"; + sha256 = "1p4c4k3qzs6mpf53fr7crnif0l1gs4f5licd715fbv2ral874w5n"; + name = "kshisen-23.08.0.tar.xz"; }; }; ksirk = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ksirk-23.04.3.tar.xz"; - sha256 = "1sp5mhnf8r3fvifz0kw74436j5kwsmiw66myygb4rsggb8amh5x4"; - name = "ksirk-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ksirk-23.08.0.tar.xz"; + sha256 = "0xrbjbbscab83vvxldbfwr3aspwfyima27a5ry65clf86r40g8fi"; + name = "ksirk-23.08.0.tar.xz"; }; }; ksmtp = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ksmtp-23.04.3.tar.xz"; - sha256 = "0pz17vmn38n2xl35d9di1b9138dh54wgyal9hx412nh123w13h12"; - name = "ksmtp-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ksmtp-23.08.0.tar.xz"; + sha256 = "0kfl1zrbh9114bmvby387cgqd616i21hrhbbih6diklr2xk0ramr"; + name = "ksmtp-23.08.0.tar.xz"; }; }; ksnakeduel = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ksnakeduel-23.04.3.tar.xz"; - sha256 = "182z9664p0shyx4rbr1cn32mzlfzl80x96nwakvv1ss7sf7dp1x3"; - name = "ksnakeduel-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ksnakeduel-23.08.0.tar.xz"; + sha256 = "1qhplpq4ybk4zlmh92b7v5rxki4i0j7azngc2pn8awabblylhc8j"; + name = "ksnakeduel-23.08.0.tar.xz"; }; }; kspaceduel = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kspaceduel-23.04.3.tar.xz"; - sha256 = "1mpry73vvi332wxyw2wymh3lsrj2amblg50dym9ni1lj2af657ia"; - name = "kspaceduel-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kspaceduel-23.08.0.tar.xz"; + sha256 = "01fis8xzbslvwgk7f4mdf4rijjcdkiq2zza99d4qgn3zldjznxyw"; + name = "kspaceduel-23.08.0.tar.xz"; }; }; ksquares = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ksquares-23.04.3.tar.xz"; - sha256 = "0b3r99hfhm5r4jxkwiji0lww703r7dj60x2m55ginvdy7ixm46rm"; - name = "ksquares-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ksquares-23.08.0.tar.xz"; + sha256 = "1yng38zvgs91qb2w4nnmyhv8adnwq4zipqpbm4nr7ipysq7acm10"; + name = "ksquares-23.08.0.tar.xz"; }; }; ksudoku = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ksudoku-23.04.3.tar.xz"; - sha256 = "03hrwyvwzhxdbq7pp03c7lkz0dhv9yi6lcwvz3s63mn01wyq6iv3"; - name = "ksudoku-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ksudoku-23.08.0.tar.xz"; + sha256 = "0cz2rjwvyg062cjx9fik75ic782i0xqcs4cvcska6m1slhv93w9m"; + name = "ksudoku-23.08.0.tar.xz"; }; }; ksystemlog = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ksystemlog-23.04.3.tar.xz"; - sha256 = "15c1h1dlcgbx2adhjzry2zwia0alym7vc251zymyzhl2xjacvqlm"; - name = "ksystemlog-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ksystemlog-23.08.0.tar.xz"; + sha256 = "0k8cncpp27l7n6s7aq3iwacf41jjskxs03204y2i877nv9xg6j3x"; + name = "ksystemlog-23.08.0.tar.xz"; }; }; kteatime = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kteatime-23.04.3.tar.xz"; - sha256 = "02c3j21f0adilvwyy20pmkbrq4h33vdmrp00cqjbncsk6il5xym7"; - name = "kteatime-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kteatime-23.08.0.tar.xz"; + sha256 = "0nw9ly0jvkl9m3fr7cgmycg28379vl2n547n9k2sh8p5va545dj1"; + name = "kteatime-23.08.0.tar.xz"; }; }; ktimer = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktimer-23.04.3.tar.xz"; - sha256 = "1n5az5cgb0q28lz5f7afqjlfga32q232g836nkl1sfq8n5whj5z5"; - name = "ktimer-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ktimer-23.08.0.tar.xz"; + sha256 = "06dlhfxr3amrvbdrdq3k85i477i7qan913dqp577nlbf3wlblvsc"; + name = "ktimer-23.08.0.tar.xz"; }; }; ktnef = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktnef-23.04.3.tar.xz"; - sha256 = "00dkcmywjxzq5v2kp4klw50c3w74lmh16kbcwn8qd97kky3pd5ik"; - name = "ktnef-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ktnef-23.08.0.tar.xz"; + sha256 = "00ybqdbz5g6392yzc725pgspx8mf4123iv7pd4x7qnfzf5by91l1"; + name = "ktnef-23.08.0.tar.xz"; }; }; ktorrent = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktorrent-23.04.3.tar.xz"; - sha256 = "17q6ivnbh4zxqnbm1bdzz3hri1434sq2rs9y57lvn4bb2xdwn1z5"; - name = "ktorrent-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ktorrent-23.08.0.tar.xz"; + sha256 = "048p6lir9kk1pllpgwc5nr0laywlgd5namp70h22lmiwgaymh20r"; + name = "ktorrent-23.08.0.tar.xz"; }; }; ktouch = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktouch-23.04.3.tar.xz"; - sha256 = "1kpljbg5vjclydiymzn474wzb05bvn7587dr3pns2x09h6iv3c98"; - name = "ktouch-23.04.3.tar.xz"; - }; - }; - ktp-accounts-kcm = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-accounts-kcm-23.04.3.tar.xz"; - sha256 = "06p3fl229ks9kf820g91jb5f7qynysnybaay2pcq1yyqvv98ayrl"; - name = "ktp-accounts-kcm-23.04.3.tar.xz"; - }; - }; - ktp-approver = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-approver-23.04.3.tar.xz"; - sha256 = "0hin782xn9xdya2cv3vy79qhywjd72r2mx9sl1c69qkklqsf9xpr"; - name = "ktp-approver-23.04.3.tar.xz"; - }; - }; - ktp-auth-handler = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-auth-handler-23.04.3.tar.xz"; - sha256 = "1hn3a9rc4yzc18rxn2j6by6hjnrpnqqgzyzg7nxyrsfwcc7wgvq9"; - name = "ktp-auth-handler-23.04.3.tar.xz"; - }; - }; - ktp-call-ui = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-call-ui-23.04.3.tar.xz"; - sha256 = "1gz5a5hjsz2f9k8dyfb5k9x8n2wqps30fpf6kgv8m0mazszgy87y"; - name = "ktp-call-ui-23.04.3.tar.xz"; - }; - }; - ktp-common-internals = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-common-internals-23.04.3.tar.xz"; - sha256 = "0hhba4nwc88yhn1qai3lc0mvczw4kvqjg6h3lq4mr2zfac0g2wbs"; - name = "ktp-common-internals-23.04.3.tar.xz"; - }; - }; - ktp-contact-list = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-contact-list-23.04.3.tar.xz"; - sha256 = "1di1rbfdq28y4p0v6hdj3cyvzini6zkzzam72gffjdayp4ba5mrn"; - name = "ktp-contact-list-23.04.3.tar.xz"; - }; - }; - ktp-contact-runner = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-contact-runner-23.04.3.tar.xz"; - sha256 = "0hyj92wiaj4vzp030pfn7yr9zjx921d4x2rxgfkmhymkvj0v7pqb"; - name = "ktp-contact-runner-23.04.3.tar.xz"; - }; - }; - ktp-desktop-applets = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-desktop-applets-23.04.3.tar.xz"; - sha256 = "1sricvnmsdmh0458v04i7wkywc57vnc0w727zys9xcbbv1zc1n2r"; - name = "ktp-desktop-applets-23.04.3.tar.xz"; - }; - }; - ktp-filetransfer-handler = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-filetransfer-handler-23.04.3.tar.xz"; - sha256 = "1wnqd8xji5pykxczlgyyjf8hcxw9v131n5ssflx4wyrvkccgii95"; - name = "ktp-filetransfer-handler-23.04.3.tar.xz"; - }; - }; - ktp-kded-module = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-kded-module-23.04.3.tar.xz"; - sha256 = "1chgrjmd23kzzcrya5dch8al5x8d1ll48bb597ik2hhr8w63s3cb"; - name = "ktp-kded-module-23.04.3.tar.xz"; - }; - }; - ktp-send-file = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-send-file-23.04.3.tar.xz"; - sha256 = "1hkk88i88vwysqxbfi0ahhz6aw3snyjgz1jkcf5j5iik73xspcmb"; - name = "ktp-send-file-23.04.3.tar.xz"; - }; - }; - ktp-text-ui = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-text-ui-23.04.3.tar.xz"; - sha256 = "01rikl02cdnb77l8irz6jcbz2viq947l0wbvrqpjlvxv7x7hyvfx"; - name = "ktp-text-ui-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ktouch-23.08.0.tar.xz"; + sha256 = "0y550h945fk1jfqfyc5fyd6hfi9g7awr7ag596jjrbw552xy8ynq"; + name = "ktouch-23.08.0.tar.xz"; }; }; ktrip = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktrip-23.04.3.tar.xz"; - sha256 = "1y2gbz5jv08jjjhdy2vyvwalmj436h332dmbw8qwc06ify2r469l"; - name = "ktrip-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ktrip-23.08.0.tar.xz"; + sha256 = "1y3xkkjh8ip4mcx5y6396axbylpql1iyfz9y115r7s7n8hb1qrfp"; + name = "ktrip-23.08.0.tar.xz"; }; }; ktuberling = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktuberling-23.04.3.tar.xz"; - sha256 = "0zk7wijp425657s2j7xq7mhybgyddpam88ih8i0sbpcs0sliyz7k"; - name = "ktuberling-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/ktuberling-23.08.0.tar.xz"; + sha256 = "1wc74cpvalp0xpnhsqkbqyk3gjnzmi95hqdsj4wpqj60mh78zzy7"; + name = "ktuberling-23.08.0.tar.xz"; }; }; kturtle = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kturtle-23.04.3.tar.xz"; - sha256 = "0hknmg65kafm1f6885yiz86g9jpqyycjg6208iyi6i15lyqjr4a9"; - name = "kturtle-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kturtle-23.08.0.tar.xz"; + sha256 = "064kf6apwxnv7zmpv1mal3y4i7y46rd939dfa9dk4x41d3la2mlv"; + name = "kturtle-23.08.0.tar.xz"; }; }; kubrick = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kubrick-23.04.3.tar.xz"; - sha256 = "0nank1ga4c4xfsw0m1cqhjhyz2wpbsxplyyb9x3l2vpg92gj5dbs"; - name = "kubrick-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kubrick-23.08.0.tar.xz"; + sha256 = "0y0h7l3mpijm08r13hlfy1dmx34kafndx0cr7vll0wb3b9xhlpqv"; + name = "kubrick-23.08.0.tar.xz"; }; }; kwalletmanager = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kwalletmanager-23.04.3.tar.xz"; - sha256 = "1g3yw32kv7yij2ymk52fpp0srncr2ijfckfvz5hc0nsn7xhyqdby"; - name = "kwalletmanager-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kwalletmanager-23.08.0.tar.xz"; + sha256 = "0hf3288bhyr8864k0fm6kw77rx13fbkhxlspisl4l7algc9z5qfq"; + name = "kwalletmanager-23.08.0.tar.xz"; }; }; kwave = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kwave-23.04.3.tar.xz"; - sha256 = "0s9w8jgwblljwfji2a19bqs3nx6sr2qzz35kwbi0ahwncy69k4jx"; - name = "kwave-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kwave-23.08.0.tar.xz"; + sha256 = "0a278cq9ya3cvvzllminkiw1ac8g0g5qs5ay59xh6h4mn6lxn0y4"; + name = "kwave-23.08.0.tar.xz"; }; }; kweather = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kweather-23.04.3.tar.xz"; - sha256 = "1147lagd99m5qgpy9dk5vkc500p2jw4nb50kjhr1b9yhdz8dcbwn"; - name = "kweather-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kweather-23.08.0.tar.xz"; + sha256 = "00ympmljkp8xvl8gg86dbmyd5mxasg6wfx17jgyrvwh0fdq150q5"; + name = "kweather-23.08.0.tar.xz"; }; }; kwordquiz = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kwordquiz-23.04.3.tar.xz"; - sha256 = "15abyxccp02b1bmcb79g0k7sd6j6dmhw2k8l2h9as2ja4r5xhir1"; - name = "kwordquiz-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/kwordquiz-23.08.0.tar.xz"; + sha256 = "1n7lh8xyp5w0r3d4dijsl8lnv2az6vvkbnlywbhjcs28lc1s392g"; + name = "kwordquiz-23.08.0.tar.xz"; }; }; libgravatar = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libgravatar-23.04.3.tar.xz"; - sha256 = "03zhnpb114y6a6vhiv9c1fiqsinjmk52j1k9w2r04ibxp35m3xj7"; - name = "libgravatar-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libgravatar-23.08.0.tar.xz"; + sha256 = "1v8lljgawzdrfv2dcbrxkih6as67q3p2id093nxks6x3j81li223"; + name = "libgravatar-23.08.0.tar.xz"; }; }; libkcddb = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkcddb-23.04.3.tar.xz"; - sha256 = "1s10g6m6c3h14gzxvp2s0v51jxzsrh23xfn7gl51a0r50srbbz52"; - name = "libkcddb-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libkcddb-23.08.0.tar.xz"; + sha256 = "0pkiy5qfmy58s6zvss1zx837jg6nv696m2z99vyj5nshz7926gv4"; + name = "libkcddb-23.08.0.tar.xz"; }; }; libkcompactdisc = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkcompactdisc-23.04.3.tar.xz"; - sha256 = "0gl21mhfz3vj89x0r8y79yiijcag1xfdnyfrjqzkx9i8yd2k45b1"; - name = "libkcompactdisc-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libkcompactdisc-23.08.0.tar.xz"; + sha256 = "0m677c12hxd7n7vf887x8pp29i3y42kvvj9ah3rgza7qr7w5bnpf"; + name = "libkcompactdisc-23.08.0.tar.xz"; }; }; libkdcraw = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkdcraw-23.04.3.tar.xz"; - sha256 = "0vwr44j77c1vffsppkzdasd0l8apzx7jn6llwhzb4bjp93arx18w"; - name = "libkdcraw-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libkdcraw-23.08.0.tar.xz"; + sha256 = "0iyq01ql0v0vvcca2qa7vi02kby76446qja7vg6h70524pgvdjx3"; + name = "libkdcraw-23.08.0.tar.xz"; }; }; libkdegames = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkdegames-23.04.3.tar.xz"; - sha256 = "1sicpfsrkxn5d0fdy71h7033rpkb94r5hjvv5ab7qbmzb1qa4awq"; - name = "libkdegames-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libkdegames-23.08.0.tar.xz"; + sha256 = "12nb3gj8capcajb9s5qga3i58b57vv3fqn000wsqg3bb4l2wg6c7"; + name = "libkdegames-23.08.0.tar.xz"; }; }; libkdepim = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkdepim-23.04.3.tar.xz"; - sha256 = "1i5c4qqd4ghlfjvxniy8sbfqh0fsrz4sadvh0n2d207s9rsl274v"; - name = "libkdepim-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libkdepim-23.08.0.tar.xz"; + sha256 = "1vhcd0r8lqwm09i95c8x913ld4f6mqm6r83d3s67m0s0gm3zhf10"; + name = "libkdepim-23.08.0.tar.xz"; }; }; libkeduvocdocument = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkeduvocdocument-23.04.3.tar.xz"; - sha256 = "04qnahyy3400ys56nvqlq5lgyp5w64bxj13jpljggja5r72ay9n0"; - name = "libkeduvocdocument-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libkeduvocdocument-23.08.0.tar.xz"; + sha256 = "0ibjacd0nqgkjfn9dhr2pibh10fzmd601lp7ycr0nafn11k8fdyn"; + name = "libkeduvocdocument-23.08.0.tar.xz"; }; }; libkexiv2 = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkexiv2-23.04.3.tar.xz"; - sha256 = "16cb7cab4pyarwwn2byyvanwlakcgq5h203hkysp44flszq515cl"; - name = "libkexiv2-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libkexiv2-23.08.0.tar.xz"; + sha256 = "0rkb7zfzn0m67fjcy5qmzz1hvwjrhf1ylk0rjddyvpyn7ndnnisy"; + name = "libkexiv2-23.08.0.tar.xz"; }; }; libkgapi = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkgapi-23.04.3.tar.xz"; - sha256 = "18jcrp7qi35zxzb4b7mn6519bjw47s7kwfahd6a50p40j17k09bs"; - name = "libkgapi-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libkgapi-23.08.0.tar.xz"; + sha256 = "0rnzf2g66kf7krv1ab7ipz2cgzbcd87c7rkmd67q73ia3nw8r6lp"; + name = "libkgapi-23.08.0.tar.xz"; }; }; libkipi = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkipi-23.04.3.tar.xz"; - sha256 = "1g6p7nvdd1k7p5nixq7p18zd0dmr5ym6irvz7s9j879a71w444j8"; - name = "libkipi-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libkipi-23.08.0.tar.xz"; + sha256 = "0bz0fhwish0ry2hxljkzj5vqv2rbapprvyv6hsvwnc9j6bzf72lj"; + name = "libkipi-23.08.0.tar.xz"; }; }; libkleo = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkleo-23.04.3.tar.xz"; - sha256 = "0l77n4dlbv9hclzvh69kdzji907if7yayxiasxnnjkzsvcm1af25"; - name = "libkleo-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libkleo-23.08.0.tar.xz"; + sha256 = "0087mhn5h8zg696dwkpinvfjyn0scss7ggh2avm00qf1m5z8pbyc"; + name = "libkleo-23.08.0.tar.xz"; }; }; libkmahjongg = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkmahjongg-23.04.3.tar.xz"; - sha256 = "1a0c0q34h5yxwx76y6934ibn6hm1ip1hc2xvl11q1kaazq0alca3"; - name = "libkmahjongg-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libkmahjongg-23.08.0.tar.xz"; + sha256 = "1r5qwgx5qdmb0lzbw1jbid8lyms3flr51swljbv8vd0ivyj8vh88"; + name = "libkmahjongg-23.08.0.tar.xz"; }; }; libkomparediff2 = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkomparediff2-23.04.3.tar.xz"; - sha256 = "1zkiyyrbfbr1i7zyhhayf53daaarzc8a2xz0iqjy9za7rawnmgbv"; - name = "libkomparediff2-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libkomparediff2-23.08.0.tar.xz"; + sha256 = "1qg5hjga7za1j2an2qgbfg1gnngz7bbimhasaabxp1dah81z7j2l"; + name = "libkomparediff2-23.08.0.tar.xz"; }; }; libksane = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libksane-23.04.3.tar.xz"; - sha256 = "0hmsrkrcqiyhdcshln5jg9xzqn7xvyjj1g6vrx82pfs1lwsczhr6"; - name = "libksane-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libksane-23.08.0.tar.xz"; + sha256 = "1q3acb4iyqqwwkhi12xiajc4094ckkrf62s463hk8xqn1z7chm9i"; + name = "libksane-23.08.0.tar.xz"; }; }; libksieve = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libksieve-23.04.3.tar.xz"; - sha256 = "066z33v30h568bmdcsl4v478p3xhiwsmq7pr7kziilrhy3a2m7p6"; - name = "libksieve-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libksieve-23.08.0.tar.xz"; + sha256 = "0yz2539lcnhsyxq997rs25dn6djwbbmc2syhkysny3ar088drwj9"; + name = "libksieve-23.08.0.tar.xz"; }; }; libktorrent = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libktorrent-23.04.3.tar.xz"; - sha256 = "1m6gyk1bids7qr9wfh6gcfq73ac9j5b2bljvfvfsw9f1ky1cmwab"; - name = "libktorrent-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/libktorrent-23.08.0.tar.xz"; + sha256 = "1xi66zrdigxw61psg8j1y1jm2qz9acynbjdiz497gq125n6cmh0g"; + name = "libktorrent-23.08.0.tar.xz"; }; }; lokalize = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/lokalize-23.04.3.tar.xz"; - sha256 = "0czkb5dk44yb5zwknq3s2m5im99fs06dmbsp60gx2m6p355m4w8z"; - name = "lokalize-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/lokalize-23.08.0.tar.xz"; + sha256 = "12xhla3kcwd6qg1f2ihwzdssv922vnzmiyldbzxxbyyd51dkqwsa"; + name = "lokalize-23.08.0.tar.xz"; }; }; lskat = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/lskat-23.04.3.tar.xz"; - sha256 = "1qphzc1r26qwc8sl5rjkw16ia3lsj7c2lg9fxnhk08k8mxncymxg"; - name = "lskat-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/lskat-23.08.0.tar.xz"; + sha256 = "11sxz0lzcc9vw1xcs5gw4as0wn9y90ibcagadq3h078awp8n2vl5"; + name = "lskat-23.08.0.tar.xz"; }; }; mailcommon = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/mailcommon-23.04.3.tar.xz"; - sha256 = "165a0qf6i2862dpsw4wvgnxi4wv7hnc9s63fsf9jp6kbwwfw9nqv"; - name = "mailcommon-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/mailcommon-23.08.0.tar.xz"; + sha256 = "0xm9qlxcjf07p086w7ajqj7ksih2v61ycajxp1qxjhjmbl5wsbd4"; + name = "mailcommon-23.08.0.tar.xz"; }; }; mailimporter = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/mailimporter-23.04.3.tar.xz"; - sha256 = "18shpxz7rg64g2mxdhdjhxhn893m0930v76cdnij339ycbcq5ypc"; - name = "mailimporter-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/mailimporter-23.08.0.tar.xz"; + sha256 = "00m3ibqyghxfh6bdq4h60b10snzgaijfss5dbyfqzd5a2c08070m"; + name = "mailimporter-23.08.0.tar.xz"; }; }; marble = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/marble-23.04.3.tar.xz"; - sha256 = "14ys9yfnwh3i64wm198gsf7z1iyxsi5wv93ygv0wy7rv9czb1zl8"; - name = "marble-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/marble-23.08.0.tar.xz"; + sha256 = "1djvylddhpvqyr6h7kq9y215a4m5fxgdz5y9yzrsr1yf16fzj6x1"; + name = "marble-23.08.0.tar.xz"; }; }; markdownpart = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/markdownpart-23.04.3.tar.xz"; - sha256 = "0w3aflbsrmbgsiin3xl7svrw3rwbj3dk9kh3ibycvvmrp03p9yp4"; - name = "markdownpart-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/markdownpart-23.08.0.tar.xz"; + sha256 = "0ddjgvnljhng71xdv6zpi0csi6q0xigwc28fv1by70x035f0z5yn"; + name = "markdownpart-23.08.0.tar.xz"; }; }; mbox-importer = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/mbox-importer-23.04.3.tar.xz"; - sha256 = "0qaz4r69gmqag6jwmxk54rih78sh88jsw2qvyjhdhdywc4r8bx32"; - name = "mbox-importer-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/mbox-importer-23.08.0.tar.xz"; + sha256 = "1qq945m0rmrf37rnwp8a7dqchzwwhqnrsliiqz40y6qsblzigvlj"; + name = "mbox-importer-23.08.0.tar.xz"; + }; + }; + merkuro = { + version = "23.08.0"; + src = fetchurl { + url = "${mirror}/stable/release-service/23.08.0/src/merkuro-23.08.0.tar.xz"; + sha256 = "0xrrjx592vw0qxgsna08rhsj8yhq5kmg9gl138aqhaib9x05dsia"; + name = "merkuro-23.08.0.tar.xz"; }; }; messagelib = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/messagelib-23.04.3.tar.xz"; - sha256 = "0aqac0p46cwnr3qxjk0ivalfwjcgwy52s088wnk6ckp77m7r65is"; - name = "messagelib-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/messagelib-23.08.0.tar.xz"; + sha256 = "1dqzsm6i0nm565xi4nhvslkmyxcsycg36x4m3jr1njwlphpg86jy"; + name = "messagelib-23.08.0.tar.xz"; }; }; minuet = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/minuet-23.04.3.tar.xz"; - sha256 = "1lsnm52jcr37bk8lf9j1h6nvx2avc4z12g418bhg3424bwv4pmlf"; - name = "minuet-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/minuet-23.08.0.tar.xz"; + sha256 = "0g4a7r6av4bczd4ra18axlhdl25xpi7liq76bg863x4vkvcxwq86"; + name = "minuet-23.08.0.tar.xz"; }; }; neochat = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/neochat-23.04.3.tar.xz"; - sha256 = "015g42qbnj0g5n6swjj85nsxvlcih829ff11l14h1a7f4ip00yif"; - name = "neochat-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/neochat-23.08.0.tar.xz"; + sha256 = "1ywbfmiv37bxq046l85xchryv04mqmsl0x4s49rk3r88lfgimbaf"; + name = "neochat-23.08.0.tar.xz"; }; }; okular = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/okular-23.04.3.tar.xz"; - sha256 = "1vgcqkq6mzd270hzabmdqqv105iv6kr6ah2h18b15al2n9rmg0bi"; - name = "okular-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/okular-23.08.0.tar.xz"; + sha256 = "0f38k4jvbhlg0fyns6k128x91307sd9day3rxsc5423mz52cailv"; + name = "okular-23.08.0.tar.xz"; }; }; palapeli = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/palapeli-23.04.3.tar.xz"; - sha256 = "19xh03rhb48m4bbdmpga4aqij6agqg047ghl92p98z1phg5lxzrv"; - name = "palapeli-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/palapeli-23.08.0.tar.xz"; + sha256 = "19cxxcj2vzy7bd27lgvx1jlhchmn5dr9i3x13zhyqhq7fgash31l"; + name = "palapeli-23.08.0.tar.xz"; }; }; parley = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/parley-23.04.3.tar.xz"; - sha256 = "136ygvdv0p9pfpbyddc1y3jj8jaak2r5b4szrfaq051m3y54i9mb"; - name = "parley-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/parley-23.08.0.tar.xz"; + sha256 = "19w4mmi0pn167mwg49k9ldd7827vs2crg3p00lvcxbiywxc3n88w"; + name = "parley-23.08.0.tar.xz"; }; }; partitionmanager = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/partitionmanager-23.04.3.tar.xz"; - sha256 = "03xx3nh2grkgkjn8dixy529lb4gnrdhlzhzsry82g64f8c6sfqqm"; - name = "partitionmanager-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/partitionmanager-23.08.0.tar.xz"; + sha256 = "01pjka3mc0lh5s3mc8w73mjrn89yxfrzq5fyyam13dglyxcy0z3w"; + name = "partitionmanager-23.08.0.tar.xz"; }; }; picmi = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/picmi-23.04.3.tar.xz"; - sha256 = "1x1iv6a840jwldfpx44wvh1vki1jz1hixzvzhdfx2mhw05v91fjx"; - name = "picmi-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/picmi-23.08.0.tar.xz"; + sha256 = "1z6rv7zi5ywsiz9l7snrw3f79m0w7pfhf5qnp7qlz5pj6k9f3b9y"; + name = "picmi-23.08.0.tar.xz"; }; }; pim-data-exporter = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/pim-data-exporter-23.04.3.tar.xz"; - sha256 = "1bwh5srkdlqmxindci9416zmrp0gjvci59zyilvnr09kwg7lmwn0"; - name = "pim-data-exporter-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/pim-data-exporter-23.08.0.tar.xz"; + sha256 = "03rnrinkadvxgh4h75vs8aq4r7jf9vyhk14l4ixfzqbsxc6jllmf"; + name = "pim-data-exporter-23.08.0.tar.xz"; }; }; pim-sieve-editor = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/pim-sieve-editor-23.04.3.tar.xz"; - sha256 = "1yik788sniv7jh1w9wwc4rf06x1kd3bwkb3vflckinn37y2rpl4a"; - name = "pim-sieve-editor-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/pim-sieve-editor-23.08.0.tar.xz"; + sha256 = "1i750958l16jp8gikv0rxy4hzrl2dpfda069mr68ih4l1dndj6am"; + name = "pim-sieve-editor-23.08.0.tar.xz"; }; }; pimcommon = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/pimcommon-23.04.3.tar.xz"; - sha256 = "1v2nv83h9p1ajbcwfdk8b7lrr84r8c855lysknzvzkpm5z012z3l"; - name = "pimcommon-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/pimcommon-23.08.0.tar.xz"; + sha256 = "1q14yjaa51mkc5x1dccln82cw2kdkr1g5601s0pkxfy13dnqb0dv"; + name = "pimcommon-23.08.0.tar.xz"; }; }; plasmatube = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/plasmatube-23.04.3.tar.xz"; - sha256 = "0wmzzh8db3ybzhn9hh4j9c126pzcdshz4a0fzakgx93z1ph59pcg"; - name = "plasmatube-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/plasmatube-23.08.0.tar.xz"; + sha256 = "1k8xzmsg34b8xjb16mlcrq9y87b3f8pwk971dvjng1b1ml425m5c"; + name = "plasmatube-23.08.0.tar.xz"; }; }; poxml = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/poxml-23.04.3.tar.xz"; - sha256 = "11rqd7hhsy6f8qi0529cmy381bhskji6wf4fij7yjksmrsdvfw6d"; - name = "poxml-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/poxml-23.08.0.tar.xz"; + sha256 = "10qn0bz0k5sdrxd0mp75ri1dafh6djdpmypkg4y6lc27q2ghfi8p"; + name = "poxml-23.08.0.tar.xz"; }; }; print-manager = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/print-manager-23.04.3.tar.xz"; - sha256 = "1fnbkx2xk3pr3cwcji1xbswcf5b7h8r4kag8i3lv28cnjw3ahs52"; - name = "print-manager-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/print-manager-23.08.0.tar.xz"; + sha256 = "09p4bwgqg1wzns37wig4wc5304pnab1n77zs3nv55k7kqk2b58cv"; + name = "print-manager-23.08.0.tar.xz"; }; }; qmlkonsole = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/qmlkonsole-23.04.3.tar.xz"; - sha256 = "146c7rzgr3m2gw8ndac9i2kzkhpinn86h17f3vky6kph6nrmlx9j"; - name = "qmlkonsole-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/qmlkonsole-23.08.0.tar.xz"; + sha256 = "0xyzdhb0r3wilc44h7mw6bg5axw7n5pbmlq4wf1k1pjd1m910ilg"; + name = "qmlkonsole-23.08.0.tar.xz"; }; }; rocs = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/rocs-23.04.3.tar.xz"; - sha256 = "13bzxsicsylfq7kdpfik4afgkbv2g7avg3imbkiw969jbgl8qbmb"; - name = "rocs-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/rocs-23.08.0.tar.xz"; + sha256 = "15havvabqzwbqapz5lkw9wq0yl9bskya87yb0sgg3ing658i1kxq"; + name = "rocs-23.08.0.tar.xz"; }; }; signon-kwallet-extension = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/signon-kwallet-extension-23.04.3.tar.xz"; - sha256 = "067lldmvsrr1p2vp15xi2zwaq61x55yh7wqq3nhmmblpjiimywvl"; - name = "signon-kwallet-extension-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/signon-kwallet-extension-23.08.0.tar.xz"; + sha256 = "0hyp9mn52qh88dn9cf223nw917xxrzdfilxpjyxzpffsbdv7kf51"; + name = "signon-kwallet-extension-23.08.0.tar.xz"; }; }; skanlite = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/skanlite-23.04.3.tar.xz"; - sha256 = "0g6p3m16vx8cmshyj1c5qkvlhghi1az6rv6jqkzwjjk5mzchmcgj"; - name = "skanlite-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/skanlite-23.08.0.tar.xz"; + sha256 = "126l8va5kyxsa78gsj1y7d85449rwm6ccrnrpd4p9cmaxz4vld26"; + name = "skanlite-23.08.0.tar.xz"; }; }; skanpage = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/skanpage-23.04.3.tar.xz"; - sha256 = "1j5jaq67mrnrb0vgspb5rlhcvpskc3f4bfnksr84njrv0jd3gzi2"; - name = "skanpage-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/skanpage-23.08.0.tar.xz"; + sha256 = "1wgjp10yp7siklqbssxq9fm0c7bqw6fihhn0q1khn5c42dr2xbh1"; + name = "skanpage-23.08.0.tar.xz"; }; }; spectacle = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/spectacle-23.04.3.tar.xz"; - sha256 = "1fyklcvz0zndxabflkka75rham6768rp01as7m5dv0ic4lipkf9m"; - name = "spectacle-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/spectacle-23.08.0.tar.xz"; + sha256 = "1vn1w9ywkf5f4d1i02hf3qha6647cx3nwaj5cv70rxyp71x1wfrq"; + name = "spectacle-23.08.0.tar.xz"; }; }; step = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/step-23.04.3.tar.xz"; - sha256 = "0ayg41vw4ssaq1zk3a8vs8gbvvbkkq042msasas5avq1pdixl470"; - name = "step-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/step-23.08.0.tar.xz"; + sha256 = "138b5l79zzhi0yms4h4nimyfhkr4pnpn0p7xhhl0jhyqmgjpyyqv"; + name = "step-23.08.0.tar.xz"; }; }; svgpart = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/svgpart-23.04.3.tar.xz"; - sha256 = "0cc4b4iq19ylmmawapcnk5d6h0qj30x9gm81x3w4k29pp754mmli"; - name = "svgpart-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/svgpart-23.08.0.tar.xz"; + sha256 = "0ljys7hi2drz6bmk4h62d07j4jrgv6pla8aqvsxs6fckb88knsjm"; + name = "svgpart-23.08.0.tar.xz"; }; }; sweeper = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/sweeper-23.04.3.tar.xz"; - sha256 = "19b382cgdcd4qh4ppdmbhsacvcc9nlbs7spcg8ii02bdpx6qw9b7"; - name = "sweeper-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/sweeper-23.08.0.tar.xz"; + sha256 = "1g3k249zf077d6w2264szih2gvhvd2p5pbx6xvxb685p7bg0kiva"; + name = "sweeper-23.08.0.tar.xz"; }; }; telly-skout = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/telly-skout-23.04.3.tar.xz"; - sha256 = "0rnidnzv8qifb5ci3qk0sfvadycqg5wfdmiv47pgmp61jsgrqgrb"; - name = "telly-skout-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/telly-skout-23.08.0.tar.xz"; + sha256 = "1d102ldb9ycprz2x2iv7f835w4az9bi9cgsdmx2pglizi0sk7azm"; + name = "telly-skout-23.08.0.tar.xz"; }; }; tokodon = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/tokodon-23.04.3.tar.xz"; - sha256 = "021pd3r4hxa7g9jswb9c57j8c9gxyjclrk6r5fm2nnai5z7cz1ky"; - name = "tokodon-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/tokodon-23.08.0.tar.xz"; + sha256 = "1dwbx6v95pmid0pl77l798kmazjh5bmwscp15wql3nvz9p1wdj2h"; + name = "tokodon-23.08.0.tar.xz"; }; }; umbrello = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/umbrello-23.04.3.tar.xz"; - sha256 = "1mk779xl4vqk7qz7vlxyc2ddx1345pg8mz46igkragrx1kq4vbzw"; - name = "umbrello-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/umbrello-23.08.0.tar.xz"; + sha256 = "0bjaz0lig3n5vjyarydjlgc934jg35g74br5cdmn8xlmm5y73ffb"; + name = "umbrello-23.08.0.tar.xz"; }; }; yakuake = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/yakuake-23.04.3.tar.xz"; - sha256 = "17ylm5z5lzjq5g4d48s0clpl3hg4rym9sc1p5hr0wfs9jx7197jy"; - name = "yakuake-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/yakuake-23.08.0.tar.xz"; + sha256 = "1q72rcwjrrjdwx9sy4w020ydgnqg4myi6icv0vr2fkfcsxr6r0q5"; + name = "yakuake-23.08.0.tar.xz"; }; }; zanshin = { - version = "23.04.3"; + version = "23.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/zanshin-23.04.3.tar.xz"; - sha256 = "0f6d2wf9vly7qqbzv9nfahjvyi8db77anb9w0qfc95i69hggy2yj"; - name = "zanshin-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.0/src/zanshin-23.08.0.tar.xz"; + sha256 = "01w4m27pw6nrf5m8xfxwhfmvgr24jlbys9h3byfl1ddr9l6f3l6x"; + name = "zanshin-23.08.0.tar.xz"; }; }; } diff --git a/pkgs/applications/kde/tokodon.nix b/pkgs/applications/kde/tokodon.nix index bf40a5a00155..43da82e89018 100644 --- a/pkgs/applications/kde/tokodon.nix +++ b/pkgs/applications/kde/tokodon.nix @@ -20,6 +20,7 @@ , qtwebsockets , kitemmodels , pimcommon +, mpv }: mkDerivation { @@ -47,6 +48,7 @@ mkDerivation { qtwebsockets kitemmodels pimcommon + mpv ]; meta = with lib; { diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 4a05bc4e3a51..82eb6fce2549 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.19.0"; + version = "2.20.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-/sP5Z52fWkRcv+Wj45HTV1Ckve+jA92m91kGGJwdC6s=" "zip"; - i686-linux = fetch "linux_386" "sha256-UGPWk0I/nCaqWWz/rwG/TSDie0/tarKroGi+7Ge7kE4=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-rSZM0GuroSqVokhkjPtk3+2+C9w5/Tkh2cvB+kShyHY=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-3zVD8LUdxhzroLlnQCiCVELEQMPmCriRff85ZlfgSKI=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-D9cPNtHiofY/Fb2EO+AGexRSqY+AidZm0D9+9W9dCUY=" "zip"; + i686-linux = fetch "linux_386" "sha256-sY8kI4InFGZIFoz5rfvNMxA9C4u6Qcg3vNTsoY7X6OY=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-TkfEh75k3KzvvInPAsYDhS2OIKQpBOCaT6qRIld+wQ8=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-kytAXelvvP+SBaniHlo9JTK1LLRrefgLuWPhC8sC7U8=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; diff --git a/pkgs/applications/misc/deadd-notification-center/default.nix b/pkgs/applications/misc/deadd-notification-center/default.nix index 39630f12c0f6..44c36281fadd 100644 --- a/pkgs/applications/misc/deadd-notification-center/default.nix +++ b/pkgs/applications/misc/deadd-notification-center/default.nix @@ -17,13 +17,13 @@ let ''; in mkDerivation rec { pname = "deadd-notification-center"; - version = "2.0.4"; + version = "2.1.1"; src = fetchFromGitHub { owner = "phuhl"; repo = "linux_notification_center"; rev = version; - hash = "sha256-ascg31HsHeXKhvMNntiRLuZ4+T2+fokfDhZ3c8N/Gzg="; + hash = "sha256-VU9NaQVS0n8hFRjWMvCMkaF5mZ4hpnluV31+/SAK7tU="; }; isLibrary = false; diff --git a/pkgs/applications/misc/golden-cheetah-bin/default.nix b/pkgs/applications/misc/golden-cheetah-bin/default.nix index fa11f7716219..49e9f9df8cdd 100644 --- a/pkgs/applications/misc/golden-cheetah-bin/default.nix +++ b/pkgs/applications/misc/golden-cheetah-bin/default.nix @@ -1,12 +1,12 @@ -{ appimageTools, lib, fetchurl, stdenv }: +{ appimageTools, lib, fetchurl, nix-update-script, stdenv }: let pname = "golden-cheetah"; - version = "3.6-RC4"; + version = "3.6"; src = fetchurl { - url = "https://github.com/GoldenCheetah/GoldenCheetah/releases/download/v${version}/GoldenCheetah_v3.6-DEV_x64.AppImage"; - hash = "sha256-I5GafK/W1djSx67xrjcMyPqMSqGW9AfrcPYcGcf0Pag="; + url = "https://github.com/GoldenCheetah/GoldenCheetah/releases/download/v${version}/GoldenCheetah_v${version}_x64.AppImage"; + hash = "sha256-PMRUDQSQxbECbF9SPOo03t4Xxj1OtYJAPXEMyyy6EVY="; }; appimageContents = appimageTools.extract { inherit pname src version; }; @@ -24,12 +24,14 @@ appimageTools.wrapType2 { cp ${appimageContents}/gc.png $out/share/pixmaps/ ''; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Performance software for cyclists, runners and triathletes. This version includes the API Tokens for e.g. Strava"; - platforms = platforms.linux; + platforms = lib.platforms.linux; broken = !stdenv.isx86_64; - maintainers = with maintainers; [ gador ]; - license = licenses.gpl2Plus; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ gador adamcstephens ]; + license = lib.licenses.gpl2Plus; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index f13cf8a21d42..1345dc51593d 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchpatch, mkDerivation +{ lib, fetchFromGitHub, nix-update-script, mkDerivation , qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools , qtconnectivity, qtcharts, libusb-compat-0_1, gsl, blas , bison, flex, zlib, qmake, makeDesktopItem, wrapQtAppsHook @@ -16,13 +16,13 @@ let }; in mkDerivation rec { pname = "golden-cheetah"; - version = "3.6-RC4"; + version = "3.6"; src = fetchFromGitHub { owner = "GoldenCheetah"; repo = "GoldenCheetah"; rev = "refs/tags/v${version}"; - hash = "sha256-2cwxsfy4Zc9fF3fe6QcZp3LPd2yWw2rDlYrK/QGiJYw="; + hash = "sha256-Ntim1/ZPaTPCHQ5p8xF5LWpqq8+OgkPfaQqqysv9j/c="; }; buildInputs = [ @@ -72,10 +72,12 @@ in mkDerivation rec { runHook postInstall ''; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Performance software for cyclists, runners and triathletes. Built from source and without API tokens"; - platforms = platforms.linux; - maintainers = with maintainers; [ adamcstephens ]; - license = licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ adamcstephens ]; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/gopacked/default.nix b/pkgs/applications/misc/gopacked/default.nix index 42b886e4c72b..1af03a1528a2 100644 --- a/pkgs/applications/misc/gopacked/default.nix +++ b/pkgs/applications/misc/gopacked/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "tulir"; repo = "gopacked"; rev = "v${version}"; - sha256 = "03qr8rlnipziy16nbcpf631jh42gsyv2frdnh8yzsh8lm0p8p4ry"; + hash = "sha256-PpOLLqgUQf09grZlJ7bXTxAowzDusmVN8PHfaGlGGQ8="; }; - vendorSha256 = "0fklr3lxh8g7gda65wf2wdkqv15869h7m1bwbzbiv8pasrf5b352"; + vendorHash = "sha256-ooxVXNbqoh3XX3yFemAyqISNZ+PC8WJUe+ch2OnIdDo="; doCheck = false; diff --git a/pkgs/applications/misc/gum/default.nix b/pkgs/applications/misc/gum/default.nix index b43d888fede1..96315bb50c24 100644 --- a/pkgs/applications/misc/gum/default.nix +++ b/pkgs/applications/misc/gum/default.nix @@ -34,5 +34,6 @@ buildGoModule rec { changelog = "https://github.com/charmbracelet/gum/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ maaslalani ]; + mainProgram = "gum"; }; } diff --git a/pkgs/applications/misc/mainsail/default.nix b/pkgs/applications/misc/mainsail/default.nix index dd7aae237a11..48fbce686ffc 100644 --- a/pkgs/applications/misc/mainsail/default.nix +++ b/pkgs/applications/misc/mainsail/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "mainsail"; - version = "2.6.2"; + version = "2.7.1"; src = fetchzip { url = "https://github.com/mainsail-crew/mainsail/releases/download/v${version}/mainsail.zip"; - hash = "sha256-/ej26rLze/QaxGDtU4XhaejlkbkzZfzB+ib2I+3W8Ho="; + hash = "sha256-j2ri7PyQGzRlhpgE9qKneX00HwlDmIi2JUremz446wk="; stripRoot = false; }; diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 4aebb67ac981..134c1b33b729 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { pname = "mediainfo-gui"; - version = "23.04"; + version = "23.06"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "sha256-Uiut1rHk6LV+giW6e0nvgn35ffTLaLbU/HkQ92xf32k="; + hash = "sha256-TJd+6wzoN4co5k7yTyf+YrLFEW+/BUHIJKRDCfgP+Io="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index d347bb3af57f..8aa1da1568f9 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -10,13 +10,13 @@ python3Packages.buildPythonApplication rec { pname = "skytemple"; - version = "1.4.7"; + version = "1.5.4"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-NK0yLxs7/pVpl9LCz6ggYsaUDuEAj6edBEPC+4yCxNM="; + hash = "sha256-brt1bNQonAjbqCsMLHgOS8leDb3Y8MWKIxV+BXoJ1lY="; }; buildInputs = [ diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix index 2ec1097338e4..6e9d2e6cc1bb 100644 --- a/pkgs/applications/misc/tellico/default.nix +++ b/pkgs/applications/misc/tellico/default.nix @@ -34,11 +34,6 @@ mkDerivation rec { hash = "sha256-opg4FbfOM48eqWQUJnMHH7KSo6x4S2DHd7ucPw6iTzg="; }; - postPatch = '' - substituteInPlace src/gui/imagewidget.h \ - --replace ksane_version.h KF5/ksane_version.h - ''; - nativeBuildInputs = [ cmake extra-cmake-modules diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index 3d85939b371e..0faa36302fc9 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages, nixosTests }: python3Packages.buildPythonApplication rec { pname = "toot"; @@ -20,6 +20,8 @@ python3Packages.buildPythonApplication rec { py.test ''; + passthru.tests.toot = nixosTests.pleroma; + meta = with lib; { description = "Mastodon CLI interface"; homepage = "https://github.com/ihabunek/toot"; diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix index ad45adbe0a73..173e50d17518 100644 --- a/pkgs/applications/misc/usql/default.nix +++ b/pkgs/applications/misc/usql/default.nix @@ -10,28 +10,29 @@ buildGoModule rec { pname = "usql"; - version = "0.14.10"; + version = "0.15.0"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-4T8h4KPouhjGaeeThCULilzmPs2CVGBpiqXYmtSkCO4="; + hash = "sha256-YjRbrhJSbX1OLEc7A72ubg1KtzJSWY0KphD4d8dAKQ8="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-a+hcd0vQ0jt3Dp+YnMORe6yIohbmpN22sOUJ6G1i4P4="; + vendorHash = "sha256-OZ/eui+LR+Gn1nmu9wryGmz3jiUMuDScmTZ5G8UKWP8="; proxyVendor = true; - # Exclude broken impala & hive driver + # Exclude broken genji, hive & impala drivers (bad group) # These drivers break too often and are not used. # # See https://github.com/xo/usql/pull/347 # excludedPackages = [ - "impala" + "genji" "hive" + "impala" ]; # These tags and flags are copied from build-release.sh diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index ee31f79a5752..4cece29ef949 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -47,7 +47,7 @@ # Hardening , graphene-hardened-malloc # Whether to use graphene-hardened-malloc -, useHardenedMalloc ? true +, useHardenedMalloc ? null # Whether to disable multiprocess support , disableContentSandbox ? false @@ -56,7 +56,10 @@ , extraPrefs ? "" }: -let +lib.warnIf (useHardenedMalloc != null) + "tor-browser-bundle-bin: useHardenedMalloc is deprecated and enabling it can cause issues" + +(let libPath = lib.makeLibraryPath libPkgs; libPkgs = [ @@ -268,7 +271,7 @@ stdenv.mkDerivation rec { GeoIPv6File $TBB_IN_STORE/TorBrowser/Data/Tor/geoip6 EOF - WRAPPER_LD_PRELOAD=${lib.optionalString useHardenedMalloc + WRAPPER_LD_PRELOAD=${lib.optionalString (useHardenedMalloc == true) "${graphene-hardened-malloc}/lib/libhardened_malloc.so"} WRAPPER_XDG_DATA_DIRS=${lib.concatMapStringsSep ":" (x: "${x}/share") [ @@ -477,4 +480,4 @@ stdenv.mkDerivation rec { license = licenses.free; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; -} +}) diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 7d5a7ed22eba..50ea8c168980 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }: let - version = "2.0.1"; - sha256 = "1smrqb2y99ml45g2n00lz7cz6vkisahl2jy7mncxvhl7s6wx5acz"; - manifestsSha256 = "0j8hlggndbbiapa4sxv3rvvhj4g8b1brgq3g55v0d9k6dzq3q6b3"; + version = "2.1.0"; + sha256 = "08g9awlgij8privpmzmrg63aygcjqmycr981ak0lkbx5chynlnmn"; + manifestsSha256 = "06iqmc5rg9l7zwcyg66fvy6h1g4bg1mr496n17piapjiqiv3j3q4"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-n0915f9mHExAEsHtplpLSPDJBWU5cFgBQC2ElToNRmA="; + vendorSha256 = "sha256-RVHDiJS1MhskVorS/SNZlXWP/oc8OXjUjApeanBkIWQ="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/pkgs/applications/networking/cluster/k3sup/default.nix b/pkgs/applications/networking/cluster/k3sup/default.nix index 2ab0ae308d92..3d5ab7d8dc8e 100644 --- a/pkgs/applications/networking/cluster/k3sup/default.nix +++ b/pkgs/applications/networking/cluster/k3sup/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "k3sup"; - version = "0.12.14"; + version = "0.12.15"; src = fetchFromGitHub { owner = "alexellis"; repo = "k3sup"; rev = version; - sha256 = "sha256-8zXcW1jVNVpFWpVYONjc0cwRQr8YTVbLYIH1IYCe9Nw="; + sha256 = "sha256-7eO4QCCgsNWXoo/H0JdMIS7e74p+Ph62OpjBtjmvJKY="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/kubevpn/default.nix b/pkgs/applications/networking/cluster/kubevpn/default.nix index 9bd4747d2dcf..6f7810a0796d 100644 --- a/pkgs/applications/networking/cluster/kubevpn/default.nix +++ b/pkgs/applications/networking/cluster/kubevpn/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubevpn"; - version = "1.1.35"; + version = "1.1.36"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; rev = "v${version}"; - sha256 = "sha256-fY0SKluJ1SG323rV7eDdhmDSMn49aITXYyFhR2ArFTw="; + sha256 = "sha256-wL6L94NNIPTYeUx+k78cFUdTMo9vIvzoKfXa2anCFQM="; }; - vendorHash = "sha256-aU8/C/p/VQ3JYApgr/i5dE/nBs0QjsvXBSMnEmj/Sno="; + vendorHash = "sha256-24mw5ku0pQX2QNQPA9E+wowS3y0J+oKiIxuyVGcgBro="; # TODO investigate why some config tests are failing doCheck = false; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index bccc854b49a8..99e7404bc333 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -110,13 +110,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-25CTfFwj/RxsFE6gpUxS1X3TbsuRhTZP89WqhsaRp8w=", + "hash": "sha256-Wt6rcHCxn1RPIxblL/Y6JWfsmOcloMZ8DMWvoVz/xrI=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.13.1", + "rev": "v5.14.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Oir+zn8UNbO3vbl3+QUIlis4K2watmWokaYdD7xGYzI=" + "vendorHash": "sha256-wF4dsQItVSXpJWBiOmdt/5ZaZeROmIxNW66Ec80PudU=" }, "azuread": { "hash": "sha256-aLckXkWxMsDS1ddPucAmjFS6+mkwHeAO1+BlPNaF6cI=", @@ -128,11 +128,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-Nw0Ep5YbipmupB53uzZHHogseHFAbvurz42Q4fPNw/o=", + "hash": "sha256-l26MIkMpB4/vO6r2u7vyepAGxRw8CNPDhcUD/USWteg=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.70.0", + "rev": "v3.71.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -182,13 +182,13 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "buildkite": { - "hash": "sha256-xojTeS+p9XG+wO9thmrSOWrizF56FCg+nwRBdaXqr/4=", + "hash": "sha256-LZyfyiPyGToJMMue9049CnMnioJblko/WXt2PSNv4WE=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v0.25.1", + "rev": "v0.26.0", "spdx": "MIT", - "vendorHash": "sha256-V2BsVBhtdPOT9iseWPhPTOrUe4iMhq4YUiBWd0ne5Xg=" + "vendorHash": "sha256-G4aKekEqEZVMxXDjPgnzvXidv0u1WydZqxSPj5d+WKg=" }, "checkly": { "hash": "sha256-tOTrAi6hd4HFbHAj0p/LTYdxQl1R1WuQ9L4hzqmDVqI=", @@ -436,11 +436,11 @@ "vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk=" }, "github": { - "hash": "sha256-9U3vF8xunpTKbOTytUEscMeS3ya6u+PVkNVJjufhpZ0=", + "hash": "sha256-I1FOJitXPJo/mlJCTXsJ1i+UCTImbtkJtEWAvV8wUP0=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v5.33.0", + "rev": "v5.34.0", "spdx": "MIT", "vendorHash": null }, @@ -510,11 +510,11 @@ "vendorHash": "sha256-r8njRjQGYESeHuD8pF6rRUe1j2VVMwoDITFi2StC5bk=" }, "helm": { - "hash": "sha256-mGrQ5YKNsv1+Vkan5ohMXnTYofhCQPuTFjemXF/g+tA=", + "hash": "sha256-pgV1xXhg8WIyF4RhJwAenTI6eAmtINveO8zqrKzLajQ=", "homepage": "https://registry.terraform.io/providers/hashicorp/helm", "owner": "hashicorp", "repo": "terraform-provider-helm", - "rev": "v2.10.1", + "rev": "v2.11.0", "spdx": "MPL-2.0", "vendorHash": "sha256-a80+gjjoFOKI96pUMvTMyM90F5oCb1Ime8hPQcFedFE=" }, @@ -709,13 +709,13 @@ "vendorHash": "sha256-ZjS40Xc8y2UBPn4rX3EgRoSapRvMEeVMGZE6z9tpsAQ=" }, "lxd": { - "hash": "sha256-mZ2ptpgpyNXZAS19MVxOq3cfmSjTJvTP60fbpEgk6kE=", + "hash": "sha256-0/nIdfCsmPaUkGkSkmWWioc6RZGTb0XWtvprjuDg2gU=", "homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd", "owner": "terraform-lxd", "repo": "terraform-provider-lxd", - "rev": "v1.10.1", + "rev": "v1.10.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-zGVatrMqYsbGahEGJ/Gt9ub76R49m7RbLLs2XeKwQJw=" + "vendorHash": "sha256-DMOyP8BX1502a+Hd7rwhpV2/nT0ECFKmKDPtWE6o0IM=" }, "mailgun": { "hash": "sha256-r1E2Y5JRu77T29ebUNTXUEypnrsfYYbBhvpKZGt5T9w=", @@ -872,13 +872,13 @@ "vendorHash": "sha256-NnB8deqIeiB66Kba9LWT62fyI23HL57VcsTickoTRwI=" }, "opentelekomcloud": { - "hash": "sha256-WL7eER7FsuIpdFsp4K1RlrrhEEK6hMou7HYAn/XbvLU=", + "hash": "sha256-dNA6rNzbXFycKRKwJl+/HqUKCKn678KqthIRhmOe72M=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.35.5", + "rev": "v1.35.6", "spdx": "MPL-2.0", - "vendorHash": "sha256-C2wZjhO6PAiHuoKWN97QJLnC0tYNEyDXMSErGlv2Zpg=" + "vendorHash": "sha256-PHtTE3puaeIKXr9mf2bDhhHI51L4XVfOPhL7c5AvlBA=" }, "opsgenie": { "hash": "sha256-Jz3JMq39C2NvA0kvJdjjkOHNvZOMuw4Fq2+nyVHRIL4=", @@ -890,20 +890,20 @@ "vendorHash": null }, "ovh": { - "hash": "sha256-CG7xyx3d9jPD+W0EmNVwdV2ShenfsnxykkERe/8ky3A=", + "hash": "sha256-U1gjD3NUm3/KqnbjgM91qe5gy/x/9Mn3Q4VW2XXBRw4=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v0.32.0", + "rev": "v0.33.0", "spdx": "MPL-2.0", "vendorHash": null }, "pagerduty": { - "hash": "sha256-kVz63aXl03p6T22WPB9PuZm+QllGxJNt3fDZ1H64dqw=", + "hash": "sha256-EJN2kf4MghIG38kEzyzafTEwxBytm5nyMA9f+bYM7ng=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v2.16.0", + "rev": "v2.16.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1025,11 +1025,11 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-zIXlrb/2g/N/slOfvyLmNG2keGXKTes0rHXJmZLV0Sg=", + "hash": "sha256-ILh5mdTyzU0AfJzyGH9JK1QsOER0BtKn9vXyRaGeb8g=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v8.1.0", + "rev": "v9.0.0", "spdx": "MPL-2.0", "vendorHash": "sha256-PQU4VC5wHcB70UkZaRT8jtz+qOAONU2SxtRrTmml9vY=" }, @@ -1106,11 +1106,11 @@ "vendorHash": "sha256-7qDPVKcBQuJQlya6UHjo5YPLgKl0qz1NlU2TuEf8T+0=" }, "talos": { - "hash": "sha256-GRwzR2L6PKx6Us1ci3cs2+DU7TQvhEPcOLyn73dS96Y=", + "hash": "sha256-9A14x7A5F11PzrJfBg4ZC63of4s4OzfNAYeJIPlHWlI=", "homepage": "https://registry.terraform.io/providers/siderolabs/talos", "owner": "siderolabs", "repo": "terraform-provider-talos", - "rev": "v0.3.0", + "rev": "v0.3.1", "spdx": "MPL-2.0", "vendorHash": "sha256-0HRhwUGDE4y7UFlXyD0w8zl4NV5436L4SRhrb8vQGyc=" }, diff --git a/pkgs/applications/networking/cluster/tfautomv/default.nix b/pkgs/applications/networking/cluster/tfautomv/default.nix index 1374bfe08f36..7409ec8ea446 100644 --- a/pkgs/applications/networking/cluster/tfautomv/default.nix +++ b/pkgs/applications/networking/cluster/tfautomv/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "tfautomv"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "busser"; repo = pname; rev = "v${version}"; - hash = "sha256-/Pli1gTG/68BtPdvF+BAwxFaeBrjj69h6Mtcbfm7UZ8="; + hash = "sha256-A1/sf+QjxQ8S2Cqmw9mD0r4aqA2Ssopeni0YNLND9L8="; }; vendorHash = "sha256-zAshnSqZT9lx9EWvJsMwi6rqvhUWJ/3uJnk+44TGzlU="; diff --git a/pkgs/applications/networking/feedreaders/yarr/default.nix b/pkgs/applications/networking/feedreaders/yarr/default.nix index 57a897118811..ab3e6af5723e 100644 --- a/pkgs/applications/networking/feedreaders/yarr/default.nix +++ b/pkgs/applications/networking/feedreaders/yarr/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yarr"; - version = "2.3"; + version = "2.4"; src = fetchFromGitHub { owner = "nkanaev"; repo = "yarr"; rev = "v${version}"; - hash = "sha256-LW0crWdxS6zcY5rxR0F2FLDYy9Ph2ZKyB/5VFVss+tA="; + hash = "sha256-ZMQ+IX8dZuxyxQhD/eWAe4bGGCVcaCeVgF+Wqs79G+k="; }; - vendorHash = "sha256-yXnoibqa0+lHhX3I687thGgasaVeNiHpGFmtEnH7oWY="; + vendorHash = null; subPackages = [ "src" ]; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 6288154f43a1..45ce7c3d1df1 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,7 +2,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.28"; - ptb = "0.0.44"; + ptb = "0.0.45"; canary = "0.0.166"; development = "0.0.217"; } else { @@ -20,7 +20,7 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "lehrB2jTvMKIDt7QWK/UAkrzYnW5pAP4LRHfIvGpnzA="; + sha256 = "cN70ZYl9hxWU5FSCpDbpOuR2Wsz6XtPSDoXOTvcCe7g="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index bc123e212d07..73437d73015f 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2023-05-01"; + version = "unstable-2023-08-15"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "dcb5069ff76bd293e86928804208737e6cee2ccc"; - sha256 = "0c3wnx51kbpzy9x8i9wm0ng16h35kgqsigrygrmwvxxn7zgv72ma"; + rev = "0532942ac6176a66ef184fb728a4cbb02958fc0b"; + sha256 = "sha256-FcRXxu0Nc8qHQl8PoA92MeuhpV+vgl658uILEpmDy3A="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/webcord/default.nix b/pkgs/applications/networking/instant-messengers/webcord/default.nix index 00361a7e368a..6a52d7107339 100644 --- a/pkgs/applications/networking/instant-messengers/webcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/webcord/default.nix @@ -84,6 +84,7 @@ buildNpmPackage rec { downloadPage = "https://github.com/SpacingBat3/WebCord/releases"; changelog = "https://github.com/SpacingBat3/WebCord/releases/tag/v${version}"; license = licenses.mit; + mainProgram = "webcord"; maintainers = with maintainers; [ huantian ]; platforms = electron_25.meta.platforms; }; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index f23c95feaf5a..636068184162 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -48,23 +48,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "5.15.5.20753"; - versions.x86_64-darwin = "5.15.5.20753"; - versions.x86_64-linux = "5.15.5.5603"; + versions.aarch64-darwin = "5.15.10.21826"; + versions.x86_64-darwin = "5.15.10.21826"; + versions.x86_64-linux = "5.15.10.6882"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-yDdmr0lHmhsJpTpvw4Qr4ZUk7SfEZw/53bVL3yV+a/Q="; + hash = "sha256-C+CkVB0Auj43JElKZgarGqx7AttgQWu/EOqpwHPVSLI="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-qZ5jiNL7I6IHwm1bZ8rgjVwwFJKPeAViQvx+qatGPug="; + hash = "sha256-hr2wCTmJ/ToEzfgXm+91Ab8+8u3gijIQgjPfTZxRWaM="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-JIS+jxBiW/ek47iz+yCcmoCZ8+UBzEXMC1Yd7Px0ofg="; + hash = "sha256-KHxG06VZoFDxVh/7r/lLHMZEh9l8QAysDfG1sw7D+Yo="; }; }; diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index 2ae0e2abce50..c1bb57b3b1bb 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wee-slack"; - version = "2.9.1"; + version = "2.10.0"; src = fetchFromGitHub { repo = "wee-slack"; owner = "wee-slack"; rev = "v${version}"; - sha256 = "sha256-f5CRJmvNZlKOE1XsU214R42dYo0s5xSRXC8TKOniEf4="; + sha256 = "sha256-SxmMCD7FdkmZ0ccDbuY2XUGcLxHlv62x4Pj55Wzf0AA="; }; patches = [ diff --git a/pkgs/applications/networking/seahub/default.nix b/pkgs/applications/networking/seahub/default.nix index 677405c5a295..9bd90ad928c9 100644 --- a/pkgs/applications/networking/seahub/default.nix +++ b/pkgs/applications/networking/seahub/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , python3 , makeWrapper , nixosTests @@ -30,6 +31,14 @@ python.pkgs.buildPythonApplication rec { sha256 = "sha256-7Exvm3EShb/1EqwA4wzWB9zCdv0P/ISmjKSoqtOMnqk="; }; + patches = [ + (fetchpatch { + # PIL update fix + url = "https://patch-diff.githubusercontent.com/raw/haiwen/seahub/pull/5570.patch"; + sha256 = "sha256-7V2aRlacJ7Qhdi9k4Bs+t/Emx+EAM/NNCI+K40bMwLA="; + }) + ]; + dontBuild = true; doCheck = false; # disabled because it requires a ccnet environment diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index ce01fec02e18..99839d9c99d2 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -49,7 +49,7 @@ assert withQt -> qt6 != null; let - version = "4.0.7"; + version = "4.0.8"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -61,7 +61,7 @@ stdenv.mkDerivation { repo = "wireshark"; owner = "wireshark"; rev = "v${version}"; - hash = "sha256-CjSf4CfzgiXvmraM3lYBVLSfdDBSuFNIgeatj0OjYSQ="; + hash = "sha256-bNg0yhNb1GRsTclNWWO+Bamm2wOnUjVKU+JftJu+LTo="; }; cmakeFlags = [ diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index e474a5de9924..5141ddc135bf 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -19,14 +19,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "23.8.0"; + version = "23.8.1"; in stdenv.mkDerivation { inherit pname appname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-ZvZOUcKtY+V0zhqsOYNi3W8yxRPUdYsp2kSHETRCTLs="; + hash = "sha256-ZS9OzC+pdtYY4xLQ3G31/Sw/xx4qgDjp+nAcPJdl0tk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/iqtree/default.nix b/pkgs/applications/science/biology/iqtree/default.nix index abf9cfba45fd..37a8a58a92e1 100644 --- a/pkgs/applications/science/biology/iqtree/default.nix +++ b/pkgs/applications/science/biology/iqtree/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "iqtree"; - version = "2.2.2.6"; + version = "2.2.2.7"; src = fetchFromGitHub { owner = "iqtree"; repo = "iqtree2"; rev = "v${version}"; - hash = "sha256-dce7JOPZaosRP99/xRfz88EwXR9nYXK6Z4t2i5Uje1w="; + hash = "sha256-XyjVo5TYMoB+ZOAGc4ivYqFGnEO1M7mhxXrG45TP44Y="; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 970f5517c21f..405561510be0 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -1,20 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, intltool, autoreconfHook, pkg-config, libqalculate, gtk3, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, intltool, autoreconfHook, pkg-config, libqalculate, gtk3, curl, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "sha256-Fbi+vZEyXhUZQjWUX01IXd6G1cthfiuztdbisNQ/VZU="; + sha256 = "sha256-GYy3Ot2vjXpCp89Rib3Ua0XeVGOOTejKcaqNZvPmxm0="; }; hardeningDisable = [ "format" ]; nativeBuildInputs = [ intltool pkg-config autoreconfHook wrapGAppsHook ]; - buildInputs = [ libqalculate gtk3 ]; + buildInputs = [ libqalculate gtk3 curl ]; enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix index abe65e413690..be9dd27695f7 100644 --- a/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/pkgs/applications/science/math/qalculate-qt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-qt"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-qt"; rev = "v${version}"; - hash = "sha256-fMchJgxuOO2e7cOHLako26c9gsWvQY2MTRVD3JWGSAU="; + hash = "sha256-7VlaoiY+HgHCMZCegUdy2wpgfx3fKaViMtkdNRleHaA="; }; nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ]; diff --git a/pkgs/applications/science/robotics/mujoco/default.nix b/pkgs/applications/science/robotics/mujoco/default.nix index 4af3d6899fa9..c4f84e158399 100644 --- a/pkgs/applications/science/robotics/mujoco/default.nix +++ b/pkgs/applications/science/robotics/mujoco/default.nix @@ -9,18 +9,18 @@ }: let - # See https://github.com/deepmind/mujoco/blob/573d331b69845c5d651b70f5d1b0f3a0d2a3a233/cmake/MujocoDependencies.cmake#L21-L59 + # See https://github.com/deepmind/mujoco/blob/c9246e1f5006379d599e0bcddf159a8616d31441/cmake/MujocoDependencies.cmake#L17-L55 abseil-cpp = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; - rev = "8c0b94e793a66495e0b1f34a5eb26bd7dc672db0"; - hash = "sha256-Od1FZOOWEXVQsnZBwGjDIExi6LdYtomyL0STR44SsG8="; + rev = "c2435f8342c2d0ed8101cb43adfd605fdc52dca2"; + hash = "sha256-PLoI7ix+reUqkZ947kWzls8lujYqWXk9A9a55UcfahI="; }; benchmark = fetchFromGitHub { owner = "google"; repo = "benchmark"; - rev = "d845b7b3a27d54ad96280a29d61fa8988d4fddcf"; - hash = "sha256-XTnTM1k6xMGXUws/fKdJUbpCPcc4U0IelL6BPEEnpEQ="; + rev = "2dd015dfef425c866d9a43f2c67d8b52d709acb6"; + hash = "sha256-pUW9YVaujs/y00/SiPqDgK4wvVsaM7QUp/65k0t7Yr0="; }; ccd = fetchFromGitHub { owner = "danfis"; @@ -31,14 +31,14 @@ let eigen3 = fetchFromGitLab { owner = "libeigen"; repo = "eigen"; - rev = "3bb6a48d8c171cf20b5f8e48bfb4e424fbd4f79e"; - hash = "sha256-k71DoEsx8JpC9AlQ0cCRI0fWMIWFBFL/Yscx+2iBtNM="; + rev = "211c5dfc6741a5570ad007983c113ef4d144f9f3"; + hash = "sha256-oT/h8QkL0vwaflh46Zsnu9Db1b65AP6p//nAga8M5jI="; }; googletest = fetchFromGitHub { owner = "google"; repo = "googletest"; - rev = "58d77fa8070e8cec2dc1ed015d66b454c8d78850"; - hash = "sha256-W+OxRTVtemt2esw4P7IyGWXOonUN5ZuscjvzqkYvZbM="; + rev = "b796f7d44681514f58a683a3a71ff17c94edb0c1"; + hash = "sha256-LVLEn+e7c8013pwiLzJiiIObyrlbBHYaioO/SWbItPQ="; }; lodepng = fetchFromGitHub { owner = "lvandeve"; @@ -49,8 +49,8 @@ let qhull = fetchFromGitHub { owner = "qhull"; repo = "qhull"; - rev = "3df027b91202cf179f3fba3c46eebe65bbac3790"; - hash = "sha256-aHO5n9Y35C7/zb3surfMyjyMjo109DoZnkozhiAKpYQ="; + rev = "0c8fc90d2037588024d9964515c1e684f6007ecc"; + hash = "sha256-Ptzxad3ewmKJbbcmrBT+os4b4SR976zlCG9F0nq0x94="; }; tinyobjloader = fetchFromGitHub { owner = "tinyobjloader"; @@ -61,12 +61,12 @@ let tinyxml2 = fetchFromGitHub { owner = "leethomason"; repo = "tinyxml2"; - rev = "1dee28e51f9175a31955b9791c74c430fe13dc82"; - hash = "sha256-AQQOctXi7sWIH/VOeSUClX6hlm1raEQUOp+VoPjLM14="; + rev = "9a89766acc42ddfa9e7133c7d81a5bda108a0ade"; + hash = "sha256-YGAe4+Ttv/xeou+9FoJjmQCKgzupTYdDhd+gzvtz/88="; }; - # See https://github.com/deepmind/mujoco/blob/573d331b69845c5d651b70f5d1b0f3a0d2a3a233/simulate/cmake/SimulateDependencies.cmake#L32-L35 - glfw = fetchFromGitHub { + # See https://github.com/deepmind/mujoco/blob/c9246e1f5006379d599e0bcddf159a8616d31441/simulate/cmake/SimulateDependencies.cmake#L32-L35 + glfw3 = fetchFromGitHub { owner = "glfw"; repo = "glfw"; rev = "7482de6071d21db77a7236155da44c172a7f6c9e"; @@ -75,13 +75,13 @@ let in stdenv.mkDerivation rec { pname = "mujoco"; - version = "2.3.0"; + version = "2.3.7"; src = fetchFromGitHub { owner = "deepmind"; repo = pname; rev = version; - hash = "sha256-FxMaXl7yfUAyY6LE1sxaw226dBtp1DOCWNnROp0WX2I="; + hash = "sha256-LgpA+iPGqciHuWBSD6/7yvZ7p+vo48ZYKjjrDZSnAwE="; }; patches = [ ./dependencies.patch ]; @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { ln -s ${benchmark} build/_deps/benchmark-src ln -s ${ccd} build/_deps/ccd-src ln -s ${eigen3} build/_deps/eigen3-src - ln -s ${glfw} build/_deps/glfw-src + ln -s ${glfw3} build/_deps/glfw3-src ln -s ${googletest} build/_deps/googletest-src ln -s ${lodepng} build/_deps/lodepng-src ln -s ${qhull} build/_deps/qhull-src diff --git a/pkgs/applications/science/robotics/mujoco/dependencies.patch b/pkgs/applications/science/robotics/mujoco/dependencies.patch index 5ddbaaab5329..f7dcc06a9e05 100644 --- a/pkgs/applications/science/robotics/mujoco/dependencies.patch +++ b/pkgs/applications/science/robotics/mujoco/dependencies.patch @@ -1,8 +1,8 @@ diff --git a/cmake/MujocoDependencies.cmake b/cmake/MujocoDependencies.cmake -index 99e4a7a..cf9a901 100644 +index 3e322ea..980aace 100644 --- a/cmake/MujocoDependencies.cmake +++ b/cmake/MujocoDependencies.cmake -@@ -82,8 +82,6 @@ set(BUILD_SHARED_LIBS +@@ -87,8 +87,6 @@ set(BUILD_SHARED_LIBS if(NOT TARGET lodepng) FetchContent_Declare( lodepng @@ -11,7 +11,7 @@ index 99e4a7a..cf9a901 100644 ) FetchContent_GetProperties(lodepng) -@@ -111,10 +109,6 @@ findorfetch( +@@ -127,10 +125,6 @@ findorfetch( qhull LIBRARY_NAME qhull @@ -21,8 +21,8 @@ index 99e4a7a..cf9a901 100644 - ${MUJOCO_DEP_VERSION_qhull} TARGETS qhull - # TODO(fraromano) Remove when https://github.com/qhull/qhull/pull/112 is merged. -@@ -146,10 +140,6 @@ findorfetch( + EXCLUDE_FROM_ALL +@@ -151,10 +145,6 @@ findorfetch( tinyxml2 LIBRARY_NAME tinyxml2 @@ -33,7 +33,7 @@ index 99e4a7a..cf9a901 100644 TARGETS tinyxml2 EXCLUDE_FROM_ALL -@@ -164,10 +154,6 @@ findorfetch( +@@ -169,10 +159,6 @@ findorfetch( tinyobjloader LIBRARY_NAME tinyobjloader @@ -44,7 +44,7 @@ index 99e4a7a..cf9a901 100644 TARGETS tinyobjloader EXCLUDE_FROM_ALL -@@ -182,10 +168,6 @@ findorfetch( +@@ -187,10 +173,6 @@ findorfetch( ccd LIBRARY_NAME ccd @@ -55,7 +55,7 @@ index 99e4a7a..cf9a901 100644 TARGETS ccd EXCLUDE_FROM_ALL -@@ -222,10 +204,6 @@ if(MUJOCO_BUILD_TESTS) +@@ -227,10 +209,6 @@ if(MUJOCO_BUILD_TESTS) absl LIBRARY_NAME abseil-cpp @@ -66,7 +66,7 @@ index 99e4a7a..cf9a901 100644 TARGETS absl::core_headers EXCLUDE_FROM_ALL -@@ -249,10 +227,6 @@ if(MUJOCO_BUILD_TESTS) +@@ -254,10 +232,6 @@ if(MUJOCO_BUILD_TESTS) GTest LIBRARY_NAME googletest @@ -77,7 +77,7 @@ index 99e4a7a..cf9a901 100644 TARGETS gtest gmock -@@ -283,10 +257,6 @@ if(MUJOCO_BUILD_TESTS) +@@ -288,10 +262,6 @@ if(MUJOCO_BUILD_TESTS) benchmark LIBRARY_NAME benchmark @@ -88,7 +88,7 @@ index 99e4a7a..cf9a901 100644 TARGETS benchmark::benchmark benchmark::benchmark_main -@@ -303,8 +273,6 @@ if(MUJOCO_TEST_PYTHON_UTIL) +@@ -308,8 +278,6 @@ if(MUJOCO_TEST_PYTHON_UTIL) FetchContent_Declare( Eigen3 @@ -98,17 +98,17 @@ index 99e4a7a..cf9a901 100644 FetchContent_GetProperties(Eigen3) diff --git a/simulate/cmake/SimulateDependencies.cmake b/simulate/cmake/SimulateDependencies.cmake -index 6616d6f..5d5a889 100644 +index fa539c2..5985d5a 100644 --- a/simulate/cmake/SimulateDependencies.cmake +++ b/simulate/cmake/SimulateDependencies.cmake @@ -81,10 +81,6 @@ findorfetch( - glfw + glfw3 LIBRARY_NAME - glfw + glfw3 - GIT_REPO - https://github.com/glfw/glfw.git - GIT_TAG -- ${MUJOCO_DEP_VERSION_glfw} +- ${MUJOCO_DEP_VERSION_glfw3} TARGETS glfw EXCLUDE_FROM_ALL diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index a27930fcb4ac..d0eceae70525 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -11,18 +11,18 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.1.7"; + version = "2.1.8"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-W6nqhSEoP2mDp7fCoXqwYAafjfESxymYXAdC3BnJJno="; + hash = "sha256-gdMNAU+w4u+9DZL9x96OAZihShkQdvSiqPCA+eNf600="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libseccomp systemd ] - ++ lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; + ++ lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; # manpage requires building the vendored go-md2man makeFlags = [ "bin/conmon" ]; diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index f9c15b35e43b..6a3da1f03a66 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -1,31 +1,21 @@ -{ lib, rustPlatform, fetchgit, fetchpatch -, pkg-config, protobuf, python3, wayland-scanner +{ lib, rustPlatform, fetchgit, pkg-config, protobuf, python3, wayland-scanner , libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols }: rustPlatform.buildRustPackage rec { pname = "crosvm"; - version = "115.2"; + version = "116.1"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "d14053a211eb6753c53ced71fad2d3b402b997e6"; - sha256 = "8p6M9Q9E07zqtHYdIIi6io9LLatd+9fH4Inod2Xjy5M="; + rev = "97ac6ce38d8e5789c91fcc5bae6078d21a2afdb3"; + sha256 = "NssjHXorPGZBYqERPeLW3cqEzbXqyL9N4OnLLQMLALk="; fetchSubmodules = true; }; - patches = [ - # Backport option to not vendor virglrenderer. - (fetchpatch { - url = "https://chromium.googlesource.com/crosvm/crosvm/+/dde9aa0e6d89a090f5d5f000822f7911eba98445%5E%21/?format=TEXT"; - decode = "base64 -d"; - hash = "sha256-W/s1i2reBXsbr0AOEtL9go3TNNYMwDVEu6pz3Q9wBSU="; - }) - ]; - separateDebugInfo = true; - cargoSha256 = "ZXyMeu2forItGcsGrNBWhV1V9HzVQK6LM4TxBrxAZnU="; + cargoHash = "sha256-mlXAlq62nAW6ZVxRav+k/iU1YDecfPDTCPp7FdJBO54="; nativeBuildInputs = [ pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix index 2e4d589d158e..3b110d9bc991 100644 --- a/pkgs/applications/virtualization/singularity/generic.nix +++ b/pkgs/applications/virtualization/singularity/generic.nix @@ -207,12 +207,16 @@ in substituteInPlace "$out/bin/run-singularity" \ --replace "/usr/bin/env ${projectName}" "$out/bin/${projectName}" wrapProgram "$out/bin/${projectName}" \ - --prefix PATH : "''${defaultPathInputs// /\/bin:}" + --prefix PATH : "''${defaultPathInputs// /\/bin:}''${defaultPathInputs:+/bin:}" # Make changes in the config file ${lib.optionalString enableNvidiaContainerCli '' substituteInPlace "$out/etc/${projectName}/${projectName}.conf" \ --replace "use nvidia-container-cli = no" "use nvidia-container-cli = yes" ''} + ${lib.optionalString (enableNvidiaContainerCli && projectName == "singularity") '' + substituteInPlace "$out/etc/${projectName}/${projectName}.conf" \ + --replace "# nvidia-container-cli path =" "nvidia-container-cli path = ${nvidia-docker}/bin/nvidia-container-cli" + ''} ${lib.optionalString (removeCompat && (projectName != "singularity")) '' unlink "$out/bin/singularity" for file in "$out"/share/man/man?/singularity*.gz; do diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 1a9fe490af85..31c8bbfdc5e4 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -2,6 +2,7 @@ , vte, avahi, dconf, gobject-introspection, libvirt-glib, system-libvirt , gsettings-desktop-schemas, libosinfo, gnome, gtksourceview4, docutils, cpio , e2fsprogs, findutils, gzip, cdrtools, xorriso, fetchpatch +, desktopToDarwinBundle, stdenv , spiceSupport ? true, spice-gtk ? null }: @@ -26,7 +27,8 @@ python3.pkgs.buildPythonApplication rec { wrapGAppsHook libvirt-glib vte dconf gtk-vnc gnome.adwaita-icon-theme avahi gsettings-desktop-schemas libosinfo gtksourceview4 - ] ++ lib.optional spiceSupport spice-gtk; + ] ++ lib.optional spiceSupport spice-gtk + ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; propagatedBuildInputs = with python3.pkgs; [ pygobject3 libvirt libxml2 requests cdrtools diff --git a/pkgs/applications/window-managers/katriawm/default.nix b/pkgs/applications/window-managers/katriawm/default.nix index fece3d808b4f..74bd269285c2 100644 --- a/pkgs/applications/window-managers/katriawm/default.nix +++ b/pkgs/applications/window-managers/katriawm/default.nix @@ -9,12 +9,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "katriawm"; - version = "23.04"; + version = "23.06"; src = fetchzip { name = finalAttrs.pname + "-" + finalAttrs.version; url = "https://www.uninformativ.de/git/katriawm/archives/katriawm-v${finalAttrs.version}.tar.gz"; - hash = "sha256-Wi9Fv/Ms6t7tr8nxznXrn/6V04lnO1HMz4XFbuCr9+Y="; + hash = "sha256-4vdBX5biakoxiOyz7DPNgkLxlzi27kZ9rC20g+pn3N4="; }; nativeBuildInputs = [ diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index ecfcc0cd52c5..e3c67d03dfa1 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -200,7 +200,7 @@ runCommand substitute ${./wrapper.sh} $out/bin/$progname \ --subst-var-by bash ${emacs.stdenv.shell} \ --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \ - --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp:" \ + --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp" \ --subst-var prog chmod +x $out/bin/$progname done @@ -219,7 +219,7 @@ runCommand substitute ${./wrapper.sh} $out/Applications/Emacs.app/Contents/MacOS/Emacs \ --subst-var-by bash ${emacs.stdenv.shell} \ --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \ - --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp:" \ + --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp" \ --subst-var-by prog "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs" chmod +x $out/Applications/Emacs.app/Contents/MacOS/Emacs fi diff --git a/pkgs/build-support/emacs/wrapper.sh b/pkgs/build-support/emacs/wrapper.sh index e8eecb8c8696..44762bd4582b 100644 --- a/pkgs/build-support/emacs/wrapper.sh +++ b/pkgs/build-support/emacs/wrapper.sh @@ -4,16 +4,17 @@ IFS=: newLoadPath=() newNativeLoadPath=() -added= +addedNewLoadPath= +addedNewNativeLoadPath= if [[ -n $EMACSLOADPATH ]] then while read -rd: entry do - if [[ -z $entry && -z $added ]] + if [[ -z $entry && -z $addedNewLoadPath ]] then newLoadPath+=(@wrapperSiteLisp@) - added=1 + addedNewLoadPath=1 fi newLoadPath+=("$entry") done <<< "$EMACSLOADPATH:" @@ -22,14 +23,19 @@ else newLoadPath+=("") fi +# NOTE: Even though we treat EMACSNATIVELOADPATH like EMACSLOADPATH in +# this wrapper, empty elements in EMACSNATIVELOADPATH have no special +# meaning for Emacs. Only non-empty elements in EMACSNATIVELOADPATH +# will be prepended to native-comp-eln-load-path. +# https://git.savannah.gnu.org/cgit/emacs.git/tree/lisp/startup.el?id=3685387e609753293c4518be75e77c659c3b2d8d#n599 if [[ -n $EMACSNATIVELOADPATH ]] then while read -rd: entry do - if [[ -z $entry && -z $added ]] + if [[ -z $entry && -z $addedNewNativeLoadPath ]] then newNativeLoadPath+=(@wrapperSiteLispNative@) - added=1 + addedNewNativeLoadPath=1 fi newNativeLoadPath+=("$entry") done <<< "$EMACSNATIVELOADPATH:" diff --git a/pkgs/data/documentation/scheme-manpages/default.nix b/pkgs/data/documentation/scheme-manpages/default.nix index cd4a8b2462aa..08916f3e561f 100644 --- a/pkgs/data/documentation/scheme-manpages/default.nix +++ b/pkgs/data/documentation/scheme-manpages/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "scheme-manpages"; - version = "unstable-2023-06-04"; + version = "unstable-2023-08-13"; src = fetchFromGitHub { owner = "schemedoc"; repo = "manpages"; - rev = "d5fce963985df270cb99d020169b4f28122e6415"; - hash = "sha256-snODSEtH1K/X0MakJWcPM40cqLUA+0cbBkhAHuisCyI="; + rev = "c17abb7dfb733fede4cf776a932e9696ccc7a4f2"; + hash = "sha256-9s/1sJEA4nowzQRpySOFzY+PxiUdz1Z3D931rMet4CA="; }; dontBuild = true; diff --git a/pkgs/desktops/deepin/apps/deepin-music/default.nix b/pkgs/desktops/deepin/apps/deepin-music/default.nix index fe39459ec046..914e4e6671dc 100644 --- a/pkgs/desktops/deepin/apps/deepin-music/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-music/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "deepin-music"; - version = "6.2.28"; + version = "6.2.31"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-rSaB8kIbpyPuhw3vWLWlXgY6xJpxLL8DktgcBoca0L0="; + hash = "sha256-OXyHB47orv9ix+Jg0b7wciA6DWUsXzFmIg4SM+piO3c="; }; postPatch = '' diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 9d01f85e0efe..4716d217c261 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -7,7 +7,6 @@ , meson , ninja , vala -, python3 , desktop-file-utils , libcanberra , gtk3 @@ -29,7 +28,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "6.4.1"; + version = "6.5.0"; outputs = [ "out" "dev" ]; @@ -37,15 +36,15 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = "files"; rev = version; - sha256 = "sha256-s4Df2eLnr+RnbTwPzjt9bVA+xZ9xca2hiFdGlRUZRfU="; + sha256 = "sha256-E1e2eXGpycl2VXEUvUir5G3MRLz/4TQMvmOuWgU9JNc="; }; patches = [ - # Fix log spam with new GLib - # https://github.com/elementary/files/pull/2257 + # meson: Don't run gtk-update-icon-cache + # https://github.com/elementary/files/pull/2294 (fetchpatch { - url = "https://github.com/elementary/files/commit/7bd542fa0a646b5cb0972f5575c56a9ee4d9dce7.patch"; - hash = "sha256-C+oSx0xn3YPuwEC0K+3ZmKeQrroKreJo1tfcpLGQ1S4="; + url = "https://github.com/elementary/files/commit/758ece9fb29eb4a25f47065710dad4ac547ca2ce.patch"; + hash = "sha256-+OASDsOPH0g5Cyxw4JmVxA70zQHhcpqLMKKYP4VLTO0="; }) ]; @@ -54,7 +53,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 vala wrapGAppsHook ]; @@ -77,11 +75,6 @@ stdenv.mkDerivation rec { zeitgeist ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix b/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix index b479a574d97b..e716fab959a0 100644 --- a/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-appfinder"; - version = "4.18.0"; + version = "4.18.1"; - sha256 = "sha256-/VYZpWk08OQPZ/DQ5SqSL4F4KDdh+IieQBDOZUxZvtw="; + sha256 = "sha256-CZEX1PzFsVt72Fkb4+5PiZjAcDisvYnbzFGFXjFL4sc="; nativeBuildInputs = [ exo ]; buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ]; diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix index 19765f97a174..77482b048a8d 100644 --- a/pkgs/development/compilers/circt/default.nix +++ b/pkgs/development/compilers/circt/default.nix @@ -13,12 +13,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.51.0"; + version = "1.52.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - sha256 = "sha256-IEMIFbMBLEKgntDiRfVH6qgj9a5RLWQnKrMnl5A3AYQ="; + sha256 = "sha256-ol8inyUrKezv+lhDIq2DhP4LHNJLhZylRbtIfoVAMYk="; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/erg/default.nix b/pkgs/development/compilers/erg/default.nix index a3ed2397c8eb..860461e28b64 100644 --- a/pkgs/development/compilers/erg/default.nix +++ b/pkgs/development/compilers/erg/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "erg"; - version = "0.6.18"; + version = "0.6.19"; src = fetchFromGitHub { owner = "erg-lang"; repo = "erg"; rev = "v${version}"; - hash = "sha256-bpKzC7xHP4vfl2WcyMEsFK1aAbkP3dtlpyNvXUWHWKg="; + hash = "sha256-oA0AXTMEdfItvIZi1ITQ3ZR6JPSg9/1V6oeK2wcRERw="; }; - cargoHash = "sha256-wIp+zQpHLmZNwgbSXQKV45YwO5qpZqdcUE6gnF/Wzhk="; + cargoHash = "sha256-dLMU48/umKHPV6iahazxOYA/eDvFWhzV9xveT2xQ+EE="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/development/compilers/llvm/15/libcxxabi/default.nix b/pkgs/development/compilers/llvm/15/libcxxabi/default.nix index 692a0256e901..ec61918e341a 100644 --- a/pkgs/development/compilers/llvm/15/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/15/libcxxabi/default.nix @@ -68,8 +68,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" - ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || - (stdenv.hostPlatform.isDarwin && enableShared)) [ + ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || !stdenv.hostPlatform.isDarwin) [ # libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib, # but that does not appear to be the case for example when building # pkgsLLVM.libcxxabi (which uses clangNoCompilerRtWithLibc). diff --git a/pkgs/development/compilers/llvm/16/libcxxabi/default.nix b/pkgs/development/compilers/llvm/16/libcxxabi/default.nix index 692a0256e901..ec61918e341a 100644 --- a/pkgs/development/compilers/llvm/16/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/16/libcxxabi/default.nix @@ -68,8 +68,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" - ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || - (stdenv.hostPlatform.isDarwin && enableShared)) [ + ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || !stdenv.hostPlatform.isDarwin) [ # libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib, # but that does not appear to be the case for example when building # pkgsLLVM.libcxxabi (which uses clangNoCompilerRtWithLibc). diff --git a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix index 51020fcdb0ca..b65a480117ee 100644 --- a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix @@ -68,8 +68,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" - ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || - (stdenv.hostPlatform.isDarwin && enableShared)) [ + ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) || !stdenv.hostPlatform.isDarwin) [ # libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib, # but that does not appear to be the case for example when building # pkgsLLVM.libcxxabi (which uses clangNoCompilerRtWithLibc). diff --git a/pkgs/development/compilers/lunarml/default.nix b/pkgs/development/compilers/lunarml/default.nix index ff3122ce2198..16e4997993c1 100644 --- a/pkgs/development/compilers/lunarml/default.nix +++ b/pkgs/development/compilers/lunarml/default.nix @@ -11,13 +11,13 @@ in stdenvNoCC.mkDerivation { inherit pname; - version = "unstable-2023-06-25"; + version = "unstable-2023-07-25"; src = fetchFromGitHub { owner = "minoki"; repo = "LunarML"; - rev = "f58f90cf7a2f26340403245907ed183f6a12ab52"; - sha256 = "djHJfUAPplsejFW9L3fbwTeeWgvR+gKkI8TmwIh8n7E="; + rev = "4a5f9c7d42c6b1fcd3d73ab878321f887a153aa7"; + sha256 = "dpYUXMbYPRvk+t6Cnc4uh8w5MwuPXuKPgZQl2P0EBZU="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/pkgs/development/embedded/stm32/stm32cubemx/default.nix index af496df582c1..a9384d9b2b8b 100644 --- a/pkgs/development/embedded/stm32/stm32cubemx/default.nix +++ b/pkgs/development/embedded/stm32/stm32cubemx/default.nix @@ -1,23 +1,27 @@ -{ lib, stdenv, makeDesktopItem, icoutils, fdupes, imagemagick, jdk11, fetchzip }: -# TODO: JDK16 causes STM32CubeMX to crash right now, so we fixed the version to JDK11 -# This may be fixed in a future version of STM32CubeMX. This issue has been reported to ST: -# https://community.st.com/s/question/0D53W00000jnOzPSAU/stm32cubemx-crashes-on-launch-with-openjdk16 -# If you're updating this derivation, check the link above to see if it's been fixed upstream -# and try replacing all occurrences of jdk11 with jre and test whether it works. +{ fdupes +, fetchzip +, icoutils +, imagemagick +, jdk17 +, lib +, makeDesktopItem +, stdenv +}: + let iconame = "STM32CubeMX"; in stdenv.mkDerivation rec { pname = "stm32cubemx"; - version = "6.8.1"; + version = "6.9.1"; src = fetchzip { url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}-lin.zip"; - sha256 = "sha256-0WzdyRP09rRZzVZhwMOxA/SwHrQOYGBnv8UwvjMT22Q="; + sha256 = "sha256-KTbIRj7DkWoC2h/TLKjVduvsKVSue28kGOL34JqBVx4="; stripRoot = false; }; - nativeBuildInputs = [ icoutils fdupes imagemagick ]; + nativeBuildInputs = [ fdupes icoutils imagemagick ]; desktopItem = makeDesktopItem { name = "STM32CubeMX"; exec = "stm32cubemx"; @@ -41,7 +45,7 @@ stdenv.mkDerivation rec { cat << EOF > $out/bin/${pname} #!${stdenv.shell} - ${jdk11}/bin/java -jar $out/opt/STM32CubeMX/STM32CubeMX + ${jdk17}/bin/java -jar $out/opt/STM32CubeMX/STM32CubeMX EOF chmod +x $out/bin/${pname} @@ -74,7 +78,7 @@ stdenv.mkDerivation rec { homepage = "https://www.st.com/en/development-tools/stm32cubemx.html"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; - maintainers = with maintainers; [ wucke13 ]; + maintainers = with maintainers; [ angaz wucke13 ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/futuresql/default.nix b/pkgs/development/libraries/futuresql/default.nix new file mode 100644 index 000000000000..2adc148701a7 --- /dev/null +++ b/pkgs/development/libraries/futuresql/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl, cmake, extra-cmake-modules, qtbase }: +stdenv.mkDerivation rec { + pname = "futuresql"; + version = "0.1.1"; + + src = fetchurl { + url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; + hash = "sha256-5E7Y1alhizynuimD7ZxfdXLm4KWxmflIaINLccy+vUM="; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules ]; + buildInputs = [ qtbase ]; + + # a library, nothing to wrap + dontWrapQtApps = true; +} diff --git a/pkgs/development/libraries/libgourou/default.nix b/pkgs/development/libraries/libgourou/default.nix index 2d1b90675590..78b5654873bd 100644 --- a/pkgs/development/libraries/libgourou/default.nix +++ b/pkgs/development/libraries/libgourou/default.nix @@ -1,13 +1,21 @@ -{ lib, stdenv, fetchzip, pugixml, updfparser, curl, openssl, libzip -, installShellFiles }: +{ lib +, stdenv +, fetchzip +, pugixml +, updfparser +, curl +, openssl +, libzip +, installShellFiles +}: stdenv.mkDerivation rec { name = "libgourou"; - version = "0.8.1"; + version = "0.8.2"; src = fetchzip { url = "https://indefero.soutade.fr/p/${name}/source/download/v${version}/"; - sha256 = "sha256-X56K4z1+k62Q9pxnN8kx35oc7+uJJN/o/tpnKx1FjwE="; + sha256 = "sha256-adkrvBCgN07Ir+J3JFCy+X9p9609lj1w8nElrlHXTxc"; extension = "zip"; }; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index b84562850efe..a8826e4381eb 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "sha256-Wgy1vsr0FXRJz9BCfw2PyFkesIJ/eg2dYDY/I2TESnU="; + sha256 = "sha256-wONqqd8Ds10SvkUrj7Ps6BfqUNPE6hCnQrKDTEglVEQ="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix index e7e8d2032ed5..44f82f15852a 100644 --- a/pkgs/development/libraries/lief/default.nix +++ b/pkgs/development/libraries/lief/default.nix @@ -3,26 +3,28 @@ , fetchFromGitHub , python , cmake +, ninja }: let - pyEnv = python.withPackages (ps: [ ps.setuptools ]); + pyEnv = python.withPackages (ps: [ ps.setuptools ps.tomli ps.pip ps.setuptools ]); in stdenv.mkDerivation rec { pname = "lief"; - version = "0.12.3"; + version = "0.13.2"; src = fetchFromGitHub { owner = "lief-project"; repo = "LIEF"; rev = version; - sha256 = "sha256-wZgv4AFc7DrMCyxMLKQxO1mUTDAU4klK8aZAySqGJoY="; + sha256 = "sha256-lH4SqwPB2Jp/wUI2Cll67PQbHbwMqpNuLy/ei8roiHg="; }; outputs = [ "out" "py" ]; nativeBuildInputs = [ cmake + ninja ]; # Not a propagatedBuildInput because only the $py output needs it; $out is @@ -31,33 +33,16 @@ stdenv.mkDerivation rec { python ]; - dontUseCmakeConfigure = true; - - buildPhase = '' - runHook preBuild - - substituteInPlace setup.py \ - --replace 'cmake_args = []' "cmake_args = [ \"-DCMAKE_INSTALL_PREFIX=$prefix\" ]" - ${pyEnv.interpreter} setup.py --sdk build --parallel=$NIX_BUILD_CORES - - runHook postBuild + postBuild = '' + pushd /build/source/api/python + ${pyEnv.interpreter} setup.py build --parallel=$NIX_BUILD_CORES + popd ''; - # I was unable to find a way to build the library itself and have it install - # to $out, while also installing the Python bindings to $py without building - # the project twice (using cmake), so this is the best we've got. It uses - # something called CPack to create the tarball, but it's not obvious to me - # *how* that happens, or how to intercept it to just get the structured - # library output. - installPhase = '' - runHook preInstall - - mkdir -p $out $py/nix-support - echo "${python}" >> $py/nix-support/propagated-build-inputs - tar xf build/*.tar.gz --directory $out --strip-components 1 + postInstall = '' + pushd /build/source/api/python ${pyEnv.interpreter} setup.py install --skip-build --root=/ --prefix=$py - - runHook postInstall + popd ''; meta = with lib; { @@ -65,6 +50,6 @@ stdenv.mkDerivation rec { homepage = "https://lief.quarkslab.com/"; license = [ licenses.asl20 ]; platforms = with platforms; linux ++ darwin; - maintainers = [ maintainers.lassulus ]; + maintainers = with maintainers; [ lassulus genericnerdyusername ]; }; } diff --git a/pkgs/development/libraries/openturns/default.nix b/pkgs/development/libraries/openturns/default.nix index 4c80c4b9ac81..d6735e77d460 100644 --- a/pkgs/development/libraries/openturns/default.nix +++ b/pkgs/development/libraries/openturns/default.nix @@ -26,24 +26,15 @@ stdenv.mkDerivation rec { pname = "openturns"; - version = "1.20"; + version = "1.21"; src = fetchFromGitHub { owner = "openturns"; repo = "openturns"; rev = "v${version}"; - sha256 = "sha256-QeapH937yGnK6oD+rgIERePxz6ooxGpOx6x9LyFDt2A="; + sha256 = "sha256-zWCwuxJEiyhnllVCsfm3zNz2Xorvuj2Vl2fufS3qixY="; }; - patches = [ - # Fix build with primesieve 11, https://github.com/openturns/openturns/pull/2187 - # Remove with next version update. - (fetchpatch { - url = "https://github.com/openturns/openturns/commit/a85061f89a5763061467beac516c1355fe81b9be.patch"; - hash = "sha256-z28ipBuX3b5UFEnKuDfp+kMI5cUcwXVz/8WZHlICnvE="; - }) - ]; - nativeBuildInputs = [ cmake ] ++ lib.optional enablePython python3Packages.sphinx; buildInputs = [ swig @@ -84,6 +75,7 @@ stdenv.mkDerivation rec { description = "Multivariate probabilistic modeling and uncertainty treatment library"; license = with licenses; [ lgpl3 gpl3 ]; homepage = "https://openturns.github.io/www/"; + changelog = "https://github.com/openturns/openturns/raw/v${version}/ChangeLog"; maintainers = with maintainers; [ gdinh ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix index 2eb391dda46b..f82e48b46cd8 100644 --- a/pkgs/development/libraries/science/math/nccl/default.nix +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -15,13 +15,13 @@ let in backendStdenv.mkDerivation (finalAttrs: { name = "nccl-${finalAttrs.version}-cuda-${cudaVersion}"; - version = "2.16.5-1"; + version = "2.18.3-1"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nccl"; rev = "v${finalAttrs.version}"; - hash = "sha256-JyhhYKSVIqUKIbC1rCJozPT1IrIyRLGrTjdPjJqsYaU="; + hash = "sha256-v4U4IzwiuiYFyFhxVmNOCUmkbSg/AM0QtWPve0ehVhs="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/adax/default.nix b/pkgs/development/python-modules/adax/default.nix index e4240028638b..fd2cb0f29f59 100644 --- a/pkgs/development/python-modules/adax/default.nix +++ b/pkgs/development/python-modules/adax/default.nix @@ -8,16 +8,16 @@ buildPythonPackage rec { pname = "adax"; - version = "0.2.0"; + version = "0.3.0"; format = "setuptools"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyadax"; - rev = version; - hash = "sha256-EMSX2acklwWOYiEeLHYG5mwdiGnWAUo5dGMiHCmZrko="; + rev = "refs/tags/${version}"; + hash = "sha256-y4c1RBy/UxmKP7+mHXi86XJ2/RXGrqkj94I2Q699EJU="; }; propagatedBuildInputs = [ @@ -28,11 +28,14 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "adax" ]; + pythonImportsCheck = [ + "adax" + ]; meta = with lib; { description = "Python module to communicate with Adax"; homepage = "https://github.com/Danielhiversen/pyAdax"; + changelog = "https://github.com/Danielhiversen/pyAdax/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aioaseko/default.nix b/pkgs/development/python-modules/aioaseko/default.nix index d6d69c6ee466..e1781a9bf324 100644 --- a/pkgs/development/python-modules/aioaseko/default.nix +++ b/pkgs/development/python-modules/aioaseko/default.nix @@ -2,13 +2,15 @@ , aiohttp , buildPythonPackage , fetchFromGitHub +, fetchpatch , pythonOlder , setuptools +, pyjwt }: buildPythonPackage rec { pname = "aioaseko"; - version = "0.0.2"; + version = "0.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -16,16 +18,26 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "milanmeu"; repo = pname; - rev = "v${version}"; - hash = "sha256-nJRVNBYfBcLYnBsTpQZYMHYWh0+hQObVKJ7sOXFwDjc="; + rev = "refs/tags/v${version}"; + hash = "sha256-RgIwA5/W7qtgI9ZTF4oDPuzSc+r04ZV3JOaNNFjS0pU="; }; + patches = [ + # Remove time, https://github.com/milanmeu/aioaseko/pull/6 + (fetchpatch { + name = "remove-time.patch"; + url = "https://github.com/milanmeu/aioaseko/commit/07d7ca43a2edd060e95a64737f072d98ba938484.patch"; + hash = "sha256-67QaqSy5mGY/22jWHOkymr0pFoiizVQAXlrqXRb3tG0="; + }) + ]; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ aiohttp + pyjwt ]; # Module has no tests @@ -38,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to interact with the Aseko Pool Live API"; homepage = "https://github.com/milanmeu/aioaseko"; + changelog = "https://github.com/milanmeu/aioaseko/releases/tag/v${version}"; license = with licenses; [ lgpl3Plus ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aioquic/default.nix b/pkgs/development/python-modules/aioquic/default.nix index 753ce73fb2dc..9aeb06a1382d 100644 --- a/pkgs/development/python-modules/aioquic/default.nix +++ b/pkgs/development/python-modules/aioquic/default.nix @@ -1,52 +1,43 @@ { lib -, fetchPypi -, fetchpatch , buildPythonPackage +, certifi +, fetchPypi , openssl , pylsqpack -, certifi -, pytestCheckHook , pyopenssl +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "aioquic"; - version = "0.9.20"; + version = "0.9.21"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-7ENqqs6Ze4RrAeUgDtv34+VrkYJqFE77l0j9jd0zK74="; + hash = "sha256-ecfsBjGOeFYnZlyk6HI63zR7ciW30AbjMtJXWh9RbvU="; }; - patches = [ - # This patch is here because it's required by the next patch. - (fetchpatch { - url = "https://github.com/aiortc/aioquic/commit/3930580b50831a034d21ee4689362188b21a4d6a.patch"; - hash = "sha256-XjhyajDawN/G1nPtkMbNe66iJCo76UpdA7PqwtxO5ag="; - }) - # https://github.com/aiortc/aioquic/pull/349, fixes test failure due pyopenssl==22 - (fetchpatch { - url = "https://github.com/aiortc/aioquic/commit/c3b72be85868d67ee32d49ab9bd98a4357cbcde9.patch"; - hash = "sha256-AjW+U9DpNXgA5yqKkWnx0OYpY2sZR9KIdQ3pSzxU+uY="; - }) - # AssertionError: 'self-signed certificate' != 'self signed certificate' - (fetchpatch { - url = "https://github.com/aiortc/aioquic/commit/cfcd3ce12fb27f5b26deb011a82f66b5d68d521a.patch"; - hash = "sha256-bCW817Z7jCxYySfUukNR4cibURH3qZWEQjeeyvRIqZY="; - }) - ]; - propagatedBuildInputs = [ certifi pylsqpack pyopenssl ]; - buildInputs = [ openssl ]; + buildInputs = [ + openssl + ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "aioquic" ]; + pythonImportsCheck = [ + "aioquic" + ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/aiosomecomfort/default.nix b/pkgs/development/python-modules/aiosomecomfort/default.nix index 72fdd22f6696..e993813081a8 100644 --- a/pkgs/development/python-modules/aiosomecomfort/default.nix +++ b/pkgs/development/python-modules/aiosomecomfort/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiosomecomfort"; - version = "0.0.16"; + version = "0.0.17"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mkmer"; repo = "AIOSomecomfort"; rev = "refs/tags/${version}"; - hash = "sha256-GwnlaPy+pIJOL3szOebH0a0ytVMOeUI4dM8D629RuEU="; + hash = "sha256-HJbLsl1NHZxfH17mIi0T6h5ZSfKaw4VYbNgN6vmN7l4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncsleepiq/default.nix b/pkgs/development/python-modules/asyncsleepiq/default.nix index fcfa15fcb1de..ee3efac57914 100644 --- a/pkgs/development/python-modules/asyncsleepiq/default.nix +++ b/pkgs/development/python-modules/asyncsleepiq/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "asyncsleepiq"; - version = "1.3.5"; + version = "1.3.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CLBKFDvhErnWNEs7xWLha2QgUvKRDmj0y1CYYKri3ag="; + hash = "sha256-h+Q9g0kznGMLLi8i/iKodGXB+f/m3PXoF6h6hhIX9ys="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix b/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix index b9e3a2e4a053..624c9735b6ac 100644 --- a/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix @@ -4,32 +4,36 @@ , pythonOlder , azure-common , azure-mgmt-core -, msrest -, msrestazure +, isodate +, typing-extensions }: buildPythonPackage rec { - version = "2.0.0"; pname = "azure-mgmt-appcontainers"; + version = "3.0.0"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ccdIdvdgTYPWEZCWqkLc8lEuMuAEERvl5B1huJyBkvU="; - extension = "zip"; + hash = "sha256-oqKPEOnZaIU7IMzDqT552IBJr9RtWt3vFO3SlG8igs0="; }; propagatedBuildInputs = [ azure-common azure-mgmt-core - msrest - msrestazure + isodate + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; # no tests included doCheck = false; - pythonImportsCheck = [ "azure.mgmt.appcontainers" ]; + pythonImportsCheck = [ + "azure.mgmt.appcontainers" + ]; meta = with lib; { description = "Microsoft Azure Appcontainers Management Client Library for Python"; diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index e3ec3ee71b95..4707f8bc2ae9 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -1,32 +1,32 @@ { lib -, buildPythonPackage -, fetchPypi -, msrest -, msrestazure , azure-common , azure-mgmt-core , azure-mgmt-nspkg +, buildPythonPackage +, fetchPypi +, isodate , pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "25.0.0"; + version = "26.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-je7O92bklsbIlfsTUF2TXUqztAZxn8ep4ezCUHeLuhE="; + hash = "sha256-BpvnSqee5wodtMXPxo/pHCBk8Yy4yPnEdK164d9ILuM="; }; propagatedBuildInputs = [ - msrest - msrestazure azure-common azure-mgmt-core + isodate + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; # has no tests diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix index 91fb01f95473..e4d0ae9b288f 100644 --- a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix @@ -1,31 +1,31 @@ { lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, msrest -, msrestazure , azure-common , azure-mgmt-core +, buildPythonPackage +, fetchPypi +, isodate +, pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "azure-mgmt-monitor"; - version = "6.0.1"; + version = "6.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-j+LrnLsfvRNlolKYf72ZUXxg5lb33R7PfxveBSyxHDI="; + hash = "sha256-X/v1AOSZq3kSsbptJs7yZIDZrkEVMgGbt41yViGW4Hs="; }; propagatedBuildInputs = [ - msrest - msrestazure + isodate azure-common azure-mgmt-core + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; pythonNamespaces = [ diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index b0bdd1c086bb..6d8e08964807 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -1,31 +1,31 @@ { lib -, buildPythonPackage -, fetchPypi , azure-common , azure-mgmt-core -, msrest -, msrestazure +, buildPythonPackage +, fetchPypi +, isodate , pythonOlder +, typing-extensions }: buildPythonPackage rec { - version = "24.0.0"; pname = "azure-mgmt-network"; + version = "25.0.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-LtahQ2PnJC2jlD3pHp+IBLaUaNXTamZqdFdE/iJ4840="; + hash = "sha256-rZPbkUQJFIeNSSPWHTK79INWeRX5+GJ7o7mEMLhyJ9E="; }; propagatedBuildInputs = [ azure-common azure-mgmt-core - msrest - msrestazure + isodate + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions ]; # Module has no tests diff --git a/pkgs/development/python-modules/boxx/default.nix b/pkgs/development/python-modules/boxx/default.nix index 925aa2b2568b..a2a71ad0c986 100644 --- a/pkgs/development/python-modules/boxx/default.nix +++ b/pkgs/development/python-modules/boxx/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "boxx"; - version = "0.10.9"; + version = "0.10.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fWOGKDk7eJVlE9LMau3DZF8nFLUrmHpunAXdqLxHFHk="; + hash = "sha256-7A5qFpISrjVrqQfKk6BPb7RhDWd9f90eF3bku+LsCcc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/canals/default.nix b/pkgs/development/python-modules/canals/default.nix index 6832a3626132..ae4d8615c757 100644 --- a/pkgs/development/python-modules/canals/default.nix +++ b/pkgs/development/python-modules/canals/default.nix @@ -1,44 +1,31 @@ { lib , buildPythonPackage -, pythonOlder -, pythonAtLeast , fetchFromGitHub -# native build inputs , hatchling -# build input -, networkx -# check inputs -, pytestCheckHook -# optional dependencies -, pygraphviz -, requests , mkdocs-material , mkdocs-mermaid2-plugin , mkdocstrings +, networkx +, pygraphviz +, pytestCheckHook +, pythonOlder +, requests }: -let + +buildPythonPackage rec { pname = "canals"; - version = "0.2.2"; - optional-dependencies = { - graphviz = [ pygraphviz ]; - mermaid = [ requests ]; - docs = [ mkdocs-material mkdocs-mermaid2-plugin mkdocstrings ]; - }; -in -buildPythonPackage { - inherit version pname; + version = "0.6.0"; format = "pyproject"; - # Pypi source package doesn't contain tests + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "deepset-ai"; repo = pname; - rev = "v${version}"; - hash = "sha256-dF0bkY4DFJIovaseNiOLgF8lmha+njTTTzr2/4LzZEc="; + rev = "refs/tags/v${version}"; + hash = "sha256-s4nKPywfRn2hNhn/coWGqShv7D+MCEHblVzfweQJlnM="; }; - disabled = pythonOlder "3.8"; - nativeBuildInputs = [ hatchling ]; @@ -47,18 +34,37 @@ buildPythonPackage { networkx ]; - passthru = { inherit optional-dependencies; }; + passthru.optional-dependencies = { + graphviz = [ + pygraphviz + ]; + mermaid = [ + requests + ]; + docs = [ + mkdocs-material + mkdocs-mermaid2-plugin + mkdocstrings + ]; + }; nativeCheckInputs = [ pytestCheckHook - ] ++ optional-dependencies.mermaid; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); disabledTestPaths = [ - # requires internet connection to mermaid.ink + # Test requires internet connection to mermaid.ink "test/pipelines/integration" ]; - pythonImportsCheck = [ "canals" ]; + disabledTests = [ + # Path issue + "test_draw_pygraphviz" + ]; + + pythonImportsCheck = [ + "canals" + ]; meta = with lib; { description = "A component orchestration engine"; diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix index ca1dd48a9df5..b426de499aa0 100644 --- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2023.8.10.19"; + version = "2023.8.24.13"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "coinmetrics_api_client"; - hash = "sha256-sXWcnl6E2Aw78Y4JPpTQlRmhRP6egl6eo81N2PIhi34="; + hash = "sha256-Ju8QczI/vyX4//WMy92H66DafTGJefsOqIjifCfQXGU="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/events/default.nix b/pkgs/development/python-modules/events/default.nix index 6fe355d9c4d8..f4e9dcd250f0 100644 --- a/pkgs/development/python-modules/events/default.nix +++ b/pkgs/development/python-modules/events/default.nix @@ -1,17 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { - pname = "Events"; - version = "0.4"; + pname = "events"; + version = "0.5"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "01d9dd2a061f908d74a89fa5c8f07baa694f02a2a5974983663faaf7a97180f5"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pyeve"; + repo = "events"; + rev = "refs/tags/v${version}"; + hash = "sha256-GGhIKHbJ31IN0Uoe689X9V/MZvtseE47qx2CmM4MYUs="; }; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "events" + ]; + + pytestFlagsArray = [ + "events/tests/tests.py" + ]; + meta = with lib; { - homepage = "https://events.readthedocs.org"; description = "Bringing the elegance of C# EventHanlder to Python"; + homepage = "https://events.readthedocs.org"; + changelog = "https://github.com/pyeve/events/blob/v0.5/CHANGES"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 470d17deeba1..b7d4cda7df7c 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "5.0.3"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "ecederstrand"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oQ09/CvHIA4PAVqK6DeY3slHvQ1aPRqCC6ZuhubTN94="; + hash = "sha256-WKQgfmEbil55WO3tWVq4n9wiJNw0Op/jbI7xt5vtKpA="; }; patches = [ diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix index b3ecf7a3fce2..dea302fb8f3a 100644 --- a/pkgs/development/python-modules/explorerscript/default.nix +++ b/pkgs/development/python-modules/explorerscript/default.nix @@ -6,25 +6,37 @@ , igraph , pygments , pytestCheckHook +, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "explorerscript"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "sha256-REQYyxB2sb/gG54+OkMw+M4Agg9SWfAyqAhiSNnd3tE="; + sha256 = "sha256-0U5n7e/utmgOTBuTypkBMeHZR7lji6lFimSjbC7hVRM="; }; nativeBuildInputs = [ antlr4 + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + # antlr output is rebuilt in postPatch step. + "antlr4-python3-runtime" + # igraph > 0.10.4 was marked as incompatible by upstream + # due to regression introduced in 0.10.5, which was fixed + # in igraph 0.10.6. + # + # https://github.com/igraph/python-igraph/issues/693 + "igraph" ]; postPatch = '' - sed -i "s/antlr4-python3-runtime.*/antlr4-python3-runtime',/" setup.py antlr -Dlanguage=Python3 -visitor explorerscript/antlr/{ExplorerScript,SsbScript}.g4 ''; diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 6ac240e4b61e..9d05bf5e0930 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -1,32 +1,43 @@ { lib , buildPythonPackage -, fetchPypi -, requests +, fetchFromGitHub +, flitBuildHook , google-auth , google-auth-oauthlib +, pytest-vcr +, pytestCheckHook , pythonOlder +, requests }: buildPythonPackage rec { pname = "gspread"; - version = "5.9.0"; - format = "setuptools"; + version = "5.10.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-NLl4NLvvrM9ySXcCuuJtEvltBoXkmkGK/mqSqbvLnJw="; + src = fetchFromGitHub { + owner = "burnash"; + repo = "gspread"; + rev = "refs/tags/v${version}"; + hash = "sha256-GAlQYQVuwsnkXqZOvG66f9kig+m392CVlrgUTqrTKyA="; }; - propagatedBuildInputs = [ - requests - google-auth - google-auth-oauthlib + nativeBuildInputs = [ + flitBuildHook ]; - # No tests included - doCheck = false; + propagatedBuildInputs = [ + google-auth + google-auth-oauthlib + requests + ]; + + nativeCheckInputs = [ + pytest-vcr + pytestCheckHook + ]; pythonImportsCheck = [ "gspread" diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index d1bd71fa1c57..a730b8c48b7b 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.8.9"; + version = "2023.8.11"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PQ9KxKyTa9xiLa6suqHRem6Rs732djbjzFKKLZDUM/g="; + hash = "sha256-EDpOCZlWIb1WChO4/k37WDkA4LT4Wy8tcMpThMgCQoU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index 2f539c87524d..da27462cc50b 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "ical"; - version = "5.0.0"; + version = "5.0.1"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6xDbr/y9ZNT9thWMLHPi9/EXVXrUdMCVJdQAcd3G2vo="; + hash = "sha256-6gMmY6XlFdqF0DxkrCJhZPzUYZuEpDnIHG++nBRE3hg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/idasen/default.nix b/pkgs/development/python-modules/idasen/default.nix index e4792be41690..8ce6928b9057 100644 --- a/pkgs/development/python-modules/idasen/default.nix +++ b/pkgs/development/python-modules/idasen/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch , bleak , pyyaml , voluptuous @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "idasen"; - version = "0.9.6"; + version = "0.10.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,17 +21,9 @@ buildPythonPackage rec { owner = "newAM"; repo = "idasen"; rev = "refs/tags/v${version}"; - hash = "sha256-t8w4USDzyS0k5yk0XtQF8fVffzdf+udKSkdveMlseHk="; + hash = "sha256-aCVKnKWJlrlKD+74KL9JKlNpMGOzg/iWmB+1IMn0V/E="; }; - patches = [ - (fetchpatch { - name = "replace-poetry-with-poetry-core.patch"; - url = "https://github.com/newAM/idasen/commit/b9351d5c9def0687e4ae4cb65f38d14ed9ff2df5.patch"; - hash = "sha256-Qi3psPZExJ5tBJ4IIvDC3JnWf4Gym6Z7akGCV8GZUNY="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index 5d8e36519e8c..05f857641b66 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "5.0.3"; + version = "5.0.4"; src = fetchPypi { inherit pname version; - hash = "sha256-9SrFF1QAEpbS5WWBhOA1p8/YyToSbUb69vINUMQ1cug="; + hash = "sha256-+zrsfyi4I8venFGMKXDMUq+9+f7y6IY59y1/OJDExGs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jsonpath/default.nix b/pkgs/development/python-modules/jsonpath/default.nix index 383df6e2652e..00205eb1907a 100644 --- a/pkgs/development/python-modules/jsonpath/default.nix +++ b/pkgs/development/python-modules/jsonpath/default.nix @@ -1,21 +1,38 @@ { lib , buildPythonPackage , fetchPypi +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "jsonpath"; - version = "0.82"; + version = "0.82.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "46d3fd2016cd5b842283d547877a02c418a0fe9aa7a6b0ae344115a2c990fef4"; + hash = "sha256-2H7yvLze1o7pa8NMGAm2lFfs7JsMTdRxZYoSvTkQAtE="; }; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "jsonpath" + ]; + + pytestFlagsArray = [ + "test/test*.py" + ]; + meta = with lib; { description = "An XPath for JSON"; homepage = "https://github.com/json-path/JsonPath"; license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + maintainers = with maintainers; [ mic92 ]; }; } diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix index b34bb4435d0c..613d4478af87 100644 --- a/pkgs/development/python-modules/jsonrpc-async/default.nix +++ b/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "jsonrpc-async"; - version = "2.1.1"; + version = "2.1.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "emlove"; repo = pname; rev = version; - hash = "sha256-HhesXzxVjhWJkubiBi6sMoXi/zicqn99dqT5bilycS8="; + hash = "sha256-KOnycsOZFDEVj8CJDwGbdtbOpMPQMVdrXbHG0fzr9PI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/keyrings-cryptfile/default.nix b/pkgs/development/python-modules/keyrings-cryptfile/default.nix index a31a5a3c957d..4a640d7b1b7c 100644 --- a/pkgs/development/python-modules/keyrings-cryptfile/default.nix +++ b/pkgs/development/python-modules/keyrings-cryptfile/default.nix @@ -1,8 +1,7 @@ { lib +, argon2-cffi , buildPythonPackage , fetchPypi -, fetchpatch -, argon2-cffi , keyring , pycryptodome , pytestCheckHook @@ -10,26 +9,22 @@ }: buildPythonPackage rec { - pname = "keyrings.cryptfile"; - # NOTE: newer releases are bugged/incompatible - # https://github.com/frispete/keyrings.cryptfile/issues/15 - version = "1.3.4"; + pname = "keyrings-cryptfile"; + version = "1.3.9"; + format = "setuptools"; + disabled = pythonOlder "3.5"; src = fetchPypi { - inherit pname version; - hash = "sha256-jW+cKMm+xef8C+fl0CGe+6SEkYBHDjFX2/kLCZ62j6c="; + pname = "keyrings.cryptfile"; + inherit version; + hash = "sha256-fCpFPKuZhUJrjCH3rVSlfkn/joGboY4INAvYgBrPAJE="; }; - patches = [ - # upstream setup.cfg has an option that is not supported - ./fix-testsuite.patch - # change of API in keyrings.testing - (fetchpatch { - url = "https://github.com/frispete/keyrings.cryptfile/commit/6fb9e45f559b8b69f7a0a519c0bece6324471d79.patch"; - hash = "sha256-1878pMO9Ed1zs1pl+7gMjwx77HbDHdE1CryN8TPfPdU="; - }) - ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "-s --cov=keyrings/cryptfile" "" + ''; propagatedBuildInputs = [ argon2-cffi @@ -46,13 +41,14 @@ buildPythonPackage rec { ]; disabledTests = [ - "test_set_properties" - "UncryptedFileKeyringTestCase" + # FileNotFoundError: [Errno 2] No such file or directory: '/build/... + "test_versions" ]; meta = with lib; { description = "Encrypted file keyring backend"; homepage = "https://github.com/frispete/keyrings.cryptfile"; + changelog = "https://github.com/frispete/keyrings.cryptfile/blob/v${version}/CHANGES.md"; license = licenses.mit; maintainers = teams.chia.members; }; diff --git a/pkgs/development/python-modules/mdformat/default.nix b/pkgs/development/python-modules/mdformat/default.nix index 3ac61c1a1888..a25a632f5150 100644 --- a/pkgs/development/python-modules/mdformat/default.nix +++ b/pkgs/development/python-modules/mdformat/default.nix @@ -47,7 +47,7 @@ let package = buildPythonPackage rec { pname = "mdformat"; - version = "0.7.16"; + version = "0.7.17"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -55,8 +55,8 @@ let src = fetchFromGitHub { owner = "executablebooks"; repo = pname; - rev = version; - hash = "sha256-6MWUkvZp5CYUWsbMGXM2gudjn5075j5FIuaNnCrgRNs="; + rev = "refs/tags/${version}"; + hash = "sha256-umtfbhN6sDR/rFr1LwmJ21Ph9bK1Qq43bmMVzGCPD5s="; }; nativeBuildInputs = [ @@ -93,6 +93,7 @@ let meta = with lib; { description = "CommonMark compliant Markdown formatter"; homepage = "https://mdformat.rtfd.io/"; + changelog = "https://github.com/executablebooks/mdformat/blob/${version}/docs/users/changelog.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab aldoborrero ]; mainProgram = "mdformat"; diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 9cae940ccc38..2cf9223978bd 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.110.1"; + version = "2.110.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-v2h/K1gat+nHGjn6a9r1BDMDAoJ/OtNctxHzV41gRkg="; + hash = "sha256-4+qP/eCd3xy0Q3Nrwbj2VpyNWqiKL82nrX7Od0yHToo="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 56d36ebdda56..2491ebb6b851 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.143"; + version = "2.1.144"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xyYD9oGrlK1kswQ7uiO3/gAJUnelvWv7ZHyzn/g5iCg="; + hash = "sha256-wugHG/ZfyfNgd2znDS7FXu34LsUVMcwDswFkh4lRIXo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 0c0b611fbb06..61022edb9f22 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pglast"; - version = "5.3"; + version = "5.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fiNd+11hqMHgzSMNT7fgne3pTeJ4nu5krA48LCgIaIQ="; + hash = "sha256-fyLvgaYHmTh9OaWXkuenKmNTHCVYFln/FbN+5u2a9+8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pgvector/default.nix b/pkgs/development/python-modules/pgvector/default.nix index 89f3974d4069..a521038ef03d 100644 --- a/pkgs/development/python-modules/pgvector/default.nix +++ b/pkgs/development/python-modules/pgvector/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pgvector"; - version = "0.2.0"; + version = "0.2.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "pgvector"; repo = "pgvector-python"; rev = "refs/tags/v${version}"; - hash = "sha256-VcV/WyDY1UN2TcuvNRQRIh5YIlewGQXf6fcTZihvftQ="; + hash = "sha256-Phe8iAdOCVp4wpLuLfO+fQMD1MOD47OEIQJ45rYQzug="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pynisher/default.nix b/pkgs/development/python-modules/pynisher/default.nix index 3d1c3a842208..6c7f1c0f59a2 100644 --- a/pkgs/development/python-modules/pynisher/default.nix +++ b/pkgs/development/python-modules/pynisher/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pynisher"; - version = "1.0.8"; + version = "1.0.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BTH34zv7OAaVKc20VASfv3QaxAt/Y14Dkd/PBo/V6vo="; + hash = "sha256-hlN5uUlgmcipQqmr22rB245oEXOUe5WB9jWo7MXXViE="; }; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module intended to limit a functions resources"; homepage = "https://github.com/automl/pynisher"; + changelog = "https://github.com/automl/pynisher/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix index c0900b664439..9e0de7f3915d 100644 --- a/pkgs/development/python-modules/pyomo/default.nix +++ b/pkgs/development/python-modules/pyomo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyomo"; - version = "6.6.1"; + version = "6.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { repo = "pyomo"; owner = "pyomo"; rev = "refs/tags/${version}"; - hash = "sha256-1FSu5ejFjjNTuvaFU/UqAI/817HkrOA1Hczq8gcPQGA="; + hash = "sha256-hh2sfWOUp3ac75NEuTrw3YkvS7hXpzJp39v6cfrhNiQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysnooz/default.nix b/pkgs/development/python-modules/pysnooz/default.nix index 24868e7a6b62..8d4adbb86d13 100644 --- a/pkgs/development/python-modules/pysnooz/default.nix +++ b/pkgs/development/python-modules/pysnooz/default.nix @@ -25,13 +25,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "AustinBrunkhorst"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-X7RjI4KytJI9raHAJHLygV3J4zHKuHk8Kq+3JfktPeg="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'transitions = "^0.8.11"' 'transitions = ">0.8.11"' \ + --replace 'transitions = "^0.8.11"' 'transitions = ">=0.8.11"' \ + --replace 'Events = "^0.4"' 'Events = ">=0.4"' \ --replace " --cov=pysnooz --cov-report=term-missing:skip-covered" "" ''; @@ -62,6 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to control SNOOZ white noise machines"; homepage = "https://github.com/AustinBrunkhorst/pysnooz"; + changelog = "https://github.com/AustinBrunkhorst/pysnooz/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pytest-testinfra/default.nix b/pkgs/development/python-modules/pytest-testinfra/default.nix index fe663c3f265b..df1ae78c8612 100644 --- a/pkgs/development/python-modules/pytest-testinfra/default.nix +++ b/pkgs/development/python-modules/pytest-testinfra/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "pytest-testinfra"; - version = "8.1.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; - hash = "sha256-m0CCi1j7esK/8pzBRlk0rfQ08Q3VoQj2BTXe5SZgpj0="; + hash = "sha256-UxGzaeBUaSD85GTDv5RbVevnWhJ1aPbWFelLiJE0AUk="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { ]; # markers don't get added when docker is not available (leads to warnings): - # https://github.com/pytest-dev/pytest-testinfra/blob/8.1.0/test/conftest.py#L228 + # https://github.com/pytest-dev/pytest-testinfra/blob/9.0.0/test/conftest.py#L223 preCheck = '' export HOME=$(mktemp -d) sed -i '54imarkers = \ diff --git a/pkgs/development/python-modules/radian/default.nix b/pkgs/development/python-modules/radian/default.nix index d8ffc2bff9ef..ab33203d7011 100644 --- a/pkgs/development/python-modules/radian/default.nix +++ b/pkgs/development/python-modules/radian/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "radian"; - version = "0.6.6"; + version = "0.6.7"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,13 +27,12 @@ buildPythonPackage rec { owner = "randy3k"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zA7R9UIB0hOWev10Y4oySIKeIxTOo0V6Q3Fxe+FeHSU="; + hash = "sha256-MEstbQj1dOcrukgDvMwL330L9INEZcIupebrSYMOrZk="; }; postPatch = '' substituteInPlace setup.py \ - --replace '"pytest-runner"' "" \ - --replace '0.3.39,<0.4.0' '0.3.39' + --replace '"pytest-runner"' "" ''; nativeBuildInputs = [ @@ -59,6 +58,8 @@ buildPythonPackage rec { git ]; + makeWrapperArgs = [ "--set R_HOME ${R}/lib/R" ]; + preCheck = '' export HOME=$TMPDIR export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${R}/lib/R/lib diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix index fb6a49ff6204..349544f1d035 100644 --- a/pkgs/development/python-modules/skytemple-files/default.nix +++ b/pkgs/development/python-modules/skytemple-files/default.nix @@ -28,13 +28,13 @@ buildPythonPackage rec { pname = "skytemple-files"; - version = "1.4.7"; + version = "1.5.4"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - hash = "sha256-SLRZ9ThrH2UWqfr5BbjJKDM/SRkCfMNK70XZT4+Ks7w="; + hash = "sha256-RB+Cp4mL0y59/l7yu0z3jefADHR9/h0rbTZLm7BvJ7k="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/skytemple-rust/default.nix b/pkgs/development/python-modules/skytemple-rust/default.nix index 47bbf831afda..ddf1866a1056 100644 --- a/pkgs/development/python-modules/skytemple-rust/default.nix +++ b/pkgs/development/python-modules/skytemple-rust/default.nix @@ -13,19 +13,19 @@ buildPythonPackage rec { pname = "skytemple-rust"; - version = "1.4.0.post0"; + version = "1.5.3"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - hash = "sha256-aw57B15sDbMcdNPD8MW+O7AdqSSqjlOcuXNSm10GdPM="; + hash = "sha256-Txx8kQNb3ODbaJXfuHERzPx4zGUqYXzy+jbLNaMyf+w="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-SvHrMr5k4afVdU5nvg+bcoHVmzHYyoOYqv7nOSVxRCE="; + hash = "sha256-KQA8dfHnuysx9EUySJXZ/52Hfq6AbALwkBp3B1WJJuc="; }; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; diff --git a/pkgs/development/python-modules/spdx-tools/default.nix b/pkgs/development/python-modules/spdx-tools/default.nix index 956eaa30b847..913a458ae0f3 100644 --- a/pkgs/development/python-modules/spdx-tools/default.nix +++ b/pkgs/development/python-modules/spdx-tools/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "spdx-tools"; - version = "0.8.0"; + version = "0.8.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "spdx"; repo = "tools-python"; rev = "refs/tags/v${version}"; - hash = "sha256-TMiaxapJuiLqm+x9K49MIzeWOE/CRAI+M1+9OeU0YvM="; + hash = "sha256-/iBy6i4J/IiJzfNdW6pN3VTE9PVED4ckoe4OBlw8wnI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index c3ad45ec13a6..4edb02182b11 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.34"; + version = "3.35"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RgdoPLsyz9TzxjkpBF6qAgqwIhxQNvm7QbeyW8dVzSM="; + hash = "sha256-j2/n+NEncs1c9FlHA6mNzQw3wP1oIN0gVBunS5/KNjo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index 98bd27072d16..761a14fbfd03 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -42,20 +42,21 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.185.1"; + version = "0.205.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "strawberry-graphql"; repo = "strawberry"; rev = "refs/tags/${version}"; - hash = "sha256-PwhTD1k2GOVf6ACNDY1atLLP1jjAF6eTDCE3eLUIpJA="; + hash = "sha256-58pBsTQM3t5rj4AywhMqmCUzUQB4BH9FAF7J3p6Qkok="; }; patches = [ (fetchpatch { + # https://github.com/strawberry-graphql/strawberry/pull/2199 name = "switch-to-poetry-core.patch"; url = "https://github.com/strawberry-graphql/strawberry/commit/710bb96f47c244e78fc54c921802bcdb48f5f421.patch"; hash = "sha256-ekUZ2hDPCqwXp9n0YjBikwSkhCmVKUzQk7LrPECcD7Y="; @@ -64,7 +65,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace " --emoji --mypy-ini-file=mypy.ini --benchmark-disable" "" \ + --replace "--emoji --mypy-ini-file=mypy.ini" "" \ ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/troposphere/default.nix b/pkgs/development/python-modules/troposphere/default.nix index 567c2dec60e2..39c71da17761 100644 --- a/pkgs/development/python-modules/troposphere/default.nix +++ b/pkgs/development/python-modules/troposphere/default.nix @@ -1,18 +1,16 @@ { lib +, awacs , buildPythonPackage +, cfn-flip , fetchFromGitHub , pythonOlder -, python - - # python dependencies -, awacs -, cfn-flip , typing-extensions +, unittestCheckHook }: buildPythonPackage rec { pname = "troposphere"; - version = "4.3.2"; + version = "4.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,34 +19,35 @@ buildPythonPackage rec { owner = "cloudtools"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8vIpwZBUdU9gD1Ya0+L1phMDMcAABtuyRx4quDfQWGA="; + hash = "sha256-ecRpp8XsP/iv4G8m85qcGJXHXH4CPdgBO8c0IZU56wU="; }; propagatedBuildInputs = [ cfn-flip - ] ++ lib.lists.optionals (pythonOlder "3.8") [ + ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; nativeCheckInputs = [ awacs + unittestCheckHook ]; passthru.optional-dependencies = { - policy = [ awacs ]; + policy = [ + awacs + ]; }; - checkPhase = '' - ${python.interpreter} -m unittest discover - ''; - - pythonImportsCheck = [ "troposphere" ]; + pythonImportsCheck = [ + "troposphere" + ]; meta = with lib; { description = "Library to create AWS CloudFormation descriptions"; - maintainers = with maintainers; [ jlesquembre ]; - license = licenses.bsd2; homepage = "https://github.com/cloudtools/troposphere"; changelog = "https://github.com/cloudtools/troposphere/blob/${version}/CHANGELOG.rst"; + license = licenses.bsd2; + maintainers = with maintainers; [ jlesquembre ]; }; } diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index fadf2ef3818c..ef2678e88b31 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "8.6.0"; + version = "8.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-ATspn/cY9DJahcsesnzwDOCEKYoUbqSoeOR3+kLou0s="; + hash = "sha256-wzsAHW0OlorLVI6nnDjv8WP1dpzyrmtE4OfwzFnZOH4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-beautifulsoup4/default.nix b/pkgs/development/python-modules/types-beautifulsoup4/default.nix new file mode 100644 index 000000000000..00ebb5123e3c --- /dev/null +++ b/pkgs/development/python-modules/types-beautifulsoup4/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, types-html5lib +}: + +buildPythonPackage rec { + pname = "types-beautifulsoup4"; + version = "4.12.0.6"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-BFqyhdPlQBhuFhM2EvQ/Z+MfkQ5tdXiQa0OgrY+BE0c="; + }; + + propagatedBuildInputs = [ + types-html5lib + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "bs4-stubs" + ]; + + meta = with lib; { + description = "Typing stubs for beautifulsoup4"; + homepage = "https://pypi.org/project/types-beautifulsoup4/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/types-html5lib/default.nix b/pkgs/development/python-modules/types-html5lib/default.nix new file mode 100644 index 000000000000..843b1a108c85 --- /dev/null +++ b/pkgs/development/python-modules/types-html5lib/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-html5lib"; + version = "1.1.11.15"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-gOGiBi0io6/+XCjZfaML/786B205PID8bxZxIWwb1JI="; + }; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "html5lib-stubs" + ]; + + meta = with lib; { + description = "Typing stubs for html5lib"; + homepage = "https://pypi.org/project/types-html5lib/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index 8275ed31f944..adbf50aa924b 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.6.0.4"; + version = "4.6.0.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-xHWp089z3WlsOIfTBkQyP8VvXgCvlhUQNbO1tSh1ybM="; + hash = "sha256-XxedEL08qZWoE0qvzd/D4S1SsghDfEUp7yfmisswHzg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/vsure/default.nix b/pkgs/development/python-modules/vsure/default.nix index 709271d0905f..f8242d34f4c2 100644 --- a/pkgs/development/python-modules/vsure/default.nix +++ b/pkgs/development/python-modules/vsure/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "vsure"; - version = "2.6.5"; + version = "2.6.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2w1D0380ljgRa5NSPAUlUPFTmGzjl79hyLwirmuHmGo="; + hash = "sha256-ecrBvKOhW3znVoXHQeKKW4o/hbA4fLhxJrWZObwtki8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/watchfiles/default.nix b/pkgs/development/python-modules/watchfiles/default.nix index 3f75354376dd..2d2b9aa649ca 100644 --- a/pkgs/development/python-modules/watchfiles/default.nix +++ b/pkgs/development/python-modules/watchfiles/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "watchfiles"; - version = "0.19.0"; + version = "0.20.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,13 +28,13 @@ buildPythonPackage rec { owner = "samuelcolvin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-NmmeoaIfFMNKCcjH6tPnkpflkN35bKlT76MqF9W8LBc="; + hash = "sha256-eoKF6uBHgML63DrDlC1zPfDu/mAMoaevttwqHLCKh+M="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-9ruk3PMcWNLOIGth5fo91/miyF17lgERWL3F4y4as18="; + hash = "sha256-4XqR6pZqPAftZoJqZf+iZWp0c8xv00MDJDDETiGGEDo="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/zimports/default.nix b/pkgs/development/python-modules/zimports/default.nix index ee9d683c8642..22cd50c9189e 100644 --- a/pkgs/development/python-modules/zimports/default.nix +++ b/pkgs/development/python-modules/zimports/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zimports"; - version = "0.6.0"; + version = "0.6.1"; format = "setuptools"; # upstream technically support 3.7 through 3.9, but 3.10 happens to work while 3.11 breaks with an import error @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "sqlalchemyorg"; repo = "zimports"; rev = "refs/tags/v${version}"; - hash = "sha256-qm5mA8pCSLbkupGBo+ppHSW6uy1j/FfV3idvGQGhjqU="; + hash = "sha256-+sDvl8z0O0cZyS1oZgt924hlOkYeHiStpXL9y9+JZ5I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/r-modules/wrapper-radian.nix b/pkgs/development/r-modules/wrapper-radian.nix index 898ab1999650..cdac14d3300b 100644 --- a/pkgs/development/r-modules/wrapper-radian.nix +++ b/pkgs/development/r-modules/wrapper-radian.nix @@ -26,8 +26,7 @@ runCommand (radian.name + "-wrapper") { }; } ('' makeWrapper "${radian}/bin/radian" "$out/bin/radian" \ - --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE" \ - --set "R_HOME" "${R}/lib/R" + --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE" '' + lib.optionalString wrapR '' cd ${R}/bin for exe in *; do diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index 3ab48462dbbc..0d94e4e2f6c3 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.20.0"; + version = "10.20.1"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "v${version}"; - sha256 = "sha256-0NUOOJu3iuKBlIi4z1Jv8e00BTsgk0dpLOgfpIKSc2A="; + sha256 = "sha256-pfbSNFKZubgebx90zL5sVva36wXS+0NQvvMxPI8kV3Y="; }; subPackages = [ "." ]; @@ -23,7 +23,7 @@ buildGoModule rec { meta = with lib; { broken = stdenv.isDarwin; - maintainers = with maintainers; [ colemickens ]; + maintainers = with maintainers; [ colemickens kashw2 ]; license = licenses.mit; description = "The new Azure Storage data transfer utility - AzCopy v10"; }; diff --git a/pkgs/development/tools/database/litefs/default.nix b/pkgs/development/tools/database/litefs/default.nix index 660d06c63661..c12cde6af918 100644 --- a/pkgs/development/tools/database/litefs/default.nix +++ b/pkgs/development/tools/database/litefs/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "litefs"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "superfly"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EPOOQSjhhUgUcO+edcZIPomd6g/BI9Ee5MsmylKq1Sk="; + sha256 = "sha256-gTXIQVnNyVn2UqigozvEPaPm3XoqHd6E0RZnZS4bP3g="; }; vendorHash = "sha256-4e1tAAXM2EYuqe1AbN1wng/bq1BP7MSOV6woeKjc3x4="; diff --git a/pkgs/development/tools/gops/default.nix b/pkgs/development/tools/gops/default.nix index a74d0a9d08c9..6b191d00bf3b 100644 --- a/pkgs/development/tools/gops/default.nix +++ b/pkgs/development/tools/gops/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gops"; - version = "0.3.27"; + version = "0.3.28"; src = fetchFromGitHub { owner = "google"; repo = "gops"; rev = "v${version}"; - sha256 = "sha256-F1/1wMO2lQ4v2+r3FPzaxCkL2lW+COgxy4fjv6+p7AY="; + sha256 = "sha256-HNM487WSfNWNF31ccDIdotsEG8Mj2C7V85UI47a9drU="; }; - vendorHash = "sha256-ea+1AV0WzaQiDHyAUsm0rd/bznehG9UtmB1ubgHrOGM="; + vendorHash = "sha256-ptC2G7cXcAjthJcAXvuBqI2ZpPuSMBqzO+gJiyaAUP0="; preCheck = "export HOME=$(mktemp -d)"; diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index 82363d0ca515..83f25c44ab25 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "7.0.2"; + version = "7.0.3"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "jql-v${version}"; - hash = "sha256-lYm+zgZkt/iVJgehJM44VqWbcR4kqt8rUSEsnz07tbU="; + hash = "sha256-9VQtPYAw/MtYZxfosWPQOy29YjvzVGP/mhje42dAb8U="; }; - cargoHash = "sha256-Gav89ub4ccv/lCCqNYn9NvK4Q8udlu6YaZPhouHOVss="; + cargoHash = "sha256-erGqHW3LyXTcy6MZH24F7OKknissH4es2VmWdEFwe0Y="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; @@ -22,5 +22,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/yamafaktory/jql/releases/tag/${src.rev}"; license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ akshgpt7 figsoda ]; + mainProgram = "jql"; }; } diff --git a/pkgs/development/tools/language-servers/lua-language-server/default.nix b/pkgs/development/tools/language-servers/lua-language-server/default.nix index 9cf575ec5480..faf662981068 100644 --- a/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lua-language-server"; - version = "3.6.25"; + version = "3.7.0"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-fERsqOjuZSIPpTEAQbKZ/ZYzQENxJi8Gibb6Oi073pA="; + sha256 = "sha256-kUtiMNwJJN7ZAktSC7tZriAcTDFhvcfSwBE6KFzceMg="; fetchSubmodules = true; }; @@ -81,6 +81,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/LuaLS/lua-language-server/blob/${version}/changelog.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda sei40kr ]; + mainProgram = "lua-language-server"; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/tools/language-servers/millet/Cargo.lock b/pkgs/development/tools/language-servers/millet/Cargo.lock index e9208f2e315b..de07ef3606fe 100644 --- a/pkgs/development/tools/language-servers/millet/Cargo.lock +++ b/pkgs/development/tools/language-servers/millet/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -19,16 +19,16 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] [[package]] name = "analysis" -version = "0.12.9" +version = "0.13.0" dependencies = [ "config", "diagnostic", @@ -54,9 +54,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "autocfg" @@ -66,9 +66,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -97,15 +97,18 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -115,7 +118,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chain-map" -version = "0.12.9" +version = "0.13.0" dependencies = [ "fast-hash", "str-util", @@ -124,11 +127,11 @@ dependencies = [ [[package]] name = "char-name" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" [[package]] name = "cm-syntax" -version = "0.12.9" +version = "0.13.0" dependencies = [ "lex-util", "paths", @@ -140,7 +143,7 @@ dependencies = [ [[package]] name = "code-h2-md-map" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "fast-hash", ] @@ -157,7 +160,7 @@ dependencies = [ [[package]] name = "config" -version = "0.12.9" +version = "0.13.0" dependencies = [ "fast-hash", "serde", @@ -185,7 +188,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cov-mark" -version = "0.12.9" +version = "0.13.0" dependencies = [ "fast-hash", "once_cell", @@ -222,7 +225,7 @@ dependencies = [ [[package]] name = "diagnostic" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" [[package]] name = "diff" @@ -239,7 +242,7 @@ checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1" [[package]] name = "elapsed" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "log", ] @@ -271,9 +274,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", @@ -293,7 +296,7 @@ dependencies = [ [[package]] name = "event-parse" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "drop_bomb", "rowan", @@ -303,16 +306,16 @@ dependencies = [ [[package]] name = "fast-hash" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "rustc-hash", ] [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -321,7 +324,7 @@ dependencies = [ [[package]] name = "fmt-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" [[package]] name = "form_urlencoded" @@ -343,9 +346,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "glob" @@ -380,7 +383,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "identifier-case" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" [[package]] name = "idna" @@ -395,7 +398,7 @@ dependencies = [ [[package]] name = "idx" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "nohash-hasher", ] @@ -412,7 +415,7 @@ dependencies = [ [[package]] name = "input" -version = "0.12.9" +version = "0.13.0" dependencies = [ "cm-syntax", "config", @@ -460,7 +463,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306" [[package]] name = "lang-srv" -version = "0.12.9" +version = "0.13.0" dependencies = [ "analysis", "anyhow", @@ -488,7 +491,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lex-util" -version = "0.12.9" +version = "0.13.0" [[package]] name = "libc" @@ -508,21 +511,21 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lsp-server" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ea9ae5a5082ca3b6ae824fc7666cd206b99168a4d4c769ad8fe9cc740df6a6" +checksum = "b52dccdf3302eefab8c8a1273047f0a3c3dca4b527c8458d00c09484c8371928" dependencies = [ "crossbeam-channel", "log", @@ -532,9 +535,9 @@ dependencies = [ [[package]] name = "lsp-types" -version = "0.93.2" +version = "0.94.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be6e9c7e2d18f651974370d7aff703f9513e0df6e464fd795660edc77e6ca51" +checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1" dependencies = [ "bitflags 1.3.2", "serde", @@ -560,7 +563,7 @@ dependencies = [ [[package]] name = "millet-cli" -version = "0.12.9" +version = "0.13.0" dependencies = [ "analysis", "codespan-reporting", @@ -578,7 +581,7 @@ dependencies = [ [[package]] name = "millet-ls" -version = "0.12.9" +version = "0.13.0" dependencies = [ "anyhow", "env_logger", @@ -598,7 +601,7 @@ dependencies = [ [[package]] name = "mlb-hir" -version = "0.12.9" +version = "0.13.0" dependencies = [ "fast-hash", "paths", @@ -609,7 +612,7 @@ dependencies = [ [[package]] name = "mlb-statics" -version = "0.12.9" +version = "0.13.0" dependencies = [ "config", "diagnostic", @@ -633,7 +636,7 @@ dependencies = [ [[package]] name = "mlb-syntax" -version = "0.12.9" +version = "0.13.0" dependencies = [ "lex-util", "paths", @@ -651,9 +654,9 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -672,18 +675,18 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] [[package]] name = "object" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" dependencies = [ "memchr", ] @@ -696,7 +699,7 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "panic-hook" -version = "0.12.9" +version = "0.13.0" dependencies = [ "better-panic", ] @@ -704,7 +707,7 @@ dependencies = [ [[package]] name = "paths" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "fast-hash", "glob", @@ -716,7 +719,7 @@ dependencies = [ [[package]] name = "pattern-match" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "fast-hash", ] @@ -766,18 +769,18 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.31" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] [[package]] name = "regex" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ "aho-corasick", "memchr", @@ -787,9 +790,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" dependencies = [ "aho-corasick", "memchr", @@ -829,11 +832,11 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.4" +version = "0.38.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "errno", "libc", "linux-raw-sys", @@ -848,18 +851,18 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "serde" -version = "1.0.171" +version = "1.0.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "9f5db24220c009de9bd45e69fb2938f4b6d2df856aa9304ce377b3180f83b7c1" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "5ad697f7e0b65af4983a4ce8f56ed5b357e8d3c36651bf6a7e13639c17b8e670" dependencies = [ "proc-macro2", "quote", @@ -868,9 +871,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.103" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -879,9 +882,9 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.14" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d89a8107374290037607734c0b73a85db7ed80cae314b3c5791f192a496e731" +checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", @@ -899,7 +902,7 @@ dependencies = [ [[package]] name = "slash-var-path" -version = "0.12.9" +version = "0.13.0" dependencies = [ "fast-hash", "str-util", @@ -907,14 +910,14 @@ dependencies = [ [[package]] name = "sml-comment" -version = "0.12.9" +version = "0.13.0" dependencies = [ "sml-syntax", ] [[package]] name = "sml-dynamics" -version = "0.12.9" +version = "0.13.0" dependencies = [ "fast-hash", "fmt-util", @@ -925,7 +928,7 @@ dependencies = [ [[package]] name = "sml-dynamics-tests" -version = "0.12.9" +version = "0.13.0" dependencies = [ "config", "pretty_assertions", @@ -941,7 +944,7 @@ dependencies = [ [[package]] name = "sml-file-syntax" -version = "0.12.9" +version = "0.13.0" dependencies = [ "config", "elapsed", @@ -955,7 +958,7 @@ dependencies = [ [[package]] name = "sml-fixity" -version = "0.12.9" +version = "0.13.0" dependencies = [ "fast-hash", "once_cell", @@ -964,7 +967,7 @@ dependencies = [ [[package]] name = "sml-hir" -version = "0.12.9" +version = "0.13.0" dependencies = [ "la-arena", "sml-lab", @@ -975,7 +978,7 @@ dependencies = [ [[package]] name = "sml-hir-lower" -version = "0.12.9" +version = "0.13.0" dependencies = [ "config", "cov-mark", @@ -990,14 +993,14 @@ dependencies = [ [[package]] name = "sml-lab" -version = "0.12.9" +version = "0.13.0" dependencies = [ "str-util", ] [[package]] name = "sml-lex" -version = "0.12.9" +version = "0.13.0" dependencies = [ "cov-mark", "diagnostic", @@ -1008,11 +1011,11 @@ dependencies = [ [[package]] name = "sml-libs" version = "0.1.0" -source = "git+https://github.com/azdavis/sml-libs.git#3948485e5bf5649e50271caf3e58af01200af5b0" +source = "git+https://github.com/azdavis/sml-libs.git#0d94e3ce13f2a489dff86151f74b26074affec2a" [[package]] name = "sml-naive-fmt" -version = "0.12.9" +version = "0.13.0" dependencies = [ "fast-hash", "sml-comment", @@ -1021,11 +1024,11 @@ dependencies = [ [[package]] name = "sml-namespace" -version = "0.12.9" +version = "0.13.0" [[package]] name = "sml-parse" -version = "0.12.9" +version = "0.13.0" dependencies = [ "diagnostic", "event-parse", @@ -1037,14 +1040,14 @@ dependencies = [ [[package]] name = "sml-path" -version = "0.12.9" +version = "0.13.0" dependencies = [ "str-util", ] [[package]] name = "sml-scon" -version = "0.12.9" +version = "0.13.0" dependencies = [ "num-bigint", "num-traits", @@ -1053,7 +1056,7 @@ dependencies = [ [[package]] name = "sml-statics" -version = "0.12.9" +version = "0.13.0" dependencies = [ "chain-map", "config", @@ -1076,7 +1079,7 @@ dependencies = [ [[package]] name = "sml-statics-types" -version = "0.12.9" +version = "0.13.0" dependencies = [ "chain-map", "code-h2-md-map", @@ -1095,7 +1098,7 @@ dependencies = [ [[package]] name = "sml-symbol-kind" -version = "0.12.9" +version = "0.13.0" dependencies = [ "sml-namespace", "sml-statics-types", @@ -1103,7 +1106,7 @@ dependencies = [ [[package]] name = "sml-syntax" -version = "0.12.9" +version = "0.13.0" dependencies = [ "code-h2-md-map", "fast-hash", @@ -1114,7 +1117,7 @@ dependencies = [ [[package]] name = "sml-ty-var-scope" -version = "0.12.9" +version = "0.13.0" dependencies = [ "fast-hash", "sml-hir", @@ -1132,16 +1135,16 @@ dependencies = [ [[package]] name = "str-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "smol_str", ] [[package]] name = "syn" -version = "2.0.26" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -1151,7 +1154,7 @@ dependencies = [ [[package]] name = "syntax-gen" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "char-name", "fast-hash", @@ -1172,7 +1175,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.12.9" +version = "0.13.0" dependencies = [ "analysis", "cm-syntax", @@ -1198,7 +1201,7 @@ dependencies = [ [[package]] name = "text-pos" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "line-index", "text-size-util", @@ -1213,7 +1216,7 @@ checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233" [[package]] name = "text-size-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" dependencies = [ "text-size", ] @@ -1236,7 +1239,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "token" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" [[package]] name = "toml" @@ -1275,7 +1278,7 @@ dependencies = [ [[package]] name = "topo-sort" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" [[package]] name = "ungrammar" @@ -1285,9 +1288,9 @@ checksum = "a3e5df347f0bf3ec1d670aad6ca5c6a1859cd9ea61d2113125794654ccced68f" [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] @@ -1322,7 +1325,7 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "uniq" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e17b58328b245410fc23f" +source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" [[package]] name = "url" @@ -1388,7 +1391,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -1408,17 +1411,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -1429,9 +1432,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -1441,9 +1444,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -1453,9 +1456,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -1465,9 +1468,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -1477,9 +1480,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -1489,9 +1492,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -1501,22 +1504,22 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.0" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] [[package]] name = "xtask" -version = "0.12.9" +version = "0.13.0" dependencies = [ "anyhow", "flate2", diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index 8b1fc8c47745..95b7a2bc68fd 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.12.9"; + version = "0.13.0"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-PGB5sgYxiXYTj6O9SY/druDpNCf4O8HsivT8zhJM62M="; + hash = "sha256-q7p3TB7YsfROW+6MCbcGCPTIekEgqQBi0MUHkIuhtHc="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "char-name-0.1.0" = "sha256-mAzrBqaESZhLNozdgrGaRbOzwT+5j9nw9rRot9Xg1Ts="; - "sml-libs-0.1.0" = "sha256-q3n4UfDcpDaN8v9UewAz2G26NeDDsZFuczS7N6nkl5Q="; + "char-name-0.1.0" = "sha256-uWKoRLEwbjndrtu30H0zysHLIXBqWa0SnYm6Iy1hUko="; + "sml-libs-0.1.0" = "sha256-zQrhH24XlA9SeQ+sVzaVwJwrm80TRIjFq99Vay7QEN8="; }; }; diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 43afba18773d..d3a3d933c715 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "4.0.3"; + version = "4.0.4"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-xwBeg6A39MrnQTfesfv+vD0QSIRq9CWvF4vwqf/N730="; + sha256 = "sha256-jJIHEV3Sdu1SbdF6ewohGeN9L1ubRiARMWyP8zyJSv0="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/misc/ast-grep/default.nix b/pkgs/development/tools/misc/ast-grep/default.nix index 40924e195de5..0b0b7e47ba93 100644 --- a/pkgs/development/tools/misc/ast-grep/default.nix +++ b/pkgs/development/tools/misc/ast-grep/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; rev = version; - hash = "sha256-chx37D0y05nIlXmP4SsWvsO+36BV7drTYpJCgMIl5xA="; + hash = "sha256-1ThEJ8VEcXNScY4zmmXz7BVYs6irE1h9HDxkVvmVq1k="; }; - cargoHash = "sha256-VfuBee2F2FxhcTE1JwosFgQI9+stzDuOHfpLv25rcNw="; + cargoHash = "sha256-3myUFgKktvD9S0Bp7ixsZb59p3iDwmiEKUFD7wB+7IM="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/development/tools/misc/dart-sass/default.nix b/pkgs/development/tools/misc/dart-sass/default.nix index e856e333b33a..8783ca578a23 100644 --- a/pkgs/development/tools/misc/dart-sass/default.nix +++ b/pkgs/development/tools/misc/dart-sass/default.nix @@ -19,17 +19,17 @@ let in buildDartApplication rec { pname = "dart-sass"; - version = "1.65.1"; + version = "1.66.1"; src = fetchFromGitHub { owner = "sass"; repo = pname; rev = version; - hash = "sha256-q6UY+A7JFDYb9hzvr2SYI9GfkY9bg49fQkUM7gHKOBU="; + hash = "sha256-2bqYoWG8xGh7HGZyCPLNz/ZWXH29Be12YfYgGTCIVx8="; }; pubspecLockFile = ./pubspec.lock; - vendorHash = "sha256-nIiffqM5HwJmORdONz+RADAPTISrz/3/HxK4aOSl5cM="; + vendorHash = "sha256-YWxVpwuo97i00/F4WOn2AWiRFYSFIWbEbmxDF77gWsE="; nativeBuildInputs = [ buf diff --git a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix index 6dd504a3cf9e..5f6113343f73 100644 --- a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix +++ b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "nxpmicro-mfgtools"; - version = "1.5.11"; + version = "1.5.21"; src = fetchFromGitHub { - owner = "NXPmicro"; + owner = "nxp-imx"; repo = "mfgtools"; rev = "uuu_${version}"; - hash = "sha256-RD0haw0C89uvTlLHtvlv1VwU4Jw2U19Caiq+BSfB4hU="; + sha256 = "sha256-XVvGsHltlA3h9hd3C88G3s2wIZ1EVM6DmvdiwD82vTw="; }; nativeBuildInputs = [ cmake pkg-config installShellFiles ]; diff --git a/pkgs/development/tools/misc/runme/default.nix b/pkgs/development/tools/misc/runme/default.nix index fc61e0ae376f..dfae5be83c53 100644 --- a/pkgs/development/tools/misc/runme/default.nix +++ b/pkgs/development/tools/misc/runme/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "runme"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "stateful"; repo = "runme"; rev = "v${version}"; - hash = "sha256-BoPNIaYxK4VyafNWAVDonwTfpqF1N3Ggq5GF6A7DhF0="; + hash = "sha256-3NCD9kagcxW8Ahet20imFYqo3G7nkR1iPM0C5tQX72o="; }; vendorHash = "sha256-sGk2K0I9onGFpDwboRugNHjFictisY4Q0NTNnOT3BW4="; diff --git a/pkgs/development/tools/misc/slint-lsp/default.nix b/pkgs/development/tools/misc/slint-lsp/default.nix index 58c3460bf556..028f2f8d5029 100644 --- a/pkgs/development/tools/misc/slint-lsp/default.nix +++ b/pkgs/development/tools/misc/slint-lsp/default.nix @@ -25,14 +25,14 @@ let in rustPlatform.buildRustPackage rec { pname = "slint-lsp"; - version = "1.1.0"; + version = "1.1.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-YVOxzxkvvW2pFDsYdDM2uiK6kIam+EP/BOF+Vs+RM2g="; + sha256 = "sha256-ENv17Az6yzUwD39HDfoD7Bmvs6LHjVp85PaYkTw6jW0="; }; - cargoHash = "sha256-Nt8t4nyfwxyX8mugQy4La3Y+nertJg9MFE1ROePISSg="; + cargoHash = "sha256-wL46QhY3Cq2KFLETPRhUWb77o1vNrRA2w1NBAtBc0yo="; nativeBuildInputs = [ cmake pkg-config fontconfig ]; buildInputs = rpathLibs ++ [ xorg.libxcb.dev ] diff --git a/pkgs/development/tools/misc/src-cli/default.nix b/pkgs/development/tools/misc/src-cli/default.nix index f983d82846b6..d8d3ffd4bf53 100644 --- a/pkgs/development/tools/misc/src-cli/default.nix +++ b/pkgs/development/tools/misc/src-cli/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "src-cli"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "src-cli"; rev = version; - hash = "sha256-r9ugSs9I5K7yuAtOTWCKr3dHGBtmTQVehKqZ3ago1U4="; + hash = "sha256-byfmZQDYn76/0K/ByKePXF+eWVZNCnAqu5k6UN7Iijg="; }; - vendorHash = "sha256-A533f+FfEzU2TlNwHkD8gjeQYRATz85cCCmqLdl9290="; + vendorHash = "sha256-DASjCyOY9+USRYrnIS+Li4zhBnZNoyxUgN9LqhIAMh8="; subPackages = [ "cmd/src" diff --git a/pkgs/development/tools/misc/typical/default.nix b/pkgs/development/tools/misc/typical/default.nix index 12016efc53de..7944f14ca4d6 100644 --- a/pkgs/development/tools/misc/typical/default.nix +++ b/pkgs/development/tools/misc/typical/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "typical"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "stepchowfun"; repo = "typical"; rev = "v${version}"; - hash = "sha256-pXLOtCzdI6KspNzg1R7Zc97Dd7dX7ZzxvlvKprkLF2I="; + hash = "sha256-UoTzgYxLdlWefNLeege7+tlqWh4uzotO5EbcyqvU2Xo="; }; - cargoHash = "sha256-ckW2Hc5BRqtvzZRUAlf7Vy06cgSTY6nv2ompSDNzpi4="; + cargoHash = "sha256-GIyvwByzNKFvEdVSLo2cxuQ7JvKRFezhyKQrWjbj7Kk="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix index 913755b64812..af5937e328d0 100644 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.31.3"; + version = "0.32.0"; src = fetchCrate { inherit pname version; - hash = "sha256-oSjfNbId5jEHeLiJ3FMoNqwLZg6iyr3ZqpcfKvEnpac="; + hash = "sha256-etEwMmfwyOTHRb/UfkcHvmnLVVqeSagWJ5HjuJ6gZVo="; }; - cargoHash = "sha256-VHHEQafQfRqmdscuWpN+NdcfEc1sTt+lKLg26aM9QQE="; + cargoHash = "sha256-7GyPjEit3FEjnegLnZt9TMLBI3BtzcDssrJPj60gpTo="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix index b340dc338a27..3c83dd5437a5 100644 --- a/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.28"; + version = "1.0.29"; src = fetchCrate { inherit pname version; - sha256 = "sha256-vPOQC/bpjmjQzHZZHVMTil2XqIbKhxb7461dWCgySQk="; + sha256 = "sha256-SCxigQ6jhT+r6ixgCGwWDtvU8WUJ+5eWYe8DIWPBWhY="; }; - cargoSha256 = "sha256-SL9fIZpMG+XfNHV0xEQyrm13MphIWv6I/cFUOVrA6bA="; + cargoSha256 = "sha256-ZX2T+wKIgYJqOK6118wmsMBKigtJvPqJ2hVtyh23zUk="; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ DiskArbitration diff --git a/pkgs/development/tools/rust/genemichaels/Cargo.lock b/pkgs/development/tools/rust/genemichaels/Cargo.lock new file mode 100644 index 000000000000..56b9df484a6d --- /dev/null +++ b/pkgs/development/tools/rust/genemichaels/Cargo.lock @@ -0,0 +1,553 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "anyhow" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "cargo-manifest" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ce38d2d1efbe0e7180766a872570bc07cd5430a42e713b01006d4afa89912fe" +dependencies = [ + "serde", + "toml", +] + +[[package]] +name = "cc" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec7a4128863c188deefe750ac1d1dfe66c236909f845af04beed823638dc1b2" +dependencies = [ + "bitflags", + "clap_derive", + "clap_lex", + "is-terminal", + "once_cell", + "strsim", + "termcolor", +] + +[[package]] +name = "clap_derive" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn", +] + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "genemichaels" +version = "0.1.21" +dependencies = [ + "anyhow", + "cargo-manifest", + "clap", + "derive_more", + "markdown", + "proc-macro2", + "quote", + "structre", + "syn", + "threadpool", + "walkdir", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "is-terminal" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" +dependencies = [ + "hermit-abi", + "io-lifetimes", + "rustix", + "windows-sys", +] + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "litrs" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9275e0933cf8bb20f008924c0cb07a0692fe54d8064996520bf998de9eb79aa" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "markdown" +version = "1.0.0-alpha.5" +source = "git+https://github.com/wooorm/markdown-rs?rev=af202d3f0ea24e0a957b02a6f9fb23c6c3b4afe7#af202d3f0ea24e0a957b02a6f9fb23c6c3b4afe7" +dependencies = [ + "log", + "unicode-id", +] + +[[package]] +name = "num_cpus" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "once_cell" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" + +[[package]] +name = "os_str_bytes" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "regex" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.36.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "semver" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" + +[[package]] +name = "serde" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "structre" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31eab0dcebb0d631c93629c0da9fdce1448123aa15e5e4c08fcd71d4f4fd5f4" +dependencies = [ + "anyhow", + "once_cell", + "regex", + "structre_proc_macros", +] + +[[package]] +name = "structre_proc_macros" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66e7698a9d57b3a475ce1d6cc37b1be9ee8ed188ec596603c863c06c9e06cf7e" +dependencies = [ + "litrs", + "proc-macro2", + "quote", + "regex-syntax", + "syn", +] + +[[package]] +name = "syn" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + +[[package]] +name = "toml" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" +dependencies = [ + "indexmap", + "serde", +] + +[[package]] +name = "unicode-id" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d70b6494226b36008c8366c288d77190b3fad2eb4c10533139c1c1f461127f1a" + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", + "winapi-util", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" diff --git a/pkgs/development/tools/rust/genemichaels/default.nix b/pkgs/development/tools/rust/genemichaels/default.nix new file mode 100644 index 000000000000..673519aeabc4 --- /dev/null +++ b/pkgs/development/tools/rust/genemichaels/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "genemichaels"; + version = "0.1.21"; + src = fetchFromGitHub { + owner = "andrewbaxter"; + repo = pname; + rev = "158bb8eb705b073d84562554c1a6a63eedd44c6b"; + hash = "sha256-rAJYukxptasexZzwWgtGlUbHhyyI6OJvSzVxGLBO9vM="; + }; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes."markdown-1.0.0-alpha.5" = "sha256-pjIKzXvRKoMfFVIyIXdm+29vvUzCHiJ0rrZgr4K+Ih8="; + }; + meta = { + description = "Even formats macros"; + homepage = "https://github.com/andrewbaxter/genemichaels"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.anselmschueler ]; + }; +} diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix index d64da750c407..51b10de9c237 100644 --- a/pkgs/development/tools/twilio-cli/default.nix +++ b/pkgs/development/tools/twilio-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.12.0"; + version = "5.13.0"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-K8SMUT2f8pgxCP5JGFyo/gLm60t0OeCt/1fYAw2HQX0="; + sha256 = "sha256-WfaXYNaNBMcOyQshJkMgzGSmID0tmZ0TRN6N3lR275Q="; }; buildInputs = [ nodejs ]; diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 7b9ea612ab37..cdb66d46caac 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -11,7 +11,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "0.7.3"; + version = "0.8.0"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -35,19 +35,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-9gs5PIbYxhhUC+lw/iEIhjdMIUYVnhP7oYrRqmE3HcU="; + hash = "sha256-fJwzGgPzBQeV80Btl16N8zDnmcWq60EUbs0IkpLLgtA="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-CFio1bgsgND54BrklkCVjfDvMDFxpYe1h77nGMOJdsc="; + hash = "sha256-C/JlybeZ1daTBWCAtKcxmN90QSDvII+YuX5/UU/aTL4="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-j6NpHAqSBRe2Wa4ztA1Ao4JYTKTEIwlYMCMMICKqZv0="; + hash = "sha256-4VZ5VgwtKQgAoky0zWDjEV3Nk5nMnD018Q2kJYCMc9c="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-05Duhv2WrYXWS6mKI3zB5QiIlitsysXwmuy+9XHBB9M="; + hash = "sha256-kzlxhUegVmra3zAyF/0KP2Nb9+uIV/UhwlnN2PMenS8="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/games/path-of-building/default.nix b/pkgs/games/path-of-building/default.nix index f08f4de54bbf..e798dbde6db8 100644 --- a/pkgs/games/path-of-building/default.nix +++ b/pkgs/games/path-of-building/default.nix @@ -2,13 +2,13 @@ let data = stdenv.mkDerivation(finalAttrs: { pname = "path-of-building-data"; - version = "2.32.2"; + version = "2.33.1"; src = fetchFromGitHub { owner = "PathOfBuildingCommunity"; repo = "PathOfBuilding"; rev = "v${finalAttrs.version}"; - hash = "sha256-1JwnKx5ohwFGdPlgaqXwTIPcfXmH+2GJRBbQhF46mTY="; + hash = "sha256-nnASvWApp3BjUPa+i7cvMJnTiD8oXtZTU6OjryFxaBM="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/misc/vencord/default.nix b/pkgs/misc/vencord/default.nix index 99d11b06976f..73a4b2cf5ea2 100644 --- a/pkgs/misc/vencord/default.nix +++ b/pkgs/misc/vencord/default.nix @@ -1,20 +1,24 @@ { buildNpmPackage , fetchFromGitHub +, fetchpatch2 , lib -, substituteAll , esbuild , buildGoModule , buildWebExtension ? false }: +let + version = "1.4.5"; + gitHash = "98a03c8"; +in buildNpmPackage rec { pname = "vencord"; - version = "1.3.4"; + inherit version; src = fetchFromGitHub { owner = "Vendicated"; repo = "Vencord"; rev = "v${version}"; - sha256 = "sha256-r+VgxXwsBOfMggcVlr5q1/ONfp13CpX4ssrLQtmdLe8="; + sha256 = "sha256-ZoHOCl0j+RBSl2lL9wO2rJ8VR+GNIeWJYe65c3lVoz8="; }; ESBUILD_BINARY_PATH = lib.getExe (esbuild.override { @@ -33,23 +37,36 @@ buildNpmPackage rec { # Supresses an error about esbuild's version. npmRebuildFlags = [ "|| true" ]; - npmDepsHash = "sha256-HJK88z4Gs8mqd28zKrsTtk34VcRqIyb6aURbvRZLN0I="; + npmDepsHash = "sha256-51IK95QY9YX0WerGu4GuOrYKoj8Uoo0R1b6WZpC5v4U="; npmFlags = [ "--legacy-peer-deps" ]; npmBuildScript = if buildWebExtension then "buildWeb" else "build"; - npmBuildFlags = [ "--" "--standalone" ]; + npmBuildFlags = [ "--" "--standalone" "--disable-updater" ]; prePatch = '' cp ${./package-lock.json} ./package-lock.json ''; patches = [ - (substituteAll { - src = ./replace-git.patch; - inherit version; + (fetchpatch2 { + name = "allow-git-hash-remote-preset.patch"; + url = "https://github.com/Vendicated/Vencord/commit/d9f55664428007199348123b05818f9e08c4f64d.patch"; + hash = "sha256-l4PP8nVtyQJYUqtU9xYGT4j1Oayy08DE6TfbwPun0pY="; + }) + (fetchpatch2 { + name = "use-source-date-epoch.patch"; + url = "https://github.com/Vendicated/Vencord/commit/28247c88a949eeaac75b13a8d6653164d9659f56.patch"; + hash = "sha256-mMpsB3GkI9LUiMQ/NFOiRw4z+wVkktmWgUHNTgxUFPU="; + }) + (fetchpatch2 { + name = "allow-disabling-updater.patch"; + url = "https://github.com/Vendicated/Vencord/commit/bad1fa0c766b2d42cd2eb0e0d1ab2e0c381bab98.patch"; + hash = "sha256-yp453kFvVC02QEB3Op8PfopnLt3xGkjp4WfP6kPeIJ0="; }) - ./disable-updater-ui.patch ]; + VENCORD_HASH = gitHash; + VENCORD_REMOTE = "${src.owner}/${src.repo}"; + installPhase = if buildWebExtension then '' cp -r dist/chromium-unpacked/ $out diff --git a/pkgs/misc/vencord/disable-updater-ui.patch b/pkgs/misc/vencord/disable-updater-ui.patch deleted file mode 100644 index 6682d814b862..000000000000 --- a/pkgs/misc/vencord/disable-updater-ui.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/src/components/VencordSettings/UpdaterTab.tsx b/src/components/VencordSettings/UpdaterTab.tsx -index 4d0b86c..0f1d87f 100644 ---- a/src/components/VencordSettings/UpdaterTab.tsx -+++ b/src/components/VencordSettings/UpdaterTab.tsx -@@ -249,4 +249,4 @@ function Updater() { - ); - } - --export default IS_WEB ? null : wrapTab(Updater, "Updater"); -+export default null; -diff --git a/src/plugins/_core/settings.tsx b/src/plugins/_core/settings.tsx -index 3ea5a43..da63213 100644 ---- a/src/plugins/_core/settings.tsx -+++ b/src/plugins/_core/settings.tsx -@@ -105,7 +105,7 @@ export default definePlugin({ - label: "Themes", - element: require("@components/VencordSettings/ThemesTab").default, - }, -- !IS_WEB && { -+ false && !IS_WEB && { - section: "VencordUpdater", - label: "Updater", - element: require("@components/VencordSettings/UpdaterTab").default, -diff --git a/src/utils/updater.ts b/src/utils/updater.ts -index 2e2bfe1..5ebd06e 100644 ---- a/src/utils/updater.ts -+++ b/src/utils/updater.ts -@@ -38,6 +38,7 @@ async function Unwrap(p: Promise>) { - } - - export async function checkForUpdates() { -+ return false; - changes = await Unwrap(VencordNative.updater.getUpdates()); - if (changes.some(c => c.hash === gitHash)) { - isNewer = true; diff --git a/pkgs/misc/vencord/package-lock.json b/pkgs/misc/vencord/package-lock.json index c75130a7e6fa..e53695d7098c 100644 --- a/pkgs/misc/vencord/package-lock.json +++ b/pkgs/misc/vencord/package-lock.json @@ -1,16 +1,18 @@ { "name": "vencord", - "version": "1.3.4", + "version": "1.4.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vencord", - "version": "1.3.4", - "license": "GPL-3.0", + "version": "1.4.5", + "license": "GPL-3.0-or-later", "dependencies": { + "@sapphi-red/web-noise-suppressor": "0.3.3", "@vap/core": "0.0.12", "@vap/shiki": "0.10.5", + "eslint-plugin-simple-header": "^1.0.2", "fflate": "^0.7.4", "nanoid": "^4.0.2", "virtual-merge": "^1.0.1" @@ -27,9 +29,8 @@ "diff": "^5.1.0", "discord-types": "^1.3.26", "esbuild": "^0.15.18", - "eslint": "^8.28.0", + "eslint": "^8.46.0", "eslint-import-resolver-alias": "^1.1.2", - "eslint-plugin-header": "^3.1.1", "eslint-plugin-path-alias": "^1.0.0", "eslint-plugin-simple-import-sort": "^10.0.0", "eslint-plugin-unused-imports": "^2.0.0", @@ -48,6 +49,15 @@ "pnpm": ">=8" } }, + "node_modules/@aashutoshrathi/word-wrap": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/@babel/code-frame": { "version": "7.22.5", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz", @@ -695,23 +705,23 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.5.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz", - "integrity": "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==", + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz", + "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==", "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, "node_modules/@eslint/eslintrc": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.3.tgz", - "integrity": "sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz", + "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==", "dev": true, "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.5.2", + "espree": "^9.6.0", "globals": "^13.19.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", @@ -727,9 +737,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.43.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.43.0.tgz", - "integrity": "sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg==", + "version": "8.47.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.47.0.tgz", + "integrity": "sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -833,6 +843,11 @@ } } }, + "node_modules/@sapphi-red/web-noise-suppressor": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@sapphi-red/web-noise-suppressor/-/web-noise-suppressor-0.3.3.tgz", + "integrity": "sha512-gAC33DCXYwNTI/k1PxOVHmbbzakUSMbb/DHpoV6rn4pKZtPI1dduULSmAAm/y1ipgIlArnk2JcnQzw4n2tCZHw==" + }, "node_modules/@types/diff": { "version": "5.0.3", "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.0.3.tgz", @@ -1133,9 +1148,9 @@ } }, "node_modules/acorn": { - "version": "8.9.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz", - "integrity": "sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==", + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", + "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -2295,27 +2310,27 @@ } }, "node_modules/eslint": { - "version": "8.43.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.43.0.tgz", - "integrity": "sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q==", + "version": "8.47.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.47.0.tgz", + "integrity": "sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.4.0", - "@eslint/eslintrc": "^2.0.3", - "@eslint/js": "8.43.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.2", + "@eslint/js": "^8.47.0", "@humanwhocodes/config-array": "^0.11.10", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", - "ajv": "^6.10.0", + "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", "debug": "^4.3.2", "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.0", - "eslint-visitor-keys": "^3.4.1", - "espree": "^9.5.2", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", "esquery": "^1.4.2", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -2325,7 +2340,6 @@ "globals": "^13.19.0", "graphemer": "^1.4.0", "ignore": "^5.2.0", - "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "is-path-inside": "^3.0.3", @@ -2335,9 +2349,8 @@ "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.1", + "optionator": "^0.9.3", "strip-ansi": "^6.0.1", - "strip-json-comments": "^3.1.0", "text-table": "^0.2.0" }, "bin": { @@ -2362,15 +2375,6 @@ "eslint-plugin-import": ">=1.4.0" } }, - "node_modules/eslint-plugin-header": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-header/-/eslint-plugin-header-3.1.1.tgz", - "integrity": "sha512-9vlKxuJ4qf793CmeeSrZUvVClw6amtpghq3CuWcB5cUNnWHQhgcqy5eF8oVKFk1G3Y/CbchGfEaw3wiIJaNmVg==", - "dev": true, - "peerDependencies": { - "eslint": ">=7.7.0" - } - }, "node_modules/eslint-plugin-path-alias": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/eslint-plugin-path-alias/-/eslint-plugin-path-alias-1.0.0.tgz", @@ -2383,6 +2387,11 @@ "eslint": "^7" } }, + "node_modules/eslint-plugin-simple-header": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-simple-header/-/eslint-plugin-simple-header-1.0.2.tgz", + "integrity": "sha512-K1EJ/ueBIjPRA8qR44Ymo+GDmPYYmfoODtainGxVr7PSbX6QiaY+pTuGCrOhO+AtVsYJs8GLSVdGUTXyAxAtOA==" + }, "node_modules/eslint-plugin-simple-import-sort": { "version": "10.0.0", "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-10.0.0.tgz", @@ -2436,9 +2445,9 @@ } }, "node_modules/eslint-visitor-keys": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz", - "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -2448,9 +2457,9 @@ } }, "node_modules/eslint/node_modules/eslint-scope": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz", - "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", "dev": true, "dependencies": { "esrecurse": "^4.3.0", @@ -2473,12 +2482,12 @@ } }, "node_modules/espree": { - "version": "9.5.2", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.2.tgz", - "integrity": "sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==", + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", "dev": true, "dependencies": { - "acorn": "^8.8.0", + "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", "eslint-visitor-keys": "^3.4.1" }, @@ -2893,9 +2902,9 @@ } }, "node_modules/globals": { - "version": "13.20.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", - "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", + "version": "13.21.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz", + "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -3866,17 +3875,17 @@ } }, "node_modules/optionator": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", - "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", + "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", "dev": true, "dependencies": { + "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.3" + "type-check": "^0.4.0" }, "engines": { "node": ">= 0.8.0" @@ -5600,15 +5609,6 @@ "node": ">= 8" } }, - "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", diff --git a/pkgs/misc/vencord/replace-git.patch b/pkgs/misc/vencord/replace-git.patch deleted file mode 100644 index 829321638bf2..000000000000 --- a/pkgs/misc/vencord/replace-git.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/scripts/build/common.mjs b/scripts/build/common.mjs -index 7ff599a..85b3bfa 100644 ---- a/scripts/build/common.mjs -+++ b/scripts/build/common.mjs -@@ -24,7 +24,7 @@ import { promisify } from "util"; - - export const watch = process.argv.includes("--watch"); - export const isStandalone = JSON.stringify(process.argv.includes("--standalone")); --export const gitHash = execSync("git rev-parse --short HEAD", { encoding: "utf-8" }).trim(); -+export const gitHash = "v@version@"; - export const banner = { - js: ` - // Vencord ${gitHash} -@@ -124,11 +124,7 @@ export const gitRemotePlugin = { - namespace: "git-remote", path: args.path - })); - build.onLoad({ filter, namespace: "git-remote" }, async () => { -- const res = await promisify(exec)("git remote get-url origin", { encoding: "utf-8" }); -- const remote = res.stdout.trim() -- .replace("https://github.com/", "") -- .replace("git@github.com:", "") -- .replace(/.git$/, ""); -+ const remote = "Vendicated/Vencord"; - - return { contents: `export default "${remote}"` }; - }); diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index ddffa995b5cd..a9e1b47eddba 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -1,26 +1,18 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch, nix-update-script +{ lib, buildGoModule, fetchFromGitHub, nix-update-script , nixosTests, postgresql, postgresqlTestHook }: buildGoModule rec { pname = "matrix-dendrite"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - hash = "sha256-2DqEfTXD3W6MxfBb6aHaKH+zpxLc2tHaGuWGQuncySo="; + hash = "sha256-I8k3E/7RXJFIaEX1Zw6oFDT6UkQvZBZuyTxUZZQYr+s="; }; - patches = [ - # Fix SQLite db lockup - (fetchpatch { - url = "https://github.com/matrix-org/dendrite/commit/c08c7405dbe9d88c1364f6f1f2466db5045506cc.patch"; - hash = "sha256-gTF9jK5Ihfe1v49gPCK68BLeiUZa2Syo+7D9r62iEXQ="; - }) - ]; - - vendorHash = "sha256-dc0zpKh7J+fi2b5GD/0BQ120UXbBvJLUF74RmYMSOMw="; + vendorHash = "sha256-H2wtGjGTzqN8OXAI2ksCBgTJsmJYLQu5aFu9OP03/DA="; subPackages = [ # The server diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 80d3c1a189f7..230cc2f91681 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.8.3"; + version = "2023.8.4"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 307aa6e63755..96bce463bcb2 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -295,7 +295,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.8.3"; + hassVersion = "2023.8.4"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -311,7 +311,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-fbuNDP604G7YIL61+7LALPdD0blA4n2/meG0PnKnNQU="; + hash = "sha256-Mu3DyCtF/bTrTvRKPLVEGSZfWZrF7QQy/ZvBi5IIH3s="; }; # Secondary source is git for tests @@ -319,7 +319,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-eDA4FWFhfwlUM2skq/Yrua6RFEbmX5x1uC/QE/PhgTQ="; + hash = "sha256-N06e2QSt34l4T0hulndZR/czjaPcmw8YXF0iAN/XmgQ="; }; nativeBuildInputs = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index b8259e573673..fa2bdee5f89f 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.8.3"; + version = "2023.8.4"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-odZ0rKydFtj2bwNrP3KsE5xxFLAssYMoaEe+sBMIeYI="; + hash = "sha256-Oxge6gZ7m0ZFuJKIy6X9YgmC7aK2/oQWJAYCFTclZ/Y="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/http/dufs/default.nix b/pkgs/servers/http/dufs/default.nix index 65582acd9cab..77425c08b5ba 100644 --- a/pkgs/servers/http/dufs/default.nix +++ b/pkgs/servers/http/dufs/default.nix @@ -2,31 +2,23 @@ , rustPlatform , fetchFromGitHub , stdenv -, pkg-config -, openssl , darwin }: rustPlatform.buildRustPackage rec { pname = "dufs"; - version = "0.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "sigoden"; - repo = pname; + repo = "dufs"; rev = "v${version}"; - sha256 = "sha256-FrLvwXEnNEKi8FvPIs6A52WpSUT+pUCc61JBi9M/PPw="; + hash = "sha256-WZ+tyrx4ayFyPmDJq6dGaTRiR6bSQq5k5iOfb+ETe/I="; }; - cargoHash = "sha256-YHFEjs8a1QJHWYVjAQxmpMIQ2aDbu6mxeuNqcvReYR0="; + cargoHash = "sha256-HZiWmqIh21b12DP+hnx1pWBWgSa5j71kp6GCRKGMHv0="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ - pkg-config - ]; - - buildInputs = lib.optionals stdenv.isLinux [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix index fdf510a774ce..24c46d32253e 100644 --- a/pkgs/servers/lidarr/default.nix +++ b/pkgs/servers/lidarr/default.nix @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-fYfqkv3o9aly2bgY5iiZETs4LZfrbJGWd7XeRP4nTu0="; - arm64-linux_hash = "sha256-ENdQQnjxNFyVYnTdxZuaSO4oJ7sd4Oa9TLs8xu93p5g="; - x64-osx_hash = "sha256-LwzwMsqq8RDBiQbKtBVKJPhh4woQTpVr+T0K8ii6kG8="; + x64-linux_hash = "sha256-Dpdsg952hw3ra24/REedfm/S3cOocfSrxjR5vGO/b5E="; + arm64-linux_hash = "sha256-xMRpbg37Q9VIRiioy3kUS00M0zxCT1G439pNWdgSe6A="; + x64-osx_hash = "sha256-rfG7pGUYpEHVpHu+tS0v+/CqF0v/TI0uy7faPoXU4oo="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "lidarr"; - version = "1.2.6.3313"; + version = "1.3.5.3530"; src = fetchurl { url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/oxigraph/default.nix b/pkgs/servers/oxigraph/default.nix index b21c39165bbc..0246d3f5b071 100644 --- a/pkgs/servers/oxigraph/default.nix +++ b/pkgs/servers/oxigraph/default.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "oxigraph"; - version = "0.3.18"; + version = "0.3.19"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-0sAQ/jOnYO0P1EX+DY7rDJyzOkdAaO7hGQDFTgNJyQs="; + sha256 = "sha256-lVPRg9zU3VOTrxr2pTHzfvaGjoP/h88W4JmQhOKshRc="; fetchSubmodules = true; }; - cargoHash = "sha256-bRSv77fq+3f4X+NB75qtjXRHo50H61ytoRPTEjKp6W0="; + cargoHash = "sha256-+wh6qHXW9KXXOkMIkRr+tI3ViBrHpE2G+96mhXFJDtI="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/servers/seafile-server/default.nix b/pkgs/servers/seafile-server/default.nix index af3e8c4ea8c2..e1c9d0b0858e 100644 --- a/pkgs/servers/seafile-server/default.nix +++ b/pkgs/servers/seafile-server/default.nix @@ -10,13 +10,13 @@ let }; in stdenv.mkDerivation rec { pname = "seafile-server"; - version = "9.0.6"; + version = "9.0.10"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-server"; - rev = "881c270aa8d99ca6648e7aa1458fc283f38e6f31"; # using a fixed revision because upstream may re-tag releases :/ - sha256 = "sha256-M1jIysirtl1KKyEvScOIshLvSa5vjxTdFEARgy8bLTc="; + rev = "079a8b65a543bfbc48e7671c3dbbffe19fd02944"; # using a fixed revision because upstream may re-tag releases :/ + sha256 = "sha256-F1n4E6ajpri3CVM7B28UKoTV1oOLr5nTy6Lw0E5tCrc="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/servers/search/weaviate/default.nix b/pkgs/servers/search/weaviate/default.nix index 5be04938caff..eeecaa1808bb 100644 --- a/pkgs/servers/search/weaviate/default.nix +++ b/pkgs/servers/search/weaviate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "weaviate"; - version = "1.20.5"; + version = "1.21.0"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-aQY1kwMdZ8aDj3YSK3g88coHqTSIZDxDJJdZSwPhDSU="; + hash = "sha256-3FSXvo4egn3NZcHgLIOLbyi14qNMB4UHDUa+ox28gN8="; }; - vendorHash = "sha256-RL18glau8IODHy0HqLq28nE7OIUezWDJY7BE/OBFHBw="; + vendorHash = "sha256-HUfkwmAIwTPDZsgRLte7tu/0QKT82WriTqJ14iiKKOs="; subPackages = [ "cmd/weaviate-server" ]; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 176be440bb82..ff6103c94d4c 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik"; - version = "2.10.3"; + version = "2.10.4"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-0Mg+jBuj12GlNdKoyUcB1YDv2oGl9OARKdTzQ+WIWfw="; + sha256 = "sha256-rpXSK/6ssUxzYbR1Nf0Cw7Sk6GnhExO4z8OZGQWITZM="; stripRoot = false; }; - vendorHash = "sha256-sCylkXFg3cGm2ksN9TYV6hxdDqwlxfhZLQtjbZq7LBQ="; + vendorHash = "sha256-CsLn8YqQozO+H66ss59Jh+fmDLVx/CzpFY09x2SoI2k="; subPackages = [ "cmd/traefik" ]; diff --git a/pkgs/servers/web-apps/slskd/default.nix b/pkgs/servers/web-apps/slskd/default.nix index a63c7eceb064..6ee91255e8a3 100644 --- a/pkgs/servers/web-apps/slskd/default.nix +++ b/pkgs/servers/web-apps/slskd/default.nix @@ -10,13 +10,13 @@ }: let pname = "slskd"; - version = "0.17.8"; + version = "0.18.1"; src = fetchFromGitHub { owner = "slskd"; repo = "slskd"; rev = version; - sha256 = "sha256-kqkJZNxg044RbgHFsRfvRMyFRBjnIubdHRqUuMjj2D0="; + sha256 = "sha256-RfwkMNUUt/iecf8A+OV8kyvF4LKWkYcwQ/KErERNWV4="; }; meta = with lib; { @@ -34,9 +34,8 @@ let pname = "slskd-web"; src = "${src}/src/web"; - patches = [ ./package-lock.patch ]; npmFlags = [ "--legacy-peer-deps" ]; - npmDepsHash = "sha256-vURi36ebdJQofhBlElIH5m6T1b8tsVGAzXCiDYUcSww="; + npmDepsHash = "sha256-+2g3pCaGFbzQjKwhjmD6viuzVE5pRg+qSOXMrCtLQkI="; installPhase = '' cp -r build $out ''; diff --git a/pkgs/servers/web-apps/slskd/deps.nix b/pkgs/servers/web-apps/slskd/deps.nix index b911a2cd3d94..d40a61d3d2d6 100644 --- a/pkgs/servers/web-apps/slskd/deps.nix +++ b/pkgs/servers/web-apps/slskd/deps.nix @@ -102,6 +102,7 @@ (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) + (fetchNuGet { pname = "OneOf"; version = "3.0.255"; sha256 = "17m7nqiwfvpbmy0c9l1i71hh1n2vnjm7hdmb6ppgwmbq6ypnxy4a"; }) (fetchNuGet { pname = "prometheus-net"; version = "7.0.0"; sha256 = "13h42444mx4nbafhn0aw7xg8gg5dxjszv3qxfz1dflayzmcwganf"; }) (fetchNuGet { pname = "prometheus-net.AspNetCore"; version = "7.0.0"; sha256 = "0cjdh47qimcg6bmflnwl5xv77vxn4h4hmd1znv8b5a7krg1hrf5k"; }) (fetchNuGet { pname = "prometheus-net.AspNetCore.HealthChecks"; version = "7.0.0"; sha256 = "0q9gal3hkd45d78s1p0f3dv0kxr0byq69k0aq6pmmh9h6rpx56dl"; }) diff --git a/pkgs/servers/web-apps/slskd/package-lock.patch b/pkgs/servers/web-apps/slskd/package-lock.patch deleted file mode 100644 index 59bc95c2aea0..000000000000 --- a/pkgs/servers/web-apps/slskd/package-lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/package-lock.json b/package-lock.json -index 5a84fbe7..562051c7 100644 ---- a/package-lock.json -+++ b/package-lock.json -@@ -12425,7 +12425,7 @@ - "node_modules/pkg-up/node_modules/path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", -- "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", -+ "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", - "dev": true, - "engines": { - "node": ">=4" diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index b76b63167e2b..d87d842be08c 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -22,7 +22,7 @@ }: let - version = "0.83.1"; + version = "0.84.0"; in rustPlatform.buildRustPackage { @@ -33,10 +33,10 @@ rustPlatform.buildRustPackage { owner = "nushell"; repo = "nushell"; rev = version; - hash = "sha256-WMMGsJFgUkascCja7v0VA3spaOb5QmMFXQ2JOT9beO4="; + hash = "sha256-vXtQUWKRPS53IBUgO9Dw8dVzfD5W2kHSPOZHs293O5Q="; }; - cargoHash = "sha256-/0+k3qOM9/rY6XmeVjqQWkjv19yZTkmfMK51z4+ppJU="; + cargoHash = "sha256-NtTCuTWbGTrGKF7ulm3Bfal/WuBtPEX7QvHoOyKY1V8="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ] diff --git a/pkgs/shells/nushell/nu_scripts/default.nix b/pkgs/shells/nushell/nu_scripts/default.nix index 0a49f709a6b7..9170e8452460 100644 --- a/pkgs/shells/nushell/nu_scripts/default.nix +++ b/pkgs/shells/nushell/nu_scripts/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nu_scripts"; - version = "unstable-2023-07-29"; + version = "unstable-2023-08-24"; src = fetchFromGitHub { owner = "nushell"; repo = pname; - rev = "3ee56c6ec31fcc8dbffee85e1c73eb6fe0bbba8d"; - hash = "sha256-luGIvcKOfhDorPfGfL449+eD+58MGo5jMCsNwIRJWt4="; + rev = "45c051dad0e243a63608c8274b7fddd5f0b74941"; + hash = "sha256-kpE+vgobYsQuh8sS3gK/yg68nQykquwteeuecjLtIrE="; }; installPhase = '' diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index bbba12bddb35..4cab90c7e05a 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -11,9 +11,9 @@ let in rustPlatform.buildRustPackage { inherit pname; - version = "0.83.1"; + version = "0.84.0"; src = nushell.src; - cargoHash = "sha256-qRKONc8rDRALEin8WGxi7Jma4uD+U+9Gu6zpmYWmGOc="; + cargoHash = "sha256-RcwCYfIEV0+NbZ99uWaCOLqLap3wZ4qXIsc02fqkBSQ="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; cargoBuildFlags = [ "--package nu_plugin_gstat" ]; diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index 00b70f279c67..0988d4f80bb7 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -9,11 +9,11 @@ rustPlatform.buildRustPackage { pname = "nushell_plugin_query"; - version = "0.83.1"; + version = "0.84.0"; src = nushell.src; - cargoHash = "sha256-0Bcu2h1ooc4z4ezKSjl7ca5cNQwnF3je7XzdhuqP4iQ="; + cargoHash = "sha256-8uAoiurQpI++duheNqwEDw/0CIPE1dHcgL48hKWqNUg="; buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ]; diff --git a/pkgs/tools/admin/aws-sso-cli/default.nix b/pkgs/tools/admin/aws-sso-cli/default.nix index c381d05bb4ff..18b312c6a1c0 100644 --- a/pkgs/tools/admin/aws-sso-cli/default.nix +++ b/pkgs/tools/admin/aws-sso-cli/default.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "aws-sso-cli"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "synfinatic"; repo = pname; rev = "v${version}"; - hash = "sha256-RshR1GA3BvvPwwkVxrM98FfgW3kNaMM0Vqr7iEuoFek="; + hash = "sha256-mINJtjSOmU6oUNIPa5Hl5fG5FqTFM8AJg9jH8WmIAHE="; }; vendorHash = "sha256-skFENAr5XjdKoAyVwXYJVZH+IviqfyZmMIdgHq+7IPs="; diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 625d68dabc0a..a583662138d5 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -5,7 +5,7 @@ let overrideAzureMgmtPackage = package: version: extension: hash: # check to make sure overriding is even necessary - package.overrideAttrs(oldAttrs: rec { + package.overridePythonAttrs(oldAttrs: rec { inherit version; src = fetchPypi { diff --git a/pkgs/tools/admin/granted/default.nix b/pkgs/tools/admin/granted/default.nix index cfea2994df6b..907d440174ff 100644 --- a/pkgs/tools/admin/granted/default.nix +++ b/pkgs/tools/admin/granted/default.nix @@ -1,7 +1,10 @@ { bash , buildGoModule , fetchFromGitHub + +, withFish ? false , fish + , lib , makeWrapper , xdg-utils @@ -36,6 +39,8 @@ buildGoModule rec { ]; postInstall = '' + ln -s $out/bin/granted $out/bin/assumego + # Install shell script install -Dm755 $src/scripts/assume $out/bin/assume substituteInPlace $out/bin/assume \ @@ -44,6 +49,7 @@ buildGoModule rec { wrapProgram $out/bin/assume \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} + '' + lib.optionalString withFish '' # Install fish script install -Dm755 $src/scripts/assume.fish $out/share/assume.fish substituteInPlace $out/share/assume.fish \ @@ -56,5 +62,10 @@ buildGoModule rec { changelog = "https://github.com/common-fate/granted/releases/tag/${version}"; license = licenses.mit; maintainers = [ maintainers.ivankovnatsky ]; + # Could not figure out how to use this application without any hustle. Weird + # linking of binary, aliases for god knows what. + # https://docs.commonfate.io/granted/usage/assuming-roles. + # Will mark as broken until maybe someone fixes it. Switched to aws-sso. + broken = true; }; } diff --git a/pkgs/tools/audio/headsetcontrol/default.nix b/pkgs/tools/audio/headsetcontrol/default.nix index 294b2cc7b931..99434f9ca738 100644 --- a/pkgs/tools/audio/headsetcontrol/default.nix +++ b/pkgs/tools/audio/headsetcontrol/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "headsetcontrol"; - version = "2.6.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "Sapd"; repo = "HeadsetControl"; rev = version; - sha256 = "sha256-SVOcRzR52RYZsk/OWAr1/s+Nm6x48OxG0TF7yQ+Kb94="; + sha256 = "sha256-tAndkfLEgj81JWzXtDBNspRxzKAL6XaRw0aDI1XbC1E="; }; nativeBuildInputs = [ @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; /* - Test depends on having the apropiate headsets connected. + Tests depend on having the appropriate headsets connected. */ doCheck = false; diff --git a/pkgs/tools/filesystems/mount-zip/default.nix b/pkgs/tools/filesystems/mount-zip/default.nix index 678abe4892cd..a6577e900733 100644 --- a/pkgs/tools/filesystems/mount-zip/default.nix +++ b/pkgs/tools/filesystems/mount-zip/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mount-zip"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "google"; repo = "mount-zip"; rev = "v${finalAttrs.version}"; - hash = "sha256-+slN5eedSddYKgiNLq4KZ5BXwvGQw9859sVfkcIBYeo="; + hash = "sha256-dc1Cpyh4ctPPYo4cxH81mqNlomtzjiHHfkh52NPzq80="; }; nativeBuildInputs = [ boost gcc icu pandoc pkg-config ]; diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 2f34fb1e5645..04c19d93af99 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -1,5 +1,26 @@ -{ lib, stdenv, fetchFromGitLab, dpkg, gawk, perl, wget, binutils, bzip2, coreutils, util-linux -, gnugrep, gnupg1, gnutar, gnused, gzip, xz, makeWrapper }: +{ lib +, stdenv +, fetchFromGitLab +, dpkg +, gawk +, perl +, wget +, binutils +, bzip2 +, coreutils +, util-linux +, gnugrep +, gnupg1 +, gnutar +, gnused +, gzip +, xz +, makeWrapper +, nix-update-script +, testers +, debootstrap +}: + # USAGE like this: debootstrap sid /tmp/target-chroot-directory # There is also cdebootstrap now. Is that easier to maintain? let binPath = lib.makeBinPath [ @@ -19,14 +40,14 @@ let binPath = lib.makeBinPath [ ]; in stdenv.mkDerivation rec { pname = "debootstrap"; - version = "1.0.128"; + version = "1.0.131"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = pname; - rev = version; - sha256 = "sha256-WybWWyRPreokjUAdWfZ2MUjgZhF1GTncpbLajQ3rh0E="; + rev = "refs/tags/${version}"; + hash = "sha256-rwNcrS2GzVs0JYxeHcpLMG9FDwSpthNmZIemn95hC6g="; }; nativeBuildInputs = [ makeWrapper ]; @@ -62,7 +83,15 @@ in stdenv.mkDerivation rec { runHook postInstall ''; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = debootstrap; + }; + }; + meta = with lib; { + changelog = "https://salsa.debian.org/installer-team/debootstrap/-/blob/${version}/debian/changelog"; description = "Tool to create a Debian system in a chroot"; homepage = "https://wiki.debian.org/Debootstrap"; license = licenses.mit; diff --git a/pkgs/tools/misc/diffoci/default.nix b/pkgs/tools/misc/diffoci/default.nix new file mode 100644 index 000000000000..5d1678a017d3 --- /dev/null +++ b/pkgs/tools/misc/diffoci/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "diffoci"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "reproducible-containers"; + repo = "diffoci"; + rev = "v${version}"; + hash = "sha256-xmsfqlp/bosCjT83MXkA7uNlPgGYlKXOdnxVhm648zo="; + }; + + vendorHash = "sha256-w3/Je8iIT6CEusfIfGv9TAWkePY5TtOQS0rQYH92sAs="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Diff for Docker and OCI container images"; + homepage = "https://github.com/reproducible-containers/diffoci/"; + license = licenses.asl20; + maintainers = with maintainers; [ jk ]; + }; +} diff --git a/pkgs/tools/misc/eza/default.nix b/pkgs/tools/misc/eza/default.nix index 8ee47ac4cd70..7eeb4e9cbab7 100644 --- a/pkgs/tools/misc/eza/default.nix +++ b/pkgs/tools/misc/eza/default.nix @@ -57,6 +57,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/eza-community/eza"; license = licenses.mit; + mainProgram = "eza"; maintainers = with maintainers; [ cafkafk ]; }; } diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index 731cd459d41c..74904a569c25 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-Zh77m1jezjKJPC8Ua3Uv3w7MIeuLJ6U9WBFzT0uuLSo="; + hash = "sha256-8A00XGKX/dbJElrHQrtoDCEGZJ8ktpFJ6zsxu2qZcxI="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/getoptions/default.nix b/pkgs/tools/misc/getoptions/default.nix index 46a671707259..9860430515e4 100644 --- a/pkgs/tools/misc/getoptions/default.nix +++ b/pkgs/tools/misc/getoptions/default.nix @@ -18,8 +18,11 @@ stdenvNoCC.mkDerivation rec { nativeCheckInputs = [ shellspec ksh mksh yash zsh ] ++ lib.lists.optional (!stdenvNoCC.isDarwin) busybox-sandbox-shell; + # Disable checks against yash, since shellspec seems to be broken for yash>=2.54 + # (see: https://github.com/NixOS/nixpkgs/pull/218264#pullrequestreview-1434402054) preCheck = '' sed -i '/shellspec -s posh/d' Makefile + sed -i '/shellspec -s yash/d' Makefile '' + lib.strings.optionalString stdenvNoCC.isDarwin '' sed -i "/shellspec -s 'busybox ash'/d" Makefile ''; diff --git a/pkgs/tools/misc/grex/default.nix b/pkgs/tools/misc/grex/default.nix index d7a0fc1a747b..2a6ca6031e3b 100644 --- a/pkgs/tools/misc/grex/default.nix +++ b/pkgs/tools/misc/grex/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "grex"; - version = "1.4.2"; + version = "1.4.4"; src = fetchFromGitHub { owner = "pemistahl"; - repo = pname; + repo = "grex"; rev = "v${version}"; - sha256 = "sha256-kbrBnpoVeXSgmIqElpfAnoSutYwsnFaxFJpRsJPUE8k="; + hash = "sha256-ef1eUxeCznIgXLoywwJmnLkTGdW1AmGwCin9DLU9kAs="; }; - cargoSha256 = "sha256-WO8h5JUEiCpfsROQoRZj7I6em6REcJ2PfmoGN1zKRPg="; + cargoHash = "sha256-XLH+fS3fwRcWmVOzTjUacV010N37Oofs9Tbixdka1qY="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; @@ -27,7 +27,9 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A command-line tool for generating regular expressions from user-provided test cases"; homepage = "https://github.com/pemistahl/grex"; + changelog = "https://github.com/pemistahl/grex/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ SuperSandro2000 ]; + mainProgram = "grex"; + maintainers = with maintainers; [ SuperSandro2000 mfrw ]; }; } diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 1dc0eda83f67..3c9c6169192d 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -26,7 +26,7 @@ assert !cppSupport || !mpiSupport; let inherit (lib) optional optionals; in stdenv.mkDerivation rec { - version = "1.14.1-2"; + version = "1.14.2"; pname = "hdf5" + lib.optionalString cppSupport "-cpp" + lib.optionalString fortranSupport "-fortran" @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { majorMinor = lib.versions.majorMinor version; majorMinorPatch = with lib.versions; "${major version}.${minor version}.${patch version}"; in "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${majorMinor}/hdf5-${majorMinorPatch}/src/hdf5-${version}.tar.bz2"; - sha256 = "sha256-BsoUHRo8MStdfMSCahJzcpOuExAxdIhhaJ9qLsghnb0="; + sha256 = "sha256-6jxeJX7zIq9ed/weUurTrWvzu0rAZIDdF+45ANeiTPs="; }; passthru = { @@ -94,18 +94,6 @@ stdenv.mkDerivation rec { moveToOutput 'bin/h5pcc' "''${!outputDev}" ''; - # Remove reference to /build, which get introduced - # into AM_CPPFLAGS since hdf5-1.14.0. Cmake of various - # packages using HDF5 gets confused trying access the non-existent path. - postFixup = '' - for i in h5cc h5pcc h5c++; do - if [ -f $dev/bin/$i ]; then - substituteInPlace $dev/bin/$i --replace \ - '-I/build/hdf5-${version}/src/H5FDsubfiling' "" - fi - done - ''; - enableParallelBuilding = true; passthru.tests = { diff --git a/pkgs/tools/misc/hyfetch/default.nix b/pkgs/tools/misc/hyfetch/default.nix index 037a6e123196..3621ad675b24 100644 --- a/pkgs/tools/misc/hyfetch/default.nix +++ b/pkgs/tools/misc/hyfetch/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "hyfetch"; - version = "1.4.9"; + version = "1.4.10"; format = "setuptools"; src = fetchFromGitHub { owner = "hykilpikonna"; repo = "hyfetch"; rev = "refs/tags/${version}"; - hash = "sha256-n+Aa6HrGB7aKrHLQijKNcUVGMYxuqYVrAAnHFPDYH40="; + hash = "sha256-B8FAMXot+QV7Q2bJuTsRsrxHSr/2f+WNTKrZqFXewdE="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix index ed45be67d200..9768b33c5ce9 100644 --- a/pkgs/tools/misc/smenu/default.nix +++ b/pkgs/tools/misc/smenu/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "1.2.0"; + version = "1.3.0"; pname = "smenu"; src = fetchFromGitHub { owner = "p-gen"; repo = "smenu"; rev = "v${version}"; - sha256 = "sha256-DfND2lIHQc+7+8lM86MMOdFKhbUAOnSlkpLwxo10EI4="; + sha256 = "sha256-r2N+MmZI2KCuYarrFL2Xn5hu4FO3n5MqADRuTXMOtk0="; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/vial/default.nix b/pkgs/tools/misc/vial/default.nix index 6834a53bb6ec..40d3a7c3322d 100644 --- a/pkgs/tools/misc/vial/default.nix +++ b/pkgs/tools/misc/vial/default.nix @@ -1,12 +1,12 @@ { lib, fetchurl, appimageTools }: let name = "vial-${version}"; - version = "0.6"; + version = "0.7"; pname = "Vial"; src = fetchurl { url = "https://github.com/vial-kb/vial-gui/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage"; - sha256 = "sha256-2EapikmY79KQdoHnz1A7gErVXBN8D80r1GJMKQ5gIM0="; + hash = "sha256-IvOjwboxc3KRKUMXW3dWoHMy8Oh7NGsu0GIJcLZ6WR8="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; @@ -23,11 +23,13 @@ appimageTools.wrapType2 { echo 'KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0666", TAG+="uaccess", TAG+="udev-acl"' > $out/etc/udev/rules.d/92-viia.rules ''; - meta = with lib; { - description = "An Open-source QMK GUI fork for configuring your keyboard in real time"; + meta = { + description = "An Open-source GUI and QMK fork for configuring your keyboard in real time"; homepage = "https://get.vial.today"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ kranzes ]; + license = lib.licenses.gpl2Plus; + mainProgram = "vial"; + maintainers = with lib.maintainers; [ kranzes ]; platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/tools/networking/clash-meta/default.nix b/pkgs/tools/networking/clash-meta/default.nix index c7275db6c0a6..5c3f4c976b41 100644 --- a/pkgs/tools/networking/clash-meta/default.nix +++ b/pkgs/tools/networking/clash-meta/default.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "clash-meta"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "Clash.Meta"; rev = "v${version}"; - hash = "sha256-QXNMplVy4cDRbUUDwidto7jxgjStX5PmCLdAIW7Edn8="; + hash = "sha256-gOUG+XtLfkgnbTj1yUun50pevOh+aPXfIlof5/U2ud8="; }; - vendorHash = "sha256-lMeJ3z/iTHIbJI5kTzkQjNPMv5tGMJK/+PM36BUlpjE="; + vendorHash = "sha256-My/fwa8BgaJcSGKcyyzUExVE0M2fk7rMZtOBW7V5edQ="; # Do not build testing suit excludedPackages = [ "./test" ]; diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index 1fa275ab2b53..1968d866c91f 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -1,7 +1,7 @@ { lib , stdenv , cmake -, buildGo118Module +, buildGoModule , makeWrapper , fetchFromGitHub , pythonPackages @@ -35,7 +35,7 @@ let cmakeFlags = ["-DBUILD_DEMO=OFF" "-DDISABLE_PYTHON2=ON"]; }; -in buildGo118Module rec { +in buildGoModule rec { pname = "datadog-agent"; inherit src version; diff --git a/pkgs/tools/networking/grpc_cli/default.nix b/pkgs/tools/networking/grpc_cli/default.nix index 1d22b6cd17bb..9cd4d34876cb 100644 --- a/pkgs/tools/networking/grpc_cli/default.nix +++ b/pkgs/tools/networking/grpc_cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "grpc_cli"; - version = "1.56.2"; + version = "1.57.0"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-yjEaVfyfOlH/GPZz06lKvdds88VZUygPe1OxueMDnJA="; + hash = "sha256-ZPhPi4ODAAohCySVKeypaDID4ZUXvnfidOGK5EMXvh4="; fetchSubmodules = true; }; nativeBuildInputs = [ automake cmake autoconf ]; diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix index bc2733bfb982..7787c89e247c 100644 --- a/pkgs/tools/networking/httplz/default.nix +++ b/pkgs/tools/networking/httplz/default.nix @@ -12,15 +12,15 @@ rustPlatform.buildRustPackage rec { pname = "httplz"; - version = "1.13.0"; + version = "1.13.1"; src = fetchCrate { inherit version; pname = "https"; - hash = "sha256-sTkj2UkUENpezPFAzyDUz6rC4F0G864uLLYOU9fyXjo="; + hash = "sha256-KjkUIAo2CAfVNjC0Vq3Pd8qDN9g1+K/ZRs+sGcc8bCg="; }; - cargoHash = "sha256-omjm+NSny1NLUj9MCeGU6XgrVRAxMJzTbvIyfmWgoCU="; + cargoHash = "sha256-liRCdFg1wUPIURffSJVYG9nf1UEsvSH/krglBeluvlQ="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/networking/subnetcalc/default.nix b/pkgs/tools/networking/subnetcalc/default.nix index ba8b46d486b6..b5aa064f7390 100644 --- a/pkgs/tools/networking/subnetcalc/default.nix +++ b/pkgs/tools/networking/subnetcalc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "subnetcalc"; - version = "2.4.21"; + version = "2.4.22"; src = fetchFromGitHub { owner = "dreibh"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-cFlNx59PaI5GvbEKUplNEq5HVCNt40ZJUvMj2UIbe2A="; + sha256 = "sha256-5sDEMS4RgHdGQZAT2MVF/Ls0KXwdKzX+05uQpHhCZn8="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 1ab7fba07084..11351f56e239 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-08-24"; + version = "2023-08-25"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-iL0RfcTOKQ3c3UErfAE0efi4HXJYHUP6RFcgDzeGJqU="; + hash = "sha256-kDwhmkx+nxqtpyKp9mmnTbu6pzGL/J4/NP2mojljgws="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/imdshift/default.nix b/pkgs/tools/security/imdshift/default.nix new file mode 100644 index 000000000000..c33e0878cd4d --- /dev/null +++ b/pkgs/tools/security/imdshift/default.nix @@ -0,0 +1,39 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "imdshift"; + version = "1.0.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "ayushpriya10"; + repo = "IMDShift"; + rev = "refs/tags/v${version}"; + hash = "sha256-Uoa0uNOhCkT622Yy8GEg8jz9k5zmtXwGmvdb3MVTLX8="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + boto3 + click + prettytable + tqdm + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "IMDShift" + ]; + + meta = with lib; { + description = "Tool to migrate workloads to IMDSv2"; + homepage = "https://github.com/ayushpriya10/IMDShift"; + changelog = "https://github.com/ayushpriya10/IMDShift/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index d52b52b62217..f62588de9e48 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.30" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.31" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index fe3c7d2c8838..f608b1b2fd48 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: e15c05b0bd8774e33c33c100965ec7e301e4f295 - ref: refs/tags/6.3.30 + revision: a97e8a0e2a3b15f3b3710f04def1178139ae0fa2 + ref: refs/tags/6.3.31 specs: - metasploit-framework (6.3.30) + metasploit-framework (6.3.31) actionpack (~> 7.0) activerecord (~> 7.0) activesupport (~> 7.0) @@ -41,6 +41,7 @@ GIT mqtt msgpack (~> 1.6.0) nessus_rest + net-imap net-ldap net-smtp net-ssh @@ -104,25 +105,25 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actionpack (7.0.7) - actionview (= 7.0.7) - activesupport (= 7.0.7) + actionpack (7.0.7.2) + actionview (= 7.0.7.2) + activesupport (= 7.0.7.2) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.7) - activesupport (= 7.0.7) + actionview (7.0.7.2) + activesupport (= 7.0.7.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (7.0.7) - activesupport (= 7.0.7) - activerecord (7.0.7) - activemodel (= 7.0.7) - activesupport (= 7.0.7) - activesupport (7.0.7) + activemodel (7.0.7.2) + activesupport (= 7.0.7.2) + activerecord (7.0.7.2) + activemodel (= 7.0.7.2) + activesupport (= 7.0.7.2) + activesupport (7.0.7.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -133,13 +134,13 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.806.0) - aws-sdk-core (3.180.3) + aws-partitions (1.811.0) + aws-sdk-core (3.181.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.399.0) + aws-sdk-ec2 (1.402.0) aws-sdk-core (~> 3, >= 3.177.0) aws-sigv4 (~> 1.1) aws-sdk-ec2instanceconnect (1.32.0) @@ -151,8 +152,8 @@ GEM aws-sdk-kms (1.71.0) aws-sdk-core (~> 3, >= 3.177.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.132.1) - aws-sdk-core (~> 3, >= 3.179.0) + aws-sdk-s3 (1.134.0) + aws-sdk-core (~> 3, >= 3.181.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.6) aws-sdk-ssm (1.156.0) @@ -172,6 +173,7 @@ GEM cookiejar (0.3.3) crass (1.0.6) daemons (1.4.1) + date (3.3.3) dnsruby (1.70.0) simpleidn (~> 0.2.1) domain_name (0.5.20190701) @@ -271,6 +273,9 @@ GEM mustermann (3.0.0) ruby2_keywords (~> 0.0.1) nessus_rest (0.1.6) + net-imap (0.3.7) + date + net-protocol net-ldap (0.18.0) net-protocol (0.2.1) timeout @@ -317,9 +322,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.7) - actionpack (= 7.0.7) - activesupport (= 7.0.7) + railties (7.0.7.2) + actionpack (= 7.0.7.2) + activesupport (= 7.0.7.2) method_source rake (>= 12.2) thor (~> 1.0) @@ -331,7 +336,7 @@ GEM recog (3.1.2) nokogiri redcarpet (3.6.0) - reline (0.3.7) + reline (0.3.8) io-console (~> 0.5) rex-arch (0.1.14) rex-text @@ -407,7 +412,7 @@ GEM tilt (~> 2.0) sqlite3 (1.6.3) mini_portile2 (~> 2.8.0) - sshkey (2.0.0) + sshkey (3.0.0) strptime (0.2.5) swagger-blocks (3.0.0) thin (1.8.2) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index e98c4a25c121..9cfc107eceef 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.3.30"; + version = "6.3.31"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-j2tgBXn5PP4WegSk4NU5aVfrWVKYcYUS8fHFF5kuCJc="; + sha256 = "sha256-X0QJ4edzqLh01qAhmpcdiuk8xdAkccoJAZmxeTh3q48="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 1f4f9687e1a4..d713e28fc444 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -4,50 +4,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "150sjsk12vzj9aswjy3cz124l8n8sn52bhd0wwly73rwc1a750sg"; + sha256 = "0qamc5ly521wk9i1658h9jv7avmyyp92kffa1da2fn5zk0wgyhf4"; type = "gem"; }; - version = "7.0.7"; + version = "7.0.7.2"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nn21k5psxdv2fkwxs679lr0b8n1nzli2ks343cx4azn6snp8b8a"; + sha256 = "151zxb61bb6q7g0sn34qz79k8bg02vmb8mmnsn0fr15lxw92dfhm"; type = "gem"; }; - version = "7.0.7"; + version = "7.0.7.2"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rspbw4yxx9fh2wyl2wvgwadwapfyx7j9zlirpd4pmk31wkhl4hf"; + sha256 = "1crjq1dznlbsrwd5yijxraz1591xmg4vdcwwnmrw4nh6hrwq5fj5"; type = "gem"; }; - version = "7.0.7"; + version = "7.0.7.2"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ygg145wxlgm12b1x5r0rsk2aa6i2wjz7bgb21j8vmyqyfl272cy"; + sha256 = "03vrssdqaqm41w27s21r37skdfxa41midvjy37i2zh3rnbnq8ps2"; type = "gem"; }; - version = "7.0.7"; + version = "7.0.7.2"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wzbnv3hns0yiwbgh1m3q5j0d7b0k52nlpwirhxyv3l0ycmljfr9"; + sha256 = "1vlzcnyqlbchaq85phmdv73ydlc18xpvxy1cbsk191cwd29i7q32"; type = "gem"; }; - version = "7.0.7"; + version = "7.0.7.2"; }; addressable = { groups = ["default"]; @@ -104,30 +104,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "072z18xbl8n793w4irrsmgh788csvmfkvw1iixsrmdzlzrjjagqx"; + sha256 = "0082fsywglghvam55i4jz7cj2vyd8hb8b7658cr9yqlwna9j1sp3"; type = "gem"; }; - version = "1.806.0"; + version = "1.811.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lc3j74v49b2akyimfnsx3vsgi1i3068cpchn358l0dv27aib6c2"; + sha256 = "0xjw9cf6ldbw50xi5ric8d63r8kybpsvaqxh2v6n7374hfady73i"; type = "gem"; }; - version = "3.180.3"; + version = "3.181.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l2gdlqgq9y5r83svl4g7jpijpw3a6p7xsfdvhklb36mgmf61a0n"; + sha256 = "1kl5b8m0ad2dxj2r0f5wkphfwhnpq820jbzrdmxyh20kivckv33c"; type = "gem"; }; - version = "1.399.0"; + version = "1.402.0"; }; aws-sdk-ec2instanceconnect = { groups = ["default"]; @@ -164,10 +164,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iciakii0vcm16x0fivs5hwwhy3n8j1f9d7pimxr05yplnxizh6a"; + sha256 = "1fbz259as60xnf563z9byp8blq5fsc81h92h3wicai4bmz45w4r5"; type = "gem"; }; - version = "1.132.1"; + version = "1.134.0"; }; aws-sdk-ssm = { groups = ["default"]; @@ -299,6 +299,16 @@ }; version = "1.4.1"; }; + date = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; + type = "gem"; + }; + version = "3.3.3"; + }; dnsruby = { groups = ["default"]; platforms = []; @@ -644,12 +654,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "e15c05b0bd8774e33c33c100965ec7e301e4f295"; - sha256 = "15q85scigigiy498awcqa9cynmv977ay1904g8bgwg7rg42n0swg"; + rev = "a97e8a0e2a3b15f3b3710f04def1178139ae0fa2"; + sha256 = "13xbfww7kccr044wlw94s32krsca3nbrl8d0srsbia3kwzhhji2z"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.30"; + version = "6.3.31"; }; metasploit-model = { groups = ["default"]; @@ -771,6 +781,16 @@ }; version = "0.1.6"; }; + net-imap = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lf7wqg7czhaj51qsnmn28j7jmcxhkh3m28rl1cjrqsgjxhwj7r3"; + type = "gem"; + }; + version = "0.3.7"; + }; net-ldap = { groups = ["default"]; platforms = []; @@ -1037,10 +1057,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0in2b84qqmfnigx0li9bgi6l4knmgbj3a29fzm1zzb5jnv4r1gbr"; + sha256 = "01pdn9sn7kawwrvrbr3vz44j287xbka8mm7nrv9cl510y8gzxi2x"; type = "gem"; }; - version = "7.0.7"; + version = "7.0.7.2"; }; rake = { groups = ["default"]; @@ -1097,10 +1117,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n6b6a1b18fscw9ff0fw5jk1l7kzw542r8444mm7d27zyx5v18sj"; + sha256 = "0lv1nv7z63n4qmsm3h5h273m7daxngkcq8ynkk9j8lmn7jji98lb"; type = "gem"; }; - version = "0.3.7"; + version = "0.3.8"; }; rex-arch = { groups = ["default"]; @@ -1418,10 +1438,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp"; + sha256 = "1k8i5pzjhcnyf0bhcyn5iixpfp4pz0556rcxwpglh6p0sr8s6nv5"; type = "gem"; }; - version = "2.0.0"; + version = "3.0.0"; }; strptime = { groups = ["default"]; diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 3437b19e3a30..735d025e2ea6 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -72,12 +72,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" "WITH_ALLCOMP=yes" ]; - postInstall = '' - # Install Emacs Mode. NOTE: We can't install the necessary - # dependencies (s.el) here. The user has to do this themselves. - mkdir -p "$out/share/emacs/site-lisp" - cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/" - '' + lib.optionalString dmenuSupport '' + postInstall = lib.optionalString dmenuSupport '' cp "contrib/dmenu/passmenu" "$out/bin/" ''; diff --git a/pkgs/tools/security/swtpm/default.nix b/pkgs/tools/security/swtpm/default.nix index e71b88c8c3b9..d132e27a8059 100644 --- a/pkgs/tools/security/swtpm/default.nix +++ b/pkgs/tools/security/swtpm/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "swtpm"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "stefanberger"; repo = "swtpm"; rev = "v${version}"; - sha256 = "sha256-O+sHkmQ47FbqsgWpaqAc/j2AJ5xzsvpBj/p0Zea1nSI="; + sha256 = "sha256-QKR5S7FlMFDw4+VpyRdqixMWyzLpQkf3QCUceQvsliU="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/vals/default.nix b/pkgs/tools/security/vals/default.nix index 489d0e6d93f3..c835de3444cb 100644 --- a/pkgs/tools/security/vals/default.nix +++ b/pkgs/tools/security/vals/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vals"; - version = "0.26.2"; + version = "0.27.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "variantdev"; repo = pname; - sha256 = "sha256-WTUdb2LF/50KT3BqwbvKu4TFocbYBdEAoD3IQiPD2bs="; + sha256 = "sha256-EYp+c3MbkdMIyo/2kHsKg9hjByqm6VdNxLcsl4dJrcg="; }; - vendorHash = "sha256-6DJiqDEgEHQbyIt4iShoBnagBvspd3W3vD56/FGjESs="; + vendorHash = "sha256-iNwQUwcF6iKYdqvy4t5xgOvNdhR+Vx+J5UHZzkNOed4="; ldflags = [ "-s" diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 420cb2880af6..e61f3673bc87 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { # Don't forget to update go.d.plugin.nix as well - version = "1.42.0"; + version = "1.42.1"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - hash = "sha256-Gd+lZVi0bU/7dXCZaPyRwWKkFOm+QNbuwgxcXS2YO7E="; + hash = "sha256-uVr897LF5F+ZGz2rzrTBLhoOOFE+BrE69xztQM8Lq8Q="; fetchSubmodules = true; }; diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix index 44ecbd39d471..1ab520cefac4 100644 --- a/pkgs/tools/system/nvtop/default.nix +++ b/pkgs/tools/system/nvtop/default.nix @@ -11,14 +11,15 @@ , udev , addOpenGLRunpath , amd ? true +, intel ? true +, msm ? true , nvidia ? true }: let - pname-suffix = if amd && nvidia then "" else if amd then "-amd" else "-nvidia"; nvidia-postFixup = "addOpenGLRunpath $out/bin/nvtop"; libPath = lib.makeLibraryPath [ libdrm ncurses udev ]; - amd-postFixup = '' + drm-postFixup = '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${libPath}" \ @@ -26,14 +27,14 @@ let ''; in stdenv.mkDerivation rec { - pname = "nvtop" + pname-suffix; - version = "3.0.1"; + pname = "nvtop"; + version = "3.0.2"; src = fetchFromGitHub { owner = "Syllo"; repo = "nvtop"; rev = version; - hash = "sha256-vLvt2sankpQWAVZBPo3OePs4LDy7YfVnMkZLfN6ERAc="; + hash = "sha256-SHKdjzbc3ZZfOW2p8RLFRKKBfLnO+Z8/bKVxcdLLqxw="; }; cmakeFlags = with lib; [ @@ -43,17 +44,19 @@ stdenv.mkDerivation rec { ] ++ optional nvidia "-DNVML_INCLUDE_DIRS=${cudatoolkit}/include" ++ optional nvidia "-DNVML_LIBRARIES=${cudatoolkit}/targets/x86_64-linux/lib/stubs/libnvidia-ml.so" ++ optional (!amd) "-DAMDGPU_SUPPORT=OFF" + ++ optional (!intel) "-DINTEL_SUPPORT=OFF" + ++ optional (!msm) "-DMSM_SUPPORT=OFF" ++ optional (!nvidia) "-DNVIDIA_SUPPORT=OFF" - ++ optional amd "-DLibdrm_INCLUDE_DIRS=${libdrm}/lib/stubs/libdrm.so.2" + ++ optional (amd || msm) "-DLibdrm_INCLUDE_DIRS=${libdrm}/lib/stubs/libdrm.so.2" ; nativeBuildInputs = [ cmake gtest ] ++ lib.optional nvidia addOpenGLRunpath; buildInputs = with lib; [ ncurses udev ] ++ optional nvidia cudatoolkit - ++ optional amd libdrm + ++ optional (amd || msm) libdrm ; # ordering of fixups is important - postFixup = (lib.optionalString amd amd-postFixup) + (lib.optionalString nvidia nvidia-postFixup); + postFixup = (lib.optionalString (amd || msm) drm-postFixup) + (lib.optionalString nvidia nvidia-postFixup); doCheck = true; @@ -66,9 +69,10 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A (h)top like task monitor for AMD, Intel and NVIDIA GPUs"; + description = "A (h)top like task monitor for AMD, Adreno, Intel and NVIDIA GPUs"; longDescription = '' - Nvtop stands for Neat Videocard TOP, a (h)top like task monitor for AMD, Intel and NVIDIA GPUs. It can handle multiple GPUs and print information about them in a htop familiar way. + Nvtop stands for Neat Videocard TOP, a (h)top like task monitor for AMD, Adreno, Intel and NVIDIA GPUs. + It can handle multiple GPUs and print information about them in a htop familiar way. ''; homepage = "https://github.com/Syllo/nvtop"; changelog = "https://github.com/Syllo/nvtop/releases/tag/${version}"; diff --git a/pkgs/tools/text/riffdiff/default.nix b/pkgs/tools/text/riffdiff/default.nix index f78ddaf9c829..c26966a15817 100644 --- a/pkgs/tools/text/riffdiff/default.nix +++ b/pkgs/tools/text/riffdiff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "riffdiff"; - version = "2.25.0"; + version = "2.25.2"; src = fetchFromGitHub { owner = "walles"; repo = "riff"; rev = version; - hash = "sha256-/V9xp5ew+oL3AIBsgDaAa6LE5Ko/ae7VW47QATtqG1I="; + hash = "sha256-JZWgI4yAsk+jtTyS3QZBxdAOPYmUxb7pn1SbcUeCh6Y="; }; - cargoHash = "sha256-pWMsmQ4JqlHgdP5TUgwZ6fwdEjKrilI5Rla6XLjaBF8="; + cargoHash = "sha256-Z33CGF02rPf24LaYh+wEmmGgPPw+oxMNCgMzCrUEKqk="; meta = with lib; { description = "A diff filter highlighting which line parts have changed"; diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index afc986e9c597..6c423b48d956 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ugrep"; - version = "4.0.2"; + version = "4.0.3"; src = fetchFromGitHub { owner = "Genivia"; repo = "ugrep"; rev = "v${finalAttrs.version}"; - hash = "sha256-g+COkAdXc1Z3yrObbeBU1wtu9Tr3mEhxrf6Qmy3JywY="; + hash = "sha256-t0M0b4q/25gEY3+LhGEgkKJAK1d6kni6uH0VW+yQco0="; }; buildInputs = [ diff --git a/pkgs/tools/text/xml/xml2/default.nix b/pkgs/tools/text/xml/xml2/default.nix index 265ab10e5ac8..d469078c91dc 100644 --- a/pkgs/tools/text/xml/xml2/default.nix +++ b/pkgs/tools/text/xml/xml2/default.nix @@ -12,6 +12,25 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 ]; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + echo -n 'checking csv2 and 2csv...' + $out/bin/csv2 -f <<< $'a,b\n1,2' \ + | $out/bin/2csv record a b \ + | grep -qF '1,2' + echo ' ok' + + echo -n 'checking xml2 and 2xml...' + $out/bin/xml2 <<< $'abc' \ + | $out/bin/2xml \ + | grep -qF 'abc' + echo ' ok' + + runHook postInstallCheck + ''; + meta = with lib; { homepage = "https://web.archive.org/web/20160515005047/http://dan.egnor.name:80/xml2"; description = "Tools for command line processing of XML, HTML, and CSV"; diff --git a/pkgs/tools/wayland/wl-screenrec/default.nix b/pkgs/tools/wayland/wl-screenrec/default.nix index 8f09b806f6af..c7f42cba6430 100644 --- a/pkgs/tools/wayland/wl-screenrec/default.nix +++ b/pkgs/tools/wayland/wl-screenrec/default.nix @@ -34,6 +34,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/russelltg/wl-screenrec"; license = licenses.asl20; platforms = platforms.linux; + mainProgram = "wl-screenrec"; maintainers = with maintainers; [ colemickens ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4038c003f20b..a440ec395e51 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2020,20 +2020,20 @@ mapAliases ({ https://github.com/NixOS/nixpkgs/pull/101369 */ inherit (plasma5Packages) - akonadi akregator ark bluedevil bomber bovo breeze-grub breeze-gtk + akonadi akregator arianna ark bluedevil bomber bovo breeze-grub breeze-gtk breeze-icons breeze-plymouth breeze-qt5 colord-kde discover dolphin dragon elisa falkon ffmpegthumbs filelight granatier gwenview k3b kactivitymanagerd kaddressbook - kalendar kalzium kapman kapptemplate kate katomic kblackbox kblocks kbounce + kalzium kapman kapptemplate kate katomic kblackbox kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser kde-cli-tools kde-gtk-config kdenlive kdeplasma-addons kdevelop-pg-qt kdevelop-unwrapped kdev-php - kdev-python kdevelop kdf kdialog kdiamond keditbookmarks kfind kfloppy + kdev-python kdevelop kdf kdialog kdiamond keditbookmarks kfind kgamma5 kget kgpg khelpcenter kig kigo killbots kinfocenter kitinerary kleopatra klettres klines kmag kmail kmenuedit kmines kmix kmplot knavalbattle knetwalk knights kollision kolourpaint kompare konsole kontact konversation korganizer kpkpass krdc kreversi krfb kscreen kscreenlocker kshisen ksquares ksshaskpass ksystemlog kteatime ktimer ktorrent ktouch kturtle kwallet-pam kwalletmanager kwave kwayland-integration kwin kwrited - marble milou minuet okular oxygen oxygen-icons5 picmi + marble merkuro milou minuet okular oxygen oxygen-icons5 picmi plasma-browser-integration plasma-desktop plasma-integration plasma-nano plasma-nm plasma-pa plasma-mobile plasma-systemmonitor plasma-thunderbolt plasma-vault plasma-workspace plasma-workspace-wallpapers polkit-kde-agent @@ -2041,6 +2041,9 @@ mapAliases ({ systemsettings xdg-desktop-portal-kde yakuake zanshin ; + kalendar = merkuro; # Renamed in 23.08 + kfloppy = throw "kfloppy has been removed upstream in KDE Gear 23.08"; + inherit (plasma5Packages.thirdParty) krohnkite krunner-ssh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e00fbc33de82..9e451ba0c98d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7374,6 +7374,10 @@ with pkgs; diction = callPackage ../tools/text/diction { }; + diffoci = callPackage ../tools/misc/diffoci { + buildGoModule = buildGo121Module; + }; + diffoscope = callPackage ../tools/misc/diffoscope { jdk = jdk8; }; @@ -17722,6 +17726,8 @@ with pkgs; expr = callPackage ../development/interpreters/expr { }; + genemichaels = callPackage ../development/tools/rust/genemichaels { }; + gnudatalanguage = callPackage ../development/interpreters/gnudatalanguage { inherit (llvmPackages) openmp; inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -19297,6 +19303,8 @@ with pkgs; funzzy = callPackage ../development/tools/misc/funzzy { }; + futuresql = libsForQt5.callPackage ../development/libraries/futuresql { }; + fzf-make = callPackage ../development/tools/misc/fzf-make { }; gede = libsForQt5.callPackage ../development/tools/misc/gede { }; @@ -24260,8 +24268,30 @@ with pkgs; nvitop = callPackage ../tools/system/nvitop { }; nvtop = callPackage ../tools/system/nvtop { }; - nvtop-nvidia = callPackage ../tools/system/nvtop { amd = false; }; - nvtop-amd = callPackage ../tools/system/nvtop { nvidia = false; }; + nvtop-amd = (callPackage ../tools/system/nvtop { + amd = true; + intel = false; + msm = false; + nvidia = false; + }).overrideAttrs { pname = "nvtop-amd"; }; + nvtop-intel = (callPackage ../tools/system/nvtop { + amd = false; + intel = true; + msm = false; + nvidia = false; + }).overrideAttrs { pname = "nvtop-intel"; }; + nvtop-msm = (callPackage ../tools/system/nvtop { + amd = false; + intel = false; + msm = true; + nvidia = false; + }).overrideAttrs { pname = "nvtop-msm"; }; + nvtop-nvidia = (callPackage ../tools/system/nvtop { + amd = false; + intel = false; + msm = false; + nvidia = true; + }).overrideAttrs { pname = "nvtop-nvidia"; }; ocl-icd = callPackage ../development/libraries/ocl-icd { }; @@ -30485,8 +30515,6 @@ with pkgs; argo-rollouts = callPackage ../applications/networking/cluster/argo-rollouts { }; - arianna = libsForQt5.callPackage ../applications/misc/arianna { }; - ario = callPackage ../applications/audio/ario { }; arion = callPackage ../applications/virtualization/arion { }; @@ -32923,6 +32951,8 @@ with pkgs; inherit (nodePackages) imapnotify; + imdshift = callPackage ../tools/security/imdshift { }; + img2pdf = with python3Packages; toPythonApplication img2pdf; imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber { }; @@ -41282,7 +41312,9 @@ with pkgs; usb-reset = callPackage ../applications/misc/usb-reset { }; - usql = callPackage ../applications/misc/usql { }; + usql = callPackage ../applications/misc/usql { + buildGoModule = buildGo121Module; + }; utf8cpp = callPackage ../development/libraries/utf8cpp { }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 3f61bc2229d0..2b06fd2e2425 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -5,20 +5,13 @@ # Recommended: simply use `emacsWithPackages` with the packages you want. # # Alternative: use `emacs`, install everything to a system or user profile -# and then add this at the start your `init.el`: +# and then add this at the start your `early-init.el`: /* - (require 'package) - - ;; optional. makes unpure packages archives unavailable - (setq package-archives nil) - ;; optional. use this if you install emacs packages to the system profile (add-to-list 'package-directory-list "/run/current-system/sw/share/emacs/site-lisp/elpa") ;; optional. use this if you install emacs packages to user profiles (with nix-env) (add-to-list 'package-directory-list "~/.nix-profile/share/emacs/site-lisp/elpa") - - (package-initialize) */ { pkgs' diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index aff0e71fcca1..e720a70fafc3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4273,19 +4273,23 @@ with self; { }; }; - Connector = buildPerlPackage { + Connector = buildPerlModule { pname = "Connector"; - version = "1.35"; + version = "1.47"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Connector-1.35.tar.gz"; - hash = "sha256-Qdl2bubNdaGcFsdeuQ3GT9/dXbp22NIJdo37FeVm3Eo="; + url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Connector-1.47.tar.gz"; + hash = "sha256-I2R4pAq53cIVgu4na6krnjgbP8XtljkKLe2o4nSGeoM="; }; - buildInputs = [ ConfigMerge ConfigStd ConfigVersioned DBDSQLite DBI IOSocketSSL JSON LWP LWPProtocolHttps ProcSafeExec TemplateToolkit YAML ]; + buildInputs = [ ModuleBuildTiny ConfigMerge ConfigStd ConfigVersioned DBDSQLite DBI IOSocketSSL JSON LWP LWPProtocolHttps ProcSafeExec TemplateToolkit YAML ]; propagatedBuildInputs = [ LogLog4perl Moose ]; prePatch = '' # Attempts to use network. rm t/01-proxy-http.t rm t/01-proxy-proc-safeexec.t + + # crypt() tests that use DES + rm t/01-builtin-password.t + rm t/01-builtin-password-scheme.t ''; meta = { description = "A generic connection to a hierarchical-structured data set"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 36c7f74c6614..09bdb2475da6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13118,6 +13118,8 @@ self: super: with self; { types-appdirs = callPackage ../development/python-modules/types-appdirs { }; + types-beautifulsoup4 = callPackage ../development/python-modules/types-beautifulsoup4 { }; + types-colorama = callPackage ../development/python-modules/types-colorama { }; types-dateutil = callPackage ../development/python-modules/types-dateutil { }; @@ -13134,6 +13136,8 @@ self: super: with self; { types-futures = callPackage ../development/python-modules/types-futures { }; + types-html5lib = callPackage ../development/python-modules/types-html5lib { }; + types-ipaddress = callPackage ../development/python-modules/types-ipaddress { }; types-mock = callPackage ../development/python-modules/types-mock { };